diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-11-28 23:45:11 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-11-28 23:45:11 +0000 |
| commit | cf24181d193285d8ac6bfa19033a2224504d1860 (patch) | |
| tree | c8640f265cbf2b05824ae1bfac0fb3de1c523919 /app-text | |
| parent | Update libunique dep too for last commit (diff) | |
| download | gentoo-2-cf24181d193285d8ac6bfa19033a2224504d1860.tar.gz gentoo-2-cf24181d193285d8ac6bfa19033a2224504d1860.tar.bz2 gentoo-2-cf24181d193285d8ac6bfa19033a2224504d1860.zip | |
Fix underlinking issue, bug 372119
(Portage version: 2.1.10.37/cvs/Linux x86_64)
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/xournal/ChangeLog | 7 | ||||
| -rw-r--r-- | app-text/xournal/files/xournal-0.4.5_p20111022-underlinking.patch | 24 | ||||
| -rw-r--r-- | app-text/xournal/xournal-0.4.5_p20111022-r1.ebuild | 3 |
3 files changed, 32 insertions, 2 deletions
diff --git a/app-text/xournal/ChangeLog b/app-text/xournal/ChangeLog index 226559b9863a..11dddf4e245e 100644 --- a/app-text/xournal/ChangeLog +++ b/app-text/xournal/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-text/xournal # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.25 2011/11/24 12:22:52 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.26 2011/11/28 23:45:11 dilfridge Exp $ + + 28 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org> + xournal-0.4.5_p20111022-r1.ebuild, + +files/xournal-0.4.5_p20111022-underlinking.patch: + Fix underlinking issue, bug 372119 24 Nov 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml: Drop maintainer due retirement, bug #158470 diff --git a/app-text/xournal/files/xournal-0.4.5_p20111022-underlinking.patch b/app-text/xournal/files/xournal-0.4.5_p20111022-underlinking.patch new file mode 100644 index 000000000000..eae370ebf464 --- /dev/null +++ b/app-text/xournal/files/xournal-0.4.5_p20111022-underlinking.patch @@ -0,0 +1,24 @@ +From 619691e135630c79f45e61a4126804c51ea52d42 Mon Sep 17 00:00:00 2001 +From: Andreas K. Huettel (dilfridge) <mail@akhuettel.de> +Date: Mon, 28 Nov 2011 23:36:16 +0100 +Subject: [PATCH] Add xournal_0.4.5-3.debian patch 1 (add_ldflags), should fix Gentoo bug 372119 + +--- + src/Makefile.am | 3 +-- + 1 files changed, 1 insertions(+), 2 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index ba52740..3dea178 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -30,6 +30,5 @@ if WIN32 + xournal_LDFLAGS = -mwindows + xournal_LDADD = win32/xournal.res ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lz + else +- xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) ++ xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lX11 -lz + endif +- +-- +1.7.3.4 + diff --git a/app-text/xournal/xournal-0.4.5_p20111022-r1.ebuild b/app-text/xournal/xournal-0.4.5_p20111022-r1.ebuild index de5ce8de3d80..4f047acb7bd6 100644 --- a/app-text/xournal/xournal-0.4.5_p20111022-r1.ebuild +++ b/app-text/xournal/xournal-0.4.5_p20111022-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.5_p20111022-r1.ebuild,v 1.2 2011/11/16 23:40:03 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.5_p20111022-r1.ebuild,v 1.3 2011/11/28 23:45:11 dilfridge Exp $ EAPI=4 @@ -42,6 +42,7 @@ PATCHES=( "${DISTDIR}"/${P}-sjg-image-rev7.patch.gz "${FILESDIR}"/${P}-gtk-recent.patch "${FILESDIR}"/${P}-aspectratio.patch + "${FILESDIR}"/${P}-underlinking.patch ) src_prepare() { |