From e93b125df1465c34a5f294d0c76e38cc0edc04bc98d57f055664f8d70595a46e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 28 Apr 2022 12:48:41 +0000 Subject: [PATCH] Accepting request 973710 from GNOME:Next - Update to version 42.1: + Fix build_gtk4 option. + Updated translations. - Drop a3ed548d92b160245b79978ae362d47091ad8dad.patch: fixed upstream. OBS-URL: https://build.opensuse.org/request/show/973710 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=330 --- ...548d92b160245b79978ae362d47091ad8dad.patch | 164 ------------------ gnome-desktop-42.0.tar.xz | 3 - gnome-desktop-42.1.tar.xz | 3 + gnome-desktop.changes | 9 + gnome-desktop.spec | 4 +- 5 files changed, 13 insertions(+), 170 deletions(-) delete mode 100644 a3ed548d92b160245b79978ae362d47091ad8dad.patch delete mode 100644 gnome-desktop-42.0.tar.xz create mode 100644 gnome-desktop-42.1.tar.xz diff --git a/a3ed548d92b160245b79978ae362d47091ad8dad.patch b/a3ed548d92b160245b79978ae362d47091ad8dad.patch deleted file mode 100644 index ad82257..0000000 --- a/a3ed548d92b160245b79978ae362d47091ad8dad.patch +++ /dev/null @@ -1,164 +0,0 @@ -From a3ed548d92b160245b79978ae362d47091ad8dad Mon Sep 17 00:00:00 2001 -From: Matt Turner -Date: Sun, 20 Mar 2022 18:07:17 -0700 -Subject: [PATCH] meson: Fix build_gtk4 option - -(cherry picked from commit a9ad6e704f9fead5748c2a9697990b01e91b9de0) ---- - libgnome-desktop/meson.build | 134 +++++++++++++++++------------------ - 1 file changed, 67 insertions(+), 67 deletions(-) - -diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build -index 2aaf81b1..7dfbfeb4 100644 ---- a/libgnome-desktop/meson.build -+++ b/libgnome-desktop/meson.build -@@ -78,79 +78,79 @@ libgnome_desktop_base_headers = [ - 'gnome-xkb-info.h', - ] - --install_headers(libgnome_desktop_base_headers, -- subdir: 'gnome-desktop-4.0/libgnome-desktop' --) -+if get_option('build_gtk4') -+ install_headers(libgnome_desktop_base_headers, -+ subdir: 'gnome-desktop-4.0/libgnome-desktop' -+ ) - --base_deps = [ -- gdk_pixbuf_dep, -- glib_dep, -- gio_dep, -- gio_unix_dep, -- libsystemd_dep, -- schemas_dep, -- xkb_config_dep, -- xkbregistry_dep, -- iso_codes_dep, -- udev_dep, -- seccomp_dep, -- m_dep, -- rt_dep, --] -+ base_deps = [ -+ gdk_pixbuf_dep, -+ glib_dep, -+ gio_dep, -+ gio_unix_dep, -+ libsystemd_dep, -+ schemas_dep, -+ xkb_config_dep, -+ xkbregistry_dep, -+ iso_codes_dep, -+ udev_dep, -+ seccomp_dep, -+ m_dep, -+ rt_dep, -+ ] - --libgnome_desktop_base = library('gnome-desktop-4', -- sources: [ -- libgnome_desktop_base_sources, -- libgnome_desktop_base_private_sources, -- dbus_idle_built_sources, -- ], -- dependencies: base_deps, -- soversion: soversion, -- version: libversion, -- c_args: libargs, -- link_args: base_ldflags, -- install: true, -- include_directories: [ -- include_directories('.'), -- include_directories('..'), -- ], --) -+ libgnome_desktop_base = library('gnome-desktop-4', -+ sources: [ -+ libgnome_desktop_base_sources, -+ libgnome_desktop_base_private_sources, -+ dbus_idle_built_sources, -+ ], -+ dependencies: base_deps, -+ soversion: soversion, -+ version: libversion, -+ c_args: libargs, -+ link_args: base_ldflags, -+ install: true, -+ include_directories: [ -+ include_directories('.'), -+ include_directories('..'), -+ ], -+ ) - --libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base, -- sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources], -- export_packages: 'gnome-desktop-4', -- namespace: 'GnomeDesktop', -- nsversion: '4.0', -- includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'], -- extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'], -- identifier_prefix: 'Gnome', -- symbol_prefix: 'gnome', -- install: true, --) -+ libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base, -+ sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources], -+ export_packages: 'gnome-desktop-4', -+ namespace: 'GnomeDesktop', -+ nsversion: '4.0', -+ includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'], -+ extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'], -+ identifier_prefix: 'Gnome', -+ symbol_prefix: 'gnome', -+ install: true, -+ ) - --pkg.generate( -- libgnome_desktop_base, -- requires: ['gsettings-desktop-schemas'], -- version: meson.project_version(), -- name: 'gnome-desktop-4', -- filebase: 'gnome-desktop-4', -- description: 'Utility library for GNOME desktop components', -- subdirs: 'gnome-desktop-4.0', --) -+ pkg.generate( -+ libgnome_desktop_base, -+ requires: ['gsettings-desktop-schemas'], -+ version: meson.project_version(), -+ name: 'gnome-desktop-4', -+ filebase: 'gnome-desktop-4', -+ description: 'Utility library for GNOME desktop components', -+ subdirs: 'gnome-desktop-4.0', -+ ) - --libgnome_desktop_base_dep = declare_dependency( -- sources: [ -- libgnome_desktop_base_gir, -- ], -- dependencies: base_deps, -- link_with: libgnome_desktop_base, -- include_directories: [ -- include_directories('.'), -- include_directories('..'), -- ], --) -+ libgnome_desktop_base_dep = declare_dependency( -+ sources: [ -+ libgnome_desktop_base_gir, -+ ], -+ dependencies: base_deps, -+ link_with: libgnome_desktop_base, -+ include_directories: [ -+ include_directories('.'), -+ include_directories('..'), -+ ], -+ ) - --if gtk4_dep.found() - subdir('gnome-bg') - subdir('gnome-rr') - endif --- -GitLab - diff --git a/gnome-desktop-42.0.tar.xz b/gnome-desktop-42.0.tar.xz deleted file mode 100644 index d770459..0000000 --- a/gnome-desktop-42.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f3caa293a5e86f6ccad18f817273db1c67061e680d79d839aa8a7528e5bb26d6 -size 743484 diff --git a/gnome-desktop-42.1.tar.xz b/gnome-desktop-42.1.tar.xz new file mode 100644 index 0000000..180d10e --- /dev/null +++ b/gnome-desktop-42.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2433ab606d244c3524de5b812094db8a670fb11ed9ff7180c2d021ae1fc9fc05 +size 743032 diff --git a/gnome-desktop.changes b/gnome-desktop.changes index 64b8c3a..f708e71 100644 --- a/gnome-desktop.changes +++ b/gnome-desktop.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Apr 28 11:15:31 UTC 2022 - Emily Gonyer + +- Update to version 42.1: + + Fix build_gtk4 option. + + Updated translations. +- Drop a3ed548d92b160245b79978ae362d47091ad8dad.patch: fixed + upstream. + ------------------------------------------------------------------- Tue Mar 22 08:00:53 UTC 2022 - Bjørn Lie diff --git a/gnome-desktop.spec b/gnome-desktop.spec index bff56b6..58e3ff3 100644 --- a/gnome-desktop.spec +++ b/gnome-desktop.spec @@ -17,7 +17,7 @@ Name: gnome-desktop -Version: 42.0 +Version: 42.1 Release: 0 Summary: The GNOME Desktop API Library License: LGPL-2.1-or-later @@ -27,8 +27,6 @@ Source0: https://download.gnome.org/sources/gnome-desktop/42/%{name}-%{ve # PATCH-FIX-OPENSUSE gnome-desktop-switch-Japanese-default-input-to-mozc.patch bnc#1029083 boo#1056289 qzhao@suse.com -- Switch new user's default input engine from "anthy" to "mozc" in gnome-desktop with Japanese language and ibus input frame-work condition. Patch1: gnome-desktop-switch-Japanese-default-input-to-mozc.patch -# PATCH-FIX-UPSTREAM a3ed548d92b160245b79978ae362d47091ad8dad.patch -- meson: Fix build_gtk4 option -Patch2: https://gitlab.gnome.org/GNOME/gnome-desktop/-/commit/a3ed548d92b160245b79978ae362d47091ad8dad.patch BuildRequires: fdupes BuildRequires: gobject-introspection-devel