Sat Jul 21 00:02:19 UTC 2012

11 files changed, 124 insertions, 40 deletions

diff --git a/community/directfb/DirectFB-1.6.1-zlib-include.patch b/community/directfb/DirectFB-1.6.1-zlib-include.patch
new file mode 100644
index 000000000..e4f24a5cf
--- /dev/null
+++ b/community/directfb/DirectFB-1.6.1-zlib-include.patch
@@ -0,0 +1,12 @@
+diff -Naur DirectFB-1.6.0-orig/src/core/surface.c DirectFB-1.6.0/src/core/surface.c
+--- DirectFB-1.6.0-orig/src/core/surface.c	2012-06-20 02:21:36.029994460 -0400
++++ DirectFB-1.6.0/src/core/surface.c	2012-06-20 02:22:48.533330819 -0400
+@@ -28,6 +28,8 @@
+ 
+ #include <config.h>
+ 
++#include <zlib.h>
++
+ #include <direct/debug.h>
+ 
+ #include <core/core.h>
diff --git a/community/directfb/PKGBUILD b/community/directfb/PKGBUILD
index 1e23e4f65..618174393 100644
--- a/community/directfb/PKGBUILD
+++ b/community/directfb/PKGBUILD
@@ -1,27 +1,25 @@
-# $Id: PKGBUILD 68160 2012-03-18 19:39:44Z ebelanger $
+# $Id: PKGBUILD 74058 2012-07-19 05:01:17Z ebelanger $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=directfb
-pkgver=1.5.3
+pkgver=1.6.1
 pkgrel=1
 pkgdesc="A thin library that provides hardware graphics acceleration, input device handling and abstraction, integrated windowing system on top of the Linux Framebuffer Device"
 arch=('i686' 'x86_64')
 url="http://www.directfb.org"
 license=('LGPL')
