diff options
Diffstat (limited to 'libre/konqueror/libre.patch')
| -rw-r--r-- | libre/konqueror/libre.patch | 40 |
1 files changed, 17 insertions, 23 deletions
diff --git a/libre/konqueror/libre.patch b/libre/konqueror/libre.patch index f772c625a..d782bf969 100644 --- a/libre/konqueror/libre.patch +++ b/libre/konqueror/libre.patch @@ -1,8 +1,6 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0b1c8782c..8a822fcf8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -20,7 +20,7 @@ include(ECMSetupVersion) +--- 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}") @@ -11,7 +9,7 @@ index 0b1c8782c..8a822fcf8 100644 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 ) +@@ -52,7 +52,6 @@ add_subdirectory( src ) add_subdirectory( client ) add_subdirectory( autotests ) @@ -19,34 +17,30 @@ index 0b1c8782c..8a822fcf8 100644 add_subdirectory( about ) add_subdirectory( pics ) -diff --git a/about/konq_aboutpage.cpp b/about/konq_aboutpage.cpp -index 017875809..86d8f0d4c 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"))) +--- 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\">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 <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("Netscape Communicator<SUP>®</SUP> <A HREF=\"%4\">plugins</A> (for viewing <A HREF=\"%1\">Flash<SUP>®</SUP></A>, <A HREF=\"%2\">Real<SUP>®</SUP></A>Audio, <A HREF=\"%3\">Real<SUP>®</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("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"))) ++ QStringLiteral("about:plugins"))) .arg(i18n("built-in")) .arg(i18n("Secure Sockets Layer")) -@@ -301,8 +298,8 @@ QString KonqAboutPageSingleton::tips() - .arg(i18n("Tips")) + .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, " + .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 " |