summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2013-07-20 11:28:45 +0000
committerPacho Ramos <pacho@gentoo.org>2013-07-20 11:28:45 +0000
commitf1a37aba1ef902fdddd350d768f98a364e54d9ed (patch)
treea1c384c3db86869ed87eab5d697e4528031e69d6 /dev-libs/json-glib
parentMask due keywords pending, bug #476710 (diff)
downloadhistorical-f1a37aba1ef902fdddd350d768f98a364e54d9ed.tar.gz
historical-f1a37aba1ef902fdddd350d768f98a364e54d9ed.tar.bz2
historical-f1a37aba1ef902fdddd350d768f98a364e54d9ed.zip
Apply upstream patch to use bsymbolic and prevent problems like bug #475954
Package-Manager: portage-2.1.12.13/cvs/Linux x86_64 Manifest-Sign-Key: 0xA188FBD4
Diffstat (limited to 'dev-libs/json-glib')
-rw-r--r--dev-libs/json-glib/ChangeLog9
-rw-r--r--dev-libs/json-glib/Manifest13
-rw-r--r--dev-libs/json-glib/files/json-glib-0.16.0-bsymbolic.patch47
-rw-r--r--dev-libs/json-glib/json-glib-0.16.0-r1.ebuild (renamed from dev-libs/json-glib/json-glib-0.16.0.ebuild)13
4 files changed, 72 insertions, 10 deletions
diff --git a/dev-libs/json-glib/ChangeLog b/dev-libs/json-glib/ChangeLog
index 0b76b88ab4f7..ef038c463a9f 100644
--- a/dev-libs/json-glib/ChangeLog
+++ b/dev-libs/json-glib/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-libs/json-glib
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/ChangeLog,v 1.49 2013/04/25 19:39:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/ChangeLog,v 1.50 2013/07/20 11:28:41 pacho Exp $
+
+*json-glib-0.16.0-r1 (20 Jul 2013)
+
+ 20 Jul 2013; Pacho Ramos <pacho@gentoo.org>
+ +files/json-glib-0.16.0-bsymbolic.patch, +json-glib-0.16.0-r1.ebuild,
+ -json-glib-0.16.0.ebuild:
+ Apply upstream patch to use bsymbolic and prevent problems like bug #475954
*json-glib-0.16.0 (25 Apr 2013)
diff --git a/dev-libs/json-glib/Manifest b/dev-libs/json-glib/Manifest
index d818e69da95a..43bd5414f271 100644
--- a/dev-libs/json-glib/Manifest
+++ b/dev-libs/json-glib/Manifest
@@ -1,18 +1,19 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
+AUX json-glib-0.16.0-bsymbolic.patch 1781 SHA256 7fa2b96f99788974c2c71ef6b5873dedfe50b22965a0262ba10c48f854a9b985 SHA512 aadfd889803a574d623efc1bfb64fb04274dabf687e164f58fbef81b6a03b30aeff35318b1c4f02f95c09bf2ebd3de6158d9b66008bda381ec91f1322345781a WHIRLPOOL d76e2226eaa750d8ac5fbf1bc1350beb885e62c92f5a5d2d820b2bf0967859df5f76e642d217be26408bd7e5686caed457464d237a927915a8cbce6cc28dcadb
DIST json-glib-0.14.2.tar.xz 445396 SHA256 b816a5fa3e5664b08679a6972a6e5693d6cc1990ff4a6f94c07554db96be94a7 SHA512 11a482eeac40e255dc844fc3ae2fca3240678ca131d2685ba574db5e1f2440f2305a4ebf74fcc30b18e4d883d1bf91d3a598819d93f204535dc949deb6749771 WHIRLPOOL 2afc121088d1c39ad0c04154b07f2758abf086c2e41810b0f6f21c83018d1f0dadc61d366cd4929121e9fd761bb88e60ce380cab29b72f769516b218eb169c87
DIST json-glib-0.15.2.tar.xz 459232 SHA256 f090cd94acc85989e033d72028fa70863d05092ae5bba6b454e70c132b24cdde SHA512 1cf07e09cc7eeba07a5b0131a760cd022160a9b13c380bcbf9f197dc23bdc07665d7c2832812c9e36bcefef9e8096662733832b93041d927cc2b05e31623e707 WHIRLPOOL 6cbec3c8ff36af13d46962b81bba7b3618b7de50383f81f5390b4a4178b941119cd36e84d25ae72a7712e8d08668e62c5b78c4c6e8ed855d1bbd84d25f5b459a
DIST json-glib-0.16.0.tar.xz 505452 SHA256 e4a3fd2f399e4c148aad608e6ed0a94095f2ddde9dd12f5aa2f072ecae5c1d37 SHA512 4e58b568a875087755622b6976bcfdcf5e029d1bff4ac0e187887f56223a2bdf1a288a1d1355d265a5d82f5306e2f6ef98b910e4002551a1fe770a79efb4270c WHIRLPOOL 020b4137ebd6f1243b17ba74d2c5d2adbc2c9c4e75ae13164db648f5e319b1f8e5ba9a8773607ecd398c03b0e303b9601d3e0e8dfbddba48f5d82197f6edf12d
EBUILD json-glib-0.14.2.ebuild 941 SHA256 a5a16f85b7a852a92f681678855d036026f2bdc43ee689a8a665341026d4d5ab SHA512 9ab590bcce4be2dad22759841890115822b210f1ca59ad1da7a0d7c09b1210c9b1adce700e69c6a5254a6b21948de6c9ac734388c2b5579aad2a08abd3858a8e WHIRLPOOL 166f982cde0036275a434f83d6cba5d5fd3556fea342fb45429a7a790294d47fb237a7a1b9c047d6a6098226ff35d1e561ff3c0adc1288b4612d7af3baf3d53d
EBUILD json-glib-0.15.2.ebuild 914 SHA256 3b110d90a9bc50df3a61738dbc1a6bd1708db37d8b5d117bc11122a317db0204 SHA512 681da7006e7a9b5b679a26d96ee4231c9564bb557ad9e551c995503fa9c146c8883fc15b87d7fd10a04f723e688c23ca5f944e0e5dc3941b162cd81297cac477 WHIRLPOOL 67488101d77b64a70219bf796eb81a1fe1ff34a2276f7e79b75d0b684c43a136fd138b690f9808ed67b0ca12b8f820f001c749b025efe43afe8545c3946b4363
-EBUILD json-glib-0.16.0.ebuild 893 SHA256 89887ffd53ebbdeb012d890c56f64f0c91892908d628a3e53f8eda4468faa97d SHA512 d1a34b5f681353c9e56a74192b5b296a23ef7134138642eb979cb458e692f5cef21e7e2701072ea95ef0570912929328e1890b218241cb476135dfcc7a7e623d WHIRLPOOL 277678c6d6d1907d79b5fdbdf4087de8cef15121bcf9fc3cd28c74bb47fd6756ae853a026a634c88b0a2451e912fda164a95faeb9dc7481d6819c45077787985
-MISC ChangeLog 6979 SHA256 94715ed1ef17989ea2870187a6bd32cbf754a83c7f9515767cf3b35c81e11ee6 SHA512 217998630044465809fc602b4a01ffa9f49adc495faa9ccab5d35a77cdbb07ab9c7d089e21a7c244d0e978b6266fed78de7575b97c3c5e045c50dece25344ad7 WHIRLPOOL f90ee43b7a4c22b5194c56c151c3ee6462675b4306545fff7e1574c8352c4b62bc6f9c4cc69ee0faa0bc893820eb6694045602326288c186fb78ea0722c26b16
+EBUILD json-glib-0.16.0-r1.ebuild 1078 SHA256 8b807a748adbb5e214a18748bbddd8ab7f03fa795e0027d17cd53e4f5b565f25 SHA512 55837c5d1bf79a8d16e8a4898965c52fdfeed2c0815000830bb5848b1f3208cc62c151f44a5ede6e382e8e73b3d336432f7738b6f89e1643f026277189e52051 WHIRLPOOL d8f7a181b082a34427c6725665118fc9834059bc5c9fafad231308f6d86c1868daa733db8766908d87073f5a1a061f77852587d72e06d01432dc06a439167165
+MISC ChangeLog 7240 SHA256 ca9af36763f63e7b7f8f239ab694ebc086079c43454b6bc00618d32cb2dc84f0 SHA512 9d54462c00c6acdbb4b679f2710d2ef3d5fe435d881c1483d1b8472c5aadf7701336d6b0eb2788fad5bb9c6ea8593bf41061262e9ad4dd73e7bab03efaa41bc3 WHIRLPOOL 660bc0559302919824ee7af2b572ed017ec4e46ce79b988df24fa1ac1927101ce42012bd144fffff5b2d668112c70622ee410ace1c4e2474ed44dc0517cf133f
MISC metadata.xml 1060 SHA256 f8c41c5a7e4950f631ab6cdb55ed4e4867dbdb24e9a89b116f9189620a06f6e7 SHA512 b05ed9cb8464da4462cd56044fde8b720dac53276d5a76f1697e536b37d1e96dfb3348c93f2d838559f122050c75c54516527f758da40878c76c8ec772fe5770 WHIRLPOOL cff42f26f1d5de50756271e13b8ba28f9863ed08ed96b6418693fb47009f9d191c9bfbc60dd486140ad482034cf21a92c3c6e17a0c3d67334d63e6488d009047
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
-iEYEAREIAAYFAlF5hl8ACgkQCaWpQKGI+9RewwCfejv3Z5tuSIjO9tmcNh04zYNR
-XDQAn1a9uumqumakAVgHKoITXEoGaQI0
-=0z/c
+iEYEAREIAAYFAlHqdGoACgkQCaWpQKGI+9Qg7wCdFDpn0YBDFazQtpp/rDl1gbgI
+0vUAn2NpCZmPNLtrRnINiwuTATywHP0D
+=A8Sm
-----END PGP SIGNATURE-----
diff --git a/dev-libs/json-glib/files/json-glib-0.16.0-bsymbolic.patch b/dev-libs/json-glib/files/json-glib-0.16.0-bsymbolic.patch
new file mode 100644
index 000000000000..81593a8f5b67
--- /dev/null
+++ b/dev-libs/json-glib/files/json-glib-0.16.0-bsymbolic.patch
@@ -0,0 +1,47 @@
+From a9327484746820a5a2b8c1acf4a78470b004f0a0 Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi@gnome.org>
+Date: Thu, 11 Jul 2013 15:49:14 +0000
+Subject: build: Add configure option to enable -Bsymbolic
+
+We should always compile with -Bsymbolic enabled to avoid intra-library
+PLT jumps.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=703734
+---
+diff --git a/configure.ac b/configure.ac
+index 7c640fa..90654c6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -93,6 +93,30 @@ AC_MSG_RESULT([$platform_win32])
+ AM_CONDITIONAL(OS_LINUX, [test "$platform_linux" = "yes"])
+ AM_CONDITIONAL(OS_WIN32, [test "$platform_win32" = "yes"])
+
++# Check for -Bsymbolic-functions to avoid intra-library PLT jumps
++AC_ARG_ENABLE([Bsymbolic],
++ [AS_HELP_STRING([--disable-Bsymbolic],
++ [Avoid linking with -Bsymbolic])],
++ [],
++ [
++ saved_LDFLAGS="${LDFLAGS}"
++ AC_MSG_CHECKING([for -Bsymbolic-functions linker flag])
++ LDFLAGS=-Wl,-Bsymbolic-functions
++ AC_TRY_LINK([], [int main (void) { return 0; }],
++ [
++ AC_MSG_RESULT([yes])
++ enable_Bsymbolic=yes
++ ],
++ [
++ AC_MSG_RESULT([no])
++ enable_Bsymbolic=no
++ ])
++ LDFLAGS="${saved_LDFLAGS}"
++ ])
++
++AS_IF([test "x$enable_Bsymbolic" = "xyes"], [JSON_LINK_FLAGS=-Wl[,]-Bsymbolic-functions])
++JSON_LT_LDFLAGS="$JSON_LT_LDFLAGS $JSON_LINK_FLAGS"
++
+ AC_SUBST(JSON_LT_LDFLAGS)
+
+ dnl === Dependencies ==========================================================
+--
+cgit v0.9.2
diff --git a/dev-libs/json-glib/json-glib-0.16.0.ebuild b/dev-libs/json-glib/json-glib-0.16.0-r1.ebuild
index 203905c0d48a..0e8b0859f48e 100644
--- a/dev-libs/json-glib/json-glib-0.16.0.ebuild
+++ b/dev-libs/json-glib/json-glib-0.16.0-r1.ebuild
@@ -1,14 +1,14 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/json-glib-0.16.0.ebuild,v 1.1 2013/04/25 19:39:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/json-glib-0.16.0-r1.ebuild,v 1.1 2013/07/20 11:28:41 pacho Exp $
EAPI=5
GCONF_DEBUG=yes
-inherit gnome2
+inherit autotools eutils gnome2
DESCRIPTION="A library providing GLib serialization and deserialization support for the JSON format"
-HOMEPAGE="http://live.gnome.org/JsonGlib"
+HOMEPAGE="https://wiki.gnome.org/JsonGlib"
LICENSE="LGPL-2.1+"
SLOT="0"
@@ -25,6 +25,13 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
"
+src_prepare() {
+ # Add configure option to enable -Bsymbolic (from 'master')
+ epatch "${FILESDIR}/${PN}-0.16.0-bsymbolic.patch"
+ eautoreconf
+ gnome2_src_prepare
+}
+
src_configure() {
# Coverage support is useless, and causes runtime problems
gnome2_src_configure \