From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B787415808B for ; Fri, 25 Mar 2022 20:54:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7A9F0E0858; Fri, 25 Mar 2022 20:54:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F2167E0858 for ; Fri, 25 Mar 2022 20:54:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A16A5342EC9 for ; Fri, 25 Mar 2022 20:54:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1BEAE315 for ; Fri, 25 Mar 2022 20:54:05 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1648241630.96aa7e415811f1b5d6426ae68150d91f0fc3e034.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-desktop/, gnome-base/gnome-desktop/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-base/gnome-desktop/Manifest gnome-base/gnome-desktop/files/42.0-meson-Add-optionality-for-introspection.patch gnome-base/gnome-desktop/files/42.0-meson-Fix-build_gtk4-option.patch gnome-base/gnome-desktop/gnome-desktop-42.0-r300.ebuild gnome-base/gnome-desktop/gnome-desktop-42.0-r400.ebuild X-VCS-Directories: gnome-base/gnome-desktop/ gnome-base/gnome-desktop/files/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 96aa7e415811f1b5d6426ae68150d91f0fc3e034 X-VCS-Branch: master Date: Fri, 25 Mar 2022 20:54:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 65fe7471-0ab8-464f-a5ea-748ecf73a674 X-Archives-Hash: 06a8531bf6d8e8ddae20e7f7c17be65e commit: 96aa7e415811f1b5d6426ae68150d91f0fc3e034 Author: Matt Turner gentoo org> AuthorDate: Fri Mar 25 19:37:45 2022 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri Mar 25 20:53:50 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96aa7e41 gnome-base/gnome-desktop: Version bump to 42.0 gnome-desktop has grown a new SLOT. As a result, we now provide a -r300 version for slot 3, and -r400 for slot 4. Signed-off-by: Matt Turner gentoo.org> gnome-base/gnome-desktop/Manifest | 1 + ...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 | 75 ++++++++++ 5 files changed, 420 insertions(+) diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest index b8f807d902c4..aed70403c3ab 100644 --- a/gnome-base/gnome-desktop/Manifest +++ b/gnome-base/gnome-desktop/Manifest @@ -1 +1,2 @@ DIST gnome-desktop-41.3.tar.xz 732804 BLAKE2B 40a88ba4454455f85a46676d4b2f37159617f7eae9d0f5e1a27c3f0ed1e44953ae9475e81558b7cce1b6fd8cd8804cd3f452d060d843d4f58a7af8748b4c35fa SHA512 b02d9fe3bfad56993f9ed7225b38b4b0b685c7ad1480a9d9db5f9a6a8e13c16918d87e6a51160ee3101ab8ce24f4c0632ae351e7bb11cc473523e216ee9cf6bf +DIST gnome-desktop-42.0.tar.xz 743484 BLAKE2B 7c7d5e74fe01e082c8ec1994bb7666f191e0eed4212c8ef6257ebb4c3e3a5fb95c8a0c47f1c8f0864a36faa239251569e67eafa734cba4a181b6774233352357 SHA512 b9d37765d3cc43bb709e1e9b97deb6ef16d2a8e6ef7cc3c577ba465d4856bbfe8774fb7fc6eaae4d88064081aeeea0c0c77fe2b4ef79b4d9af1232c918526b44 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..591678a929d3 --- /dev/null +++ b/gnome-base/gnome-desktop/gnome-desktop-42.0-r400.ebuild @@ -0,0 +1,75 @@ +# 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 ) +" +BDEPEND=" + app-text/docbook-xml-dtd:4.1.2 + dev-util/gdbus-codegen + gtk-doc? ( >=dev-util/gtk-doc-1.14 ) + 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=true + $(meson_use debug debug_tools) + $(meson_use introspection) + $(meson_feature udev) + $(meson_feature systemd) + $(meson_use gtk-doc gtk_doc) + -Dinstalled_tests=false + -Dbuild_gtk4=true + -Dlegacy_library=false + ) + meson_src_configure +}