We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 394b2a11 authored by Sam Geeraerts's avatar Sam Geeraerts

Stop Konqueror from suggesting potentially non-free plugins.

parent c43eac56
......@@ -152,6 +152,7 @@ KDEBASE_VERSION=1
BOGOFILTER_VERSION=1
BLENDER_VERSION=1
MESA_VERSION=3
KDELIBS_VERSION=1
# PATHS
WORKINGDIR=$BASEDIR/tmp
......
......@@ -371,6 +371,7 @@ while [ $REDO -eq 1 ]; do # If versions in the config change, we could need to r
# KDE
ensure_updated kdebase kdebase $RELEASE$distro_release ./gen-kdebase $KDEBASE_VERSION
ensure_updated kdelibs kdelibs $RELEASE$distro_release ./gen-kdelibs $KDELIBS_VERSION
# ensure_updated kubuntu-default-settings k$DISTRONAME_L-default-settings $RELEASE$distro_release ./gen-kdefault-settings $KDEFAULT_SETTINGS_VERSION
# ensure_updated kubuntu-meta k$DISTRONAME_L-desktop $RELEASE$distro_release ./gen-kmeta $KMETA_VERSION
......
#!/bin/bash
#
# Copyright (C) 2006 Brian Brazil
# Copyright (C) 2012 Sam Geeraerts
#
# 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
#
. config
rm -rf $WORKINGDIR
mkdir -p $WORKINGDIR
cd $WORKINGDIR
apt-get source kdelibs$VERSION
apt-get --yes build-dep kdelibs$VERSION
cd kdelibs-*
IMGDIR=$PWD/images
rm debian/patches/kubuntu_62_flash_installer.diff
cp "$IMGDIR"/kdelibs_disable_missing_plugins.diff
echo | dch -D $RELEASE -v $(sed -n '1s#^.*(\(.*\)).*#\1'${DISTRONAME_L}${KDELIBS_VERSION}'#p' debian/changelog) "Don't suggest downloading non-free plugins."
dpkg-buildpackage $DPKGOPTS
diff -Nur kdelibs-3.5.10//khtml/rendering/render_frames.cpp kdelibs-3.5.10.new//khtml/rendering/render_frames.cpp
--- kdelibs-3.5.10//khtml/rendering/render_frames.cpp 2006-07-22 10:16:47.000000000 +0200
+++ kdelibs-3.5.10.new//khtml/rendering/render_frames.cpp 2012-12-27 15:32:50.714979322 +0100
@@ -924,34 +924,6 @@
// prepare for the local eventloop in KMessageBox
ref();
- KHTMLPart *part = static_cast<KHTMLView *>(m_view)->part();
- KParts::BrowserExtension *ext = part->browserExtension();
- if( embed && !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);
- if ( mime->name() != KMimeType::defaultMimeType() )
- mimeName = mime->comment();
-
- // Check if we already asked the user, for this page
- if (!mimeName.isEmpty() && part->docImpl() && !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( m_view,
- i18n("No plugin found for '%1'.\nDo you want to download one from %2?").arg(mimeName).arg(shortURL),
- i18n("Missing Plugin"), i18n("Download"), i18n("Do Not Download"), QString("plugin-")+serviceType);
- if ( res == KMessageBox::Yes )
- {
- // Display vendor download page
- ext->createNewWindow( pluginPageURL );
- return;
- }
- }
- }
-
// didn't work, render alternative content.
if ( element() && (
element()->id() == ID_OBJECT || element()->id() == ID_EMBED || element()->id() == ID_APPLET))
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