[gentoo-commits] proj/kde:master commit in: kde-base/libkonq/files/, kde-base/libkonq/

[gentoo-commits] proj/kde:master commit in: kde-base/libkonq/files/, kde-base/libkonq/

[Michael Palimaka]

commit:     7cfbc2faa27d474a7c4d6360ddda272b9ec271b2
Author:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
AuthorDate: Tue Apr 24 09:46:57 2012 +0000
Commit:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Tue Apr 24 09:46:57 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7cfbc2fa

[kde-base/libkonq] Update patch to reflect changes upstream, and add description.

(Portage version: 2.1.10.57/git/Linux x86_64, unsigned Manifest commit)

---
 kde-base/libkonq/files/libkonq-4.5.56-cmake.patch |   15 -------------
 kde-base/libkonq/files/libkonq-4.8.3-cmake.patch  |   23 +++++++++++++++++++++
 kde-base/libkonq/files/libkonq-4.9.0-cmake.patch  |   15 +++++++++++++
 kde-base/libkonq/libkonq-4.8.49.9999.ebuild       |    2 +-
 kde-base/libkonq/libkonq-9999.ebuild              |    2 +-
 5 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/kde-base/libkonq/files/libkonq-4.5.56-cmake.patch b/kde-base/libkonq/files/libkonq-4.5.56-cmake.patch
