diff options
| author | Maciej Mrozowski <reavertm@gentoo.org> | 2010-09-06 18:48:45 +0200 |
|---|---|---|
| committer | Maciej Mrozowski <reavertm@gentoo.org> | 2010-09-06 18:53:00 +0200 |
| commit | 6e7969db80bd07f0e10ce21ecedab6ec4dbf84ed (patch) | |
| tree | 604780cb854a340cb4320c1bb79ef1d12517d707 | |
| parent | a94749f6a6b84060f3c98a03fbd22340620eb681 (diff) | |
| download | kde-6e7969db80bd07f0e10ce21ecedab6ec4dbf84ed.tar.gz kde-6e7969db80bd07f0e10ce21ecedab6ec4dbf84ed.tar.bz2 kde-6e7969db80bd07f0e10ce21ecedab6ec4dbf84ed.zip | |
[kde-base/libkonq] Fix patch (it actually applies only to trunk)
This reverts commit f078bc1f4c9ce742d8ac53eb70d849432049ff10.
| -rw-r--r-- | kde-base/libkonq/Manifest | 5 | ||||
| -rw-r--r-- | kde-base/libkonq/files/fix_includes_install.patch | 12 | ||||
| -rw-r--r-- | kde-base/libkonq/files/libkonq-4.5.56-cmake.patch | 15 | ||||
| -rw-r--r-- | kde-base/libkonq/libkonq-9999.ebuild | 2 |
4 files changed, 24 insertions, 10 deletions
diff --git a/kde-base/libkonq/Manifest b/kde-base/libkonq/Manifest index 915615ee891..5c61629a303 100644 --- a/kde-base/libkonq/Manifest +++ b/kde-base/libkonq/Manifest @@ -1,7 +1,8 @@ -AUX fix_includes_install.patch 447 RMD160 3fa7ed8ea143a61b8679db2141e47c0c9a171b4c SHA1 c4c79a91287c5a7ee91c7b3e5cc191c207b85196 SHA256 cc7c09f3517e3660010575460cbd2b60e9a9b48e3a27762a640163c2ee17f703 +AUX fix_includes_install.patch 465 RMD160 94f2fa7ee7715bb59f5de40db05d2a2572e98313 SHA1 b94c82e7b50c3d600ec6359009d97dcb0df95e26 SHA256 308356ee9f9eacaf5bd75457498eae08fe895546b31275a06cd08ca59181ad2a +AUX libkonq-4.5.56-cmake.patch 447 RMD160 3fa7ed8ea143a61b8679db2141e47c0c9a171b4c SHA1 c4c79a91287c5a7ee91c7b3e5cc191c207b85196 SHA256 cc7c09f3517e3660010575460cbd2b60e9a9b48e3a27762a640163c2ee17f703 DIST kdebase-4.5.1.tar.bz2 2611115 RMD160 690affc112fe1550a928d9546454c8d2a606bd1e SHA1 fbeaa5cf6770e3ea82865c3523708f85689d5107 SHA256 8bce667812f9dcb7e2018334009ac9942c07144a5d682260af0d8e12f2d0e819 EBUILD libkonq-4.4.9999.ebuild 381 RMD160 ce6bcaf7c463ff2b530cbf049d24e37674de52f0 SHA1 90a5939c22a8b4c4699e03a0a1b18e91ced4f4b7 SHA256 344412ac7cf5ee3e228f3ff67bc01b7c0fc1df22a3dcb12b09bb69646b65b562 EBUILD libkonq-4.5.1.ebuild 433 RMD160 8e3ae3bf7998d07cff7d3d14d6dfde4cea7ad4f3 SHA1 a3abc0f3fc797326956250f1817067eb4b7fc960 SHA256 4cefca36f31a79778663863dfa3eb40cfcb62fb3a27e4a47a328531ee6a9194f EBUILD libkonq-4.5.9999.ebuild 381 RMD160 ce6bcaf7c463ff2b530cbf049d24e37674de52f0 SHA1 90a5939c22a8b4c4699e03a0a1b18e91ced4f4b7 SHA256 344412ac7cf5ee3e228f3ff67bc01b7c0fc1df22a3dcb12b09bb69646b65b562 -EBUILD libkonq-9999.ebuild 381 RMD160 ce6bcaf7c463ff2b530cbf049d24e37674de52f0 SHA1 90a5939c22a8b4c4699e03a0a1b18e91ced4f4b7 SHA256 344412ac7cf5ee3e228f3ff67bc01b7c0fc1df22a3dcb12b09bb69646b65b562 +EBUILD libkonq-9999.ebuild 379 RMD160 85add060a434b0ba02c6772c8c8511918c10bb29 SHA1 789cc1ab7f61488410f9ad26b7bb07f4c8b581c0 SHA256 927e1f4984b81c71423dad96a4e9f051f1935c324bae06776c432a7f095cacd1 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/libkonq/files/fix_includes_install.patch b/kde-base/libkonq/files/fix_includes_install.patch index c079ed02c47..2d5efbdb9d7 100644 --- a/kde-base/libkonq/files/fix_includes_install.patch +++ b/kde-base/libkonq/files/fix_includes_install.patch @@ -1,15 +1,13 @@ -Index: lib/konq/CMakeLists.txt -=================================================================== ---- lib/konq/CMakeLists.txt (revision 1172114) -+++ lib/konq/CMakeLists.txt (working copy) -@@ -58,7 +58,9 @@ - konq_dndpopupmenuplugin.h +diff -ru libkonq/apps/lib/konq/CMakeLists.txt libkonqfixed/apps/lib/konq/CMakeLists.txt +--- libkonq/apps/lib/konq/CMakeLists.txt 2008-04-27 19:08:19.000000000 +0000 ++++ libkonqfixed/apps/lib/konq/CMakeLists.txt 2008-04-27 19:09:31.000000000 +0000 +@@ -42,7 +42,8 @@ + konq_popupmenu.h knewmenu.h konq_menuactions.h - # konq_copytomenu.h - anyone needs it? + konq_copytomenu.h + konq_popupmenuinformation.h -+ konq_statusbarmessagelabel.h konq_operations.h libkonq_export.h konq_events.h diff --git a/kde-base/libkonq/files/libkonq-4.5.56-cmake.patch b/kde-base/libkonq/files/libkonq-4.5.56-cmake.patch new file mode 100644 index 00000000000..c079ed02c47 --- /dev/null +++ b/kde-base/libkonq/files/libkonq-4.5.56-cmake.patch @@ -0,0 +1,15 @@ +Index: lib/konq/CMakeLists.txt +=================================================================== +--- lib/konq/CMakeLists.txt (revision 1172114) ++++ lib/konq/CMakeLists.txt (working copy) +@@ -58,7 +58,9 @@ + konq_dndpopupmenuplugin.h + knewmenu.h + konq_menuactions.h +- # konq_copytomenu.h - anyone needs it? ++ konq_copytomenu.h ++ konq_popupmenuinformation.h ++ konq_statusbarmessagelabel.h + konq_operations.h + libkonq_export.h + konq_events.h diff --git a/kde-base/libkonq/libkonq-9999.ebuild b/kde-base/libkonq/libkonq-9999.ebuild index 3a89f6a5f40..b76953aa8af 100644 --- a/kde-base/libkonq/libkonq-9999.ebuild +++ b/kde-base/libkonq/libkonq-9999.ebuild @@ -16,4 +16,4 @@ RESTRICT="test" KMSAVELIBS="true" -PATCHES=( "${FILESDIR}/fix_includes_install.patch" ) +PATCHES=( "${FILESDIR}/${PN}-4.5.56-cmake.patch" ) |