From 7856f3eaaf7aa4e050e1c4a54a10c678ca8018b7 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 07:17:54 +0000 Subject: [PATCH 01/10] Initialize branch F-12 for webkitkde --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From 0ab15abd2ad22e6ac94c4eecd001a71aa34ccb8b Mon Sep 17 00:00:00 2001 From: nucleo Date: Mon, 9 Nov 2009 14:21:20 +0000 Subject: [PATCH 02/10] snapshot 1046552 with new API --- sources | 2 +- webkitkde.spec | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 5779ee9..9deb4c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eccfb5d3f6c973f18b4b55cb01789756 webkitkde-0.0.1-svn.tar.bz2 +4718a0c0acceb4c0abcd5b570037ac9f webkitkde-0.0.1-svn.tar.bz2 diff --git a/webkitkde.spec b/webkitkde.spec index 61b9459..89320f2 100644 --- a/webkitkde.spec +++ b/webkitkde.spec @@ -1,6 +1,6 @@ Name: webkitkde Version: 0.0.1 -Release: 0.2.20090924svn%{?dist} +Release: 0.5.20091109svn%{?dist} Summary: QtWebKit bindings to KDE Group: System Environment/Libraries License: LGPLv2+ @@ -22,7 +22,6 @@ URL: http://techbase.kde.org/Projects/WebKit # # To create a new checkout use it with anonymous svn access # ./create_tarball.rb -n -a webkitkde -# svn revision 1027811 Source0: %{name}-%{version}-svn.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake gettext @@ -132,6 +131,9 @@ fi %{_kde4_appsdir}/cmake/modules/FindWebKitPart.cmake %changelog +* Mon Nov 9 2009 Alexey Kurov - 0.0.1-0.5.20091109svn +- snapshot 1046552 with new API + * Sun Sep 27 2009 Alexey Kurov - 0.0.1-0.2.20090924svn - webkitpart should owns kpartplugins in webkitpart apps dir From bced83abe924dd19cc8f34e0eaa667a63be9809b Mon Sep 17 00:00:00 2001 From: nucleo Date: Mon, 9 Nov 2009 14:42:35 +0000 Subject: [PATCH 03/10] removed kdelauncher from CMakeLists because it not installs --- webkitkde-remove-kdelauncher.patch | 10 ++++++++++ webkitkde.spec | 7 ++++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 webkitkde-remove-kdelauncher.patch diff --git a/webkitkde-remove-kdelauncher.patch b/webkitkde-remove-kdelauncher.patch new file mode 100644 index 0000000..0b4c3d3 --- /dev/null +++ b/webkitkde-remove-kdelauncher.patch @@ -0,0 +1,10 @@ +--- webkitkde-0.0.1-svn/CMakeLists.txt 2009-11-09 15:48:59.000000000 +0200 ++++ webkitkde-0.0.1-svn/CMakeLists.txt 2009-11-09 16:25:23.000000000 +0200 +@@ -14,7 +14,6 @@ + add_subdirectory(icons) + add_subdirectory(kdewebkit) + add_subdirectory(part) +-add_subdirectory(kdelauncher) + find_package(Msgfmt REQUIRED) + find_package(Gettext REQUIRED) + add_subdirectory( po ) diff --git a/webkitkde.spec b/webkitkde.spec index 89320f2..47f66ab 100644 --- a/webkitkde.spec +++ b/webkitkde.spec @@ -1,6 +1,6 @@ Name: webkitkde Version: 0.0.1 -Release: 0.5.20091109svn%{?dist} +Release: 0.6.20091109svn%{?dist} Summary: QtWebKit bindings to KDE Group: System Environment/Libraries License: LGPLv2+ @@ -23,6 +23,7 @@ URL: http://techbase.kde.org/Projects/WebKit # To create a new checkout use it with anonymous svn access # ./create_tarball.rb -n -a webkitkde Source0: %{name}-%{version}-svn.tar.bz2 +Patch0: webkitkde-remove-kdelauncher.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake gettext BuildRequires: kdelibs4-devel @@ -62,6 +63,7 @@ Development files for the webkitpart. %prep %setup -q -n %{name}-%{version}-svn +%patch0 -p1 %build mkdir -p %{_target_platform} @@ -131,6 +133,9 @@ fi %{_kde4_appsdir}/cmake/modules/FindWebKitPart.cmake %changelog +* Mon Nov 9 2009 Alexey Kurov - 0.0.1-0.6.20091109svn +- removed kdelauncher from CMakeLists because it not installs + * Mon Nov 9 2009 Alexey Kurov - 0.0.1-0.5.20091109svn - snapshot 1046552 with new API From 1bc19af08d18d78e8ea8914d42ca913438e53a60 Mon Sep 17 00:00:00 2001 From: nucleo Date: Mon, 9 Nov 2009 15:52:12 +0000 Subject: [PATCH 04/10] version changed to 0.0.2 for new API --- .cvsignore | 2 +- sources | 2 +- webkitkde.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 478b7f1..7a4ce84 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -webkitkde-0.0.1-svn.tar.bz2 +webkitkde-0.0.2-svn.tar.bz2 diff --git a/sources b/sources index 9deb4c6..172f8b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4718a0c0acceb4c0abcd5b570037ac9f webkitkde-0.0.1-svn.tar.bz2 +a4a7e6bb355a15a21f2949986567e3c1 webkitkde-0.0.2-svn.tar.bz2 diff --git a/webkitkde.spec b/webkitkde.spec index 47f66ab..45c58ec 100644 --- a/webkitkde.spec +++ b/webkitkde.spec @@ -1,6 +1,6 @@ Name: webkitkde -Version: 0.0.1 -Release: 0.6.20091109svn%{?dist} +Version: 0.0.2 +Release: 0.1.20091109svn%{?dist} Summary: QtWebKit bindings to KDE Group: System Environment/Libraries License: LGPLv2+ @@ -17,7 +17,7 @@ URL: http://techbase.kde.org/Projects/WebKit # mainmodule = playground # submodule = libs # kde_release = no -# version = 0.0.1-svn +# version = 0.0.2-svn # docs = no # # To create a new checkout use it with anonymous svn access @@ -133,6 +133,9 @@ fi %{_kde4_appsdir}/cmake/modules/FindWebKitPart.cmake %changelog +* Mon Nov 9 2009 Alexey Kurov - 0.0.2-0.1.20091109svn +- version changed to 0.0.2 for new API + * Mon Nov 9 2009 Alexey Kurov - 0.0.1-0.6.20091109svn - removed kdelauncher from CMakeLists because it not installs From d4ddbe2098a16bd08e5e77b1c33104f590f7bbb8 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:15:57 +0000 Subject: [PATCH 05/10] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f3656ef..6f594a5 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: webkitkde -# $Id$ +# $Id: Makefile,v 1.1 2009/09/25 16:30:04 kevin Exp $ NAME := webkitkde SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From fdf145cda78c4cb5d559e3c08b0701079449b0c5 Mon Sep 17 00:00:00 2001 From: nucleo Date: Wed, 10 Feb 2010 09:25:49 +0000 Subject: [PATCH 06/10] Update to svn 1079265 --- .cvsignore | 2 +- sources | 2 +- webkitkde-remove-kdelauncher.patch | 10 ---- webkitkde-svn1079265.patch | 48 +++++++++++++++++++ webkitkde.spec | 74 +++++++++++++++++++++++------- 5 files changed, 108 insertions(+), 28 deletions(-) delete mode 100644 webkitkde-remove-kdelauncher.patch create mode 100644 webkitkde-svn1079265.patch diff --git a/.cvsignore b/.cvsignore index 7a4ce84..549be18 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -webkitkde-0.0.2-svn.tar.bz2 +webkitkde-0.0.4-svn.tar.bz2 diff --git a/sources b/sources index 172f8b7..e98b3bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a4a7e6bb355a15a21f2949986567e3c1 webkitkde-0.0.2-svn.tar.bz2 +3c375f8e4255c6c168e0a8f629a41d09 webkitkde-0.0.4-svn.tar.bz2 diff --git a/webkitkde-remove-kdelauncher.patch b/webkitkde-remove-kdelauncher.patch deleted file mode 100644 index 0b4c3d3..0000000 --- a/webkitkde-remove-kdelauncher.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- webkitkde-0.0.1-svn/CMakeLists.txt 2009-11-09 15:48:59.000000000 +0200 -+++ webkitkde-0.0.1-svn/CMakeLists.txt 2009-11-09 16:25:23.000000000 +0200 -@@ -14,7 +14,6 @@ - add_subdirectory(icons) - add_subdirectory(kdewebkit) - add_subdirectory(part) --add_subdirectory(kdelauncher) - find_package(Msgfmt REQUIRED) - find_package(Gettext REQUIRED) - add_subdirectory( po ) diff --git a/webkitkde-svn1079265.patch b/webkitkde-svn1079265.patch new file mode 100644 index 0000000..c48c0dd --- /dev/null +++ b/webkitkde-svn1079265.patch @@ -0,0 +1,48 @@ +--- trunk/playground/libs/webkitkde/part/cmake/modules/FindWebKitPart.cmake 2009/11/24 06:55:18 1053443 ++++ trunk/playground/libs/webkitkde/part/cmake/modules/FindWebKitPart.cmake 2010/01/23 23:12:51 1079265 +@@ -5,10 +5,9 @@ + # WEBKITPART_INCLUDE_DIR - the WebKitPart include directory + # WEBKITPART_LIBRARIES - Link these to use WebKitPart + # WEBKITPART_DEFINITIONS - Compiler switches required for using WebKitPart ++# + # Redistribution and use is allowed according to the terms of the BSD license. + # For details see the accompanying COPYING-CMAKE-SCRIPTS file. +-# +- + + if ( WEBKITPART_INCLUDE_DIR AND WEBKITPART_LIBRARIES ) + # in cache already +@@ -17,7 +16,7 @@ + + # Little trick I found in FindKDE4Interal... If we're building WebKitPart, set the variables to point to the build directory. + if(webkitpart_SOURCE_DIR) +- set(WEBKITPART_LIBRARIES webkitkpart) ++ set(WEBKITPART_LIBRARIES kwebkitpart) + set(WEBKITPART_INCLUDE_DIR ${CMAKE_SOURCE_DIR}) + endif(webkitpart_SOURCE_DIR) + +@@ -25,18 +24,15 @@ + # in the FIND_PATH() and FIND_LIBRARY() calls + if( NOT WIN32 ) + find_package(PkgConfig) +- + pkg_check_modules(PC_WEBKITPART kwebkitpart) +- + set(PCRE_DEFINITIONS ${PC_WEBKITPART_CFLAGS_OTHER}) + endif( NOT WIN32 ) + +-FIND_PATH(WEBKITPART_INCLUDE_DIR NAMES webkitpart.h ++FIND_PATH(WEBKITPART_INCLUDE_DIR NAMES kwebkitpart.h + PATHS + ${PC_WEBKITPART_INCLUDEDIR} + ${PC_WEBKITPART_INCLUDE_DIRS} + ${KDE4_INCLUDE_INSTALL_DIR} +- PATH_SUFFIXES webkitkde + ) + + FIND_LIBRARY(WEBKITPART_LIBRARIES NAMES kwebkit +@@ -51,4 +47,3 @@ + + # show the WEBKITPART_INCLUDE_DIR and WEBKITPART_LIBRARIES variables only in the advanced view + MARK_AS_ADVANCED(WEBKITPART_INCLUDE_DIR WEBKITPART_LIBRARIES) +- diff --git a/webkitkde.spec b/webkitkde.spec index 45c58ec..6d03306 100644 --- a/webkitkde.spec +++ b/webkitkde.spec @@ -1,6 +1,14 @@ + +# easy kde43 toggle +%if 0%{?fedora} < 13 +%define kde43 1 +%else +%define kde_version 4.3.95 +%endif + Name: webkitkde -Version: 0.0.2 -Release: 0.1.20091109svn%{?dist} +Version: 0.0.4 +Release: 0.2.svn1079265%{?dist} Summary: QtWebKit bindings to KDE Group: System Environment/Libraries License: LGPLv2+ @@ -17,16 +25,16 @@ URL: http://techbase.kde.org/Projects/WebKit # mainmodule = playground # submodule = libs # kde_release = no -# version = 0.0.2-svn +# version = 0.0.4-svn # docs = no # # To create a new checkout use it with anonymous svn access # ./create_tarball.rb -n -a webkitkde Source0: %{name}-%{version}-svn.tar.bz2 -Patch0: webkitkde-remove-kdelauncher.patch +Patch0: webkitkde-svn1079265.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake gettext -BuildRequires: kdelibs4-devel +BuildRequires: kdelibs4-devel %{?kde_version: >= %{kde_version}} %description This project aims to integrate WebKit (QtWebKit) into KDE. @@ -36,6 +44,8 @@ The project is made up of the following components: The WebKitKDE library sits on top of QtWebKit, providing KDE integration (for example, WebActions using KDE icons and shortcuts, downloading using KIO, etc). + +%if 0%{?kde43} %package devel Summary: Development files for %{name} Group: Development/Libraries @@ -44,10 +54,12 @@ Requires: %{name} = %{version}-%{release} %description devel Development files for the %{name}. +%endif %package -n webkitpart Summary: A KPart based on WebKitKDE library Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} %description -n webkitpart WebKitPart is a KPart that allows KPart-based applications, for example Konqueror, to make use of WebKit for viewing @@ -56,14 +68,17 @@ web pages. %package -n webkitpart-devel Summary: Development files for webkitpart Group: Development/Libraries +%if 0%{?kde43} Requires: %{name}-devel = %{version}-%{release} +%endif +Requires: kdelibs4-devel Requires: webkitpart = %{version}-%{release} %description -n webkitpart-devel Development files for the webkitpart. %prep %setup -q -n %{name}-%{version}-svn -%patch0 -p1 +%patch0 -p4 %build mkdir -p %{_target_platform} @@ -77,16 +92,18 @@ make %{?_smp_mflags} -C %{_target_platform} rm -rf $RPM_BUILD_ROOT make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform} -mkdir $RPM_BUILD_ROOT%{_kde4_appsdir}/webkitpart/kpartplugins +#mkdir $RPM_BUILD_ROOT%{_kde4_appsdir}/webkitpart/kpartplugins %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT +%if 0%{?kde43} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig +%endif %post -n webkitpart /sbin/ldconfig @@ -105,34 +122,59 @@ fi %files -f %{name}.lang %defattr(-,root,root,-) %doc README COPYING.LIB + +%if 0%{?kde43} %{_kde4_libdir}/libkdewebkit.so.* %files devel %defattr(-,root,root,-) %doc README -%{_kde4_includedir}/KDE/KdeWebKit -%{_kde4_includedir}/kdewebkit +%{_kde4_includedir}/KDE/KWebPage +%{_kde4_includedir}/KDE/KWebPluginFactory +%{_kde4_includedir}/KDE/KWebView +%{_kde4_includedir}/kdewebkit_export.h +%{_kde4_includedir}/kwebpage.h +%{_kde4_includedir}/kwebpluginfactory.h +%{_kde4_includedir}/kwebview.h %{_kde4_libdir}/libkdewebkit.so %{_kde4_appsdir}/cmake/modules/FindKdeWebKit.cmake +%endif %files -n webkitpart %defattr(-,root,root,-) %doc README COPYING.LIB -%{_kde4_libdir}/kde4/webkitkdepart.so -%{_kde4_libdir}/libwebkitkde.so.* +%{_kde4_libdir}/kde4/kwebkitpart.so* +%{_kde4_libdir}/libkwebkit.so.* %{_kde4_iconsdir}/hicolor/*/apps/webkit.png -%{_kde4_appsdir}/webkitpart -%{_kde4_datadir}/kde4/services/webkitpart.desktop +%{_kde4_appsdir}/kwebkitpart +%{_kde4_datadir}/kde4/services/kwebkitpart.desktop %files -n webkitpart-devel %defattr(-,root,root,-) %doc README -%{_kde4_includedir}/KDE/WebKitPart -%{_kde4_includedir}/webkitkde -%{_kde4_libdir}/libwebkitkde.so +%{_kde4_includedir}/KDE/KWebKitPart +%{_kde4_includedir}/kwebkitpart.h +%{_kde4_includedir}/kwebkit_export.h +%{_kde4_libdir}/libkwebkit.so %{_kde4_appsdir}/cmake/modules/FindWebKitPart.cmake %changelog +* Sun Jan 24 2010 Alexey Kurov - 0.0.4-0.2.svn1079265 +- svn 1079265. Fixed the library and header file names. + +* Sat Jan 23 2010 Alexey Kurov - 0.0.4-0.1.svn1078162 +- svn 1078162 + +* Thu Dec 3 2009 Alexey Kurov - 0.0.3-0.2.svn1057318 +- svn 1057318 + +* Tue Nov 24 2009 Alexey Kurov - 0.0.3-0.1.svn1049337 +- version changed to 0.0.3 (kdewebkit moved to kdelibs 4.4) +- drop webkitkde-devel subpackage for KDE 4.4 + +* Wed Nov 18 2009 Rex Dieter - 0.0.2-0.2.20091109svn +- rebuild (qt-4.6.0-rc1, fc13+) + * Mon Nov 9 2009 Alexey Kurov - 0.0.2-0.1.20091109svn - version changed to 0.0.2 for new API From f500123a10951744e997bc0891c076ccc2d60fd6 Mon Sep 17 00:00:00 2001 From: nucleo Date: Wed, 10 Feb 2010 14:43:25 +0000 Subject: [PATCH 07/10] don't build kdelauncher --- webkitkde-remove-kdelauncher.patch | 10 ++++++ webkitkde.spec | 54 ++++-------------------------- 2 files changed, 17 insertions(+), 47 deletions(-) create mode 100644 webkitkde-remove-kdelauncher.patch diff --git a/webkitkde-remove-kdelauncher.patch b/webkitkde-remove-kdelauncher.patch new file mode 100644 index 0000000..99be9e0 --- /dev/null +++ b/webkitkde-remove-kdelauncher.patch @@ -0,0 +1,10 @@ +--- webkitkde/CMakeLists.txt 2009-11-24 21:36:22.000000000 +0200 ++++ webkitkde/CMakeLists.txt 2009-11-24 21:47:10.000000000 +0200 +@@ -16,7 +16,6 @@ + add_subdirectory(kdewebkit) + endif(${KDE_VERSION} VERSION_LESS 4.3.74) + add_subdirectory(part) +-add_subdirectory(kdelauncher) + find_package(Msgfmt REQUIRED) + find_package(Gettext REQUIRED) + add_subdirectory( po ) diff --git a/webkitkde.spec b/webkitkde.spec index 6d03306..8706993 100644 --- a/webkitkde.spec +++ b/webkitkde.spec @@ -1,14 +1,6 @@ - -# easy kde43 toggle -%if 0%{?fedora} < 13 -%define kde43 1 -%else -%define kde_version 4.3.95 -%endif - Name: webkitkde Version: 0.0.4 -Release: 0.2.svn1079265%{?dist} +Release: 0.3.svn1079265%{?dist} Summary: QtWebKit bindings to KDE Group: System Environment/Libraries License: LGPLv2+ @@ -32,9 +24,10 @@ URL: http://techbase.kde.org/Projects/WebKit # ./create_tarball.rb -n -a webkitkde Source0: %{name}-%{version}-svn.tar.bz2 Patch0: webkitkde-svn1079265.patch +Patch1: webkitkde-remove-kdelauncher.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake gettext -BuildRequires: kdelibs4-devel %{?kde_version: >= %{kde_version}} +BuildRequires: kdelibs4-devel >= 4.4.0 %description This project aims to integrate WebKit (QtWebKit) into KDE. @@ -45,17 +38,6 @@ The WebKitKDE library sits on top of QtWebKit, providing KDE integration (for example, WebActions using KDE icons and shortcuts, downloading using KIO, etc). -%if 0%{?kde43} -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: kdelibs4-devel -Requires: %{name} = %{version}-%{release} - -%description devel -Development files for the %{name}. -%endif - %package -n webkitpart Summary: A KPart based on WebKitKDE library Group: System Environment/Libraries @@ -68,9 +50,6 @@ web pages. %package -n webkitpart-devel Summary: Development files for webkitpart Group: Development/Libraries -%if 0%{?kde43} -Requires: %{name}-devel = %{version}-%{release} -%endif Requires: kdelibs4-devel Requires: webkitpart = %{version}-%{release} %description -n webkitpart-devel @@ -79,6 +58,7 @@ Development files for the webkitpart. %prep %setup -q -n %{name}-%{version}-svn %patch0 -p4 +%patch1 -p1 %build mkdir -p %{_target_platform} @@ -99,12 +79,6 @@ make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform} %clean rm -rf $RPM_BUILD_ROOT -%if 0%{?kde43} -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig -%endif - %post -n webkitpart /sbin/ldconfig touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: @@ -123,23 +97,6 @@ fi %defattr(-,root,root,-) %doc README COPYING.LIB -%if 0%{?kde43} -%{_kde4_libdir}/libkdewebkit.so.* - -%files devel -%defattr(-,root,root,-) -%doc README -%{_kde4_includedir}/KDE/KWebPage -%{_kde4_includedir}/KDE/KWebPluginFactory -%{_kde4_includedir}/KDE/KWebView -%{_kde4_includedir}/kdewebkit_export.h -%{_kde4_includedir}/kwebpage.h -%{_kde4_includedir}/kwebpluginfactory.h -%{_kde4_includedir}/kwebview.h -%{_kde4_libdir}/libkdewebkit.so -%{_kde4_appsdir}/cmake/modules/FindKdeWebKit.cmake -%endif - %files -n webkitpart %defattr(-,root,root,-) %doc README COPYING.LIB @@ -159,6 +116,9 @@ fi %{_kde4_appsdir}/cmake/modules/FindWebKitPart.cmake %changelog +* Wed Feb 10 2010 Alexey Kurov - 0.0.4-0.3.svn1079265 +- build only for kdelibs >= 4.4.0 + * Sun Jan 24 2010 Alexey Kurov - 0.0.4-0.2.svn1079265 - svn 1079265. Fixed the library and header file names. From a82dc2e402df704e7d1014ddd21e465841c73fd4 Mon Sep 17 00:00:00 2001 From: nucleo Date: Wed, 10 Feb 2010 18:37:46 +0000 Subject: [PATCH 08/10] update to kwebkitpart snapshot from kdereview --- .cvsignore | 2 +- sources | 2 +- webkitkde-remove-kdelauncher.patch | 15 ++++------ webkitkde-svn1079265.patch | 48 ------------------------------ webkitkde.spec | 48 +++++++++++------------------- 5 files changed, 26 insertions(+), 89 deletions(-) delete mode 100644 webkitkde-svn1079265.patch diff --git a/.cvsignore b/.cvsignore index 549be18..bcce97a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -webkitkde-0.0.4-svn.tar.bz2 +webkitkde-0.0.5-svn.tar.bz2 diff --git a/sources b/sources index e98b3bf..0665e7d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3c375f8e4255c6c168e0a8f629a41d09 webkitkde-0.0.4-svn.tar.bz2 +f3517d9a109b483a8df8230d61cecd95 webkitkde-0.0.5-svn.tar.bz2 diff --git a/webkitkde-remove-kdelauncher.patch b/webkitkde-remove-kdelauncher.patch index 99be9e0..9174a16 100644 --- a/webkitkde-remove-kdelauncher.patch +++ b/webkitkde-remove-kdelauncher.patch @@ -1,10 +1,7 @@ ---- webkitkde/CMakeLists.txt 2009-11-24 21:36:22.000000000 +0200 -+++ webkitkde/CMakeLists.txt 2009-11-24 21:47:10.000000000 +0200 -@@ -16,7 +16,6 @@ - add_subdirectory(kdewebkit) - endif(${KDE_VERSION} VERSION_LESS 4.3.74) - add_subdirectory(part) +--- CMakeLists.txt 2010-01-30 18:04:51.000000000 +0200 ++++ CMakeLists.txt 2010-02-10 20:01:41.000000000 +0200 +@@ -8,4 +8,3 @@ + add_subdirectory(cmake) + add_subdirectory(icons) + add_subdirectory(src) -add_subdirectory(kdelauncher) - find_package(Msgfmt REQUIRED) - find_package(Gettext REQUIRED) - add_subdirectory( po ) diff --git a/webkitkde-svn1079265.patch b/webkitkde-svn1079265.patch deleted file mode 100644 index c48c0dd..0000000 --- a/webkitkde-svn1079265.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- trunk/playground/libs/webkitkde/part/cmake/modules/FindWebKitPart.cmake 2009/11/24 06:55:18 1053443 -+++ trunk/playground/libs/webkitkde/part/cmake/modules/FindWebKitPart.cmake 2010/01/23 23:12:51 1079265 -@@ -5,10 +5,9 @@ - # WEBKITPART_INCLUDE_DIR - the WebKitPart include directory - # WEBKITPART_LIBRARIES - Link these to use WebKitPart - # WEBKITPART_DEFINITIONS - Compiler switches required for using WebKitPart -+# - # Redistribution and use is allowed according to the terms of the BSD license. - # For details see the accompanying COPYING-CMAKE-SCRIPTS file. --# -- - - if ( WEBKITPART_INCLUDE_DIR AND WEBKITPART_LIBRARIES ) - # in cache already -@@ -17,7 +16,7 @@ - - # Little trick I found in FindKDE4Interal... If we're building WebKitPart, set the variables to point to the build directory. - if(webkitpart_SOURCE_DIR) -- set(WEBKITPART_LIBRARIES webkitkpart) -+ set(WEBKITPART_LIBRARIES kwebkitpart) - set(WEBKITPART_INCLUDE_DIR ${CMAKE_SOURCE_DIR}) - endif(webkitpart_SOURCE_DIR) - -@@ -25,18 +24,15 @@ - # in the FIND_PATH() and FIND_LIBRARY() calls - if( NOT WIN32 ) - find_package(PkgConfig) -- - pkg_check_modules(PC_WEBKITPART kwebkitpart) -- - set(PCRE_DEFINITIONS ${PC_WEBKITPART_CFLAGS_OTHER}) - endif( NOT WIN32 ) - --FIND_PATH(WEBKITPART_INCLUDE_DIR NAMES webkitpart.h -+FIND_PATH(WEBKITPART_INCLUDE_DIR NAMES kwebkitpart.h - PATHS - ${PC_WEBKITPART_INCLUDEDIR} - ${PC_WEBKITPART_INCLUDE_DIRS} - ${KDE4_INCLUDE_INSTALL_DIR} -- PATH_SUFFIXES webkitkde - ) - - FIND_LIBRARY(WEBKITPART_LIBRARIES NAMES kwebkit -@@ -51,4 +47,3 @@ - - # show the WEBKITPART_INCLUDE_DIR and WEBKITPART_LIBRARIES variables only in the advanced view - MARK_AS_ADVANCED(WEBKITPART_INCLUDE_DIR WEBKITPART_LIBRARIES) -- diff --git a/webkitkde.spec b/webkitkde.spec index 8706993..6cf8713 100644 --- a/webkitkde.spec +++ b/webkitkde.spec @@ -1,30 +1,18 @@ Name: webkitkde -Version: 0.0.4 -Release: 0.3.svn1079265%{?dist} +Version: 0.0.5 +Release: 0.1.svn1088283%{?dist} Summary: QtWebKit bindings to KDE Group: System Environment/Libraries License: LGPLv2+ URL: http://techbase.kde.org/Projects/WebKit -# To create a tarball from svn use create_tarball.rb script -# -# http://websvn.kde.org/trunk/KDE/kdesdk/scripts/createtarball/ -# -# To use it you will need the script itself and a config.ini in the same directory -# config.ini contents: -# -# [webkitkde] -# mainmodule = playground -# submodule = libs -# kde_release = no -# version = 0.0.4-svn -# docs = no -# -# To create a new checkout use it with anonymous svn access -# ./create_tarball.rb -n -a webkitkde +# The source for this package was pulled from upstream's vcs. +# Use the following commands to generate the tarball: +# svn export -r 1088283 svn://anonsvn.kde.org/home/kde/trunk/kdereview/kwebkitpart webkitkde-0.0.5-svn +# tar -cjf webkitkde-0.0.5-svn.tar.bz2 webkitkde-0.0.5-svn + Source0: %{name}-%{version}-svn.tar.bz2 -Patch0: webkitkde-svn1079265.patch -Patch1: webkitkde-remove-kdelauncher.patch +Patch0: webkitkde-remove-kdelauncher.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake gettext BuildRequires: kdelibs4-devel >= 4.4.0 @@ -32,9 +20,9 @@ BuildRequires: kdelibs4-devel >= 4.4.0 %description This project aims to integrate WebKit (QtWebKit) into KDE. The project is made up of the following components: -- WebKitKDE: The binding between KDE and QtWebKit -- WebKitPart: A KPart based on it -The WebKitKDE library sits on top of QtWebKit, providing +- kdewebkit: The binding between KDE and QtWebKit +- kwebkitpart: A KPart based on it +The kdewebkit library sits on top of QtWebKit, providing KDE integration (for example, WebActions using KDE icons and shortcuts, downloading using KIO, etc). @@ -43,7 +31,7 @@ Summary: A KPart based on WebKitKDE library Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} %description -n webkitpart -WebKitPart is a KPart that allows KPart-based applications, +KWebKitPart is a KPart that allows KPart-based applications, for example Konqueror, to make use of WebKit for viewing web pages. @@ -57,8 +45,7 @@ Development files for the webkitpart. %prep %setup -q -n %{name}-%{version}-svn -%patch0 -p4 -%patch1 -p1 +%patch0 %build mkdir -p %{_target_platform} @@ -74,8 +61,6 @@ rm -rf $RPM_BUILD_ROOT make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform} #mkdir $RPM_BUILD_ROOT%{_kde4_appsdir}/webkitpart/kpartplugins -%find_lang %{name} - %clean rm -rf $RPM_BUILD_ROOT @@ -93,7 +78,7 @@ if [ $1 -eq 0 ] ; then gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: fi -%files -f %{name}.lang +%files %defattr(-,root,root,-) %doc README COPYING.LIB @@ -113,9 +98,12 @@ fi %{_kde4_includedir}/kwebkitpart.h %{_kde4_includedir}/kwebkit_export.h %{_kde4_libdir}/libkwebkit.so -%{_kde4_appsdir}/cmake/modules/FindWebKitPart.cmake +%{_kde4_appsdir}/cmake/modules/FindKWebKitPart.cmake %changelog +* Wed Feb 10 2010 Alexey Kurov - 0.0.5-0.1.svn1088283 +- update to kwebkitpart snapshot from kdereview + * Wed Feb 10 2010 Alexey Kurov - 0.0.4-0.3.svn1079265 - build only for kdelibs >= 4.4.0 From d4d4fb1af6cdcdf4fe48075df3c1bae1fb059201 Mon Sep 17 00:00:00 2001 From: nucleo Date: Wed, 24 Mar 2010 19:19:48 +0000 Subject: [PATCH 09/10] drop webkitkde --- webkitkde.spec | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/webkitkde.spec b/webkitkde.spec index 6cf8713..20d69c7 100644 --- a/webkitkde.spec +++ b/webkitkde.spec @@ -1,6 +1,6 @@ Name: webkitkde Version: 0.0.5 -Release: 0.1.svn1088283%{?dist} +Release: 0.2.svn1088283%{?dist} Summary: QtWebKit bindings to KDE Group: System Environment/Libraries License: LGPLv2+ @@ -29,7 +29,6 @@ and shortcuts, downloading using KIO, etc). %package -n webkitpart Summary: A KPart based on WebKitKDE library Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} %description -n webkitpart KWebKitPart is a KPart that allows KPart-based applications, for example Konqueror, to make use of WebKit for viewing @@ -78,10 +77,6 @@ if [ $1 -eq 0 ] ; then gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: fi -%files -%defattr(-,root,root,-) -%doc README COPYING.LIB - %files -n webkitpart %defattr(-,root,root,-) %doc README COPYING.LIB @@ -101,6 +96,10 @@ fi %{_kde4_appsdir}/cmake/modules/FindKWebKitPart.cmake %changelog +* Wed Mar 24 2010 Alexey Kurov - 0.0.5-0.2.svn1088283 +- drop webkitkde package +- removed Requires: webkitkde from webkitpart + * Wed Feb 10 2010 Alexey Kurov - 0.0.5-0.1.svn1088283 - update to kwebkitpart snapshot from kdereview From f15ff461d952383d378fedf42baab9da4b7ad523 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:14:37 +0000 Subject: [PATCH 10/10] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 6f594a5..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: webkitkde -# $Id: Makefile,v 1.1 2009/09/25 16:30:04 kevin Exp $ -NAME := webkitkde -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12 diff --git a/import.log b/import.log deleted file mode 100644 index 41e0ee2..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -webkitkde-0_0_1-0_1_20090924svn_fc11:HEAD:webkitkde-0.0.1-0.1.20090924svn.fc11.src.rpm:1253896781