summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Hüttel <dilfridge@gentoo.org>2012-06-24 11:03:29 +0000
committerAndreas Hüttel <dilfridge@gentoo.org>2012-06-24 11:03:29 +0000
commit4e8a3539897b1e2cf5d6dd07dd788ab2c56c389f (patch)
tree224cc5d65ce681600bbba237a144d8781a2ede9a /app-text
parentdrop depend.php in favour of an explicit dep (nothing really changes here) (diff)
downloadhistorical-4e8a3539897b1e2cf5d6dd07dd788ab2c56c389f.tar.gz
historical-4e8a3539897b1e2cf5d6dd07dd788ab2c56c389f.tar.bz2
historical-4e8a3539897b1e2cf5d6dd07dd788ab2c56c389f.zip
Fix underlinking and automake strangeness, bug 423285
Package-Manager: portage-2.2.0_alpha112/cvs/Linux x86_64
Diffstat (limited to 'app-text')
-rw-r--r--app-text/xournal/ChangeLog7
-rw-r--r--app-text/xournal/Manifest25
-rw-r--r--app-text/xournal/files/xournal-0.4.5_p20111022-underlinking-2.patch10
-rw-r--r--app-text/xournal/xournal-0.4.5_p20111022-r2.ebuild4
4 files changed, 35 insertions, 11 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/Manifest b/app-text/xournal/Manifest
index e44dbee942ba..3935a9bdd4d9 100644
--- a/app-text/xournal/Manifest
+++ b/app-text/xournal/Manifest
@@ -3,6 +3,7 @@ Hash: SHA512
AUX xournal-0.4.5_p20111022-aspectratio.patch 3547 RMD160 fc53a86e58b7f5c0de3d3e31c43506d88b120a11 SHA1 fdb8fdaeeb4cfb8022c1a0c899a5bf024e2c29e1 SHA256 27791e240551c2987088d8d979a9389a9dbbb9fda836d537f3637e7966af52ac
AUX xournal-0.4.5_p20111022-gtk-recent.patch 11391 RMD160 411e88bbe51468cb58ff0debe999d46b53ad79a6 SHA1 8bde995a0757ee691afbca0afa3efc5ddab76339 SHA256 d9b8bf35b527e4283554b804acd0a455f66a8e08fa753370bca34ae543d1f58c
+AUX xournal-0.4.5_p20111022-underlinking-2.patch 575 RMD160 ce938f4b1f830f2b34b36f4e890c21ae95e0ed49 SHA1 318df9a69c1e063638007de6049d3ab4468dadd9 SHA256 10c01e25c737fa396abb052de3e59d646bd80a7067cf22bf802c30e98ecb550d
AUX xournal-0.4.5_p20111022-underlinking.patch 792 RMD160 6516d38a26159f63f2a2daae8a1f24448ce0a06d SHA1 583ead6936d06b9c07e57920f93e9d40fe3f1f05 SHA256 2e44dc7deafd62dcd01d1aca848a7bcb5bf93d648625e76715f0be03c45386c5
DIST xournal-0.4.5_p20111022-r2-patchset.tar.xz 35776 RMD160 a166eb7d6ba7aecce8161d3c9c5d7566d9c3dede SHA1 29cab6debcd2228a70adcffa4c920db50c8ba9db SHA256 4375f116ff82cae1e9497f1b76797a519319bf4012d4aa1262caee75406aeea4
DIST xournal-0.4.5_p20111022-sjg-image-rev7.patch.gz 21551 RMD160 6048a996fdb7b43e05beff67cf5ae0da53cff840 SHA1 0ff950726a7ad5b0012421c158406d6d49d2c38d SHA256 88b050483fc27f37f307adb358b3e5c4bfc0b600b7d3427599dea4c1ffe87fc2
@@ -10,18 +11,24 @@ DIST xournal-0.4.5_p20111022.tar.xz 332700 RMD160 6578c037ad536c0173c533758c5f86
DIST xournal-0.4.6-gentoo.patch.xz 32720 RMD160 4cab7d7580d98ae9186fa39ab7ced7b9975ca15a SHA1 349acbf691b3c72a64defbffb2fb2f9baf203a7f SHA256 e8f03410cb1e31b50cac3b646fc5670f349f7ebc68854a481e2046de71ce38bf
DIST xournal-0.4.6.tar.xz 335128 RMD160 76ce8b2ac642c8a61dc22d821c0830b86c85cdb7 SHA1 7ad0654ed0c96ee874d6bcbb04c66413066a8a2e SHA256 4310fe579b8e99a66c40ba923fe0dce2e8543ad69c7660a01a675637970057d3
EBUILD xournal-0.4.5_p20111022-r1.ebuild 1354 RMD160 11f1306ea61e3cfceb1366e39c380df4bcd77f0a SHA1 8502d5f5bb2cede515811077434a2a9d338aa61c SHA256 f6d6a3f982f9e00fa1f22a1f16f7213db5748b81c2fb40934f47f15f7d2e5c26
-EBUILD xournal-0.4.5_p20111022-r2.ebuild 1289 RMD160 2be1bd7a3c3c9a6756bf976947e111b41a868f53 SHA1 d0fc0b3a9994c38eda5e7a59f85861bc4ca1f228 SHA256 ba55dcc0a1e080f8eff915b3663857519e659493ece1208d8b8a78d71b7fcbff
+EBUILD xournal-0.4.5_p20111022-r2.ebuild 1382 RMD160 3fd523cd1efd23f34cacf5774739270f6b79254e SHA1 290573311d46d03cdb4f6109ebfca3935ca11ef1 SHA256 8f0e2bdad9bc0f009d4062fec2f4364ebc2de71d67574bb76486b4a94d0492d8
EBUILD xournal-0.4.6.ebuild 1285 RMD160 16a425fbea060b1490030f6a91b57c20b4eb6ca5 SHA1 5fb65840ed5e78099fdfdffcc5de44e45ee0dd7a SHA256 349216a1e6d17a36c8338e94751cfbccd47f13f4b0ec120bde6fe8cff4ece3eb
-MISC ChangeLog 5911 RMD160 4a41216b19297b7d869642c9c41a313746c869b0 SHA1 af70a3230000ed19f0e951dcf79b145f0d969a58 SHA256 87cbda6ba91e2b7ecafd9e6b53bc788d534952ac7f633b9c74ed3a9b69e1d241
+MISC ChangeLog 6123 RMD160 71becb857629d9f9f3ef3d654a76b36280c88f69 SHA1 65b43a7766bc2d3333da160256f34fda80299e30 SHA256 d90abc4846fcb0422293ddeba2fa39f9791de84a89eebcae24c427ccecfd5033
MISC metadata.xml 561 RMD160 994fde5a7482cd84910d37246072d1fd848da7c5 SHA1 cc77d272a12b97e7e08a2764086c78746fc919e4 SHA256 e0c14d0d41505ee0ff810d8bfd6f6ac751b287e84d171d114f5a48becf91b7c1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQEcBAEBCgAGBQJP33YaAAoJEOTDgjZ80txdB6UH/1TgI2Of6/BC/3B3mgpQDJAy
-6AJv+3A9DUFiX84+SvR5oIb15FYAD8YQKL/XjnU39v4tQLpvavOxK2OrGATK0+44
-eRaJ5BtOvwlegPAvx6lG87Ku4fdjpnwXV/OU6Smo4PrVBwO4Zn6Dur66sVRHTKg/
-YO8Hr4s13B4y4RtTEikuOnPi8btkXpu8CksIq4YBn9FAtl7UxFd0lKnalQpeG/WS
-IurK0tynr1P567GtnJTM2u/iOcrJ5fQ0obaNz+gAVJRiS0KvH5TVMA3Br4qJoQoy
-Si/pHCyySyT2pdKzlKoeBQJ8xaFsF58gp9a2R+0tcLvid7469hOrdw8djUX0Cnc=
-=bN+8
+iQIcBAEBCgAGBQJP5vRLAAoJEEb+UGWnxTyH2lAQAJ2hWk+k+JbNoJnJxh20Dm1j
+K2wU/tT1pge/FWuLDpfynOMIXMtOvABE8KZAHTt3we0GtCZsMp/79NA1Cy0K4dk3
+Y4VzoyumXcVzd+kQuLABvE919bcqHb4mt2mmEMdXhKc9MeYROBFBm0ihCPWeIOBU
+wzPIRLTpou59PrjTlBstiBdicF1Wk0IIMHlMg9gCzqImLks058/Saxbpl9peBN5L
+fNKM9Uhu6bJFDsC1s2mrQsUgJjnT1tuGKwKsEsv2nlUe4yu/NYZFDXNVKY9cx6sc
+q3uChY7wSGoqddUk4QJpeVVWk9+DZ4mE42KJFbIE1j7ekUdbkBstTbNIx+Lmt4Od
+ehPqVcb7kU2CBjdwUhXeGMu1tDWBoPqGgT/D743aQu6kF8j37wJypbWNZT668C8Z
+MqzpSumcA8wxtAVmA91cmrlFIl6VpBWxCgmT9+0xz58ODkYGUueo4c+N94ggjgPh
+hUg70qioVrOQhMhAERy1ayosSKTjl6BnmxvqHLHW+TYWZLn+85JpntCrtTox2wLA
+tkW7EeSd8efgobwEq2Xpi1UCVm/7iRdQhy6YuDHU5mv484QGNlRoUijTR0i17xoA
+zQHqX0gaKhmPCzJtewv7RCw2LzUoBbNTTe25H4YWRfc0eA1v17PMz3DqRoGIRcOl
+p23PXoGUxn18GN8Og+h1
+=6VMG
-----END PGP SIGNATURE-----
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
}