summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2018-06-10 13:44:08 +0300
committerMart Raudsepp <leio@gentoo.org>2018-06-10 13:48:33 +0300
commite3a8963ce8f1b1ce7cfcdbeaf270f2d47d280fb1 (patch)
treef4f586e1f9ec79b420f1afcf7d3bd83f33d07897 /dev-libs/glib/glib-2.54.3-r6.ebuild
parentdev-libs/glib-2.54: add back gtester-report with USE=utils (diff)
downloadgentoo-e3a8963ce8f1b1ce7cfcdbeaf270f2d47d280fb1.tar.gz
gentoo-e3a8963ce8f1b1ce7cfcdbeaf270f2d47d280fb1.tar.bz2
gentoo-e3a8963ce8f1b1ce7cfcdbeaf270f2d47d280fb1.zip
dev-libs/glib-2.54: include upstream branch patches
Includes commit that reverts part of a performance patchset, which apparently could deadlock libreoffice (the patch in patchset should avoid the potential LO hanging). Package-Manager: Portage-2.3.40, Repoman-2.3.9
Diffstat (limited to 'dev-libs/glib/glib-2.54.3-r6.ebuild')
-rw-r--r--dev-libs/glib/glib-2.54.3-r6.ebuild5
1 files changed, 4 insertions, 1 deletions
diff --git a/dev-libs/glib/glib-2.54.3-r6.ebuild b/dev-libs/glib/glib-2.54.3-r6.ebuild
index 424d46671f5..4d02ca0b776 100644
--- a/dev-libs/glib/glib-2.54.3-r6.ebuild
+++ b/dev-libs/glib/glib-2.54.3-r6.ebuild
@@ -16,7 +16,7 @@ inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux
DESCRIPTION="The GLib library of C routines"
HOMEPAGE="https://www.gtk.org/"
-SRC_URI="${SRC_URI}
+SRC_URI="${SRC_URI} https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz
https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
LICENSE="LGPL-2.1+"
@@ -122,6 +122,9 @@ src_prepare() {
# gdbus-codegen is a separate package
eapply "${FILESDIR}"/${PN}-2.54.3-external-gdbus-codegen.patch
+ # Upstream glib-2-54 branch; includes fixups for potential libreoffice lockups
+ eapply "${WORKDIR}"/patches/
+
# Leave gtester-report python shebang alone - handled by python_fix_shebang
sed -e '/${PYTHON}/d' -i glib/Makefile.{am,in} || die