Skip to content

Commit

Permalink
gnome-desktop: upgrade 41.2 -> 42.0
Browse files Browse the repository at this point in the history
Build both gtk3 and gtk4 variants for now

=============
Version 42.rc
=============
- Translation updates

===============
Version 42.beta
===============
- Add async methods for thumbnail creation
- thumbnail: Resolve symlinks before exporting them with Flatpak
- Make table:cangjie5 the default input method for zh_HK
- Translation updates

============
Version 42.alpha.1
============
- build: fix soversion in libgnome-desktop-4

Signed-off-by: Andreas Müller <[email protected]>
  • Loading branch information
schnitzeltony committed Apr 3, 2022
1 parent 5c93865 commit 07fd6c2
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ Signed-off-by: Andreas Müller <[email protected]>
1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/meson.build b/meson.build
index cceefe0..df3fdd9 100644
index 1dc8a73..87d72fe 100644
--- a/meson.build
+++ b/meson.build
@@ -59,12 +59,7 @@ udev_dep = dependency('libudev', required: get_option('udev'))
@@ -65,12 +65,7 @@ udev_dep = dependency('libudev', required: get_option('udev'))
host_os = host_machine.system()
host_cpu = host_machine.cpu()
supported_os = ['linux']
Expand All @@ -32,9 +32,9 @@ index cceefe0..df3fdd9 100644
- seccomp_dep = dependency('', required: false)
-endif
+seccomp_dep = dependency('', required: false)
fontconfig_cache_path = fontconfig_dep.get_pkgconfig_variable('cachedir')

xkb_base = xkb_config_dep.get_pkgconfig_variable('xkb_base')
fontconfig_cache_path = fontconfig_dep.get_variable(pkgconfig: 'cachedir')
xkb_base = xkb_config_dep.get_variable(pkgconfig: 'xkb_base')
--
2.31.1
2.34.1

Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,22 @@ REQUIRED_DISTRO_FEATURES += "gobject-introspection-data"

GIR_MESON_OPTION = ""

SRC_URI[archive.sha256sum] = "34329eefdacad2332a6adbae538c8da6e52235c7775a908b7c32040a0753ec6a"
SRC_URI[archive.sha256sum] = "f3caa293a5e86f6ccad18f817273db1c67061e680d79d839aa8a7528e5bb26d6"
SRC_URI += " \
file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \
file://0001-meson.build-Disable-libseccomp-for-all-archs.patch \
"

DEPENDS += "gsettings-desktop-schemas virtual/libx11 gtk+3 startup-notification xkeyboard-config iso-codes udev"
DEPENDS += " \
gsettings-desktop-schemas \
virtual/libx11 \
gtk+3 \
gtk4 \
startup-notification \
xkeyboard-config \
iso-codes \
udev \
"

GTKDOC_MESON_OPTION = "gtk_doc"
EXTRA_OEMESON = "-Ddesktop_docs=false"
Expand Down

0 comments on commit 07fd6c2

Please sign in to comment.