-depends=('gcc-libs' 'libjpeg' 'sdl' 'sysfsutils' 'libpng' 'freetype2')
+depends=('gcc-libs' 'libjpeg' 'sdl' 'libpng' 'freetype2')
 options=('!libtool')
 source=(http://www.directfb.org/downloads/Core/DirectFB-${pkgver%.*}/DirectFB-${pkgver}.tar.gz \
-        DirectFB-1.4.9-libpng-1.5.patch directfb-missing_include.patch)
-md5sums=('54a9ec931c8e3c82adb924194e65120e'
-         '82f552ae306871382a6a8e05cffee723'
-         '6b7ceca416c28a3791a145c15bf6f462')
+        DirectFB-1.6.1-zlib-include.patch)
+sha1sums=('121c7fd1e81ccb41962986126e1d69f188c2f2c2'
+          'f2309edd87c772a7894d4b648d56197d91790cad')
 
 build() {
   cd "${srcdir}/DirectFB-${pkgver}"
-  patch -p1 -i ../DirectFB-1.4.9-libpng-1.5.patch
-  patch -p1 -i ../directfb-missing_include.patch
-  CFLAGS+="-fno-inline" ./configure --prefix=/usr --sysconfdir=/etc --enable-static \
+  patch -p1 -i ../DirectFB-1.6.1-zlib-include.patch
+  ./configure --prefix=/usr --sysconfdir=/etc --enable-static \
     --enable-zlib --enable-x11 --enable-sdl --disable-vnc --disable-osx \
     --enable-video4linux2 --enable-voodoo
   make
diff --git a/community/electricsheep/PKGBUILD b/community/electricsheep/PKGBUILD
index ab2e3c89e..719e1926e 100644
--- a/community/electricsheep/PKGBUILD
+++ b/community/electricsheep/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 74018 2012-07-18 02:33:30Z ebelanger $
+# $Id: PKGBUILD 74059 2012-07-19 05:01:20Z ebelanger $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=electricsheep
 pkgver=2.7b33
-pkgrel=2
+pkgrel=3
 pkgdesc="A screensaver that realize the collective dream of sleeping computers from all over the internet"
 arch=('i686' 'x86_64')
 url="http://community.electricsheep.org/"
diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD
index 156a7a655..945ebab4a 100644
--- a/community/nodejs/PKGBUILD
+++ b/community/nodejs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 73801 2012-07-15 18:02:53Z bpiotrowski $
+# $Id: PKGBUILD 74081 2012-07-19 18:54:00Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: James Campos <james.r.campos@gmail.com>
@@ -8,8 +8,8 @@
 # Contributor: TIanyi Cui <tianyicui@gmail.com>
 
 pkgname=nodejs
-pkgver=0.8.2
-pkgrel=3
+pkgver=0.8.3
+pkgrel=1
 pkgdesc='Evented I/O for V8 javascript'
 arch=('i686' 'x86_64')
 url='http://nodejs.org/'
@@ -19,7 +19,7 @@ checkdepends=('curl') # curl used for check()
 optdepends=('openssl: TLS support')
 options=('!emptydirs')
 source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz")
-md5sums=('2d1a74aa9e5ecfdb4c64d200b642eb1e')
+md5sums=('53604d2e3773d62e90fa5a340a362e08')
 
 build() {
   cd node-v${pkgver}
diff --git a/community/nsd/PKGBUILD b/community/nsd/PKGBUILD
index 2db56161a..ce1701117 100644
--- a/community/nsd/PKGBUILD
+++ b/community/nsd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 73541 2012-07-09 11:23:02Z bisson $
+# $Id: PKGBUILD 74075 2012-07-19 14:27:58Z bisson $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Roberto Alsina <ralsina@kde.org>
 
 pkgname=nsd
-pkgver=3.2.11
+pkgver=3.2.12
 pkgrel=1
 pkgdesc='Authoritative only, high performance and simple DNS server'
 url='http://www.nlnetlabs.nl/nsd/'
@@ -14,8 +14,8 @@ makedepends=('flex')
 arch=('i686' 'x86_64')
 source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'service')
-sha1sums=('4b8b9293fd13b0fba2a2bff9fd11940e0d8d7448'
-          'e560876628a30f11f9abbee4abcaa1f51cf449a6')
+sha1sums=('dd8606a05525f6a493dfacb7ddfa7e1fa3c6a85b'
+          '29a74ce922b3991dd65ae5254bafa0a308d915e9')
 
 install=install
 
diff --git a/community/nsd/service b/community/nsd/service
index 37649f557..2caa9585c 100644
--- a/community/nsd/service
+++ b/community/nsd/service
@@ -8,7 +8,6 @@ PIDFile=/run/nsd.pid
 ExecStart=/usr/sbin/nsd start
 ExecReload=/usr/sbin/nsd reload
 ExecStop=/usr/sbin/nsd stop
-Restart=always
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/qingy/PKGBUILD b/community/qingy/PKGBUILD
index c077229c8..89c4fc249 100644
--- a/community/qingy/PKGBUILD
+++ b/community/qingy/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 70357 2012-05-04 23:55:21Z allan $
+# $Id: PKGBUILD 74060 2012-07-19 05:01:27Z ebelanger $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
 pkgname=qingy
 pkgver=1.0.0
-pkgrel=4
+pkgrel=5
 pkgdesc="A DirectFB getty replacement"
 arch=('i686' 'x86_64')
 url="http://qingy.sourceforge.net/"
diff --git a/community/scite/PKGBUILD b/community/scite/PKGBUILD
index 4a9fdb879..ca6612877 100644
--- a/community/scite/PKGBUILD
+++ b/community/scite/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 72018 2012-06-05 20:13:19Z arodseth $
+# $Id: PKGBUILD 74068 2012-07-19 10:19:10Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Thomas S Hatch <thatch45@gmail.com>
 # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it>
@@ -6,7 +6,7 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=scite
-pkgver=3.2.0
+pkgver=3.2.1
 pkgrel=1
 pkgdesc='Editor with facilities for building and running programs'
 arch=('x86_64' 'i686')
@@ -17,7 +17,7 @@ makedepends=('setconf')
 backup=('usr/share/scite/SciTEGlobal.properties')
 install=$pkgname.install
 source=("http://downloads.sourceforge.net/sourceforge/scintilla/${pkgname}${pkgver//./}.tgz")
-sha256sums=('2734a61acd823831e870b6ce04a39f6d163e83f93096044c66ff36be5bbcdf2e')
+sha256sums=('f95c89074fd73a22b783b5582d3b23cdbd4b7eb38ab407721a702c4a1bcb678c')
 
 build() {
   cd "$srcdir"
diff --git a/community/wxgtk2.9/PKGBUILD b/community/wxgtk2.9/PKGBUILD
index 702455d04..58690ab8a 100644
--- a/community/wxgtk2.9/PKGBUILD
+++ b/community/wxgtk2.9/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 72461 2012-06-14 23:31:54Z ebelanger $
+# $Id: PKGBUILD 74061 2012-07-19 05:01:32Z ebelanger $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=wxgtk2.9
-pkgver=2.9.3.1
+pkgver=2.9.4
 pkgrel=1
 pkgdesc="GTK+ implementation of wxWidgets API for GUI"
 arch=('i686' 'x86_64')
@@ -10,13 +10,13 @@ url="http://wxwidgets.org"
 license=('custom:wxWindows')
 depends=('gtk2' 'gstreamer0.10-base' 'libgl' 'libxxf86vm' 'libsm')
 makedepends=('gstreamer0.10-base-plugins' 'gconf' 'mesa')
-source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2 wxGTK-2.9.3.1-collision.patch)
-sha1sums=('0202f64e1e99fb69d22d7be0d38cf7dcf3d80d79'
-          '69eace867fb20dba9271b57292756e144bb698ce')
+source=(http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2 wxGTK-2.9.4-collision.patch)
+sha1sums=('5a34ddf19d37c741f74652ee847df9568a8b81e1'
+          'a76ccca4c2fad246c9aafbcc5a9697ebf35f33a3')
 
 build() {
-  cd "${srcdir}/wxPython-src-${pkgver}"
-  patch -p1 -i ../wxGTK-2.9.3.1-collision.patch
+  cd "${srcdir}/wxWidgets-${pkgver}"
+  patch -p1 -i ../wxGTK-2.9.4-collision.patch
   ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \
     --enable-graphics_ctx --enable-mediactrl --with-regex=builtin \
     --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \
@@ -26,7 +26,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/wxPython-src-${pkgver}"
+  cd "${srcdir}/wxWidgets-${pkgver}"
   make DESTDIR="${pkgdir}" install
   rm "${pkgdir}/usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
   install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
diff --git a/community/wxgtk2.9/wxGTK-2.9.4-collision.patch b/community/wxgtk2.9/wxGTK-2.9.4-collision.patch
new file mode 100644
index 000000000..4b1fb395e
--- /dev/null
+++ b/community/wxgtk2.9/wxGTK-2.9.4-collision.patch
@@ -0,0 +1,77 @@
+Prevent file collisions between multiple installed SLOTs.
+
+  - Don't install wxwin.m4.  It is installed with app-admin/eselect-wxwidgets.
+  - Version the bakefile preset filenames.  Unversioned symlinks to these files
+    are handled by eselect.
+  - Version wx-config and wxrc.  The unversioned forms are wrapper scripts
+    installed with eselect-wxwidgets.
+  - Version wxstd.mo and modify AddStdCatalog to use it.
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -14076,10 +14076,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+ all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
+ 
+ install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
+-	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
+-	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
+-	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA)  wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets)
++	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; \
++	for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py ; do \
++	$(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done)
+ 	$(DYLIB_RPATH_INSTALL)
+ 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
+ 	for f in setup.h $(RCDEFS_H); do \
+@@ -14964,15 +14964,16 @@ install-wxconfig:
+ 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
+ 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
+ 	$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
+-	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
+-
++	(cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) \
++	&& $(LN_S) ../lib/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
+ locale_install: 
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
+ 	for l in $(LOCALE_LINGUAS) ; do \
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
+ 	if test -f $(srcdir)/locale/$$l.mo ; then \
+-	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
++	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo \
++	$(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
+ 	fi ; \
+ 	done
+ 
+--- a/build/bakefiles/wx.bkl
++++ b/build/bakefiles/wx.bkl
+@@ -138,7 +138,7 @@
+         <using module="gettext"/>
+         <gettext-catalogs id="locale">
+             <srcdir>$(SRCDIR)/locale</srcdir>
+-            <catalog-name>wxstd</catalog-name>
++            <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name>
+             <linguas>
+                 ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk
+                 zh zh_CN zh_TW
+--- a/src/common/translation.cpp
++++ b/src/common/translation.cpp
+@@ -1302,7 +1302,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c
+ 
+ bool wxTranslations::AddStdCatalog()
+ {
+-    if ( !AddCatalog(wxS("wxstd")) )
++    if ( !AddCatalog(wxS("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION))) )
+         return false;
+ 
+     // there may be a catalog with toolkit specific overrides, it is not
+--- a/utils/wxrc/Makefile.in
++++ b/utils/wxrc/Makefile.in
+@@ -124,7 +124,6 @@ distclean: clean
+ @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+ @COND_USE_XRC_1@	$(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
+ @COND_USE_XRC_1@	mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+-@COND_USE_XRC_1@	(cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
+ 
+ @COND_USE_XRC_1@uninstall_wxrc: 
+ @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
diff --git a/community/xmlrpc-c/PKGBUILD b/community/xmlrpc-c/PKGBUILD
index b387f32cb..7a456a8c0 100644
--- a/community/xmlrpc-c/PKGBUILD
+++ b/community/xmlrpc-c/PKGBUILD
@@ -1,15 +1,13 @@
-# $Id: PKGBUILD 69311 2012-04-13 13:20:52Z arodseth $
+# $Id: PKGBUILD 74066 2012-07-19 10:16:54Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: Vitaliy Berdinskikh <skipper13@root.ua>
 
 pkgname=xmlrpc-c
-# The webpage is unclear on which version is the latest advanced version (2012-04-13)
-# Both the 1.29x series and 1.30.1 are mentioned. I'll go with 1.29.2 for now.
-pkgver=1.29.2
+pkgver=1.31.02
 epoch=1
-pkgrel=2
+pkgrel=1
 pkgdesc='XML-RPC for C and C++'
 arch=('x86_64' 'i686')
 url='http://xmlrpc-c.sourceforge.net/'
@@ -18,7 +16,7 @@ depends=('curl' 'libxml2' 'gcc-libs' 'zlib')
 makedepends=('libtool' 'setconf')
 options=('!makeflags' '!libtool')
 source=("$pkgname-advanced-$pkgver.tar.gz::http://xmlrpc-c.svn.sourceforge.net/viewvc/xmlrpc-c/advanced.tar.gz")
-sha256sums=('68f5ae842a490778899f51a7ebec3399b9238f28db94b764646202c48bd8381f')
+sha256sums=('658013f009f29bc8cbd9fd9ebef087a2f6691a123d3b17c68b2cd4a958f91c39')
 
 build() {
   cd "$srcdir/advanced"