Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/allegro/PKGBUILD
	community/erlang/PKGBUILD
	community/python-openbabel/PKGBUILD
	core/vi/PKGBUILD
	extra/accountsservice/PKGBUILD
	extra/calligra/PKGBUILD
	kde-unstable/kactivities/PKGBUILD
	kde-unstable/kdeaccessibility-jovie/PKGBUILD
	kde-unstable/kdeaccessibility-kaccessible/PKGBUILD
	kde-unstable/kdeaccessibility-kmag/PKGBUILD
	kde-unstable/kdeaccessibility-kmousetool/PKGBUILD
	kde-unstable/kdeaccessibility-kmouth/PKGBUILD
	kde-unstable/kdeadmin/PKGBUILD
	kde-unstable/kdeartwork/PKGBUILD
	kde-unstable/kdebase-konsole/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	kde-unstable/kdebase-workspace/kde-np.pam
	kde-unstable/kdebase-workspace/kde.pam
	kde-unstable/kdebase-workspace/kdebase-workspace.install
	kde-unstable/kdebase/PKGBUILD
	kde-unstable/kdebindings-kimono/PKGBUILD
	kde-unstable/kdebindings-korundum/PKGBUILD
	kde-unstable/kdebindings-korundum/ruby19.patch
	kde-unstable/kdebindings-kross/PKGBUILD
	kde-unstable/kdebindings-perlkde/PKGBUILD
	kde-unstable/kdebindings-perlqt/PKGBUILD
	kde-unstable/kdebindings-python/PKGBUILD
	kde-unstable/kdebindings-qtruby/PKGBUILD
	kde-unstable/kdebindings-qyoto/PKGBUILD
	kde-unstable/kdebindings-smokegen/PKGBUILD
	kde-unstable/kdebindings-smokekde/PKGBUILD
	kde-unstable/kdebindings-smokeqt/PKGBUILD
	kde-unstable/kdeedu-analitza/PKGBUILD
	kde-unstable/kdeedu-blinken/PKGBUILD
	kde-unstable/kdeedu-cantor/PKGBUILD
	kde-unstable/kdeedu-kalgebra/PKGBUILD
	kde-unstable/kdeedu-kalzium/PKGBUILD
	kde-unstable/kdeedu-kalzium/kdeedu-kalzium.install
	kde-unstable/kdeedu-kanagram/PKGBUILD
	kde-unstable/kdeedu-kbruch/PKGBUILD
	kde-unstable/kdeedu-kgeography/PKGBUILD
	kde-unstable/kdeedu-khangman/PKGBUILD
	kde-unstable/kdeedu-kig/PKGBUILD
	kde-unstable/kdeedu-kiten/PKGBUILD
	kde-unstable/kdeedu-klettres/PKGBUILD
	kde-unstable/kdeedu-kmplot/PKGBUILD
	kde-unstable/kdeedu-kstars/PKGBUILD
	kde-unstable/kdeedu-ktouch/PKGBUILD
	kde-unstable/kdeedu-kturtle/PKGBUILD
	kde-unstable/kdeedu-kwordquiz/PKGBUILD
	kde-unstable/kdeedu-marble/PKGBUILD
	kde-unstable/kdeedu-marble/kdeedu-marble.install
	kde-unstable/kdeedu-pairs/PKGBUILD
	kde-unstable/kdeedu-parley/PKGBUILD
	kde-unstable/kdeedu-rocs/PKGBUILD
	kde-unstable/kdeedu-step/PKGBUILD
	kde-unstable/kdegraphics-gwenview/PKGBUILD
	kde-unstable/kdegraphics-kamera/PKGBUILD
	kde-unstable/kdegraphics-kcolorchooser/PKGBUILD
	kde-unstable/kdegraphics-kgamma/PKGBUILD
	kde-unstable/kdegraphics-kolourpaint/PKGBUILD
	kde-unstable/kdegraphics-kruler/PKGBUILD
	kde-unstable/kdegraphics-ksaneplugin/PKGBUILD
	kde-unstable/kdegraphics-ksnapshot/PKGBUILD
	kde-unstable/kdegraphics-mobipocket/PKGBUILD
	kde-unstable/kdegraphics-okular/PKGBUILD
	kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD
	kde-unstable/kdegraphics-svgpart/PKGBUILD
	kde-unstable/kdegraphics-thumbnailers/PKGBUILD
	kde-unstable/kdemultimedia-audiocd-kio/PKGBUILD
	kde-unstable/kdemultimedia-dragonplayer/PKGBUILD
	kde-unstable/kdemultimedia-ffmpegthumbs/PKGBUILD
	kde-unstable/kdemultimedia-juk/PKGBUILD
	kde-unstable/kdemultimedia-kmix/PKGBUILD
	kde-unstable/kdemultimedia-kscd/PKGBUILD
	kde-unstable/kdemultimedia-mplayerthumbs/PKGBUILD
	kde-unstable/kdenetwork/PKGBUILD
	kde-unstable/kdepim-runtime/PKGBUILD
	kde-unstable/kdepim/PKGBUILD
	kde-unstable/kdepim/fix-build.patch
	kde-unstable/kdepimlibs/PKGBUILD
	kde-unstable/kdeplasma-addons/PKGBUILD
	kde-unstable/kdesdk-kate/PKGBUILD
	kde-unstable/kdesdk-kate/pkgbuild-syntax-highlight.patch
	kde-unstable/kdesdk/PKGBUILD
	kde-unstable/kdetoys/PKGBUILD
	kde-unstable/kdeutils-filelight/PKGBUILD
	kde-unstable/kdeutils-kcalc/PKGBUILD
	kde-unstable/kdeutils-kcharselect/PKGBUILD
	kde-unstable/kdeutils-kdf/PKGBUILD
	kde-unstable/kdeutils-kfloppy/PKGBUILD
	kde-unstable/kdeutils-kgpg/PKGBUILD
	kde-unstable/kdeutils-kremotecontrol/PKGBUILD
	kde-unstable/kdeutils-ktimer/PKGBUILD
	kde-unstable/kdeutils-kwallet/PKGBUILD
	kde-unstable/kdeutils-superkaramba/PKGBUILD
	kde-unstable/kdeutils-sweeper/PKGBUILD
	kde-unstable/kdewebdev/PKGBUILD
	kde-unstable/libkcddb/PKGBUILD
	kde-unstable/libkcompactdisc/PKGBUILD
	kde-unstable/libkdcraw/PKGBUILD
	kde-unstable/libkdeedu/PKGBUILD
	kde-unstable/libkexiv2/PKGBUILD
	kde-unstable/libkipi/PKGBUILD
	kde-unstable/libksane/PKGBUILD
	kde-unstable/nepomuk-core/PKGBUILD

2 files changed, 18 insertions, 4 deletions

diff --git a/extra/xfce4-smartbookmark-plugin/PKGBUILD b/extra/xfce4-smartbookmark-plugin/PKGBUILD
index 041af6211..b7857d6d0 100644
--- a/extra/xfce4-smartbookmark-plugin/PKGBUILD
+++ b/extra/xfce4-smartbookmark-plugin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 159006 2012-05-14 20:21:29Z foutrelis $
+# $Id: PKGBUILD 171600 2012-11-19 20:34:28Z foutrelis $
 # Maintainer:
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-smartbookmark-plugin
 pkgver=0.4.4
-pkgrel=3
+pkgrel=4
 pkgdesc="Plugin for the Xfce4 panel that lets you quicksearch from selected websites"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin"
@@ -16,16 +16,19 @@ makedepends=('intltool' 'libxt')
 options=('!libtool')
 source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.4/$pkgname-$pkgver.tar.bz2
         xfce4-smartbookmark-plugin-archlinux.patch
-        use-exo-open-instead-of-xfbrowser4.patch)
+        use-exo-open-instead-of-xfbrowser4.patch
+        fix-config-write.patch)
 sha256sums=('6c77e8fee0ec4dcee7aa34d94377e068a522b1ea650823422f2f5cca8126f2ed'
             'a126b086811b60a8f3cd1a2b818cb6b9a9c6e959e00db1499b114fa8803325e6'
-            '436f7cda2b2bdfee61ac3d887d17dc91094526fec8713ab84fda249850525aac')
+            '436f7cda2b2bdfee61ac3d887d17dc91094526fec8713ab84fda249850525aac'
+            '21873511b77e0fac6c85f15dc6332fcb4532ac688f3202bc839c00f372249b88')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   patch -Np0 -i "$srcdir/xfce4-smartbookmark-plugin-archlinux.patch"
   patch -Np1 -i "$srcdir/use-exo-open-instead-of-xfbrowser4.patch"
+  patch -Np1 -i "$srcdir/fix-config-write.patch"
 
   ./configure \
     --prefix=/usr \
diff --git a/extra/xfce4-smartbookmark-plugin/fix-config-write.patch b/extra/xfce4-smartbookmark-plugin/fix-config-write.patch
new file mode 100644
index 000000000..0f5a25f4f
--- /dev/null
+++ b/extra/xfce4-smartbookmark-plugin/fix-config-write.patch
@@ -0,0 +1,11 @@
+diff -upr xfce4-smartbookmark-plugin-0.4.4.orig/src/smartbookmark.c xfce4-smartbookmark-plugin-0.4.4/src/smartbookmark.c
+--- xfce4-smartbookmark-plugin-0.4.4.orig/src/smartbookmark.c	2012-11-19 22:24:16.000000000 +0200
++++ xfce4-smartbookmark-plugin-0.4.4/src/smartbookmark.c	2012-11-19 22:24:42.000000000 +0200
+@@ -365,6 +365,7 @@ static void search_create_options(XfcePa
+     search_apply_options_cb(search);
+     gtk_widget_destroy(search->opt_dialog);
+     xfce_panel_plugin_unblock_menu(plugin);
++    search_write_config(plugin, search);
+ }
+ 
+