From 588fad3f4ac69a1234341ffd3c2b3cd2b1d020c2 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 3 Sep 2014 06:57:55 -0300 Subject: kde packages: remove libre and nonprism suffixes, add complex pkgrel --- libre/kdebase-konqueror-libre/PKGBUILD | 54 ---------------------- .../kdebase-konqueror.install | 12 ----- libre/kdebase-konqueror-libre/konq-about-fsdg.diff | 33 ------------- 3 files changed, 99 deletions(-) delete mode 100644 libre/kdebase-konqueror-libre/PKGBUILD delete mode 100644 libre/kdebase-konqueror-libre/kdebase-konqueror.install delete 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 deleted file mode 100644 index 3c360cf60..000000000 --- a/libre/kdebase-konqueror-libre/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# $Id: PKGBUILD 217088 2014-07-18 11:28:37Z svenstaro $ -# Maintainer (Arch): Andrea Scarpino -# Contributor (Arch): Pierre Schmitz -# Maintainer: Michał Masłowski -# Maintainer: André Silva - -_pkgname='kdebase-konqueror' -pkgname='kdebase-konqueror-libre' -pkgver=4.14.0 -pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') -url="http://kde.org/applications/internet/konqueror/" -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdebase') -conflicts=('kdebase-nsplugins' 'kdebase-konqueror') -replaces=('kdebase-nsplugins' 'kdebase-konqueror') -provides=("kdebase-konqueror=$pkgver") -makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'baloo-widgets') -source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz" - 'konq-about-fsdg.diff') -sha1sums=('9f0c7cda0ec0ca6fbe41696a753679f3e158fec2' - 'd6cbb53c04179b8180f9439eca156b7ff2e76b3a') -pkgdesc='KDE File Manager & Web Browser, without Google and nonfree software recommendation' -depends=('kdebase-dolphin' 'kdebase-keditbookmarks') -optdepends=('kwebkitpart: to enable webkit engine') -install='kdebase-konqueror.install' - -prepare() { - mkdir build - - cd kde-baseapps-${pkgver} - # Don't recommend nonfree software or Google. - patch -Np1 -i "${srcdir}/konq-about-fsdg.diff" -} - -build() { - cd build - cmake ../kde-baseapps-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DKDE4_BUILD_TESTS=OFF \ - -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 deleted file mode 100644 index 5495fb1b5..000000000 --- a/libre/kdebase-konqueror-libre/kdebase-konqueror.install +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 93ef4016a..000000000 --- a/libre/kdebase-konqueror-libre/konq-about-fsdg.diff +++ /dev/null @@ -1,33 +0,0 @@ -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 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 " - "create your own Web-Shortcuts." , QString("exec:/kcmshell4 ebrowsing")) ) -- cgit v1.2.3