diff options
| author |   Ben de Groot <yngwin@gentoo.org> | 2012-10-03 07:21:20 +0000 |
|---|---|---|
| committer | Ben de Groot <yngwin@gentoo.org> | 2012-10-03 07:21:20 +0000 |
| commit | 4854e12b074574d0a872a4f196e77704c686e560 (patch) | |
| tree | b97ec6e385b97b7e544ac5ff97eb62701fa88a09 /www-client/qupzilla | |
| parent | Add beta version with new SyncTeX feature (diff) | |
| download | gentoo-2-4854e12b074574d0a872a4f196e77704c686e560.tar.gz gentoo-2-4854e12b074574d0a872a4f196e77704c686e560.tar.bz2 gentoo-2-4854e12b074574d0a872a4f196e77704c686e560.zip | |
Add libX11-underlinking.patch (applied in git upstream) from Alec Moskvin in bug #436232. Add epatch_user.
(Portage version: 2.2.0_alpha123/cvs/Linux x86_64)
Diffstat (limited to 'www-client/qupzilla')
| -rw-r--r-- | www-client/qupzilla/ChangeLog | 7 | ||||
| -rw-r--r-- | www-client/qupzilla/files/qupzilla-1.3.5-libX11-underlinking.patch | 25 | ||||
| -rw-r--r-- | www-client/qupzilla/qupzilla-1.3.5.ebuild | 4 |
3 files changed, 34 insertions, 2 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/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() { |