Tue Feb 12 00:04:33 PST 2013

5 files changed, 73 insertions, 105 deletions

diff --git a/extra/fbida/PKGBUILD b/extra/fbida/PKGBUILD
index bab0074f8..c77f7107f 100644
--- a/extra/fbida/PKGBUILD
+++ b/extra/fbida/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 148710 2012-02-05 11:47:47Z ibiru $
+# $Id: PKGBUILD 177938 2013-02-11 19:29:44Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=fbida
-pkgver=2.08
-pkgrel=2
+pkgver=2.09
+pkgrel=1
 pkgdesc="Few applications to display and elementary edit images: fbi, fbgs, ida, exiftran"
 arch=('i686' 'x86_64')
 url="http://www.kraxel.org/blog/linux/fbida/"
@@ -11,9 +11,9 @@ license=('GPL2')
 depends=('giflib' 'libtiff' 'libexif' 'lesstif' 'libpng' 'fontconfig' 'curl')
 makedepends=('libxpm')
 optdepends=('ghostscript: to use fbgs')
-source=(http://www.kraxel.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('9b3693ab26a58194e36b479bffb61ed0')
-sha1sums=('597e0953c68112bf7c363b1ccaa94e72100b116a')
+source=(http://www.kraxel.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc})
+sha1sums=('5838b2cb7188481fece6159fccb3b121acd906e7'
+          '18f5660301201326bd9426ce55e9fc217bf720d8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -23,5 +23,5 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" prefix=/usr install
+  make STRIP="" DESTDIR="${pkgdir}" prefix=/usr install
 }
diff --git a/extra/fluxbox/PKGBUILD b/extra/fluxbox/PKGBUILD
index 6f832a720..1f3bec017 100644
--- a/extra/fluxbox/PKGBUILD
+++ b/extra/fluxbox/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 177083 2013-02-06 03:07:57Z eric $
+# $Id: PKGBUILD 177926 2013-02-11 02:54:48Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=fluxbox
-pkgver=1.3.3
-pkgrel=2
+pkgver=1.3.4
+pkgrel=1
 pkgdesc="A lightweight and highly-configurable window manager"
 arch=('i686' 'x86_64')
 url="http://www.fluxbox.org"
@@ -12,14 +12,12 @@ depends=('libxft' 'libxpm' 'libxinerama' 'libxrandr' 'gcc-libs' 'imlib2' 'fribid
 optdepends=('xorg-xmessage: for using the fbsetbg and fluxbox-generate_menu utilities')
 options=('!makeflags')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.lzma \
-        fluxbox.desktop fluxbox-fix_timer.diff)
-sha1sums=('6892259dd495424291194fde242230cca95abce3'
-          'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8'
-          'bc10368d7a157f83428897e2b7aced7ce620dec3')
+        fluxbox.desktop)
+sha1sums=('8a4f0d79238609523e1127808d9d2eab15030ea0'
+          'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/fluxbox-fix_timer.diff"
   ./configure --prefix=/usr \
     --enable-xft --enable-xinerama \
     --enable-imlib2 --enable-nls
diff --git a/extra/fluxbox/fluxbox-fix_timer.diff b/extra/fluxbox/fluxbox-fix_timer.diff
deleted file mode 100644
index dceb1043b..000000000
--- a/extra/fluxbox/fluxbox-fix_timer.diff
+++ /dev/null
@@ -1,78 +0,0 @@
-From 4d307dcd10af9d817ff5c05fc40ae7487564cb31 Mon Sep 17 00:00:00 2001
-From: Mathias Gumz <akira at fluxbox dot org>
-Date: Sat, 12 Jan 2013 08:24:11 +0000
-Subject: Fix bug: handle the list of Timers not in-place
-
-With commit 541c8c4 we switched from an (manually) ordered list to a
-std::set<> to handle the active timers. The code which checks for overdue
-timers now traverses and modifies the std::set<> in place. This might
-lead to an infinite loop. Examples of such bad behavior are "flickering of
-the tooltip" (bug #3590078) or crashes (bug #3600143) or just insanely high
-cpu load when autoraising windows or submenus.
-
-We now make a copy of the std::set<> traverse this instead of the original.
----
-diff --git a/src/FbTk/Timer.cc b/src/FbTk/Timer.cc
-index f63ea38..dd736dd 100644
---- a/src/FbTk/Timer.cc
-+++ b/src/FbTk/Timer.cc
-@@ -52,6 +52,7 @@
- #endif
- 
- #include <cstdio>
-+#include <vector>
- #include <set>
- 
- 
-@@ -195,32 +196,35 @@ void Timer::updateTimers(int fd) {
-         return;
-     }
- 
-+    // stoping / restarting the timers modifies the list in an upredictable
-+    // way. to avoid problems such as infinite loops we save the current
-+    // (ordered) list of timers into a list and work on it.
-+
-+    ssize_t i;
-+    const ssize_t ts = s_timerlist.size();
-+    std::vector<FbTk::Timer*> timers;
-+
-+    timers.reserve(ts);
-+    for (it = s_timerlist.begin(); it != s_timerlist.end(); ++it ) {
-+        timers.push_back(*it);
-+    }
-+
-     now = FbTime::now();
--    for (it = s_timerlist.begin(); it != s_timerlist.end(); ) {
-+    for (i = 0; i < ts; ++i) {
-+
-+        FbTk::Timer* t = timers[i];
- 
--        // t->fireTimeout() might add timers to the list
--        // this invalidates 'it'. thus we store the current timer
--        Timer* t = *it;
-         if (now < t->getEndTime()) {
-             break;
-         }
- 
-         t->fireTimeout();
--
--        // find the iterator to the timer again
--        // and continue working on the list
--        it = s_timerlist.find(t);
--        it++;
--        s_timerlist.erase(t);
-+        t->stop();
- 
-         if (! t->doOnce()) { // restart the current timer
--            t->m_timing = false;
-             t->start();
--        } else {
--            t->stop();
-         }
-     }
--
- }
- 
- 
---
-cgit v0.9.1
diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD
index 054f8b8cd..f3c7cc0e0 100644
--- a/extra/kdesdk-kate/PKGBUILD
+++ b/extra/kdesdk-kate/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 177635 2013-02-08 08:55:54Z andrea $
+# $Id: PKGBUILD 177932 2013-02-11 17:58:22Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=kdesdk-kate
@@ -6,18 +6,22 @@ pkgname=('kdebase-katepart'
          'kdebase-kwrite'
          'kdesdk-kate')
 pkgver=4.10.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
-makedepends=('kdelibs ''cmake' 'automoc4' 'kdebindings-python2')
+makedepends=('kdelibs ''cmake' 'automoc4' 'kdebindings-python')
 source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.xz"
-        'pkgbuild-syntax-highlight.patch')
+        'pkgbuild-syntax-highlight.patch'
+        'fix-highlight-selection.patch')
 sha1sums=('9754f1acd55278d529c4e7a5a778b5cec51e73b9'
-          'dc70306c507083cf9b4bb1c536858742292fa1bf')
+          'dc70306c507083cf9b4bb1c536858742292fa1bf'
+          '46a09159747a76f348ab66a5c88dfeb596a1cbdd')
 
 build() {
   cd kate-${pkgver}
   patch -p1 -i "${srcdir}"/pkgbuild-syntax-highlight.patch
+  # KDEBUG#314530
+  patch -p1 -i "${srcdir}"/fix-highlight-selection.patch
   cd ../
 
   mkdir build
@@ -25,8 +29,7 @@ build() {
   cmake ../kate-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DKDE4_BUILD_TESTS=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2
+    -DCMAKE_INSTALL_PREFIX=/usr
   make
 }
 
@@ -49,9 +52,8 @@ package_kdebase-kwrite() {
 
   cd build/kwrite
   make DESTDIR="${pkgdir}" install
-  cd ../../
 
-  cd build/doc/kwrite
+  cd ../../build/doc/kwrite
   make DESTDIR="${pkgdir}" install
 }
 
@@ -62,12 +64,11 @@ package_kdesdk-kate() {
   url="http://www.kde.org/applications/utilities/kate/"
   install='kdesdk-kate.install'
   optdepends=('kdebase-konsole: open a terminal in Kate'
-              'kdebindings-python2: python bindings')
+              'kdebindings-python: python bindings')
 
   cd build/kate
   make DESTDIR="${pkgdir}" install
-  cd ../../
 
-  cd build/doc/kate
+  cd ../../build/doc/kate
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/kdesdk-kate/fix-highlight-selection.patch b/extra/kdesdk-kate/fix-highlight-selection.patch
new file mode 100644
index 000000000..26accafc7
--- /dev/null
+++ b/extra/kdesdk-kate/fix-highlight-selection.patch
@@ -0,0 +1,47 @@
+commit f934575613d7efc60b9b6be6203c777d42ab7ffc
+Author: Dominik Haumann <dhaumann@kde.org>
+Date:   Sun Feb 10 22:18:38 2013 +0100
+
+    fix plugin loading in KDE SC 4.10.0
+    
+    Thanks to Dorian and Loïc for finding the root of this issue.
+    
+    BUG: 314530
+    FIXED-IN: 4.10.1
+
+diff --git a/part/utils/katepartpluginmanager.cpp b/part/utils/katepartpluginmanager.cpp
+index e9cb258..18fe6f0 100644
+--- a/part/utils/katepartpluginmanager.cpp
++++ b/part/utils/katepartpluginmanager.cpp
+@@ -75,17 +75,25 @@ KatePartPluginManager *KatePartPluginManager::self()
+ void KatePartPluginManager::setupPluginList ()
+ {
+   KService::List traderList = KServiceTypeTrader::self()->
+-      query("KTextEditor/Plugin",
+-            "([X-KDE-Version] >= 4.0) and ([X-KDE-Version] <= " + QString("%1.%2").arg(KDE::versionMajor()).arg(KDE::versionMinor()) + ')');
++      query("KTextEditor/Plugin");
+ 
+   foreach(const KService::Ptr &ptr, traderList)
+   {
+-    KatePartPluginInfo info(ptr);
++    QVariant version = ptr->property("X-KDE-Version", QVariant::String);
++    QStringList numbers = qvariant_cast<QString>(version).split('.');
++    unsigned int kdeVersion = KDE_MAKE_VERSION(numbers.value(0).toUInt(),
++                                               numbers.value(1).toUInt(),
++                                               numbers.value(2).toUInt());
+ 
+-    info.load = false;
+-    info.plugin = 0L;
++    if (KDE_MAKE_VERSION(4,0,0) <= kdeVersion && kdeVersion <= KDE::version())
++    {
++      KatePartPluginInfo info(ptr);
++
++      info.load = false;
++      info.plugin = 0L;
+ 
+-    m_pluginList.push_back (info);
++      m_pluginList.push_back (info);
++    }
+   }
+ }
+