summaryrefslogtreecommitdiff
path: root/dev-libs/glib
diff options
context:
space:
mode:
Diffstat (limited to 'dev-libs/glib')
-rw-r--r--dev-libs/glib/ChangeLog8
-rw-r--r--dev-libs/glib/Manifest9
-rw-r--r--dev-libs/glib/files/glib-2.32.4-bashcomp.patch27
-rw-r--r--dev-libs/glib/files/glib-2.34.3-testsuite-skip-gdbus-auth-tests.patch (renamed from dev-libs/glib/files/glib-2.34.0-testsuite-skip-gdbus-auth-tests.patch)12
-rw-r--r--dev-libs/glib/glib-2.34.3-r1.ebuild (renamed from dev-libs/glib/glib-2.34.3.ebuild)82
5 files changed, 58 insertions, 80 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 7e228148..fd471888 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -2,6 +2,14 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*glib-2.34.3-r1 (15 Aug 2013)
+
+ 15 Aug 2013; Bertrand Jacquin <beber@meleeweb.net>
+ +files/glib-2.34.3-testsuite-skip-gdbus-auth-tests.patch,
+ +glib-2.34.3-r1.ebuild, -files/glib-2.32.4-bashcomp.patch,
+ -files/glib-2.34.0-testsuite-skip-gdbus-auth-tests.patch, -glib-2.34.3.ebuild:
+ dev-libs/glib: Refresh with upstream
+
10 Jun 2013; Bertrand Jacquin <beber@meleeweb.net> metadata.xml:
Fix manifest
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 78636d3b..cc77c0ac 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,11 +1,10 @@
AUX glib-2.12.12-fbsd.patch 668 SHA256 23b0dc406d3d45fe125268b731af67147e83f6e38a63c7892828bdbfe1c31e8d WHIRLPOOL 1a90159aa6ac5f5f5dcb4f7225343af88d43540b802f2588279c60d5f27f51e5411ad29441ad10ad5adb947cf7d73016e93fb02d64203375f851758e680690ab
AUX glib-2.31.x-external-gdbus-codegen.patch 3504 SHA256 47a0f2f2a99a50042063952994c8538097dee14ea5b2ca39f1c168092c645c6e WHIRLPOOL c64cdb643d36df9b20f386aee75f285f3cf17366f2ec3a93370e365a54d72454085cbd3b043ca4fd919115575d46c07a5bf972dee4981aab736bc9da0ca41203
-AUX glib-2.32.4-bashcomp.patch 843 SHA256 262a3689dc030712eea1349ee96cbf21123b0329c78629e2e80cd9917ac415fb WHIRLPOOL 87d57428ef8626ab9f207e6a7df896748912c717fdc8aef3ebf1de73b72899fd5adfd97800ec4ce2fd38528f16267778a26492f79a85dd42f99734e1fa299ffb
-AUX glib-2.34.0-testsuite-skip-gdbus-auth-tests.patch 1784 SHA256 00ff3dd00872158eaf5a9e622d0877b8003c16880af07ceb9fed4d4bdfba69a1 WHIRLPOOL 211ad59497093b34c313f22884b0a29a7a9973167e6a56f4737962d590b30ae7fd2dd9b1d9843c6d247cba8ee0d866cb1981a30c363aa19c711d32145a15e345
AUX glib-2.34.0-testsuite-skip-thread4.patch 1312 SHA256 65ed09251a66b096df38431fde13335038e26c4fa973534af68948757801a3a5 WHIRLPOOL 8da1696ce6fd7fac83bef9563baf71e2b67b3e194ab3e631d238dc6e0a2d5493dc7a7f3af61bfa64a2023b0554ecaf3c523e7d9edea30e22f3615186e63f14cc
AUX glib-2.34.3-automake-1.13.patch 645 SHA256 a8f4bd4bfa03e2d4014af5e3ce899188bd935bfb4917444c2b09f1a493ebfacb WHIRLPOOL 585cd5ee5cb1a52f62a4db7056f7fe3d6c3886e77870637f25ef52386330e544cf8590a05a72d095cca9ed0bf1bae86e1fae99c886039736b4ba7b06dff15429
+AUX glib-2.34.3-testsuite-skip-gdbus-auth-tests.patch 1764 SHA256 361845ce7dc980642e018713834aa6b143d6c0cea4256bd16c2f79387c8a6bea WHIRLPOOL b8049eba35e60d2e1b5e0daed244a61892b31dfe9123f7de26ef07b116388147f8d6c0c32cdf496b284df3363bd13e4b9f1b61418a318e49fbb24812d5e0b7fd
DIST glib-2.34.3.tar.xz 6334872 SHA256 855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7 WHIRLPOOL 296f29666bdd38faae41a1b0b7875dd5fb6ac23d5d27282658e73bbb614db944b3a92d5334ddcca19f959e4c5ef2bf20a5b0f19390558645f986afc2f84edd4d
-DIST pkg-config-0.26.tar.gz 396399 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af WHIRLPOOL f535946a02192a9bffc7be0fae454e25aa86af8bac7f47622d52ed13f77f1ba05ff9b5693b2a501981e3991e4e1595eced22dee4ab748b310baa7d57267a62a7
-EBUILD glib-2.34.3.ebuild 8666 SHA256 80c19f11dc7f2a0d3f6d1148dd332d70f6a4ffa70d529ca89ad7040c40dbab0f WHIRLPOOL dbefea7e43dca7a69599108ce2a731c6b409eb00b45756d3a51a67415cc89435d1f9617277725d3a2391b4a3dd8d3762ac3cf27f7c18c274bb6f58fb944d73f1
-MISC ChangeLog 1921 SHA256 7bf81613892ab8a8adb82f719cb9bf4b8fa3f6b7791f9599ff4c27832fbc2d0a WHIRLPOOL 23dffddd649aab7698e7c70ba8162588aa4b27cad2b0f8c579e2c5fa8f75e190d908e7443bc223bcbc6a517b8452b5b3f286a59707fe635553b8d0b018c57fd7
+DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486
+EBUILD glib-2.34.3-r1.ebuild 8513 SHA256 b97a58906cfcad2ec613623e05b31a8c9b247af8510f0e48f487e7e17d78d6de WHIRLPOOL a4ebd8785d9810ea1589988347cd119a5cd16b60d164a242bd15a12cc04e0ae66c8e2a7f6fcb16eca03f9f45b5365853b211ba3b7a46d56ee15e4e2267fdcc35
+MISC ChangeLog 2247 SHA256 c40a01d763412fd0f8e932cda71d719e0f894e0821df44aacb0c4ded9558acef WHIRLPOOL eb58510fb49b47617fb360e5f634f80035543a919fa1077e854ac6fe7bb0239bb8910e71a9eb8a889decfd0bbba5018558e393cf370028f5e663e2666ea55c9e
MISC metadata.xml 545 SHA256 4367212499516e0cfa526071662d8935033526186dc91b9c3ff905b11b00fc08 WHIRLPOOL 6d72d4e1db077a863c57d0f310b870c2aa1298e76052ea63809012183024af13eb3fbc21e891b15430eff93542514f7d8eb21f9273c6d3f7799ab63454eec504
diff --git a/dev-libs/glib/files/glib-2.32.4-bashcomp.patch b/dev-libs/glib/files/glib-2.32.4-bashcomp.patch
deleted file mode 100644
index 33abffcf..00000000
--- a/dev-libs/glib/files/glib-2.32.4-bashcomp.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 6d032421b4871105e1f37bb75a5ec7b012f19f61 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sun, 15 Jul 2012 22:30:07 -0400
-Subject: [PATCH] gio: use /usr/share/bash-completion for bashcomp
-
-In Gentoo, we use /usr/share/bash-completion, not
-/usr/share/bash-completion/completions.
----
- gio/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/gio/Makefile.am b/gio/Makefile.am
-index 704367c..bee9dc6 100644
---- a/gio/Makefile.am
-+++ b/gio/Makefile.am
-@@ -715,7 +715,7 @@ gdbus_LDADD = libgio-2.0.la \
- $(top_builddir)/glib/libglib-2.0.la \
- $(top_builddir)/gobject/libgobject-2.0.la
-
--completiondir = $(datadir)/bash-completion/completions
-+completiondir = $(datadir)/bash-completion
- completion_DATA = \
- completion/gdbus \
- completion/gsettings \
---
-1.7.8.6
-
diff --git a/dev-libs/glib/files/glib-2.34.0-testsuite-skip-gdbus-auth-tests.patch b/dev-libs/glib/files/glib-2.34.3-testsuite-skip-gdbus-auth-tests.patch
index aff75cbe..c7c3f336 100644
--- a/dev-libs/glib/files/glib-2.34.0-testsuite-skip-gdbus-auth-tests.patch
+++ b/dev-libs/glib/files/glib-2.34.3-testsuite-skip-gdbus-auth-tests.patch
@@ -1,4 +1,4 @@
-From 6e6aa7de746b78bc5fc6d2cad1cac762f6d2205f Mon Sep 17 00:00:00 2001
+From 86bc94d3783ba53a944451f4eba4c78130eeef3b Mon Sep 17 00:00:00 2001
From: Priit Laes <plaes@plaes.org>
Date: Tue, 3 Jul 2012 12:50:44 +0300
Subject: [PATCH] Gentoo: skip over gdbus-auth /gdbus/auth/*/DBUS_COOKIE_SHA1
@@ -6,11 +6,11 @@ Subject: [PATCH] Gentoo: skip over gdbus-auth /gdbus/auth/*/DBUS_COOKIE_SHA1
https://bugzilla.gnome.org/show_bug.cgi?id=679308
---
- gio/tests/gdbus-auth.c | 9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
+ gio/tests/gdbus-auth.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
diff --git a/gio/tests/gdbus-auth.c b/gio/tests/gdbus-auth.c
-index 737770e..9f42c24 100644
+index 737770e..d528c6b 100644
--- a/gio/tests/gdbus-auth.c
+++ b/gio/tests/gdbus-auth.c
@@ -89,11 +89,14 @@ auth_client_external (void)
@@ -50,13 +50,13 @@ index 737770e..9f42c24 100644
g_test_add_func ("/gdbus/auth/client/DBUS_COOKIE_SHA1", auth_client_dbus_cookie_sha1);
+#endif
g_test_add_func ("/gdbus/auth/server/ANONYMOUS", auth_server_anonymous);
- g_test_add_func ("/gdbus/auth/server/EXTERNAL", auth_server_external);
+#if 0
+ g_test_add_func ("/gdbus/auth/server/EXTERNAL", auth_server_external);
g_test_add_func ("/gdbus/auth/server/DBUS_COOKIE_SHA1", auth_server_dbus_cookie_sha1);
+#endif
ret = g_test_run();
--
-1.7.8.6
+1.8.3.2
diff --git a/dev-libs/glib/glib-2.34.3.ebuild b/dev-libs/glib/glib-2.34.3-r1.ebuild
index 96c5648c..ce970aba 100644
--- a/dev-libs/glib/glib-2.34.3.ebuild
+++ b/dev-libs/glib/glib-2.34.3-r1.ebuild
@@ -1,16 +1,17 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.34.3.ebuild,v 1.5 2013/04/30 14:29:12 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.34.3-r1.ebuild,v 1.1 2013/08/15 13:01:15 tetromino Exp $
EAPI="5"
-PYTHON_DEPEND="utils? 2" # Avoid runtime dependency on python when USE=test
+PYTHON_COMPAT=( python2_{5,6,7} )
+# Avoid runtime dependency on python when USE=test
-inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python toolchain-funcs virtualx linux-info
+inherit autotools bash-completion-r1 gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python toolchain-funcs versionator virtualx linux-info
DESCRIPTION="The GLib library of C routines"
HOMEPAGE="http://www.gtk.org/"
SRC_URI="${SRC_URI}
- http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf
+ http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
LICENSE="LGPL-2+"
SLOT="2"
@@ -22,10 +23,17 @@ RDEPEND="virtual/libiconv
sys-libs/zlib
|| (
>=dev-libs/elfutils-0.142
- >=dev-libs/libelf-0.8.12 )
+ >=dev-libs/libelf-0.8.12
+ >=sys-freebsd/freebsd-lib-9.2_rc1
+ )
+ selinux? ( sys-libs/libselinux )
xattr? ( sys-apps/attr )
fam? ( virtual/fam )
- utils? ( >=dev-util/gdbus-codegen-${PV} )"
+ utils? (
+ ${PYTHON_DEPS}
+ >=dev-util/gdbus-codegen-${PV}
+ )
+"
DEPEND="${RDEPEND}
app-text/docbook-xml-dtd:4.1.2
>=dev-libs/libxslt-1.0
@@ -34,22 +42,21 @@ DEPEND="${RDEPEND}
systemtap? ( >=dev-util/systemtap-1.3 )
test? (
sys-devel/gdb
- =dev-lang/python-2*
+ ${PYTHON_DEPS}
>=dev-util/gdbus-codegen-${PV}
>=sys-apps/dbus-1.2.14 )
- !<dev-util/gtk-doc-1.15-r2"
+ !<dev-libs/gobject-introspection-1.$(get_version_component_range 2)
+ !<dev-util/gtk-doc-1.15-r2
+"
+# gobject-introspection blocker to ensure people don't mix
+# different g-i and glib major versions
+
PDEPEND="x11-misc/shared-mime-info
!<gnome-base/gvfs-1.6.4-r990"
# shared-mime-info needed for gio/xdgmime, bug #409481
# Earlier versions of gvfs do not work with glib
pkg_setup() {
- # Needed for gio/tests/gdbus-testserver.py
- if use test; then
- python_set_active_version 2
- python_pkg_setup
- fi
-
if use kernel_linux ; then
CONFIG_CHECK="~INOTIFY_USER"
linux-info_pkg_setup
@@ -57,9 +64,10 @@ pkg_setup() {
}
src_prepare() {
- mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
+ # Prevent build failure in stage3 where pkgconfig is not available, bug #481056
+ mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
- # Fix gmodule issues on fbsd; bug #184301
+ # Fix gmodule issues on fbsd; bug #184301, upstream bug #107626
epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
if use test; then
@@ -67,7 +75,7 @@ src_prepare() {
sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
- # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629
+ # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
if ! has_version dev-util/desktop-file-utils ; then
ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
ewarn "think on installing it to get these tests run."
@@ -96,26 +104,28 @@ src_prepare() {
# gdbus-codegen is a separate package
epatch "${FILESDIR}/${PN}-2.31.x-external-gdbus-codegen.patch"
- # bashcomp goes in /usr/share/bash-completion
- epatch "${FILESDIR}/${PN}-2.32.4-bashcomp.patch"
+ # leave python shebang alone
+ sed -e '/${PYTHON}/d' \
+ -i glib/Makefile.{am,in} || die
+
+ # Gentoo handles completions in a different directory
+ sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
+ gio/Makefile.am || die
# https://bugzilla.gnome.org/show_bug.cgi?id=679306
epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
# https://bugzilla.gnome.org/show_bug.cgi?id=679308
- epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-gdbus-auth-tests.patch"
+ epatch "${FILESDIR}/${PN}-2.34.3-testsuite-skip-gdbus-auth-tests.patch"
# build failure with automake-1.13; fixed upstream in 2.36
epatch "${FILESDIR}/${PN}-2.34.3-automake-1.13.patch"
epatch_user
- # disable pyc compiling
- use test && python_clean_py-compile_files
-
# Needed for the punt-python-check patch, disabling timeout test
# Also needed to prevent croscompile failures, see bug #267603
# Also needed for the no-gdbus-codegen patch
- AT_M4DIR="${WORKDIR}" eautoreconf
+ eautoreconf
[[ ${CHOST} == *-freebsd* ]] && elibtoolize
@@ -145,7 +155,6 @@ src_configure() {
# Building with --disable-debug highly unrecommended. It will build glib in
# an unusable form as it disables some commonly used API. Please do not
# convert this to the use_enable form, as it results in a broken build.
- # -- compnerd (3/27/06)
use debug && myconf="--enable-debug"
if use test; then
@@ -173,13 +182,13 @@ src_configure() {
}
src_install() {
- local f
+ default
- # install-exec-hook substitutes ${PYTHON} in glib/gtester-report
- emake DESTDIR="${D}" PYTHON="${EPREFIX}/usr/bin/python2" install
-
- if ! use utils; then
+ if use utils ; then
+ python_replicate_script "${ED}"/usr/bin/gtester-report
+ else
rm "${ED}usr/bin/gtester-report"
+ rm "${ED}usr/share/man/man1/gtester-report.1"
fi
# Do not install charset.alias even if generated, leave it to libiconv
@@ -204,6 +213,7 @@ src_test() {
export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
unset GSETTINGS_BACKEND # bug 352451
export LC_TIME=C # bug #411967
+ python_export_best
# Related test is a bit nitpicking
mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
@@ -219,18 +229,6 @@ src_test() {
Xemake check
}
-pkg_preinst() {
- # Only give the introspection message if:
- # * The user has gobject-introspection
- # * Has glib already installed
- # * Previous version was different from new version
- # TODO: add a subslotted virtual to trigger this automatically
- if has_version "dev-libs/gobject-introspection" && ! has_version "=${CATEGORY}/${PF}"; then
- ewarn "You must rebuild gobject-introspection so that the installed"
- ewarn "typelibs and girs are regenerated for the new APIs in glib"
- fi
-}
-
pkg_postinst() {
# Inform users about possible breakage when updating glib and not dbus-glib, bug #297483
# TODO: add a subslotted virtual to trigger this automatically
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-13 01:34:57 +0000