From e68d405c5d712af4387159df07e226217bdda049 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 6 Apr 2022 22:33:41 +0100 Subject: gentoo resync : 06.04.2022 --- gnome-base/gnome-desktop/Manifest | 5 + ...0-meson-Add-optionality-for-introspection.patch | 96 ++++++++++++ .../files/42.0-meson-Fix-build_gtk4-option.patch | 165 +++++++++++++++++++++ .../gnome-desktop/gnome-desktop-42.0-r300.ebuild | 83 +++++++++++ .../gnome-desktop/gnome-desktop-42.0-r400.ebuild | 76 ++++++++++ 5 files changed, 425 insertions(+) create mode 100644 gnome-base/gnome-desktop/files/42.0-meson-Add-optionality-for-introspection.patch create mode 100644 gnome-base/gnome-desktop/files/42.0-meson-Fix-build_gtk4-option.patch create mode 100644 gnome-base/gnome-desktop/gnome-desktop-42.0-r300.ebuild create mode 100644 gnome-base/gnome-desktop/gnome-desktop-42.0-r400.ebuild (limited to 'gnome-base/gnome-desktop') diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest index 5430c9a15292..b73d06c4f69e 100644 --- a/gnome-base/gnome-desktop/Manifest +++ b/gnome-base/gnome-desktop/Manifest @@ -1,4 +1,9 @@ AUX 3.32.2-optional-introspection.patch 1376 BLAKE2B de57d769aab0cdc6a7fda25c0265f34d5d0fd555ae60a519273512021cf4f065db1e22ab72ce9004a914a47d077551b5a12ffbd5e81a9b8cf098a4762a0e461d SHA512 ea76e41aff067281497b98c86b66d8c382124ceead5b18e729342615a50b6aa3401f4d7c5553023b5d78ca0ea02823c7d6026ba9acca862804351269e4107d18 +AUX 42.0-meson-Add-optionality-for-introspection.patch 3275 BLAKE2B f3629eab79b830397646ea855991daf5d61a9bb992262deb452e32a19e1564be20f98dfa49f8b08f6ca6a36b69fe44e46bee16b23533a27d089b77e2ae524a07 SHA512 9982e691e080dfa03c5ee6038b9a3a0e47521272240082d0da1ebf00c75f958d60c5d764ebae580415489e39b18ee77bb0c99587d32b4575ae0495fc88793c83 +AUX 42.0-meson-Fix-build_gtk4-option.patch 4432 BLAKE2B 38d648ca67079db2f552b3af0e76ea928c15e1fc44e5b569992ffd3b469047659e9c681a3933f91d4bf7065c4465a95db8fac2c2891f8bbc8b09d9c239d6057d SHA512 d7f6d3cad1986bcc3d9c5013c870fa2e6d42d3b27648b4375e23dc2cb0a6d53c1a6b085fe2d009566938f4bff68773b1d61784abdf47667f85b01fc485a08e19 DIST gnome-desktop-41.3.tar.xz 732804 BLAKE2B 40a88ba4454455f85a46676d4b2f37159617f7eae9d0f5e1a27c3f0ed1e44953ae9475e81558b7cce1b6fd8cd8804cd3f452d060d843d4f58a7af8748b4c35fa SHA512 b02d9fe3bfad56993f9ed7225b38b4b0b685c7ad1480a9d9db5f9a6a8e13c16918d87e6a51160ee3101ab8ce24f4c0632ae351e7bb11cc473523e216ee9cf6bf +DIST gnome-desktop-42.0.tar.xz 743484 BLAKE2B 7c7d5e74fe01e082c8ec1994bb7666f191e0eed4212c8ef6257ebb4c3e3a5fb95c8a0c47f1c8f0864a36faa239251569e67eafa734cba4a181b6774233352357 SHA512 b9d37765d3cc43bb709e1e9b97deb6ef16d2a8e6ef7cc3c577ba465d4856bbfe8774fb7fc6eaae4d88064081aeeea0c0c77fe2b4ef79b4d9af1232c918526b44 EBUILD gnome-desktop-41.3.ebuild 1922 BLAKE2B d2d6613309b0adba0b3afba8d8966e368a8ea7fd5c1676ee2f3aaa37a3518af6f861a5aa98ba0611c3ee023901ba5c7838f59eddd1ef43cdee27054dfc94bb7f SHA512 722b7d3f3c6e43c84c7bf37f202263a21021ed0fc3b8275ea1cd207b0d19cb3e7807bbc8eb539a54210a4296468994d677ebdbd1b82023e11514f00ca82c73e4 +EBUILD gnome-desktop-42.0-r300.ebuild 2094 BLAKE2B 15bde2ec3d978dfe8aea8519f7a988480e14e0a4c72e62555be0ed51dc63a5cc659c6b25afdfca0809d59c7b2c0732809ba8c7522143e66b29d0ce8de46f13da SHA512 95b49469f13d3793b745945e7c1a9ffea4b0b5a8cfde63fbb230edaa1d4a0b4de76753c050ea41612bfb58fa5514ca150ac948126ded0cfd343c7bea204d95ab +EBUILD gnome-desktop-42.0-r400.ebuild 2026 BLAKE2B 09482d3611295bc809533b5588ad671edf2f47f89aebaa12b8148bd38d2f8cb669a6fca3b7339e4ccc453400a77bbc360d6239191e527e361348c27b03e88e0b SHA512 ab34a050c4f16d120c37c60637faab919b87db1157a766f473f551a30b5a549b04e8df368e9e1be6cf91ab8b3d0bd23ac373a2b2aa6ca71b7c8f4ce50c02a74d MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132 diff --git a/gnome-base/gnome-desktop/files/42.0-meson-Add-optionality-for-introspection.patch b/gnome-base/gnome-desktop/files/42.0-meson-Add-optionality-for-introspection.patch new file mode 100644 index 000000000000..f697be9db1fa --- /dev/null +++ b/gnome-base/gnome-desktop/files/42.0-meson-Add-optionality-for-introspection.patch @@ -0,0 +1,96 @@ +https://gitlab.gnome.org/GNOME/gnome-desktop/-/merge_requests/139 + +From 94b253000f081423a3c813d340ed486fc170768d Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp +Date: Wed, 18 Sep 2019 22:28:21 +0300 +Subject: [PATCH 2/2] 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' + ) +-- +2.34.1 + diff --git a/gnome-base/gnome-desktop/files/42.0-meson-Fix-build_gtk4-option.patch b/gnome-base/gnome-desktop/files/42.0-meson-Fix-build_gtk4-option.patch new file mode 100644 index 000000000000..9b166e23bab8 --- /dev/null +++ b/gnome-base/gnome-desktop/files/42.0-meson-Fix-build_gtk4-option.patch @@ -0,0 +1,165 @@ +https://gitlab.gnome.org/GNOME/gnome-desktop/-/merge_requests/138 + +From a9ad6e704f9fead5748c2a9697990b01e91b9de0 Mon Sep 17 00:00:00 2001 +From: Matt Turner +Date: Sun, 20 Mar 2022 18:07:17 -0700 +Subject: [PATCH 1/2] meson: Fix build_gtk4 option + +--- + 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 e81530ed..a0fb11f8 100644 +--- a/libgnome-desktop/meson.build ++++ b/libgnome-desktop/meson.build +@@ -86,79 +86,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 +-- +2.34.1 + diff --git a/gnome-base/gnome-desktop/gnome-desktop-42.0-r300.ebuild b/gnome-base/gnome-desktop/gnome-desktop-42.0-r300.ebuild new file mode 100644 index 000000000000..16f7cb36d9a1 --- /dev/null +++ b/gnome-base/gnome-desktop/gnome-desktop-42.0-r300.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit gnome.org meson xdg + +DESCRIPTION="Library with common API for various GNOME modules" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/" + +LICENSE="GPL-2+ LGPL-2+ FDL-1.1+" +SLOT="3/19" # subslot = libgnome-desktop-3 soname version +IUSE="debug +introspection seccomp systemd udev" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" + +COMMON_DEPEND=" + >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] + >=x11-libs/gtk+-3.3.6:3[X,introspection?] + >=dev-libs/glib-2.53.0:2 + >=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?] + x11-misc/xkeyboard-config + x11-libs/libxkbcommon + app-text/iso-codes + systemd? ( sys-apps/systemd:= ) + udev? ( virtual/libudev:= ) + seccomp? ( sys-libs/libseccomp ) + + x11-libs/cairo:= + introspection? ( >=dev-libs/gobject-introspection-1.54:= ) +" +DEPEND="${COMMON_DEPEND} + media-libs/fontconfig +" +RDEPEND="${COMMON_DEPEND} + seccomp? ( sys-apps/bubblewrap ) +" +BDEPEND=" + app-text/docbook-xml-dtd:4.1.2 + dev-util/gdbus-codegen + dev-util/itstool + >=sys-devel/gettext-0.19.8 + x11-base/xorg-proto + virtual/pkgconfig +" +# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto + +PATCHES=( + "${FILESDIR}"/${PV}-meson-Fix-build_gtk4-option.patch + "${FILESDIR}"/${PV}-meson-Add-optionality-for-introspection.patch +) + +src_prepare() { + default + xdg_environment_reset + + # Don't build manual test programs that will never get run + sed -i -e "/'test-.*'/d" libgnome-desktop/meson.build || die +} + +src_configure() { + local emesonargs=( + -Dgnome_distributor=Gentoo + -Ddate_in_gnome_version=true + -Ddesktop_docs=false + $(meson_use debug debug_tools) + $(meson_use introspection) + $(meson_feature udev) + $(meson_feature systemd) + -Dgtk_doc=false + -Dinstalled_tests=false + -Dbuild_gtk4=false + -Dlegacy_library=true + ) + meson_src_configure +} + +src_install() { + meson_src_install + + rm -r \ + ${ED}/usr/share/gnome/gnome-version.xml \ + ${ED}/usr/share/locale \ + || die +} diff --git a/gnome-base/gnome-desktop/gnome-desktop-42.0-r400.ebuild b/gnome-base/gnome-desktop/gnome-desktop-42.0-r400.ebuild new file mode 100644 index 000000000000..3b63a89f7c9a --- /dev/null +++ b/gnome-base/gnome-desktop/gnome-desktop-42.0-r400.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit gnome.org meson xdg + +DESCRIPTION="Library with common API for various GNOME modules" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/" + +LICENSE="GPL-2+ LGPL-2+ FDL-1.1+" +SLOT="4/1" # subslot = libgnome-desktop-4 soname version +IUSE="debug gtk-doc +introspection seccomp systemd udev" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris" + +COMMON_DEPEND=" + >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] + >=gui-libs/gtk-4.4.0:4[X,introspection?] + >=dev-libs/glib-2.53.0:2 + >=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?] + x11-misc/xkeyboard-config + x11-libs/libxkbcommon + app-text/iso-codes + systemd? ( sys-apps/systemd:= ) + udev? ( virtual/libudev:= ) + seccomp? ( sys-libs/libseccomp ) + + x11-libs/cairo:= + introspection? ( >=dev-libs/gobject-introspection-1.54:= ) +" +DEPEND="${COMMON_DEPEND} + media-libs/fontconfig +" +RDEPEND="${COMMON_DEPEND} + seccomp? ( sys-apps/bubblewrap ) + !