[arch-commits] Commit in kdelibs/repos (20 files)

Antonio Rojas arojas at archlinux.org
Tue Feb 28 19:07:15 UTC 2017


    Date: Tuesday, February 28, 2017 @ 19:07:15
  Author: arojas
Revision: 289741

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  kdelibs/repos/extra-i686/PKGBUILD
    (from rev 289740, kdelibs/trunk/PKGBUILD)
  kdelibs/repos/extra-i686/archlinux-menu.patch
    (from rev 289740, kdelibs/trunk/archlinux-menu.patch)
  kdelibs/repos/extra-i686/kde-applications-menu.patch
    (from rev 289740, kdelibs/trunk/kde-applications-menu.patch)
  kdelibs/repos/extra-i686/kdelibs-no-kdewebkit.patch
    (from rev 289740, kdelibs/trunk/kdelibs-no-kdewebkit.patch)
  kdelibs/repos/extra-i686/qt4.patch
    (from rev 289740, kdelibs/trunk/qt4.patch)
  kdelibs/repos/extra-x86_64/PKGBUILD
    (from rev 289740, kdelibs/trunk/PKGBUILD)
  kdelibs/repos/extra-x86_64/archlinux-menu.patch
    (from rev 289740, kdelibs/trunk/archlinux-menu.patch)
  kdelibs/repos/extra-x86_64/kde-applications-menu.patch
    (from rev 289740, kdelibs/trunk/kde-applications-menu.patch)
  kdelibs/repos/extra-x86_64/kdelibs-no-kdewebkit.patch
    (from rev 289740, kdelibs/trunk/kdelibs-no-kdewebkit.patch)
  kdelibs/repos/extra-x86_64/qt4.patch
    (from rev 289740, kdelibs/trunk/qt4.patch)
Deleted:
  kdelibs/repos/extra-i686/PKGBUILD
  kdelibs/repos/extra-i686/archlinux-menu.patch
  kdelibs/repos/extra-i686/kde-applications-menu.patch
  kdelibs/repos/extra-i686/kdelibs-no-kdewebkit.patch
  kdelibs/repos/extra-i686/qt4.patch
  kdelibs/repos/extra-x86_64/PKGBUILD
  kdelibs/repos/extra-x86_64/archlinux-menu.patch
  kdelibs/repos/extra-x86_64/kde-applications-menu.patch
  kdelibs/repos/extra-x86_64/kdelibs-no-kdewebkit.patch
  kdelibs/repos/extra-x86_64/qt4.patch

------------------------------------------+
 /PKGBUILD                                |  136 +++++++++++++++++++
 /archlinux-menu.patch                    |   44 ++++++
 /kde-applications-menu.patch             |   44 ++++++
 /kdelibs-no-kdewebkit.patch              |  200 +++++++++++++++++++++++++++++
 /qt4.patch                               |   22 +++
 extra-i686/PKGBUILD                      |   64 ---------
 extra-i686/archlinux-menu.patch          |   22 ---
 extra-i686/kde-applications-menu.patch   |   22 ---
 extra-i686/kdelibs-no-kdewebkit.patch    |  100 --------------
 extra-i686/qt4.patch                     |   11 -
 extra-x86_64/PKGBUILD                    |   64 ---------
 extra-x86_64/archlinux-menu.patch        |   22 ---
 extra-x86_64/kde-applications-menu.patch |   22 ---
 extra-x86_64/kdelibs-no-kdewebkit.patch  |  100 --------------
 extra-x86_64/qt4.patch                   |   11 -
 15 files changed, 446 insertions(+), 438 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2017-02-28 19:06:41 UTC (rev 289740)
+++ extra-i686/PKGBUILD	2017-02-28 19:07:15 UTC (rev 289741)
@@ -1,64 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=kdelibs
-pkgver=4.14.29
-_kdeappver=16.12.2
-pkgrel=1
-pkgdesc="KDE Core Libraries"
-arch=('i686' 'x86_64')
-url='https://www.kde.org/'
-license=('GPL' 'LGPL' 'FDL')
-depends=('attica-qt4' 'libxss' 'qca-qt4' 'libdbusmenu-qt4' 'polkit-qt4'
-        'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr'
-        'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon-qt4'
-        'media-player-info' 'libutempter' 'icu')
-makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'mesa')
-source=("http://download.kde.org/stable/applications/${_kdeappver}/src/$pkgname-$pkgver.tar.xz"
-        'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch' 'kdelibs-no-kdewebkit.patch')
-sha1sums=('d04e3fe612cef075d2023f6cef1938ff236f19d3'
-          '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-          'ed1f57ee661e5c7440efcaba7e51d2554709701c'
-          'ee83d517c2d8dbe611e263ef16df87f39531fe72')
-
-prepare() {
-  mkdir -p build
-  cd ${pkgname}-${pkgver}
-  # avoid file conflict with gnome-menus
-  patch -p1 -i ../kde-applications-menu.patch
-  # add Archlinux menu entry
-  patch -p1 -i ../archlinux-menu.patch
-  # qmake refers to Qt5
-  patch -p1 -i ../qt4.patch
-  # disable kdewebkit (Fedora)
-  patch -p1 -i ../kdelibs-no-kdewebkit.patch
-}
-
-build() {
-       cd build
-       cmake ../$pkgname-$pkgver \
-               -DCMAKE_BUILD_TYPE=Release \
-               -DKDE4_BUILD_TESTS=OFF \
-               -DCMAKE_SKIP_RPATH=ON \
-               -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
-               -DCMAKE_INSTALL_PREFIX=/usr \
-               -DSYSCONF_INSTALL_DIR=/etc \
-               -DLOCALE_INSTALL_DIR=/usr/share/locale/kde4 \
-               -DKDE_DEFAULT_HOME='.kde4' \
-               -DWITH_FAM=OFF \
-               -DWITH_SOLID_UDISKS2=ON
-       make
-}
-
-package() {
-       cd build
-       make DESTDIR="$pkgdir" install
-
-       # cert bundle seems to be hardcoded
-       # link it to the one from ca-certificates
-       rm -f "$pkgdir"/usr/share/apps/kssl/ca-bundle.crt
-       ln -sf /etc/ssl/certs/ca-certificates.crt "$pkgdir"/usr/share/apps/kssl/ca-bundle.crt
-}

