summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen de Groot <yngwin@gentoo.org>2012-10-03 07:21:20 +0000
committerBen de Groot <yngwin@gentoo.org>2012-10-03 07:21:20 +0000
commitc8deda1860f1c868e0c3bef38233d3062a688f82 (patch)
treeda5f28f7a02f51a629f0d283f4e08fbd0a490071 /www-client
parentAdd beta version with new SyncTeX feature (diff)
downloadhistorical-c8deda1860f1c868e0c3bef38233d3062a688f82.tar.gz
historical-c8deda1860f1c868e0c3bef38233d3062a688f82.tar.bz2
historical-c8deda1860f1c868e0c3bef38233d3062a688f82.zip
Add libX11-underlinking.patch (applied in git upstream) from Alec Moskvin in bug #436232. Add epatch_user.
Package-Manager: portage-2.2.0_alpha123/cvs/Linux x86_64
Diffstat (limited to 'www-client')
-rw-r--r--www-client/qupzilla/ChangeLog7
-rw-r--r--www-client/qupzilla/Manifest5
-rw-r--r--www-client/qupzilla/files/qupzilla-1.3.5-libX11-underlinking.patch25
-rw-r--r--www-client/qupzilla/qupzilla-1.3.5.ebuild4
4 files changed, 37 insertions, 4 deletions
diff --git a/www-client/qupzilla/ChangeLog b/www-client/qupzilla/ChangeLog
index 824095235a99..088922b70739 100644
--- a/www-client/qupzilla/ChangeLog
+++ b/www-client/qupzilla/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for www-client/qupzilla
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/qupzilla/ChangeLog,v 1.15 2012/09/19 08:11:14 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/qupzilla/ChangeLog,v 1.16 2012/10/03 07:21:20 yngwin Exp $
+
+ 03 Oct 2012; Ben de Groot <yngwin@gentoo.org>
+ +files/qupzilla-1.3.5-libX11-underlinking.patch, qupzilla-1.3.5.ebuild:
+ Add libX11-underlinking.patch (applied in git upstream) from Alec Moskvin in
+ bug #436232. Add epatch_user.
19 Sep 2012; Ben de Groot <yngwin@gentoo.org> qupzilla-1.3.5.ebuild:
Use mirror; clean-up
diff --git a/www-client/qupzilla/Manifest b/www-client/qupzilla/Manifest
index df7f2ae80c1e..8c6171f1fcf5 100644
--- a/www-client/qupzilla/Manifest
+++ b/www-client/qupzilla/Manifest
@@ -1,6 +1,7 @@
+AUX qupzilla-1.3.5-libX11-underlinking.patch 576 SHA256 b8e4b4c9e454db17a98dcba7d642dd47e2dfd6d788395468fa0f3a3d7fc709e5 SHA512 502ec7b82113a3e358f8ffb49906e5d8bd8fe67c399f050af4896ae6e665b87b5602f01cee2b9c6e84ab5661e2e92c8abca3131688eba3e28f1e5d61adf5a5d2 WHIRLPOOL 4b2a878ff334bc8ba8e8a4774130d6ad02cf442b38294df73398e76bc3f1350e7a6fe6e3b9089de413b478301586c415995d2138b19d49de831964f40e6b0e23
DIST QupZilla-1.3.1.tar.gz 3400816 SHA256 60b02295b84a3e5929e8a188c40acb56807c15e81a9f3018e19da1825283ddf0 SHA512 b36035c083564690edf63ed72f8c0399474cb7f56d238d4a3b360601e8699df73621eafa5ddf2368fb037d16a989237b0a0c305b17092aeaf6164c68ee4bafe3 WHIRLPOOL d1f70d7c966cfcb6e59938019d6aaf1bf24c355585708448cd0ddab5bc85655b13e7da998afb818ca0a3deb7e08b44b1773e9055cbc857df0db83afaddb37d8b
DIST QupZilla-1.3.5.tar.gz 3579426 SHA256 af8266dce8c3d353a9b7e2c0494651b55f3715b06e8465ff730f4e618fe453a3 SHA512 0fa3a937242c43bbf9fabbf95fe3289849c5ecfad58b0e64a4639f9c9721af55b560227089f644750eb81cd8f15ae942ad7469cdc196e8406fe510a6ad81ad7c WHIRLPOOL b2cf3721375e0eab812db966cf0706b974b7c621c09dcc249bca134842a8a6585842d25bc272967aac32a5ed985423dcb3968fe427e8d6544fe54454fdd2da8c
EBUILD qupzilla-1.3.1.ebuild 1007 SHA256 e629209f08068318a0dbce4a76421e6a989354f1c3eca1677163513bf0ce3ffd SHA512 08d0a23c4824647c38d57b24ac70bbd5fb09786553dd79fc6430d04c4669ac00c202555af5205c1f43832805f1118609afe734e682fcd0a4a31af3e4efbf0c08 WHIRLPOOL 69bf05be553a49b29064baab7c09c93cf31f98ea1e55421b6d8be3c6b904b211f8589905bcca7a61d0373df213fce8a6bae247053f16de1e900c4ca1d4910753
-EBUILD qupzilla-1.3.5.ebuild 1668 SHA256 6011d59a69926cddc04509c204b0237afadde40246c31ca47cc815f4bb043b0b SHA512 e3ee3f4348237989feffb2751e20b344304283956a8519dc4d988b63f34b0411cd72f6eccac5810727dc7e48f858f23cb95543e931b062debd841d79bc109c62 WHIRLPOOL 2ae12884e3581856286d90d744bccba4f05c737465f7693df92b6e5c9c54614bece6232733103da175019fd66ee5b3bd87c9e96cefad2f8c8ad44e9ef7968595
-MISC ChangeLog 2284 SHA256 d84e193516c269d8808a4332b8d554fd04026d3a8d980b0434c792d53f5c8918 SHA512 caaf3a15d089665a39ebf102ecede35a8e76607fdf2703c20be4776e5c45bed967fe0d3be5cfbf66f1efd37a5eac8fdef6d54f36dd7a4ea3a8485250981e7553 WHIRLPOOL ba3749e67ad0eb9c1ce65b8dd4e9b8d4d2461e9bb903a09f0159858bab14a47113c3fea8b3d5f5d290f83f3123a6e24711562b0e90187873180b6661e422b0ea
+EBUILD qupzilla-1.3.5.ebuild 1734 SHA256 0ec79379ee3833e5203ae98b6703219361aa0a76a3064455c14061ccb93457fb SHA512 2d16094dddaf656bbed20994f843eb919f79df311c581f70ad6d7d63a8c627a3ad4b4188ef676be32fb3d89a08c51e2b267adf29926c5c44500b6f0a61ad7371 WHIRLPOOL 9537da095904e994eddf6cc89d991170ce268fbbae80870691eafc05e962d82f6112a8f67b07cbd6898124c25cc38af7af92063fee08d7689eaf87dac4f8c92f
+MISC ChangeLog 2518 SHA256 077b4005210556bb2d38a3af17e31144c8a3f1d195342e8175bb3a7873392e74 SHA512 b5474f6f25d1bf3a4b926a82813ae3c925b657e672248c6d978912326b10409c206c00279b711f330f428e03de185baec595c691fa199496d5abfb4e78819fa4 WHIRLPOOL 7b3d45a6c95e3b103dd4e2d3df7ec834c8f626246ffeab9dc06d077edaadd5418ff7aba2bdd7f23726184fd652cf5c5669eb2f6f0a81fede3bc7435b79e306b1
MISC metadata.xml 416 SHA256 1b51452eaf560d3cd580b3530bb739a415a34188f5ba555d2af9d36da646fe0b SHA512 4918aafacd22beb0817572692c198c99fb588c226abc469fc9a01c02ddcd685584bc756bc595a936f3e48c535f2203e2384f8dd6d96bffe5ad152f84c7812e56 WHIRLPOOL 17d97783743b7140be444e359e62da877ba30134b8abb83912c8f5633c9a5e94981d9db2a062f03467b4fb89b7ca6ef2d755e359a56d9c31dc26eae2eb7ccd1c
diff --git a/www-client/qupzilla/files/qupzilla-1.3.5-libX11-underlinking.patch b/www-client/qupzilla/files/qupzilla-1.3.5-libX11-underlinking.patch
new file mode 100644
index 000000000000..90a77758967b
--- /dev/null
+++ b/www-client/qupzilla/files/qupzilla-1.3.5-libX11-underlinking.patch
@@ -0,0 +1,25 @@
+From 4b2081ef5b35c3b8c5ababe53d56a5959fea3f82 Mon Sep 17 00:00:00 2001
+From: Alec Moskvin <alecm@gmx.com>
+Date: Thu, 20 Sep 2012 20:11:50 -0400
+Subject: [PATCH] Link to libX11 explicitly to prevent underlinking
+
+---
+ src/lib/lib.pro | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git src/lib/lib.pro src/lib/lib.pro
+index 82845f8..28d3b18 100644
+--- src/lib/lib.pro
++++ src/lib/lib.pro
+@@ -401,6 +401,8 @@ RESOURCES += \
+ target.path = $$library_folder
+
+ INSTALLS += target
++
++ LIBS += -lX11
+ }
+
+ message(===========================================)
+--
+1.7.12
+
diff --git a/www-client/qupzilla/qupzilla-1.3.5.ebuild b/www-client/qupzilla/qupzilla-1.3.5.ebuild
index b5313fd2a002..d4f3121ed7be 100644
--- a/www-client/qupzilla/qupzilla-1.3.5.ebuild
+++ b/www-client/qupzilla/qupzilla-1.3.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/qupzilla/qupzilla-1.3.5.ebuild,v 1.2 2012/09/19 08:11:14 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/qupzilla/qupzilla-1.3.5.ebuild,v 1.3 2012/10/03 07:21:20 yngwin Exp $
EAPI=4
PLOCALES="cs_CZ de_DE el_GR es_ES es_VE fa_IR fr_FR hu_HU id_ID it_IT ja_JP
@@ -35,6 +35,8 @@ DOCS="AUTHORS BUILDING CHANGELOG FAQ README.md TODO"
src_prepare() {
# remove outdated copies of localizations:
rm -rf bin/locale || die
+ epatch "${FILESDIR}"/${P}-libX11-underlinking.patch
+ epatch_user
}
src_configure() {