rpms/konq-plugins/devel konq-plugins-4.3.3-kde4380-webkitkde.patch, NONE, 1.1 konq-plugins.spec, 1.37, 1.38

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/konq-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10866/devel

Modified Files:
	konq-plugins.spec 
Added Files:
	konq-plugins-4.3.3-kde4380-webkitkde.patch 
Log Message:
* Thu Dec 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.3-4
- fix build with KDE 4.3.80's version of webkitkde (upstream patch)

konq-plugins-4.3.3-kde4380-webkitkde.patch:
 CMakeLists.txt           |   54 ++++++++++++++++++++++++++---------------------
 config-babelfish.h.cmake |    3 --
 plugin_babelfish.cpp     |    4 +--
 3 files changed, 33 insertions(+), 28 deletions(-)

--- NEW FILE konq-plugins-4.3.3-kde4380-webkitkde.patch ---
Index: babelfish/config-babelfish.h.cmake
===================================================================
--- babelfish/config-babelfish.h.cmake	(revision 1056180)
+++ babelfish/config-babelfish.h.cmake	(revision 1056181)
@@ -1,2 +1 @@
-#cmakedefine HAVE_WEBKITKDE 1
-#cmakedefine HAVE_WEBVIEW 1
+#cmakedefine HAVE_WEBKITPART 1
Index: babelfish/CMakeLists.txt
===================================================================
--- babelfish/CMakeLists.txt	(revision 1056180)
+++ babelfish/CMakeLists.txt	(revision 1056181)
@@ -1,15 +1,7 @@
+project(babelfish)
 
-
-
 include(MacroOptionalDependPackage)
 
-MACRO_OPTIONAL_DEPEND_PACKAGE(KdeWebKit "kdewebkit")
-if(DEPEND_PACKAGE_KdeWebKit)
-        macro_optional_find_package(KdeWebKit QUIET)
-else(DEPEND_PACKAGE_KdeWebKit)
-        set(KDEWEBKIT_FOUND FALSE)
-endif(DEPEND_PACKAGE_KdeWebKit)
-
 MACRO_OPTIONAL_DEPEND_PACKAGE(WebKitPart "webkitpart")
 if(DEPEND_PACKAGE_WebKitPart)
         macro_optional_find_package(WebKitPart QUIET)
@@ -17,20 +9,29 @@
         set(WEBKITPART_FOUND FALSE)
 endif(DEPEND_PACKAGE_WebKitPart)
 
-if( WEBKITPART_FOUND AND KDEWEBKIT_FOUND)
-    set(WEBKITKDE_FOUND true)
-endif( WEBKITPART_FOUND AND KDEWEBKIT_FOUND)
 
+if(${KDE_VERSION} VERSION_LESS 4.3.74) # newer kdelibs versions include webkitkde
+    MACRO_OPTIONAL_DEPEND_PACKAGE(KdeWebKit "kdewebkit")
+    if(DEPEND_PACKAGE_KdeWebKit)
+            macro_optional_find_package(KdeWebKit QUIET)
+    else(DEPEND_PACKAGE_KdeWebKit)
+            set(WEBKITPART_FOUND FALSE)
+    endif(DEPEND_PACKAGE_KdeWebKit)
+endif(${KDE_VERSION} VERSION_LESS 4.3.74)
 
-macro_log_feature(WEBKITKDE_FOUND "WebKitKde" "Webkitkde libraries and header files" "" FALSE "" "Webkitkde is necessary to compile support for WebKitKde.")
 
-macro_bool_to_01(WEBKITKDE_FOUND HAVE_WEBKITKDE)
+macro_log_feature(WEBKITPART_FOUND "WebKitKde" "Webkitkde libraries and header files" "https://svn.kde.org/home/kde/trunk/playground/libs/webkitkde" FALSE "" "Webkitkde is necessary to compile Babelfish support for WebKitKde.")
 
+macro_bool_to_01(WEBKITPART_FOUND HAVE_WEBKITPART)
 
-if( WEBKITKDE_FOUND )
-    include_directories(${KDEWEBKIT_INCLUDE_DIR})
+
+if( WEBKITPART_FOUND )
+    if(${KDE_VERSION} VERSION_LESS 4.3.74)
+        include_directories(kwebkit ${KDEWEBKIT_INCLUDE_DIR})
+    endif(${KDE_VERSION} VERSION_LESS 4.3.74)
+
     include_directories(${WEBKITPART_INCLUDE_DIR})
-endif(WEBKITKDE_FOUND)
+endif(WEBKITPART_FOUND)
 
 
 
@@ -46,11 +47,17 @@
 
 
 target_link_libraries(babelfishplugin  ${KDE4_KHTML_LIBS} )
-if( WEBKITKDE_FOUND)
-    target_link_libraries(babelfishplugin ${WEBKITPART_LIBRARIES} ${KDEWEBKIT_LIBRARIES} ${QT_QTWEBKIT_LIBRARY} )
-endif(WEBKITKDE_FOUND)
+if( WEBKITPART_FOUND)
+    if(${KDE_VERSION} VERSION_LESS 4.3.74)
+        target_link_libraries(babelfishplugin ${KDEWEBKIT_LIBRARIES})
+    else(${KDE_VERSION} VERSION_LESS 4.3.74)
+        target_link_libraries(babelfishplugin ${KDE4_KDEWEBKIT_LIBS})
+    endif(${KDE_VERSION} VERSION_LESS 4.3.74)
 
+    target_link_libraries(babelfishplugin ${WEBKITPART_LIBRARIES} ${QT_QTWEBKIT_LIBRARY})
+endif(WEBKITPART_FOUND)
 
+
 install(TARGETS babelfishplugin  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
 
@@ -58,8 +65,7 @@
 
 install( FILES plugin_babelfish.rc plugin_babelfish.desktop  DESTINATION  ${DATA_INSTALL_DIR}/khtml/kpartplugins )
 install( FILES translaterc  DESTINATION  ${CONFIG_INSTALL_DIR} )
-if(WEBKITKDE_FOUND)
+if(WEBKITPART_FOUND)
    install( FILES plugin_babelfish.rc plugin_babelfish.desktop  DESTINATION  ${DATA_INSTALL_DIR}/webkitpart/kpartplugins )
-endif(WEBKITKDE_FOUND)
-kde4_install_icons( ${ICON_INSTALL_DIR}   )
-
+endif(WEBKITPART_FOUND)
+kde4_install_icons(${ICON_INSTALL_DIR})
Index: babelfish/plugin_babelfish.cpp
===================================================================
--- babelfish/plugin_babelfish.cpp	(revision 1056180)
+++ babelfish/plugin_babelfish.cpp	(revision 1056181)
@@ -41,7 +41,7 @@
 #include <KConfigGroup>
 #include <KHTMLPart>
 
-#ifdef HAVE_WEBKITKDE
+#ifdef HAVE_WEBKITPART
 #include <webkitpart.h>
 #include <QWebView>
 #endif
@@ -246,7 +246,7 @@
   }
   else
   {
-#ifdef HAVE_WEBKITKDE
+#ifdef HAVE_WEBKITPART
       WebKitPart *part = dynamic_cast<WebKitPart *>(parent());
       hasSelection = !part->view()->selectedText().isEmpty();
       selection = part->view()->selectedText();


Index: konq-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/konq-plugins/devel/konq-plugins.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- konq-plugins.spec	25 Nov 2009 01:39:59 -0000	1.37
+++ konq-plugins.spec	10 Dec 2009 00:59:10 -0000	1.38
@@ -2,13 +2,15 @@
 
 Name:           konq-plugins
 Version:        4.3.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Additional plugins that interact with konqueror
 
 Group:          Applications/Internet
 License:        GPLv2+ and LGPLv2+
 URL:            http://extragear.kde.org
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/extragear/konq-plugins-%{version}.tar.bz2
+# fix build with KDE 4.3.80's version of webkitkde (upstream patch)
+Patch100:       konq-plugins-4.3.3-kde4380-webkitkde.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: cmake
@@ -48,6 +50,7 @@ Some additional plugins that interact wi
 
 %prep
 %setup -q
+%patch100 -p0 -b .webkitkde
 
 
 %build
@@ -138,6 +141,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Thu Dec 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.3-4
+- fix build with KDE 4.3.80's version of webkitkde (upstream patch)
+
 * Wed Nov 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.3-3
 - rebuild for Qt 4.6.0 RC1 in F13 (was built against Beta 1 with unstable ABI)