1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
--- 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 @@
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( src )
add_subdirectory( client )
add_subdirectory( autotests )
-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 @@
.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>®</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"))
+ .arg(i18n("JDK 1.2.0 (Java 2) compatible VM"))
.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>®</SUP></A>, etc.)",
- QStringLiteral("https://get.adobe.com/flashplayer/"),
- QStringLiteral("about:plugins")))
+ .arg(i18n("NPAPI<SUP>®</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,7 +300,7 @@
.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 "
+ "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")))
|
