Commit dc4fcb0e by Ruben Rodriguez

Added helpers for kde-baseapps and kde4libs, fixes #20558

parent 2d67b95c
diff -ru source.orig/konqueror/about/konq_aboutpage.cc source/konqueror/about/konq_aboutpage.cc
--- source.orig/konqueror/about/konq_aboutpage.cc 2014-07-09 23:11:04.000000000 -0400
+++ source/konqueror/about/konq_aboutpage.cc 2017-03-05 14:41:47.307284541 -0500
@@ -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"),
+ QStringLiteral("about:plugins"))
.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>"),
+ QStringLiteral("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 -ru kdelibs-4.8.0.orig/khtml/html/html_objectimpl.cpp kdelibs-4.8.0/khtml/html/html_objectimpl.cpp
--- kdelibs-4.8.0.orig/khtml/html/html_objectimpl.cpp 2012-01-30 19:46:27.684114289 +0100
+++ kdelibs-4.8.0/khtml/html/html_objectimpl.cpp 2012-01-30 19:47:47.222111046 +0100
@@ -577,46 +577,6 @@
void HTMLObjectBaseElementImpl::slotPartLoadingErrorNotify()
{
- // If we have an embed, we may be able to tell the user where to
- // download the plugin.
-
- HTMLEmbedElementImpl *embed = relevantEmbed();
- QString serviceType; // shadows ours, but we don't care.
-
- if (!embed)
- return;
-
- serviceType = embed->serviceType;
-
- KHTMLPart* part = document()->part();
- KParts::BrowserExtension *ext = part->browserExtension();
-
- if(!embed->pluginPage.isEmpty() && ext) {
- // Prepare the mimetype to show in the question (comment if available, name as fallback)
- QString mimeName = serviceType;
- KMimeType::Ptr mime = KMimeType::mimeType(serviceType, KMimeType::ResolveAliases);
- if ( mime && mime->name() != KMimeType::defaultMimeType() )
- mimeName = mime->comment();
-
- // Check if we already asked the user, for this page
- if (!mimeName.isEmpty() && !part->pluginPageQuestionAsked(serviceType))
- {
- part->setPluginPageQuestionAsked(serviceType);
-
- // Prepare the URL to show in the question (host only if http, to make it short)
- KUrl pluginPageURL(embed->pluginPage);
- QString shortURL = pluginPageURL.protocol() == "http" ? pluginPageURL.host() : pluginPageURL.prettyUrl();
- int res = KMessageBox::questionYesNo( part->view(),
- i18n("No plugin found for '%1'.\nDo you want to download one from %2?", mimeName, shortURL),
- i18n("Missing Plugin"), KGuiItem(i18n("Download")), KGuiItem(i18n("Do Not Download")), QString("plugin-")+serviceType);
- if (res == KMessageBox::Yes)
- {
- // Display vendor download page
- ext->createNewWindow(pluginPageURL);
- return;
- }
- }
- }
}
#!/bin/sh
#
# Copyright (C) 2017 Ruben Rodriguez <ruben@trisquel.info>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=1
. ./config
# https://git.parabola.nu/abslibre.git/tree/libre/konqueror/konq-about-fsdg.diff
patch -p1 < $DATA/konq-about-fsdg.diff
changelog "Removed flash plugin handler from khtml"
compile
#!/bin/sh
#
# Copyright (C) 2017 Ruben Rodriguez <ruben@trisquel.info>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=1
. ./config
# https://git.parabola.nu/abslibre.git/tree/libre/kdelibs/khtml-fsdg.diff
patch -p1 < $DATA/khtml-fsdg.diff
changelog "Removed flash plugin handler from khtml"
compile
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment