diff options
| author |   Mart Raudsepp <leio@gentoo.org> | 2018-06-10 13:44:08 +0300 |
|---|---|---|
| committer | Mart Raudsepp <leio@gentoo.org> | 2018-06-10 13:48:33 +0300 |
| commit | e3a8963ce8f1b1ce7cfcdbeaf270f2d47d280fb1 (patch) | |
| tree | f4f586e1f9ec79b420f1afcf7d3bd83f33d07897 /dev-libs | |
| parent | dev-libs/glib-2.54: add back gtester-report with USE=utils (diff) | |
| download | gentoo-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')
| -rw-r--r-- | dev-libs/glib/Manifest | 1 | ||||
| -rw-r--r-- | dev-libs/glib/glib-2.54.3-r6.ebuild | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index 90cf5fa953b9..b840e13b7cd0 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -1,4 +1,5 @@ DIST glib-2.50.3.tar.xz 7589284 BLAKE2B 8648e5d9e8f4c943ca3ec5a5ec01f380f55f76555bf4ec731e211b33d0e23c29ea2a9323e2e839f35f89f292863df76d4e8c622fc44c0e5905eb904576618dbd SHA512 ef35806c15170b6608445f255136c0bebd2d433adf903c2af2865f6a57b4f2fcfc1e4a7cea1a0dac48ff5fe26248fbf7886dba4a8d209506f0a94160df8fb7af DIST glib-2.52.3.tar.xz 7679972 BLAKE2B 8d9f6b714571bd04ab9717fbf9ded8556664e43dcdb7dd59436b8b7f1a8a5cdf98e9ce60ca1ead941af1d57688044fefb6c749fa735084622a3482b058864ff6 SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017 +DIST glib-2.54.3-patchset.tar.xz 39488 BLAKE2B 0bebd1f8eadd1796c355dbad20739ec2428a5b67e363e6ea61e2bab1e672506c438c80c602e87ec7d221ad92ad5c52adf7b57fb13441835e41f1e1208c26c6db SHA512 3d880c2681893da9267c8b2ba9a695eddbb1cef63f4ea26e052ce2f69e1e9d78eccdb27b235cbf0693ecd262bd70d020b24f82fc72ab11a4dbc2c929cfb72942 DIST glib-2.54.3.tar.xz 7836536 BLAKE2B 140e7cf09a41b72a5b22e5b87e9674cbfdfe1b82f3cf5f0fd3ecb2ed6b1f62a90f8b4c0bc2f655e297f91394f771f6ecad210357e31f104ee49ca178be6b9d76 SHA512 23eb4458684624f80c17aa784eab42a38eec87bb5979fcfe56f0bc63b5c7bcf8251a0d4ea916fe2c8109ff5b14a4b60c6260755d079ff984c0d8e6a2871d307d DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 diff --git a/dev-libs/glib/glib-2.54.3-r6.ebuild b/dev-libs/glib/glib-2.54.3-r6.ebuild index 424d46671f5a..4d02ca0b7766 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 |