Copied: kdelibs/repos/extra-i686/PKGBUILD (from rev 289740, kdelibs/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2017-02-28 19:07:15 UTC (rev 289741)
@@ -0,0 +1,68 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=kdelibs
+pkgver=4.14.29
+_kdeappver=16.12.2
+pkgrel=2
+pkgdesc="KDE Core Libraries"
+arch=('i686' 'x86_64')
+url='https://www.kde.org/'
+license=('GPL' 'LGPL' 'FDL')
+depends=('attica-qt4' 'libxss' 'qca-qt4' 'libdbusmenu-qt4' 'polkit-qt4'
+        'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr'
+        'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon-qt4'
+        'media-player-info' 'libutempter' 'icu')
+makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'mesa')
+source=("https://download.kde.org/stable/applications/${_kdeappver}/src/$pkgname-$pkgver.tar.xz"
+        'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch' 'kdelibs-no-kdewebkit.patch'
+        kdelibs-sanitize-url.patch::"https://cgit.kde.org/kdelibs.git/patch/?id=1804c2fd")
+sha1sums=('d04e3fe612cef075d2023f6cef1938ff236f19d3'
+          '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
+          '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
+          'ed1f57ee661e5c7440efcaba7e51d2554709701c'
+          'ee83d517c2d8dbe611e263ef16df87f39531fe72'
+          '25c65eb2dd321b45e216d8b8adae2312bff06ee5')
+
+prepare() {
+  mkdir -p build
+  cd ${pkgname}-${pkgver}
+  # avoid file conflict with gnome-menus
+  patch -p1 -i ../kde-applications-menu.patch
+  # add Archlinux menu entry
+  patch -p1 -i ../archlinux-menu.patch
+  # qmake refers to Qt5
+  patch -p1 -i ../qt4.patch
+  # disable kdewebkit (Fedora)
+  patch -p1 -i ../kdelibs-no-kdewebkit.patch
+  # Sanitize URLs before passing them to FindProxyForURL
+  patch -p1 -i ../kdelibs-sanitize-url.patch
+}
+
+build() {
+       cd build
+       cmake ../$pkgname-$pkgver \
+               -DCMAKE_BUILD_TYPE=Release \
+               -DKDE4_BUILD_TESTS=OFF \
+               -DCMAKE_SKIP_RPATH=ON \
+               -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
+               -DCMAKE_INSTALL_PREFIX=/usr \
+               -DSYSCONF_INSTALL_DIR=/etc \
+               -DLOCALE_INSTALL_DIR=/usr/share/locale/kde4 \
+               -DKDE_DEFAULT_HOME='.kde4' \
+               -DWITH_FAM=OFF \
+               -DWITH_SOLID_UDISKS2=ON
+       make
+}
+
+package() {
+       cd build
+       make DESTDIR="$pkgdir" install
+
+       # cert bundle seems to be hardcoded
+       # link it to the one from ca-certificates
+       rm -f "$pkgdir"/usr/share/apps/kssl/ca-bundle.crt
+       ln -sf /etc/ssl/certs/ca-certificates.crt "$pkgdir"/usr/share/apps/kssl/ca-bundle.crt
+}

Deleted: extra-i686/archlinux-menu.patch
===================================================================
--- extra-i686/archlinux-menu.patch	2017-02-28 19:06:41 UTC (rev 289740)
+++ extra-i686/archlinux-menu.patch	2017-02-28 19:07:15 UTC (rev 289741)
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/applications.menu	2010-01-31 19:28:11.000000000 +0000
-+++ kdelibs-4.3.98/kded/applications.menu	2010-01-31 22:25:53.556043077 +0000
-@@ -16,11 +16,19 @@
- 	</DefaultLayout>
- 	<Layout>
- 		<Merge type="menus"/>
-+		<Menuname>Arch Linux</Menuname>
- 		<Menuname>Applications</Menuname>
- 		<Merge type="files"/>
- 	</Layout>
- 
- 	<Menu>
-+		<Name>Arch Linux</Name>                                                                                                   
-+		<Directory>Archlinux.directory</Directory>                                                                               
-+		<Include>                                                                                                                
-+			<Category>Archlinux</Category>                                                                                           
-+		</Include>
-+	</Menu>
-+	<Menu>
- 		<Name>Applications</Name>
- 		<Directory>kde-unknown.directory</Directory>
- 		<OnlyUnallocated/>

Copied: kdelibs/repos/extra-i686/archlinux-menu.patch (from rev 289740, kdelibs/trunk/archlinux-menu.patch)
===================================================================
--- extra-i686/archlinux-menu.patch	                        (rev 0)
+++ extra-i686/archlinux-menu.patch	2017-02-28 19:07:15 UTC (rev 289741)
@@ -0,0 +1,22 @@
+--- kdelibs-4.3.98/kded/applications.menu	2010-01-31 19:28:11.000000000 +0000
++++ kdelibs-4.3.98/kded/applications.menu	2010-01-31 22:25:53.556043077 +0000
+@@ -16,11 +16,19 @@
+ 	</DefaultLayout>
+ 	<Layout>
+ 		<Merge type="menus"/>
++		<Menuname>Arch Linux</Menuname>
+ 		<Menuname>Applications</Menuname>
+ 		<Merge type="files"/>
+ 	</Layout>
+ 
+ 	<Menu>
++		<Name>Arch Linux</Name>                                                                                                   
++		<Directory>Archlinux.directory</Directory>                                                                               
++		<Include>                                                                                                                
++			<Category>Archlinux</Category>                                                                                           
++		</Include>
++	</Menu>
++	<Menu>
+ 		<Name>Applications</Name>
+ 		<Directory>kde-unknown.directory</Directory>
+ 		<OnlyUnallocated/>

Deleted: extra-i686/kde-applications-menu.patch
===================================================================
--- extra-i686/kde-applications-menu.patch	2017-02-28 19:06:41 UTC (rev 289740)
+++ extra-i686/kde-applications-menu.patch	2017-02-28 19:07:15 UTC (rev 289741)
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/CMakeLists.txt	2009-10-02 14:55:17.000000000 +0000
-+++ kdelibs-4.3.98/kded/CMakeLists.txt	2010-01-31 22:16:13.946933892 +0000
-@@ -69,7 +69,7 @@
- if (WIN32)
- install( FILES applications.menu  DESTINATION  ${SHARE_INSTALL_PREFIX}/xdg/menus )
- else (WIN32)
--install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus )
-+install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu )
- endif (WIN32)
- install( FILES kdedmodule.desktop DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
- install( FILES kded.upd           DESTINATION  ${DATA_INSTALL_DIR}/kconf_update )
---- kdelibs-4.3.98/kded/kbuildsycoca.cpp	2009-12-04 23:10:18.000000000 +0000
-+++ kdelibs-4.3.98/kded/kbuildsycoca.cpp	2010-01-31 22:16:13.962766572 +0000
-@@ -302,7 +302,7 @@
-      if (!m_trackId.isEmpty())
-         g_vfolder->setTrackId(m_trackId);
- 
--     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
-+     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
- 
-      KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
-      entry->setLayoutInfo(kdeMenu->layoutList);

Copied: kdelibs/repos/extra-i686/kde-applications-menu.patch (from rev 289740, kdelibs/trunk/kde-applications-menu.patch)
===================================================================
--- extra-i686/kde-applications-menu.patch	                        (rev 0)
+++ extra-i686/kde-applications-menu.patch	2017-02-28 19:07:15 UTC (rev 289741)
@@ -0,0 +1,22 @@
+--- kdelibs-4.3.98/kded/CMakeLists.txt	2009-10-02 14:55:17.000000000 +0000
++++ kdelibs-4.3.98/kded/CMakeLists.txt	2010-01-31 22:16:13.946933892 +0000
+@@ -69,7 +69,7 @@
+ if (WIN32)
+ install( FILES applications.menu  DESTINATION  ${SHARE_INSTALL_PREFIX}/xdg/menus )
+ else (WIN32)
+-install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus )
++install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu )
+ endif (WIN32)
+ install( FILES kdedmodule.desktop DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
+ install( FILES kded.upd           DESTINATION  ${DATA_INSTALL_DIR}/kconf_update )
+--- kdelibs-4.3.98/kded/kbuildsycoca.cpp	2009-12-04 23:10:18.000000000 +0000
++++ kdelibs-4.3.98/kded/kbuildsycoca.cpp	2010-01-31 22:16:13.962766572 +0000
+@@ -302,7 +302,7 @@
+      if (!m_trackId.isEmpty())
+         g_vfolder->setTrackId(m_trackId);
+ 
+-     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
++     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
+ 
+      KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
+      entry->setLayoutInfo(kdeMenu->layoutList);

Deleted: extra-i686/kdelibs-no-kdewebkit.patch
===================================================================
--- extra-i686/kdelibs-no-kdewebkit.patch	2017-02-28 19:06:41 UTC (rev 289740)
+++ extra-i686/kdelibs-no-kdewebkit.patch	2017-02-28 19:07:15 UTC (rev 289741)
@@ -1,100 +0,0 @@
-diff -up kdelibs-4.14.16/CMakeLists.txt.webkit kdelibs-4.14.16/CMakeLists.txt
---- kdelibs-4.14.16/CMakeLists.txt.webkit	2016-01-07 00:02:22.000000000 +0100
-+++ kdelibs-4.14.16/CMakeLists.txt	2016-01-28 13:03:53.556194927 +0100
-@@ -356,7 +356,6 @@ if(NOT WINCE)
- add_subdirectory( plasma )
- endif(NOT WINCE)
- add_subdirectory( kunitconversion )
--add_subdirectory( kdewebkit )
- add_subdirectory( includes )
- 
- add_subdirectory( experimental )
-diff -up kdelibs-4.14.16/kdewidgets/CMakeLists.txt.webkit kdelibs-4.14.16/kdewidgets/CMakeLists.txt
---- kdelibs-4.14.16/kdewidgets/CMakeLists.txt.webkit	2016-01-28 13:03:53.527196020 +0100
-+++ kdelibs-4.14.16/kdewidgets/CMakeLists.txt	2016-01-28 13:03:53.556194927 +0100
-@@ -88,41 +88,6 @@ if(QT_QTDESIGNER_FOUND)
-     install(TARGETS kdedeprecated  DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
-   endif(NOT KDE_NO_DEPRECATED)
- 
--
--  # kdewebkit widgets
--  include_directories(
--    ${CMAKE_SOURCE_DIR}/kdewebkit
--  )
--
--  add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp
--    COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kdewebkit.widgets
--    MAIN_DEPENDENCY kdewebkit.widgets DEPENDS makekdewidgets)
--
--  set(kdewebkitwidgets_PART_SRCS
--     classpreviews.cpp
--     ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp
--  )
--
--  qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.moc)
--
--
--  qt4_add_resources(kdewebkitwidgets_PART_SRCS kdewebkitwidgets.qrc)
--
--  kde4_add_plugin(kdewebkitwidgets ${kdewebkitwidgets_PART_SRCS})
--
--  target_link_libraries(kdewebkitwidgets ${KDE4_KDEUI_LIBS} ${KDE4_KDEWEBKIT_LIBS} ${QT_QTWEBKIT_LIBRARY})
--  if(NOT WIN32)
--    set_target_properties(kdewebkitwidgets PROPERTIES
--                                     INSTALL_RPATH_USE_LINK_PATH TRUE
--                                     SKIP_BUILD_RPATH TRUE
--                                     BUILD_WITH_INSTALL_RPATH TRUE
--                                     INSTALL_RPATH ${LIB_INSTALL_DIR}
--                         )
--  endif(NOT WIN32)
--
--  install(TARGETS kdewebkitwidgets  DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
--
--
-   if (QT_QT3SUPPORT_FOUND)
- 
-      include_directories(
-diff -up kdelibs-4.14.16/plasma/CMakeLists.txt.webkit kdelibs-4.14.16/plasma/CMakeLists.txt
---- kdelibs-4.14.16/plasma/CMakeLists.txt.webkit	2016-01-07 00:02:22.000000000 +0100
-+++ kdelibs-4.14.16/plasma/CMakeLists.txt	2016-01-28 13:26:55.730137496 +0100
-@@ -11,6 +11,7 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBL
- endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
- 
- set(PLASMA_NO_PACKAGEKIT TRUE)
-+set(PLASMA_NO_KDEWEBKIT TRUE)
- 
- include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                     ${KDE4_KDECORE_INCLUDES}
-@@ -121,7 +122,6 @@ set(plasma_LIB_SRCS
-     framesvg.cpp
-     plasma.cpp
-     popupapplet.cpp
--    private/animablegraphicswebview.cpp
-     private/applethandle.cpp
-     private/associatedapplicationmanager.cpp
-     private/componentinstaller.cpp
-@@ -211,7 +211,6 @@ set(plasma_LIB_SRCS
-     widgets/textbrowser.cpp
-     widgets/treeview.cpp
-     widgets/textedit.cpp
--    widgets/webview.cpp
- 
-     #Temporary QtJolie branch
-     private/qtjolie-branch/qtjolie/abstractadaptor.cpp
-@@ -275,7 +274,7 @@ endif(PHONON_FOUND)
- 
- kde4_add_library(plasma ${LIBRARY_TYPE} ${plasma_LIB_SRCS})
- 
--target_link_libraries(plasma LINK_PRIVATE ${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_LIBRARY}
-+target_link_libraries(plasma LINK_PRIVATE ${QT_QTUITOOLS_LIBRARY}
-                              ${QT_QTSCRIPT_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSQL_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY}
-                              ${KDE4_KDEUI_LIBS} ${KDE4_KDNSSD_LIBS} ${KDE4_THREADWEAVER_LIBS} ${PLASMA_EXTRA_LIBS})
- 
-@@ -415,7 +414,6 @@ install(FILES
-     widgets/textbrowser.h
-     widgets/treeview.h
-     widgets/textedit.h
--    widgets/webview.h
-     DESTINATION ${INCLUDE_INSTALL_DIR}/plasma/widgets COMPONENT Devel)
- 
- install(FILES

Copied: kdelibs/repos/extra-i686/kdelibs-no-kdewebkit.patch (from rev 289740, kdelibs/trunk/kdelibs-no-kdewebkit.patch)
===================================================================
--- extra-i686/kdelibs-no-kdewebkit.patch	                        (rev 0)
+++ extra-i686/kdelibs-no-kdewebkit.patch	2017-02-28 19:07:15 UTC (rev 289741)
@@ -0,0 +1,100 @@
+diff -up kdelibs-4.14.16/CMakeLists.txt.webkit kdelibs-4.14.16/CMakeLists.txt
+--- kdelibs-4.14.16/CMakeLists.txt.webkit	2016-01-07 00:02:22.000000000 +0100
++++ kdelibs-4.14.16/CMakeLists.txt	2016-01-28 13:03:53.556194927 +0100
+@@ -356,7 +356,6 @@ if(NOT WINCE)
+ add_subdirectory( plasma )
+ endif(NOT WINCE)
+ add_subdirectory( kunitconversion )
+-add_subdirectory( kdewebkit )
+ add_subdirectory( includes )
+ 
+ add_subdirectory( experimental )
+diff -up kdelibs-4.14.16/kdewidgets/CMakeLists.txt.webkit kdelibs-4.14.16/kdewidgets/CMakeLists.txt
+--- kdelibs-4.14.16/kdewidgets/CMakeLists.txt.webkit	2016-01-28 13:03:53.527196020 +0100
++++ kdelibs-4.14.16/kdewidgets/CMakeLists.txt	2016-01-28 13:03:53.556194927 +0100
+@@ -88,41 +88,6 @@ if(QT_QTDESIGNER_FOUND)
+     install(TARGETS kdedeprecated  DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
+   endif(NOT KDE_NO_DEPRECATED)
+ 
+-
+-  # kdewebkit widgets
+-  include_directories(
+-    ${CMAKE_SOURCE_DIR}/kdewebkit
+-  )
+-
+-  add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp
+-    COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kdewebkit.widgets
+-    MAIN_DEPENDENCY kdewebkit.widgets DEPENDS makekdewidgets)
+-
+-  set(kdewebkitwidgets_PART_SRCS
+-     classpreviews.cpp
+-     ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp
+-  )
+-
+-  qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.moc)
+-
+-
+-  qt4_add_resources(kdewebkitwidgets_PART_SRCS kdewebkitwidgets.qrc)
+-
+-  kde4_add_plugin(kdewebkitwidgets ${kdewebkitwidgets_PART_SRCS})
+-
+-  target_link_libraries(kdewebkitwidgets ${KDE4_KDEUI_LIBS} ${KDE4_KDEWEBKIT_LIBS} ${QT_QTWEBKIT_LIBRARY})
+-  if(NOT WIN32)
+-    set_target_properties(kdewebkitwidgets PROPERTIES
+-                                     INSTALL_RPATH_USE_LINK_PATH TRUE
+-                                     SKIP_BUILD_RPATH TRUE
+-                                     BUILD_WITH_INSTALL_RPATH TRUE
+-                                     INSTALL_RPATH ${LIB_INSTALL_DIR}
+-                         )
+-  endif(NOT WIN32)
+-
+-  install(TARGETS kdewebkitwidgets  DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
+-
+-
+   if (QT_QT3SUPPORT_FOUND)
+ 
+      include_directories(
+diff -up kdelibs-4.14.16/plasma/CMakeLists.txt.webkit kdelibs-4.14.16/plasma/CMakeLists.txt
+--- kdelibs-4.14.16/plasma/CMakeLists.txt.webkit	2016-01-07 00:02:22.000000000 +0100
++++ kdelibs-4.14.16/plasma/CMakeLists.txt	2016-01-28 13:26:55.730137496 +0100
+@@ -11,6 +11,7 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBL
+ endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
+ 
+ set(PLASMA_NO_PACKAGEKIT TRUE)
++set(PLASMA_NO_KDEWEBKIT TRUE)
+ 
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
+                     ${KDE4_KDECORE_INCLUDES}
+@@ -121,7 +122,6 @@ set(plasma_LIB_SRCS
+     framesvg.cpp
+     plasma.cpp
+     popupapplet.cpp
+-    private/animablegraphicswebview.cpp
+     private/applethandle.cpp
+     private/associatedapplicationmanager.cpp
+     private/componentinstaller.cpp
+@@ -211,7 +211,6 @@ set(plasma_LIB_SRCS
+     widgets/textbrowser.cpp
+     widgets/treeview.cpp
+     widgets/textedit.cpp
+-    widgets/webview.cpp
+ 
+     #Temporary QtJolie branch
+     private/qtjolie-branch/qtjolie/abstractadaptor.cpp
+@@ -275,7 +274,7 @@ endif(PHONON_FOUND)
+ 
+ kde4_add_library(plasma ${LIBRARY_TYPE} ${plasma_LIB_SRCS})
+ 
+-target_link_libraries(plasma LINK_PRIVATE ${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_LIBRARY}
++target_link_libraries(plasma LINK_PRIVATE ${QT_QTUITOOLS_LIBRARY}
+                              ${QT_QTSCRIPT_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSQL_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY}
+                              ${KDE4_KDEUI_LIBS} ${KDE4_KDNSSD_LIBS} ${KDE4_THREADWEAVER_LIBS} ${PLASMA_EXTRA_LIBS})
+ 
+@@ -415,7 +414,6 @@ install(FILES
+     widgets/textbrowser.h
+     widgets/treeview.h
+     widgets/textedit.h
+-    widgets/webview.h
+     DESTINATION ${INCLUDE_INSTALL_DIR}/plasma/widgets COMPONENT Devel)
+ 
+ install(FILES

Deleted: extra-i686/qt4.patch
===================================================================
--- extra-i686/qt4.patch	2017-02-28 19:06:41 UTC (rev 289740)
+++ extra-i686/qt4.patch	2017-02-28 19:07:15 UTC (rev 289741)
@@ -1,11 +0,0 @@
---- kdelibs-4.10.1/cmake/modules/FindQt4.cmake~	2013-03-07 16:57:29.735552097 +0000
-+++ kdelibs-4.10.1/cmake/modules/FindQt4.cmake	2013-03-07 16:57:52.038725421 +0000
-@@ -446,7 +446,7 @@
- # check for qmake
- # Debian uses qmake-qt4
- # macports' Qt uses qmake-mac
--FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
-+FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac PATHS
-   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
-   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
-   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin"

Copied: kdelibs/repos/extra-i686/qt4.patch (from rev 289740, kdelibs/trunk/qt4.patch)
===================================================================
--- extra-i686/qt4.patch	                        (rev 0)
+++ extra-i686/qt4.patch	2017-02-28 19:07:15 UTC (rev 289741)
@@ -0,0 +1,11 @@
+--- kdelibs-4.10.1/cmake/modules/FindQt4.cmake~	2013-03-07 16:57:29.735552097 +0000
++++ kdelibs-4.10.1/cmake/modules/FindQt4.cmake	2013-03-07 16:57:52.038725421 +0000
+@@ -446,7 +446,7 @@
+ # check for qmake
+ # Debian uses qmake-qt4
+ # macports' Qt uses qmake-mac
+-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
++FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac PATHS
+   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
+   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
+   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin"

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2017-02-28 19:06:41 UTC (rev 289740)
+++ extra-x86_64/PKGBUILD	2017-02-28 19:07:15 UTC (rev 289741)
@@ -1,64 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=kdelibs
-pkgver=4.14.29
-_kdeappver=16.12.2
-pkgrel=1
-pkgdesc="KDE Core Libraries"
-arch=('i686' 'x86_64')
-url='https://www.kde.org/'
-license=('GPL' 'LGPL' 'FDL')
-depends=('attica-qt4' 'libxss' 'qca-qt4' 'libdbusmenu-qt4' 'polkit-qt4'
-        'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr'
-        'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon-qt4'
-        'media-player-info' 'libutempter' 'icu')
-makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'mesa')
-source=("http://download.kde.org/stable/applications/${_kdeappver}/src/$pkgname-$pkgver.tar.xz"
-        'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch' 'kdelibs-no-kdewebkit.patch')
-sha1sums=('d04e3fe612cef075d2023f6cef1938ff236f19d3'
-          '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-          'ed1f57ee661e5c7440efcaba7e51d2554709701c'
-          'ee83d517c2d8dbe611e263ef16df87f39531fe72')
-
-prepare() {
-  mkdir -p build
-  cd ${pkgname}-${pkgver}
-  # avoid file conflict with gnome-menus
-  patch -p1 -i ../kde-applications-menu.patch
-  # add Archlinux menu entry
-  patch -p1 -i ../archlinux-menu.patch
-  # qmake refers to Qt5
-  patch -p1 -i ../qt4.patch
-  # disable kdewebkit (Fedora)
-  patch -p1 -i ../kdelibs-no-kdewebkit.patch
-}
-
-build() {
-       cd build
-       cmake ../$pkgname-$pkgver \
-               -DCMAKE_BUILD_TYPE=Release \
-               -DKDE4_BUILD_TESTS=OFF \
-               -DCMAKE_SKIP_RPATH=ON \
-               -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
-               -DCMAKE_INSTALL_PREFIX=/usr \
-               -DSYSCONF_INSTALL_DIR=/etc \
-               -DLOCALE_INSTALL_DIR=/usr/share/locale/kde4 \
-               -DKDE_DEFAULT_HOME='.kde4' \
-               -DWITH_FAM=OFF \
-               -DWITH_SOLID_UDISKS2=ON
-       make
-}
-
-package() {
-       cd build
-       make DESTDIR="$pkgdir" install
-
-       # cert bundle seems to be hardcoded
-       # link it to the one from ca-certificates
-       rm -f "$pkgdir"/usr/share/apps/kssl/ca-bundle.crt
-       ln -sf /etc/ssl/certs/ca-certificates.crt "$pkgdir"/usr/share/apps/kssl/ca-bundle.crt
-}

Copied: kdelibs/repos/extra-x86_64/PKGBUILD (from rev 289740, kdelibs/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2017-02-28 19:07:15 UTC (rev 289741)
@@ -0,0 +1,68 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=kdelibs
+pkgver=4.14.29
+_kdeappver=16.12.2
+pkgrel=2
+pkgdesc="KDE Core Libraries"
+arch=('i686' 'x86_64')
+url='https://www.kde.org/'
+license=('GPL' 'LGPL' 'FDL')
+depends=('attica-qt4' 'libxss' 'qca-qt4' 'libdbusmenu-qt4' 'polkit-qt4'
+        'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr'
+        'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon-qt4'
+        'media-player-info' 'libutempter' 'icu')
+makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'mesa')
+source=("https://download.kde.org/stable/applications/${_kdeappver}/src/$pkgname-$pkgver.tar.xz"
+        'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch' 'kdelibs-no-kdewebkit.patch'
+        kdelibs-sanitize-url.patch::"https://cgit.kde.org/kdelibs.git/patch/?id=1804c2fd")
+sha1sums=('d04e3fe612cef075d2023f6cef1938ff236f19d3'
+          '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
+          '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
+          'ed1f57ee661e5c7440efcaba7e51d2554709701c'
+          'ee83d517c2d8dbe611e263ef16df87f39531fe72'
+          '25c65eb2dd321b45e216d8b8adae2312bff06ee5')
+
+prepare() {
+  mkdir -p build
+  cd ${pkgname}-${pkgver}
+  # avoid file conflict with gnome-menus
+  patch -p1 -i ../kde-applications-menu.patch
+  # add Archlinux menu entry
+  patch -p1 -i ../archlinux-menu.patch
+  # qmake refers to Qt5
+  patch -p1 -i ../qt4.patch
+  # disable kdewebkit (Fedora)
+  patch -p1 -i ../kdelibs-no-kdewebkit.patch
+  # Sanitize URLs before passing them to FindProxyForURL
+  patch -p1 -i ../kdelibs-sanitize-url.patch
+}
+
+build() {
+       cd build
+       cmake ../$pkgname-$pkgver \
+               -DCMAKE_BUILD_TYPE=Release \
+               -DKDE4_BUILD_TESTS=OFF \
+               -DCMAKE_SKIP_RPATH=ON \
+               -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
+               -DCMAKE_INSTALL_PREFIX=/usr \
+               -DSYSCONF_INSTALL_DIR=/etc \
+               -DLOCALE_INSTALL_DIR=/usr/share/locale/kde4 \
+               -DKDE_DEFAULT_HOME='.kde4' \
+               -DWITH_FAM=OFF \
+               -DWITH_SOLID_UDISKS2=ON
+       make
+}
+
+package() {
+       cd build
+       make DESTDIR="$pkgdir" install
+
+       # cert bundle seems to be hardcoded
+       # link it to the one from ca-certificates
+       rm -f "$pkgdir"/usr/share/apps/kssl/ca-bundle.crt
+       ln -sf /etc/ssl/certs/ca-certificates.crt "$pkgdir"/usr/share/apps/kssl/ca-bundle.crt
+}

Deleted: extra-x86_64/archlinux-menu.patch
===================================================================
--- extra-x86_64/archlinux-menu.patch	2017-02-28 19:06:41 UTC (rev 289740)
+++ extra-x86_64/archlinux-menu.patch	2017-02-28 19:07:15 UTC (rev 289741)
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/applications.menu	2010-01-31 19:28:11.000000000 +0000
-+++ kdelibs-4.3.98/kded/applications.menu	2010-01-31 22:25:53.556043077 +0000
-@@ -16,11 +16,19 @@
- 	</DefaultLayout>
- 	<Layout>
- 		<Merge type="menus"/>
-+		<Menuname>Arch Linux</Menuname>
- 		<Menuname>Applications</Menuname>
- 		<Merge type="files"/>
- 	</Layout>
- 
- 	<Menu>
-+		<Name>Arch Linux</Name>                                                                                                   
-+		<Directory>Archlinux.directory</Directory>                                                                               
-+		<Include>                                                                                                                
-+			<Category>Archlinux</Category>                                                                                           
-+		</Include>
-+	</Menu>
-+	<Menu>
- 		<Name>Applications</Name>
- 		<Directory>kde-unknown.directory</Directory>
- 		<OnlyUnallocated/>

Copied: kdelibs/repos/extra-x86_64/archlinux-menu.patch (from rev 289740, kdelibs/trunk/archlinux-menu.patch)
===================================================================
--- extra-x86_64/archlinux-menu.patch	                        (rev 0)
+++ extra-x86_64/archlinux-menu.patch	2017-02-28 19:07:15 UTC (rev 289741)
@@ -0,0 +1,22 @@
+--- kdelibs-4.3.98/kded/applications.menu	2010-01-31 19:28:11.000000000 +0000
++++ kdelibs-4.3.98/kded/applications.menu	2010-01-31 22:25:53.556043077 +0000
+@@ -16,11 +16,19 @@
+ 	</DefaultLayout>
+ 	<Layout>
+ 		<Merge type="menus"/>
++		<Menuname>Arch Linux</Menuname>
+ 		<Menuname>Applications</Menuname>
+ 		<Merge type="files"/>
+ 	</Layout>
+ 
+ 	<Menu>
++		<Name>Arch Linux</Name>                                                                                                   
++		<Directory>Archlinux.directory</Directory>                                                                               
++		<Include>                                                                                                                
++			<Category>Archlinux</Category>                                                                                           
++		</Include>
++	</Menu>
++	<Menu>
+ 		<Name>Applications</Name>
+ 		<Directory>kde-unknown.directory</Directory>
+ 		<OnlyUnallocated/>

Deleted: extra-x86_64/kde-applications-menu.patch
===================================================================
--- extra-x86_64/kde-applications-menu.patch	2017-02-28 19:06:41 UTC (rev 289740)
+++ extra-x86_64/kde-applications-menu.patch	2017-02-28 19:07:15 UTC (rev 289741)
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/CMakeLists.txt	2009-10-02 14:55:17.000000000 +0000
-+++ kdelibs-4.3.98/kded/CMakeLists.txt	2010-01-31 22:16:13.946933892 +0000
-@@ -69,7 +69,7 @@
- if (WIN32)
- install( FILES applications.menu  DESTINATION  ${SHARE_INSTALL_PREFIX}/xdg/menus )
- else (WIN32)
--install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus )
-+install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu )
- endif (WIN32)
- install( FILES kdedmodule.desktop DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
- install( FILES kded.upd           DESTINATION  ${DATA_INSTALL_DIR}/kconf_update )
---- kdelibs-4.3.98/kded/kbuildsycoca.cpp	2009-12-04 23:10:18.000000000 +0000
-+++ kdelibs-4.3.98/kded/kbuildsycoca.cpp	2010-01-31 22:16:13.962766572 +0000
-@@ -302,7 +302,7 @@
-      if (!m_trackId.isEmpty())
-         g_vfolder->setTrackId(m_trackId);
- 
--     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
-+     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
- 
-      KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
-      entry->setLayoutInfo(kdeMenu->layoutList);

Copied: kdelibs/repos/extra-x86_64/kde-applications-menu.patch (from rev 289740, kdelibs/trunk/kde-applications-menu.patch)
===================================================================
--- extra-x86_64/kde-applications-menu.patch	                        (rev 0)
+++ extra-x86_64/kde-applications-menu.patch	2017-02-28 19:07:15 UTC (rev 289741)
@@ -0,0 +1,22 @@
+--- kdelibs-4.3.98/kded/CMakeLists.txt	2009-10-02 14:55:17.000000000 +0000
++++ kdelibs-4.3.98/kded/CMakeLists.txt	2010-01-31 22:16:13.946933892 +0000
+@@ -69,7 +69,7 @@
+ if (WIN32)
+ install( FILES applications.menu  DESTINATION  ${SHARE_INSTALL_PREFIX}/xdg/menus )
+ else (WIN32)
+-install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus )
++install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu )
+ endif (WIN32)
+ install( FILES kdedmodule.desktop DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
+ install( FILES kded.upd           DESTINATION  ${DATA_INSTALL_DIR}/kconf_update )
+--- kdelibs-4.3.98/kded/kbuildsycoca.cpp	2009-12-04 23:10:18.000000000 +0000
++++ kdelibs-4.3.98/kded/kbuildsycoca.cpp	2010-01-31 22:16:13.962766572 +0000
+@@ -302,7 +302,7 @@
+      if (!m_trackId.isEmpty())
+         g_vfolder->setTrackId(m_trackId);
+ 
+-     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
++     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
+ 
+      KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
+      entry->setLayoutInfo(kdeMenu->layoutList);

Deleted: extra-x86_64/kdelibs-no-kdewebkit.patch
===================================================================
--- extra-x86_64/kdelibs-no-kdewebkit.patch	2017-02-28 19:06:41 UTC (rev 289740)
+++ extra-x86_64/kdelibs-no-kdewebkit.patch	2017-02-28 19:07:15 UTC (rev 289741)
@@ -1,100 +0,0 @@
-diff -up kdelibs-4.14.16/CMakeLists.txt.webkit kdelibs-4.14.16/CMakeLists.txt
---- kdelibs-4.14.16/CMakeLists.txt.webkit	2016-01-07 00:02:22.000000000 +0100
-+++ kdelibs-4.14.16/CMakeLists.txt	2016-01-28 13:03:53.556194927 +0100
-@@ -356,7 +356,6 @@ if(NOT WINCE)
- add_subdirectory( plasma )
- endif(NOT WINCE)
- add_subdirectory( kunitconversion )
--add_subdirectory( kdewebkit )
- add_subdirectory( includes )
- 
- add_subdirectory( experimental )
-diff -up kdelibs-4.14.16/kdewidgets/CMakeLists.txt.webkit kdelibs-4.14.16/kdewidgets/CMakeLists.txt
---- kdelibs-4.14.16/kdewidgets/CMakeLists.txt.webkit	2016-01-28 13:03:53.527196020 +0100
-+++ kdelibs-4.14.16/kdewidgets/CMakeLists.txt	2016-01-28 13:03:53.556194927 +0100
-@@ -88,41 +88,6 @@ if(QT_QTDESIGNER_FOUND)
-     install(TARGETS kdedeprecated  DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
-   endif(NOT KDE_NO_DEPRECATED)
- 
--
--  # kdewebkit widgets
--  include_directories(
--    ${CMAKE_SOURCE_DIR}/kdewebkit
--  )
--
--  add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp
--    COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kdewebkit.widgets
--    MAIN_DEPENDENCY kdewebkit.widgets DEPENDS makekdewidgets)
--
--  set(kdewebkitwidgets_PART_SRCS
--     classpreviews.cpp
--     ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp
--  )
--
--  qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.moc)
--
--
--  qt4_add_resources(kdewebkitwidgets_PART_SRCS kdewebkitwidgets.qrc)
--
--  kde4_add_plugin(kdewebkitwidgets ${kdewebkitwidgets_PART_SRCS})
--
--  target_link_libraries(kdewebkitwidgets ${KDE4_KDEUI_LIBS} ${KDE4_KDEWEBKIT_LIBS} ${QT_QTWEBKIT_LIBRARY})
--  if(NOT WIN32)
--    set_target_properties(kdewebkitwidgets PROPERTIES
--                                     INSTALL_RPATH_USE_LINK_PATH TRUE
--                                     SKIP_BUILD_RPATH TRUE
--                                     BUILD_WITH_INSTALL_RPATH TRUE
--                                     INSTALL_RPATH ${LIB_INSTALL_DIR}
--                         )
--  endif(NOT WIN32)
--
--  install(TARGETS kdewebkitwidgets  DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
--
--
-   if (QT_QT3SUPPORT_FOUND)
- 
-      include_directories(
-diff -up kdelibs-4.14.16/plasma/CMakeLists.txt.webkit kdelibs-4.14.16/plasma/CMakeLists.txt
---- kdelibs-4.14.16/plasma/CMakeLists.txt.webkit	2016-01-07 00:02:22.000000000 +0100
-+++ kdelibs-4.14.16/plasma/CMakeLists.txt	2016-01-28 13:26:55.730137496 +0100
-@@ -11,6 +11,7 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBL
- endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
- 
- set(PLASMA_NO_PACKAGEKIT TRUE)
-+set(PLASMA_NO_KDEWEBKIT TRUE)
- 
- include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                     ${KDE4_KDECORE_INCLUDES}
-@@ -121,7 +122,6 @@ set(plasma_LIB_SRCS
-     framesvg.cpp
-     plasma.cpp
-     popupapplet.cpp
--    private/animablegraphicswebview.cpp
-     private/applethandle.cpp
-     private/associatedapplicationmanager.cpp
-     private/componentinstaller.cpp
-@@ -211,7 +211,6 @@ set(plasma_LIB_SRCS
-     widgets/textbrowser.cpp
-     widgets/treeview.cpp
-     widgets/textedit.cpp
--    widgets/webview.cpp
- 
-     #Temporary QtJolie branch
-     private/qtjolie-branch/qtjolie/abstractadaptor.cpp
-@@ -275,7 +274,7 @@ endif(PHONON_FOUND)
- 
- kde4_add_library(plasma ${LIBRARY_TYPE} ${plasma_LIB_SRCS})
- 
--target_link_libraries(plasma LINK_PRIVATE ${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_LIBRARY}
-+target_link_libraries(plasma LINK_PRIVATE ${QT_QTUITOOLS_LIBRARY}
-                              ${QT_QTSCRIPT_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSQL_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY}
-                              ${KDE4_KDEUI_LIBS} ${KDE4_KDNSSD_LIBS} ${KDE4_THREADWEAVER_LIBS} ${PLASMA_EXTRA_LIBS})
- 
-@@ -415,7 +414,6 @@ install(FILES
-     widgets/textbrowser.h
-     widgets/treeview.h
-     widgets/textedit.h
--    widgets/webview.h
-     DESTINATION ${INCLUDE_INSTALL_DIR}/plasma/widgets COMPONENT Devel)
- 
- install(FILES

Copied: kdelibs/repos/extra-x86_64/kdelibs-no-kdewebkit.patch (from rev 289740, kdelibs/trunk/kdelibs-no-kdewebkit.patch)
===================================================================
--- extra-x86_64/kdelibs-no-kdewebkit.patch	                        (rev 0)
+++ extra-x86_64/kdelibs-no-kdewebkit.patch	2017-02-28 19:07:15 UTC (rev 289741)
@@ -0,0 +1,100 @@
+diff -up kdelibs-4.14.16/CMakeLists.txt.webkit kdelibs-4.14.16/CMakeLists.txt
+--- kdelibs-4.14.16/CMakeLists.txt.webkit	2016-01-07 00:02:22.000000000 +0100
++++ kdelibs-4.14.16/CMakeLists.txt	2016-01-28 13:03:53.556194927 +0100
+@@ -356,7 +356,6 @@ if(NOT WINCE)
+ add_subdirectory( plasma )
+ endif(NOT WINCE)
+ add_subdirectory( kunitconversion )
+-add_subdirectory( kdewebkit )
+ add_subdirectory( includes )
+ 
+ add_subdirectory( experimental )
+diff -up kdelibs-4.14.16/kdewidgets/CMakeLists.txt.webkit kdelibs-4.14.16/kdewidgets/CMakeLists.txt
+--- kdelibs-4.14.16/kdewidgets/CMakeLists.txt.webkit	2016-01-28 13:03:53.527196020 +0100
++++ kdelibs-4.14.16/kdewidgets/CMakeLists.txt	2016-01-28 13:03:53.556194927 +0100
+@@ -88,41 +88,6 @@ if(QT_QTDESIGNER_FOUND)
+     install(TARGETS kdedeprecated  DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
+   endif(NOT KDE_NO_DEPRECATED)
+ 
+-
+-  # kdewebkit widgets
+-  include_directories(
+-    ${CMAKE_SOURCE_DIR}/kdewebkit
+-  )
+-
+-  add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp
+-    COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kdewebkit.widgets
+-    MAIN_DEPENDENCY kdewebkit.widgets DEPENDS makekdewidgets)
+-
+-  set(kdewebkitwidgets_PART_SRCS
+-     classpreviews.cpp
+-     ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp
+-  )
+-
+-  qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.moc)
+-
+-
+-  qt4_add_resources(kdewebkitwidgets_PART_SRCS kdewebkitwidgets.qrc)
+-
+-  kde4_add_plugin(kdewebkitwidgets ${kdewebkitwidgets_PART_SRCS})
+-
+-  target_link_libraries(kdewebkitwidgets ${KDE4_KDEUI_LIBS} ${KDE4_KDEWEBKIT_LIBS} ${QT_QTWEBKIT_LIBRARY})
+-  if(NOT WIN32)
+-    set_target_properties(kdewebkitwidgets PROPERTIES
+-                                     INSTALL_RPATH_USE_LINK_PATH TRUE
+-                                     SKIP_BUILD_RPATH TRUE
+-                                     BUILD_WITH_INSTALL_RPATH TRUE
+-                                     INSTALL_RPATH ${LIB_INSTALL_DIR}
+-                         )
+-  endif(NOT WIN32)
+-
+-  install(TARGETS kdewebkitwidgets  DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
+-
+-
+   if (QT_QT3SUPPORT_FOUND)
+ 
+      include_directories(
+diff -up kdelibs-4.14.16/plasma/CMakeLists.txt.webkit kdelibs-4.14.16/plasma/CMakeLists.txt
+--- kdelibs-4.14.16/plasma/CMakeLists.txt.webkit	2016-01-07 00:02:22.000000000 +0100
++++ kdelibs-4.14.16/plasma/CMakeLists.txt	2016-01-28 13:26:55.730137496 +0100
+@@ -11,6 +11,7 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBL
+ endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
+ 
+ set(PLASMA_NO_PACKAGEKIT TRUE)
++set(PLASMA_NO_KDEWEBKIT TRUE)
+ 
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
+                     ${KDE4_KDECORE_INCLUDES}
+@@ -121,7 +122,6 @@ set(plasma_LIB_SRCS
+     framesvg.cpp
+     plasma.cpp
+     popupapplet.cpp
+-    private/animablegraphicswebview.cpp
+     private/applethandle.cpp
+     private/associatedapplicationmanager.cpp
+     private/componentinstaller.cpp
+@@ -211,7 +211,6 @@ set(plasma_LIB_SRCS
+     widgets/textbrowser.cpp
+     widgets/treeview.cpp
+     widgets/textedit.cpp
+-    widgets/webview.cpp
+ 
+     #Temporary QtJolie branch
+     private/qtjolie-branch/qtjolie/abstractadaptor.cpp
+@@ -275,7 +274,7 @@ endif(PHONON_FOUND)
+ 
+ kde4_add_library(plasma ${LIBRARY_TYPE} ${plasma_LIB_SRCS})
+ 
+-target_link_libraries(plasma LINK_PRIVATE ${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_LIBRARY}
++target_link_libraries(plasma LINK_PRIVATE ${QT_QTUITOOLS_LIBRARY}
+                              ${QT_QTSCRIPT_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSQL_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY}
+                              ${KDE4_KDEUI_LIBS} ${KDE4_KDNSSD_LIBS} ${KDE4_THREADWEAVER_LIBS} ${PLASMA_EXTRA_LIBS})
+ 
+@@ -415,7 +414,6 @@ install(FILES
+     widgets/textbrowser.h
+     widgets/treeview.h
+     widgets/textedit.h
+-    widgets/webview.h
+     DESTINATION ${INCLUDE_INSTALL_DIR}/plasma/widgets COMPONENT Devel)
+ 
+ install(FILES

Deleted: extra-x86_64/qt4.patch
===================================================================
--- extra-x86_64/qt4.patch	2017-02-28 19:06:41 UTC (rev 289740)
+++ extra-x86_64/qt4.patch	2017-02-28 19:07:15 UTC (rev 289741)
@@ -1,11 +0,0 @@
---- kdelibs-4.10.1/cmake/modules/FindQt4.cmake~	2013-03-07 16:57:29.735552097 +0000
-+++ kdelibs-4.10.1/cmake/modules/FindQt4.cmake	2013-03-07 16:57:52.038725421 +0000
-@@ -446,7 +446,7 @@
- # check for qmake
- # Debian uses qmake-qt4
- # macports' Qt uses qmake-mac
--FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
-+FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac PATHS
-   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
-   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
-   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin"

Copied: kdelibs/repos/extra-x86_64/qt4.patch (from rev 289740, kdelibs/trunk/qt4.patch)
===================================================================
--- extra-x86_64/qt4.patch	                        (rev 0)
+++ extra-x86_64/qt4.patch	2017-02-28 19:07:15 UTC (rev 289741)
@@ -0,0 +1,11 @@
+--- kdelibs-4.10.1/cmake/modules/FindQt4.cmake~	2013-03-07 16:57:29.735552097 +0000
++++ kdelibs-4.10.1/cmake/modules/FindQt4.cmake	2013-03-07 16:57:52.038725421 +0000
+@@ -446,7 +446,7 @@
+ # check for qmake
+ # Debian uses qmake-qt4
+ # macports' Qt uses qmake-mac
+-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
++FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac PATHS
+   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
+   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
+   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin"



More information about the arch-commits mailing list