From 377f7fff82ea29f7f34ee2b4cce4147029a3b199 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Mas=C5=82owski?= Date: Mon, 30 Jan 2012 20:33:35 +0100 Subject: kdelibs-libre and kdebase-konqueror-libre not recommending nonfree plugins. --- libre/kdebase-konqueror-libre/PKGBUILD | 51 ++++++++++++++++++++++ .../kdebase-konqueror.install | 12 +++++ libre/kdebase-konqueror-libre/konq-about-fsdg.diff | 33 ++++++++++++++ 3 files changed, 96 insertions(+) create mode 100644 libre/kdebase-konqueror-libre/PKGBUILD create mode 100644 libre/kdebase-konqueror-libre/kdebase-konqueror.install create mode 100644 libre/kdebase-konqueror-libre/konq-about-fsdg.diff (limited to 'libre/kdebase-konqueror-libre') 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 +# $Id: PKGBUILD 147790 2012-01-28 10:33:05Z andrea $ +# Maintainer: Andrea Scarpino +# Contributor: Pierre Schmitz + +_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 here.", QString("exec:/kcmshell4 khtml_java_js")) ) + .arg( i18n("JavaScript enabled (globally). Configure JavaScript here.", QString("exec:/kcmshell4 khtml_java_js")) ) // leave the double backslashes here, they are necessary for javascript ! +- .arg( i18n("Secure Java® support", QString("http://www.oracle.com/technetwork/java/index.html")) ) +- .arg( i18n("JDK 1.2.0 (Java 2) compatible VM (IBM or Sun/Oracle)", +- QString("http://www.ibm.com"), QString("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) here.", QString("exec:/kcmshell4 khtml_java_js")) ) // TODO Maybe test if Java is enabled ? +- .arg( i18n("Netscape Communicator® plugins (for viewing Flash®, Real®Audio, Real®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® plugins ", ++ 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 & 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 " + "create your own Web-Shortcuts." , QString("exec:/kcmshell4 ebrowsing")) ) -- cgit v1.2.3-2-g168b