* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-desktop/, gnome-base/gnome-desktop/files/
@ 2020-06-13 15:24 Mart Raudsepp
0 siblings, 0 replies; 2+ messages in thread
From: Mart Raudsepp @ 2020-06-13 15:24 UTC (permalink / raw
To: gentoo-commits
commit: ec71f6dd0e992dc78ff5201adac15d571a8f7625
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 13 15:06:12 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Jun 13 15:24:19 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec71f6dd
gnome-base/gnome-desktop: remove old
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
gnome-base/gnome-desktop/Manifest | 3 -
.../files/3.32.2-fix-tests-without-locale.patch | 82 ----------------------
.../gnome-desktop/gnome-desktop-3.32.2.ebuild | 79 ---------------------
.../gnome-desktop/gnome-desktop-3.34.6.ebuild | 77 --------------------
4 files changed, 241 deletions(-)
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index a13488e4eff..659227cea5e 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,5 +1,2 @@
-DIST gnome-desktop-3.32.2-patchset.tar.xz 7404 BLAKE2B ecc821d3338957d0a123d625607d727019d9500915a76ff6d10d3000e1fc1e51fc7c0382374752582aef641d005cd73d39148466b08c53dc1ce9872e73a21215 SHA512 0471f0a6d9213ea60e867bd4f381575f6a94fa0fde57cc1a360e2d4ef98c11f2f973d3d95347db8f24aacb2249ba84ffc4e35e05bb595d9d3b6debe561ed88da
-DIST gnome-desktop-3.32.2.tar.xz 709128 BLAKE2B f0335d1ad583f0b000c47826cd4b6eb24624862b22b00e9d42759ed1cfcf3dba6f091dd85504c9c8da8b9789bf78cf53d284942ba6e2d3c630db028b4a0a69c6 SHA512 7dfa5c3e4b77637cc40e6244eb8ce8cb314cf92d865b64e36c5dffa8a699e91c81bd359f0a89a725c064eafec965d2b9d119aa05f1de103cd836a4bff9119a99
DIST gnome-desktop-3.34.5.tar.xz 718008 BLAKE2B a09daf4f575b26774beeef8e9edb4ed757ead7c0155aab4d7c132bf503d29096c40b06d52aa261594c6db367ac7a638c33de4445748ab3d94a095c23f8ddd705 SHA512 bc59b420d5698b15697404efcf452e830933efa23b6dba9011eade1c7521dbd4fb6f6e6e2be822d231611b2133e36f2ec42ed49ecabd175127366e0e7d59955c
-DIST gnome-desktop-3.34.6.tar.xz 718144 BLAKE2B 7379f45b7028ed16f4f707b82adfd1c95150791da9988ff52f3b49a9be68effefc04e32512fb4316368d695ae531afd8ad58168214e483fd0164b45a2de7f1d1 SHA512 a4e6c8ec1f5cea785bc58635dc72dae39a0a118db5433a02919c8fd3c4f7276d6f1093e8f52b1def5756c161effbedce20c6dcfe282a5a3d2458acc82af60aa5
DIST gnome-desktop-3.34.7.tar.xz 718220 BLAKE2B 89bfd00a356cd47d865aa4df1079b37b08c6a85f4380b5424181ce247248c7f11f0ca135858afb0c00fc4ff47175ff2acbb0b67cebe75e0b0a9f27263f0a9d69 SHA512 efc466d2a7a8a142e76a07c8cb75bad51aafbb2e70432e339713965890e6a83554a5f77ef6cdb6aa9e3ebace4883fb6d3d06004d7a2446d6960319cacbec7639
diff --git a/gnome-base/gnome-desktop/files/3.32.2-fix-tests-without-locale.patch b/gnome-base/gnome-desktop/files/3.32.2-fix-tests-without-locale.patch
deleted file mode 100644
index bd4df1ca1a9..00000000000
--- a/gnome-base/gnome-desktop/files/3.32.2-fix-tests-without-locale.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 9ae847ec875efe443d51d584fa6c61966c7c3c7c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
-Date: Wed, 4 Sep 2019 22:09:26 +0100
-Subject: [PATCH] tests/wall*: Do not fail if some of the locales is missing
-
----
- tests/wall-clock.c | 14 ++++++++++++++
- tests/wallclock-reftest.c | 5 +++++
- 2 files changed, 19 insertions(+)
-
-diff --git a/tests/wall-clock.c b/tests/wall-clock.c
-index 4937ee66..23929ebd 100644
---- a/tests/wall-clock.c
-+++ b/tests/wall-clock.c
-@@ -48,6 +48,7 @@ test_utf8_character (const char *utf8_char,
- /* In the C locale, make sure the time string is formatted with regular
- * colons */
- locale = newlocale (LC_ALL_MASK, "C", (locale_t) 0);
-+ g_assert_true (locale != (locale_t)0);
- save_locale = uselocale (locale);
- clock = gnome_wall_clock_new ();
- str = gnome_wall_clock_string_for_datetime (clock,
-@@ -60,6 +61,10 @@ test_utf8_character (const char *utf8_char,
-
- /* In a UTF8 locale, we want ratio characters and no colons. */
- locale = newlocale (LC_ALL_MASK, "en_US.utf8", locale);
-+ if (locale == (locale_t)0) {
-+ g_test_skip("en_US.utf8 locale not found, skipping");
-+ return;
-+ }
- uselocale (locale);
- clock = gnome_wall_clock_new ();
- str = gnome_wall_clock_string_for_datetime (clock,
-@@ -73,6 +78,10 @@ test_utf8_character (const char *utf8_char,
- /* ... and same thing with an RTL locale: should be formatted with
- * ratio characters */
- locale = newlocale (LC_ALL_MASK, "he_IL.utf8", locale);
-+ if (locale == (locale_t)0) {
-+ g_test_skip("he_IL.utf8 locale not found, skipping");
-+ return;
-+ }
- uselocale (locale);
- clock = gnome_wall_clock_new ();
- str = gnome_wall_clock_string_for_datetime (clock,
-@@ -112,6 +121,10 @@ test_clock_format_setting (void)
- const char *str;
-
- locale = newlocale (LC_ALL_MASK, "en_US.utf8", (locale_t) 0);
-+ if (locale == (locale_t)0) {
-+ g_test_skip("en_US.utf8 locale not found, skipping");
-+ return;
-+ }
- save_locale = uselocale (locale);
-
- settings = g_settings_new ("org.gnome.desktop.interface");
-@@ -192,6 +205,7 @@ test_weekday_setting (void)
-
- /* Save current locale */
- locale = newlocale (LC_ALL_MASK, "C", (locale_t) 0);
-+ g_assert_true (locale != (locale_t)0);
- save_locale = uselocale (locale);
- settings = g_settings_new ("org.gnome.desktop.interface");
-
-diff --git a/tests/wallclock-reftest.c b/tests/wallclock-reftest.c
-index 8ac630f2..0a7e812d 100644
---- a/tests/wallclock-reftest.c
-+++ b/tests/wallclock-reftest.c
-@@ -446,6 +446,11 @@ test_ui_file (GFile *file,
- locale = get_locale_for_file (ui_file);
- g_assert (locale);
- loc = newlocale (LC_ALL_MASK, locale, (locale_t) 0);
-+ if (loc == (locale_t)0)
-+ {
-+ g_test_skip("locale not found, skipping");
-+ return;
-+ }
- previous_locale = uselocale (loc);
- g_assert_true (previous_locale != (locale_t) 0);
-
---
-2.20.1
-
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.32.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.32.2.ebuild
deleted file mode 100644
index cee93712f2c..00000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-3.32.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson virtualx xdg
-
-DESCRIPTION="Library with common API for various GNOME modules"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
-SLOT="3/17" # subslot = libgnome-desktop-3 soname version
-IUSE="debug gtk-doc +introspection seccomp udev"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-# cairo[X] needed for gnome-bg
-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
- app-text/iso-codes
- x11-libs/libX11
- udev? (
- sys-apps/hwids
- virtual/libudev:= )
- seccomp? ( sys-libs/libseccomp )
-
- x11-libs/cairo:=[X]
- 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=(
- # Translation updates and nvidia builtin display detection fix from origin/gnome-3-32
- "${WORKDIR}"/patches/
- "${FILESDIR}"/${PV}-optional-introspection.patch # add introspection meson option
- "${FILESDIR}"/${PV}-fix-tests-without-locale.patch # fix tests when he_IL.utf8 or other tested locales not present
-)
-
-src_prepare() {
- # Don't build manual test programs that will never get run
- sed -i -e "/'test-.*'/d" libgnome-desktop/meson.build || die
- xdg_src_prepare
-}
-
-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_use gtk-doc gtk_doc)
- -Dinstalled_tests=false
- )
- meson_src_configure
-}
-
-src_test() {
- virtx meson_src_test
-}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.34.6.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.34.6.ebuild
deleted file mode 100644
index 5018ba92f32..00000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-3.34.6.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson virtualx 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/18" # subslot = libgnome-desktop-3 soname version
-IUSE="debug gtk-doc +introspection seccomp systemd udev"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-# cairo[X] needed for gnome-bg
-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
- app-text/iso-codes
- x11-libs/libX11
- systemd? ( sys-apps/systemd:= )
- udev? (
- sys-apps/hwids
- virtual/libudev:= )
- seccomp? ( sys-libs/libseccomp )
-
- x11-libs/cairo:=[X]
- 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}"/3.32.2-optional-introspection.patch # add introspection meson option
-)
-
-src_prepare() {
- # Don't build manual test programs that will never get run
- sed -i -e "/'test-.*'/d" libgnome-desktop/meson.build || die
- xdg_src_prepare
-}
-
-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
- )
- meson_src_configure
-}
-
-src_test() {
- virtx meson_src_test
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-desktop/, gnome-base/gnome-desktop/files/
@ 2022-03-25 20:54 Matt Turner
0 siblings, 0 replies; 2+ messages in thread
From: Matt Turner @ 2022-03-25 20:54 UTC (permalink / raw
To: gentoo-commits
commit: 96aa7e415811f1b5d6426ae68150d91f0fc3e034
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:37:45 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> 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 <mattst88 <AT> 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 <leio@gentoo.org>
+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 <mattst88@gmail.com>
+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
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-03-25 20:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-13 15:24 [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-desktop/, gnome-base/gnome-desktop/files/ Mart Raudsepp
-- strict thread matches above, loose matches on Subject: below --
2022-03-25 20:54 Matt Turner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox