| 1 |
commit: 5232c09207fa5d063b0c06cd6e450f92600beccb |
| 2 |
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de> |
| 3 |
AuthorDate: Wed Aug 3 21:57:37 2011 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 3 21:57:37 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=5232c092 |
| 7 |
|
| 8 |
Add experimental as-needed patch |
| 9 |
|
| 10 |
(Portage version: 2.1.10.9/git/Linux x86_64, signed Manifest commit with key B6C5F7DE) |
| 11 |
|
| 12 |
--- |
| 13 |
app-office/libreoffice/ChangeLog | 4 ++ |
| 14 |
app-office/libreoffice/Manifest | 31 ++++++++++--------- |
| 15 |
.../files/libreoffice-3.4.2.3-as-needed.patch | 32 ++++++++++++++++++++ |
| 16 |
app-office/libreoffice/libreoffice-3.4.2.3.ebuild | 1 + |
| 17 |
4 files changed, 53 insertions(+), 15 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog |
| 20 |
index b791d5c..07ec81b 100644 |
| 21 |
--- a/app-office/libreoffice/ChangeLog |
| 22 |
+++ b/app-office/libreoffice/ChangeLog |
| 23 |
@@ -2,6 +2,10 @@ |
| 24 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
# $Header: $ |
| 26 |
|
| 27 |
+ 03 Aug 2011; Andreas K. Huettel <dilfridge@g.o> |
| 28 |
+ libreoffice-3.4.2.3.ebuild, +files/libreoffice-3.4.2.3-as-needed.patch: |
| 29 |
+ Add experimental as-needed patch |
| 30 |
+ |
| 31 |
*libreoffice-3.4.9999 (03 Aug 2011) |
| 32 |
*libreoffice-3.4.2.3 (03 Aug 2011) |
| 33 |
*libreoffice-3.3.3 (03 Aug 2011) |
| 34 |
|
| 35 |
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest |
| 36 |
index a115ab5..6948830 100644 |
| 37 |
--- a/app-office/libreoffice/Manifest |
| 38 |
+++ b/app-office/libreoffice/Manifest |
| 39 |
@@ -13,6 +13,7 @@ AUX libreoffice-3.3.1-neon_remove_SSPI_support.diff 1081 RMD160 9c91936b136055a6 |
| 40 |
AUX libreoffice-3.3.2-bison25.diff 911 RMD160 b3335fe3728e97b69bde744dcd34dc27d4f3212c SHA1 857406c4735f9bcb0d1a7bd0b1dec3b444142ac6 SHA256 d16a9c2a41d2a5669208eac33212920e2d356da60d30e9dc5126ccd13319464b |
| 41 |
AUX libreoffice-3.4.1-salfix.diff 668 RMD160 3764e664888b423d81f9e78def6c2a93e037a462 SHA1 10e0128da7ddebdae3b52983e91363940b151cf1 SHA256 3adf1eab52b80c34b3ef1f8ab26eb6171af4515c8e05a264dcf10bd7c45e20e7 |
| 42 |
AUX libreoffice-3.4.2-allopts.txt 40633 RMD160 24d91b414bcbb2dc92230901e452664318b2ce83 SHA1 fd914f7562c20d427a53fb7d2b95f4b0c3bc6b05 SHA256 54c7f92331ab064c713af6fb268e980dfcdf95e289efb05e63970b6a3b345a10 |
| 43 |
+AUX libreoffice-3.4.2.3-as-needed.patch 1112 RMD160 334c7ee6109b4121dea78715fef00320c945a49e SHA1 ca816ea54146c574fd18d9b8f616c4ae17f04a4d SHA256 b922b27ee671bd936709500ff750a48bba4463ea11738b798f643e5a7ac545a6 |
| 44 |
AUX libreoffice-as-needed-gtk.patch 403 RMD160 c1c5733d282eb3b59b7fe03d5258e9c917d9c6c4 SHA1 7516a3d554d96b7a27e5884ef124f9f5166a5939 SHA256 88609b6bac793423dee7af79110a05981669471170f9473a2bc591d35927117a |
| 45 |
AUX libreoffice-fix-sandbox-install.patch 1609 RMD160 e79859f6343e04808cc261c101483ff2ba0f1a5d SHA1 579d30eafb7a7e54531faf4bc8d3bd35150494f7 SHA256 fdb54126c78837d73e7a095ceedba9329b121ce2ce1d1a23ad75247b8f144b50 |
| 46 |
AUX libreoffice-gbuild-use-cxxflags.patch 353 RMD160 97f0c4cffe624ca8df71471cae61975176464847 SHA1 d1a2de4de89055fc4150f27022ea9f0fa5a34f20 SHA256 27ccd9ec886f2f6433969524860b3fa7199531b5f5d774f7643d6bc75883222a |
| 47 |
@@ -168,24 +169,24 @@ DIST libreoffice-writer-3.4.2.3.tar.bz2 7294695 RMD160 2a7210c518376d9fe5c6e8a50 |
| 48 |
DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c |
| 49 |
EBUILD libreoffice-3.3.1.ebuild 18572 RMD160 d92d1933c8bbde7d28425b11717614cf6cf7b1e0 SHA1 60ef1f62c341ce7997de7ff5bcef04b304f4dfd9 SHA256 a3fae0a7f7da4a92e67d9c86ba4e7f92a92bbfac8f40a2703c64f317b670da6b |
| 50 |
EBUILD libreoffice-3.3.3.ebuild 18134 RMD160 95cf52bf10765cd9bb7862c673dc57a96bcca376 SHA1 4a001ff974125839ad5219915bb2f8399e6f90f8 SHA256 a60d52f57767ac5e9f46ad5204dd27b4f4a45ac1468357c41462b502d37b8626 |
| 51 |
-EBUILD libreoffice-3.4.2.3.ebuild 18684 RMD160 50b255c478ac0ed0ab9f6ed08213a12296e74b20 SHA1 d9a50903e2d7efd214d537d604ad3ac37d56e111 SHA256 701192c80ebd1a7fcd14c807665fda8f82f2c2a9af694fe3d5f2876dd40b2b18 |
| 52 |
+EBUILD libreoffice-3.4.2.3.ebuild 18729 RMD160 8e6f4347cde684ba3b2f75d8f90b557af1746a1d SHA1 d1038b7316a7e824896b58a15c6ba12184e6efec SHA256 2bc7dfc1fa280dea232d9250e5c4d36c6ec5d4d4176ec94f8b91541a9e8a1a49 |
| 53 |
EBUILD libreoffice-3.4.9999.ebuild 18637 RMD160 80bca4571deb9d80c2c3ada76531d2b11bf7efab SHA1 f8b990b335c8d848f218e727e172c1e0bbfb4c71 SHA256 cf98d148b57783327d4d2d256ada2d03d048444888c987d0e38c781c4719df15 |
| 54 |
-MISC ChangeLog 843 RMD160 39e53937ed9d08e7f0486fbf2032de90118a78ca SHA1 16ff9012ea83bb609866ef54babf62533bf81a8f SHA256 8c988c447507cf73cb5a035027be6dc4942686659dc3d81c3d3f598b0fceafd5 |
| 55 |
+MISC ChangeLog 1010 RMD160 745848712b7d6969611218df3ef47b3bfc8b78e8 SHA1 169d00fd7bae240fb23ca178215ba83ae00b2143 SHA256 acaf70494c72581c7cc701cd334d3362200d52b056c882f207682f3635320085 |
| 56 |
MISC metadata.xml 1070 RMD160 5a010568eabba00eaa6193765fa5d181462dc5a5 SHA1 9973d230e4e10704136eddd33c8e20ddf485ba9f SHA256 c15b697bd70ccf20aef38b02b55a316cc02df24e027daf6d9b0d185d920469b3 |
| 57 |
-----BEGIN PGP SIGNATURE----- |
| 58 |
Version: GnuPG v2.0.17 (GNU/Linux) |
| 59 |
|
| 60 |
-iQIcBAEBCgAGBQJOOcM9AAoJENwGBM22xffeh38P/2uj7BUgRH0lQcIUp19QE+/O |
| 61 |
-17Ub3I4vlU2MFdlCjKsTqzRzFfH1Xmhv0ys/UDylfusxGKmej1qsZgqVuYNmoq2k |
| 62 |
-iFveFnfWj0p2/XgXsRpOvP7ou5b85qmA20BgQNeUiSSDyvwNo/MwNgggN3K3PyVi |
| 63 |
-BvR3xF5JYpCdc6CbcIpfk4RkA+jVzNSEhQReLd7i7AjgiFJAdkHbDDFj+WM4ldz8 |
| 64 |
-tjXQkx+AREGqGyue600A64YIafMDBzXG6qPmtf77DSj3qK+2kSRSZHvNCOPbhJFz |
| 65 |
-GtHVuEFHgMoxoqymUEHYToL3dRXyHIuTfiWlDfmh1iwSBhsxoxf4HN9GVtsWjBIe |
| 66 |
-P3BUcWk+tFYuoz1lCRXr1o4Di6hFXS/BhW6FfIY7v3UDLdzbUWlWOupehC4cz8oW |
| 67 |
-DrR4IvYRzI7V87q6TS9IbKH58MP4YVLXk3t01OcpBKQP9+UjkaFbE+4qlYFZG37V |
| 68 |
-zU+y5hBJcbEdUSZdq6YnjEVWopCKHjvu3CDaEI7O362hzrF68etV0aTHsyNj3txj |
| 69 |
-f4R1d9SP3cZBIEopFgDTUUyHgw14Ix+P4+QwOEhfEn9w1WyDsPQfVybRfhedILPd |
| 70 |
-3GOtwIW5ojp7Xr6OkS2EeuLxbuct5XoSMUHjFVWfE7g9mC39mY7/Gkn00MLKJQPe |
| 71 |
-zivK7RLnpiMRT94YobBb |
| 72 |
-=jVYd |
| 73 |
+iQIcBAEBCgAGBQJOOcRQAAoJENwGBM22xffe8okP/1rgrh4ix/GtyzFBa1yNNEJ7 |
| 74 |
+CCUmS4V3I/u6hfJ7RMsFkflwb4omJqxL3XYvX5swBlWEM7cG0D7yOmASbC/SlNjl |
| 75 |
+0VbHs0d8TPvsQV9ffV0ZdWyQa7EAKZL5nIKo0HhyW+Z3KKWjLMCUvnGp4qtxK/D7 |
| 76 |
+4w1YlFigfOp71Dv3Yaqg1qkt6fg1aOAkoPCxoEp3Xk/n2QtId0EfVUW3QmPGI3wz |
| 77 |
+p4Dqs8eSKuo2+RAT9N55FVlbdz7QgQv8imxbuvUoW5DijX9ZgL6/9KV3jJVBF0ku |
| 78 |
+yWFPae+eucKWSZCbzEnouMxIvMYewrF/ByNZifVv7QeHItADuQ5sXyiuodTR9+Sw |
| 79 |
+RSomlyEbn4HqsfZRLhbh59bZY1IHRBVdAHHq2fVnrxt2frfMP6UjMwomdC+MQFvp |
| 80 |
+BM5N5ccVBXzIBXhbw8ZhAzX9bwwFiunLAA8l/VCkCes2PS73keYLYbx/DB70WARR |
| 81 |
+Bqd4Jtkhz2cDyhyIteA3JtJAsjjdKcqe43gvd1Bu8f+zk/Gx+633Yzz5wuF71B0Q |
| 82 |
+NlH0p4gtKnLuq8nqf3IpkTAhPqrYBaCP3lRzrNed4NSeWt5Meh7LFCgCooshX1pd |
| 83 |
+1EuHlgCyfjV5D09V1bbXzrWXkCnptL1ZckNUld7cD7PcOPJ2d0+ShoFEnFzUEGPI |
| 84 |
+8nxuwB89W1tLm5tQ+Pnw |
| 85 |
+=mVE2 |
| 86 |
-----END PGP SIGNATURE----- |
| 87 |
|
| 88 |
diff --git a/app-office/libreoffice/files/libreoffice-3.4.2.3-as-needed.patch b/app-office/libreoffice/files/libreoffice-3.4.2.3-as-needed.patch |
| 89 |
new file mode 100644 |
| 90 |
index 0000000..1dddb0e |
| 91 |
--- /dev/null |
| 92 |
+++ b/app-office/libreoffice/files/libreoffice-3.4.2.3-as-needed.patch |
| 93 |
@@ -0,0 +1,32 @@ |
| 94 |
+From 7f54882a2b2a769a49d539fac0922320de51c848 Mon Sep 17 00:00:00 2001 |
| 95 |
+From: Petr Mladek <pmladek@××××.cz> |
| 96 |
+Date: Mon, 1 Aug 2011 21:16:58 +0200 |
| 97 |
+Subject: [PATCH] fix build with -Wl,--no-as-needed |
| 98 |
+ |
| 99 |
+--- |
| 100 |
+ binfilter/filter/source/bf_offwrp/makefile.mk | 2 +- |
| 101 |
+ 1 files changed, 1 insertions(+), 1 deletions(-) |
| 102 |
+ |
| 103 |
+diff --git a/binfilter/filter/source/bf_offwrp/makefile.mk b/binfilter/filter/source/bf_offwrp/makefile.mk |
| 104 |
+index d65beed..0545931 100644 |
| 105 |
+--- a/binfilter/filter/source/bf_offwrp/makefile.mk |
| 106 |
++++ b/binfilter/filter/source/bf_offwrp/makefile.mk |
| 107 |
+@@ -52,7 +52,6 @@ SHL1STDLIBS= \ |
| 108 |
+ $(BFSVTOOLLIB) \ |
| 109 |
+ $(BFOFALIB) \ |
| 110 |
+ $(VCLLIB) \ |
| 111 |
+- $(SOTLIB) \ |
| 112 |
+ $(SALLIB) \ |
| 113 |
+ $(TOOLSLIB) \ |
| 114 |
+ $(CPPULIB) \ |
| 115 |
+@@ -64,6 +63,7 @@ SHL1STDLIBS= \ |
| 116 |
+ $(BFSCLIB) \ |
| 117 |
+ $(BFSVXLIB) \ |
| 118 |
+ $(BFSO3LIB) \ |
| 119 |
++ $(SOTLIB) \ |
| 120 |
+ $(UNOTOOLSLIB) \ |
| 121 |
+ $(COMPHELPERLIB) \ |
| 122 |
+ $(LEGACYSMGRLIB) |
| 123 |
+-- |
| 124 |
+1.7.3.4 |
| 125 |
+ |
| 126 |
|
| 127 |
diff --git a/app-office/libreoffice/libreoffice-3.4.2.3.ebuild b/app-office/libreoffice/libreoffice-3.4.2.3.ebuild |
| 128 |
index c34dfee..f2b3d89 100644 |
| 129 |
--- a/app-office/libreoffice/libreoffice-3.4.2.3.ebuild |
| 130 |
+++ b/app-office/libreoffice/libreoffice-3.4.2.3.ebuild |
| 131 |
@@ -236,6 +236,7 @@ PATCHES=( |
| 132 |
"${FILESDIR}/${PN}-translate-toolkit-parallel-solenv.patch" |
| 133 |
"${FILESDIR}/${PN}-gbuild-use-cxxflags.patch" |
| 134 |
"${FILESDIR}/${PN}-installed-files-permissions.patch" |
| 135 |
+ "${FILESDIR}/${PN}-3.4.2.3-as-needed.patch" |
| 136 |
) |
| 137 |
|
| 138 |
# Uncoment me when updating to eapi4 |
Archives