Cleanup the patch not to apply that much changes.

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 4adc5afedb50c04eb35ac66085142ca4724c7277..830fd31032335424370437f2dffec623c0f719d0 100644 (file)
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.151 2011/09/29 13:42:10 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.152 2011/09/29 14:09:59 scarabeus Exp $
+
+  29 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  files/libreoffice-poppler-0.18.0.patch:
+  Cleanup the patch not to apply that much changes.
 
   29 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   +files/libreoffice-poppler-0.18.0.patch, libreoffice-3.4.3.2-r1.ebuild:

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index d92cee09119823f692f430b900d93e33b4b4a11d..741facf1737230324cf8d59c54690864d9ad69da 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -23,7 +23,7 @@ AUX libreoffice-installed-files-permissions.patch 374 RMD160 83d650b6b0e84a02e2a
 AUX libreoffice-java.patch 1879 RMD160 2a1a3ab82a9eb526d09beed577b98be24f485e33 SHA1 08f7d6c300e494ba9f056b941752419872d6d2cc SHA256 beab05671a22a685acf0a60bff8ed65deaa2b2ba79c79b6fcff59d87e2a7ecd4
 AUX libreoffice-kill-cppunit.patch 555 RMD160 97655715899b1518b3c7935e6db504196f561d00 SHA1 05d28cbc51ca13b8f77c95e78a1810318a423afc SHA256 5d792f868f0dec1ee3147a1054e127ecbf07aa33a69132a5f60e3b692896543e
 AUX libreoffice-libdb5-fix-check.diff 1197 RMD160 dea8896745502035e899f9f685c662a1dbdfbbeb SHA1 07202400d8c17a12cb965331ddbef57c4438e7be SHA256 f8532c4ee3ebb8cb424cbb736abcb7b3c7027fd7c749f39571e76527808bd51a
-AUX libreoffice-poppler-0.18.0.patch 1160 RMD160 b15e3c478eda9a6efbd22ae2b10d45c36218344d SHA1 bea65d40f42bc874e59d91ab6aba29b57f0738ed SHA256 638ae5f41aef015a5fa87d7c7293b8180a16870f142c90c86d6347e251fc01d8
+AUX libreoffice-poppler-0.18.0.patch 885 RMD160 9745263963377bf7a9bd0b675a1f080f190e8614 SHA1 3079b643390e46a92a34d7cd3ee2ebe5366ac3ba SHA256 66f2a281c4feebffce5ac634177186a353e2712648cb71a3ac335a4cc4b1787a
 AUX libreoffice-solenv-build-crash.patch 492 RMD160 b5220c76d90e785a5bb38548cad8d5d9d73de7d2 SHA1 a0571d2301ce9f03ff5b58326906fe2078ea39b5 SHA256 45276cdc69444a0542bac4e949ef92bac4286db58b824198a59f797bd71c81f6
 AUX libreoffice-svx.patch 1347 RMD160 91d5f142df33d119666252ecc319dc4e7ec70f6d SHA1 020db7d4e784a131acc63413ccc625715d44df70 SHA256 dbcd451e390c78102075b048e1472cb45c8d960608bef4ac0c0611c7aeaea736
 AUX libreoffice-translate-toolkit-parallel-solenv.patch 439 RMD160 03aad89f6ee542243e599e80419a270b040916ca SHA1 c5c41c21881e6b6de7c7c784f66c640f6a06a1c6 SHA256 cf8ab3923825706d6607c7efc28c26eedac886a4678586129e75be1b689d1ea1
@@ -175,22 +175,22 @@ EBUILD libreoffice-3.3.4.ebuild 18146 RMD160 1c71a223f37c402ab01d95b71dfa5af2c69
 EBUILD libreoffice-3.4.3.2-r1.ebuild 18392 RMD160 988b114219c3914cf18ca8c60fbc6012d310a5a7 SHA1 cf661741a45d50f8489a2c0160701570b4bc0c5b SHA256 0d2d3450a86f19b9959c4efa9e37828cda5a8d313ae7e9e401087a921e313e40
 EBUILD libreoffice-3.4.9999-r1.ebuild 18444 RMD160 6209f79b7aee2ef034810b62a30d80a6c573e683 SHA1 76cd9106979325bbc55127c9a37d83514f179a11 SHA256 578c8666330d5e81c00f11127f6c671e780addb01ac8052dcf508388b691c8fb
 EBUILD libreoffice-9999-r1.ebuild 14073 RMD160 a5c3bbd8bddf989c1293599ed93ca78fd4126eab SHA1 05e064546c1405491947863697c224746d6c586a SHA256 706099d21db822bfcfda507b9fd1ad2935c1687f22c324e1a4aca455fd81573a
