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

Conflicts:
	community/bsdiff/PKGBUILD
	community/drivel/PKGBUILD
	community/dvdbackup/PKGBUILD
	community/gdlmm/PKGBUILD
	community/gnome-phone-manager/PKGBUILD
	community/highlight/PKGBUILD
	community/i3-wm/PKGBUILD
	community/linux-tools/PKGBUILD
	community/obconf/PKGBUILD
	community/perl-class-factory-util/PKGBUILD
	community/python-mpi4py/PKGBUILD
	community/qupzilla/PKGBUILD
	community/subtitleeditor/PKGBUILD
	community/synce-librapi/PKGBUILD
	community/synce-libsynce/PKGBUILD
	community/tilda/PKGBUILD
	core/glibc/PKGBUILD
	core/iputils/PKGBUILD
	extra/alsa-tools/PKGBUILD
	extra/calligra/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/kobodeluxe/PKGBUILD
	extra/libburn/PKGBUILD
	extra/libisoburn/PKGBUILD
	extra/libisofs/PKGBUILD
	extra/libsamplerate/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/maxima/PKGBUILD
	extra/nasm/PKGBUILD
	extra/perl-netaddr-ip/PKGBUILD
	extra/perl-template-toolkit/PKGBUILD
	extra/putty/PKGBUILD
	extra/samba/PKGBUILD
	extra/tk/PKGBUILD
	extra/vim/PKGBUILD
	extra/xorg-xprop/PKGBUILD
	extra/xorg-xwd/PKGBUILD
	pcr/ams/PKGBUILD
	pcr/clalsadrv/PKGBUILD

2 files changed, 6 insertions, 37 deletions

diff --git a/community/obconf/PKGBUILD b/community/obconf/PKGBUILD
index 0ab8e2207..3d7ba626c 100644
--- a/community/obconf/PKGBUILD
+++ b/community/obconf/PKGBUILD
@@ -1,28 +1,25 @@
-# $Id: PKGBUILD 64692 2012-02-17 18:43:19Z bluewind $
+# $Id: PKGBUILD 95455 2013-08-12 10:25:42Z bluewind $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@archlinux.org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=obconf
-pkgver=2.0.3.git20100309
-pkgrel=3.1
+pkgver=2.0.4
+pkgrel=1
 pkgdesc="A GTK2 based configuration tool for the Openbox windowmanager"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://openbox.org/wiki/ObConf:About"
 license=('GPL')
 depends=('openbox' 'gtk2' 'libglade' 'desktop-file-utils' 'libsm')
 install=${pkgname}.install
-source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'config-file.patch')
-md5sums=('d45a1eab18aa25c18280821118368b97'
-         '51f5f110f8bc4a89dfb460c3dd4a3be8')
+source=("http://openbox.org/dist/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('9271c5d2dc366d61f73665a5e8bceabc')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
-  patch -p1 -i "${srcdir}"/config-file.patch
 
-  ./bootstrap
+  #./bootstrap
   ./configure --prefix=/usr
   make
 }
diff --git a/community/obconf/config-file.patch b/community/obconf/config-file.patch
deleted file mode 100644
index ce7973f3d..000000000
--- a/community/obconf/config-file.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Dana Jansens <danakj@orodu.net>
-Date: Fri, 5 Aug 2011 16:05:10 +0000 (-0400)
-Subject: Load the rc.xml config file given on --config-file the same as Openbox (use the whole ...
-X-Git-Url: http://git.openbox.org/?p=dana%2Fobconf.git;a=commitdiff_plain;h=cc7a18807663313ef111d86a75844ded0416a889
-
-Load the rc.xml config file given on --config-file the same as Openbox (use the whole path given).
----
-
-diff --git a/src/main.c b/src/main.c
-index 9035e8d..a576253 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -233,11 +233,10 @@ int main(int argc, char **argv)
-     }
- 
-     xmlIndentTreeOutput = 1;
--    if (!obt_xml_load_config_file(parse_i,
--                                  "openbox",
--                                  (obc_config_file ?
--                                   obc_config_file : "rc.xml"),
--                                  "openbox_config"))
-+    if (!((obc_config_file &&
-+           obt_xml_load_file(parse_i, obc_config_file, "openbox_config")) ||
-+          obt_xml_load_config_file(parse_i, "openbox", "rc.xml",
-+                                   "openbox_config")))
-     {
-         obconf_error(_("Failed to load an rc.xml. You have probably failed to install Openbox properly."), TRUE);
-         exit_with_error = TRUE;