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 --- libre/kdebase-konqueror/PKGBUILD | 52 +++++ libre/kdebase-konqueror/kdebase-konqueror.install | 12 + libre/kdebase-konqueror/konq-about-fsdg.diff | 33 +++ libre/kdebase-runtime-libre/PKGBUILD | 72 ------ .../kdebase-runtime-libre/duckduckgo_html.desktop | 113 ---------- .../kdebase-runtime-libre/duckduckgo_lite.desktop | 113 ---------- .../kdebase-runtime-libre/kdebase-runtime.install | 13 -- libre/kdebase-runtime/PKGBUILD | 70 ++++++ libre/kdebase-runtime/duckduckgo_html.desktop | 113 ++++++++++ libre/kdebase-runtime/duckduckgo_lite.desktop | 113 ++++++++++ libre/kdebase-runtime/kdebase-runtime.install | 13 ++ libre/kdelibs-libre/PKGBUILD | 65 ------ libre/kdelibs-libre/kde-applications-menu.patch | 22 -- libre/kdelibs-libre/kdelibs-cve-2014-5033.patch | 36 --- libre/kdelibs-libre/kdelibs.install | 13 -- libre/kdelibs-libre/khtml-fsdg.diff | 50 ----- libre/kdelibs-libre/pyqt.patch | 247 --------------------- libre/kdelibs-libre/qt4.patch | 11 - libre/kdelibs/PKGBUILD | 63 ++++++ libre/kdelibs/kde-applications-menu.patch | 22 ++ libre/kdelibs/kdelibs-cve-2014-5033.patch | 36 +++ libre/kdelibs/kdelibs.install | 13 ++ libre/kdelibs/khtml-fsdg.diff | 50 +++++ libre/kdelibs/pyqt.patch | 247 +++++++++++++++++++++ libre/kdelibs/qt4.patch | 11 + libre/kdenetwork-kopete-libre/PKGBUILD | 48 ---- .../kdenetwork-kopete.install | 12 - libre/kdenetwork-kopete-libre/kdenetwork.install | 11 - libre/kdenetwork-kopete/PKGBUILD | 46 ++++ libre/kdenetwork-kopete/kdenetwork-kopete.install | 12 + libre/kdenetwork-kopete/kdenetwork.install | 11 + libre/kdeutils-ark-libre/PKGBUILD | 46 ---- libre/kdeutils-ark-libre/ark-unar-06.patch | 236 -------------------- libre/kdeutils-ark-libre/kdeutils-ark.install | 12 - libre/kdeutils-ark/PKGBUILD | 44 ++++ libre/kdeutils-ark/ark-unar-06.patch | 236 ++++++++++++++++++++ libre/kdeutils-ark/kdeutils-ark.install | 12 + nonprism/kde-meta-nonprism/PKGBUILD | 115 ---------- nonprism/kde-meta/PKGBUILD | 113 ++++++++++ nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD | 68 ------ .../kdenetwork-kopete.install | 12 - .../kdenetwork.install | 11 - .../libre-nonprism.patch | 110 --------- nonprism/kdenetwork-kopete/PKGBUILD | 66 ++++++ .../kdenetwork-kopete/kdenetwork-kopete.install | 12 + nonprism/kdenetwork-kopete/kdenetwork.install | 11 + nonprism/kdenetwork-kopete/libre-nonprism.patch | 110 +++++++++ nonprism/kdepim-nonprism/PKGBUILD | 183 --------------- nonprism/kdepim-nonprism/kdepim-akregator.install | 12 - .../kdepim-nonprism/kdepim-kaddressbook.install | 12 - nonprism/kdepim-nonprism/kdepim-kmail.install | 12 - nonprism/kdepim-nonprism/kdepim-knode.install | 12 - nonprism/kdepim-nonprism/kdepim-korganizer.install | 12 - nonprism/kdepim-nonprism/kdepim.install | 11 - nonprism/kdepim-runtime-nonprism/PKGBUILD | 39 ---- .../kdepim-runtime-nonprism/kdepim-runtime.install | 13 -- nonprism/kdepim-runtime/PKGBUILD | 37 +++ nonprism/kdepim-runtime/kdepim-runtime.install | 13 ++ nonprism/kdepim/PKGBUILD | 175 +++++++++++++++ nonprism/kdepim/kdepim-akregator.install | 12 + nonprism/kdepim/kdepim-kaddressbook.install | 12 + nonprism/kdepim/kdepim-kmail.install | 12 + nonprism/kdepim/kdepim-knode.install | 12 + nonprism/kdepim/kdepim-korganizer.install | 12 + nonprism/kdepim/kdepim.install | 11 + 68 files changed, 1817 insertions(+), 1841 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 create mode 100644 libre/kdebase-konqueror/PKGBUILD create mode 100644 libre/kdebase-konqueror/kdebase-konqueror.install create mode 100644 libre/kdebase-konqueror/konq-about-fsdg.diff delete mode 100644 libre/kdebase-runtime-libre/PKGBUILD delete mode 100644 libre/kdebase-runtime-libre/duckduckgo_html.desktop delete mode 100644 libre/kdebase-runtime-libre/duckduckgo_lite.desktop delete mode 100644 libre/kdebase-runtime-libre/kdebase-runtime.install create mode 100644 libre/kdebase-runtime/PKGBUILD create mode 100644 libre/kdebase-runtime/duckduckgo_html.desktop create mode 100644 libre/kdebase-runtime/duckduckgo_lite.desktop create mode 100644 libre/kdebase-runtime/kdebase-runtime.install delete mode 100644 libre/kdelibs-libre/PKGBUILD delete mode 100644 libre/kdelibs-libre/kde-applications-menu.patch delete mode 100644 libre/kdelibs-libre/kdelibs-cve-2014-5033.patch delete mode 100644 libre/kdelibs-libre/kdelibs.install delete mode 100644 libre/kdelibs-libre/khtml-fsdg.diff delete mode 100644 libre/kdelibs-libre/pyqt.patch delete mode 100644 libre/kdelibs-libre/qt4.patch create mode 100644 libre/kdelibs/PKGBUILD create mode 100644 libre/kdelibs/kde-applications-menu.patch create mode 100644 libre/kdelibs/kdelibs-cve-2014-5033.patch create mode 100644 libre/kdelibs/kdelibs.install create mode 100644 libre/kdelibs/khtml-fsdg.diff create mode 100644 libre/kdelibs/pyqt.patch create mode 100644 libre/kdelibs/qt4.patch delete mode 100644 libre/kdenetwork-kopete-libre/PKGBUILD delete mode 100644 libre/kdenetwork-kopete-libre/kdenetwork-kopete.install delete mode 100644 libre/kdenetwork-kopete-libre/kdenetwork.install create mode 100644 libre/kdenetwork-kopete/PKGBUILD create mode 100644 libre/kdenetwork-kopete/kdenetwork-kopete.install create mode 100644 libre/kdenetwork-kopete/kdenetwork.install delete mode 100644 libre/kdeutils-ark-libre/PKGBUILD delete mode 100644 libre/kdeutils-ark-libre/ark-unar-06.patch delete mode 100644 libre/kdeutils-ark-libre/kdeutils-ark.install create mode 100644 libre/kdeutils-ark/PKGBUILD create mode 100644 libre/kdeutils-ark/ark-unar-06.patch create mode 100644 libre/kdeutils-ark/kdeutils-ark.install delete mode 100644 nonprism/kde-meta-nonprism/PKGBUILD create mode 100644 nonprism/kde-meta/PKGBUILD delete mode 100644 nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD delete mode 100644 nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork-kopete.install delete mode 100644 nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork.install delete mode 100644 nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch create mode 100644 nonprism/kdenetwork-kopete/PKGBUILD create mode 100644 nonprism/kdenetwork-kopete/kdenetwork-kopete.install create mode 100644 nonprism/kdenetwork-kopete/kdenetwork.install create mode 100644 nonprism/kdenetwork-kopete/libre-nonprism.patch delete mode 100644 nonprism/kdepim-nonprism/PKGBUILD delete mode 100644 nonprism/kdepim-nonprism/kdepim-akregator.install delete mode 100644 nonprism/kdepim-nonprism/kdepim-kaddressbook.install delete mode 100644 nonprism/kdepim-nonprism/kdepim-kmail.install delete mode 100644 nonprism/kdepim-nonprism/kdepim-knode.install delete mode 100644 nonprism/kdepim-nonprism/kdepim-korganizer.install delete mode 100644 nonprism/kdepim-nonprism/kdepim.install delete mode 100644 nonprism/kdepim-runtime-nonprism/PKGBUILD delete mode 100644 nonprism/kdepim-runtime-nonprism/kdepim-runtime.install create mode 100644 nonprism/kdepim-runtime/PKGBUILD create mode 100644 nonprism/kdepim-runtime/kdepim-runtime.install create mode 100644 nonprism/kdepim/PKGBUILD create mode 100644 nonprism/kdepim/kdepim-akregator.install create mode 100644 nonprism/kdepim/kdepim-kaddressbook.install create mode 100644 nonprism/kdepim/kdepim-kmail.install create mode 100644 nonprism/kdepim/kdepim-knode.install create mode 100644 nonprism/kdepim/kdepim-korganizer.install create mode 100644 nonprism/kdepim/kdepim.install 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")) ) diff --git a/libre/kdebase-konqueror/PKGBUILD b/libre/kdebase-konqueror/PKGBUILD new file mode 100644 index 000000000..6f0a738b9 --- /dev/null +++ b/libre/kdebase-konqueror/PKGBUILD @@ -0,0 +1,52 @@ +# $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' +pkgver=4.14.0 +pkgrel=1.parabola1 +arch=('i686' 'x86_64' 'mips64el') +url="http://kde.org/applications/internet/konqueror/" +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdebase') +conflicts=('kdebase-nsplugins' 'kdebase-konqueror-libre') +replaces=('kdebase-nsplugins' 'kdebase-konqueror-libre') +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/kdebase-konqueror.install b/libre/kdebase-konqueror/kdebase-konqueror.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/libre/kdebase-konqueror/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/konq-about-fsdg.diff b/libre/kdebase-konqueror/konq-about-fsdg.diff new file mode 100644 index 000000000..93ef4016a --- /dev/null +++ b/libre/kdebase-konqueror/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 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")) ) diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD deleted file mode 100644 index 3e13281fc..000000000 --- a/libre/kdebase-runtime-libre/PKGBUILD +++ /dev/null @@ -1,72 +0,0 @@ -# $Id: PKGBUILD 217060 2014-07-18 11:26:24Z svenstaro $ -# Maintainer (Arch): Andrea Scarpino -# Contributor (Arch): Pierre Schmitz -# Maintainer: André Silva - -_pkgname=kdebase-runtime -pkgname=kdebase-runtime-libre -pkgver=4.14.0 -pkgrel=1 -pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers" -arch=('i686' 'x86_64' 'mips64el') -url='https://projects.kde.org/projects/kde/kde-runtime' -license=('GPL' 'LGPL') -replaces=("${_pkgname}") -conflicts=("${_pkgname}") -provides=("${_pkgname}=${pkgver}") -depends=("kdelibs>=${pkgver}" 'kactivities' 'libkactivities4' 'smbclient' 'libssh' 'libcanberra' - 'oxygen-icons' 'xorg-xauth' 'libwebp') -makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'doxygen' - 'networkmanager' 'boost') -optdepends=('kdepimlibs: needed by DrKonqi to send crash reports to KDE.org' - 'gdb: needed by DrKonqi to generate backtrace' - 'htdig: to build the search index in the KHelpCenter' - 'rarian: needed by KHelpCenter') -install="${_pkgname}.install" -source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz" - 'duckduckgo_html.desktop' - 'duckduckgo_lite.desktop') -sha1sums=('3847a9e6a66e4e724cff9230ff564c900243d4cd' - 'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd' - 'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b') - -prepare() { - mkdir build -} - -build() { - cd "${srcdir}" - - # Removing non-privacy search providers - rm -v kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders/{7digital,acronym,amazon{,_mp3},amg,backports,baidu,bing,blip,cia,dbug,deb,duckduckgo{,_info,_shopping},facebook,ecosia,feedster,flickr,flickrcc,google,google_advanced,google_code,google_groups,google_images,google_lucky,google_maps,google_movie,google_news,imdb,jamendo,jeeves,magnatune,metacrawler,msdn,nl-telephone,nl-teletekst,python,rpmfind,tvtome,uspto,vimeo,voila,yahoo,yahoo_image,yahoo_local,yahoo_shopping,yahoo_video,youtube}.desktop - - # Adding DuckDuckGo HTML - cp -v duckduckgo_html.desktop "kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders" - - # Adding DuckDuckGo Lite - cp -v duckduckgo_lite.desktop "kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders" - - cd build - cmake ../kde-runtime-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DKDE4_BUILD_TESTS=OFF \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_QNtrack=OFF \ - -DSAMBA_INCLUDE_DIR=/usr/include/samba-4.0 \ - -DWITH_NepomukCore=OFF - make -} - -package() { - cd build - make DESTDIR="$pkgdir" install - - rm "${pkgdir}"/usr/share/icons/hicolor/index.theme - - ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/" - - # FS#36668 - chown :nobody "${pkgdir}"/usr/lib/kde4/libexec/kdesud - chmod g+s "${pkgdir}"/usr/lib/kde4/libexec/kdesud -} diff --git a/libre/kdebase-runtime-libre/duckduckgo_html.desktop b/libre/kdebase-runtime-libre/duckduckgo_html.desktop deleted file mode 100644 index ba6a602ad..000000000 --- a/libre/kdebase-runtime-libre/duckduckgo_html.desktop +++ /dev/null @@ -1,113 +0,0 @@ -[Desktop Entry] -Charset= -Hidden=false -Keys=duckduckgo,dd,dukgo -Name=Duck Duck Go HTML -Name[ar]=Duck Duck Go HTML -Name[ast]=Duck Duck Go HTML -Name[bg]=Duck Duck Go HTML -Name[bn]=Duck Duck Go HTML -Name[bs]=Dak dak go HTML -Name[ca]=Duck Duck Go HTML -Name[ca@valencia]=Duck Duck Go HTML -Name[cs]=Duck Duck Go HTML -Name[da]=Duck Duck Go HTML -Name[de]=Duck Duck Go HTML -Name[el]=Duck Duck Go HTML -Name[en_GB]=Duck Duck Go HTML -Name[eo]=Duck Duck Go HTML -Name[es]=Duck Duck Go HTML -Name[et]=Duck Duck Go HTML -Name[eu]=Duck Duck Go HTML -Name[fa]=Duck Duck Go HTML -Name[fi]=Duck Duck Go HTML -Name[fr]=Duck Duck Go HTML -Name[ga]=Duck Duck Go HTML -Name[gl]=Duck Duck Go HTML -Name[gu]=Duck Duck Go HTML -Name[he]=Duck Duck Go HTML -Name[hi]=Duck Duck Go HTML -Name[hr]=Duck Duck Go HTML -Name[hu]=Duck Duck Go HTML -Name[ia]=Duck Duck Go HTML -Name[id]=Duck Duck Go HTML -Name[is]=Duck Duck Go HTML -Name[it]=Duck Duck Go HTML -Name[ja]=Duck Duck Go HTML -Name[kk]=Duck Duck Go HTML -Name[km]=Duck Duck Go HTML -Name[kn]=Duck Duck Go HTML -Name[ko]=Duck Duck Go HTML -Name[lt]=Duck Duck Go HTML -Name[lv]=Duck Duck Go HTML -Name[ml]=Duck Duck Go HTML -Name[nb]=Duck Duck Go HTML -Name[nds]=Duck Duck Go HTML -Name[nl]=Duck Duck Go HTML -Name[nn]=Duck Duck Go HTML -Name[pa]=Duck Duck Go HTML -Name[pl]=Duck Duck Go HTML -Name[pt]=Duck Duck Go HTML -Name[pt_BR]=Duck Duck Go HTML -Name[ro]=Duck Duck Go HTML -Name[ru]=Поиск Duck Duck Go HTML -Name[si]=Duck Duck Go HTML -Name[sk]=Duck Duck Go HTML -Name[sl]=Duck Duck Go HTML -Name[sr]=Duck Duck Go HTML -Name[sr@ijekavian]=Duck Duck Go HTML -Name[sr@ijekavianlatin]=Duck Duck Go HTML -Name[sr@latin]=Duck Duck Go HTML -Name[sv]=Duck Duck Go HTML -Name[tg]=Duck Duck Go HTML -Name[th]=Duck Duck Go HTML -Name[tr]=Duck Duck Go HTML -Name[ug]=Duck Duck Go HTML -Name[uk]=Duck Duck Go HTML -Name[vi]=Duck Duck Go HTML -Name[wa]=Duck Duck Go HTML -Name[x-test]=xxDuck Duck Go HTMLxx -Name[zh_CN]=Duck Duck Go HTML -Name[zh_TW]=Duck Duck Go HTML -Query=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[bg]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[bn]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[ca]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[cs]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[da]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[de]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[el]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[eo]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[es]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[et]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[fi]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[fr]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[gl]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[hi]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[hu]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[ia]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[it]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[kk]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[km]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[nb]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[nl]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[pa]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[pl]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[pt]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[pt_BR]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[ro]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[ru]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[sl]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[sr]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[sr@ijekavian]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[sr@ijekavianlatin]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[sr@latin]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[sv]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[tr]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[uk]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[wa]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[x-test]=xxhttp://duckduckgo.com/html/?q=\\{@}&t=KDExx -Query[zh_CN]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -Query[zh_TW]=http://duckduckgo.com/html/?q=\\{@}&t=KDE -ServiceTypes=SearchProvider -Type=Service diff --git a/libre/kdebase-runtime-libre/duckduckgo_lite.desktop b/libre/kdebase-runtime-libre/duckduckgo_lite.desktop deleted file mode 100644 index 0da670dbe..000000000 --- a/libre/kdebase-runtime-libre/duckduckgo_lite.desktop +++ /dev/null @@ -1,113 +0,0 @@ -[Desktop Entry] -Charset= -Hidden=false -Keys=duckduckgolite,ddlite,dukgolite -Name=Duck Duck Go Lite -Name[ar]=Duck Duck Go Lite -Name[ast]=Duck Duck Go Lite -Name[bg]=Duck Duck Go Lite -Name[bn]=Duck Duck Go Lite -Name[bs]=Dak dak go Lite -Name[ca]=Duck Duck Go Lite -Name[ca@valencia]=Duck Duck Go Lite -Name[cs]=Duck Duck Go Lite -Name[da]=Duck Duck Go Lite -Name[de]=Duck Duck Go Lite -Name[el]=Duck Duck Go Lite -Name[en_GB]=Duck Duck Go Lite -Name[eo]=Duck Duck Go Lite -Name[es]=Duck Duck Go Lite -Name[et]=Duck Duck Go Lite -Name[eu]=Duck Duck Go Lite -Name[fa]=Duck Duck Go Lite -Name[fi]=Duck Duck Go Lite -Name[fr]=Duck Duck Go Lite -Name[ga]=Duck Duck Go Lite -Name[gl]=Duck Duck Go Lite -Name[gu]=Duck Duck Go Lite -Name[he]=Duck Duck Go Lite -Name[hi]=Duck Duck Go Lite -Name[hr]=Duck Duck Go Lite -Name[hu]=Duck Duck Go Lite -Name[ia]=Duck Duck Go Lite -Name[id]=Duck Duck Go Lite -Name[is]=Duck Duck Go Lite -Name[it]=Duck Duck Go Lite -Name[ja]=Duck Duck Go Lite -Name[kk]=Duck Duck Go Lite -Name[km]=Duck Duck Go Lite -Name[kn]=Duck Duck Go Lite -Name[ko]=Duck Duck Go Lite -Name[lt]=Duck Duck Go Lite -Name[lv]=Duck Duck Go Lite -Name[ml]=Duck Duck Go Lite -Name[nb]=Duck Duck Go Lite -Name[nds]=Duck Duck Go Lite -Name[nl]=Duck Duck Go Lite -Name[nn]=Duck Duck Go Lite -Name[pa]=Duck Duck Go Lite -Name[pl]=Duck Duck Go Lite -Name[pt]=Duck Duck Go Lite -Name[pt_BR]=Duck Duck Go Lite -Name[ro]=Duck Duck Go Lite -Name[ru]=Поиск Duck Duck Go Lite -Name[si]=Duck Duck Go Lite -Name[sk]=Duck Duck Go Lite -Name[sl]=Duck Duck Go Lite -Name[sr]=Duck Duck Go Lite -Name[sr@ijekavian]=Duck Duck Go Lite -Name[sr@ijekavianlatin]=Duck Duck Go Lite -Name[sr@latin]=Duck Duck Go Lite -Name[sv]=Duck Duck Go Lite -Name[tg]=Duck Duck Go Lite -Name[th]=Duck Duck Go Lite -Name[tr]=Duck Duck Go Lite -Name[ug]=Duck Duck Go Lite -Name[uk]=Duck Duck Go Lite -Name[vi]=Duck Duck Go Lite -Name[wa]=Duck Duck Go Lite -Name[x-test]=xxDuck Duck Go Litexx -Name[zh_CN]=Duck Duck Go Lite -Name[zh_TW]=Duck Duck Go Lite -Query=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[bg]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[bn]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[ca]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[cs]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[da]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[de]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[el]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[eo]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[es]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[et]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[fi]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[fr]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[gl]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[hi]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[hu]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[ia]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[it]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[kk]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[km]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[nb]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[nl]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[pa]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[pl]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[pt]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[pt_BR]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[ro]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[ru]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[sl]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[sr]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[sr@ijekavian]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[sr@ijekavianlatin]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[sr@latin]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[sv]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[tr]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[uk]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[wa]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[x-test]=xxhttp://duckduckgo.com/lite/?q=\\{@}&t=KDExx -Query[zh_CN]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -Query[zh_TW]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE -ServiceTypes=SearchProvider -Type=Service diff --git a/libre/kdebase-runtime-libre/kdebase-runtime.install b/libre/kdebase-runtime-libre/kdebase-runtime.install deleted file mode 100644 index c77e68041..000000000 --- a/libre/kdebase-runtime-libre/kdebase-runtime.install +++ /dev/null @@ -1,13 +0,0 @@ -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/kdebase-runtime/PKGBUILD b/libre/kdebase-runtime/PKGBUILD new file mode 100644 index 000000000..6782dc11f --- /dev/null +++ b/libre/kdebase-runtime/PKGBUILD @@ -0,0 +1,70 @@ +# $Id: PKGBUILD 217060 2014-07-18 11:26:24Z svenstaro $ +# Maintainer (Arch): Andrea Scarpino +# Contributor (Arch): Pierre Schmitz +# Maintainer: André Silva + +pkgname=kdebase-runtime +pkgver=4.14.0 +pkgrel=1.parabola1 +pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers" +arch=('i686' 'x86_64' 'mips64el') +url='https://projects.kde.org/projects/kde/kde-runtime' +license=('GPL' 'LGPL') +replaces=("${pkgname}-libre") +conflicts=("${pkgname}-libre") +depends=("kdelibs>=${pkgver}" 'kactivities' 'libkactivities4' 'smbclient' 'libssh' 'libcanberra' + 'oxygen-icons' 'xorg-xauth' 'libwebp') +makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'doxygen' + 'networkmanager' 'boost') +optdepends=('kdepimlibs: needed by DrKonqi to send crash reports to KDE.org' + 'gdb: needed by DrKonqi to generate backtrace' + 'htdig: to build the search index in the KHelpCenter' + 'rarian: needed by KHelpCenter') +install="${pkgname}.install" +source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz" + 'duckduckgo_html.desktop' + 'duckduckgo_lite.desktop') +sha1sums=('3847a9e6a66e4e724cff9230ff564c900243d4cd' + 'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd' + 'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b') + +prepare() { + mkdir build +} + +build() { + cd "${srcdir}" + + # Removing non-privacy search providers + rm -v kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders/{7digital,acronym,amazon{,_mp3},amg,backports,baidu,bing,blip,cia,dbug,deb,duckduckgo{,_info,_shopping},facebook,ecosia,feedster,flickr,flickrcc,google,google_advanced,google_code,google_groups,google_images,google_lucky,google_maps,google_movie,google_news,imdb,jamendo,jeeves,magnatune,metacrawler,msdn,nl-telephone,nl-teletekst,python,rpmfind,tvtome,uspto,vimeo,voila,yahoo,yahoo_image,yahoo_local,yahoo_shopping,yahoo_video,youtube}.desktop + + # Adding DuckDuckGo HTML + cp -v duckduckgo_html.desktop "kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders" + + # Adding DuckDuckGo Lite + cp -v duckduckgo_lite.desktop "kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders" + + cd build + cmake ../kde-runtime-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DKDE4_BUILD_TESTS=OFF \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_QNtrack=OFF \ + -DSAMBA_INCLUDE_DIR=/usr/include/samba-4.0 \ + -DWITH_NepomukCore=OFF + make +} + +package() { + cd build + make DESTDIR="$pkgdir" install + + rm "${pkgdir}"/usr/share/icons/hicolor/index.theme + + ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/" + + # FS#36668 + chown :nobody "${pkgdir}"/usr/lib/kde4/libexec/kdesud + chmod g+s "${pkgdir}"/usr/lib/kde4/libexec/kdesud +} diff --git a/libre/kdebase-runtime/duckduckgo_html.desktop b/libre/kdebase-runtime/duckduckgo_html.desktop new file mode 100644 index 000000000..ba6a602ad --- /dev/null +++ b/libre/kdebase-runtime/duckduckgo_html.desktop @@ -0,0 +1,113 @@ +[Desktop Entry] +Charset= +Hidden=false +Keys=duckduckgo,dd,dukgo +Name=Duck Duck Go HTML +Name[ar]=Duck Duck Go HTML +Name[ast]=Duck Duck Go HTML +Name[bg]=Duck Duck Go HTML +Name[bn]=Duck Duck Go HTML +Name[bs]=Dak dak go HTML +Name[ca]=Duck Duck Go HTML +Name[ca@valencia]=Duck Duck Go HTML +Name[cs]=Duck Duck Go HTML +Name[da]=Duck Duck Go HTML +Name[de]=Duck Duck Go HTML +Name[el]=Duck Duck Go HTML +Name[en_GB]=Duck Duck Go HTML +Name[eo]=Duck Duck Go HTML +Name[es]=Duck Duck Go HTML +Name[et]=Duck Duck Go HTML +Name[eu]=Duck Duck Go HTML +Name[fa]=Duck Duck Go HTML +Name[fi]=Duck Duck Go HTML +Name[fr]=Duck Duck Go HTML +Name[ga]=Duck Duck Go HTML +Name[gl]=Duck Duck Go HTML +Name[gu]=Duck Duck Go HTML +Name[he]=Duck Duck Go HTML +Name[hi]=Duck Duck Go HTML +Name[hr]=Duck Duck Go HTML +Name[hu]=Duck Duck Go HTML +Name[ia]=Duck Duck Go HTML +Name[id]=Duck Duck Go HTML +Name[is]=Duck Duck Go HTML +Name[it]=Duck Duck Go HTML +Name[ja]=Duck Duck Go HTML +Name[kk]=Duck Duck Go HTML +Name[km]=Duck Duck Go HTML +Name[kn]=Duck Duck Go HTML +Name[ko]=Duck Duck Go HTML +Name[lt]=Duck Duck Go HTML +Name[lv]=Duck Duck Go HTML +Name[ml]=Duck Duck Go HTML +Name[nb]=Duck Duck Go HTML +Name[nds]=Duck Duck Go HTML +Name[nl]=Duck Duck Go HTML +Name[nn]=Duck Duck Go HTML +Name[pa]=Duck Duck Go HTML +Name[pl]=Duck Duck Go HTML +Name[pt]=Duck Duck Go HTML +Name[pt_BR]=Duck Duck Go HTML +Name[ro]=Duck Duck Go HTML +Name[ru]=Поиск Duck Duck Go HTML +Name[si]=Duck Duck Go HTML +Name[sk]=Duck Duck Go HTML +Name[sl]=Duck Duck Go HTML +Name[sr]=Duck Duck Go HTML +Name[sr@ijekavian]=Duck Duck Go HTML +Name[sr@ijekavianlatin]=Duck Duck Go HTML +Name[sr@latin]=Duck Duck Go HTML +Name[sv]=Duck Duck Go HTML +Name[tg]=Duck Duck Go HTML +Name[th]=Duck Duck Go HTML +Name[tr]=Duck Duck Go HTML +Name[ug]=Duck Duck Go HTML +Name[uk]=Duck Duck Go HTML +Name[vi]=Duck Duck Go HTML +Name[wa]=Duck Duck Go HTML +Name[x-test]=xxDuck Duck Go HTMLxx +Name[zh_CN]=Duck Duck Go HTML +Name[zh_TW]=Duck Duck Go HTML +Query=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[bg]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[bn]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[ca]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[cs]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[da]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[de]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[el]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[eo]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[es]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[et]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[fi]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[fr]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[gl]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[hi]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[hu]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[ia]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[it]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[kk]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[km]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[nb]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[nl]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[pa]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[pl]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[pt]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[pt_BR]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[ro]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[ru]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[sl]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[sr]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[sr@ijekavian]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[sr@ijekavianlatin]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[sr@latin]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[sv]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[tr]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[uk]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[wa]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[x-test]=xxhttp://duckduckgo.com/html/?q=\\{@}&t=KDExx +Query[zh_CN]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +Query[zh_TW]=http://duckduckgo.com/html/?q=\\{@}&t=KDE +ServiceTypes=SearchProvider +Type=Service diff --git a/libre/kdebase-runtime/duckduckgo_lite.desktop b/libre/kdebase-runtime/duckduckgo_lite.desktop new file mode 100644 index 000000000..0da670dbe --- /dev/null +++ b/libre/kdebase-runtime/duckduckgo_lite.desktop @@ -0,0 +1,113 @@ +[Desktop Entry] +Charset= +Hidden=false +Keys=duckduckgolite,ddlite,dukgolite +Name=Duck Duck Go Lite +Name[ar]=Duck Duck Go Lite +Name[ast]=Duck Duck Go Lite +Name[bg]=Duck Duck Go Lite +Name[bn]=Duck Duck Go Lite +Name[bs]=Dak dak go Lite +Name[ca]=Duck Duck Go Lite +Name[ca@valencia]=Duck Duck Go Lite +Name[cs]=Duck Duck Go Lite +Name[da]=Duck Duck Go Lite +Name[de]=Duck Duck Go Lite +Name[el]=Duck Duck Go Lite +Name[en_GB]=Duck Duck Go Lite +Name[eo]=Duck Duck Go Lite +Name[es]=Duck Duck Go Lite +Name[et]=Duck Duck Go Lite +Name[eu]=Duck Duck Go Lite +Name[fa]=Duck Duck Go Lite +Name[fi]=Duck Duck Go Lite +Name[fr]=Duck Duck Go Lite +Name[ga]=Duck Duck Go Lite +Name[gl]=Duck Duck Go Lite +Name[gu]=Duck Duck Go Lite +Name[he]=Duck Duck Go Lite +Name[hi]=Duck Duck Go Lite +Name[hr]=Duck Duck Go Lite +Name[hu]=Duck Duck Go Lite +Name[ia]=Duck Duck Go Lite +Name[id]=Duck Duck Go Lite +Name[is]=Duck Duck Go Lite +Name[it]=Duck Duck Go Lite +Name[ja]=Duck Duck Go Lite +Name[kk]=Duck Duck Go Lite +Name[km]=Duck Duck Go Lite +Name[kn]=Duck Duck Go Lite +Name[ko]=Duck Duck Go Lite +Name[lt]=Duck Duck Go Lite +Name[lv]=Duck Duck Go Lite +Name[ml]=Duck Duck Go Lite +Name[nb]=Duck Duck Go Lite +Name[nds]=Duck Duck Go Lite +Name[nl]=Duck Duck Go Lite +Name[nn]=Duck Duck Go Lite +Name[pa]=Duck Duck Go Lite +Name[pl]=Duck Duck Go Lite +Name[pt]=Duck Duck Go Lite +Name[pt_BR]=Duck Duck Go Lite +Name[ro]=Duck Duck Go Lite +Name[ru]=Поиск Duck Duck Go Lite +Name[si]=Duck Duck Go Lite +Name[sk]=Duck Duck Go Lite +Name[sl]=Duck Duck Go Lite +Name[sr]=Duck Duck Go Lite +Name[sr@ijekavian]=Duck Duck Go Lite +Name[sr@ijekavianlatin]=Duck Duck Go Lite +Name[sr@latin]=Duck Duck Go Lite +Name[sv]=Duck Duck Go Lite +Name[tg]=Duck Duck Go Lite +Name[th]=Duck Duck Go Lite +Name[tr]=Duck Duck Go Lite +Name[ug]=Duck Duck Go Lite +Name[uk]=Duck Duck Go Lite +Name[vi]=Duck Duck Go Lite +Name[wa]=Duck Duck Go Lite +Name[x-test]=xxDuck Duck Go Litexx +Name[zh_CN]=Duck Duck Go Lite +Name[zh_TW]=Duck Duck Go Lite +Query=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[bg]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[bn]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[ca]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[cs]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[da]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[de]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[el]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[eo]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[es]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[et]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[fi]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[fr]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[gl]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[hi]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[hu]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[ia]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[it]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[kk]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[km]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[nb]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[nl]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[pa]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[pl]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[pt]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[pt_BR]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[ro]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[ru]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[sl]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[sr]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[sr@ijekavian]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[sr@ijekavianlatin]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[sr@latin]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[sv]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[tr]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[uk]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[wa]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[x-test]=xxhttp://duckduckgo.com/lite/?q=\\{@}&t=KDExx +Query[zh_CN]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +Query[zh_TW]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE +ServiceTypes=SearchProvider +Type=Service diff --git a/libre/kdebase-runtime/kdebase-runtime.install b/libre/kdebase-runtime/kdebase-runtime.install new file mode 100644 index 000000000..c77e68041 --- /dev/null +++ b/libre/kdebase-runtime/kdebase-runtime.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/PKGBUILD b/libre/kdelibs-libre/PKGBUILD deleted file mode 100644 index 963749145..000000000 --- a/libre/kdelibs-libre/PKGBUILD +++ /dev/null @@ -1,65 +0,0 @@ -# $Id: PKGBUILD 219465 2014-08-07 18:21:58Z andrea $ -# Maintainer (Arch): Andrea Scarpino -# Maintainer: André Silva - -_pkgname=kdelibs -pkgname=kdelibs-libre -pkgver=4.14.0 -pkgrel=1 -pkgdesc="KDE Core Libraries, without nonfree plugins recommendation support" -arch=('i686' 'x86_64' 'mips64el') -url='https://projects.kde.org/projects/kde/kdelibs' -license=('GPL' 'LGPL' 'FDL') -provides=("kdelibs=$pkgver") -replaces=('kdelibs') -conflicts=('kdelibs') -depends=('attica' 'libxss' 'krb5' 'grantlee' 'qca' 'libdbusmenu-qt' 'polkit-qt' - 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'strigi' - 'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon-qt4' - 'media-player-info' 'libxtst' 'libutempter' 'qtwebkit' 'icu') -makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa') -install=${_pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" - 'kde-applications-menu.patch' 'khtml-fsdg.diff' 'qt4.patch') -sha1sums=('d8c56abfa101b0bd39e05ae36b7f6063d8fe360c' - '86ee8c8660f19de8141ac99cd6943964d97a1ed7' - 'a1502a964081ad583a00cf90c56e74bf60121830' - 'ed1f57ee661e5c7440efcaba7e51d2554709701c') - -prepare() { - mkdir build - cd ${_pkgname}-${pkgver} - # avoid file conflict with gnome-menus - patch -p1 -i "${srcdir}"/kde-applications-menu.patch - # don't ask the user to download a plugin, it's probably nonfree. - patch -p1 -i "${srcdir}"/khtml-fsdg.diff - # qmake refers to Qt5 - patch -p1 -i "${srcdir}"/qt4.patch -} - -build() { - cd build - cmake ../${_pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DKDE4_BUILD_TESTS=OFF \ - -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 \ - -DWITH_SOLID_UDISKS2=ON - 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/kde-applications-menu.patch b/libre/kdelibs-libre/kde-applications-menu.patch deleted file mode 100644 index 4b513298a..000000000 --- a/libre/kdelibs-libre/kde-applications-menu.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 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-cve-2014-5033.patch b/libre/kdelibs-libre/kdelibs-cve-2014-5033.patch deleted file mode 100644 index c85eccd6b..000000000 --- a/libre/kdelibs-libre/kdelibs-cve-2014-5033.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp -+++ b/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp -@@ -144,7 +144,7 @@ - - Action::AuthStatus Polkit1Backend::actionStatus(const QString &action) - { -- PolkitQt1::UnixProcessSubject subject(QCoreApplication::applicationPid()); -+ PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID())); - PolkitQt1::Authority::Result r = PolkitQt1::Authority::instance()->checkAuthorizationSync(action, subject, - PolkitQt1::Authority::None); - switch (r) { -@@ -160,21 +160,12 @@ - - QByteArray Polkit1Backend::callerID() const - { -- QByteArray a; -- QDataStream s(&a, QIODevice::WriteOnly); -- s << QCoreApplication::applicationPid(); -- -- return a; -+ return QDBusConnection::systemBus().baseService().toUtf8(); - } - - bool Polkit1Backend::isCallerAuthorized(const QString &action, QByteArray callerID) - { -- QDataStream s(&callerID, QIODevice::ReadOnly); -- qint64 pid; -- -- s >> pid; -- -- PolkitQt1::UnixProcessSubject subject(pid); -+ PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID)); - PolkitQt1::Authority *authority = PolkitQt1::Authority::instance(); - - PolkitResultEventLoop e; - diff --git a/libre/kdelibs-libre/kdelibs.install b/libre/kdelibs-libre/kdelibs.install deleted file mode 100644 index c77e68041..000000000 --- a/libre/kdelibs-libre/kdelibs.install +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 1a531b3c8..000000000 --- a/libre/kdelibs-libre/khtml-fsdg.diff +++ /dev/null @@ -1,50 +0,0 @@ -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; -- } -- } -- } - } - - diff --git a/libre/kdelibs-libre/pyqt.patch b/libre/kdelibs-libre/pyqt.patch deleted file mode 100644 index eadd2f2ac..000000000 --- a/libre/kdelibs-libre/pyqt.patch +++ /dev/null @@ -1,247 +0,0 @@ -Make FindPyKDE4 work with PyQt's new build system. -Make FindPyQt4 work with PyQt's new build system. - -Since PyQt 4.10, PyQt.pyqtconfig is deprecated and not available unless -PyQt is built using the old configure script. - -PyKDE4 itself has recently been adjusted to mimic PyQt itself and only -install its pykdeconfig module if pyqtconfig is present. Additionally, -information such as SIP flags and the directory where PyKDE's SIP files -are installed are now also provided in the -PyKDE4.kdecore.PYKDE_CONFIGURATION dict. - -This commit completely rewrites FindPyKDE4.py to make it look like -FindPyQt.cmake after commit a7e4743: most of the information used by -FindPyKDE4.cmake is fetched from PyKDE4.kdecore, and we first try to -obtain the SIP flags and directory from pykdeconfig and, if it fails, we -use PYKDE_CONFIGURATION. - -Furthermore, FindPyKDE4.py now only prints the variables that are -actually consumed by FindPyKDE4.cmake -- it is not possible to obtain -all the data provided by pykdeconfig in PYKDE_CONFIGURATION. We've also -stopped reading and setting PYKDE4_VERSION_TAG, since PyKDE4 stopped -setting a KDE tag in 2008 (and its value was 3_92_0 at the time). - -CCBUG: 327633 -REVIEW: 119454 - -BUG: 337462 -FIXED-IN: 4.14.0 -REVIEW: 119302 ---- kdelibs-4.13.3/cmake/modules/FindPyKDE4.cmake~ 2014-08-06 21:54:27.564432282 +0000 -+++ kdelibs-4.13.3/cmake/modules/FindPyKDE4.cmake 2014-08-06 21:54:43.417702615 +0000 -@@ -25,7 +25,6 @@ - STRING(REGEX REPLACE ".*\npykde_version_str:([^\n]+).*$" "\\1" PYKDE4_VERSION_STR ${pykde_config}) - STRING(REGEX REPLACE ".*\npykde_kde_sip_flags:([^\n]+).*$" "\\1" PYKDE4_SIP_FLAGS ${pykde_config}) - STRING(REGEX REPLACE ".*\npykde_sip_dir:([^\n]+).*$" "\\1" PYKDE4_SIP_DIR ${pykde_config}) -- STRING(REGEX REPLACE ".*\npykde_version_tag:([^\n]+).*$" "\\1" PYKDE4_VERSION_TAG ${pykde_config}) - MESSAGE(STATUS "Found PyKDE4 version ${PYKDE4_VERSION_STR} ${PYKDE4_SIP_DIR}") - - SET(PYKDE4_FOUND TRUE) -@@ -183,3 +182,4 @@ - endif(WIN32) - ENDMACRO(PYKDE4_ADD_EXECUTABLE) - -+ ---- kdelibs-4.13.3/cmake/modules/FindPyKDE4.py~ 2014-08-06 21:54:56.427650960 +0000 -+++ kdelibs-4.13.3/cmake/modules/FindPyKDE4.py 2014-08-06 21:55:04.400952596 +0000 -@@ -1,46 +1,23 @@ --# By Simon Edwards --# modified by Paul Giannaros to add better PyKDE4 --# sip directory finding --# This file is in the public domain. -+# Copyright (c) 2014, Raphael Kubo da Costa -+# Redistribution and use is allowed according to the terms of the BSD license. -+# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - --import sys --import os --import PyKDE4.pykdeconfig --import PyQt4.pyqtconfig -+import PyKDE4.kdecore - --if "_pkg_config" in dir(PyKDE4.pykdeconfig): -- _pkg_config = PyKDE4.pykdeconfig._pkg_config -+if __name__ == '__main__': -+ try: -+ import PyKDE4.pykdeconfig -+ pykdecfg = PyKDE4.pykdeconfig.Configuration() -+ sip_dir = pykdecfg.pykde_sip_dir -+ sip_flags = pykdecfg.pykde_kde_sip_flags -+ except ImportError: -+ # PyQt4 >= 4.10.0 was built with configure-ng.py instead of -+ # configure.py, so pyqtconfig.py and pykdeconfig.py are not installed. -+ sip_dir = PyKDE4.kdecore.PYKDE_CONFIGURATION['sip_dir'] -+ sip_flags = PyKDE4.kdecore.PYKDE_CONFIGURATION['sip_flags'] - -- for varname in [ -- 'kde_version', -- 'kde_version_extra', -- 'kdebasedir', -- 'kdeincdir', -- 'kdelibdir', -- 'libdir', -- 'pykde_kde_sip_flags', -- 'pykde_mod_dir', -- 'pykde_modules', -- 'pykde_sip_dir', -- 'pykde_version', -- 'pykde_version_str']: -- varvalue = _pkg_config[varname] -- if varname == 'pykde_sip_dir': -- d = os.path.join(_pkg_config[varname], 'PyKDE4') -- if os.path.exists(d): -- varvalue = d -- print("%s:%s\n" % (varname, varvalue)) -- pykde_version_tag = '' -- in_t = False -- for item in _pkg_config['pykde_kde_sip_flags'].split(): -- if item == "-t": -- in_t = True -- elif in_t: -- if item.startswith("KDE_"): -- pykde_version_tag = item -- else: -- in_t = False -- print("pykde_version_tag:%s" % pykde_version_tag) -+ print('pykde_version:%06.x' % PyKDE4.kdecore.version()) -+ print('pykde_version_str:%s' % PyKDE4.kdecore.versionString()) -+ print('pykde_sip_dir:%s' % sip_dir) -+ print('pykde_sip_flags:%s' % sip_flags) - --else: -- sys.exit(1) ---- kdelibs-4.13.3/cmake/modules/FindPyQt.py~ 2014-08-06 21:55:55.874081319 +0000 -+++ kdelibs-4.13.3/cmake/modules/FindPyQt.py 2014-08-06 21:56:06.250706848 +0000 -@@ -1,24 +1,49 @@ - # Copyright (c) 2007, Simon Edwards -+# Copyright (c) 2014, Raphael Kubo da Costa - # Redistribution and use is allowed according to the terms of the BSD license. - # For details see the accompanying COPYING-CMAKE-SCRIPTS file. - --import PyQt4.pyqtconfig -+import PyQt4.QtCore -+import os -+import sys - --pyqtcfg = PyQt4.pyqtconfig.Configuration() --print("pyqt_version:%06.0x" % pyqtcfg.pyqt_version) --print("pyqt_version_str:%s" % pyqtcfg.pyqt_version_str) -- --pyqt_version_tag = "" --in_t = False --for item in pyqtcfg.pyqt_sip_flags.split(' '): -- if item=="-t": -- in_t = True -- elif in_t: -- if item.startswith("Qt_4"): -- pyqt_version_tag = item -+def get_default_sip_dir(): -+ # This is based on QScintilla's configure.py, and only works for the -+ # default case where installation paths have not been changed in PyQt's -+ # configuration process. -+ if sys.platform == 'win32': -+ pyqt_sip_dir = os.path.join(sys.prefix, 'sip', 'PyQt4') - else: -- in_t = False --print("pyqt_version_tag:%s" % pyqt_version_tag) -+ pyqt_sip_dir = os.path.join(sys.prefix, 'share', 'sip', 'PyQt4') -+ return pyqt_sip_dir -+ -+def get_qt4_tag(sip_flags): -+ in_t = False -+ for item in sip_flags.split(' '): -+ if item == '-t': -+ in_t = True -+ elif in_t: -+ if item.startswith('Qt_4'): -+ return item -+ else: -+ in_t = False -+ raise ValueError('Cannot find Qt\'s tag in PyQt4\'s SIP flags.') -+ -+if __name__ == '__main__': -+ try: -+ import PyQt4.pyqtconfig -+ pyqtcfg = PyQt4.pyqtconfig.Configuration() -+ sip_dir = pyqtcfg.pyqt_sip_dir -+ sip_flags = pyqtcfg.pyqt_sip_flags -+ except ImportError: -+ # PyQt4 >= 4.10.0 was built with configure-ng.py instead of -+ # configure.py, so pyqtconfig.py is not installed. -+ sip_dir = get_default_sip_dir() -+ sip_flags = PyQt4.QtCore.PYQT_CONFIGURATION['sip_flags'] -+ -+ print('pyqt_version:%06.x' % PyQt4.QtCore.PYQT_VERSION) -+ print('pyqt_version_str:%s' % PyQt4.QtCore.PYQT_VERSION_STR) -+ print('pyqt_version_tag:%s' % get_qt4_tag(sip_flags)) -+ print('pyqt_sip_dir:%s' % sip_dir) -+ print('pyqt_sip_flags:%s' % sip_flags) - --print("pyqt_sip_dir:%s" % pyqtcfg.pyqt_sip_dir) --print("pyqt_sip_flags:%s" % pyqtcfg.pyqt_sip_flags) ---- kdelibs-4.13.3/cmake/modules/FindPyQt4.cmake~ 2014-08-06 21:55:16.697570407 +0000 -+++ kdelibs-4.13.3/cmake/modules/FindPyQt4.cmake 2014-08-06 21:55:38.597483393 +0000 -@@ -9,16 +9,20 @@ - # Find the installed version of PyQt4. FindPyQt4 should only be called after - # Python has been found. - # --# This file defines the following variables: -+# This file defines the following variables, which can also be overriden by -+# users: - # - # PYQT4_VERSION - The version of PyQt4 found expressed as a 6 digit hex number - # suitable for comparison as a string - # - # PYQT4_VERSION_STR - The version of PyQt4 as a human readable string. - # --# PYQT4_VERSION_TAG - The PyQt version tag using by PyQt's sip files. -+# PYQT4_VERSION_TAG - The Qt4 version tag used by PyQt's sip files. - # --# PYQT4_SIP_DIR - The directory holding the PyQt4 .sip files. -+# PYQT4_SIP_DIR - The directory holding the PyQt4 .sip files. This can be unset -+# if PyQt4 was built using its new build system and pyqtconfig.py is not -+# present on the system, as in this case its value cannot be determined -+# automatically. - # - # PYQT4_SIP_FLAGS - The SIP flags used to build PyQt. - -@@ -31,13 +35,27 @@ - - EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${_find_pyqt_py} OUTPUT_VARIABLE pyqt_config) - IF(pyqt_config) -- STRING(REGEX REPLACE "^pyqt_version:([^\n]+).*$" "\\1" PYQT4_VERSION ${pyqt_config}) -- STRING(REGEX REPLACE ".*\npyqt_version_str:([^\n]+).*$" "\\1" PYQT4_VERSION_STR ${pyqt_config}) -- STRING(REGEX REPLACE ".*\npyqt_version_tag:([^\n]+).*$" "\\1" PYQT4_VERSION_TAG ${pyqt_config}) -- STRING(REGEX REPLACE ".*\npyqt_sip_dir:([^\n]+).*$" "\\1" PYQT4_SIP_DIR ${pyqt_config}) -- STRING(REGEX REPLACE ".*\npyqt_sip_flags:([^\n]+).*$" "\\1" PYQT4_SIP_FLAGS ${pyqt_config}) -+ STRING(REGEX MATCH "^pyqt_version:([^\n]+).*$" _dummy ${pyqt_config}) -+ SET(PYQT4_VERSION "${CMAKE_MATCH_1}" CACHE STRING "PyQt4's version as a 6-digit hexadecimal number") - -- SET(PYQT4_FOUND TRUE) -+ STRING(REGEX MATCH ".*\npyqt_version_str:([^\n]+).*$" _dummy ${pyqt_config}) -+ SET(PYQT4_VERSION_STR "${CMAKE_MATCH_1}" CACHE STRING "PyQt4's version as a human-readable string") -+ -+ STRING(REGEX MATCH ".*\npyqt_version_tag:([^\n]+).*$" _dummy ${pyqt_config}) -+ SET(PYQT4_VERSION_TAG "${CMAKE_MATCH_1}" CACHE STRING "The Qt4 version tag used by PyQt4's .sip files") -+ -+ STRING(REGEX MATCH ".*\npyqt_sip_dir:([^\n]+).*$" _dummy ${pyqt_config}) -+ SET(PYQT4_SIP_DIR "${CMAKE_MATCH_1}" CACHE PATH "The base directory where PyQt4's .sip files are installed") -+ -+ STRING(REGEX MATCH ".*\npyqt_sip_flags:([^\n]+).*$" _dummy ${pyqt_config}) -+ SET(PYQT4_SIP_FLAGS "${CMAKE_MATCH_1}" CACHE STRING "The SIP flags used to build PyQt4") -+ -+ IF(NOT IS_DIRECTORY "${PYQT4_SIP_DIR}") -+ MESSAGE(WARNING "The base directory where PyQt4's SIP files are installed could not be determined. This usually means PyQt4 was built with its new build system and pyqtconfig.py is not present.\n" -+ "Please set the PYQT4_SIP_DIR variable manually.") -+ ELSE(NOT IS_DIRECTORY "${PYQT4_SIP_DIR}") -+ SET(PYQT4_FOUND TRUE) -+ ENDIF(NOT IS_DIRECTORY "${PYQT4_SIP_DIR}") - ENDIF(pyqt_config) - - IF(PYQT4_FOUND) -@@ -51,3 +69,4 @@ - ENDIF(PYQT4_FOUND) - - ENDIF(EXISTS PYQT4_VERSION) -+ diff --git a/libre/kdelibs-libre/qt4.patch b/libre/kdelibs-libre/qt4.patch deleted file mode 100644 index bb4312d40..000000000 --- a/libre/kdelibs-libre/qt4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kdelibs-4.10.1/cmake/modules/FindQt4.cmake~ 2013-03-07 16:57:29.735552097 +0000 -+++ kdelibs-4.10.1/cmake/modules/FindQt4.cmake 2013-03-07 16:57:52.038725421 +0000 -@@ -446,7 +446,7 @@ - # check for qmake - # Debian uses qmake-qt4 - # macports' Qt uses qmake-mac --FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS -+FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac PATHS - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin" - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin" diff --git a/libre/kdelibs/PKGBUILD b/libre/kdelibs/PKGBUILD new file mode 100644 index 000000000..045450038 --- /dev/null +++ b/libre/kdelibs/PKGBUILD @@ -0,0 +1,63 @@ +# $Id: PKGBUILD 219465 2014-08-07 18:21:58Z andrea $ +# Maintainer (Arch): Andrea Scarpino +# Maintainer: André Silva + +pkgname=kdelibs +pkgver=4.14.0 +pkgrel=1.parabola1 +pkgdesc="KDE Core Libraries, without nonfree plugins recommendation support" +arch=('i686' 'x86_64' 'mips64el') +url='https://projects.kde.org/projects/kde/kdelibs' +license=('GPL' 'LGPL' 'FDL') +replaces=('kdelibs-libre') +conflicts=('kdelibs-libre') +depends=('attica' 'libxss' 'krb5' 'grantlee' 'qca' 'libdbusmenu-qt' 'polkit-qt' + 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'strigi' + 'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon-qt4' + 'media-player-info' 'libxtst' 'libutempter' 'qtwebkit' 'icu') +makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz" + 'kde-applications-menu.patch' 'khtml-fsdg.diff' 'qt4.patch') +sha1sums=('d8c56abfa101b0bd39e05ae36b7f6063d8fe360c' + '86ee8c8660f19de8141ac99cd6943964d97a1ed7' + 'a1502a964081ad583a00cf90c56e74bf60121830' + 'ed1f57ee661e5c7440efcaba7e51d2554709701c') + +prepare() { + mkdir build + cd ${pkgname}-${pkgver} + # avoid file conflict with gnome-menus + patch -p1 -i "${srcdir}"/kde-applications-menu.patch + # don't ask the user to download a plugin, it's probably nonfree. + patch -p1 -i "${srcdir}"/khtml-fsdg.diff + # qmake refers to Qt5 + patch -p1 -i "${srcdir}"/qt4.patch +} + +build() { + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DKDE4_BUILD_TESTS=OFF \ + -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 \ + -DWITH_SOLID_UDISKS2=ON + 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/kde-applications-menu.patch b/libre/kdelibs/kde-applications-menu.patch new file mode 100644 index 000000000..4b513298a --- /dev/null +++ b/libre/kdelibs/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/kdelibs-cve-2014-5033.patch b/libre/kdelibs/kdelibs-cve-2014-5033.patch new file mode 100644 index 000000000..c85eccd6b --- /dev/null +++ b/libre/kdelibs/kdelibs-cve-2014-5033.patch @@ -0,0 +1,36 @@ +--- a/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp ++++ b/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp +@@ -144,7 +144,7 @@ + + Action::AuthStatus Polkit1Backend::actionStatus(const QString &action) + { +- PolkitQt1::UnixProcessSubject subject(QCoreApplication::applicationPid()); ++ PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID())); + PolkitQt1::Authority::Result r = PolkitQt1::Authority::instance()->checkAuthorizationSync(action, subject, + PolkitQt1::Authority::None); + switch (r) { +@@ -160,21 +160,12 @@ + + QByteArray Polkit1Backend::callerID() const + { +- QByteArray a; +- QDataStream s(&a, QIODevice::WriteOnly); +- s << QCoreApplication::applicationPid(); +- +- return a; ++ return QDBusConnection::systemBus().baseService().toUtf8(); + } + + bool Polkit1Backend::isCallerAuthorized(const QString &action, QByteArray callerID) + { +- QDataStream s(&callerID, QIODevice::ReadOnly); +- qint64 pid; +- +- s >> pid; +- +- PolkitQt1::UnixProcessSubject subject(pid); ++ PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID)); + PolkitQt1::Authority *authority = PolkitQt1::Authority::instance(); + + PolkitResultEventLoop e; + diff --git a/libre/kdelibs/kdelibs.install b/libre/kdelibs/kdelibs.install new file mode 100644 index 000000000..c77e68041 --- /dev/null +++ b/libre/kdelibs/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/khtml-fsdg.diff b/libre/kdelibs/khtml-fsdg.diff new file mode 100644 index 000000000..1a531b3c8 --- /dev/null +++ b/libre/kdelibs/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; +- } +- } +- } + } + + diff --git a/libre/kdelibs/pyqt.patch b/libre/kdelibs/pyqt.patch new file mode 100644 index 000000000..eadd2f2ac --- /dev/null +++ b/libre/kdelibs/pyqt.patch @@ -0,0 +1,247 @@ +Make FindPyKDE4 work with PyQt's new build system. +Make FindPyQt4 work with PyQt's new build system. + +Since PyQt 4.10, PyQt.pyqtconfig is deprecated and not available unless +PyQt is built using the old configure script. + +PyKDE4 itself has recently been adjusted to mimic PyQt itself and only +install its pykdeconfig module if pyqtconfig is present. Additionally, +information such as SIP flags and the directory where PyKDE's SIP files +are installed are now also provided in the +PyKDE4.kdecore.PYKDE_CONFIGURATION dict. + +This commit completely rewrites FindPyKDE4.py to make it look like +FindPyQt.cmake after commit a7e4743: most of the information used by +FindPyKDE4.cmake is fetched from PyKDE4.kdecore, and we first try to +obtain the SIP flags and directory from pykdeconfig and, if it fails, we +use PYKDE_CONFIGURATION. + +Furthermore, FindPyKDE4.py now only prints the variables that are +actually consumed by FindPyKDE4.cmake -- it is not possible to obtain +all the data provided by pykdeconfig in PYKDE_CONFIGURATION. We've also +stopped reading and setting PYKDE4_VERSION_TAG, since PyKDE4 stopped +setting a KDE tag in 2008 (and its value was 3_92_0 at the time). + +CCBUG: 327633 +REVIEW: 119454 + +BUG: 337462 +FIXED-IN: 4.14.0 +REVIEW: 119302 +--- kdelibs-4.13.3/cmake/modules/FindPyKDE4.cmake~ 2014-08-06 21:54:27.564432282 +0000 ++++ kdelibs-4.13.3/cmake/modules/FindPyKDE4.cmake 2014-08-06 21:54:43.417702615 +0000 +@@ -25,7 +25,6 @@ + STRING(REGEX REPLACE ".*\npykde_version_str:([^\n]+).*$" "\\1" PYKDE4_VERSION_STR ${pykde_config}) + STRING(REGEX REPLACE ".*\npykde_kde_sip_flags:([^\n]+).*$" "\\1" PYKDE4_SIP_FLAGS ${pykde_config}) + STRING(REGEX REPLACE ".*\npykde_sip_dir:([^\n]+).*$" "\\1" PYKDE4_SIP_DIR ${pykde_config}) +- STRING(REGEX REPLACE ".*\npykde_version_tag:([^\n]+).*$" "\\1" PYKDE4_VERSION_TAG ${pykde_config}) + MESSAGE(STATUS "Found PyKDE4 version ${PYKDE4_VERSION_STR} ${PYKDE4_SIP_DIR}") + + SET(PYKDE4_FOUND TRUE) +@@ -183,3 +182,4 @@ + endif(WIN32) + ENDMACRO(PYKDE4_ADD_EXECUTABLE) + ++ +--- kdelibs-4.13.3/cmake/modules/FindPyKDE4.py~ 2014-08-06 21:54:56.427650960 +0000 ++++ kdelibs-4.13.3/cmake/modules/FindPyKDE4.py 2014-08-06 21:55:04.400952596 +0000 +@@ -1,46 +1,23 @@ +-# By Simon Edwards +-# modified by Paul Giannaros to add better PyKDE4 +-# sip directory finding +-# This file is in the public domain. ++# Copyright (c) 2014, Raphael Kubo da Costa ++# Redistribution and use is allowed according to the terms of the BSD license. ++# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +-import sys +-import os +-import PyKDE4.pykdeconfig +-import PyQt4.pyqtconfig ++import PyKDE4.kdecore + +-if "_pkg_config" in dir(PyKDE4.pykdeconfig): +- _pkg_config = PyKDE4.pykdeconfig._pkg_config ++if __name__ == '__main__': ++ try: ++ import PyKDE4.pykdeconfig ++ pykdecfg = PyKDE4.pykdeconfig.Configuration() ++ sip_dir = pykdecfg.pykde_sip_dir ++ sip_flags = pykdecfg.pykde_kde_sip_flags ++ except ImportError: ++ # PyQt4 >= 4.10.0 was built with configure-ng.py instead of ++ # configure.py, so pyqtconfig.py and pykdeconfig.py are not installed. ++ sip_dir = PyKDE4.kdecore.PYKDE_CONFIGURATION['sip_dir'] ++ sip_flags = PyKDE4.kdecore.PYKDE_CONFIGURATION['sip_flags'] + +- for varname in [ +- 'kde_version', +- 'kde_version_extra', +- 'kdebasedir', +- 'kdeincdir', +- 'kdelibdir', +- 'libdir', +- 'pykde_kde_sip_flags', +- 'pykde_mod_dir', +- 'pykde_modules', +- 'pykde_sip_dir', +- 'pykde_version', +- 'pykde_version_str']: +- varvalue = _pkg_config[varname] +- if varname == 'pykde_sip_dir': +- d = os.path.join(_pkg_config[varname], 'PyKDE4') +- if os.path.exists(d): +- varvalue = d +- print("%s:%s\n" % (varname, varvalue)) +- pykde_version_tag = '' +- in_t = False +- for item in _pkg_config['pykde_kde_sip_flags'].split(): +- if item == "-t": +- in_t = True +- elif in_t: +- if item.startswith("KDE_"): +- pykde_version_tag = item +- else: +- in_t = False +- print("pykde_version_tag:%s" % pykde_version_tag) ++ print('pykde_version:%06.x' % PyKDE4.kdecore.version()) ++ print('pykde_version_str:%s' % PyKDE4.kdecore.versionString()) ++ print('pykde_sip_dir:%s' % sip_dir) ++ print('pykde_sip_flags:%s' % sip_flags) + +-else: +- sys.exit(1) +--- kdelibs-4.13.3/cmake/modules/FindPyQt.py~ 2014-08-06 21:55:55.874081319 +0000 ++++ kdelibs-4.13.3/cmake/modules/FindPyQt.py 2014-08-06 21:56:06.250706848 +0000 +@@ -1,24 +1,49 @@ + # Copyright (c) 2007, Simon Edwards ++# Copyright (c) 2014, Raphael Kubo da Costa + # Redistribution and use is allowed according to the terms of the BSD license. + # For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +-import PyQt4.pyqtconfig ++import PyQt4.QtCore ++import os ++import sys + +-pyqtcfg = PyQt4.pyqtconfig.Configuration() +-print("pyqt_version:%06.0x" % pyqtcfg.pyqt_version) +-print("pyqt_version_str:%s" % pyqtcfg.pyqt_version_str) +- +-pyqt_version_tag = "" +-in_t = False +-for item in pyqtcfg.pyqt_sip_flags.split(' '): +- if item=="-t": +- in_t = True +- elif in_t: +- if item.startswith("Qt_4"): +- pyqt_version_tag = item ++def get_default_sip_dir(): ++ # This is based on QScintilla's configure.py, and only works for the ++ # default case where installation paths have not been changed in PyQt's ++ # configuration process. ++ if sys.platform == 'win32': ++ pyqt_sip_dir = os.path.join(sys.prefix, 'sip', 'PyQt4') + else: +- in_t = False +-print("pyqt_version_tag:%s" % pyqt_version_tag) ++ pyqt_sip_dir = os.path.join(sys.prefix, 'share', 'sip', 'PyQt4') ++ return pyqt_sip_dir ++ ++def get_qt4_tag(sip_flags): ++ in_t = False ++ for item in sip_flags.split(' '): ++ if item == '-t': ++ in_t = True ++ elif in_t: ++ if item.startswith('Qt_4'): ++ return item ++ else: ++ in_t = False ++ raise ValueError('Cannot find Qt\'s tag in PyQt4\'s SIP flags.') ++ ++if __name__ == '__main__': ++ try: ++ import PyQt4.pyqtconfig ++ pyqtcfg = PyQt4.pyqtconfig.Configuration() ++ sip_dir = pyqtcfg.pyqt_sip_dir ++ sip_flags = pyqtcfg.pyqt_sip_flags ++ except ImportError: ++ # PyQt4 >= 4.10.0 was built with configure-ng.py instead of ++ # configure.py, so pyqtconfig.py is not installed. ++ sip_dir = get_default_sip_dir() ++ sip_flags = PyQt4.QtCore.PYQT_CONFIGURATION['sip_flags'] ++ ++ print('pyqt_version:%06.x' % PyQt4.QtCore.PYQT_VERSION) ++ print('pyqt_version_str:%s' % PyQt4.QtCore.PYQT_VERSION_STR) ++ print('pyqt_version_tag:%s' % get_qt4_tag(sip_flags)) ++ print('pyqt_sip_dir:%s' % sip_dir) ++ print('pyqt_sip_flags:%s' % sip_flags) + +-print("pyqt_sip_dir:%s" % pyqtcfg.pyqt_sip_dir) +-print("pyqt_sip_flags:%s" % pyqtcfg.pyqt_sip_flags) +--- kdelibs-4.13.3/cmake/modules/FindPyQt4.cmake~ 2014-08-06 21:55:16.697570407 +0000 ++++ kdelibs-4.13.3/cmake/modules/FindPyQt4.cmake 2014-08-06 21:55:38.597483393 +0000 +@@ -9,16 +9,20 @@ + # Find the installed version of PyQt4. FindPyQt4 should only be called after + # Python has been found. + # +-# This file defines the following variables: ++# This file defines the following variables, which can also be overriden by ++# users: + # + # PYQT4_VERSION - The version of PyQt4 found expressed as a 6 digit hex number + # suitable for comparison as a string + # + # PYQT4_VERSION_STR - The version of PyQt4 as a human readable string. + # +-# PYQT4_VERSION_TAG - The PyQt version tag using by PyQt's sip files. ++# PYQT4_VERSION_TAG - The Qt4 version tag used by PyQt's sip files. + # +-# PYQT4_SIP_DIR - The directory holding the PyQt4 .sip files. ++# PYQT4_SIP_DIR - The directory holding the PyQt4 .sip files. This can be unset ++# if PyQt4 was built using its new build system and pyqtconfig.py is not ++# present on the system, as in this case its value cannot be determined ++# automatically. + # + # PYQT4_SIP_FLAGS - The SIP flags used to build PyQt. + +@@ -31,13 +35,27 @@ + + EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${_find_pyqt_py} OUTPUT_VARIABLE pyqt_config) + IF(pyqt_config) +- STRING(REGEX REPLACE "^pyqt_version:([^\n]+).*$" "\\1" PYQT4_VERSION ${pyqt_config}) +- STRING(REGEX REPLACE ".*\npyqt_version_str:([^\n]+).*$" "\\1" PYQT4_VERSION_STR ${pyqt_config}) +- STRING(REGEX REPLACE ".*\npyqt_version_tag:([^\n]+).*$" "\\1" PYQT4_VERSION_TAG ${pyqt_config}) +- STRING(REGEX REPLACE ".*\npyqt_sip_dir:([^\n]+).*$" "\\1" PYQT4_SIP_DIR ${pyqt_config}) +- STRING(REGEX REPLACE ".*\npyqt_sip_flags:([^\n]+).*$" "\\1" PYQT4_SIP_FLAGS ${pyqt_config}) ++ STRING(REGEX MATCH "^pyqt_version:([^\n]+).*$" _dummy ${pyqt_config}) ++ SET(PYQT4_VERSION "${CMAKE_MATCH_1}" CACHE STRING "PyQt4's version as a 6-digit hexadecimal number") + +- SET(PYQT4_FOUND TRUE) ++ STRING(REGEX MATCH ".*\npyqt_version_str:([^\n]+).*$" _dummy ${pyqt_config}) ++ SET(PYQT4_VERSION_STR "${CMAKE_MATCH_1}" CACHE STRING "PyQt4's version as a human-readable string") ++ ++ STRING(REGEX MATCH ".*\npyqt_version_tag:([^\n]+).*$" _dummy ${pyqt_config}) ++ SET(PYQT4_VERSION_TAG "${CMAKE_MATCH_1}" CACHE STRING "The Qt4 version tag used by PyQt4's .sip files") ++ ++ STRING(REGEX MATCH ".*\npyqt_sip_dir:([^\n]+).*$" _dummy ${pyqt_config}) ++ SET(PYQT4_SIP_DIR "${CMAKE_MATCH_1}" CACHE PATH "The base directory where PyQt4's .sip files are installed") ++ ++ STRING(REGEX MATCH ".*\npyqt_sip_flags:([^\n]+).*$" _dummy ${pyqt_config}) ++ SET(PYQT4_SIP_FLAGS "${CMAKE_MATCH_1}" CACHE STRING "The SIP flags used to build PyQt4") ++ ++ IF(NOT IS_DIRECTORY "${PYQT4_SIP_DIR}") ++ MESSAGE(WARNING "The base directory where PyQt4's SIP files are installed could not be determined. This usually means PyQt4 was built with its new build system and pyqtconfig.py is not present.\n" ++ "Please set the PYQT4_SIP_DIR variable manually.") ++ ELSE(NOT IS_DIRECTORY "${PYQT4_SIP_DIR}") ++ SET(PYQT4_FOUND TRUE) ++ ENDIF(NOT IS_DIRECTORY "${PYQT4_SIP_DIR}") + ENDIF(pyqt_config) + + IF(PYQT4_FOUND) +@@ -51,3 +69,4 @@ + ENDIF(PYQT4_FOUND) + + ENDIF(EXISTS PYQT4_VERSION) ++ diff --git a/libre/kdelibs/qt4.patch b/libre/kdelibs/qt4.patch new file mode 100644 index 000000000..bb4312d40 --- /dev/null +++ b/libre/kdelibs/qt4.patch @@ -0,0 +1,11 @@ +--- kdelibs-4.10.1/cmake/modules/FindQt4.cmake~ 2013-03-07 16:57:29.735552097 +0000 ++++ kdelibs-4.10.1/cmake/modules/FindQt4.cmake 2013-03-07 16:57:52.038725421 +0000 +@@ -446,7 +446,7 @@ + # check for qmake + # Debian uses qmake-qt4 + # macports' Qt uses qmake-mac +-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS ++FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac PATHS + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin" + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin" diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD deleted file mode 100644 index d003aa80e..000000000 --- a/libre/kdenetwork-kopete-libre/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 217314 2014-07-18 11:45:55Z svenstaro $ -# Maintainer (Arch): Andrea Scarpino -# Maintainer: André Silva - -_pkgname=kdenetwork-kopete -pkgname=kdenetwork-kopete-libre -pkgver=4.14.0 -pkgrel=1 -pkgdesc='Instant Messenger, without nonfree Skype support' -url='http://kde.org/applications/internet/kopete/' -arch=('i686' 'x86_64' 'mips64el') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdenetwork') -replaces=($_pkgname) -conflicts=($_pkgname) -provides=($_pkgname=$pkgver) -depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libidn' - 'qimageblitz' 'libgadu' 'mediastreamer' 'jsoncpp') -makedepends=('cmake' 'automoc4' 'boost' 'kdepim-libkdepim') -install=${_pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz") -sha1sums=('bd247af3b25650bedcdb983fc285469dcacea964') - -prepare() { - cd kopete-${pkgver} - # Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34. - rm -rv protocols/skype - sed 's/, Skype//' -i doc/index.docbook - cd .. - mkdir build -} - -build() { - cd build - cmake ../kopete-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DKDE4_BUILD_TESTS=OFF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_SKIP_RPATH=ON \ - -DWITH_Libmsn=OFF \ - -DWITH_skype=OFF - make -} - -package() { - cd build - make DESTDIR=$pkgdir install -} diff --git a/libre/kdenetwork-kopete-libre/kdenetwork-kopete.install b/libre/kdenetwork-kopete-libre/kdenetwork-kopete.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/libre/kdenetwork-kopete-libre/kdenetwork-kopete.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/kdenetwork-kopete-libre/kdenetwork.install b/libre/kdenetwork-kopete-libre/kdenetwork.install deleted file mode 100644 index e70c054ec..000000000 --- a/libre/kdenetwork-kopete-libre/kdenetwork.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/libre/kdenetwork-kopete/PKGBUILD b/libre/kdenetwork-kopete/PKGBUILD new file mode 100644 index 000000000..eac942b9c --- /dev/null +++ b/libre/kdenetwork-kopete/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 217314 2014-07-18 11:45:55Z svenstaro $ +# Maintainer (Arch): Andrea Scarpino +# Maintainer: André Silva + +pkgname=kdenetwork-kopete +pkgver=4.14.0 +pkgrel=1.parabola1 +pkgdesc='Instant Messenger, without nonfree Skype support' +url='http://kde.org/applications/internet/kopete/' +arch=('i686' 'x86_64' 'mips64el') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdenetwork') +replaces=(${pkgname}-libre) +conflicts=(${pkgname}-libre) +depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libidn' + 'qimageblitz' 'libgadu' 'mediastreamer' 'jsoncpp') +makedepends=('cmake' 'automoc4' 'boost' 'kdepim-libkdepim') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz") +sha1sums=('bd247af3b25650bedcdb983fc285469dcacea964') + +prepare() { + cd kopete-${pkgver} + # Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34. + rm -rv protocols/skype + sed 's/, Skype//' -i doc/index.docbook + cd .. + mkdir build +} + +build() { + cd build + cmake ../kopete-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DKDE4_BUILD_TESTS=OFF \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_SKIP_RPATH=ON \ + -DWITH_Libmsn=OFF \ + -DWITH_skype=OFF + make +} + +package() { + cd build + make DESTDIR=$pkgdir install +} diff --git a/libre/kdenetwork-kopete/kdenetwork-kopete.install b/libre/kdenetwork-kopete/kdenetwork-kopete.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/libre/kdenetwork-kopete/kdenetwork-kopete.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/kdenetwork-kopete/kdenetwork.install b/libre/kdenetwork-kopete/kdenetwork.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/libre/kdenetwork-kopete/kdenetwork.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD deleted file mode 100644 index 303b7b372..000000000 --- a/libre/kdeutils-ark-libre/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 217366 2014-07-18 11:50:35Z svenstaro $ -# Maintainer (Arch): Andrea Scarpino -# Maintainer: André Silva - -_pkgname=kdeutils-ark -pkgname=kdeutils-ark-libre -pkgver=4.14.0 -pkgrel=1 -pkgdesc='Archiving Tool, with unar support' -url='http://kde.org/applications/utilities/ark/' -arch=('i686' 'x86_64' 'mips64el') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeutils') -provides=("kdeutils-ark=$pkgver") -replaces=('kdeutils-ark') -conflicts=('kdeutils-ark') -depends=('kdebase-runtime' 'kdebase-lib' 'libarchive' 'qjson') -makedepends=('cmake' 'automoc4') -optdepends=('p7zip' 'zip' 'unzip' 'unar') -install=${_pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz" - 'ark-unar-06.patch') -sha1sums=('fc5d388ccedddfa1e68254b4de00186e93930669' - 'a0a836950f185d9b2245204579f969203036fdec') - -prepare() { - cd "${srcdir}/ark-${pkgver}" - # This patch will allow Ark to use The Unarchiver command line utilities (unar/lsar) to operate on RAR files, particularly RARv3. - patch -Np1 -i "${srcdir}/ark-unar-06.patch" -} - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../ark-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DKDE4_BUILD_TESTS=OFF \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd $srcdir/build - make DESTDIR=$pkgdir install -} diff --git a/libre/kdeutils-ark-libre/ark-unar-06.patch b/libre/kdeutils-ark-libre/ark-unar-06.patch deleted file mode 100644 index ab2ef274f..000000000 --- a/libre/kdeutils-ark-libre/ark-unar-06.patch +++ /dev/null @@ -1,236 +0,0 @@ -diff --git a/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.desktop b/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.desktop -new file mode 100644 -index 0000000..2b5bd9e ---- /dev/null -+++ b/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.desktop -@@ -0,0 +1,15 @@ -+[Desktop Entry] -+Type=Service -+X-KDE-ServiceTypes=Kerfuffle/Plugin -+X-KDE-Library=kerfuffle_cliunarchiver -+X-KDE-PluginInfo-Author=Luke Shumaker -+X-KDE-PluginInfo-Email=lukeshu@sbcglobal.net -+X-KDE-PluginInfo-Name= kerfuffle_cliunarchiver -+X-KDE-PluginInfo-Version=0.0.1 -+X-KDE-PluginInfo-Website=http://www.kde.org -+X-KDE-PluginInfo-License=GPLv2+ -+X-KDE-Priority=150 -+X-KDE-Kerfuffle-APIRevision=1 -+X-KDE-Kerfuffle-ReadWrite=false -+Name=The Unarchiver plugin -+MimeType=application/x-rar; -diff --git a/plugins/cliunarchiverplugin/cliplugin.cpp b/plugins/cliunarchiverplugin/cliplugin.cpp -new file mode 100644 -index 0000000..e0adcf7 ---- /dev/null -+++ b/plugins/cliunarchiverplugin/cliplugin.cpp -@@ -0,0 +1,170 @@ -+ /* -+ * ark -- archiver for the KDE project -+ * -+ * Copyright (C) 2011 Luke Shumaker -+ * -+ * 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 Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ * -+ */ -+ -+#include "kerfuffle/cliinterface.h" -+#include "kerfuffle/kerfuffle_export.h" -+ -+#include -+ -+#include -+#include -+#include -+#include -+#include -+ -+using namespace Kerfuffle; -+ -+class CliPlugin: public CliInterface -+{ -+public: -+ explicit CliPlugin(QObject *parent, const QVariantList & args) -+ : CliInterface(parent, args) { -+ m_indentLevel = 0; -+ } -+ -+ virtual ~CliPlugin() { -+ } -+ -+ virtual ParameterList parameterList() const { -+ static ParameterList p; -+ if (p.isEmpty()) { -+ /* Limitations: -+ * 01 - creates an empty file upon entering wrong password -+ * 02 - unar detects if output is being redirected and then does not accept any input -+ */ -+ -+ ///////////////[ COMMON ]///////////// -+ -+ p[CaptureProgress] = false; -+ p[PasswordPromptPattern] = QLatin1String("Password (will not be shown): "); -+ -+ ///////////////[ LIST ]///////////// -+ -+ p[ListProgram] = QLatin1String("lsar"); -+ p[ListArgs] = QStringList() << QLatin1String("-json") << QLatin1String("$Archive"); -+ -+ ///////////////[ EXTRACT ]///////////// -+ -+ p[ExtractProgram] = QLatin1String("unar"); -+ p[ExtractArgs] = QStringList() << QLatin1String("$Archive") << QLatin1String("$Files") << QLatin1String("$PasswordSwitch") << QLatin1String("$RootNodeSwitch"); -+ p[NoTrailingSlashes] = true; -+ p[PasswordSwitch] = QStringList() << QLatin1String("-password") << QLatin1String("$Password"); -+ p[RootNodeSwitch] = QStringList() << QLatin1String("-output-directory") << QLatin1String("$Path"); -+ p[FileExistsExpression] = QLatin1String("^\\\"(.+)\\\" already exists."); -+ p[FileExistsInput] = QStringList() -+ << QLatin1String("o") //overwrite -+ << QLatin1String("s") //skip -+ << QLatin1String("O") //overwrite all -+ << QLatin1String("S") //autoskip -+ << QLatin1String("q") //cancel -+ ; -+ -+ ///////////////[ DELETE ]///////////// -+ -+ p[DeleteProgram] = QLatin1String("x-fakeprogram"); -+ //p[DeleteArgs] = -+ -+ ///////////////[ ADD ]///////////// -+ -+ p[AddProgram] = QLatin1String("x-fakeprogram"); -+ //p[AddArgs] = -+ -+ ///////////////[ ERRORS ]///////////// -+ -+ p[ExtractionFailedPatterns] = QStringList() -+ << QLatin1String("Failed! \\((.+)\\)$") -+ << QLatin1String("Segmentation fault$"); -+ -+ p[WrongPasswordPatterns] = QStringList() -+ << QLatin1String("Failed! \\((.+)\\)$"); -+ } -+ return p; -+ } -+ -+ QString m_entryFilename, m_internalId; -+ ArchiveEntry m_currentEntry; -+ int m_indentLevel; -+ -+ bool readListLine(const QString &line) { -+ /* lsar will give us JSON output. However, we actually parse based on -+ * the indentation. Ugly, I know, but -+ * 1. It's easier -+ * 2. lsar's JSON is invalid JSON, so actual parsers bork. -+ */ -+ -+ int spaces; -+ for(spaces=0;(spacesm_indentLevel) { -+ if (m_newIndentLevel==3) { -+ m_currentEntry.clear(); -+ m_currentEntry[IsDirectory] = false; -+ } -+ } else if (m_newIndentLevel=3) ) { -+ EntryMetaDataType index = IsDirectory; -+ if (m_currentEntry[index].toBool()) { -+ m_currentEntry[FileName].toString().append(QLatin1String("/")); -+ } -+ kDebug() << "Added entry:" << m_currentEntry; -+ entry(m_currentEntry); -+ } -+ } -+ m_indentLevel = m_newIndentLevel; -+ -+ QRegExp rx(QLatin1String("^\\s*\"([^\"]*)\": (.*),$")); -+ if (rx.indexIn(line) >= 0) { -+ QRegExp rx_unquote(QLatin1String("^\"(.*)\"$")); -+ QString key = rx.cap(1); -+ QString value = rx.cap(2); -+ -+ if (false) { -+ } else if (key==QLatin1String("XADFileName")) { -+ rx_unquote.indexIn(value); -+ m_currentEntry[FileName] = m_currentEntry[InternalID] = rx_unquote.cap(1); -+ } else if (key==QLatin1String("XADFileSize")) { -+ m_currentEntry[Size] = value.toInt(); -+ } else if (key==QLatin1String("XADCompressedSize")) { -+ m_currentEntry[CompressedSize] = value.toInt(); -+ } else if (key==QLatin1String("XADLastModificationDate")) { -+ QDateTime ts(QDate::fromString(value, QLatin1String("\"YYYY-MM-DD hh:mm:ss"))); -+ m_currentEntry[Timestamp] = ts; -+ } else if (key==QLatin1String("XADIsDirectory")) { -+ m_currentEntry[IsDirectory] = (value==QLatin1String("1")); -+ } else if (key==QLatin1String("RARCRC32")) { -+ m_currentEntry[CRC] = value.toInt(); -+ } else if (key==QLatin1String("RARCompressionMethod")) { -+ m_currentEntry[Method] = value.toInt(); -+ } else if (key==QLatin1String("Encrypted")) { -+ m_currentEntry[IsPasswordProtected] = (value.toInt() != 0); -+ } -+ // TODO: add RAR version. ([Version]) -+ } -+ -+ return true; -+ } -+}; -+ -+KERFUFFLE_EXPORT_PLUGIN(CliPlugin) -+ -diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt -index 3619412..6368839 100644 ---- a/plugins/CMakeLists.txt -+++ b/plugins/CMakeLists.txt -@@ -20,6 +20,7 @@ if (LIBARCHIVE_FOUND) - endif (LIBARCHIVE_FOUND) - - add_subdirectory( clirarplugin ) -+add_subdirectory( cliunarchiverplugin ) - add_subdirectory( cli7zplugin ) - add_subdirectory( clizipplugin ) - add_subdirectory( libsinglefileplugin ) -diff --git a/plugins/cliunarchiverplugin/CMakeLists.txt b/plugins/cliunarchiverplugin/CMakeLists.txt -new file mode 100644 -index 0000000..ccd52e7 ---- /dev/null -+++ b/plugins/cliunarchiverplugin/CMakeLists.txt -@@ -0,0 +1,21 @@ -+ -+include_directories( -+ ${CMAKE_CURRENT_SOURCE_DIR}/../.. -+ ${CMAKE_CURRENT_BINARY_DIR}/../.. -+ ) -+ -+########### next target ############### -+ -+set(kerfuffle_cliunarchiver_SRCS cliplugin.cpp) -+ -+kde4_add_plugin(kerfuffle_cliunarchiver ${kerfuffle_cliunarchiver_SRCS}) -+ -+target_link_libraries(kerfuffle_cliunarchiver ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} kerfuffle ) -+ -+ -+ -+########### install files ############### -+ -+install(TARGETS kerfuffle_cliunarchiver DESTINATION ${PLUGIN_INSTALL_DIR} ) -+install( FILES kerfuffle_cliunarchiver.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -+ diff --git a/libre/kdeutils-ark-libre/kdeutils-ark.install b/libre/kdeutils-ark-libre/kdeutils-ark.install deleted file mode 100644 index 8a26818d8..000000000 --- a/libre/kdeutils-ark-libre/kdeutils-ark.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_update() { - post_install -} - -post_remove() { - post_install -} diff --git a/libre/kdeutils-ark/PKGBUILD b/libre/kdeutils-ark/PKGBUILD new file mode 100644 index 000000000..4810ac95c --- /dev/null +++ b/libre/kdeutils-ark/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 217366 2014-07-18 11:50:35Z svenstaro $ +# Maintainer (Arch): Andrea Scarpino +# Maintainer: André Silva + +pkgname=kdeutils-ark +pkgver=4.14.0 +pkgrel=1.parabola1 +pkgdesc='Archiving Tool, with unar support' +url='http://kde.org/applications/utilities/ark/' +arch=('i686' 'x86_64' 'mips64el') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeutils') +replaces=('kdeutils-ark-libre') +conflicts=('kdeutils-ark-libre') +depends=('kdebase-runtime' 'kdebase-lib' 'libarchive' 'qjson') +makedepends=('cmake' 'automoc4') +optdepends=('p7zip' 'zip' 'unzip' 'unar') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz" + 'ark-unar-06.patch') +sha1sums=('fc5d388ccedddfa1e68254b4de00186e93930669' + 'a0a836950f185d9b2245204579f969203036fdec') + +prepare() { + cd "${srcdir}/ark-${pkgver}" + # This patch will allow Ark to use The Unarchiver command line utilities (unar/lsar) to operate on RAR files, particularly RARv3. + patch -Np1 -i "${srcdir}/ark-unar-06.patch" +} + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../ark-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DKDE4_BUILD_TESTS=OFF \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install +} diff --git a/libre/kdeutils-ark/ark-unar-06.patch b/libre/kdeutils-ark/ark-unar-06.patch new file mode 100644 index 000000000..ab2ef274f --- /dev/null +++ b/libre/kdeutils-ark/ark-unar-06.patch @@ -0,0 +1,236 @@ +diff --git a/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.desktop b/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.desktop +new file mode 100644 +index 0000000..2b5bd9e +--- /dev/null ++++ b/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.desktop +@@ -0,0 +1,15 @@ ++[Desktop Entry] ++Type=Service ++X-KDE-ServiceTypes=Kerfuffle/Plugin ++X-KDE-Library=kerfuffle_cliunarchiver ++X-KDE-PluginInfo-Author=Luke Shumaker ++X-KDE-PluginInfo-Email=lukeshu@sbcglobal.net ++X-KDE-PluginInfo-Name= kerfuffle_cliunarchiver ++X-KDE-PluginInfo-Version=0.0.1 ++X-KDE-PluginInfo-Website=http://www.kde.org ++X-KDE-PluginInfo-License=GPLv2+ ++X-KDE-Priority=150 ++X-KDE-Kerfuffle-APIRevision=1 ++X-KDE-Kerfuffle-ReadWrite=false ++Name=The Unarchiver plugin ++MimeType=application/x-rar; +diff --git a/plugins/cliunarchiverplugin/cliplugin.cpp b/plugins/cliunarchiverplugin/cliplugin.cpp +new file mode 100644 +index 0000000..e0adcf7 +--- /dev/null ++++ b/plugins/cliunarchiverplugin/cliplugin.cpp +@@ -0,0 +1,170 @@ ++ /* ++ * ark -- archiver for the KDE project ++ * ++ * Copyright (C) 2011 Luke Shumaker ++ * ++ * 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 Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ */ ++ ++#include "kerfuffle/cliinterface.h" ++#include "kerfuffle/kerfuffle_export.h" ++ ++#include ++ ++#include ++#include ++#include ++#include ++#include ++ ++using namespace Kerfuffle; ++ ++class CliPlugin: public CliInterface ++{ ++public: ++ explicit CliPlugin(QObject *parent, const QVariantList & args) ++ : CliInterface(parent, args) { ++ m_indentLevel = 0; ++ } ++ ++ virtual ~CliPlugin() { ++ } ++ ++ virtual ParameterList parameterList() const { ++ static ParameterList p; ++ if (p.isEmpty()) { ++ /* Limitations: ++ * 01 - creates an empty file upon entering wrong password ++ * 02 - unar detects if output is being redirected and then does not accept any input ++ */ ++ ++ ///////////////[ COMMON ]///////////// ++ ++ p[CaptureProgress] = false; ++ p[PasswordPromptPattern] = QLatin1String("Password (will not be shown): "); ++ ++ ///////////////[ LIST ]///////////// ++ ++ p[ListProgram] = QLatin1String("lsar"); ++ p[ListArgs] = QStringList() << QLatin1String("-json") << QLatin1String("$Archive"); ++ ++ ///////////////[ EXTRACT ]///////////// ++ ++ p[ExtractProgram] = QLatin1String("unar"); ++ p[ExtractArgs] = QStringList() << QLatin1String("$Archive") << QLatin1String("$Files") << QLatin1String("$PasswordSwitch") << QLatin1String("$RootNodeSwitch"); ++ p[NoTrailingSlashes] = true; ++ p[PasswordSwitch] = QStringList() << QLatin1String("-password") << QLatin1String("$Password"); ++ p[RootNodeSwitch] = QStringList() << QLatin1String("-output-directory") << QLatin1String("$Path"); ++ p[FileExistsExpression] = QLatin1String("^\\\"(.+)\\\" already exists."); ++ p[FileExistsInput] = QStringList() ++ << QLatin1String("o") //overwrite ++ << QLatin1String("s") //skip ++ << QLatin1String("O") //overwrite all ++ << QLatin1String("S") //autoskip ++ << QLatin1String("q") //cancel ++ ; ++ ++ ///////////////[ DELETE ]///////////// ++ ++ p[DeleteProgram] = QLatin1String("x-fakeprogram"); ++ //p[DeleteArgs] = ++ ++ ///////////////[ ADD ]///////////// ++ ++ p[AddProgram] = QLatin1String("x-fakeprogram"); ++ //p[AddArgs] = ++ ++ ///////////////[ ERRORS ]///////////// ++ ++ p[ExtractionFailedPatterns] = QStringList() ++ << QLatin1String("Failed! \\((.+)\\)$") ++ << QLatin1String("Segmentation fault$"); ++ ++ p[WrongPasswordPatterns] = QStringList() ++ << QLatin1String("Failed! \\((.+)\\)$"); ++ } ++ return p; ++ } ++ ++ QString m_entryFilename, m_internalId; ++ ArchiveEntry m_currentEntry; ++ int m_indentLevel; ++ ++ bool readListLine(const QString &line) { ++ /* lsar will give us JSON output. However, we actually parse based on ++ * the indentation. Ugly, I know, but ++ * 1. It's easier ++ * 2. lsar's JSON is invalid JSON, so actual parsers bork. ++ */ ++ ++ int spaces; ++ for(spaces=0;(spacesm_indentLevel) { ++ if (m_newIndentLevel==3) { ++ m_currentEntry.clear(); ++ m_currentEntry[IsDirectory] = false; ++ } ++ } else if (m_newIndentLevel=3) ) { ++ EntryMetaDataType index = IsDirectory; ++ if (m_currentEntry[index].toBool()) { ++ m_currentEntry[FileName].toString().append(QLatin1String("/")); ++ } ++ kDebug() << "Added entry:" << m_currentEntry; ++ entry(m_currentEntry); ++ } ++ } ++ m_indentLevel = m_newIndentLevel; ++ ++ QRegExp rx(QLatin1String("^\\s*\"([^\"]*)\": (.*),$")); ++ if (rx.indexIn(line) >= 0) { ++ QRegExp rx_unquote(QLatin1String("^\"(.*)\"$")); ++ QString key = rx.cap(1); ++ QString value = rx.cap(2); ++ ++ if (false) { ++ } else if (key==QLatin1String("XADFileName")) { ++ rx_unquote.indexIn(value); ++ m_currentEntry[FileName] = m_currentEntry[InternalID] = rx_unquote.cap(1); ++ } else if (key==QLatin1String("XADFileSize")) { ++ m_currentEntry[Size] = value.toInt(); ++ } else if (key==QLatin1String("XADCompressedSize")) { ++ m_currentEntry[CompressedSize] = value.toInt(); ++ } else if (key==QLatin1String("XADLastModificationDate")) { ++ QDateTime ts(QDate::fromString(value, QLatin1String("\"YYYY-MM-DD hh:mm:ss"))); ++ m_currentEntry[Timestamp] = ts; ++ } else if (key==QLatin1String("XADIsDirectory")) { ++ m_currentEntry[IsDirectory] = (value==QLatin1String("1")); ++ } else if (key==QLatin1String("RARCRC32")) { ++ m_currentEntry[CRC] = value.toInt(); ++ } else if (key==QLatin1String("RARCompressionMethod")) { ++ m_currentEntry[Method] = value.toInt(); ++ } else if (key==QLatin1String("Encrypted")) { ++ m_currentEntry[IsPasswordProtected] = (value.toInt() != 0); ++ } ++ // TODO: add RAR version. ([Version]) ++ } ++ ++ return true; ++ } ++}; ++ ++KERFUFFLE_EXPORT_PLUGIN(CliPlugin) ++ +diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt +index 3619412..6368839 100644 +--- a/plugins/CMakeLists.txt ++++ b/plugins/CMakeLists.txt +@@ -20,6 +20,7 @@ if (LIBARCHIVE_FOUND) + endif (LIBARCHIVE_FOUND) + + add_subdirectory( clirarplugin ) ++add_subdirectory( cliunarchiverplugin ) + add_subdirectory( cli7zplugin ) + add_subdirectory( clizipplugin ) + add_subdirectory( libsinglefileplugin ) +diff --git a/plugins/cliunarchiverplugin/CMakeLists.txt b/plugins/cliunarchiverplugin/CMakeLists.txt +new file mode 100644 +index 0000000..ccd52e7 +--- /dev/null ++++ b/plugins/cliunarchiverplugin/CMakeLists.txt +@@ -0,0 +1,21 @@ ++ ++include_directories( ++ ${CMAKE_CURRENT_SOURCE_DIR}/../.. ++ ${CMAKE_CURRENT_BINARY_DIR}/../.. ++ ) ++ ++########### next target ############### ++ ++set(kerfuffle_cliunarchiver_SRCS cliplugin.cpp) ++ ++kde4_add_plugin(kerfuffle_cliunarchiver ${kerfuffle_cliunarchiver_SRCS}) ++ ++target_link_libraries(kerfuffle_cliunarchiver ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} kerfuffle ) ++ ++ ++ ++########### install files ############### ++ ++install(TARGETS kerfuffle_cliunarchiver DESTINATION ${PLUGIN_INSTALL_DIR} ) ++install( FILES kerfuffle_cliunarchiver.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) ++ diff --git a/libre/kdeutils-ark/kdeutils-ark.install b/libre/kdeutils-ark/kdeutils-ark.install new file mode 100644 index 000000000..8a26818d8 --- /dev/null +++ b/libre/kdeutils-ark/kdeutils-ark.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_update() { + post_install +} + +post_remove() { + post_install +} diff --git a/nonprism/kde-meta-nonprism/PKGBUILD b/nonprism/kde-meta-nonprism/PKGBUILD deleted file mode 100644 index 71ae7d6c6..000000000 --- a/nonprism/kde-meta-nonprism/PKGBUILD +++ /dev/null @@ -1,115 +0,0 @@ -# $Id: PKGBUILD 208325 2014-03-21 13:57:48Z andrea $ -# Contributor (Arch): Andrea Scarpino -# Contributor (Arch): Pierre Schmitz -# Maintainer: André Silva - -pkgbase=kde-meta -pkgname=('kde-meta-kdepim-nonprism' - 'kde-meta-kdeplasma-addons-nonprism') -pkgver=4.13 -pkgrel=3.1 -arch=('any') -url='http://parabolagnulinux.org/' -license=('GPL') -groups=('kde-meta') - -package_kde-meta-kdepim-nonprism() { - pkgdesc=('Meta package for kdepim, with nonprism packages included and kdepim-blogilo removed') - depends=('kdepim-akonadiconsole-nonprism' - 'kdepim-akregator' - 'kdepim-console' - 'kdepim-kaddressbook-nonprism' - 'kdepim-kalarm' - 'kdepim-kjots-nonprism' - 'kdepim-kleopatra' - 'kdepim-kmail-nonprism' - 'kdepim-knode-nonprism' - 'kdepim-knotes-nonprism' - 'kdepim-kontact' - 'kdepim-korganizer-nonprism' - 'kdepim-kresources' - 'kdepim-ktimetracker' - 'kdepim-ktnef') - replaces=('kdepim' 'kde-meta-kdepim') - conflicts=('kdepim' 'kde-meta-kdepim') - provides=(kde-meta-kdepim=$pkgver) -} - -package_kde-meta-kdeplasma-addons-nonprism() { - pkgdesc=('Meta package for kdeplasma-addons, without kdeplasma-addons-runners-translator') - depends=('kdeplasma-addons-applets-bball' - 'kdeplasma-addons-applets-binary-clock' - 'kdeplasma-addons-applets-blackboard' - 'kdeplasma-addons-applets-bookmarks' - 'kdeplasma-addons-applets-bubblemon' - 'kdeplasma-addons-applets-calculator' - 'kdeplasma-addons-applets-charselect' - 'kdeplasma-addons-applets-comic' - 'kdeplasma-addons-applets-community' - 'kdeplasma-addons-applets-dict' - 'kdeplasma-addons-applets-eyes' - 'kdeplasma-addons-applets-fifteenpuzzle' - 'kdeplasma-addons-applets-filewatcher' - 'kdeplasma-addons-applets-frame' - 'kdeplasma-addons-applets-fuzzy-clock' - 'kdeplasma-addons-applets-icontasks' - 'kdeplasma-addons-applets-incomingmsg' - 'kdeplasma-addons-applets-kimpanel' - 'kdeplasma-addons-applets-knowledgebase' - 'kdeplasma-addons-applets-kolourpicker' - 'kdeplasma-addons-applets-konqprofiles' - 'kdeplasma-addons-applets-konsoleprofiles' - 'kdeplasma-addons-applets-lancelot' - 'kdeplasma-addons-applets-leavenote' - 'kdeplasma-addons-applets-life' - 'kdeplasma-addons-applets-luna' - 'kdeplasma-addons-applets-magnifique' - 'kdeplasma-addons-applets-mediaplayer' - 'kdeplasma-addons-applets-microblog' - 'kdeplasma-addons-applets-news' - 'kdeplasma-addons-applets-notes' - 'kdeplasma-addons-applets-nowplaying' - 'kdeplasma-addons-applets-paste' - 'kdeplasma-addons-applets-pastebin' - 'kdeplasma-addons-applets-plasmaboard' - 'kdeplasma-addons-applets-previewer' - 'kdeplasma-addons-applets-qalculate' - 'kdeplasma-addons-applets-rememberthemilk' - 'kdeplasma-addons-applets-rssnow' - 'kdeplasma-addons-applets-showdashboard' - 'kdeplasma-addons-applets-showdesktop' - 'kdeplasma-addons-applets-social-news' - 'kdeplasma-addons-applets-spellcheck' - 'kdeplasma-addons-applets-systemloadviewer' - 'kdeplasma-addons-applets-timer' - 'kdeplasma-addons-applets-unitconverter' - 'kdeplasma-addons-applets-weather' - 'kdeplasma-addons-applets-weatherstation' - 'kdeplasma-addons-applets-webslice' - 'kdeplasma-addons-containments' - 'kdeplasma-addons-runners-audioplayercontrol' - 'kdeplasma-addons-runners-browserhistory' - 'kdeplasma-addons-runners-characters' - 'kdeplasma-addons-runners-contacts' - 'kdeplasma-addons-runners-converter' - 'kdeplasma-addons-runners-datetime' - 'kdeplasma-addons-runners-dictionary' - 'kdeplasma-addons-runners-events' - 'kdeplasma-addons-runners-katesessions' - 'kdeplasma-addons-runners-konquerorsessions' - 'kdeplasma-addons-runners-konsolesessions' - 'kdeplasma-addons-runners-kopete' - 'kdeplasma-addons-runners-mediawiki' - 'kdeplasma-addons-runners-spellchecker' - 'kdeplasma-addons-runners-youtube' - 'kdeplasma-addons-wallpapers-mandelbrot' - 'kdeplasma-addons-wallpapers-marble' - 'kdeplasma-addons-wallpapers-pattern' - 'kdeplasma-addons-wallpapers-potd' - 'kdeplasma-addons-wallpapers-qmlwallpapers' - 'kdeplasma-addons-wallpapers-virus' - 'kdeplasma-addons-wallpapers-weather') - replaces=('kdeplasma-addons' 'kde-meta-kdeplasma-addons') - conflicts=('kdeplasma-addons' 'kde-meta-kdeplasma-addons') - provides=(kde-meta-kdeplasma-addons=$pkgver) -} diff --git a/nonprism/kde-meta/PKGBUILD b/nonprism/kde-meta/PKGBUILD new file mode 100644 index 000000000..96419a7cb --- /dev/null +++ b/nonprism/kde-meta/PKGBUILD @@ -0,0 +1,113 @@ +# $Id: PKGBUILD 208325 2014-03-21 13:57:48Z andrea $ +# Contributor (Arch): Andrea Scarpino +# Contributor (Arch): Pierre Schmitz +# Maintainer: André Silva + +pkgbase=kde-meta +pkgname=('kde-meta-kdepim' + 'kde-meta-kdeplasma-addons') +pkgver=4.13 +pkgrel=3.nonprism1 +arch=('any') +url='http://parabolagnulinux.org/' +license=('GPL') +groups=('kde-meta') + +package_kde-meta-kdepim() { + pkgdesc=('Meta package for kdepim, without kdepim-blogilo') + depends=('kdepim-akonadiconsole' + 'kdepim-akregator' + 'kdepim-console' + 'kdepim-kaddressbook' + 'kdepim-kalarm' + 'kdepim-kjots' + 'kdepim-kleopatra' + 'kdepim-kmail' + 'kdepim-knode' + 'kdepim-knotes' + 'kdepim-kontact' + 'kdepim-korganizer' + 'kdepim-kresources' + 'kdepim-ktimetracker' + 'kdepim-ktnef') + replaces=('kdepim' 'kde-meta-kdepim-nonprism') + conflicts=('kdepim' 'kde-meta-kdepim-nonprism') +} + +package_kde-meta-kdeplasma-addons() { + pkgdesc=('Meta package for kdeplasma-addons, without kdeplasma-addons-runners-translator') + depends=('kdeplasma-addons-applets-bball' + 'kdeplasma-addons-applets-binary-clock' + 'kdeplasma-addons-applets-blackboard' + 'kdeplasma-addons-applets-bookmarks' + 'kdeplasma-addons-applets-bubblemon' + 'kdeplasma-addons-applets-calculator' + 'kdeplasma-addons-applets-charselect' + 'kdeplasma-addons-applets-comic' + 'kdeplasma-addons-applets-community' + 'kdeplasma-addons-applets-dict' + 'kdeplasma-addons-applets-eyes' + 'kdeplasma-addons-applets-fifteenpuzzle' + 'kdeplasma-addons-applets-filewatcher' + 'kdeplasma-addons-applets-frame' + 'kdeplasma-addons-applets-fuzzy-clock' + 'kdeplasma-addons-applets-icontasks' + 'kdeplasma-addons-applets-incomingmsg' + 'kdeplasma-addons-applets-kimpanel' + 'kdeplasma-addons-applets-knowledgebase' + 'kdeplasma-addons-applets-kolourpicker' + 'kdeplasma-addons-applets-konqprofiles' + 'kdeplasma-addons-applets-konsoleprofiles' + 'kdeplasma-addons-applets-lancelot' + 'kdeplasma-addons-applets-leavenote' + 'kdeplasma-addons-applets-life' + 'kdeplasma-addons-applets-luna' + 'kdeplasma-addons-applets-magnifique' + 'kdeplasma-addons-applets-mediaplayer' + 'kdeplasma-addons-applets-microblog' + 'kdeplasma-addons-applets-news' + 'kdeplasma-addons-applets-notes' + 'kdeplasma-addons-applets-nowplaying' + 'kdeplasma-addons-applets-paste' + 'kdeplasma-addons-applets-pastebin' + 'kdeplasma-addons-applets-plasmaboard' + 'kdeplasma-addons-applets-previewer' + 'kdeplasma-addons-applets-qalculate' + 'kdeplasma-addons-applets-rememberthemilk' + 'kdeplasma-addons-applets-rssnow' + 'kdeplasma-addons-applets-showdashboard' + 'kdeplasma-addons-applets-showdesktop' + 'kdeplasma-addons-applets-social-news' + 'kdeplasma-addons-applets-spellcheck' + 'kdeplasma-addons-applets-systemloadviewer' + 'kdeplasma-addons-applets-timer' + 'kdeplasma-addons-applets-unitconverter' + 'kdeplasma-addons-applets-weather' + 'kdeplasma-addons-applets-weatherstation' + 'kdeplasma-addons-applets-webslice' + 'kdeplasma-addons-containments' + 'kdeplasma-addons-runners-audioplayercontrol' + 'kdeplasma-addons-runners-browserhistory' + 'kdeplasma-addons-runners-characters' + 'kdeplasma-addons-runners-contacts' + 'kdeplasma-addons-runners-converter' + 'kdeplasma-addons-runners-datetime' + 'kdeplasma-addons-runners-dictionary' + 'kdeplasma-addons-runners-events' + 'kdeplasma-addons-runners-katesessions' + 'kdeplasma-addons-runners-konquerorsessions' + 'kdeplasma-addons-runners-konsolesessions' + 'kdeplasma-addons-runners-kopete' + 'kdeplasma-addons-runners-mediawiki' + 'kdeplasma-addons-runners-spellchecker' + 'kdeplasma-addons-runners-youtube' + 'kdeplasma-addons-wallpapers-mandelbrot' + 'kdeplasma-addons-wallpapers-marble' + 'kdeplasma-addons-wallpapers-pattern' + 'kdeplasma-addons-wallpapers-potd' + 'kdeplasma-addons-wallpapers-qmlwallpapers' + 'kdeplasma-addons-wallpapers-virus' + 'kdeplasma-addons-wallpapers-weather') + replaces=('kdeplasma-addons' 'kde-meta-kdeplasma-addons-nonprism') + conflicts=('kdeplasma-addons' 'kde-meta-kdeplasma-addons-nonprism') +} diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD deleted file mode 100644 index 60af2de58..000000000 --- a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD +++ /dev/null @@ -1,68 +0,0 @@ -# $Id: PKGBUILD 217314 2014-07-18 11:45:55Z svenstaro $ -# Maintainer (Arch): Andrea Scarpino -# Maintainer: André Silva - -_pkgname=kdenetwork-kopete -pkgname=kdenetwork-kopete-libre-nonprism -pkgver=4.14.0 -pkgrel=1 -pkgdesc='Instant Messenger, without nonfree Skype support and support for unsafe and dangerous for privacy protocols' -url='http://kde.org/applications/internet/kopete/' -arch=('i686' 'x86_64' 'mips64el') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdenetwork') -replaces=($_pkgname) -conflicts=($_pkgname) -provides=($_pkgname=$pkgver) -depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libidn' - 'qimageblitz' 'mediastreamer' 'jsoncpp') -makedepends=('cmake' 'automoc4' 'boost' 'kdepim-libkdepim') -install=${_pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz" - 'libre-nonprism.patch') -sha1sums=('bd247af3b25650bedcdb983fc285469dcacea964' - 'ddde6ed0b6f281512dc12cb80f712f33c6932c92') - -prepare() { - cd kopete-${pkgver} - # Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34. - rm -rv protocols/skype - # remove unsafe/dangerous services - rm -rv protocols/oscar - rm -rv protocols/yahoo - rm -rv protocols/qq - rm -rv protocols/groupwise - rm -rv protocols/gadu - rm -rv protocols/wlm - rm -rv protocols/meanwhile - patch -p1 -i "${srcdir}"/libre-nonprism.patch - cd .. - mkdir build -} - -build() { - cd build - cmake ../kopete-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DKDE4_BUILD_TESTS=OFF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_SKIP_RPATH=ON \ - -DWITH_Libmsn=OFF \ - -DWITH_Libgadu=OFF \ - -DWITH_skype=OFF \ - -DWITH_oscar=OFF \ - -DWITH_yahoo=OFF \ - -DWITH_qq=OFF \ - -DWITH_groupwise=OFF \ - -DWITH_gadu=OFF \ - -DWITH_GOOGLETALK=OFF \ - -DWITH_wlm=OFF \ - -DWITH_WLM_MEDIASTREAMER=OFF \ - -DWITH_meanwhile=OFF - make -} - -package() { - cd build - make DESTDIR=$pkgdir install -} diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork-kopete.install b/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork-kopete.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork-kopete.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/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork.install b/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork.install deleted file mode 100644 index e70c054ec..000000000 --- a/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch b/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch deleted file mode 100644 index 6d73766cc..000000000 --- a/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch +++ /dev/null @@ -1,110 +0,0 @@ -diff --git a/doc/index.docbook b/doc/index.docbook -index b55fd88..416de49 100644 ---- a/doc/index.docbook -+++ b/doc/index.docbook -@@ -24,7 +24,6 @@ - - - -- - ]> -