-MISC ChangeLog 28738 RMD160 2fd5b594561aa379de99cf99b3b768873511c1ac SHA1 56bc6667b836486f53ff9846ac57f0154777ede3 SHA256 da8c20c0121293de83277feb54f66ddef08224efd7e07761144630237f6a9e0c
+MISC ChangeLog 28888 RMD160 f59cbefe460f8c9156f0ed786f1d8146f7daba3b SHA1 b10db3c2bdf755f73a6cf0f1742bfd87506fbe9a SHA256 50ca4b9aaf5099ebe67b47d5252f08f4f53cb2d200cea34b01d399477518afe3
 MISC metadata.xml 1060 RMD160 d45f264670abdfa12c42935b489af5f462f70189 SHA1 d3932fab9bb5ab0bc404a95c60fa6a03f08044bd SHA256 f7a39bf4b3077ec5bada9e35940d1a02dcf9a62b77a56cc6346f750528a1e092
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOhHWRAAoJEOSiRoyO7jvo5HMQAKFLalSOlBH7gtKYHdIa0lkZ
-UYnIciT5CYZt8ImhBRYF6J357xqoMTdnflYMrAHNDKpielAlx6j8nbgatYyhznZb
-s4BZYJrQhS2iW9U0Elxh9TTrzDnTd+OQpQJ4eWLmEYJQyp4k/7nyHTDNPP4hwUJw
-128Y9jMq3plV+3Rn7feNX0OJo3ZNB7NopkMPaFtnFVMTP0yMro5D9HRUOrfiozQC
-WT/RIMWCvBrOC9uaiGmO+YEReVOIK+JnFWInrZahN7qGWM6hFMbEuxm6T/jOBL7G
-T2O+/90jIGMcUQJ8bDSkgzYzsrbN9Y7K+9kzHNvTmzl4afK8YRuDEAFf8whH1PP7
-szbqhGC7ScBElnu+hWa5Iqfl3xadowdvm9offsWJA9GTMQp0NhRg7yvzSN8PB+TP
-fO6xLyb5HZyprJsQAqYVkiDud/h0SC30aJPy4prUPIsI9d085e547MfaQycAHWex
-iUEMlGNvQxeGN7U0HWwLSyASe/K1VAw5MYS/bZqJ/uy3qKhYQx2JtC05/9U1vA4j
-Hmq4uLt1i0VVRA2DKr6hGejeonG7H53HubzODkAlpxz2bc+FVniaDlEIeqMU1beA
-BNizVAINHoOYXMfz8Kk4Jr0Ipz2KAbtInk2dgyl84qPY8J8MoRo35GXzkOsy3A33
-t4eZyJmpa33GQ7FOKmdS
-=/EhH
+iQIcBAEBAgAGBQJOhHw3AAoJEOSiRoyO7jvouDQQAJTG+FC7xyJuQvxap3/wptNG
+AjlE2LFwrwiKzYkjPq0LvTEdD8nkJo0MlDZ/j0hIbvdvUW68phE3c4n3OWH3QRxo
+pu8bJg6cPYsQSoTB5lUrAYX9peQTsqWZYBnIhCipGlhwqBM4U377y/vcxSMT5Nwn
+N8kCzYG4PKtDCGd/EsNyn9WwfXiopt9i9fhWY+jWY0dmTaAr9utyySylc7rDnhvO
+MXHEuMBg7p8csXwDJCHibsPx776/G6LMZEYMsxjZMrP94qC+p3BpNHWmSeV7/IjX
+nyZskAb7ZY8dmFA7dBEKcto+1ca9ItQQFBOL9UjHqmDe0r31V9oD5O2evB+B6Ytz
+cw++AeEdY7Wmfb9U/eYnu0gGjCsqMwzJpYua5xZkWR9LpUqsJAkaqoKp8oB1JOQo
+xkNmUZIskGa5005olRXYhCecHTXXpMU28MoerxtK6opY5MlxzeejjItdpbyx68gt
+TAYiEiGzncvpLOwT22f/fTdx/ONDw28ogz0xrpNkZMjzbpJrndZTz/l3kkX5awBr
+GkTNmS3ZOVYrLiw3T29SjNr7FZUPF2HVecohLn3MyNfDwZy3IWUbwSuyoGl1uO4O
+9q/5eHpiUZJ/TBawguRa1awsWSLOAglJ7jq+Rhy0tF8OTv3OzSKKO2bc6Duc3H6Y
+vTg0tAsM3QVVdgYjij8x
+=dQ3G
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/files/libreoffice-poppler-0.18.0.patch b/app-office/libreoffice/files/libreoffice-poppler-0.18.0.patch
index 5d4729465ff3e817de6e9b1e1f5152702839d891..87fbe41c48fd65b03879424f82fa92453de5c1f6 100644 (file)
--- a/app-office/libreoffice/files/libreoffice-poppler-0.18.0.patch
+++ b/app-office/libreoffice/files/libreoffice-poppler-0.18.0.patch
@@ -20,14 +20,5 @@ index cf28922..3f1261c 100644
      str->reset();
  
      int c;
-@@ -490,7 +494,7 @@ void PDFOutDev::endPage()
- }
- 
- #if POPPLER_CHECK_VERSION(0, 17, 0)
--void PDFOutDev::processLink(AnnotLink *link, Catalog *catalog)
-+void PDFOutDev::processLink(AnnotLink *link, Catalog *)
- #else
- void PDFOutDev::processLink(Link* link, Catalog*)
- #endif
 --
 cgit v0.9.0.2-2-gbebe