summaryrefslogtreecommitdiff
path: root/kde-base/libkonq/files
diff options
context:
space:
mode:
authorMaciej Mrozowski <reavertm@gentoo.org>2010-09-06 18:48:45 +0200
committerMaciej Mrozowski <reavertm@gentoo.org>2010-09-06 18:53:00 +0200
commit6e7969db80bd07f0e10ce21ecedab6ec4dbf84ed (patch)
tree604780cb854a340cb4320c1bb79ef1d12517d707 /kde-base/libkonq/files
parenta94749f6a6b84060f3c98a03fbd22340620eb681 (diff)
downloadkde-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.
Diffstat (limited to 'kde-base/libkonq/files')
-rw-r--r--kde-base/libkonq/files/fix_includes_install.patch12
-rw-r--r--kde-base/libkonq/files/libkonq-4.5.56-cmake.patch15
2 files changed, 20 insertions, 7 deletions
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