Sun Sep 1 02:29:48 PDT 2013

10 files changed, 91 insertions, 54 deletions

diff --git a/community/codeblocks/PKGBUILD b/community/codeblocks/PKGBUILD
index dfe3d6028..f13c0030b 100644
--- a/community/codeblocks/PKGBUILD
+++ b/community/codeblocks/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94017 2013-07-13 12:31:23Z svenstaro $
+# $Id: PKGBUILD 96531 2013-08-31 09:00:41Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Robert Hollencamp <rhollencamp@gmail.com>
 # Contributor: Daniel J Griffiths <griffithsdj@inbox.com>
@@ -6,7 +6,7 @@
 
 pkgname=codeblocks
 pkgver=12.11
-pkgrel=3
+pkgrel=4
 pkgdesc='Open source and cross-platform C/C++ IDE'
 arch=('i686' 'x86_64')
 url='http://www.codeblocks.org'
diff --git a/community/codeblocks/codeblocks.install b/community/codeblocks/codeblocks.install
index 04d31f75b..bc2b14aff 100644
--- a/community/codeblocks/codeblocks.install
+++ b/community/codeblocks/codeblocks.install
@@ -2,7 +2,7 @@ pkgname=codeblocks
 
 post_install() {
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-mime-database usr/share/mime
+  update-mime-database usr/share/mime &>/dev/null
   update-desktop-database -q
   ln -s /usr/lib/libwxflatnotebook.so /usr/lib/libwxflatnotebook.so.0
   ln -s /usr/lib/libwxchartctrl.so  /usr/lib/libwxchartctrl.so.0
@@ -21,6 +21,6 @@ post_upgrade() {
 
 pre_remove() {
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-mime-database usr/share/mime
+  update-mime-database usr/share/mime &>/dev/null
   update-desktop-database -q
 }
diff --git a/community/ekg2/PKGBUILD b/community/ekg2/PKGBUILD
index fa0022592..bb85acd5d 100644
--- a/community/ekg2/PKGBUILD
+++ b/community/ekg2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 94920 2013-08-01 07:01:09Z bpiotrowski $
+# $Id: PKGBUILD 96537 2013-08-31 09:41:14Z bpiotrowski $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 
 pkgname=ekg2
 pkgver=0.3.1
-pkgrel=7
+pkgrel=8
 pkgdesc='Ncurses based Jabber, Gadu-Gadu, Tlen and IRC client'
 arch=('i686' 'x86_64')
 url="http://ekg2.org/"
@@ -16,7 +16,7 @@ optdepends=('xosd: xosd support'
 source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.gz
         ekg2-0.3.1-giflib5.patch)
 md5sums=('68fc05b432c34622df6561eaabef5a40'
-         'f3b6979e9b8705b0b9c7efd3f3a808fd')
+         'e5855316bf7e9b456ebabb7cb9340e98')
 
 prepare() {
   cd $pkgname-$pkgver
diff --git a/community/ekg2/ekg2-0.3.1-giflib5.patch b/community/ekg2/ekg2-0.3.1-giflib5.patch
index f0e6885c0..d11b1ecec 100644
--- a/community/ekg2/ekg2-0.3.1-giflib5.patch
+++ b/community/ekg2/ekg2-0.3.1-giflib5.patch
@@ -1,12 +1,30 @@
 diff -rupN a/plugins/gg/commands.c b/plugins/gg/commands.c
 --- a/plugins/gg/commands.c	2011-03-17 18:08:11.000000000 +0100
-+++ b/plugins/gg/commands.c	2013-07-29 18:45:51.296790942 +0200
-@@ -1034,7 +1034,7 @@ static int token_gif_load (char *fname,
++++ b/plugins/gg/commands.c	2013-08-31 11:31:42.521377436 +0200
+@@ -1029,14 +1029,15 @@ static int token_gif_load (char *fname,
+ 	GifFileType *file;
+ 	int fd;
+ 	fd = open(fname, O_RDONLY);
++	int giferror;
+ 	if (fd == -1) {
+ 		snprintf(errbuf, sizeof(errbuf), "open(%s): %m", fname);
  		goto err;
  	}
  	
 -	if (!(file = DGifOpenFileHandle(fd))) {
-+	if (!(file = DGifOpenFileHandle(fd, NULL))) {
++	if (!(file = DGifOpenFileHandle(fd, giferror))) {
  		snprintf(errbuf, sizeof(errbuf), "DGifOpenFileHandle(): %d", 
- 			GifLastError());
+-			GifLastError());
++			GifErrorString(giferror));
  		goto err2;
+ 	}
+ 
+@@ -1046,7 +1047,7 @@ static int token_gif_load (char *fname,
+ 	}
+ 	
+ 	if (DGifSlurp(file) != GIF_OK) {
+-		snprintf(errbuf, sizeof(errbuf), "DGifSlurp(): %d", GifLastError());
++		snprintf(errbuf, sizeof(errbuf), "DGifSlurp(): %d", GifErrorString(GIF_ERROR));
+ 		goto err3;
+ 	}
+ 
diff --git a/community/mupdf/PKGBUILD b/community/mupdf/PKGBUILD
index a957e6b26..b7f7e46ae 100644
--- a/community/mupdf/PKGBUILD
+++ b/community/mupdf/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96166 2013-08-20 21:04:13Z bpiotrowski $
+# $Id: PKGBUILD 96533 2013-08-31 09:24:59Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
@@ -7,15 +7,23 @@
 
 pkgname=mupdf
 pkgver=1.3
-pkgrel=3
+pkgrel=4
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('i686' 'x86_64')
 url='http://mupdf.com'
 license=('GPL3')
-depends=('desktop-file-utils' 'libxext' 'openssl')
+depends=('curl' 'desktop-file-utils' 'freetype2' 'jbig2dec' 'libjpeg' 'libxext' 'openssl')
 install=mupdf.install
-source=(https://mupdf.googlecode.com/files/$pkgname-$pkgver-source.tar.gz)
-sha256sums=('aba8b31bee9cc0a16abedab5e31c81c65996cba5591e62a50a79bea2a63d4478')
+source=(https://mupdf.googlecode.com/files/$pkgname-$pkgver-source.tar.gz
+        mupdf-1.3-system-libcurl.patch)
+sha256sums=('aba8b31bee9cc0a16abedab5e31c81c65996cba5591e62a50a79bea2a63d4478'
+            '41a3b6df736f971e91c066e73afac286eec8fa37af244a55df52e8b173646f42')
+
+prepare() {
+  cd $pkgname-$pkgver-source
+  rm -rf thirdparty/{curl,freetype,jpeg,zlib,jbig2dec}
+  patch -Np1 -i ../mupdf-1.3-system-libcurl.patch
+}
 
 build() {
   CFLAGS+=' -fPIC'
@@ -40,5 +48,7 @@ package() {
   install -Dm644 mupdf.desktop "$pkgdir"/usr/share/applications/mupdf.desktop
   install -Dm644 mupdf.xpm "$pkgdir"/usr/share/pixmaps/mupdf.xpm
 
-  chmod 644 "$pkgdir"/usr/lib/libmupdf{,-js-none}.a
+  find "$pkgdir"/usr/include \
+    "$pkgdir"/usr/share \
+    "$pkgdir"/usr/lib -type f | xargs chmod -v 0644
 }
diff --git a/community/mupdf/mupdf-1.3-system-libcurl.patch b/community/mupdf/mupdf-1.3-system-libcurl.patch
new file mode 100644
index 000000000..b99083216
--- /dev/null
+++ b/community/mupdf/mupdf-1.3-system-libcurl.patch
@@ -0,0 +1,21 @@
+--- a/Makerules	2013-08-27 14:35:11.243520354 +0000
++++ b/Makerules	2013-08-27 15:40:22.583629510 +0000
+@@ -67,6 +67,8 @@
+ SYS_JBIG2DEC_LIBS = -ljbig2dec
+ SYS_JPEG_LIBS = -ljpeg
+ SYS_ZLIB_LIBS = -lz
++SYS_CURL_CFLAGS = $(shell pkg-config --cflags libcurl) -I/usr/include/curl
++SYS_CURL_LIBS = $(shell pkg-config --libs libcurl)
+ 
+ endif
+ 
+--- a/Makethird	2013-08-27 15:41:18.043354692 +0000
++++ b/Makethird	2013-08-27 15:42:41.332916192 +0000
+@@ -444,5 +444,6 @@
+ CURL_CFLAGS := -I$(CURL_DIR)/include
+ CURL_LIBS := $(SYS_CURL_DEPS)
+ else
+-NOCURL := yes
++CURL_CFLAGS := $(SYS_CURL_CFLAGS)
++CURL_LIBS := $(SYS_CURL_LIBS) $(SYS_CURL_DEPS)
+ endif
diff --git a/community/pcsxr/PKGBUILD b/community/pcsxr/PKGBUILD
index e2b0a1a70..71bb22650 100644
--- a/community/pcsxr/PKGBUILD
+++ b/community/pcsxr/PKGBUILD
@@ -1,31 +1,34 @@
-# $Id: PKGBUILD 82335 2013-01-15 11:35:07Z allan $
+# $Id: PKGBUILD 96557 2013-08-31 16:57:39Z schuay $
 # Maintainer: schuay <jakob.gruber@gmail.com>
 # Contributor: quantax -- contact via Arch Linux forum or AUR
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 pkgname=pcsxr
-pkgver=1.9.92
-pkgrel=5
+pkgver=1.9.93
+pkgrel=1
 pkgdesc='A Sony PlayStation (PSX) emulator based on the PCSX-df project'
 arch=('i686' 'x86_64')
 url='http://pcsxr.codeplex.com/'
 license=('GPL')
-depends=('libcdio' 'libgl' 'libglade' 'libxtst' 'libxv' 'sdl')
-makedepends=('mesa')
-source=("ftp://ftp.archlinux.org/other/community/pcsxr/pcsxr-${pkgver}.tar.bz2"
-        "link_order.patch")
+depends=('libcdio' 'libgl' 'libglade' 'libxtst' 'libxv' 'sdl' 'gtk3')
+makedepends=('mesa' 'intltool')
+
+# Accessible through /srv/ftp/other/community on nymeria.
+source=("ftp://ftp.archlinux.org/other/community/pcsxr/pcsxr-${pkgver}.tar.bz2")
 
 build() {
-    cd "$srcdir/$pkgname-$pkgver"
-    patch -Np0 < "$srcdir/link_order.patch"
+    cd "$srcdir/$pkgname"
+
+    autoreconf -f -i
+    intltoolize --force
+
     ./configure --prefix=/usr --enable-libcdio --enable-opengl
     make
 }
 
 package() {
-    cd "$srcdir/$pkgname-$pkgver"
+    cd "$srcdir/$pkgname"
     make DESTDIR="$pkgdir" install
 }
 
-md5sums=('28411aed0b4424f97227d94bdefaec83'
-         'd38c38fa0fbb11fe881b4a9a868cf603')
+md5sums=('d75725b4c3fcb2cb11d39b3ace10dc31')
diff --git a/community/pcsxr/link_order.patch b/community/pcsxr/link_order.patch
deleted file mode 100644
index eedf94000..000000000
--- a/community/pcsxr/link_order.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- gui/Makefile.in	2010-08-05 13:27:28.000000000 +0200
-+++ gui/Makefile.in	2013-01-08 21:10:44.709992969 +0100
-@@ -244,8 +244,8 @@
- 	AboutDlg.c
- 
- pcsx_LDADD = \
--	$(GTK2_LIBS) $(GLADE2_LIBS) -lpthread -lz -lm -lXext -lXtst \
--	../libpcsxcore/libpcsxcore.a
-+	../libpcsxcore/libpcsxcore.a $(GTK2_LIBS) $(GLADE2_LIBS) -lpthread -lz -lm -lXext -lXtst
-+	
- 
- all: all-am
- 
diff --git a/community/sqlheavy/PKGBUILD b/community/sqlheavy/PKGBUILD
index 43f08fc60..37902a562 100755
--- a/community/sqlheavy/PKGBUILD
+++ b/community/sqlheavy/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 89815 2013-05-02 15:11:19Z alucryd $
+# $Id: PKGBUILD 96517 2013-08-30 22:52:46Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd at gmail dot com>
 # Contributor : sebikul <sebikul@gmail.com>
 
 pkgname=sqlheavy
 pkgver=0.1.1
-pkgrel=6
+pkgrel=7
 pkgdesc="GObject SQLite wrapper"
 arch=('i686' 'x86_64')
 url="https://code.google.com/p/sqlheavy/"
 license=('LGPL')
-conflicts=('sqlheavy-git')
 depends=('gtk2' 'sqlite3')
 makedepends=('gobject-introspection' 'vala')
 options=('!libtool')
@@ -17,22 +16,21 @@ source=("https://sqlheavy.googlecode.com/files/${pkgname}-${pkgver}.tar.xz")
 sha256sums=('e8689f5fd4e0baf98eada2b3811262bb99877c2e8586fd21ad2a7ad3acc59031')
 
 prepare() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
 
-  sed -i 's/libvala-0.16/libvala-0.20/' configure
-  sed -i '/examples/d
-          /utils/d'  Makefile.in
+  sed 's/libvala-0.16/libvala-0.20/' -i configure
+  sed '/examples/d; /utils/d' -i Makefile.in
 }
 
 build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
 
-  ./configure --prefix=/usr --disable-static
+  ./configure --prefix='/usr' --disable-static
   make
 }
 
 package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
 
   make DESTDIR="${pkgdir}" install
 }
diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD
index e2d517a01..30da87a87 100644
--- a/community/virtualbox-modules/PKGBUILD
+++ b/community/virtualbox-modules/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 96298 2013-08-24 12:18:47Z tpowa $
+# $Id: PKGBUILD 96546 2013-08-31 16:05:06Z foutrelis $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Sébastien Luttringer
 
 pkgbase=virtualbox-modules
 pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules')
 pkgver=4.2.16
-pkgrel=8
+pkgrel=9
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')