konqueror-19.12.3-1.parabola1: updating version

2 files changed, 23 insertions, 28 deletions

diff --git a/libre/konqueror/PKGBUILD b/libre/konqueror/PKGBUILD
index 9599d1313..f3d6740e7 100644
--- a/libre/konqueror/PKGBUILD
+++ b/libre/konqueror/PKGBUILD
@@ -7,7 +7,7 @@
 # Contributor: jc_gargma <jc_gargma@iserlohn-fortress.net>
 
 pkgname=konqueror
-pkgver=17.12.3
+pkgver=19.12.3
 pkgrel=1
 pkgrel+=.parabola1
 pkgdesc="KDE File Manager & Web Browser"
@@ -16,17 +16,15 @@ arch=(x86_64)
 arch+=(i686 armv7h)
 url="https://konqueror.org/"
 license=(LGPL)
-depends=(dolphin keditbookmarks kdelibs4support)
-makedepends=(extra-cmake-modules kdoctools python tidy kdesignerplugin kdesu khtml)
-optdepends=('tidy: tidy HTML plugin' 'kdesu: shell command plugin' 'khtml: alternative web engine')
-conflicts=(kdebase-konqueror kdebase-konq-plugins)
-replaces=(kdebase-konqueror kdebase-konq-plugins)
+depends=(dolphin keditbookmarks qt5-script kdelibs4support khtml)
+makedepends=(extra-cmake-modules kdoctools kdesignerplugin kdesu)
+optdepends=('kdesu: shell command plugin')
 groups=(kde-applications kdebase)
-source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig})
+source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig})
 source+=('libre.patch')
-sha256sums=('1c020fa206511829556dd68840751bcc133861ef875a2eda2544f44aae101536'
+sha256sums=('0f2b31a1dae1740839232bd646bf22d7cb57e34995584b9a96271ebcb0da7f0e'
             'SKIP'
-            '469f413dbe1fc19bde685a702c5291a68e22880edb51eade012d08d965d0364c')
+            '677a8cc6a725a1f66a97d79e2ca07d08f8a4328e9704f033f6686c921122f207')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid@kde.org>
               F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck@kde.org>
 
@@ -42,8 +40,6 @@ prepare() {
 build() {
   cd build
   cmake ../$pkgname-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
     -DBUILD_TESTING=OFF
   make
 }
diff --git a/libre/konqueror/libre.patch b/libre/konqueror/libre.patch
index d782bf969..57599c47e 100644
--- a/libre/konqueror/libre.patch
+++ b/libre/konqueror/libre.patch
@@ -1,28 +1,29 @@
---- konqueror-17.04.1.orig/CMakeLists.txt	2017-05-08 19:08:55.000000000 -0500
-+++ konqueror-17.04.1/CMakeLists.txt	2017-06-02 23:13:24.581753677 -0500
-@@ -22,7 +22,7 @@
+--- konqueror-19.12.3.orig/CMakeLists.txt	2020-03-02 19:07:49.000000000 -0500
++++ konqueror-19.12.3/CMakeLists.txt	2020-04-09 17:56:43.561366114 -0500
+@@ -23,7 +23,7 @@
  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} REQUIRED COMPONENTS Parts KCMUtils KHtml Archive Crash WindowSystem Init IconThemes DBusAddons)
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS KDELibs4Support)
  
- find_package(KF5 ${KF5_MIN_VERSION} COMPONENTS Activities DocTools) # Optional
-@@ -52,7 +52,6 @@
- add_subdirectory( src )
- add_subdirectory( client )
- add_subdirectory( autotests )
+@@ -60,7 +60,6 @@
+ if(BUILD_TESTING)
+     add_subdirectory( autotests )
+ endif()
 -add_subdirectory( webenginepart )
  
  add_subdirectory( about )
  add_subdirectory( pics )
---- konqueror-17.04.1.orig/about/konq_aboutpage.cpp	2017-05-06 08:10:36.000000000 -0500
-+++ konqueror-17.04.1/about/konq_aboutpage.cpp	2017-06-02 23:18:14.971764739 -0500
-@@ -220,12 +220,11 @@
+--- konqueror-19.12.3.orig/about/konq_aboutpage.cpp	2020-02-16 03:48:11.000000000 -0500
++++ konqueror-19.12.3/about/konq_aboutpage.cpp	2020-04-09 18:28:09.451377892 -0500
+@@ -218,12 +218,10 @@
+                     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("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\">OpenJDK</A> or <A HREF=\"%2\">Sun/Oracle</A>)",
 -                    QStringLiteral("http://openjdk.java.net/"), QStringLiteral("http://www.oracle.com/technetwork/java/index.html")))
 +          .arg(i18n("Secure Java support"))
@@ -30,13 +31,11 @@
            .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("NPAPI <A HREF=\"%2\">plugins</A> (for viewing <A HREF=\"%1\">Flash<SUP>&reg;</SUP></A>, etc.)",
 -                    QStringLiteral("https://get.adobe.com/flashplayer/"),
--                    QStringLiteral("about:plugins")))
 +          .arg(i18n("NPAPI<SUP>&reg;</SUP> <A HREF=\"%1\">plugins</A>",
-+                     QStringLiteral("about:plugins")))
+                     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,7 +300,7 @@
+@@ -300,7 +298,7 @@
            .arg(i18n("Specifications"))
            .arg(i18n("Tips & Tricks"))
            .arg(i18n("Use Web-Shortcuts: by typing \"gg: KDE\" one can search the Internet, "