Sun Jan 6 01:07:49 PST 2013

9 files changed, 268 insertions, 37 deletions

diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD
index 26b14ff86..91d74ba15 100644
--- a/libre/kdebase-konqueror-libre/PKGBUILD
+++ b/libre/kdebase-konqueror-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 172988 2012-12-08 05:56:10Z andrea $
+# $Id: PKGBUILD 174142 2013-01-02 15:56:20Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
@@ -6,18 +6,16 @@
 
 _pkgname='kdebase-konqueror'
 pkgname='kdebase-konqueror-libre'
-pkgver=4.9.4
-pkgrel=2
+pkgver=4.9.5
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kde.org/applications/internet/konqueror/"
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdebase')
 makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml')
 source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz"
-        'kde-baseapps-4.9.4-fix-bugs-311206-311246.diff'
     	"konq-about-fsdg.diff")
-sha1sums=('b68e76766331272a45b1d897adf4c1928a11e747'
-          '998f1db2309744dd2c054aec3462a717bc107c2e'
+sha1sums=('67d1c2c83570aac1d3c026cdecd82833e8d8b568'
           'd6cbb53c04179b8180f9439eca156b7ff2e76b3a')
 pkgdesc='KDE File Manager & Web Browser (without Google and nonfree software recommendation)'
 depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
@@ -29,12 +27,11 @@ provides=("kdebase-konqueror=$pkgver")
 
 build() {
     cd kde-baseapps-${pkgver}
-    patch -p1 -i "${srcdir}"/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff
 
     # Don't recommend nonfree software or Google.
     patch -Np1 -i "${srcdir}/konq-about-fsdg.diff"
 
-    cd ../
+    cd ..
 
 	mkdir build
 	cd build
diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD
index 75c9a87da..20219e40a 100644
--- a/libre/kdebase-runtime-libre/PKGBUILD
+++ b/libre/kdebase-runtime-libre/PKGBUILD
@@ -5,7 +5,7 @@
 
 _pkgname=kdebase-runtime
 pkgname=kdebase-runtime-libre
-pkgver=4.9.4
+pkgver=4.9.5
 pkgrel=1
 pkgdesc="Plugins and applications necessary for the running of KDE applications (without non-privacy search providers)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -26,7 +26,7 @@ install="${_pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz"
         'duckduckgo_html.desktop'
         'duckduckgo_lite.desktop')
-sha1sums=('8988c3684c05efc676d1bfe454480f60d75fac3b'
+sha1sums=('6e2abeb8cc2d40d248dfabd49da264ac375fe6b5'
           'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd'
           'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b')
 
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index 154da73f3..e73cc2f36 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 173890 2012-12-27 10:10:17Z andrea $
+# $Id: PKGBUILD 174033 2013-01-02 10:59:35Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=kdelibs
 pkgname=kdelibs-libre
-pkgver=4.9.4
-pkgrel=4
+pkgver=4.9.5
+pkgrel=1
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -23,13 +23,9 @@ conflicts=('kdelibs')
 install=${_pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
         'kde-applications-menu.patch'
-        '0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch'
-        'fix-crash-on-open-with.patch'
         'khtml-fsdg.diff')
-sha1sums=('b2fe70261207a96a26b5d8789379f134e3e070be'
+sha1sums=('899a58c5cf2115a1a18fb1690c99b2b3815975c6'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          'f5d203932f67ab6d87c794e9cb78a3b1a22ef747'
-          '8faa5984ba37e9c6da04bc64f1fe21cd24f1cf07'
           'a1502a964081ad583a00cf90c56e74bf60121830')
 
 build() {
@@ -37,11 +33,6 @@ build() {
 
        # avoid file conflict with gnome-menus
        patch -p1 -i "${srcdir}"/kde-applications-menu.patch
-
-       # Fixed upstream
-       patch -p1 -i "${srcdir}"/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
-       patch -p1 -i "${srcdir}"/fix-crash-on-open-with.patch
-       
        # Don't ask the user to download a plugin, it's probably nonfree.
        patch -p1 -i "${srcdir}"/khtml-fsdg.diff
 
diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD
index 3ff2a4205..8fea1b1c3 100644
--- a/libre/kdenetwork-kopete-libre/PKGBUILD
+++ b/libre/kdenetwork-kopete-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 172278 2012-12-02 07:47:19Z andrea $
+# $Id: PKGBUILD 174113 2013-01-02 11:04:46Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgbase=kdenetwork
 pkgname=('kdenetwork-kopete-libre')
-pkgver=4.9.4
+pkgver=4.9.5
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -17,7 +17,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp'
     'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
         'use-libotr3.patch')
-sha1sums=('1541bfd584fc86e29782dbfdbb94c2b183a2bd48'
+sha1sums=('26a607742b83211575802781b287f6f7f1c3ebbc'
           '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384')
 
 build() {
diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD
index 9f90eb367..af28566e8 100644
--- a/libre/kdepim-libre/PKGBUILD
+++ b/libre/kdepim-libre/PKGBUILD
@@ -22,7 +22,7 @@ pkgname=('kdepim-akonadiconsole-libre'
          'kdepim-ktimetracker-libre'
          'kdepim-ktnef-libre'
          'kdepim-libkdepim-libre')
-pkgver=4.9.4
+pkgver=4.9.5
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://pim.kde.org'
@@ -30,7 +30,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdepim-libre')
 makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'kde-agent')
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz")
-sha1sums=('f383306430705ff2af14518b9be90448bf857398')
+sha1sums=('a0d824dbb132cad8178767cfd881da2979ab399d')
 
 build() {
 	mkdir build
diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD
index 20ac66607..d6a1cc01e 100644
--- a/libre/kdeutils-ark-libre/PKGBUILD
+++ b/libre/kdeutils-ark-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 172283 2012-12-02 07:47:38Z andrea $
+# $Id: PKGBUILD 174118 2013-01-02 11:05:08Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=kdeutils-ark
 pkgname=kdeutils-ark-libre
-pkgver=4.9.4
+pkgver=4.9.5
 pkgrel=1
 pkgdesc='Archiving Tool'
 url='http://kde.org/applications/utilities/ark/'
@@ -18,11 +18,18 @@ install=${_pkgname}.install
 provides=("kdeutils-ark=$pkgver")
 replaces=('kdeutils-ark')
 conflicts=('kdeutils-ark')
-source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz")
-sha1sums=('074aece141ec229b5d72b39e4d31af4e5b4550cb')
+source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz"
+        'ark-unar-06.patch')
+sha1sums=('71018a85d489af1e119d2454d9b4e3166f63455c'
+          'a0a836950f185d9b2245204579f969203036fdec')
 
 build() {
-  cd "${srcdir}"
+  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"
+  
+  cd ..
   mkdir build
   cd build
   cmake ../ark-${pkgver} \
diff --git a/libre/kdeutils-ark-libre/ark-unar-06.patch b/libre/kdeutils-ark-libre/ark-unar-06.patch
new file mode 100644
index 000000000..ab2ef274f
--- /dev/null
+++ b/libre/kdeutils-ark-libre/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 <lukeshu@sbcglobal.net>
++ *
++ * 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 <KDebug>
++
++#include <QDateTime>
++#include <QDir>
++#include <QRegExp>
++#include <QString>
++#include <QStringList>
++
++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;(spaces<line.size())&&(line[spaces]==QLatin1Char(' '));spaces++){}
++        // Since this is so ugly anyway, I'm not even going to check to
++        // make sure that spaces is even.  I mean, what would I do about it?
++        int m_newIndentLevel = spaces/2;
++
++        if (m_newIndentLevel>m_indentLevel) {
++            if (m_newIndentLevel==3) {
++                m_currentEntry.clear();
++                m_currentEntry[IsDirectory] = false;
++            }
++        } else if (m_newIndentLevel<m_indentLevel) {
++            if ( (m_newIndentLevel<3) && (m_indentLevel>=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/unar/PKGBUILD b/libre/unar/PKGBUILD
index e1664e809..85366a600 100755
--- a/libre/unar/PKGBUILD
+++ b/libre/unar/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: N30N <archlinux@alunamation.com>
 
 pkgname=unar
-pkgver=1.4
+pkgver=1.5
 pkgrel=1
 pkgdesc="An Objective-C application for uncompressing archive files"
 arch=('x86_64' 'i686' 'mips64el')
@@ -38,5 +38,5 @@ package() {
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('ae5233dd835229f867f0948d28dde0d6'
+md5sums=('d493957a56844ef9c1ad7b7dd24571fc'
          '4fa4ecc6e4ba14d3b6952d064e728511')
diff --git a/libre/ununrar/PKGBUILD b/libre/ununrar/PKGBUILD
index 2e5aa615c..e4ac77b11 100644
--- a/libre/ununrar/PKGBUILD
+++ b/libre/ununrar/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Michał Masłowski  <mtjm@mtjm.eu>
 
 pkgname=ununrar
-pkgver=0.0a0dev20120412
+pkgver=0.0a0dev20130105
 pkgrel=1
 pkgdesc="An unrar-compatible interface to Unarchiver"
 arch=('any')
@@ -12,7 +12,7 @@ provides=('unrar' 'unrar-libre')
 conflicts=('unrar' 'unrar-libre')
 options=(!emptydirs)
 source=("http://mtjm.eu/releases/Ununrar-${pkgver}.tar.gz")
-sha512sums=('3593198e76643b8873d06db770bf24a8d2fdab6d2ab7880850e29cb6c2f94836bcc032f6cc919dfe39deb030c2bcd942ab870231def3aee14e8e89cf78fc3d6f')
+sha512sums=('d8872d529b8e813b44f353f2958712c7e602776810ed51c6de7b6364e024cde9058e724569f83445a324edf41ca25757f3d94d67018ba18e3db027a9ee6c9200')
 
 package() {
   cd "$srcdir/Ununrar-$pkgver"