deleted file mode 100644
index c079ed0..0000000
--- a/kde-base/libkonq/files/libkonq-4.5.56-cmake.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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/files/libkonq-4.8.3-cmake.patch b/kde-base/libkonq/files/libkonq-4.8.3-cmake.patch
new file mode 100644
index 0000000..dea16d4
--- /dev/null
+++ b/kde-base/libkonq/files/libkonq-4.8.3-cmake.patch
@@ -0,0 +1,23 @@
+These headers are required to compile dolphin.
+
+diff --git a/lib/konq/CMakeLists.txt b/lib/konq/CMakeLists.txt
+index 8ecbfa9..9fcbb3c 100644
+--- a/lib/konq/CMakeLists.txt
++++ b/lib/konq/CMakeLists.txt
+@@ -59,7 +59,7 @@ install( FILES
+  konq_dndpopupmenuplugin.h
+  knewmenu.h
+  konq_menuactions.h
+- # konq_copytomenu.h - anyone needs it?
++ konq_copytomenu.h
+  konq_operations.h
+  libkonq_export.h
+  konq_events.h
+@@ -69,6 +69,7 @@ install( FILES
+  kversioncontrolplugin2.h
+  konq_historyprovider.h
+  konq_historyentry.h
++ konq_statusbarmessagelabel.h
+ DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel
+ )
+ install( FILES konqpopupmenuplugin.desktop konqdndpopupmenuplugin.desktop  DESTINATION  ${SERVICETYPES_INSTALL_DIR} )

diff --git a/kde-base/libkonq/files/libkonq-4.9.0-cmake.patch b/kde-base/libkonq/files/libkonq-4.9.0-cmake.patch
new file mode 100644
index 0000000..53865b5
--- /dev/null
+++ b/kde-base/libkonq/files/libkonq-4.9.0-cmake.patch
@@ -0,0 +1,15 @@
+This header is required for dolphin.
+
+diff --git a/lib/konq/CMakeLists.txt b/lib/konq/CMakeLists.txt
+index 8ecbfa9..445afd9 100644
+--- a/lib/konq/CMakeLists.txt
++++ b/lib/konq/CMakeLists.txt
+@@ -59,7 +59,7 @@ install( FILES
+  konq_dndpopupmenuplugin.h
+  knewmenu.h
+  konq_menuactions.h
+- # konq_copytomenu.h - anyone needs it?
++ konq_copytomenu.h
+  konq_operations.h
+  libkonq_export.h
+  konq_events.h

diff --git a/kde-base/libkonq/libkonq-4.8.49.9999.ebuild b/kde-base/libkonq/libkonq-4.8.49.9999.ebuild
index a2e8549..6184497 100644
--- a/kde-base/libkonq/libkonq-4.8.49.9999.ebuild
+++ b/kde-base/libkonq/libkonq-4.8.49.9999.ebuild
@@ -16,4 +16,4 @@ RESTRICT="test"
 
 KMSAVELIBS="true"
 
-PATCHES=( "${FILESDIR}/${PN}-4.5.56-cmake.patch" )
+PATCHES=( "${FILESDIR}/${PN}-4.8.3-cmake.patch" )

diff --git a/kde-base/libkonq/libkonq-9999.ebuild b/kde-base/libkonq/libkonq-9999.ebuild
index a2e8549..7fa5e64 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}/${PN}-4.5.56-cmake.patch" )
+PATCHES=( "${FILESDIR}/${PN}-4.9.0-cmake.patch" )

[gentoo-commits] proj/kde:master commit in: kde-base/libkonq/files/, kde-base/libkonq/

[Michael Palimaka]

commit:     8bb39f00b762f36ac8849073a4414dceab853412
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 25 12:44:24 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Sep 25 12:44:24 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8bb39f00

[kde-base/libkonq] Install headers required by kfind.

Package-Manager: portage-2.2.10

---
 kde-base/libkonq/files/libkonq-5-cmake.patch | 14 ++++++++++++++
 kde-base/libkonq/libkonq-9999.ebuild         |  2 ++
 2 files changed, 16 insertions(+)

diff --git a/kde-base/libkonq/files/libkonq-5-cmake.patch b/kde-base/libkonq/files/libkonq-5-cmake.patch
new file mode 100644
index 0000000..d3f1a73
--- /dev/null
+++ b/kde-base/libkonq/files/libkonq-5-cmake.patch
@@ -0,0 +1,14 @@
+Install headers required by kfind.
+
+diff --git a/lib/konq/src/CMakeLists.txt b/lib/konq/src/CMakeLists.txt
+index 1186f32..9c05b9f 100644
+--- a/lib/konq/src/CMakeLists.txt
++++ b/lib/konq/src/CMakeLists.txt
+@@ -60,6 +60,7 @@ install(FILES
+     konq_historyentry.h
+     konq_historyprovider.h
+     konq_operations.h
++    konq_popupmenu.h
+     konq_popupmenuplugin.h
+     kversioncontrolplugin.h
+     kversioncontrolplugin2.h

diff --git a/kde-base/libkonq/libkonq-9999.ebuild b/kde-base/libkonq/libkonq-9999.ebuild
index 3903043..5163e0f 100644
--- a/kde-base/libkonq/libkonq-9999.ebuild
+++ b/kde-base/libkonq/libkonq-9999.ebuild
@@ -40,4 +40,6 @@ RDEPEND="${DEPEND}
 
 RESTRICT="test"
 
+PATCHES=( "${FILESDIR}/${PN}-5-cmake.patch" )
+
 S=${S}/lib/konq

[gentoo-commits] proj/kde:master commit in: kde-base/libkonq/files/, kde-base/libkonq/

[Michael Palimaka]

commit:     e663df3de08eed30dc6e126ab6b887d3e6dae691
Author:     Elias Probst <mail <AT> eliasprobst <DOT> eu>
AuthorDate: Fri Oct 24 19:38:16 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Oct 25 16:26:17 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e663df3d

[kde-base/libkonq] Drop libkonq-5-cmake.patch (upstreamed)

Upstream commit: fc4c339d619efa3f5ef9df0e52b0c212ba07c2d1

Package-Manager: portage-2.2.14

---
 kde-base/libkonq/files/libkonq-5-cmake.patch | 14 --------------
 kde-base/libkonq/libkonq-9999.ebuild         |  2 --
 2 files changed, 16 deletions(-)

diff --git a/kde-base/libkonq/files/libkonq-5-cmake.patch b/kde-base/libkonq/files/libkonq-5-cmake.patch
deleted file mode 100644
index d3f1a73..0000000
--- a/kde-base/libkonq/files/libkonq-5-cmake.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Install headers required by kfind.
-
-diff --git a/lib/konq/src/CMakeLists.txt b/lib/konq/src/CMakeLists.txt
-index 1186f32..9c05b9f 100644
---- a/lib/konq/src/CMakeLists.txt
-+++ b/lib/konq/src/CMakeLists.txt
-@@ -60,6 +60,7 @@ install(FILES
-     konq_historyentry.h
-     konq_historyprovider.h
-     konq_operations.h
-+    konq_popupmenu.h
-     konq_popupmenuplugin.h
-     kversioncontrolplugin.h
-     kversioncontrolplugin2.h

diff --git a/kde-base/libkonq/libkonq-9999.ebuild b/kde-base/libkonq/libkonq-9999.ebuild
index 762c4b1..a7e38e9 100644
--- a/kde-base/libkonq/libkonq-9999.ebuild
+++ b/kde-base/libkonq/libkonq-9999.ebuild
@@ -41,6 +41,4 @@ RDEPEND="${DEPEND}
 
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}/${PN}-5-cmake.patch" )
-
 S=${S}/lib/konq