diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2012-06-24 11:03:29 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2012-06-24 11:03:29 +0000 |
| commit | a1127a593cf6440249a064478eecfc08579e7db7 (patch) | |
| tree | 8702d858a0387dfd7b9d9f300c0f2b13c7338c51 /app-text/xournal | |
| parent | drop depend.php in favour of an explicit dep (nothing really changes here) (diff) | |
| download | gentoo-2-a1127a593cf6440249a064478eecfc08579e7db7.tar.gz gentoo-2-a1127a593cf6440249a064478eecfc08579e7db7.tar.bz2 gentoo-2-a1127a593cf6440249a064478eecfc08579e7db7.zip | |
Fix underlinking and automake strangeness, bug 423285
(Portage version: 2.2.0_alpha112/cvs/Linux x86_64)
Diffstat (limited to 'app-text/xournal')
| -rw-r--r-- | app-text/xournal/ChangeLog | 7 | ||||
| -rw-r--r-- | app-text/xournal/files/xournal-0.4.5_p20111022-underlinking-2.patch | 10 | ||||
| -rw-r--r-- | app-text/xournal/xournal-0.4.5_p20111022-r2.ebuild | 4 |
3 files changed, 19 insertions, 2 deletions
diff --git a/app-text/xournal/ChangeLog b/app-text/xournal/ChangeLog index b775e1d31807..c60247544ba2 100644 --- a/app-text/xournal/ChangeLog +++ b/app-text/xournal/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-text/xournal # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.34 2012/06/18 18:40:20 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.35 2012/06/24 11:03:29 dilfridge Exp $ + + 24 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> + xournal-0.4.5_p20111022-r2.ebuild, + +files/xournal-0.4.5_p20111022-underlinking-2.patch: + Fix underlinking and automake strangeness, bug 423285 18 Jun 2012; Agostino Sarubbo <ago@gentoo.org> xournal-0.4.5_p20111022-r2.ebuild: diff --git a/app-text/xournal/files/xournal-0.4.5_p20111022-underlinking-2.patch b/app-text/xournal/files/xournal-0.4.5_p20111022-underlinking-2.patch new file mode 100644 index 000000000000..5a51288a4b83 --- /dev/null +++ b/app-text/xournal/files/xournal-0.4.5_p20111022-underlinking-2.patch @@ -0,0 +1,10 @@ +diff -ruN xournal-0.4.5_p20111022.orig/src/Makefile.am xournal-0.4.5_p20111022/src/Makefile.am +--- xournal-0.4.5_p20111022.orig/src/Makefile.am 2012-06-24 12:57:21.453958621 +0200 ++++ xournal-0.4.5_p20111022/src/Makefile.am 2012-06-24 12:58:07.696957705 +0200 +@@ -30,5 +30,5 @@ + xournal_LDFLAGS = -mwindows + xournal_LDADD = win32/xournal.res ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lz + else +- xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lX11 -lz ++ xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lX11 -lz -lm + endif diff --git a/app-text/xournal/xournal-0.4.5_p20111022-r2.ebuild b/app-text/xournal/xournal-0.4.5_p20111022-r2.ebuild index e81ac880433d..426887ce8019 100644 --- a/app-text/xournal/xournal-0.4.5_p20111022-r2.ebuild +++ b/app-text/xournal/xournal-0.4.5_p20111022-r2.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/app-text/xournal/xournal-0.4.5_p20111022-r2.ebuild,v 1.4 2012/06/18 18:40:20 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.5_p20111022-r2.ebuild,v 1.5 2012/06/24 11:03:29 dilfridge Exp $ EAPI=4 @@ -40,7 +40,9 @@ DEPEND="${COMMONDEPEND} src_prepare() { epatch "${WORKDIR}"/0*.patch + epatch "${FILESDIR}/${P}-underlinking-2.patch" sed -e "s:n http:n Gentoo release ${PVR}\\\\n http:" -i "${S}"/src/xo-interface.c + rm -f "${S}/aclocal.m4" # bug 423285 eautoreconf } |