diff options
Diffstat (limited to 'dev-libs/glib')
| -rw-r--r-- | dev-libs/glib/Manifest | 8 | ||||
| -rw-r--r-- | dev-libs/glib/files/glib-2.68.3-glibc-2.34-close_range.patch | 32 | ||||
| -rw-r--r-- | dev-libs/glib/files/glib-2.78.4-distutils.patch | 36 | ||||
| -rw-r--r-- | dev-libs/glib/files/glib-2.78.4-libpcre2-10.43.patch | 45 | ||||
| -rw-r--r-- | dev-libs/glib/glib-2.76.4.ebuild (renamed from dev-libs/glib/glib-2.70.0.ebuild) | 74 | ||||
| -rw-r--r-- | dev-libs/glib/glib-2.78.3.ebuild (renamed from dev-libs/glib/glib-2.68.3-r1.ebuild) | 76 | ||||
| -rw-r--r-- | dev-libs/glib/glib-2.78.4-r1.ebuild (renamed from dev-libs/glib/glib-2.68.2-r1.ebuild) | 86 | ||||
| -rw-r--r-- | dev-libs/glib/glib-2.78.6.ebuild (renamed from dev-libs/glib/glib-2.68.4.ebuild) | 83 | ||||
| -rw-r--r-- | dev-libs/glib/metadata.xml | 71 |
9 files changed, 347 insertions, 164 deletions
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index f1ab05cc8156..c46b7e68014f 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -1,4 +1,4 @@ -DIST glib-2.68.2.tar.xz 4944192 BLAKE2B d35489dcfe9d57d8bd6ecf4f893b7c8e93a5b8108765791071fc811598d1f41287e03d95f20591d50d51a78db34f11833cc7970b1bf29299385357a14977ba0b SHA512 74d481552629cab67d22f8a440a7263a4e4b83adb6f3b772d368e255c17321b206aafd3af4653e5efbb2c3c14ca67d35f453728cbc5cd68728275d0b56789019 -DIST glib-2.68.3.tar.xz 4945236 BLAKE2B 6086b7490f418cb98119ab25670766e3a84de81fd180dbc6e8f929d8f8ab748b0ae7ad6a85f5419ab3c00589c3afba95972d8b4541b310acdf6b6dc9b460a07d SHA512 fb120105c4cb582491a53a0e4c61fe4bdd1f94b279bb7c362afd591369ede50a196c706375564ededf3550d4062a285b038e20b605e6d5dfe36f5d208f4bad3f -DIST glib-2.68.4.tar.xz 4945212 BLAKE2B 2135e2bea778714494b9f3ef140f20639f95dd347c9025e5663ca8f493092cd2723aba6520bb4f85687491794353685eccacc4dd34339962e5cb717e6130c025 SHA512 be17d79b41d17fd2b144184d6e793180667b7d9ba299215ea6d4948b4c05f6d888b4868c48643e25935a34ee2f85ee1d03e53325151b7a61819437cbd3c84b10 -DIST glib-2.70.0.tar.xz 4796812 BLAKE2B de393961c8c2b98fadc1cc0a3647de4fb9d54193e000005c847468e48baa30abcc518d94e1aaa69e09414ee0218c5502f872e08818bcc404aa0c61f94fe2c156 SHA512 fd3fcaebd34aebe0e63f9dc915b2df026a3f88a5c2254e9f17beea0a59ab0ac563976fca54eb57bd2f7af183c4ae76fb86f05951216bf4159d258b5e7b29696f +DIST glib-2.76.4.tar.xz 5274356 BLAKE2B c9ceb514ea81e1e6ab2d0efc82c48c0d8ae6c997fd0e3c56d47a5174b027f785b58266fff73b1d1132e272305126fbff22e3c65d47de46224cd12fa49796d5bc SHA512 f76932dc5090a44880373228e2b162f338415d06f7c90f2950eab1a43bb191c56a1797da4d377594f6a999197fef4defb848039259cfa4105bb68288a928f5b7 +DIST glib-2.78.3.tar.xz 5321388 BLAKE2B 6ef754b15e1ce4377eafdfc317025ac65c3d8010a8816a0cef786cec9da2af9f7d7d1da735c971ab8c848b2dcec050330e5b0fdceb156a36d739848e6160cd19 SHA512 9c1af75fb973d23ce0286d5b7836eea45f9628c148ced5ac10e10abceda05024ae4c57f01439824d3287d986527500b7b959828b630b6e4a3314b5224f4d7246 +DIST glib-2.78.4.tar.xz 5331892 BLAKE2B ada7134597d7d863e581a2bb1097ac07a63b27b53309aadab5b1d3686327ee718ad8c5c07af3fce5cc12328e728fc2c4df5fd9e69f431fa00dc634062ef7f926 SHA512 6f3a06e10e7373a2dbf0688512de4126472fb73cbec488b7983b5ffecff09c64d7e1ca462f892e8f215d3d277d103ca802bad7ef0bd0f91edf26fc6ce67187b6 +DIST glib-2.78.6.tar.xz 5344808 BLAKE2B d16173794c4aa019459cf8c8c84d4107fb8393828f41ec6c631b9452890f34f9022ed848a543ed134fdb8a575faef6b941cea3e05de512eb1b7a99f7601a2485 SHA512 8d75f8fd77b6309215ca86a0c7648878efe11051f18b279840c137669017ea4066388f8682367e4ea3f154333d833c9dc28ccd4a66a91f0c3854a40a2838f8da diff --git a/dev-libs/glib/files/glib-2.68.3-glibc-2.34-close_range.patch b/dev-libs/glib/files/glib-2.68.3-glibc-2.34-close_range.patch deleted file mode 100644 index a84ccaaccbb9..000000000000 --- a/dev-libs/glib/files/glib-2.68.3-glibc-2.34-close_range.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://bugs.gentoo.org/803632 -https://gitlab.gnome.org/GNOME/glib/-/commit/63e7864d1a0ddbead3c18872e95116e3843e81be.patch - -From 6e59d21b273f026e82adc56fecbec67d1ffa72a4 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 8 Jul 2021 17:26:43 -0700 -Subject: [PATCH] correctly use 3 parameters for close_range - -libc implementation has 3 parameter e.g. -https://www.freebsd.org/cgi/man.cgi?query=close_range&sektion=2&format=html - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - glib/gspawn.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/glib/gspawn.c b/glib/gspawn.c -index 95f5b868e..a15fb1ca1 100644 ---- a/glib/gspawn.c -+++ b/glib/gspawn.c -@@ -1494,7 +1494,7 @@ safe_closefrom (int lowfd) - * - * Handle ENOSYS in case it’s supported in libc but not the kernel; if so, - * fall back to safe_fdwalk(). */ -- if (close_range (lowfd, G_MAXUINT) != 0 && errno == ENOSYS) -+ if (close_range (lowfd, G_MAXUINT, 0) != 0 && errno == ENOSYS) - #endif /* HAVE_CLOSE_RANGE */ - (void) safe_fdwalk (close_func, GINT_TO_POINTER (lowfd)); - #endif --- -GitLab - diff --git a/dev-libs/glib/files/glib-2.78.4-distutils.patch b/dev-libs/glib/files/glib-2.78.4-distutils.patch new file mode 100644 index 000000000000..70ceebcf7095 --- /dev/null +++ b/dev-libs/glib/files/glib-2.78.4-distutils.patch @@ -0,0 +1,36 @@ +https://bugs.gentoo.org/922654 +https://gitlab.gnome.org/GNOME/glib/-/issues/3134 +https://gitlab.gnome.org/GNOME/glib/-/commit/6ef967a0f930ce37a8c9b5aff969693b34714291 + +[sam: Trimmed the CI changes.] + +From 6ef967a0f930ce37a8c9b5aff969693b34714291 Mon Sep 17 00:00:00 2001 +From: Jordan Williams <jordan@jwillikers.com> +Date: Fri, 1 Dec 2023 09:53:50 -0600 +Subject: [PATCH] Switch from the deprecated distutils module to the packaging + module + +The distutils module was removed in Python 3.12. +--- + +--- a/gio/gdbus-2.0/codegen/utils.py ++++ b/gio/gdbus-2.0/codegen/utils.py +@@ -19,7 +19,7 @@ + # + # Author: David Zeuthen <davidz@redhat.com> + +-import distutils.version ++import packaging.version + import os + import sys + +@@ -166,4 +166,4 @@ def version_cmp_key(key): + v = str(key[0]) + else: + v = "0" +- return (distutils.version.LooseVersion(v), key[1]) ++ return (packaging.version.Version(v), key[1]) +-- +GitLab + + diff --git a/dev-libs/glib/files/glib-2.78.4-libpcre2-10.43.patch b/dev-libs/glib/files/glib-2.78.4-libpcre2-10.43.patch new file mode 100644 index 000000000000..27dce8f40607 --- /dev/null +++ b/dev-libs/glib/files/glib-2.78.4-libpcre2-10.43.patch @@ -0,0 +1,45 @@ +https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3945 + +From cce3ae98a2c1966719daabff5a4ec6cf94a846f6 Mon Sep 17 00:00:00 2001 +From: Philip Withnall <pwithnall@gnome.org> +Date: Mon, 26 Feb 2024 16:55:44 +0000 +Subject: [PATCH] tests: Remove variable-length lookbehind tests for GRegex +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +PCRE2 10.43 has now introduced support for variable-length lookbehind, +so these tests now fail if GLib is built against PCRE2 10.43 or higher. + +See +https://github.com/PCRE2Project/pcre2/blob/e8db6fa7137f4c6f66cb87e0a3c9467252ec1ef7/ChangeLog#L94. + +Rather than making the tests conditional on the version of PCRE2 in use, +just remove them. They are mostly testing the PCRE2 code rather than +any code in GLib, so don’t have much value. + +This should fix CI runs on msys2-mingw32, which updated to PCRE2 10.43 2 +days ago. + +Signed-off-by: Philip Withnall <pwithnall@gnome.org> +--- a/glib/tests/regex.c ++++ b/glib/tests/regex.c +@@ -1885,16 +1885,6 @@ test_lookbehind (void) + g_match_info_free (match); + g_regex_unref (regex); + +- regex = g_regex_new ("(?<!dogs?|cats?) x", G_REGEX_OPTIMIZE, G_REGEX_MATCH_DEFAULT, &error); +- g_assert (regex == NULL); +- g_assert_error (error, G_REGEX_ERROR, G_REGEX_ERROR_VARIABLE_LENGTH_LOOKBEHIND); +- g_clear_error (&error); +- +- regex = g_regex_new ("(?<=ab(c|de)) foo", G_REGEX_OPTIMIZE, G_REGEX_MATCH_DEFAULT, &error); +- g_assert (regex == NULL); +- g_assert_error (error, G_REGEX_ERROR, G_REGEX_ERROR_VARIABLE_LENGTH_LOOKBEHIND); +- g_clear_error (&error); +- + regex = g_regex_new ("(?<=abc|abde)foo", G_REGEX_OPTIMIZE, G_REGEX_MATCH_DEFAULT, &error); + g_assert (regex); + g_assert_no_error (error); +-- +GitLab diff --git a/dev-libs/glib/glib-2.70.0.ebuild b/dev-libs/glib/glib-2.76.4.ebuild index 6dbfc0036677..356bd10b8796 100644 --- a/dev-libs/glib/glib-2.70.0.ebuild +++ b/dev-libs/glib/glib-2.76.4.ebuild @@ -1,21 +1,22 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{7..10} ) +EAPI=8 +PYTHON_REQ_USE="xml(+)" +PYTHON_COMPAT=( python3_{10..11} ) -inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg +inherit gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg DESCRIPTION="The GLib library of C routines" HOMEPAGE="https://www.gtk.org/" LICENSE="LGPL-2.1+" SLOT="2" -IUSE="dbus debug +elf elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs sysprof systemtap test utils xattr" +IUSE="dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr" RESTRICT="!test? ( test )" REQUIRED_USE="gtk-doc? ( test )" # Bug #777636 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" # * elfutils (via libelf) does not build on Windows. gresources are not embedded # within ELF binaries on that platform anyway and inspecting ELF binaries from @@ -29,7 +30,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~ RDEPEND=" !<dev-util/gdbus-codegen-${PV} >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] - >=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?] + >=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},unicode(+),static-libs?] >=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] @@ -37,7 +38,6 @@ RDEPEND=" selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) ) elf? ( virtual/libelf:0= ) - fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] ) " DEPEND="${RDEPEND}" @@ -49,7 +49,7 @@ BDEPEND=" gtk-doc? ( >=dev-util/gtk-doc-1.33 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 ) - systemtap? ( >=dev-util/systemtap-1.3 ) + systemtap? ( >=dev-debug/systemtap-1.3 ) ${PYTHON_DEPS} test? ( >=sys-apps/dbus-1.2.14 ) virtual/pkgconfig @@ -99,7 +99,8 @@ src_prepare() { #if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then # ewarn "Some tests will be skipped due to missing terminal program" # These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson - # Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails + # Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready + # for backport (or in a bump) and file new issue if still fails sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die # desktop-app-info/launch* might fail similarly sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die @@ -135,22 +136,42 @@ src_prepare() { chmod a+x "${T}/glib-test-ld-wrapper" || die sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die - xdg_src_prepare + # make default sane for us + if use prefix ; then + sed -i -e "s:/usr/local:${EPREFIX}/usr:" gio/xdgmime/xdgmime.c || die + # bug #308609, without path, bug #314057 + export PERL=perl + fi + + if [[ ${CHOST} == *-solaris* ]] ; then + # fix standards conflicts + sed -i \ + -e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/_POSIX_PTHREAD_SEMANTICS/' \ + -e '/\<_XOPEN_SOURCE\>/s/\<2\>/600/' \ + meson.build || die + sed -i -e '/#define\s\+_POSIX_SOURCE/d' \ + glib/giounix.c || die + fi + + # disable native macOS integrations + sed -i -e '/glib_conf.set(.HAVE_\(CARBON\|COCOA\).,/s/true/false/' \ + meson.build || die + sed -i \ + -e '/AvailabilityMacros.h/d' \ + gio/giomodule.c || die + + default gnome2_environment_reset # TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only } multilib_src_configure() { - if use debug; then - append-cflags -DG_ENABLE_DEBUG - else - append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833 - fi - - # TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property) + # TODO: figure a way to pass appropriate values for all cross properties + # that glib uses (search for get_cross_property) #if tc-is-cross-compiler ; then # https://bugzilla.gnome.org/show_bug.cgi?id=756473 - # TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property + # TODO-meson: This should be in meson cross file as 'growing_stack' + # property; and more, look at get_cross_property #case ${CHOST} in #hppa*|metag*) export glib_cv_stack_grows=yes ;; #*) export glib_cv_stack_grows=no ;; @@ -158,7 +179,9 @@ multilib_src_configure() { #fi local emesonargs=( + -Dbuildtype=$(usex debug debug plain) -Ddefault_library=$(usex static-libs both shared) + -Druntime_dir="${EPREFIX}"/run $(meson_feature selinux) $(meson_use xattr) -Dlibmount=enabled # only used if host_system == 'linux' @@ -167,12 +190,12 @@ multilib_src_configure() { $(meson_use systemtap) $(meson_feature sysprof) $(meson_native_use_bool gtk-doc gtk_doc) - $(meson_use fam) $(meson_use test tests) -Dinstalled_tests=false -Dnls=enabled -Doss_fuzz=disabled $(meson_native_use_feature elf libelf) + -Dmultiarch=false ) meson_src_configure } @@ -182,14 +205,19 @@ multilib_src_test() { export XDG_DATA_DIRS=/usr/local/share:/usr/share export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" export LC_TIME=C # bug #411967 + export TZ=UTC unset GSETTINGS_BACKEND # bug #596380 python_setup + # https://bugs.gentoo.org/839807 + local -x SANDBOX_PREDICT=${SANDBOX_PREDICT} + addpredict /usr/b + # Related test is a bit nitpicking mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" - meson_src_test --timeout-multiplier 2 --no-suite flaky + meson_src_test --timeout-multiplier 20 --no-suite flaky } multilib_src_install() { @@ -199,7 +227,9 @@ multilib_src_install() { multilib_src_install_all() { # These are installed by dev-util/glib-utils - # TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson + # TODO: With patching we might be able to get rid of the python-any deps + # and removals, and test depend on glib-utils instead; revisit now with + # meson rm "${ED}/usr/bin/glib-genmarshal" || die rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die rm "${ED}/usr/bin/glib-mkenums" || die diff --git a/dev-libs/glib/glib-2.68.3-r1.ebuild b/dev-libs/glib/glib-2.78.3.ebuild index 1ac19210fd64..356bd10b8796 100644 --- a/dev-libs/glib/glib-2.68.3-r1.ebuild +++ b/dev-libs/glib/glib-2.78.3.ebuild @@ -1,21 +1,22 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +EAPI=8 +PYTHON_REQ_USE="xml(+)" +PYTHON_COMPAT=( python3_{10..11} ) -inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg +inherit gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg DESCRIPTION="The GLib library of C routines" HOMEPAGE="https://www.gtk.org/" LICENSE="LGPL-2.1+" SLOT="2" -IUSE="dbus debug +elf elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs sysprof systemtap test utils xattr" +IUSE="dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr" RESTRICT="!test? ( test )" REQUIRED_USE="gtk-doc? ( test )" # Bug #777636 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" # * elfutils (via libelf) does not build on Windows. gresources are not embedded # within ELF binaries on that platform anyway and inspecting ELF binaries from @@ -29,7 +30,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 s RDEPEND=" !<dev-util/gdbus-codegen-${PV} >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] - >=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?] + >=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},unicode(+),static-libs?] >=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] @@ -37,7 +38,6 @@ RDEPEND=" selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) ) elf? ( virtual/libelf:0= ) - fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] ) " DEPEND="${RDEPEND}" @@ -49,7 +49,7 @@ BDEPEND=" gtk-doc? ( >=dev-util/gtk-doc-1.33 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 ) - systemtap? ( >=dev-util/systemtap-1.3 ) + systemtap? ( >=dev-debug/systemtap-1.3 ) ${PYTHON_DEPS} test? ( >=sys-apps/dbus-1.2.14 ) virtual/pkgconfig @@ -69,7 +69,6 @@ MULTILIB_CHOST_TOOLS=( PATCHES=( "${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch - "${FILESDIR}"/${PN}-2.68.3-glibc-2.34-close_range.patch ) pkg_setup() { @@ -100,7 +99,8 @@ src_prepare() { #if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then # ewarn "Some tests will be skipped due to missing terminal program" # These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson - # Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails + # Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready + # for backport (or in a bump) and file new issue if still fails sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die # desktop-app-info/launch* might fail similarly sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die @@ -136,22 +136,42 @@ src_prepare() { chmod a+x "${T}/glib-test-ld-wrapper" || die sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die - xdg_src_prepare + # make default sane for us + if use prefix ; then + sed -i -e "s:/usr/local:${EPREFIX}/usr:" gio/xdgmime/xdgmime.c || die + # bug #308609, without path, bug #314057 + export PERL=perl + fi + + if [[ ${CHOST} == *-solaris* ]] ; then + # fix standards conflicts + sed -i \ + -e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/_POSIX_PTHREAD_SEMANTICS/' \ + -e '/\<_XOPEN_SOURCE\>/s/\<2\>/600/' \ + meson.build || die + sed -i -e '/#define\s\+_POSIX_SOURCE/d' \ + glib/giounix.c || die + fi + + # disable native macOS integrations + sed -i -e '/glib_conf.set(.HAVE_\(CARBON\|COCOA\).,/s/true/false/' \ + meson.build || die + sed -i \ + -e '/AvailabilityMacros.h/d' \ + gio/giomodule.c || die + + default gnome2_environment_reset # TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only } multilib_src_configure() { - if use debug; then - append-cflags -DG_ENABLE_DEBUG - else - append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833 - fi - - # TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property) + # TODO: figure a way to pass appropriate values for all cross properties + # that glib uses (search for get_cross_property) #if tc-is-cross-compiler ; then # https://bugzilla.gnome.org/show_bug.cgi?id=756473 - # TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property + # TODO-meson: This should be in meson cross file as 'growing_stack' + # property; and more, look at get_cross_property #case ${CHOST} in #hppa*|metag*) export glib_cv_stack_grows=yes ;; #*) export glib_cv_stack_grows=no ;; @@ -159,22 +179,23 @@ multilib_src_configure() { #fi local emesonargs=( + -Dbuildtype=$(usex debug debug plain) -Ddefault_library=$(usex static-libs both shared) + -Druntime_dir="${EPREFIX}"/run $(meson_feature selinux) $(meson_use xattr) -Dlibmount=enabled # only used if host_system == 'linux' - -Dinternal_pcre=false -Dman=true $(meson_use systemtap dtrace) $(meson_use systemtap) $(meson_feature sysprof) $(meson_native_use_bool gtk-doc gtk_doc) - $(meson_use fam) $(meson_use test tests) -Dinstalled_tests=false -Dnls=enabled -Doss_fuzz=disabled $(meson_native_use_feature elf libelf) + -Dmultiarch=false ) meson_src_configure } @@ -184,14 +205,19 @@ multilib_src_test() { export XDG_DATA_DIRS=/usr/local/share:/usr/share export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" export LC_TIME=C # bug #411967 + export TZ=UTC unset GSETTINGS_BACKEND # bug #596380 python_setup + # https://bugs.gentoo.org/839807 + local -x SANDBOX_PREDICT=${SANDBOX_PREDICT} + addpredict /usr/b + # Related test is a bit nitpicking mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" - meson_src_test --timeout-multiplier 2 --no-suite flaky + meson_src_test --timeout-multiplier 20 --no-suite flaky } multilib_src_install() { @@ -201,7 +227,9 @@ multilib_src_install() { multilib_src_install_all() { # These are installed by dev-util/glib-utils - # TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson + # TODO: With patching we might be able to get rid of the python-any deps + # and removals, and test depend on glib-utils instead; revisit now with + # meson rm "${ED}/usr/bin/glib-genmarshal" || die rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die rm "${ED}/usr/bin/glib-mkenums" || die diff --git a/dev-libs/glib/glib-2.68.2-r1.ebuild b/dev-libs/glib/glib-2.78.4-r1.ebuild index aa1479e53d82..f3dbbeb1f18b 100644 --- a/dev-libs/glib/glib-2.68.2-r1.ebuild +++ b/dev-libs/glib/glib-2.78.4-r1.ebuild @@ -1,21 +1,22 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +EAPI=8 +PYTHON_REQ_USE="xml(+)" +PYTHON_COMPAT=( python3_{10..12} ) -inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg +inherit gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg DESCRIPTION="The GLib library of C routines" HOMEPAGE="https://www.gtk.org/" LICENSE="LGPL-2.1+" SLOT="2" -IUSE="dbus debug +elf elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs sysprof systemtap test utils xattr" +IUSE="dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr" RESTRICT="!test? ( test )" REQUIRED_USE="gtk-doc? ( test )" # Bug #777636 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" # * elfutils (via libelf) does not build on Windows. gresources are not embedded # within ELF binaries on that platform anyway and inspecting ELF binaries from @@ -29,15 +30,14 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 s RDEPEND=" !<dev-util/gdbus-codegen-${PV} >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] - >=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?] + >=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},unicode(+),static-libs?] >=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) ) - !kernel_Winnt? ( virtual/libelf:0= ) - fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) + elf? ( virtual/libelf:0= ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] ) " DEPEND="${RDEPEND}" @@ -49,8 +49,11 @@ BDEPEND=" gtk-doc? ( >=dev-util/gtk-doc-1.33 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 ) - systemtap? ( >=dev-util/systemtap-1.3 ) + systemtap? ( >=dev-debug/systemtap-1.3 ) ${PYTHON_DEPS} + $(python_gen_any_dep ' + dev-python/packaging[${PYTHON_USEDEP}] + ') test? ( >=sys-apps/dbus-1.2.14 ) virtual/pkgconfig " @@ -69,8 +72,14 @@ MULTILIB_CHOST_TOOLS=( PATCHES=( "${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch + "${FILESDIR}"/${PN}-2.78.4-distutils.patch + "${FILESDIR}"/${PN}-2.78.4-libpcre2-10.43.patch ) +python_check_deps() { + python_has_version "dev-python/packaging[${PYTHON_USEDEP}]" +} + pkg_setup() { if use kernel_linux ; then CONFIG_CHECK="~INOTIFY_USER" @@ -99,7 +108,8 @@ src_prepare() { #if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then # ewarn "Some tests will be skipped due to missing terminal program" # These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson - # Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails + # Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready + # for backport (or in a bump) and file new issue if still fails sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die # desktop-app-info/launch* might fail similarly sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die @@ -135,22 +145,42 @@ src_prepare() { chmod a+x "${T}/glib-test-ld-wrapper" || die sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die - xdg_src_prepare + # make default sane for us + if use prefix ; then + sed -i -e "s:/usr/local:${EPREFIX}/usr:" gio/xdgmime/xdgmime.c || die + # bug #308609, without path, bug #314057 + export PERL=perl + fi + + if [[ ${CHOST} == *-solaris* ]] ; then + # fix standards conflicts + sed -i \ + -e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/_POSIX_PTHREAD_SEMANTICS/' \ + -e '/\<_XOPEN_SOURCE\>/s/\<2\>/600/' \ + meson.build || die + sed -i -e '/#define\s\+_POSIX_SOURCE/d' \ + glib/giounix.c || die + fi + + # disable native macOS integrations + sed -i -e '/glib_conf.set(.HAVE_\(CARBON\|COCOA\).,/s/true/false/' \ + meson.build || die + sed -i \ + -e '/AvailabilityMacros.h/d' \ + gio/giomodule.c || die + + default gnome2_environment_reset # TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only } multilib_src_configure() { - if use debug; then - append-cflags -DG_ENABLE_DEBUG - else - append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833 - fi - - # TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property) + # TODO: figure a way to pass appropriate values for all cross properties + # that glib uses (search for get_cross_property) #if tc-is-cross-compiler ; then # https://bugzilla.gnome.org/show_bug.cgi?id=756473 - # TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property + # TODO-meson: This should be in meson cross file as 'growing_stack' + # property; and more, look at get_cross_property #case ${CHOST} in #hppa*|metag*) export glib_cv_stack_grows=yes ;; #*) export glib_cv_stack_grows=no ;; @@ -158,22 +188,23 @@ multilib_src_configure() { #fi local emesonargs=( + $(meson_feature debug glib_debug) -Ddefault_library=$(usex static-libs both shared) + -Druntime_dir="${EPREFIX}"/run $(meson_feature selinux) $(meson_use xattr) -Dlibmount=enabled # only used if host_system == 'linux' - -Dinternal_pcre=false -Dman=true $(meson_use systemtap dtrace) $(meson_use systemtap) $(meson_feature sysprof) $(meson_native_use_bool gtk-doc gtk_doc) - $(meson_use fam) $(meson_use test tests) -Dinstalled_tests=false -Dnls=enabled -Doss_fuzz=disabled $(meson_native_use_feature elf libelf) + -Dmultiarch=false ) meson_src_configure } @@ -183,14 +214,19 @@ multilib_src_test() { export XDG_DATA_DIRS=/usr/local/share:/usr/share export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" export LC_TIME=C # bug #411967 + export TZ=UTC unset GSETTINGS_BACKEND # bug #596380 python_setup + # https://bugs.gentoo.org/839807 + local -x SANDBOX_PREDICT=${SANDBOX_PREDICT} + addpredict /usr/b + # Related test is a bit nitpicking mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" - meson_src_test --timeout-multiplier 2 --no-suite flaky + meson_src_test --timeout-multiplier 20 --no-suite flaky } multilib_src_install() { @@ -200,7 +236,9 @@ multilib_src_install() { multilib_src_install_all() { # These are installed by dev-util/glib-utils - # TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson + # TODO: With patching we might be able to get rid of the python-any deps + # and removals, and test depend on glib-utils instead; revisit now with + # meson rm "${ED}/usr/bin/glib-genmarshal" || die rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die rm "${ED}/usr/bin/glib-mkenums" || die diff --git a/dev-libs/glib/glib-2.68.4.ebuild b/dev-libs/glib/glib-2.78.6.ebuild index f89faf66ed92..339ee604f85f 100644 --- a/dev-libs/glib/glib-2.68.4.ebuild +++ b/dev-libs/glib/glib-2.78.6.ebuild @@ -1,21 +1,22 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{7..10} ) +EAPI=8 +PYTHON_REQ_USE="xml(+)" +PYTHON_COMPAT=( python3_{10..12} ) -inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg +inherit gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg DESCRIPTION="The GLib library of C routines" HOMEPAGE="https://www.gtk.org/" LICENSE="LGPL-2.1+" SLOT="2" -IUSE="dbus debug +elf elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs sysprof systemtap test utils xattr" +IUSE="dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr" RESTRICT="!test? ( test )" REQUIRED_USE="gtk-doc? ( test )" # Bug #777636 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" # * elfutils (via libelf) does not build on Windows. gresources are not embedded # within ELF binaries on that platform anyway and inspecting ELF binaries from @@ -29,7 +30,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 s RDEPEND=" !<dev-util/gdbus-codegen-${PV} >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] - >=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?] + >=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},unicode(+),static-libs?] >=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] @@ -37,7 +38,6 @@ RDEPEND=" selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) ) elf? ( virtual/libelf:0= ) - fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] ) " DEPEND="${RDEPEND}" @@ -49,8 +49,11 @@ BDEPEND=" gtk-doc? ( >=dev-util/gtk-doc-1.33 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 ) - systemtap? ( >=dev-util/systemtap-1.3 ) + systemtap? ( >=dev-debug/systemtap-1.3 ) ${PYTHON_DEPS} + $(python_gen_any_dep ' + dev-python/packaging[${PYTHON_USEDEP}] + ') test? ( >=sys-apps/dbus-1.2.14 ) virtual/pkgconfig " @@ -69,8 +72,13 @@ MULTILIB_CHOST_TOOLS=( PATCHES=( "${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch + "${FILESDIR}"/${PN}-2.78.4-distutils.patch ) +python_check_deps() { + python_has_version "dev-python/packaging[${PYTHON_USEDEP}]" +} + pkg_setup() { if use kernel_linux ; then CONFIG_CHECK="~INOTIFY_USER" @@ -99,7 +107,8 @@ src_prepare() { #if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then # ewarn "Some tests will be skipped due to missing terminal program" # These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson - # Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails + # Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready + # for backport (or in a bump) and file new issue if still fails sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die # desktop-app-info/launch* might fail similarly sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die @@ -135,22 +144,42 @@ src_prepare() { chmod a+x "${T}/glib-test-ld-wrapper" || die sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die - xdg_src_prepare + # make default sane for us + if use prefix ; then + sed -i -e "s:/usr/local:${EPREFIX}/usr:" gio/xdgmime/xdgmime.c || die + # bug #308609, without path, bug #314057 + export PERL=perl + fi + + if [[ ${CHOST} == *-solaris* ]] ; then + # fix standards conflicts + sed -i \ + -e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/_POSIX_PTHREAD_SEMANTICS/' \ + -e '/\<_XOPEN_SOURCE\>/s/\<2\>/600/' \ + meson.build || die + sed -i -e '/#define\s\+_POSIX_SOURCE/d' \ + glib/giounix.c || die + fi + + # disable native macOS integrations + sed -i -e '/glib_conf.set(.HAVE_\(CARBON\|COCOA\).,/s/true/false/' \ + meson.build || die + sed -i \ + -e '/AvailabilityMacros.h/d' \ + gio/giomodule.c || die + + default gnome2_environment_reset # TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only } multilib_src_configure() { - if use debug; then - append-cflags -DG_ENABLE_DEBUG - else - append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833 - fi - - # TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property) + # TODO: figure a way to pass appropriate values for all cross properties + # that glib uses (search for get_cross_property) #if tc-is-cross-compiler ; then # https://bugzilla.gnome.org/show_bug.cgi?id=756473 - # TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property + # TODO-meson: This should be in meson cross file as 'growing_stack' + # property; and more, look at get_cross_property #case ${CHOST} in #hppa*|metag*) export glib_cv_stack_grows=yes ;; #*) export glib_cv_stack_grows=no ;; @@ -158,22 +187,23 @@ multilib_src_configure() { #fi local emesonargs=( + $(meson_feature debug glib_debug) -Ddefault_library=$(usex static-libs both shared) + -Druntime_dir="${EPREFIX}"/run $(meson_feature selinux) $(meson_use xattr) -Dlibmount=enabled # only used if host_system == 'linux' - -Dinternal_pcre=false -Dman=true $(meson_use systemtap dtrace) $(meson_use systemtap) $(meson_feature sysprof) $(meson_native_use_bool gtk-doc gtk_doc) - $(meson_use fam) $(meson_use test tests) -Dinstalled_tests=false -Dnls=enabled -Doss_fuzz=disabled $(meson_native_use_feature elf libelf) + -Dmultiarch=false ) meson_src_configure } @@ -183,14 +213,19 @@ multilib_src_test() { export XDG_DATA_DIRS=/usr/local/share:/usr/share export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" export LC_TIME=C # bug #411967 + export TZ=UTC unset GSETTINGS_BACKEND # bug #596380 python_setup + # https://bugs.gentoo.org/839807 + local -x SANDBOX_PREDICT=${SANDBOX_PREDICT} + addpredict /usr/b + # Related test is a bit nitpicking mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" - meson_src_test --timeout-multiplier 2 --no-suite flaky + meson_src_test --timeout-multiplier 20 --no-suite flaky } multilib_src_install() { @@ -200,7 +235,9 @@ multilib_src_install() { multilib_src_install_all() { # These are installed by dev-util/glib-utils - # TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson + # TODO: With patching we might be able to get rid of the python-any deps + # and removals, and test depend on glib-utils instead; revisit now with + # meson rm "${ED}/usr/bin/glib-genmarshal" || die rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die rm "${ED}/usr/bin/glib-mkenums" || die diff --git a/dev-libs/glib/metadata.xml b/dev-libs/glib/metadata.xml index 666314897afa..30120d5d64c7 100644 --- a/dev-libs/glib/metadata.xml +++ b/dev-libs/glib/metadata.xml @@ -1,39 +1,40 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <use> - <flag name="dbus"> - Enable dependencies required by glib libraries - using dbus service to manage settings saving - </flag> - <flag name="elf"> - Enable support for listing and extracting from - ELF resource files with gresource tool - </flag> - <flag name="mime"> - Pull in shared MIME database that many glib-based - applications require at runtime to detect or open files. Warning: - do not disable this flag unless installing on a headless server. - </flag> - <flag name="systemtap"> - Build support for profiling and tracing using - <pkg>dev-util/systemtap</pkg> - </flag> - <flag name="sysprof"> - Enable profiling data capture support using - <pkg>dev-util/sysprof-capture</pkg> - </flag> - <flag name="utils"> - Install gtester-report utility to generate test - report files for your software; build gresource utility with - ELF support. - </flag> - </use> - <upstream> - <remote-id type="cpe">cpe:/a:gnome:glib</remote-id> - </upstream> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <use> + <flag name="dbus"> + Enable dependencies required by glib libraries + using dbus service to manage settings saving + </flag> + <flag name="elf"> + Enable support for listing and extracting from + ELF resource files with gresource tool + </flag> + <flag name="mime"> + Pull in shared MIME database that many glib-based + applications require at runtime to detect or open files. Warning: + do not disable this flag unless installing on a headless server. + </flag> + <flag name="systemtap"> + Build support for profiling and tracing using + <pkg>dev-debug/systemtap</pkg> + </flag> + <flag name="sysprof"> + Enable profiling data capture support using + <pkg>dev-util/sysprof-capture</pkg> + </flag> + <flag name="utils"> + Install gtester-report utility to generate test + report files for your software; build gresource utility with + ELF support. + </flag> + </use> + <upstream> + <remote-id type="cpe">cpe:/a:gnome:glib</remote-id> + <remote-id type="gnome-gitlab">GNOME/glib</remote-id> + </upstream> </pkgmetadata> |