From 3c67d59b88ecdbc3d6fcd9e75a2e0f37b40728f4 Mon Sep 17 00:00:00 2001 From: AndrĂ© Fabian Silva Delgado Date: Wed, 8 Mar 2017 01:48:57 -0300 Subject: konqueror: move package from [libre-testing] to [libre] --- libre/konqueror/PKGBUILD | 15 +++++----- libre/konqueror/konq-about-fsdg.diff | 34 ---------------------- libre/konqueror/libre.patch | 55 ++++++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 41 deletions(-) delete mode 100644 libre/konqueror/konq-about-fsdg.diff create mode 100644 libre/konqueror/libre.patch (limited to 'libre') 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 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 here.", QStringLiteral("exec:/kcmshell5 khtml_java_js"))) - .arg(i18n("JavaScript enabled (globally). Configure JavaScript here.", QStringLiteral("exec:/kcmshell5 khtml_java_js"))) // leave the double backslashes here, they are necessary for javascript ! -- .arg(i18n("Secure Java® support", QStringLiteral("http://www.oracle.com/technetwork/java/index.html"))) -- .arg(i18n("JDK 1.2.0 (Java 2) compatible VM (IBM or Sun/Oracle)", -- QStringLiteral("http://www.ibm.com"), QStringLiteral("http://www.oracle.com/technetwork/java/index.html"))) -+ .arg(i18n("Secure Java® support"), -+ QStringLiteral("about:plugins")) - .arg(i18n("Enable Java (globally) here.", QStringLiteral("exec:/kcmshell5 khtml_java_js"))) // TODO Maybe test if Java is enabled ? -- .arg(i18n("Netscape Communicator® plugins (for viewing Flash®, Real®Audio, Real®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® 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,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 " - "create your own Web-Shortcuts.", QStringLiteral("exec:/kcmshell5 webshortcuts"))) diff --git a/libre/konqueror/libre.patch b/libre/konqueror/libre.patch new file mode 100644 index 000000000..81251960d --- /dev/null +++ b/libre/konqueror/libre.patch @@ -0,0 +1,55 @@ +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 017875809..fc95efa89 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 here.", QStringLiteral("exec:/kcmshell5 khtml_java_js"))) + .arg(i18n("JavaScript enabled (globally). Configure JavaScript here.", QStringLiteral("exec:/kcmshell5 khtml_java_js"))) // leave the double backslashes here, they are necessary for javascript ! +- .arg(i18n("Secure Java® support", QStringLiteral("http://www.oracle.com/technetwork/java/index.html"))) +- .arg(i18n("JDK 1.2.0 (Java 2) compatible VM (IBM or Sun/Oracle)", +- QStringLiteral("http://www.ibm.com"), QStringLiteral("http://www.oracle.com/technetwork/java/index.html"))) ++ .arg(i18n("Secure Java® support"), ++ QStringLiteral("about:plugins")) + .arg(i18n("Enable Java (globally) here.", QStringLiteral("exec:/kcmshell5 khtml_java_js"))) // TODO Maybe test if Java is enabled ? +- .arg(i18n("Netscape Communicator® plugins (for viewing Flash®, Real®Audio, Real®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® 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,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 " + "create your own Web-Shortcuts.", QStringLiteral("exec:/kcmshell5 webshortcuts"))) -- cgit v1.2.3