| 1 |
commit: e3a8963ce8f1b1ce7cfcdbeaf270f2d47d280fb1 |
| 2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jun 10 10:44:08 2018 +0000 |
| 4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 10 10:48:33 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3a8963c |
| 7 |
|
| 8 |
dev-libs/glib-2.54: include upstream branch patches |
| 9 |
|
| 10 |
Includes commit that reverts part of a performance patchset, which apparently |
| 11 |
could deadlock libreoffice (the patch in patchset should avoid the potential |
| 12 |
LO hanging). |
| 13 |
|
| 14 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 15 |
|
| 16 |
dev-libs/glib/Manifest | 1 + |
| 17 |
dev-libs/glib/glib-2.54.3-r6.ebuild | 5 ++++- |
| 18 |
2 files changed, 5 insertions(+), 1 deletion(-) |
| 19 |
|
| 20 |
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest |
| 21 |
index 90cf5fa953b..b840e13b7cd 100644 |
| 22 |
--- a/dev-libs/glib/Manifest |
| 23 |
+++ b/dev-libs/glib/Manifest |
| 24 |
@@ -1,4 +1,5 @@ |
| 25 |
DIST glib-2.50.3.tar.xz 7589284 BLAKE2B 8648e5d9e8f4c943ca3ec5a5ec01f380f55f76555bf4ec731e211b33d0e23c29ea2a9323e2e839f35f89f292863df76d4e8c622fc44c0e5905eb904576618dbd SHA512 ef35806c15170b6608445f255136c0bebd2d433adf903c2af2865f6a57b4f2fcfc1e4a7cea1a0dac48ff5fe26248fbf7886dba4a8d209506f0a94160df8fb7af |
| 26 |
DIST glib-2.52.3.tar.xz 7679972 BLAKE2B 8d9f6b714571bd04ab9717fbf9ded8556664e43dcdb7dd59436b8b7f1a8a5cdf98e9ce60ca1ead941af1d57688044fefb6c749fa735084622a3482b058864ff6 SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017 |
| 27 |
+DIST glib-2.54.3-patchset.tar.xz 39488 BLAKE2B 0bebd1f8eadd1796c355dbad20739ec2428a5b67e363e6ea61e2bab1e672506c438c80c602e87ec7d221ad92ad5c52adf7b57fb13441835e41f1e1208c26c6db SHA512 3d880c2681893da9267c8b2ba9a695eddbb1cef63f4ea26e052ce2f69e1e9d78eccdb27b235cbf0693ecd262bd70d020b24f82fc72ab11a4dbc2c929cfb72942 |
| 28 |
DIST glib-2.54.3.tar.xz 7836536 BLAKE2B 140e7cf09a41b72a5b22e5b87e9674cbfdfe1b82f3cf5f0fd3ecb2ed6b1f62a90f8b4c0bc2f655e297f91394f771f6ecad210357e31f104ee49ca178be6b9d76 SHA512 23eb4458684624f80c17aa784eab42a38eec87bb5979fcfe56f0bc63b5c7bcf8251a0d4ea916fe2c8109ff5b14a4b60c6260755d079ff984c0d8e6a2871d307d |
| 29 |
DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 |
| 30 |
|
| 31 |
diff --git a/dev-libs/glib/glib-2.54.3-r6.ebuild b/dev-libs/glib/glib-2.54.3-r6.ebuild |
| 32 |
index 424d46671f5..4d02ca0b776 100644 |
| 33 |
--- a/dev-libs/glib/glib-2.54.3-r6.ebuild |
| 34 |
+++ b/dev-libs/glib/glib-2.54.3-r6.ebuild |
| 35 |
@@ -16,7 +16,7 @@ inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux |
| 36 |
|
| 37 |
DESCRIPTION="The GLib library of C routines" |
| 38 |
HOMEPAGE="https://www.gtk.org/" |
| 39 |
-SRC_URI="${SRC_URI} |
| 40 |
+SRC_URI="${SRC_URI} https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz |
| 41 |
https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf |
| 42 |
|
| 43 |
LICENSE="LGPL-2.1+" |
| 44 |
@@ -122,6 +122,9 @@ src_prepare() { |
| 45 |
# gdbus-codegen is a separate package |
| 46 |
eapply "${FILESDIR}"/${PN}-2.54.3-external-gdbus-codegen.patch |
| 47 |
|
| 48 |
+ # Upstream glib-2-54 branch; includes fixups for potential libreoffice lockups |
| 49 |
+ eapply "${WORKDIR}"/patches/ |
| 50 |
+ |
| 51 |
# Leave gtester-report python shebang alone - handled by python_fix_shebang |
| 52 |
sed -e '/${PYTHON}/d' -i glib/Makefile.{am,in} || die |
Archives