From f631ad4e19ffad872f6b94c66cb645c3e7935a1e Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 21:10:24 +0200 Subject: [PATCH] gnome-desktop: update to 43. --- common/shlibs | 8 +- .../patches/optional_introspection.patch | 93 ------------------- srcpkgs/gnome-desktop/template | 13 +-- 3 files changed, 11 insertions(+), 103 deletions(-) delete mode 100644 srcpkgs/gnome-desktop/patches/optional_introspection.patch diff --git a/common/shlibs b/common/shlibs index 6b586ced104..c2a11c1cf1e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1136,10 +1136,10 @@ libgstcodecparsers-1.0.so.0 gst-plugins-bad1-1.18.3_2 libgstplayer-1.0.so.0 gst-plugins-bad1-1.18.3_2 libgstwebrtc-1.0.so.0 gst-plugins-bad1-1.18.4_2 libgstgl-1.0.so.0 gst-plugins-base1-1.14.0_1 -libgnome-desktop-3.so.19 gnome-desktop-3.37.90.1_1 -libgnome-desktop-4.so.1 gnome-desktop-42.0_1 -libgnome-bg-4.so.1 gnome-desktop-42.0_1 -libgnome-rr-4.so.1 gnome-desktop-42.0_1 +libgnome-desktop-3.so.20 gnome-desktop-43.0_1 +libgnome-desktop-4.so.2 gnome-desktop-43.0_1 +libgnome-bg-4.so.2 gnome-desktop-43.0_1 +libgnome-rr-4.so.2 gnome-desktop-43.0_1 libsecret-1.so.0 libsecret-0.10_1 libgweather-4.so.0 libgweather-4.0.0_1 libgnomekbd.so.8 libgnomekbd-3.6.0_1 diff --git a/srcpkgs/gnome-desktop/patches/optional_introspection.patch b/srcpkgs/gnome-desktop/patches/optional_introspection.patch deleted file mode 100644 index b960ef27c58..00000000000 --- a/srcpkgs/gnome-desktop/patches/optional_introspection.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 94b253000f081423a3c813d340ed486fc170768d Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -Date: Wed, 18 Sep 2019 22:28:21 +0300 -Subject: [PATCH] meson: Add optionality for introspection - ---- - libgnome-desktop/meson.build | 48 +++++++++++++++++++----------------- - meson_options.txt | 4 +++ - 2 files changed, 30 insertions(+), 22 deletions(-) - -diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build -index a0fb11f8..375cf57c 100644 ---- a/libgnome-desktop/meson.build -+++ b/libgnome-desktop/meson.build -@@ -125,17 +125,19 @@ if get_option('build_gtk4') - ], - ) - -- 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, -- ) -+ if get_option('introspection') -+ 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, -+ ) -+ endif - - pkg.generate( - libgnome_desktop_base, -@@ -255,17 +257,19 @@ if get_option('legacy_library') - ], - ) - -- gnome.generate_gir(libgnome_desktop, -- sources: introspection_sources + libgnome_desktop_headers, -- export_packages: 'gnome-desktop-3.0', -- namespace: 'GnomeDesktop', -- nsversion: '3.0', -- includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'], -- extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'], -- identifier_prefix: 'Gnome', -- symbol_prefix: 'gnome', -- install: true -- ) -+ if get_option('introspection') -+ gnome.generate_gir(libgnome_desktop, -+ sources: introspection_sources + libgnome_desktop_headers, -+ export_packages: 'gnome-desktop-3.0', -+ namespace: 'GnomeDesktop', -+ nsversion: '3.0', -+ includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'], -+ extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'], -+ identifier_prefix: 'Gnome', -+ symbol_prefix: 'gnome', -+ install: true -+ ) -+ endif - - pkg.generate( - libraries: libgnome_desktop, -diff --git a/meson_options.txt b/meson_options.txt -index e17e7330..c4db6eaf 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -17,6 +17,10 @@ option('debug_tools', - type: 'boolean', value: true, description: 'Build debug tools' - ) - -+option('introspection', -+ type: 'boolean', value: true, description: 'Whether to build introspection files' -+) -+ - option('udev', - type: 'feature', description: 'Udev support' - ) --- -GitLab diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template index 86b8ca89077..ec82aeb9d2b 100644 --- a/srcpkgs/gnome-desktop/template +++ b/srcpkgs/gnome-desktop/template @@ -1,10 +1,10 @@ # Template file for 'gnome-desktop' pkgname=gnome-desktop -version=42.6 +version=43 revision=1 build_style=meson build_helper="gir" -configure_args="-Dgnome_distributor=VoidLinux -Dudev=enabled -Dsystemd=disabled +configure_args="-Dudev=enabled -Dsystemd=disabled -Dintrospection=$(vopt_if gir true false)" hostmakedepends="gettext itstool pkg-config glib-devel" makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk4-devel gtk+3-devel @@ -12,12 +12,13 @@ makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk4-devel gtk+ libxkbfile-devel libXrandr-devel gdk-pixbuf-devel" depends="bubblewrap gsettings-desktop-schemas iso-codes xkeyboard-config" short_desc="GNOME desktop management utilities" -maintainer="Enno Boland " +maintainer="Michal Vasilek " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-desktop" -changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-42/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ac713a8274d10918dfba8cf19d278de93acf833341dff8a15bab2b9f6429739b +#changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-43/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/master/NEWS" +distfiles="${GNOME_SITE}/gnome-desktop/${version%.*}/gnome-desktop-${version}.tar.xz" +checksum=3d6e153317486157596aa3802f87676414c570738f450a94a041fe8835420a69 build_options="gir" build_options_default="gir"