diff options
| author |   Andreas Hüttel <dilfridge@gentoo.org> | 2011-11-28 23:45:11 +0000 |
|---|---|---|
| committer | Andreas Hüttel <dilfridge@gentoo.org> | 2011-11-28 23:45:11 +0000 |
| commit | 403dc5df8ec3f4b13cdce7c545746bbccbb55b32 (patch) | |
| tree | 8f19a34a91df2dfa2abc5b54fe447b2b42235bb7 /app-text | |
| parent | Update libunique dep too for last commit (diff) | |
| download | historical-403dc5df8ec3f4b13cdce7c545746bbccbb55b32.tar.gz historical-403dc5df8ec3f4b13cdce7c545746bbccbb55b32.tar.bz2 historical-403dc5df8ec3f4b13cdce7c545746bbccbb55b32.zip | |
Fix underlinking issue, bug 372119
Package-Manager: portage-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/Manifest | 23 | ||||
| -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 |
4 files changed, 49 insertions, 8 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/Manifest b/app-text/xournal/Manifest index 25a6ddd0aad1..d999fc7ab447 100644 --- a/app-text/xournal/Manifest +++ b/app-text/xournal/Manifest @@ -1,22 +1,33 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 AUX xournal-0.4.5-xoprint-len.patch 4299 RMD160 e1fe28debea0d010494aa79f3a6eaf47853dd0b2 SHA1 2b642dc6d01a8c89095e150323ca755276000636 SHA256 0b2bb739e2719658186df82379f083daf71f0a6883aeb7f93f97312cf4cdb96e 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.patch 792 RMD160 6516d38a26159f63f2a2daae8a1f24448ce0a06d SHA1 583ead6936d06b9c07e57920f93e9d40fe3f1f05 SHA256 2e44dc7deafd62dcd01d1aca848a7bcb5bf93d648625e76715f0be03c45386c5 DIST xournal-0.4.5-sjg-image-rev7.patch.gz 24137 RMD160 9a389ecf98dfc2b709555b8efc0c0f440fe4fa00 SHA1 96a2d88e5ff2b9452a1acf46592e650eb5088c8d SHA256 ac89ceb35941d9a13804fd6650f1a6b84474b3f50c89682611f2f9e66af96705 DIST xournal-0.4.5.tar.gz 425062 RMD160 a4228e6874482bd381c59cd8e3db1100361c1d40 SHA1 390cb275774469ed1b04b7268dd625bd456c895e SHA256 a7d7c2cb544451939779276e6e5ee5acc756bd0efb5253de15dc00bfe07755d1 DIST xournal-0.4.5_p20111022-sjg-image-rev7.patch.gz 21551 RMD160 6048a996fdb7b43e05beff67cf5ae0da53cff840 SHA1 0ff950726a7ad5b0012421c158406d6d49d2c38d SHA256 88b050483fc27f37f307adb358b3e5c4bfc0b600b7d3427599dea4c1ffe87fc2 DIST xournal-0.4.5_p20111022.tar.xz 332700 RMD160 6578c037ad536c0173c533758c5f86ffc046dfbe SHA1 69f66e1125ba3de3deea14be1eb6d7e8f07abe61 SHA256 46573706645a78f1cbdd9e3eed0b2409ab61947eb5f78be9c1b7d7e4535f721f EBUILD xournal-0.4.5-r2.ebuild 1294 RMD160 d123c46f65d0c25e1c134d0e99c15f2f6503f6e5 SHA1 1c50cdbc98773a000e87ad8eee2d720513d21040 SHA256 6e9e1dd61017407aa6c734c15510a98de913f2a5637e0210e3a9b9f9da8cc38a -EBUILD xournal-0.4.5_p20111022-r1.ebuild 1321 RMD160 31252719040e714e34557a5e14e25eed79512167 SHA1 9210f8bacd3085570f31e837fdb3b1da7b056a9f SHA256 7b761e9875cfd7bd419d7478732486d3b64e32ac6a25f0be1744dca11dd53f09 +EBUILD xournal-0.4.5_p20111022-r1.ebuild 1360 RMD160 33e40e6641ea97887e1a3b56dec378a36de80b7a SHA1 14675cd3f91f560e1709773230d5189e20d10714 SHA256 05dce04e141c22faa3986afd954ee3187cc643a8c06ce1b6f04d494e37ff2b8b EBUILD xournal-0.4.5_p20111022.ebuild 1240 RMD160 fa82fb5c1ac4033dcd30e0853378e9f781a9df10 SHA1 d4abe9a92b5bd4998dda91e45ef75b60d0e6c84b SHA256 6156e93806823a09b4c9f66a50d656faff1e69954dfab7af37c79efc76434320 -MISC ChangeLog 4490 RMD160 cf4857c653eb829ef4fd350b09857ceca19c143f SHA1 0c74a06be3dde3e93af470a8b49d701d6bb08090 SHA256 ae56bc6bab94e66d9b65694dedcbd6cb202e087b86fd41cac80a5e60a7079f78 +MISC ChangeLog 4679 RMD160 53040ab2e873ce73be210af93f9bc956d67430aa SHA1 e2b4a0a451309ae44480decdf16d41710804571a SHA256 6a7c0b69648428225fe693747678b1105e974ef16093cb37f494d98d5cfc0e3b MISC metadata.xml 561 RMD160 994fde5a7482cd84910d37246072d1fd848da7c5 SHA1 cc77d272a12b97e7e08a2764086c78746fc919e4 SHA256 e0c14d0d41505ee0ff810d8bfd6f6ac751b287e84d171d114f5a48becf91b7c1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk7ONyEACgkQCaWpQKGI+9T5bgCfWnCKSrxu56Izd5MDBqpD/hgs -3ZkAnR+CDAY16XwBUMsNP8iw8s2oTPk3 -=2YX+ +iQIcBAEBCgAGBQJO1B0TAAoJENwGBM22xffem5sP/RdD89hSWzcaHLOJrWyypuju +9XiYrOpAMC/3V1vDGmeU1rw/YWJ+t3JrRvFUFwm+hY/oO+lzOeUwou+9t5IhIi1V +ELPRBt82Kxy7CmCC+R1TXnePHsEsyO0oc9NTqteVJmRl7k8ke8SksUHpH+4rlt8y +viPgkdA1V3YyFeBPVz86Ngg+Iy7IOshRhB+MQosIf8C8Pn3z+29QkL8zWaVrEBCm +EhO1LZrayBi1DXSnzAJUO5dp2HJPoP/w5oyYZX5peRiZwWCd2BRQm9TRRQW9W1bz +D4LoSE6V25VUxflLM+QP5hcwx7egWI6Gk6Ciurs/+KQtXTGy2jelpZekjKlwPHnI +HptW6zbm1Yz/zz8YCNmnhP1OcVfUkm47VGwIDiW/I4JzdpA9Bf2ioONj1XHP0Xw4 +oMSpySw3KrFdwysd9TZBwiekcmSm1zzVlOpuz4dJYoRQw3zu5yyDUIhY13/7mGUw +0LlinZPIuvLGOs/0hG9QjRqwo1VD+Xl3c8Akn3o4qZOpFvhpHb/QrBzyv8neKlac +Ef2NgcEMchrVKNIn6R5mso8eYx1SYeaIJcpoZejpvIsa3gzIXyB4q/iycCDRPa2w +9ruq0dBechn2a2MCgg/ZlI7VAicXZdLnf4mmiaC/WNPBuYsNxB7g9BNv7ecjTny+ +1FUcKVy1/JAi6lBcxrE7 +=4KP+ -----END PGP SIGNATURE----- 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() { |