konqueror-16.12.0-1.parabola1: updating version

* rename KDE kdebase-konqueror package

4 files changed, 79 insertions, 87 deletions

diff --git a/libre/kdebase-konqueror/PKGBUILD b/libre/kdebase-konqueror/PKGBUILD
deleted file mode 100644
index 7be0e241e..000000000
--- a/libre/kdebase-konqueror/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 280288 2016-11-10 18:13:29Z arojas $
-# Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>
-# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
-# Contributor (Arch): Pierre Schmitz <pierre@archlinux.de>
-# Maintainer: Michał Masłowski <mtjm@mtjm.eu>
-# Maintainer: André Silva <emulatorman@parabola.nu>
-
-pkgbase=kdebase
-pkgname='kdebase-konqueror'
-pkgver=16.08.3
-pkgrel=1.parabola1
-arch=('i686' 'x86_64' 'armv7h')
-url="http://kde.org/applications/internet/konqueror/"
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde-applications' 'kdebase')
-conflicts=('kdebase-nsplugins' 'kdebase-konqueror-libre')
-replaces=('kdebase-nsplugins' 'kdebase-konqueror-libre')
-makedepends=('libkactivities4' 'cmake' 'automoc4' 'tidy')
-source=("http://download.kde.org/stable/applications/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz"
-        'konq-about-fsdg.diff')
-sha1sums=('aeac2b7cab6a40c740f3b46c282ce3b9381249bd'
-          'd6cbb53c04179b8180f9439eca156b7ff2e76b3a')
-pkgdesc='KDE File Manager & Web Browser, without Google and nonfree software recommendation'
-depends=('dolphinpart4' 'kdebase-keditbookmarks')
-optdepends=('kwebkitpart: to enable webkit engine')
-
-prepare() {
-  mkdir -p build
-
-  cd kde-baseapps-${pkgver}
-  # Don't recommend nonfree software or Google.
-  patch -Np1 -i "${srcdir}/konq-about-fsdg.diff"
-}
-
-build() {
-  cd build
-  cmake ../kde-baseapps-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DKDE4_BUILD_TESTS=OFF \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr
-
-  for i in konqueror doc/konqueror nsplugins; do
-    cd $srcdir/build/${i}
-    make
-  done
-}
-
-package() {
-  for i in konqueror doc/konqueror nsplugins; do
-    cd $srcdir/build/${i}
-    make DESTDIR=$pkgdir install
-  done
-}
diff --git a/libre/kdebase-konqueror/konq-about-fsdg.diff b/libre/kdebase-konqueror/konq-about-fsdg.diff
deleted file mode 100644
index 93ef4016a..000000000
--- a/libre/kdebase-konqueror/konq-about-fsdg.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ru kde-baseapps-4.8.0.orig/konqueror/about/konq_aboutpage.cc kde-baseapps-4.8.0/konqueror/about/konq_aboutpage.cc
---- kde-baseapps-4.8.0.orig/konqueror/about/konq_aboutpage.cc	2012-01-30 19:28:59.506176399 +0100
-+++ kde-baseapps-4.8.0/konqueror/about/konq_aboutpage.cc	2012-01-30 19:34:50.695537153 +0100
-@@ -214,14 +214,11 @@
- 		     QString("http://www.ecma-international.org/publications/standards/ECMA-262.HTM")) )
-           .arg( i18n("JavaScript disabled (globally). Enable JavaScript <A HREF=\"%1\">here</A>.", QString("exec:/kcmshell4 khtml_java_js")) )
-           .arg( i18n("JavaScript enabled (globally). Configure JavaScript <A HREF=\\\"%1\\\">here</A>.", QString("exec:/kcmshell4 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", QString("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>)",
--                       QString("http://www.ibm.com"), QString("http://www.oracle.com/technetwork/java/index.html")) )
-+          .arg( i18n("Secure Java<SUP>&reg;</SUP> support") )
-+          .arg( i18n("JDK 1.2.0 (Java 2) compatible VM") )
-           .arg( i18n("Enable Java (globally) <A HREF=\"%1\">here</A>.", QString("exec:/kcmshell4 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.)",
--                       QString("http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"),
--                       QString("http://www.real.com"), QString("http://www.real.com"),
--                       QString("about:plugins")) )
-+          .arg( i18n("Netscape Communicator<SUP>&reg;</SUP> <A HREF=\"%1\">plugins</A> ",
-+                       QString("about:plugins")) )
-           .arg( i18n("built-in") )
-           .arg( i18n("Secure Sockets Layer") )
-           .arg( i18n("(TLS/SSL v2/3) for secure communications up to 168bit") )
-@@ -293,8 +290,8 @@
- 	.arg( i18n( "Tips" ) )
- 	.arg( i18n( "Specifications" ) )
- 	.arg( i18n( "Tips &amp; 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." , QString("exec:/kcmshell4 ebrowsing")) )
diff --git a/libre/konqueror/PKGBUILD b/libre/konqueror/PKGBUILD
new file mode 100644
index 000000000..426126bdd
--- /dev/null
+++ b/libre/konqueror/PKGBUILD
@@ -0,0 +1,47 @@
+# 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.0
+pkgrel=1.parabola1
+pkgdesc="KDE File Manager & Web Browser, without Google and nonfree software recommendation"
+arch=(i686 x86_64 armv7h)
+url="https://konqueror.org/"
+license=(LGPL)
+depends=(dolphin keditbookmarks qt5-webengine)
+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')
+md5sums=('364cad4bbea9ff403fc288609b4e4463'
+         'SKIP'
+         'f7dd7c4177454bdbd538c1aea92356f0')
+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
+}
+
+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/konq-about-fsdg.diff b/libre/konqueror/konq-about-fsdg.diff
new file mode 100644
index 000000000..8b508c79f
--- /dev/null
+++ b/libre/konqueror/konq-about-fsdg.diff
@@ -0,0 +1,32 @@
+diff --git a/about/konq_aboutpage.cpp b/about/konq_aboutpage.cpp
+index 0178758..184c810 100644
+--- a/about/konq_aboutpage.cpp
++++ b/about/konq_aboutpage.cpp
+@@ -219,13 +219,10 @@ 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"),
++          .arg(i18n("Netscape Communicator<SUP>&reg;</SUP> <A HREF=\"%1\">plugins</A>",
+                     QStringLiteral("about:plugins")))
+           .arg(i18n("built-in"))
+           .arg(i18n("Secure Sockets Layer"))
+@@ -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")))