konqueror: move package from [libre-testing] to [libre]

4 files changed, 8 insertions, 89 deletions

diff --git a/libre-testing/konqueror/PKGBUILD b/libre-testing/konqueror/PKGBUILD
deleted file mode 100644
index 79dd7519f..000000000
--- a/libre-testing/konqueror/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# Maintainer (Arch): Antonio Rojas <arojas@archlinux,org>
-# Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>
-# Maintainer: André Silva <emulatorman@parabola.nu>
-# Contributor: Michał Masłowski <mtjm@mtjm.eu>
-
-pkgname=konqueror
-pkgver=16.12.2
-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)
-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}
-        'libre.patch')
-md5sums=('ebc2f5db4aa377ca11d4e4a7cdf3bf7f'
-         'SKIP'
-         'dc679b64429e08e541f27268a8faadd6')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid@kde.org>
-
-prepare() {
-  mkdir -p build
-
-  cd $pkgname-$pkgver
-  # Remove nonfree WebEngine support and nonfree software or Google recommendation
-  rm -rv webenginepart
-  patch -p1 -i ../libre.patch
-}
-
-build() {
-  cd build
-  cmake ../$pkgname-$pkgver \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DBUILD_TESTING=OFF
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-}
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/konq-about-fsdg.diff
deleted file mode 100644
index 90bcd1dfb..000000000
--- a/libre/konqueror/konq-about-fsdg.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/about/konq_aboutpage.cpp b/about/konq_aboutpage.cpp
-index 0178758..fc95efa 100644
---- a/about/konq_aboutpage.cpp
-+++ b/about/konq_aboutpage.cpp
-@@ -219,14 +219,11 @@ QString KonqAboutPageSingleton::specs()
-                     QStringLiteral("http://www.ecma-international.org/publications/standards/ECMA-262.HTM")))
-           .arg(i18n("JavaScript disabled (globally). Enable JavaScript <A HREF=\"%1\">here</A>.", QStringLiteral("exec:/kcmshell5 khtml_java_js")))
-           .arg(i18n("JavaScript enabled (globally). Configure JavaScript <A HREF=\\\"%1\\\">here</A>.", QStringLiteral("exec:/kcmshell5 khtml_java_js")))   // leave the double backslashes here, they are necessary for javascript !
--          .arg(i18n("Secure <A HREF=\"%1\">Java</A><SUP>&reg;</SUP> support", QStringLiteral("http://www.oracle.com/technetwork/java/index.html")))
--          .arg(i18n("JDK 1.2.0 (Java 2) compatible VM (<A HREF=\"%1\">IBM</A> or <A HREF=\"%2\">Sun/Oracle</A>)",
--                    QStringLiteral("http://www.ibm.com"), QStringLiteral("http://www.oracle.com/technetwork/java/index.html")))
-+          .arg(i18n("Secure Java<SUP>&reg;</SUP> support"),
-+                    QStringLiteral("about:plugins"))
-           .arg(i18n("Enable Java (globally) <A HREF=\"%1\">here</A>.", QStringLiteral("exec:/kcmshell5 khtml_java_js")))   // TODO Maybe test if Java is enabled ?
--          .arg(i18n("Netscape Communicator<SUP>&reg;</SUP> <A HREF=\"%4\">plugins</A> (for viewing <A HREF=\"%1\">Flash<SUP>&reg;</SUP></A>, <A HREF=\"%2\">Real<SUP>&reg;</SUP></A>Audio, <A HREF=\"%3\">Real<SUP>&reg;</SUP></A>Video, etc.)",
--                    QStringLiteral("http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"),
--                    QStringLiteral("http://www.real.com"), QStringLiteral("http://www.real.com"),
--                    QStringLiteral("about:plugins")))
-+          .arg(i18n("Netscape Communicator<SUP>&reg;</SUP> <A HREF=\"%1\">plugins</A>"),
-+                    QStringLiteral("about:plugins"))
-           .arg(i18n("built-in"))
-           .arg(i18n("Secure Sockets Layer"))
-           .arg(i18n("(TLS/SSL v2/3) for secure communications up to 168bit"))
-@@ -301,8 +298,8 @@ QString KonqAboutPageSingleton::tips()
-           .arg(i18n("Tips"))
-           .arg(i18n("Specifications"))
-           .arg(i18n("Tips & Tricks"))
--          .arg(i18n("Use Web-Shortcuts: by typing \"gg: KDE\" one can search the Internet, "
--                    "using Google, for the search phrase \"KDE\". There are a lot of "
-+          .arg(i18n("Use Web-Shortcuts: by typing \"dd: KDE\" one can search the Internet, "
-+                    "using DuckDuckGo HTML, for the search phrase \"KDE\". There are a lot of "
-                     "Web-Shortcuts predefined to make searching for software or looking "
-                     "up certain words in an encyclopedia a breeze. You can even "
-                     "<a href=\"%1\">create your own</a> Web-Shortcuts.", QStringLiteral("exec:/kcmshell5 webshortcuts")))
diff --git a/libre-testing/konqueror/libre.patch b/libre/konqueror/libre.patch
index 81251960d..81251960d 100644
--- a/libre-testing/konqueror/libre.patch
+++ b/libre/konqueror/libre.patch