diff options
55 files changed, 602 insertions, 171 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" diff --git a/extra/cogl/PKGBUILD b/extra/cogl/PKGBUILD index 8263db504..9b5159460 100644 --- a/extra/cogl/PKGBUILD +++ b/extra/cogl/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 156728 2012-04-23 09:04:10Z ibiru $ +# $Id: PKGBUILD 163754 2012-07-19 07:57:34Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=cogl -pkgver=1.10.2 +pkgver=1.10.4 pkgrel=1 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'pango') makedepends=('mesa' 'gobject-introspection') options=(!libtool !emptydirs) source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('042cf87ec35d2eac78719856356e415dd5333f9f613093c5db8b438630c1ecb3') +sha256sums=('0b5c9989f1d07dbda000a68640eb7ebf734513d52e3707668c41eed19991adf9') build() { cd "$pkgname-$pkgver" diff --git a/extra/eog/PKGBUILD b/extra/eog/PKGBUILD index df9c03b32..6891c7144 100644 --- a/extra/eog/PKGBUILD +++ b/extra/eog/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 161285 2012-06-08 22:49:59Z ibiru $ +# $Id: PKGBUILD 163768 2012-07-19 08:37:29Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=eog -pkgver=3.4.2 +pkgver=3.4.3 pkgrel=1 pkgdesc="Eye of Gnome: An image viewing and cataloging program" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ groups=('gnome-extra') options=('!emptydirs' '!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('8dd79cd2118ba6055efc4ebe815bdeeeb3c1310bb915035c1a56ef3188c75d5a') +sha256sums=('66e468f09de4b8097671cb6e56cd057c0e7869d836a2345e640b6cf4c404d5d9') build() { cd "$pkgname-$pkgver" diff --git a/extra/glibmm/PKGBUILD b/extra/glibmm/PKGBUILD index d237d821b..c7473ed80 100644 --- a/extra/glibmm/PKGBUILD +++ b/extra/glibmm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 156794 2012-04-23 09:05:47Z ibiru $ +# $Id: PKGBUILD 163765 2012-07-19 08:32:36Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase=glibmm pkgname=('glibmm' 'glibmm-docs') -pkgver=2.32.0 +pkgver=2.32.1 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL') @@ -12,7 +12,7 @@ makedepends=('glib2' 'libsigc++2.0' 'pkgconfig') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) options=('!libtool') url="http://www.gtkmm.org/" -sha256sums=('e1806f884c6e9f904ee2af0d39dd8d4de3f91a039f897f54333b0890de06f94b') +sha256sums=('d6ed4d38e8739813941a0f0fec471c00ea93c5ed46179543340821c7ca798a2f') build() { cd "$pkgname-$pkgver" diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 82b87b799..fb7d66d75 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163094 2012-07-06 22:39:28Z eric $ +# $Id: PKGBUILD 163750 2012-07-19 04:55:07Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.7.8.1 +pkgver=6.7.8.4 pkgrel=1 arch=('i686' 'x86_64') url="http://www.imagemagick.org/" @@ -12,7 +12,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr') source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('b14046ed6dead94ad78a7c710fd214482bf4715a' +sha1sums=('3cca01dad3596502a149229e28226b1b2a037915' '23405f80904b1de94ebd7bd6fe2a332471b8c283') build() { diff --git a/extra/libchamplain/PKGBUILD b/extra/libchamplain/PKGBUILD index 0f033c092..52659e26a 100644 --- a/extra/libchamplain/PKGBUILD +++ b/extra/libchamplain/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 156888 2012-04-23 09:08:23Z ibiru $ +# $Id: PKGBUILD 163767 2012-07-19 08:35:19Z heftig $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Michael Kanis <mkanis@gmx.de> pkgname=libchamplain -pkgver=0.12.2 +pkgver=0.12.3 pkgrel=1 pkgdesc="Gtk3 widget for displaying rasterized maps" url="http://projects.gnome.org/libchamplain/" license=('LGPL') arch=('i686' 'x86_64') options=('!libtool') -depends=('clutter-gtk' 'libsoup-gnome' 'cairo' 'sqlite3') +depends=('clutter-gtk' 'libsoup-gnome' 'cairo' 'sqlite') makedepends=('gobject-introspection' 'gtk-doc' 'vala') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('d23f97875e407fdc3e8fc86bef538a377c42f37f5be4fc8ec6063e7446fd7e2e') +sha256sums=('3d03d4e6892305a3b5b78e0718e486f6a13271df33d82383fd8361ef71f3e658') build() { cd $pkgname-$pkgver diff --git a/extra/php-apc/PKGBUILD b/extra/php-apc/PKGBUILD index fb206c7a1..a67c313c2 100644 --- a/extra/php-apc/PKGBUILD +++ b/extra/php-apc/PKGBUILD @@ -1,23 +1,20 @@ -# $Id: PKGBUILD 161426 2012-06-11 09:03:14Z pierre $ +# $Id: PKGBUILD 163778 2012-07-19 22:22:31Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=php-apc -pkgver=3.1.10 -pkgrel=3 +pkgver=3.1.11 +pkgrel=1 arch=('i686' 'x86_64') pkgdesc='A free, open, and robust framework for caching and optimizing PHP intermediate code' url='http://pecl.php.net/package/APC' depends=('php') license=('PHP') -source=("http://pecl.php.net/get/APC-${pkgver}.tgz" - 'svn.patch') +source=("http://pecl.php.net/get/APC-${pkgver}.tgz") backup=('etc/php/conf.d/apc.ini') -md5sums=('f4a6b91903d6ba9dce89fc87bb6f26c9' - 'ce07a1b49b5af496e16362899df3e3c4') +md5sums=('199b69ed1423aa869acafff485ef5f06') build() { cd $srcdir/APC-$pkgver - patch -p0 -i ${srcdir}/svn.patch phpize ./configure --prefix=/usr make diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index d6c4bfb03..19e1b6663 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 161823 2012-06-15 06:04:39Z pierre $ +# $Id: PKGBUILD 163752 2012-07-19 05:20:23Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -21,7 +21,7 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.4.4 +pkgver=5.4.5 pkgrel=1 arch=('i686' 'x86_64') license=('PHP') @@ -33,10 +33,10 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx' source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch' 'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles') -md5sums=('1fd98dc3f6f3805cd67bff12a26ed77f' +md5sums=('ffcc7f4dcf2b79d667fe0c110e6cb724' '0b0bc7a917fc592bdf11dcd3c5c255e9' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' - 'aabda9f3f2f8b9d8fdc9558c31c718db' + '6d46667e00d65933ec0c958279c0a803' '825e580dd5708d959b50944afa1b12b6' 'f56b5bb7e93c802ae8519182fbea3387' '86c73d481f3099e740e602869bacf637' diff --git a/extra/php/rc.d.php-fpm b/extra/php/rc.d.php-fpm index 3b3ec20de..47f0886ac 100644 --- a/extra/php/rc.d.php-fpm +++ b/extra/php/rc.d.php-fpm @@ -86,7 +86,7 @@ case "$1" in kill -QUIT `cat /run/php-fpm/php-fpm.pid` - wait_for_pid removed /run/php-fpm.pid + wait_for_pid removed /run/php-fpm/php-fpm.pid if [ -n "$try" ] ; then stat_fail diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD index cca5f2472..0dad5f6fa 100644 --- a/extra/pulseaudio/PKGBUILD +++ b/extra/pulseaudio/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160369 2012-06-01 12:58:42Z dreisner $ +# $Id: PKGBUILD 163774 2012-07-19 19:37:59Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Corrado Primier <bardo@aur.archlinux.org> @@ -7,8 +7,8 @@ pkgbase=pulseaudio pkgname=(pulseaudio libpulse) pkgdesc="A featureful, general-purpose sound server" -pkgver=2.0 -pkgrel=2 +pkgver=2.1 +pkgrel=1 arch=(i686 x86_64) url="http://www.freedesktop.org/wiki/Software/PulseAudio" license=(GPL LGPL) @@ -18,17 +18,13 @@ makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit libsystemd) options=(!emptydirs !libtool) source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz - pulseaudio.xinit 0001-Remove-usage-of-deprecated-udev_get_-_path.patch) -sha256sums=('28b42edd42f4879a6884af5f0ec11801ac001eb7582881215b36649aa37e2061' - 'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf' - '13e3cbe5499e462e8d818aa1faa2419aa880888ec18b4757cabbd7f5fcd6e803') + pulseaudio.xinit) +sha256sums=('ef6b347bf47abfb98080795f1583018ac959b4aeb4df916b879f9e1eaba0ca7f' + 'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf') build() { cd $pkgbase-$pkgver - # libudev.so.1.0.0 - patch -Np1 -i ../0001-Remove-usage-of-deprecated-udev_get_-_path.patch - ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD index 37f872972..dbe5821f2 100644 --- a/extra/tracker/PKGBUILD +++ b/extra/tracker/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 158542 2012-05-04 17:15:31Z heftig $ +# $Id: PKGBUILD 163766 2012-07-19 08:34:09Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgbase=tracker pkgname=(tracker libtracker-sparql) -pkgver=0.14.1 +pkgver=0.14.2 _tver=${pkgver%.*} pkgrel=1 pkgdesc="All-in-one indexer, search tool and metadata database" @@ -19,7 +19,7 @@ makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi' url="http://www.gnome.org" options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz) -sha256sums=('17ac4125d02c5f820eae9a785ac1c90b0e93682730a3950f82fd4a3dff238a43') +sha256sums=('9b59330aa2e9e09feee587ded895e9247f71fc25f46b023d616d9969314bc7f1') build() { cd $pkgbase-$pkgver diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index f83c7c6ba..d15b41d82 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,57 +1,35 @@ -# $Id: PKGBUILD 162867 2012-07-02 14:58:51Z andyrtr $ +# $Id: PKGBUILD 163776 2012-07-19 20:25:09Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> -pkgbase=xf86-video-intel -pkgname=('xf86-video-intel-uxa' 'xf86-video-intel-sna') -pkgver=2.19.0 -pkgrel=6 +pkgname=xf86-video-intel +pkgver=2.20.0 +pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') +install=$pkgname.install +pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers" depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util>=0.3.9' 'libxfixes' 'systemd-tools') makedepends=('xorg-server-devel>=1.12.0' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'libxrender') +replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna') +provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna') +conflicts=('xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy') options=('!libtool') groups=('xorg-drivers' 'xorg') -source=(${url}/archive/individual/driver/${pkgbase}-${pkgver}.tar.bz2) -sha1sums=('131934cf5e90bd48c883804cc644c4cb8b1de100') +source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('21949297220ceda32bba430f778c6409002079dc717c7190dbd1062ab4a56783') build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - mkdir build-{UXA,SNA} - - pushd build-UXA - ../configure --prefix=/usr --enable-dri --enable-uxa - make - popd - - pushd build-SNA - ../configure --prefix=/usr --enable-dri --enable-sna --enable-vmap + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ + --enable-dri make - popd } -package_xf86-video-intel-uxa() { - - pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers with UXA acceleration" - provides=('xf86-video-intel') - replaces=('xf86-video-intel') - conflicts=('xf86-video-intel-sna' 'xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy' 'xf86-video-intel') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install -C build-UXA - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} - -package_xf86-video-intel-sna() { - - pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers with SNA acceleration" - provides=('xf86-video-intel') - conflicts=('xf86-video-intel-uxa' 'xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy' 'xf86-video-intel') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install -C build-SNA +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/extra/xf86-video-intel/xf86-video-intel.install b/extra/xf86-video-intel/xf86-video-intel.install new file mode 100644 index 000000000..e3ddb5522 --- /dev/null +++ b/extra/xf86-video-intel/xf86-video-intel.install @@ -0,0 +1,8 @@ +post_install() { + echo ">>> This driver now allows to switch" + echo ">>> between several acceleration methods." + echo ">>> Add to the device section in /etc/X11/xorg.conf" + echo ">>> Option \"AccelMethod\" \"sna\"" + echo ">>> use uxa/xaa method if you run into trouble with sna." +} + diff --git a/extra/xfwm4/PKGBUILD b/extra/xfwm4/PKGBUILD index d03daab07..7fd1b766f 100644 --- a/extra/xfwm4/PKGBUILD +++ b/extra/xfwm4/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 157909 2012-04-30 04:21:48Z foutrelis $ +# $Id: PKGBUILD 163772 2012-07-19 16:30:24Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfwm4 pkgver=4.10.0 -pkgrel=1 +pkgrel=2 pkgdesc="Xfce window manager" arch=('i686' 'x86_64') url="http://www.xfce.org/" @@ -14,12 +14,17 @@ depends=('libxfce4ui' 'libwnck' 'hicolor-icon-theme') makedepends=('intltool') options=('!libtool') install=$pkgname.install -source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2) -sha256sums=('492357bf48121ebffabf2bf0d3b84213d19bf81087321175d687c8a68efe1f9c') +source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2 + xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch) +sha256sums=('492357bf48121ebffabf2bf0d3b84213d19bf81087321175d687c8a68efe1f9c' + 'f088a56cc05d1856af8d68dae9e40bc53b724d9dde4d8c2b78a88922c0ee6d1d') build() { cd "$srcdir/$pkgname-$pkgver" + # Fix https://bugzilla.xfce.org/show_bug.cgi?id=8949 (FS#29970) + patch -Np1 -i "$srcdir/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch" + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/xfwm4/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch b/extra/xfwm4/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch new file mode 100644 index 000000000..f01b554ce --- /dev/null +++ b/extra/xfwm4/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch @@ -0,0 +1,84 @@ +From 099614e3f045e06db7ab509e174510ea74857adb Mon Sep 17 00:00:00 2001 +From: Olivier Fourdan <fourdan@xfce.org> +Date: Wed, 18 Jul 2012 20:12:07 +0000 +Subject: Implement NET_WM_MOVERESIZE_CANCEL message (bug #8949) + +as gtk+-3.4 now uses it. +--- +diff --git a/src/display.h b/src/display.h +index 1ad2ef8..8797237 100644 +--- a/src/display.h ++++ b/src/display.h +@@ -163,7 +163,8 @@ enum + NET_WM_MOVERESIZE_SIZE_LEFT, + NET_WM_MOVERESIZE_MOVE, + NET_WM_MOVERESIZE_SIZE_KEYBOARD, +- NET_WM_MOVERESIZE_MOVE_KEYBOARD ++ NET_WM_MOVERESIZE_MOVE_KEYBOARD, ++ NET_WM_MOVERESIZE_CANCEL + }; + + enum +diff --git a/src/moveresize.c b/src/moveresize.c +index 9893c30..a98bdf7 100644 +--- a/src/moveresize.c ++++ b/src/moveresize.c +@@ -827,7 +827,7 @@ clientMoveEventFilter (XEvent * xevent, gpointer data) + eventFilterStatus status = EVENT_FILTER_STOP; + MoveResizeData *passdata = (MoveResizeData *) data; + Client *c = NULL; +- gboolean moving = TRUE; ++ gboolean moving; + XWindowChanges wc; + int prev_x, prev_y; + +@@ -840,6 +840,12 @@ clientMoveEventFilter (XEvent * xevent, gpointer data) + display_info = screen_info->display_info; + configure_flags = NO_CFG_FLAG; + ++ /* ++ * Clients may choose to end the move operation, ++ * we use XFWM_FLAG_MOVING_RESIZING for that. ++ */ ++ moving = FLAG_TEST (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING); ++ + /* Update the display time */ + myDisplayUpdateCurrentTime (display_info, xevent); + +@@ -1294,7 +1300,12 @@ clientResizeEventFilter (XEvent * xevent, gpointer data) + screen_info = c->screen_info; + display_info = screen_info->display_info; + status = EVENT_FILTER_STOP; +- resizing = TRUE; ++ ++ /* ++ * Clients may choose to end the resize operation, ++ * we use XFWM_FLAG_MOVING_RESIZING for that. ++ */ ++ resizing = FLAG_TEST (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING); + + frame_x = frameX (c); + frame_y = frameY (c); +diff --git a/src/netwm.c b/src/netwm.c +index 545e64a..1352f08 100644 +--- a/src/netwm.c ++++ b/src/netwm.c +@@ -695,10 +695,15 @@ clientNetMoveResize (Client * c, XClientMessageEvent * ev) + resize = TRUE; /* Resize */ + break; + case NET_WM_MOVERESIZE_MOVE: +- default: + event->type = ButtonPress; + resize = FALSE; /* Move */ + break; ++ case NET_WM_MOVERESIZE_CANCEL: ++ FLAG_UNSET (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING); ++ /* Walk through */ ++ default: /* Do nothing */ ++ return; ++ break; + } + + if (!FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)) +-- +cgit v0.9.0.3 diff --git a/libre/atool-libre/PKGBUILD b/libre/atool-libre/PKGBUILD index 7ec4d7c1e..ea1dfec52 100644 --- a/libre/atool-libre/PKGBUILD +++ b/libre/atool-libre/PKGBUILD @@ -3,12 +3,12 @@ # Contributor: leif_thande <leif.thande@gmail.com> # Contributor: tranquility <trankas@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> -# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy> +# Contributor (Parabola): Márcio Silva <coadde@lavabit.com> _pkgname=atool pkgname=atool-libre -pkgver=0.38.0 -pkgrel=3 +pkgver=0.39.0 +pkgrel=1 pkgdesc="A script for managing file archives of various types" arch=('any') url="http://www.nongnu.org/atool/" @@ -29,7 +29,7 @@ optdepends=('bzip2: for using atool with bzip2 compressed archives' 'unzip: for using atool for unpacking archives') source=(http://savannah.nongnu.org/download/$_pkgname/$_pkgname-$pkgver.tar.gz) -sha256sums=('b967195facbe5e7c6535ac117aaa7f633b0eca174137c30c36a5200efb80047d') +sha256sums=('aaf60095884abb872e25f8e919a8a63d0dabaeca46faeba87d12812d6efc703b') build() { diff --git a/libre/atool-libre/atool.changelog b/libre/atool-libre/atool.changelog new file mode 100644 index 000000000..ce0b12c2b --- /dev/null +++ b/libre/atool-libre/atool.changelog @@ -0,0 +1,18 @@ +2012-04-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * atool 0.39.0-1 + +2012-02-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * atool 0.38.0-2 + * signing package + +2011-08-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Updated to major version 0.38.0 + +2009-08-16 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Updated to major version 0.37.0 + +2008-10-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Updated to major version 0.36.0 + +2008-10-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Moved to [community] repo diff --git a/libre/crosstool-ng/PKGBUILD b/libre/crosstool-ng/PKGBUILD index 2aa38fca6..425e3d9e4 100644 --- a/libre/crosstool-ng/PKGBUILD +++ b/libre/crosstool-ng/PKGBUILD @@ -1,8 +1,9 @@ # Contributor: jwwolf <jwwolf+arch@gmail.com> # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar> +# Contributor (Parabola): Márcio Silva <coadde@lavabit.com> pkgname=crosstool-ng -pkgver=1.15.2 +pkgver=1.15.3 pkgrel=1 pkgdesc="A versatile cross toolchain generator (eglibc addons patch)" arch=('i686' 'x86_64') @@ -26,4 +27,4 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } -md5sums=('0d03314debb73de37a72014632bf1ab3') +md5sums=('a56d55f7173161b5200c144cdff6f564') diff --git a/libre/dvdrip-libre/PKGBUILD b/libre/dvdrip-libre/PKGBUILD index b9cd0c8ff..2069f1c8a 100644 --- a/libre/dvdrip-libre/PKGBUILD +++ b/libre/dvdrip-libre/PKGBUILD @@ -1,12 +1,12 @@ # $Id$ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Fredrik Hammar <Horney_C86@Hotmail.com> -# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy> +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> _pkgname=dvdrip pkgname=dvdrip-libre pkgver=0.98.11 -pkgrel=10 +pkgrel=10.1 pkgdesc="A Gtk frontend for transcode writen in Perl, without opcional hal and unfree rar dependencies" arch=('i686' 'x86_64') license=('custom') diff --git a/libre/epdfview-libre/PKGBUILD b/libre/epdfview-libre/PKGBUILD index 9923ad1cf..28c77eed8 100644 --- a/libre/epdfview-libre/PKGBUILD +++ b/libre/epdfview-libre/PKGBUILD @@ -3,11 +3,12 @@ # Maintainer: schuay <jakob.gruber@gmail.com> # Contributor: Tom K <tomk@runbox.com> # Contributor: Thayer Williams <thayer@archlinux.org> +# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy> pkgname=epdfview-libre _pkgname=epdfview pkgver=0.1.8 -pkgrel=3 +pkgrel=4 pkgdesc="A free lightweight PDF document viewer." url="http://www.emma-soft.com/projects/epdfview/" arch=('i686' 'x86_64' 'mips64el') @@ -20,9 +21,11 @@ replaces=('epdfview') install='epdfview.install' source=("http://www.emma-soft.com/projects/${_pkgname}/chrome/site/releases/${_pkgname}-${pkgver}.tar.bz2" "${_pkgname}.desktop.patch" + "glib2_headers.patch" "0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch") md5sums=('e50285b01612169b2594fea375f53ae4' 'fbf22bbabdbb7544db615ac5775d57e2' + '41b30f53f20472cbc2fcd4eae161125e' '7f9ea101a41f5b4e999fd024f423d41f') build() { @@ -30,6 +33,7 @@ build() { patch -Np0 -i "${srcdir}/${_pkgname}.desktop.patch" patch -Np1 -i "${srcdir}/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch" + patch -Np1 -i "${srcdir}/glib2_headers.patch" # FS#30116 # Use xdg-open as default browser. sed -r '/DEFAULT_EXTERNAL_BROWSER_COMMAND_LINE/s/firefox[^ ]*/xdg-open/' -i src/Config.cxx diff --git a/libre/epdfview-libre/glib2_headers.patch b/libre/epdfview-libre/glib2_headers.patch new file mode 100644 index 000000000..b5bc5c211 --- /dev/null +++ b/libre/epdfview-libre/glib2_headers.patch @@ -0,0 +1,12 @@ +diff --git a/src/gtk/StockIcons.h b/src/gtk/StockIcons.h +index c142a7a..58fcf2e 100644 +--- a/src/gtk/StockIcons.h ++++ b/src/gtk/StockIcons.h +@@ -18,7 +18,7 @@ + #if !defined (__STOCK_ICONS_H__) + #define __STOCK_ICONS_H__ + +-#include <glib/gmacros.h> ++#include <glib.h> + + G_BEGIN_DECLS diff --git a/libre/hardinfo/PKGBUILD b/libre/hardinfo/PKGBUILD index 47f4c1330..1987e191e 100644 --- a/libre/hardinfo/PKGBUILD +++ b/libre/hardinfo/PKGBUILD @@ -1,9 +1,10 @@ # $Id$ # Maintainer: Eric Bélanger <eric@archlinux.org> +# Contributor (Parabola): Márcio Silva <coadde@lavabit.com> pkgname=hardinfo pkgver=0.5.1 -pkgrel=4 +pkgrel=5 pkgdesc="A system information and benchmark tool." arch=('i686' 'x86_64') url="http://hardinfo.berlios.de/wiki/index.php/Main_Page" @@ -12,9 +13,6 @@ depends=('gtk2' 'libsoup') options=('!emptydirs') source=(http://download.berlios.de/hardinfo/${pkgname}-${pkgver}.tar.bz2 \ fixsensors.patch hardinfo.distro) -md5sums=('6fb38992e140f2fab16518ae1f38e188' - '05c212db07b9f152cdea052ff7bb28fa' - '2c609f4b3c7f202d043bdef082c2bef0') sha1sums=('983f0445aa60e02156bc5a5eaedeffb30b8e4d64' 'd2151dce76dca238102937d0e15541f172bca530' '9425e09191cd3a365a3afce57ca1973a6439fa57') @@ -25,8 +23,6 @@ build() { sed -i 's|/usr/lib64|/usr/lib|' configure ./configure --prefix=/usr sed -i 's|lib64|lib|' binreloc.c - sed -i 's|/sbin/lsmod|/bin/lsmod|g' arch/linux/{parisc,ppc,m68k,x86,common,mips,sparc,x86_64}/modules.h - sed -i 's|/sbin/lsmod|/bin/lsmod|g' arch/this/modules.h sed -i 's|{ DB_PREFIX "debian_version", "deb" },|{ DB_PREFIX "hardinfo.distro", "parabola" },{ DB_PREFIX "debian_version", "deb" },|' computer.h make } diff --git a/libre/iceape-i18n/PKGBUILD b/libre/iceape-i18n/PKGBUILD index 5f4db3101..7bfca020f 100644 --- a/libre/iceape-i18n/PKGBUILD +++ b/libre/iceape-i18n/PKGBUILD @@ -1,5 +1,6 @@ # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> -# Maintainer: André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> # Contributor: fauno <fauno@kiwwwi.com.ar> # Contributor: Figue <ffigue@gmail.com> # Based on icecat-i18n package, which is in turn based on firefox-i18n @@ -15,7 +16,7 @@ _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } -_langpacks=(be ca cs de en-GB es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT ru sk sv-SE tr zh-CN) +_langpacks=(be ca cs de en-GB es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT ru sk sv-SE tr zh-CN) pkgbase=iceape-i18n pkgname=($(for lang in ${_langpacks[@]} @@ -23,7 +24,7 @@ pkgname=($(for lang in ${_langpacks[@]} done)) _pkgver=2.7.5 pkgver=${_debver}.${_debrel} -pkgrel=1 +pkgrel=2 pkgdesc="Language packs for Debian Iceape." arch=('any') @@ -62,6 +63,7 @@ md5sums=('03a75ce1325fc748d0943cd39659e8ca' '6cb55fe51fca1de674ca32b10edc7c8b' '138121b288c269aa418ca0c33eb65326' '8fd47eed7c79fe29c74a81d9b4a4864a' + '71f6007df53b17361965f38c01869738' 'f253842c0a377e86c6c62f7db27db32d' 'b93caebe5ceb08d2cde78fe40fff3c0c' 'a36d0776b736609b1e72b8530cc9e755' diff --git a/libre/licenses-libre/PKGBUILD b/libre/licenses-libre/PKGBUILD index 6097d67b8..8a3d62929 100644 --- a/libre/licenses-libre/PKGBUILD +++ b/libre/licenses-libre/PKGBUILD @@ -1,9 +1,10 @@ # $Id: PKGBUILD 82120 2010-06-08 16:36:51Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar> +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> pkgname=licenses-libre -pkgver=2.8 +pkgver=2.9 pkgrel=1 pkgdesc="The standard licenses distribution package" arch=('any') @@ -13,6 +14,7 @@ groups=('base') provides=("licenses=${pkgver}") conflicts=('licenses') replaces=('licenses') +makedepends=(links) source=(apache-2.0.txt::http://www.apache.org/licenses/LICENSE-2.0.txt cc-by-3.0.txt cc-by-sa-3.0.txt @@ -120,7 +122,7 @@ md5sums=('3b83ef96387f14655fc854ddc3c6bd57' 'd09c120ca7db95ef2aeecec0cb08293b' 'b4a94da2a1f918b217ef5156634fc9e0' 'a45bb1bbeed9e26b26c5763df1d3913d' - '68d59ff8306e3a9f5f1c01462c77a317' + 'bfecdc446cd2a6a4410ac9e6d0064b3a' 'f083e41c43db25e18f36c91e57750b64' 'a055911c32fb4ed6e96c453ceaeba857' 'dc8502850eab9e1ff330a12d7ca18a19') diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 9793f599e..d2a5610df 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -9,9 +9,9 @@ pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE-LTS k # pkgname=linux-custom # Build kernel with a different name _kernelname=-LIBRE-LTS _basekernel=3.0 -_sublevel=37 +_sublevel=38 pkgver=${_basekernel}.${_sublevel} -_lxopkgver=${_basekernel}.36 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.37 # nearly always the same as pkgver pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'ext4-options.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - '5fbdf641fc8962f875d1e9e8ce8f2969' + '8a2416fd6ac323184ab563958a6eb560' '9cfcf3807201ce44aa720571232a10ce' '8bb5c5aa217202c3ac3798ba7798e07d' 'c072b17032e80debc6a8626299245d46' @@ -42,7 +42,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' 'f36222e7ce20c8e4dc27376f9be60f6c' - '7102cdd847f0bd7102f0ad01fa43f454') + 'f0c4e2fa00e3f9fd9d666742c32beefb') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index 12b654f19..226061525 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.37-1-LIBRE-LTS +KERNEL_VERSION=3.0.38-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index d36ba4da2..759a5fea1 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -12,9 +12,9 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock - # pkgname=linux-custom # Build kernel with a different name _kernelname=-LIBRE _basekernel=3.4 -_sublevel=5 +_sublevel=6 pkgver=${_basekernel}.${_sublevel} -_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -35,7 +35,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn '3.4.4-fix-backlight-regression.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' - '0882e254b12df2c8d73df29de85223a7' + 'fe16da96e942fcfc195fc53ff93e3864' '669c3f9d5c6a2109bad8e511287826c3' '454231e14419e56a5281eb7bc6fde83e' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -45,7 +45,7 @@ md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' '80a46681386bb87813989faeb92bdd9a' - '86910efeadb5d1e5d5416ff1a9dacb33') + 'a9338d11a2b23fe0cd43cc4fee5aed42') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 7d7e7a1db..38394ad7b 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.4.5-1-LIBRE +KERNEL_VERSION=3.4.6-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index c4d8b1e95..1738c0aae 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=21 +pkgrel=22 epoch=1 _extramodules=extramodules-3.4-LIBRE arch=('i686' 'x86_64' 'mips64el') diff --git a/libre/virtualbox-modules/PKGBUILD b/libre/virtualbox-modules/PKGBUILD index 6406715b1..f965869f7 100644 --- a/libre/virtualbox-modules/PKGBUILD +++ b/libre/virtualbox-modules/PKGBUILD @@ -6,7 +6,7 @@ pkgbase=virtualbox-modules pkgname=('virtualbox-modules' 'virtualbox-parabola-modules') pkgver=4.1.18 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/multilib/lib32-libpulse/PKGBUILD b/multilib/lib32-libpulse/PKGBUILD index 3c702876e..39c398c93 100644 --- a/multilib/lib32-libpulse/PKGBUILD +++ b/multilib/lib32-libpulse/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70578 2012-05-12 00:38:30Z heftig $ +# $Id: PKGBUILD 74083 2012-07-19 19:41:16Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Corrado Primier <bardo@aur.archlinux.org> @@ -7,7 +7,7 @@ _pkgbasename=libpulse pkgname=lib32-$_pkgbasename pkgdesc="A featureful, general-purpose sound server (32-bit client libraries)" -pkgver=2.0 +pkgver=2.1 pkgrel=1 arch=(x86_64) url="http://pulseaudio.org/" @@ -22,7 +22,7 @@ conflicts=(lib32-pulseaudio) replaces=(lib32-pulseaudio) options=(!emptydirs !libtool) source=("http://freedesktop.org/software/pulseaudio/releases/pulseaudio-$pkgver.tar.xz") -sha256sums=('28b42edd42f4879a6884af5f0ec11801ac001eb7582881215b36649aa37e2061') +sha256sums=('ef6b347bf47abfb98080795f1583018ac959b4aeb4df916b879f9e1eaba0ca7f') _libs="libpulse.la libpulse-simple.la libpulse-mainloop-glib.la" _pkglibs="libpulsecommon-$pkgver.la libpulsedsp.la" diff --git a/testing/bash/PKGBUILD b/testing/bash/PKGBUILD index 8aaa5832b..51be4e9f7 100644 --- a/testing/bash/PKGBUILD +++ b/testing/bash/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 163211 2012-07-10 21:37:43Z allan $ +# $Id: PKGBUILD 163782 2012-07-20 02:08:58Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=bash _basever=4.2 -_patchlevel=036 #prepare for some patches +_patchlevel=037 #prepare for some patches pkgver=$_basever.$_patchlevel pkgrel=1 pkgdesc="The GNU Bourne Again shell" @@ -150,4 +150,6 @@ md5sums=('3fb927c7c33022f1c327f14a81c0d4b0' '7cd9bfdf7cbfd45274d07620ee94c8d9' 'a7d2eace0da5fd236c93dbfd93458838' '9c3142956064d175a880bcb186e51ef9' - 'a1a87649853f20fe99572ddc02b0c67f') + 'a1a87649853f20fe99572ddc02b0c67f' + 'c10692f447d4966c879f8fb8d7c8ebc9' + '1bf5e34ad46566bc2d0eb7560ff8968e') diff --git a/testing/bison/PKGBUILD b/testing/bison/PKGBUILD index b19dfedf5..cf442650b 100644 --- a/testing/bison/PKGBUILD +++ b/testing/bison/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160796 2012-06-06 02:47:05Z allan $ +# $Id: PKGBUILD 163784 2012-07-20 03:30:35Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> pkgname=bison -pkgver=2.5.1 +pkgver=2.6 pkgrel=1 pkgdesc="The GNU general-purpose parser generator" arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ depends=('glibc' 'm4' 'sh') groups=('base-devel') install=bison.install source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('012708d801a3c986d8654aa673530b61' - '6c7e9276aa8b89879126a611384897a8') +md5sums=('f96a16e79daaef71c797ed88f52e59d1' + 'd67a1a075ab0cccfb53ab23692be1a02') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/testing/glib2/PKGBUILD b/testing/glib2/PKGBUILD new file mode 100644 index 000000000..8bc1a779a --- /dev/null +++ b/testing/glib2/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 163756 2012-07-19 08:05:05Z heftig $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=glib2 +pkgver=2.32.4 +pkgrel=1 +pkgdesc="Common C routines used by GTK+ and other libs" +url="http://www.gtk.org/" +arch=(i686 x86_64) +license=('LGPL') +depends=('pcre' 'libffi') +makedepends=('pkg-config' 'python2') +optdepends=('python2: for gdbus-codegen') +options=('!libtool' '!docs' '!emptydirs') +source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz + glib2.sh + glib2.csh + revert-warn-glib-compile-schemas.patch) +sha256sums=('a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b167fae2' + '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a' + '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3' + '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') + +build() { + cd glib-$pkgver + patch -Rp1 -i "$srcdir/revert-warn-glib-compile-schemas.patch" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \ + --sysconfdir=/etc \ + --with-pcre=system \ + --disable-fam + make +} + +package() { + cd glib-$pkgver + make completiondir=/usr/share/bash-completion/completions DESTDIR="$pkgdir" install + + install -d "$pkgdir/etc/profile.d" + install -m755 "$srcdir/glib2.sh" "$pkgdir/etc/profile.d/" + install -m755 "$srcdir/glib2.csh" "$pkgdir/etc/profile.d/" + + for _i in "$pkgdir/usr/share/bash-completion/completions/"*; do + chmod -x "$_i" + done + sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir"/usr/bin/gdbus-codegen +} diff --git a/testing/glib2/glib2.csh b/testing/glib2/glib2.csh new file mode 100644 index 000000000..7aa3a2ffa --- /dev/null +++ b/testing/glib2/glib2.csh @@ -0,0 +1 @@ +setenv G_BROKEN_FILENAMES 1 diff --git a/testing/glib2/glib2.sh b/testing/glib2/glib2.sh new file mode 100644 index 000000000..96a056e1e --- /dev/null +++ b/testing/glib2/glib2.sh @@ -0,0 +1 @@ +export G_BROKEN_FILENAMES=1 diff --git a/testing/glib2/revert-warn-glib-compile-schemas.patch b/testing/glib2/revert-warn-glib-compile-schemas.patch new file mode 100644 index 000000000..75b05103c --- /dev/null +++ b/testing/glib2/revert-warn-glib-compile-schemas.patch @@ -0,0 +1,33 @@ +From 6560b37450cd19c4a7c7b690e279fe97b7bfdcaa Mon Sep 17 00:00:00 2001 +From: Ryan Lortie <desrt@desrt.ca> +Date: Thu, 12 Apr 2012 23:55:34 +0000 +Subject: glib-compile-schemas: warn about bad dconf paths + +For quite some time the recommended usage of GSettings and dconf has +been to use paths like /org/gnome/example/. Use of /apps/ has spilled +over from GConf and is continuing to make its way into a number of +applications as they port. + +glib-compile-schemas will now warn about these types of paths being +used. This generates a lot of noise, but hopefully it will reduce the +number of ported applications making this mistake. +--- +diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c +index cf02389..27d0181 100644 +--- a/gio/glib-compile-schemas.c ++++ b/gio/glib-compile-schemas.c +@@ -1204,6 +1204,12 @@ parse_state_start_schema (ParseState *state, + return; + } + ++ if (path && (g_str_has_prefix (path, "/apps/") || ++ g_str_has_prefix (path, "/desktop/") || ++ g_str_has_prefix (path, "/system/"))) ++ g_printerr ("warning: Schema '%s' has path '%s'. Paths starting with " ++ "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path); ++ + state->schema_state = schema_state_new (path, gettext_domain, + extends, extends_name, list_of); + +-- +cgit v0.9.0.2 diff --git a/testing/gtk2/PKGBUILD b/testing/gtk2/PKGBUILD new file mode 100644 index 000000000..611780d9b --- /dev/null +++ b/testing/gtk2/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 163760 2012-07-19 08:21:49Z heftig $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgbase=gtk2 +pkgname=('gtk2' 'gtk-update-icon-cache') +pkgver=2.24.11 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://www.gtk.org/" +makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' + 'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2' 'gobject-introspection') +options=('!libtool') +license=('LGPL') +source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz + xid-collision-debug.patch) +sha256sums=('328b4ea19a61040145e777e2ac49820968a382ac8581a380c9429897881812a9' + 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') + +build() { + cd "$srcdir/gtk+-$pkgver" + patch -Np1 -i "$srcdir/xid-collision-debug.patch" + + CXX=/bin/false ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --with-xinput=yes + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make +} + +package_gtk2() { + pkgdesc="GTK+ is a multi-platform toolkit (v2)" + install=gtk2.install + depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache') + backup=(etc/gtk-2.0/gtkrc) + replaces=('gtk2-docs') + + cd "$srcdir/gtk+-$pkgver" + + make DESTDIR="$pkgdir" install + sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert + echo 'gtk-fallback-icon-theme = "gnome"' > "$pkgdir/etc/gtk-2.0/gtkrc" + #split this out to use with gtk3 too + rm $pkgdir/usr/bin/gtk-update-icon-cache +} +package_gtk-update-icon-cache() { + pkgdesc="The GTK+ update icon cache tool" + depends=('gdk-pixbuf2>=2.24.1-3') + + cd "$srcdir/gtk+-$pkgver/gtk" + + install -D -m755 gtk-update-icon-cache $pkgdir/usr/bin/gtk-update-icon-cache +} diff --git a/testing/gtk2/gtk2.install b/testing/gtk2/gtk2.install new file mode 100644 index 000000000..a988c645b --- /dev/null +++ b/testing/gtk2/gtk2.install @@ -0,0 +1,16 @@ +post_install() { + gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +pre_remove() { + rm -f /etc/gtk-2.0/gtk.immodules &>/dev/null + rm -f /etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null +} diff --git a/testing/gtk2/xid-collision-debug.patch b/testing/gtk2/xid-collision-debug.patch new file mode 100644 index 000000000..d61238c3b --- /dev/null +++ b/testing/gtk2/xid-collision-debug.patch @@ -0,0 +1,15 @@ +--- gtk+-2.18.3/gdk/x11/gdkxid.c 2009-06-19 04:59:18.000000000 +0200 ++++ gtk+-2.18.3/gdk/x11/gdkxid.c.new 2009-07-22 11:30:12.000000000 +0200 +@@ -56,10 +56,10 @@ + if (!display_x11->xid_ht) + display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash, + (GEqualFunc) gdk_xid_equal); +- ++/* + if (g_hash_table_lookup (display_x11->xid_ht, xid)) + g_warning ("XID collision, trouble ahead"); +- ++*/ + g_hash_table_insert (display_x11->xid_ht, xid, data); + } + diff --git a/testing/gtk3/PKGBUILD b/testing/gtk3/PKGBUILD new file mode 100644 index 000000000..270e6a7aa --- /dev/null +++ b/testing/gtk3/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 163763 2012-07-19 08:26:23Z heftig $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=gtk3 +pkgver=3.4.4 +pkgrel=1 +pkgdesc="GObject-based multi-platform GUI toolkit (v3)" +arch=('i686' 'x86_64') +url="http://www.gtk.org/" +install=gtk3.install +depends=('atk' 'cairo' 'gtk-update-icon-cache' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info' 'colord') +makedepends=('gobject-introspection') +options=('!libtool') +backup=(etc/gtk-3.0/settings.ini) +license=('LGPL') +source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz + settings.ini wacom.patch) +sha256sums=('f154e460075034da4c0ce89c320025dcd459da2a1fdf32d92a09522eaca242c7' + 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621' + '86bda95a14a99d0f596c4ecb2ed715689f71c207c65dfc90a39d4ae7f1c0c0f5') +build() { + cd "gtk+-$pkgver" + + # Partially revert BGO#673440 in order to fix BGO#674157 + patch -Np1 -i ../wacom.patch + + CXX=/bin/false ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --enable-gtk2-dependency \ + --disable-schemas-compile + #https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make +} + +package() { + cd "gtk+-$pkgver" + make DESTDIR="$pkgdir" install + + install -Dm644 "$srcdir/settings.ini" "$pkgdir/etc/gtk-3.0/settings.ini" +} diff --git a/testing/gtk3/gtk3.install b/testing/gtk3/gtk3.install new file mode 100644 index 000000000..ca20d2865 --- /dev/null +++ b/testing/gtk3/gtk3.install @@ -0,0 +1,16 @@ +post_install() { + /usr/bin/gtk-query-immodules-3.0 --update-cache + /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +pre_remove() { + rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache +} + +post_remove() { + /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas +} diff --git a/testing/gtk3/settings.ini b/testing/gtk3/settings.ini new file mode 100644 index 000000000..039000d38 --- /dev/null +++ b/testing/gtk3/settings.ini @@ -0,0 +1,2 @@ +[Settings] +gtk-fallback-icon-theme = gnome diff --git a/testing/gtk3/wacom.patch b/testing/gtk3/wacom.patch new file mode 100644 index 000000000..79ad84fc6 --- /dev/null +++ b/testing/gtk3/wacom.patch @@ -0,0 +1,12 @@ +diff -u -r gtk+-3.4.2/gdk/x11/gdkdevicemanager-xi2.c gtk+-3.4.2-wacom/gdk/x11/gdkdevicemanager-xi2.c +--- gtk+-3.4.2/gdk/x11/gdkdevicemanager-xi2.c 2012-05-02 14:45:04.000000000 +0200 ++++ gtk+-3.4.2-wacom/gdk/x11/gdkdevicemanager-xi2.c 2012-05-03 18:34:18.034807644 +0200 +@@ -331,6 +331,8 @@ + input_source = GDK_SOURCE_ERASER; + else if (strstr (tmp_name, "cursor")) + input_source = GDK_SOURCE_CURSOR; ++ else if (strstr (tmp_name, "finger")) ++ input_source = GDK_SOURCE_TOUCHSCREEN; + else if (strstr (tmp_name, "wacom") || + strstr (tmp_name, "pen")) + input_source = GDK_SOURCE_PEN; diff --git a/testing/readline/PKGBUILD b/testing/readline/PKGBUILD index f81f8c530..721a13545 100644 --- a/testing/readline/PKGBUILD +++ b/testing/readline/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 163215 2012-07-10 21:53:26Z allan $ +# $Id: PKGBUILD 163780 2012-07-20 01:54:37Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=readline _basever=6.2 -_patchlevel=003 #prepare for some patches +_patchlevel=004 #prepare for some patches pkgver=$_basever.$_patchlevel -pkgrel=2 +pkgrel=1 pkgdesc="GNU readline library" arch=('i686' 'x86_64') url="http://tiswww.case.edu/php/chet/readline/rltop.html" @@ -30,7 +30,9 @@ md5sums=('67948acb2ca081f23359d0256e9a271c' '0665020ea118e8434bd145fb71f452cc' '285361ca6d48c51ae2428157e174e812' 'c9d5d79718856e711667dede87cb7622' - '4437205bb1462f5f32e4812b8292c675') + '4437205bb1462f5f32e4812b8292c675' + 'c08e787f50579ce301075c523fa660a4' + '7e39cad1d349b8ae789e4fc33dbb235f') build() { cd ${srcdir}/${pkgname}-$_basever |