diff options
Diffstat (limited to 'libre/konqueror')
| -rw-r--r-- | libre/konqueror/PKGBUILD | 15 | ||||
| -rw-r--r-- | libre/konqueror/libre.patch (renamed from libre/konqueror/konq-about-fsdg.diff) | 23 |
2 files changed, 30 insertions, 8 deletions
diff --git a/libre/konqueror/PKGBUILD b/libre/konqueror/PKGBUILD index e3a9ce802..79dd7519f 100644 --- a/libre/konqueror/PKGBUILD +++ b/libre/konqueror/PKGBUILD @@ -5,30 +5,31 @@ pkgname=konqueror pkgver=16.12.2 -pkgrel=1.parabola1 -pkgdesc="KDE File Manager & Web Browser, without Google and nonfree software recommendation" +pkgrel=1.parabola2 +pkgdesc="KDE File Manager & Web Browser, without Google, nonfree software recommendation and nonfree qt5-webengine support" arch=(i686 x86_64 armv7h) url="https://konqueror.org/" license=(LGPL) -depends=(dolphin keditbookmarks qt5-webengine) +depends=(dolphin keditbookmarks) makedepends=(extra-cmake-modules kdoctools python tidy kdesignerplugin kdesu) optdepends=('tidy: tidy HTML plugin' 'kdesu: shell command plugin') conflicts=(kdebase-konqueror kdebase-konq-plugins) replaces=(kdebase-konqueror kdebase-konq-plugins) groups=(kde-applications kdebase) source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig} - 'konq-about-fsdg.diff') + 'libre.patch') md5sums=('ebc2f5db4aa377ca11d4e4a7cdf3bf7f' 'SKIP' - '31c3d842ccc31ddcde2730813dc667da') + 'dc679b64429e08e541f27268a8faadd6') validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid@kde.org> prepare() { mkdir -p build cd $pkgname-$pkgver - # Don't recommend nonfree software or Google. - patch -p1 -i ../konq-about-fsdg.diff + # Remove nonfree WebEngine support and nonfree software or Google recommendation + rm -rv webenginepart + patch -p1 -i ../libre.patch } build() { diff --git a/libre/konqueror/konq-about-fsdg.diff b/libre/konqueror/libre.patch index 90bcd1dfb..81251960d 100644 --- a/libre/konqueror/konq-about-fsdg.diff +++ b/libre/konqueror/libre.patch @@ -1,5 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0b1c8782c..8a822fcf8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,7 +20,7 @@ include(ECMSetupVersion) + set(KONQUEROR_LIB_VERSION "5.0.97") + set(KONQUEROR_VERSION "${KONQUEROR_LIB_VERSION}") + +-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Widgets WebEngineWidgets) ++find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Widgets) + find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Parts KCMUtils KHtml KDELibs4Support Archive Crash) + + find_package(KF5 ${KF5_MIN_VERSION} COMPONENTS Activities DocTools) # Optional +@@ -52,7 +52,6 @@ add_subdirectory( libkonq ) + add_subdirectory( src ) + add_subdirectory( client ) + add_subdirectory( autotests ) +-add_subdirectory( webenginepart ) + + add_subdirectory( about ) + add_subdirectory( pics ) diff --git a/about/konq_aboutpage.cpp b/about/konq_aboutpage.cpp -index 0178758..fc95efa 100644 +index 017875809..fc95efa89 100644 --- a/about/konq_aboutpage.cpp +++ b/about/konq_aboutpage.cpp @@ -219,14 +219,11 @@ QString KonqAboutPageSingleton::specs() |