summaryrefslogtreecommitdiff
path: root/libre/kdelibs
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2017-02-07 12:50:17 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2017-02-07 12:50:17 -0300
commit9afe4657f41aed52ff1e98d39b0d4850b8477a21 (patch)
tree88df876fa613359cb75411e0de2d254501b110cc /libre/kdelibs
parent08ec8c4ec6aaed4ce647d40f29648f26fc8850bd (diff)
downloadabslibre-9afe4657f41aed52ff1e98d39b0d4850b8477a21.tar.gz
abslibre-9afe4657f41aed52ff1e98d39b0d4850b8477a21.tar.bz2
abslibre-9afe4657f41aed52ff1e98d39b0d4850b8477a21.zip
kdelibs-4.14.28-2.parabola1: kill kdewebkit - FS#52645 -> https://bugs.archlinux.org/task/52645
Diffstat (limited to 'libre/kdelibs')
-rw-r--r--libre/kdelibs/PKGBUILD13
-rw-r--r--libre/kdelibs/kdelibs-no-kdewebkit.patch100
2 files changed, 108 insertions, 5 deletions
diff --git a/libre/kdelibs/PKGBUILD b/libre/kdelibs/PKGBUILD
index 6dad17d4a..164661ed1 100644
--- a/libre/kdelibs/PKGBUILD
+++ b/libre/kdelibs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 285928 2017-01-12 19:03:07Z arojas $
+# $Id: PKGBUILD 288154 2017-02-07 08:19:18Z arojas $
# Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>
# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org
# Contributor (Arch): Pierre Schmitz <pierre@archlinux.de>
@@ -7,7 +7,7 @@
pkgname=kdelibs
pkgver=4.14.28
_kdeappver=16.12.1
-pkgrel=1.parabola1
+pkgrel=2.parabola1
pkgdesc="KDE Core Libraries, without nonfree plugins recommendation support"
arch=('i686' 'x86_64' 'armv7h')
url='https://www.kde.org/'
@@ -17,14 +17,15 @@ conflicts=('kdelibs-libre')
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' 'qtwebkit' 'icu')
+ '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' 'khtml-fsdg.diff' 'qt4.patch')
+ 'kde-applications-menu.patch' 'khtml-fsdg.diff' 'qt4.patch' 'kdelibs-no-kdewebkit.patch')
sha1sums=('3921bef4c2e7ce97bf5fcef8f3db8ddf3b096d9e'
'86ee8c8660f19de8141ac99cd6943964d97a1ed7'
'a1502a964081ad583a00cf90c56e74bf60121830'
- 'ed1f57ee661e5c7440efcaba7e51d2554709701c')
+ 'ed1f57ee661e5c7440efcaba7e51d2554709701c'
+ 'ee83d517c2d8dbe611e263ef16df87f39531fe72')
prepare() {
mkdir -p build
@@ -35,6 +36,8 @@ prepare() {
patch -p1 -i ../khtml-fsdg.diff
# qmake refers to Qt5
patch -p1 -i ../qt4.patch
+ # disable kdewebkit (Fedora)
+ patch -p1 -i ../kdelibs-no-kdewebkit.patch
}
build() {
diff --git a/libre/kdelibs/kdelibs-no-kdewebkit.patch b/libre/kdelibs/kdelibs-no-kdewebkit.patch
new file mode 100644
index 000000000..d204a3748
--- /dev/null
+++ b/libre/kdelibs/kdelibs-no-kdewebkit.patch
@@ -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