diff options
| -rw-r--r-- | kde-base/okular/ChangeLog | 11 | ||||
| -rw-r--r-- | kde-base/okular/Manifest | 21 | ||||
| -rw-r--r-- | kde-base/okular/files/okular-4.9.0-close-url.patch | 27 | ||||
| -rw-r--r-- | kde-base/okular/okular-4.8.5-r2.ebuild (renamed from kde-base/okular/okular-4.8.5-r1.ebuild) | 7 | ||||
| -rw-r--r-- | kde-base/okular/okular-4.9.0-r2.ebuild (renamed from kde-base/okular/okular-4.9.0-r1.ebuild) | 7 |
5 files changed, 58 insertions, 15 deletions
diff --git a/kde-base/okular/ChangeLog b/kde-base/okular/ChangeLog index 46d9136118e4..5431d1679821 100644 --- a/kde-base/okular/ChangeLog +++ b/kde-base/okular/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for kde-base/okular # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/ChangeLog,v 1.147 2012/08/18 11:23:54 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/ChangeLog,v 1.148 2012/08/18 18:33:48 johu Exp $ + +*okular-4.9.0-r2 (18 Aug 2012) +*okular-4.8.5-r2 (18 Aug 2012) + + 18 Aug 2012; Johannes Huber <johu@gentoo.org> + +files/okular-4.9.0-close-url.patch, +okular-4.8.5-r2.ebuild, + +okular-4.9.0-r2.ebuild, -okular-4.8.5-r1.ebuild, -okular-4.9.0-r1.ebuild: + Backport another upstream patch, which fixes a regression pulled in by last + revision. Spotted by octoploid <cryptooctoploid@gmail.com>, bug #431858. *okular-4.8.5-r1 (18 Aug 2012) *okular-4.9.0-r1 (18 Aug 2012) diff --git a/kde-base/okular/Manifest b/kde-base/okular/Manifest index 27ea87513964..e42b55f71854 100644 --- a/kde-base/okular/Manifest +++ b/kde-base/okular/Manifest @@ -1,6 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX okular-4.9.0-close-url.patch 814 SHA256 c25c259b5ec4c746a94f469c39c733106816f5611c39e64805ff0374f6cc1ef7 SHA512 bcdfd35c75516bc1667b98838183e358455b13058ea871e032c8c97a47268d56e971f6c07b3fff37f2bbab75ddce06f0daf51608cd5e7b5e48e43c05be06ef32 WHIRLPOOL 48f3928d73b557dd6ee529905d65f64a99e703af2b72e1b57c557f0f7a8a356017685c01b51de66f3ae6cf5c5a2cd0b10468684e83408b0f8dfe122520358835 AUX okular-4.9.0-memory-corruption-warning.patch 926 SHA256 e8b71da65e2ec02d72f95bb55c585752824843f5dbe2cd0b117a473a0b93f066 SHA512 8181de7d38afa06c7a9826277a30be035451f6fb8096f9b04a302086ecad26763e3dd517f7f971c6bdf77809b2f5f322307bee81fe7db89846ac996dc0c111ff WHIRLPOOL d7b57d132fe317dd53f5432f1570f3d87fb488d613752b5b65b26f25ce9f2279d71d1a71fc67a1568f89de432f154d8852b1b69c6eeef59171bd9b427092d876 DIST okular-4.7.4.tar.bz2 1172730 SHA256 2b22733a253dc47547229e02fcb4366bad8cf339b7cd3b243f41836fdb73a10f DIST okular-4.8.3.tar.xz 1114200 SHA256 3dcc5f5b8a02eea14a28b4681d10f6f06240c0579135bb0252ae0e3caaaa8e79 SHA512 dfefca2f70e3caae4fbcea8d98e50f7eb61062ebdfb03589fcdef4618148a614bfe7d76785ab990e7a034338fdcad4f2097f42b8321b9e47ad5642280ac8c652 WHIRLPOOL 007ddf3a7eb1822bcbcaa8c12b1967a351d63d2f28cbb2dcb7650335d6bdb7414e0edd354ecf819185bdc0e706f9aab49716dacb5e8f36adeeb19cffe96e1cdd @@ -8,18 +9,18 @@ DIST okular-4.8.5.tar.xz 1115100 SHA256 4121b734c3351ac443b4ca6fb23723c4e290168c DIST okular-4.9.0.tar.xz 1368636 SHA256 b68b79c0ff39dee884185cb5457ac1228ef846f71dbc61df5b87fa617ff18685 SHA512 29e2bc72e9047ec9c87b822bd6b935030f1e6e091a3206b65c964e717ca2f0259e1c4f137861fb407b827d246f30bae2f6f9e231a1ab503a423ba2e1678b317e WHIRLPOOL 2a893b8123e80497fc38f3827a8ccd0874060f5bbe5c41d1bf2f1211aede5e7afb642a184e50b9e5d13f891365419d0f16c8325cda35c8b74d4230e1bd93dd2b EBUILD okular-4.7.4.ebuild 1235 SHA256 69b7e032efb4d187e39bdfae5734f4220fc1ca5b4a1d90cfd01342a23eb41a83 SHA512 a7049033831f717e01caea0d29138b8e5e0f360a25e2acc1bfccd80659788299102e39f0d3819264f9c2da2927f80a1036382916c1f504168262213a916a56b5 WHIRLPOOL df225c671e4eae2e909bd8ae0134475206f1e0dfa6af7554395fd5dab13692b12305c492bfb2f9a39155acaa7b6dfd90902634441a602a475fcfa5b520d09d1b EBUILD okular-4.8.3.ebuild 1236 SHA256 e84785c914bb9f412213355887c912c33d96452011b05d65c470103390bba18a SHA512 be9f422155ed4e11cc81e53a9eaaa4968400cab6f0ac5d6a61b120471fc654cf936c547c05c43d516e4b5cb61c2ad3dca7263a17bf045e00dfc76fa48cfb915d WHIRLPOOL 24851c41dfad86708f2cf39c3733abb338bb3def09215f0e1e22b868049e6656384231a33bb80c31e57be3d3c3930be0ce5149fbf18f35c35364c0c5b4a22c31 -EBUILD okular-4.8.5-r1.ebuild 1307 SHA256 f3e82a185a8099cb9a11b2d0921a51177431b348e5d7b2aada3a0ee9bccffd8c SHA512 0fba88d76175a96125fabaa3f3d5efa76578f634b6fb1276eade52696856367989c906e4e22a4e09cb6e9e03e93e5b6a4f613c85ea08bf21973007622b8a91ed WHIRLPOOL 4cf209bd2571af9515a6cfb37164bcf8ab6057624ec63eee0fe44d19c1960a2bc1b6d86bd7df28266233f0a3f8d8d7a730d1ce5d4356c6a656fa4bfd8fc16806 -EBUILD okular-4.9.0-r1.ebuild 1283 SHA256 4c64c379a2a3ee46c0cbbc08a800c0ebccd8a6b207ec09990fc8f4f2e1fb668a SHA512 2307d3904124e15948e0f3ee2b8b5fc7dd7e58cd1d64c2a806484fefc69065a8f63b9c4955243ef8ec7c6fb41ae1da0a184c8a96fb68a020250a4abc6489c345 WHIRLPOOL bb3d186340cefd6b28ca55fca503e4bf362fecd5ee858e51c6b9cef01eb76106485391571413f7e26308eaa2642a446dbe153e97d8cfd0ba1102b32a4ec34637 -MISC ChangeLog 19272 SHA256 9224ea4d7f2834b591c6ae4a9e7843a0e5949a5f9c2cdcf7fc17e8747d6f3c09 SHA512 a59a107593cbece25f5bd31fc8523792d1096192fb94e3a75c632a0133d35ecf6333c804d9191ca78f0386c1f624cd2a95a78d769d60c768baa75a40dcb715fc WHIRLPOOL 325058fac54e43f52009e193ce5ac838703f79e0cc8478783f8dd3ff8e9c2fa4fd5c6d89f2c047aae8d83d52f3962b6f04a566b8308b97a9244fbbd87a04cea4 +EBUILD okular-4.8.5-r2.ebuild 1351 SHA256 1cf16c7d76391cfcabc4f5e1b4b3087973b3bda834f5c8c79008ad4bf411a5ed SHA512 b597e0a13630798cebdc5146ab52d83ad6f0eecea27a4074a9c4b9ab549078a4613e29efe4cde1a65fd96466281d6964edb04205e4b94b41b64af273a52a03d7 WHIRLPOOL df80fc06dc5f318a83bfbfe61c4e479b6c817f640abd66d8d9fd062b6f72c031328b135e97b5e3406b3161c978307e3bfa7b19c2a17dc93c2075aed698c5aef7 +EBUILD okular-4.9.0-r2.ebuild 1320 SHA256 28ac25a82468d7bacf10e98db0399c78fa8304249c04d193d8bc44412895cdd8 SHA512 c4c08445418f9e781bd15bf83a91744dfb473ca3ceeb3724bee135718e91dbd7e189f72aec647ffe1f9c35bac480590c3c1cf70b8f2a665c0f6aa630608cd5d4 WHIRLPOOL eaac7383a23ff9782aa505682223cac7eaf8c962b241c5270c76d6e5ee9593835d232fe390297971bb75a68e663f7c1bdaa5723ad982bc6127c3bcaf49c0b6ba +MISC ChangeLog 19678 SHA256 78c2619ee77fc535d6e4887e43d740d2cb41911ad6ca6f82dbe134d63bc50f36 SHA512 e01c4b951e447aeb0cadb9bb8edf1dc8a12c947a5daf2de3857b702f9b6b10426fce235884213ecc289be382132be683f3f06f172cc40c4ee257181d51737777 WHIRLPOOL 7a824570de6010a4ec4e2c73300db1d9d91b1515cd8688220dd9a1a29da46ccb12ef8e675ca58b8f3d572764fd476a25cfd3060bc78c0e96d25335bf2befed0f MISC metadata.xml 294 SHA256 557f49cd0cd9cf5b25379d440ad05014daa7a33fedb5ebba80da47ca941dcea8 SHA512 37fc6b9030de704514c939dfbfc7ee50a3acfbecd68d60111b36d8a7781c9e8120317eb64d9a3b5c2cb3bcbb08f0e6719676a9814a59c3bb207a25e46dd31407 WHIRLPOOL 99ba787a4e6c42a437e35aa344ac0e4b9160149dc9a164d53171c08024d5dd9ea4c866c19cf35a25cf3c838db9c88feae9c75080eb1a9d19b17f89b7b98895a7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJQL3tYAAoJEO+t9ga+3I3aD9oH/RUEUF8gshYvsIpyO92pziAI -J8WMG9VZcMuV3pPMHnKEqO1I/mJrMOHEE4+jXfCz8KOz1Oe6T5mEZNA1oQiGKRBx -gSYNKdtikG+ib4sFS7Q1fjzqn2TEaPPJsMv37QlffNZsKikAclaXALCV1HugCi7D -A3Gwycvj/fEmeiWKdBk5p5qxP16ECVtwiWraV4MRMWWpbZs83UZxj0VyhPqseEih -X8BDUj/8ptTuJAH7zsuiShcJpdSinOrA6k6qT8bC76e3qTtwK3ZFJDqzk4Kaes64 -reISX0dYv5NIdPtJvq2ZOLdGN2DGFWcCpUqR5/TqVqOphRkoCJ0nx+/eahzGTKo= -=SsZ4 +iQEcBAEBCAAGBQJQL+AVAAoJEO+t9ga+3I3aKEEH/RKby/OA3YIEUyFHFnuCHa0e +HZ1SN6+yZ5m9+n107MTWOrh4WbCAGIoLav7m45qBYgxTxTUS+9EBzwaLNheGFypx +C5gf90juzdATVVyHC8D/tmIpKlxeYn20CbTmh9o5lVlEtF6FpcumNFmaa2p3/NBL +GK/oG6Mc3cwqWUSItFYZbMiU0UBwLDFEzyUS3FnzOqs2hj86yZHZkt7nbMcvzVnj +8pAUTXWT9pFHZrVdCkHsEYn8b/TnMFZTDY11iwwIb//9/U/78dzr+Zn/GIx70k02 +tzunzh1vxp9kD8plGXweXfs5eOuhXQ6RtmNKSI0iUs11DmnPKjpJSTyHoEn2l1Q= +=/M29 -----END PGP SIGNATURE----- diff --git a/kde-base/okular/files/okular-4.9.0-close-url.patch b/kde-base/okular/files/okular-4.9.0-close-url.patch new file mode 100644 index 000000000000..385ec26b3626 --- /dev/null +++ b/kde-base/okular/files/okular-4.9.0-close-url.patch @@ -0,0 +1,27 @@ +commit aa042bd0f416edfb0eedcac6be6ba90b1c1c161c +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Aug 18 18:36:30 2012 +0200 + + Close the url on shell destruction + + Otherwise we end up in a busy loop on part deletion if there are pending requests + Should not happen but if this fixes it don't see the need to lose time investigating + why given the number of todo things + +diff --git a/shell/shell.cpp b/shell/shell.cpp +index df40f7d..8b99ce4 100644 +--- a/shell/shell.cpp ++++ b/shell/shell.cpp +@@ -119,7 +119,11 @@ void Shell::delayedOpen() + + Shell::~Shell() + { +- if ( m_part ) writeSettings(); ++ if ( m_part ) ++ { ++ writeSettings(); ++ m_part->closeUrl(); ++ } + m_part = 0; // It is deleted by the KPart/QObject machinery + if ( m_args ) + m_args->clear(); diff --git a/kde-base/okular/okular-4.8.5-r1.ebuild b/kde-base/okular/okular-4.8.5-r2.ebuild index 8daae58d7835..8a15370495e0 100644 --- a/kde-base/okular/okular-4.8.5-r1.ebuild +++ b/kde-base/okular/okular-4.8.5-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/kde-base/okular/okular-4.8.5-r1.ebuild,v 1.1 2012/08/18 11:23:54 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/okular-4.8.5-r2.ebuild,v 1.1 2012/08/18 18:33:48 johu Exp $ EAPI=4 @@ -27,7 +27,10 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${PN}-4.9.0-memory-corruption-warning.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-4.9.0-memory-corruption-warning.patch" + "${FILESDIR}/${PN}-4.9.0-close-url.patch" +) src_configure() { mycmakeargs=( diff --git a/kde-base/okular/okular-4.9.0-r1.ebuild b/kde-base/okular/okular-4.9.0-r2.ebuild index 1857d6695c7f..7bfe77838125 100644 --- a/kde-base/okular/okular-4.9.0-r1.ebuild +++ b/kde-base/okular/okular-4.9.0-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/kde-base/okular/okular-4.9.0-r1.ebuild,v 1.1 2012/08/18 11:23:54 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/okular-4.9.0-r2.ebuild,v 1.1 2012/08/18 18:33:48 johu Exp $ EAPI=4 @@ -27,7 +27,10 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${P}-memory-corruption-warning.patch" ) +PATCHES=( + "${FILESDIR}/${P}-memory-corruption-warning.patch" + "${FILESDIR}/${P}-close-url.patch" +) src_configure() { mycmakeargs=( |