kdelibs-libre and kdebase-konqueror-libre not recommending nonfree plugins.

8 files changed, 260 insertions, 0 deletions

diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD
new file mode 100644
index 000000000..48e36633f
--- /dev/null
+++ b/libre/kdebase-konqueror-libre/PKGBUILD
@@ -0,0 +1,51 @@
+# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu>
+# $Id: PKGBUILD 147790 2012-01-28 10:33:05Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
+
+_pkgname='kdebase-konqueror'
+pkgname='kdebase-konqueror-libre'
+pkgver=4.8.0
+pkgrel=1
+arch=('i686' 'x86_64' 'mips64el')
+url="http://kde.org/applications/internet/konqueror/"
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdebase')
+makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml')
+source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.bz2"
+    "konq-about-fsdg.diff")
+sha1sums=('25151b551793164c5eb1cb303d3031e63a6122e3'
+          'f41541371414dcbe5e76687835e648112b3ff364')
+pkgdesc='KDE File Manager & Web Browser'
+depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
+optdepends=('kwebkitpart: to enable webkit engine')
+install='kdebase-konqueror.install'
+conflicts=('kdebase-nsplugins' 'kdebase-konqueror')
+replaces=('kdebase-nsplugins' 'kdebase-konqueror')
+provides=("kdebase-konqueror=$pkgver")
+
+build() {
+    cd "${srcdir}"/kde-baseapps-${pkgver}
+
+    # Don't recommend nonfree software or Google.
+    patch -Np1 -i "${srcdir}/konq-about-fsdg.diff"
+
+	cd ${srcdir}
+	mkdir build
+	cd build
+	cmake ../kde-baseapps-${pkgver} \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_SKIP_RPATH=ON \
+		-DCMAKE_INSTALL_PREFIX=/usr
+        for i in konqueror doc/konqueror nsplugins; do
+            cd $srcdir/build/${i}
+	    make
+        done
+}
+
+package() {
+        for i in konqueror doc/konqueror nsplugins; do
+              cd $srcdir/build/${i}
+              make DESTDIR=$pkgdir install
+        done
+}
diff --git a/libre/kdebase-konqueror-libre/kdebase-konqueror.install b/libre/kdebase-konqueror-libre/kdebase-konqueror.install
new file mode 100644
index 000000000..5495fb1b5
--- /dev/null
+++ b/libre/kdebase-konqueror-libre/kdebase-konqueror.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/libre/kdebase-konqueror-libre/konq-about-fsdg.diff b/libre/kdebase-konqueror-libre/konq-about-fsdg.diff
new file mode 100644
index 000000000..06b2103c3
--- /dev/null
+++ b/libre/kdebase-konqueror-libre/konq-about-fsdg.diff
@@ -0,0 +1,33 @@
+diff -ru kde-baseapps-4.8.0.orig/konqueror/about/konq_aboutpage.cc kde-baseapps-4.8.0/konqueror/about/konq_aboutpage.cc
+--- kde-baseapps-4.8.0.orig/konqueror/about/konq_aboutpage.cc	2012-01-30 19:28:59.506176399 +0100
++++ kde-baseapps-4.8.0/konqueror/about/konq_aboutpage.cc	2012-01-30 19:34:50.695537153 +0100
+@@ -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") )
++          .arg( i18n("JDK 1.2.0 (Java 2) compatible VM") )
+           .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> ",
++                     QString("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, 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 --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
new file mode 100644
index 000000000..09d0a715e
--- /dev/null
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -0,0 +1,66 @@
+# $Id: PKGBUILD 147759 2012-01-28 10:32:04Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
+
+_pkgname=kdelibs
+pkgname=kdelibs-libre
+pkgver=4.8.0
+pkgrel=1
+pkgdesc="KDE Core Libraries"
+arch=('i686' 'x86_64' 'mips64el')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+depends=('strigi' 'attica' 'libxss' 'xz' 'soprano' 'krb5' 'grantlee'
+        'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
+        'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'docbook-xsl'
+        'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit')
+makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
+provides=("kdelibs=$pkgver")
+replaces=('kdelibs-experimental' 'kdelibs')
+conflicts=('kdelibs')
+install=${_pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2"
+        'kde-applications-menu.patch'
+        'fix-knotify-filepath.patch'
+        'khtml-fsdg.diff')
+sha1sums=('5e4744405734e6c3ce572ef7d16054390692b38a'
+          '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
+          '3312f6005aa56a9b992c74008fe5b314f1c8ffba'
+          'a1502a964081ad583a00cf90c56e74bf60121830')
+
+build() {
+       cd "${srcdir}"/${_pkgname}-${pkgver}
+
+       # avoid file conflict with gnome-menus
+       patch -p1 -i "${srcdir}"/kde-applications-menu.patch
+
+       # https://bugs.kde.org/show_bug.cgi?id=285028
+       patch -p1 -i "${srcdir}"/fix-knotify-filepath.patch
+
+       # Don't ask the user to download a plugin, it's probably nonfree.
+       patch -p1 -i "${srcdir}"/khtml-fsdg.diff
+
+       cd "${srcdir}"
+       mkdir build
+       cd build
+       cmake ../${_pkgname}-${pkgver} \
+               -DCMAKE_BUILD_TYPE=Release \
+               -DCMAKE_SKIP_RPATH=ON \
+               -DKDE_DISTRIBUTION_TEXT='Parabola GNU/Linux-libre' \
+               -DCMAKE_INSTALL_PREFIX=/usr \
+               -DSYSCONF_INSTALL_DIR=/etc \
+               -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
+               -DKDE_DEFAULT_HOME='.kde4' \
+               -DWITH_FAM=OFF
+       make
+}
+
+package() {
+       cd "${srcdir}"/build
+       make DESTDIR="${pkgdir}" install
+
+       # cert bundle seems to be hardcoded
+       # link it to the one from ca-certificates
+       rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
+       ln -sf /etc/ssl/certs/ca-certificates.crt "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
+}
diff --git a/libre/kdelibs-libre/fix-knotify-filepath.patch b/libre/kdelibs-libre/fix-knotify-filepath.patch
new file mode 100644
index 000000000..2cd995e97
--- /dev/null
+++ b/libre/kdelibs-libre/fix-knotify-filepath.patch
@@ -0,0 +1,13 @@
+diff --git a/knotify/config/knotifyconfigactionswidget.cpp b/knotify/config/knotifyconfigactionswidget.cpp
+index 88d18b6..0e76658 100644
+--- a/knotify/config/knotifyconfigactionswidget.cpp
++++ b/knotify/config/knotifyconfigactionswidget.cpp
+@@ -128,7 +128,7 @@ void KNotifyConfigActionsWidget::slotPlay(  )
+ 	KUrl soundURL = m_ui.Sound_select->url();
+ 	if ( soundURL.isRelative() )
+ 	{
+-		QString soundString = soundURL.toLocalFile();
++		QString soundString = m_ui.Sound_select->text();
+ 		// we need a way to get the application name in order to ba able to do this :
+ 		/*QString search = QString("%1/sounds/%2").arg(config->appname).arg(soundFile);
+ 		search = KGlobal::mainComponent().dirs()->findResource("data", search);
diff --git a/libre/kdelibs-libre/kde-applications-menu.patch b/libre/kdelibs-libre/kde-applications-menu.patch
new file mode 100644
index 000000000..4b513298a
--- /dev/null
+++ b/libre/kdelibs-libre/kde-applications-menu.patch
@@ -0,0 +1,22 @@
+--- kdelibs-4.3.98/kded/CMakeLists.txt	2009-10-02 14:55:17.000000000 +0000
++++ kdelibs-4.3.98/kded/CMakeLists.txt	2010-01-31 22:16:13.946933892 +0000
+@@ -69,7 +69,7 @@
+ if (WIN32)
+ install( FILES applications.menu  DESTINATION  ${SHARE_INSTALL_PREFIX}/xdg/menus )
+ else (WIN32)
+-install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus )
++install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu )
+ endif (WIN32)
+ install( FILES kdedmodule.desktop DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
+ install( FILES kded.upd           DESTINATION  ${DATA_INSTALL_DIR}/kconf_update )
+--- kdelibs-4.3.98/kded/kbuildsycoca.cpp	2009-12-04 23:10:18.000000000 +0000
++++ kdelibs-4.3.98/kded/kbuildsycoca.cpp	2010-01-31 22:16:13.962766572 +0000
+@@ -302,7 +302,7 @@
+      if (!m_trackId.isEmpty())
+         g_vfolder->setTrackId(m_trackId);
+ 
+-     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
++     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
+ 
+      KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
+      entry->setLayoutInfo(kdeMenu->layoutList);
diff --git a/libre/kdelibs-libre/kdelibs.install b/libre/kdelibs-libre/kdelibs.install
new file mode 100644
index 000000000..c77e68041
--- /dev/null
+++ b/libre/kdelibs-libre/kdelibs.install
@@ -0,0 +1,13 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	update-mime-database usr/share/mime &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/libre/kdelibs-libre/khtml-fsdg.diff b/libre/kdelibs-libre/khtml-fsdg.diff
new file mode 100644
index 000000000..1a531b3c8
--- /dev/null
+++ b/libre/kdelibs-libre/khtml-fsdg.diff
@@ -0,0 +1,50 @@
+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;
+-            }
+-        }
+-    }
+ }
+ 
+