diff options
50 files changed, 452 insertions, 227 deletions
diff --git a/community/abuse/PKGBUILD b/community/abuse/PKGBUILD index 22fb9d7ff..8e003eac4 100644 --- a/community/abuse/PKGBUILD +++ b/community/abuse/PKGBUILD @@ -1,55 +1,32 @@ -# $Id: PKGBUILD 8618 2008-08-14 04:01:43Z kevin $ -# Committer: jlvsimoes <jlvsimoes@oninet.pt> -# Maintainer: kevin <kevin@archlinux.org> +# $Id: PKGBUILD 46622 2011-05-10 10:00:25Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: jlvsimoes <jlvsimoes@oninet.pt> +# Contributor: kevin <kevin@archlinux.org> pkgname=abuse -pkgver=0.7.1 +pkgver=0.8 pkgrel=1 -pkgdesc="A side-scroller action game that pits you against ruthless alien killers" -url="http://abuse.zoy.org/" -depends=('gcc-libs' 'libgl' 'sdl') -# abuse-data below is the original commercial levels and sound effects. -# abuse-frabs contains community created levels. -# abuse-lib is the original demo levels. -# abuse-sfx is the original sound effects, included in abuse-data. -source=(http://abuse.zoy.org/raw-attachment/wiki/Downloads/${pkgname}-${pkgver}.tar.gz -http://abuse.zoy.org/raw-attachment/wiki/Downloads/${pkgname}-data-2.00.tar.gz -http://abuse.zoy.org/raw-attachment/wiki/Downloads/${pkgname}-frabs-2.11.tar.gz -abuse.patch) -noextract=(abuse-data-2.00.tar.gz) -license=('GPL' 'custom') +pkgdesc='A side-scroller action game that pits you against ruthless alien killers.' arch=('i686' 'x86_64') -install=abuse.install -md5sums=('439b607f291560a8f9698a2f09cffa63' - '2b857668849b2dc7cd29cdd84a33c19e' - '0686f951289fe514846903bab36a2079' - '86b5256f066e994db9d57dbe1ec2a58e') +url='http://abuse.zoy.org/' +license=('GPL' 'custom') +depends=('gcc-libs' 'libgl' 'sdl' 'sdl_mixer') +install='abuse.install' +source=("http://abuse.zoy.org/raw-attachment/wiki/download/${pkgname}-${pkgver}.tar.gz") +md5sums=('ec678b8dc8d00e0382d8c805c6438489') build() { - cd ${srcdir}/abuse-${pkgver} - patch -p1 -i ${srcdir}/abuse.patch - ./configure --prefix=/usr --datadir=/usr/share/abuse/orig --with-x - make || return 1 - make DESTDIR=${pkgdir} install + cd "${srcdir}/abuse-${pkgver}" - mkdir -p ${pkgdir}/usr/share/abuse/{frabs,orig} - mkdir -p ${pkgdir}/usr/share/licenses/abuse - - # original code license. sdlport is gpl. - sed -n '1,/^$/ p' src/view.cpp > \ - ${pkgdir}/usr/share/licenses/abuse/orig.code.license + ./configure --prefix=/usr --with-assetdir=/usr/share/abuse/orig --with-x + make +} - # original game data. - cd ${pkgdir}/usr/share/abuse/orig - tar -xzf ${srcdir}/abuse-data-2.00.tar.gz - mv README.datafiles ${pkgdir}/usr/share/licenses/abuse/orig.data.license +package() { + cd "${srcdir}/abuse-${pkgver}" - # frabs data, link to sound in orignal game data. - cd ${pkgdir}/usr/share/abuse/frabs - mv ${srcdir}/abuse-frabs-2.11/* . - rm -f abuse.exe setup.exe art/dos4gw.exe art/spaint.exe - ln -s ../orig/sfx sfx - cp docs/index.html ${pkgdir}/usr/share/licenses/abuse/frabs.license + make DESTDIR="${pkgdir}" install - chown -R root:root ${pkgdir}/usr/share + install -d "${pkgdir}/usr/share/licenses/abuse" + sed -n '1,/^$/p' src/view.cpp > "${pkgdir}/usr/share/licenses/abuse/orig.code.license" } diff --git a/community/clementine/PKGBUILD b/community/clementine/PKGBUILD index 8f453aba7..4d0965bed 100644 --- a/community/clementine/PKGBUILD +++ b/community/clementine/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 44544 2011-04-08 11:52:13Z stephane $ +# $Id: PKGBUILD 46607 2011-05-09 23:12:17Z stephane $ #Maintainer: Stéphane Gaudreault <stephane@archlinux.org> #Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > #Contributor: Dany Martineau <dany.luc.martineau@gmail.com> pkgname=clementine pkgver=0.7.1 -pkgrel=2 +pkgrel=3 pkgdesc="A music player and library organizer" url="http://www.clementine-player.org/" license=('GPL') @@ -16,13 +16,16 @@ optdepends=('gstreamer0.10-base-plugins: for more open formats' 'gstreamer0.10-good-plugins: for use with "Good" plugin libraries' 'gstreamer0.10-bad-plugins: for use with "Bad" plugin libraries' 'gstreamer0.10-ugly-plugins: for use with "Ugly" plugin libraries') -source=(http://clementine-player.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) -sha1sums=('8b2025b8876f9f3fe33ef5001e0621f3a5d0f142') +source=(http://clementine-player.googlecode.com/files/${pkgname}-${pkgver}.tar.gz + clementine-0.7.1-fix-devicekit.patch) +sha1sums=('8b2025b8876f9f3fe33ef5001e0621f3a5d0f142' + 'd595e2746949363680e0d64fe2fb97b524c8d27c') install=clementine.install build() { cd "${srcdir}/${pkgname}-${pkgver}" - cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DSTATIC_SQLITE=0 + patch -Np1 -i ../clementine-0.7.1-fix-devicekit.patch + cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DSTATIC_SQLITE=0 -DENABLE_GIO=OFF make } diff --git a/community/clementine/clementine-0.7.1-fix-devicekit.patch b/community/clementine/clementine-0.7.1-fix-devicekit.patch new file mode 100644 index 000000000..797a2c864 --- /dev/null +++ b/community/clementine/clementine-0.7.1-fix-devicekit.patch @@ -0,0 +1,11 @@ +diff -Naur clementine-0.7.1.ori/src/config.h.in clementine-0.7.1/src/config.h.in +--- clementine-0.7.1.ori/src/config.h.in 2011-03-29 12:16:15.000000000 -0700 ++++ clementine-0.7.1/src/config.h.in 2011-05-09 16:00:26.505080057 -0700 +@@ -29,6 +29,7 @@ + #cmakedefine HAVE_STATIC_SQLITE + + #cmakedefine HAVE_DBUS ++#cmakedefine HAVE_DEVICEKIT + #cmakedefine HAVE_GIO + #cmakedefine HAVE_IMOBILEDEVICE + #cmakedefine HAVE_LIBARCHIVE diff --git a/community/e-modules-extra-svn/PKGBUILD b/community/e-modules-extra-svn/PKGBUILD index 7bfb26aad..a07670b6c 100755 --- a/community/e-modules-extra-svn/PKGBUILD +++ b/community/e-modules-extra-svn/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=e-modules-extra-svn -pkgver=59120 +pkgver=59230 pkgrel=1 pkgdesc="Extra gadgets for e17" arch=('i686' 'x86_64') diff --git a/community/e-svn/PKGBUILD b/community/e-svn/PKGBUILD index 48ef4531c..c8cd05745 100755 --- a/community/e-svn/PKGBUILD +++ b/community/e-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 46198 2011-05-04 10:12:25Z rvanharen $ +# $Id: PKGBUILD 46667 2011-05-10 10:41:31Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=e-svn -pkgver=58940 +pkgver=59304 pkgrel=1 pkgdesc="Enlightenment window manager DR17 (aka e17)" arch=('i686' 'x86_64') diff --git a/community/ecore-svn/PKGBUILD b/community/ecore-svn/PKGBUILD index d1592bbb5..a2b3ce343 100755 --- a/community/ecore-svn/PKGBUILD +++ b/community/ecore-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 46172 2011-05-04 10:03:34Z rvanharen $ +# $Id: PKGBUILD 46641 2011-05-10 10:36:24Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=ecore-svn -pkgver=58945 +pkgver=59292 pkgrel=1 pkgdesc="Ecore is an abstraction layer for e17" arch=('i686' 'x86_64') diff --git a/community/edje-svn/PKGBUILD b/community/edje-svn/PKGBUILD index 6ebf925ae..dfebb98dd 100755 --- a/community/edje-svn/PKGBUILD +++ b/community/edje-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 46185 2011-05-04 10:07:59Z rvanharen $ +# $Id: PKGBUILD 46654 2011-05-10 10:39:07Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=edje-svn -pkgver=58887 +pkgver=59305 pkgrel=1 pkgdesc="A graphical design and layout library based on Evas" arch=('i686' 'x86_64') diff --git a/community/eina-svn/PKGBUILD b/community/eina-svn/PKGBUILD index 7a67482ed..f13808d17 100755 --- a/community/eina-svn/PKGBUILD +++ b/community/eina-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 46161 2011-05-04 09:59:52Z rvanharen $ +# $Id: PKGBUILD 46627 2011-05-10 10:33:50Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eina-svn -pkgver=58920 +pkgver=59299 pkgrel=1 pkgdesc="E17 file chunk reading/writing library" arch=('i686' 'x86_64') diff --git a/community/elementary-svn/PKGBUILD b/community/elementary-svn/PKGBUILD index a31116bb0..7c849b2d2 100644 --- a/community/elementary-svn/PKGBUILD +++ b/community/elementary-svn/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=elementary-svn -pkgver=58962 +pkgver=59308 pkgrel=1 pkgdesc="Enlightenment's basic widget set" arch=('i686' 'x86_64') diff --git a/community/evas-svn/PKGBUILD b/community/evas-svn/PKGBUILD index 6ec7762c2..9f1b1a3de 100755 --- a/community/evas-svn/PKGBUILD +++ b/community/evas-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 46169 2011-05-04 10:02:34Z rvanharen $ +# $Id: PKGBUILD 46636 2011-05-10 10:35:23Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=evas-svn -pkgver=58958 +pkgver=59306 pkgrel=1 pkgdesc="A hardware-accelerated canvas API for X-Windows" arch=('i686' 'x86_64') diff --git a/community/exim/PKGBUILD b/community/exim/PKGBUILD index 27aabe852..2dbf30500 100644 --- a/community/exim/PKGBUILD +++ b/community/exim/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 46480 2011-05-07 19:12:24Z angvp $ +# $Id: PKGBUILD 46614 2011-05-10 07:06:59Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Maintainer: judd <jvinet@zeroflux.org> pkgname=exim -pkgver=4.75 -pkgrel=2 +pkgver=4.76 +pkgrel=1 pkgdesc="A Message Transfer Agent" arch=(i686 x86_64) url="http://www.exim.org/" @@ -13,34 +13,28 @@ backup=(etc/mail/aliases etc/mail/exim.conf \ install=exim.install changelog=exim.changelog depends=('db' 'pcre' 'pam' 'tcp_wrappers' 'openssl' 'libldap') -makedepends=('sudo') provides=('smtp-server') conflicts=('smtp-server') options=('!makeflags') source=(ftp://mirrors.24-7-solutions.net/pub/exim/ftp/exim/exim4/exim-${pkgver}.tar.bz2 aliases - newaliases exim exim.logrotate exim.conf.d exim.Makefile - 475format.patch ) -md5sums=('427fb74bbd2afbea759e6da38f25af17' +md5sums=('58e784b33c7a2ab335ec6400346d6362' '4874006f0585253ddab027d441009757' - 'ea39f58bffc16f5e3bbe59dffcf09449' '9aed772e87223213e8da9ca5e7376869' 'd788c26f86a9d72a0aebb3b849fe74f2' 'b75fe4c6e960a59a25b5f51e8f61ba3a' - '61e76543476f52f136c1d6c80ac1c5a1' - '4d5e58f07896db227ea24bea57972bd1') + '61e76543476f52f136c1d6c80ac1c5a1') build() { cd ${srcdir}/${pkgname}-${pkgver} sed -i 's|tail -1|tail -n -1|g' scripts/Configure-config.h # Make some configuration changes cp ${srcdir}/${pkgname}.Makefile Local/Makefile - patch -p2 < ${srcdir}/475format.patch make } @@ -67,7 +61,6 @@ package() { >${pkgdir}/etc/mail/exim.conf cp ${srcdir}/aliases ${pkgdir}/etc/mail - cp ${srcdir}/newaliases ${pkgdir}/usr/sbin cd ${pkgdir}/usr/sbin for i in mailq rmail rsmtp runq sendmail do diff --git a/community/exim/exim.changelog b/community/exim/exim.changelog index afb4f843c..562a87b75 100644 --- a/community/exim/exim.changelog +++ b/community/exim/exim.changelog @@ -1,3 +1,9 @@ +2010-05-09 Angel Velasquez <angvp@archlinux.org> + * Updated to 4.76 + * Removed previous patch since is no longer needed + * Removed newaliases script FS#22744 + * Removed sudo dependency + 2010-05-07 Angel Velasquez <angvp@archlinux.org> * Adding patch for security issue see: http://goo.gl/QBict diff --git a/community/luakit/PKGBUILD b/community/luakit/PKGBUILD index 485bdc3c6..407c2c945 100644 --- a/community/luakit/PKGBUILD +++ b/community/luakit/PKGBUILD @@ -3,7 +3,7 @@ pkgname=luakit pkgver=2011.05.06 -pkgrel=1 +pkgrel=2 pkgdesc='luakit is a highly configurable, micro-browser framework based on the WebKit web content engine and the GTK+ toolkit."Stable" release' arch=('i686' 'x86_64') url='http://www.luakit.org/projects/luakit' @@ -13,8 +13,8 @@ makedepends=('git' 'help2man') options=(!makeflags) conflicts=('luakit-git' 'luakit-develop-git') install='luakit.install' -source=("${pkgver}.tar.gz::https://github.com/mason-larobina/luakit/tarball/${pkgver}") -md5sums=('eaf96d02aaecc1d8ba4f62f38565497f') +source=("${pkgver}-r1.tar.gz::https://github.com/mason-larobina/luakit/tarball/${pkgver}-r1") +md5sums=('ebf25ad1d37960ca8f70f13ebf45a874') build() { cd mason-larobina-luakit-* diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index a92c5cc21..0139b8242 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 46097 2011-05-03 14:39:45Z spupykin $ +# $Id: PKGBUILD 46704 2011-05-10 20:38:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> @@ -11,7 +11,7 @@ _user=http _group=http pkgname=nginx -pkgver=1.0.1 +pkgver=1.0.2 pkgrel=1 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server" arch=('i686' 'x86_64') @@ -27,14 +27,11 @@ backup=("etc/nginx/conf/nginx.conf" "etc/logrotate.d/nginx") source=(http://sysoev.ru/nginx/nginx-${pkgver}.tar.gz nginx) -md5sums=('4d4e70e3c6c907cb101c97e9cf9399c8' +md5sums=('8a528ccaab3ddba84e72443fa40b19e7' '837b010afcbdfe82d8e65ef00c4e14ba') build() { - local _src_dir=$srcdir/nginx-${pkgver} - local _build_dir=$_src_dir/objs - - cd $_src_dir + cd $srcdir/nginx-${pkgver} ./configure \ --prefix=${_server_root} \ --sbin-path=/usr/sbin/nginx \ @@ -53,6 +50,10 @@ build() { --with-ipv6 make +} + +package() { + cd $srcdir/nginx-${pkgver} make DESTDIR=$pkgdir install install -d $pkgdir/etc/logrotate.d/ diff --git a/community/oolite/PKGBUILD b/community/oolite/PKGBUILD new file mode 100644 index 000000000..c32d7c8e8 --- /dev/null +++ b/community/oolite/PKGBUILD @@ -0,0 +1,47 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Lone_Wolf <lonewolf@xs4all.nl> +pkgname=oolite +pkgver=1.75.2 +pkgrel=2 +pkgdesc="A space-sim based on the classic Elite" +arch=('i686' 'x86_64') +url="http://oolite-linux.berlios.de" +license=('GPL2') +depends=('gnustep-gui' 'sdl_mixer' 'mesa' 'espeak' 'nspr' 'python2' 'icu') +makedepends=('gcc-objc' 'gnustep-make' 'curl' 'zip') +source=(oolite http://download2.berlios.de/oolite-linux/oolite-dev-source-${pkgver}.tar.bz2) +md5sums=('d4b3fdc553fbd4aa4418864eebd21ede' + '926720981d94fd09c9e2824dbc102d5e') + +build() { + cd $srcdir + cp -r ${srcdir}/oolite-dev-source-${pkgver} ${srcdir}/${pkgname}-build + +# running 'make -f libjs.make debug=no' and/or 'make -f Makefile release' +# works from commandline, but gives errors that cause makepkg to abort + cd ${srcdir}/${pkgname}-build/deps/Cocoa-deps/scripts + ./update-mozilla.sh + mkdir -p ${srcdir}/${pkgname}-build/deps/Cross-platform-deps/mozilla/js/src/build-release + cd ${srcdir}/${pkgname}-build/deps/Cross-platform-deps/mozilla/js/src/build-release + ../configure --disable-shared-js --enable-threadsafe --with-system-nspr --disable-tests --enable-trace-jscalls +# end of lines needed to avoid makepkg aborting + cd ${srcdir}/${pkgname}-build + make -f libjs.make debug=no + make -f Makefile release +} + +package() { + mkdir -p ${pkgdir}/usr/bin + mkdir -p ${pkgdir}/usr/share/{oolite,applications,pixmaps,doc/oolite} + cd ${srcdir}/${pkgname}-build + cp -r oolite.app/* ${pkgdir}/usr/share/oolite/ +#install shellscript and icon + install -D -m755 ../oolite ${pkgdir}/usr/bin/oolite + install -D -m644 installers/FreeDesktop/oolite-icon.png ${pkgdir}/usr/share/pixmaps/oolite-icon.png +# copy .desktop file + install -D -m644 installers/FreeDesktop/oolite.desktop ${pkgdir}/usr/share/applications/oolite.desktop +# documentation + install -D -m644 Doc/AdviceForNewCommanders.pdf Doc/OoliteReadMe.pdf Doc/OoliteRS.pdf ${pkgdir}/usr/share/doc/oolite/ + } +# vim:set ts=2 sw=2 et: diff --git a/community/oolite/oolite b/community/oolite/oolite new file mode 100755 index 000000000..d20e28545 --- /dev/null +++ b/community/oolite/oolite @@ -0,0 +1,7 @@ +#!/bin/bash +source /usr/share/GNUstep/Makefiles/GNUstep.sh +if [ ! -d ~/.Oolite/AddOns ]; then + mkdir -p ~/.Oolite/AddOns +fi +/usr/share/oolite/oolite + diff --git a/community/pdmenu/PKGBUILD b/community/pdmenu/PKGBUILD index e483ac912..b201d9381 100644 --- a/community/pdmenu/PKGBUILD +++ b/community/pdmenu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 43384 2011-03-25 14:16:56Z spupykin $ +# $Id: PKGBUILD 46707 2011-05-10 20:39:33Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=pdmenu -pkgver=1.2.99 +pkgver=1.3.0 pkgrel=1 pkgdesc="simple full screen menu program" arch=('i686' 'x86_64') @@ -11,11 +11,15 @@ license=('GPL') depends=('gpm' 'slang') optdepends=('perl') source=(http://ftp.debian.org/debian/pool/main/p/pdmenu/pdmenu_$pkgver.tar.gz) -md5sums=('656d9fbfedef7018521ba0299ba7f4a4') +md5sums=('2530237cb0dca94905e03f12a320d78a') build() { cd $srcdir/pdmenu ./configure --prefix=/usr --sysconfdir=/etc make +} + +package() { + cd $srcdir/pdmenu make INSTALL_PREFIX=$pkgdir install } diff --git a/community/privoxy/PKGBUILD b/community/privoxy/PKGBUILD index 7e86f05be..e133f8029 100644 --- a/community/privoxy/PKGBUILD +++ b/community/privoxy/PKGBUILD @@ -1,11 +1,11 @@ -# $Id$ +# $Id: PKGBUILD 46699 2011-05-10 18:48:15Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Juergen Hoetzel <juergen@hoetzel.info> # Contributor: basilburn (basilburn), Paul Bredbury (brebs) pkgname=privoxy pkgver=3.0.17 -pkgrel=1 +pkgrel=2 pkgdesc='A web proxy with advanced filtering capabilities.' arch=('i686' 'x86_64') url='http://www.privoxy.org' @@ -22,7 +22,7 @@ source=("http://downloads.sourceforge.net/ijbswa/${pkgname}-${pkgver}-stable-src 'privoxy.logrotate.d' 'privoxy.conf.d') md5sums=('9d363d738a3f3d73e774d6dfeafdb15f' - 'a799e4d4f0ebb7f08190fa2bc961f439' + '1b4ed8c4e7e5b04b10ef41b597dc3f3b' 'a364c34c8dc6eb78c9a6b777237932de' '27830ef79418e277b90c1c1fa933f876') diff --git a/community/privoxy/privoxy b/community/privoxy/privoxy index eb85bd5f9..754453de5 100755 --- a/community/privoxy/privoxy +++ b/community/privoxy/privoxy @@ -6,17 +6,23 @@ # source application-specific settings [ -f /etc/conf.d/privoxy ] && . /etc/conf.d/privoxy +# read logdir and logfile from privoxy config +prld=`grep ^logdir "$PRIVOXY_CONF" 2>/dev/null | cut -d' ' -f2` +[ -n "$prld" ] || prld=/var/log/privoxy +prlf=`grep ^logfile "$PRIVOXY_CONF" 2>/dev/null | cut -d' ' -f2` +[ -n "$prlf" ] || prlf=logfile + PID=`pidof -o %PPID /usr/sbin/privoxy` case "$1" in start) stat_busy "Starting Privoxy" - # create missing logfiles - for f in logfile jarfile; do - touch "/var/log/privoxy/${f}" - chgrp "${PRIVOXY_GROUP}" "/var/log/privoxy/${f}" - chmod 0660 "/var/log/privoxy/${f}" - done + # create missing logdir and logfile + [ -d "$prld" ] || mkdir -p "$prld" + if [ ! -f "$prlf" ]; then + touch "$prld/$prlf" && chgrp "${PRIVOXY_GROUP}" "$prld/$prlf" && \ + chmod 0660 "$prld/$prlf" + fi [ -z "$PID" ] && /usr/sbin/privoxy --user ${PRIVOXY_USER}.${PRIVOXY_GROUP} \ ${PRIVOXY_ARGS} ${PRIVOXY_CONF} if [ $? -gt 0 ]; then @@ -42,6 +48,6 @@ case "$1" in $0 start ;; *) - echo "usage: $0 {start|stop|restart}" + echo "usage: $0 {start|stop|restart}" esac exit 0 diff --git a/community/tracker/PKGBUILD b/community/tracker/PKGBUILD index 08c2653f8..06a025799 100644 --- a/community/tracker/PKGBUILD +++ b/community/tracker/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 45591 2011-04-25 08:40:39Z spupykin $ +# $Id: PKGBUILD 46713 2011-05-10 20:40:42Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Alexander Fehr <pizzapunk gmail com> pkgname=tracker pkgver=0.10.10 -pkgrel=1 +pkgrel=2 pkgdesc="Powerful object database, tag/metadata database, search tool and indexer" arch=('i686' 'x86_64') url="http://www.gnome.org/projects/tracker/" diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD index b09bf289f..359ebf5f1 100644 --- a/community/vtk/PKGBUILD +++ b/community/vtk/PKGBUILD @@ -7,23 +7,32 @@ pkgname=vtk pkgver=5.6.1 -pkgrel=5 +pkgrel=6 pkgdesc='A software system for 3D computer graphics, image processing, and visualization which supports a wide variety of visualization algorithms and advanced modeling techniques.' arch=('i686' 'x86_64') url='http://www.vtk.org' license=('BSD') -depends=('libpng' 'libtiff' 'freetype2' 'python2' 'java-runtime' 'tk' 'boost' 'ffmpeg' 'qt' 'lesstif') +depends=('libpng' 'libtiff' 'freetype2' 'python2' 'java-runtime' 'tk' 'boost' 'ffmpeg' 'qt' 'lesstif' 'mysql') optdepends=('gnuplot: plotting tools' 'graphviz: drawing tools') makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa') source=("http://www.vtk.org/files/release/${pkgver:0:3}/${pkgname}-${pkgver}.tar.gz" - "http://www.vtk.org/files/release/${pkgver:0:3}/vtkdata-${pkgver}.tar.gz") + "http://www.vtk.org/files/release/${pkgver:0:3}/vtkdata-${pkgver}.tar.gz" + 'missingheader.diff') md5sums=('b80a76435207c5d0f74dfcab15b75181' - '67263bd972f923d39a60f01104368779') + '67263bd972f923d39a60f01104368779' + 'f7c60ac3ccaf61c41ca508e53d895d3e') build() { cd VTK + # remove next time version bump + patch -Np1 -i ${srcdir}/missingheader.diff + + # remove next time version bump + sed -i '31 i#include <vtksys/cstddef>' Common/vtkPythonUtil.cxx + + # fix for libpng 1.4 for _FILE in `grep -Rl "png_set_gray_1_2_4_to_8" *` do sed -i 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' ${_FILE} @@ -57,6 +66,7 @@ build() { -DVTK_USE_BOOST:BOOL=ON \ -DVTK_USE_INFOVIS:BOOL=ON \ -DVTK_USE_GL2PS:BOOL=ON \ + -DVTK_USE_MYSQL:BOOL=ON \ -DVTK_USE_FFMPEG_ENCODER:BOOL=ON \ -DVTK_USE_TEXT_ANALYSIS:BOOL=ON \ -DVTK_WRAP_JAVA:BOOL=ON \ diff --git a/community/vtk/missingheader.diff b/community/vtk/missingheader.diff new file mode 100644 index 000000000..47956d81d --- /dev/null +++ b/community/vtk/missingheader.diff @@ -0,0 +1,28 @@ +From be4c4f115793598f6c8937a98bdd1f227d471540 Mon Sep 17 00:00:00 2001 +From: Brad King <brad.king@kitware.com> +Date: Tue, 19 Apr 2011 15:25:09 -0400 +Subject: [PATCH] MetaIO: Add missing include <stddef.h> for ptrdiff_t + +Fixes error "ptrdiff_t was not declared in this scope". + +Author: David Doria <daviddoria@gmail.com> +Change-Id: I1e0dee67d26681f4119ac1fd00ecec3d139eb726 +--- + Utilities/vtkmetaio/metaUtils.cxx | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/Utilities/vtkmetaio/metaUtils.cxx b/Utilities/vtkmetaio/metaUtils.cxx +index dcb26ca..27bde1e 100644 +--- a/Utilities/vtkmetaio/metaUtils.cxx ++++ b/Utilities/vtkmetaio/metaUtils.cxx +@@ -18,6 +18,7 @@ + + #include <stdio.h> + #include <ctype.h> ++#include <stddef.h> + + #include <sys/stat.h> + #include <fcntl.h> +-- +1.7.0 + diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD index dbeee3c53..724a4f824 100644 --- a/extra/amule/PKGBUILD +++ b/extra/amule/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 120058 2011-04-18 22:46:19Z giovanni $ +# $Id: PKGBUILD 123337 2011-05-10 13:19:54Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Henrik Ronellenfitsch <searinox@web.de> # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org> pkgname=amule -pkgver=10525 +pkgver=10552 pkgrel=1 pkgdesc="An eMule-like client for ed2k p2p network" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ url="http://www.amule.org" license=('GPL') depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm') source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2") -md5sums=('d1b925a2ceac1c63b5fb1e42702c1a2a') +md5sums=('b3685a792e92c2900dbb3eaeba7cc65d') build() { cd "${srcdir}/aMule-SVN-r${pkgver}" diff --git a/extra/apache/PKGBUILD b/extra/apache/PKGBUILD index ab87adbbb..41b26cd97 100644 --- a/extra/apache/PKGBUILD +++ b/extra/apache/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 123237 2011-05-09 13:25:58Z jgc $ +# $Id: PKGBUILD 123392 2011-05-10 21:15:00Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=apache pkgver=2.2.17 -pkgrel=2 +pkgrel=3 pkgdesc='A high performance Unix-based HTTP server' arch=('i686' 'x86_64') options=('!libtool') diff --git a/extra/apr-util/PKGBUILD b/extra/apr-util/PKGBUILD index 2ea584661..c40bdaf6c 100644 --- a/extra/apr-util/PKGBUILD +++ b/extra/apr-util/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 96364 2010-10-20 01:39:57Z allan $ +# $Id: PKGBUILD 123397 2011-05-10 22:24:40Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=apr-util -pkgver=1.3.10 -pkgrel=2 +pkgver=1.3.11 +pkgrel=1 pkgdesc="The Apache Portable Runtime" arch=('i686' 'x86_64') url="http://apr.apache.org/" -depends=('apr>=1.4.2' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc') +depends=('apr' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc') options=('!libtool') license=('APACHE') source=("http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2") -md5sums=('6a6f501a1b2a45166b8ffd6df29204bb') +md5sums=('2aeddb384b03f3f73107770724d5c97b') build() { cd "${srcdir}/apr-util-${pkgver}" diff --git a/extra/apr/PKGBUILD b/extra/apr/PKGBUILD index b0d3f4d96..4bd4ae012 100644 --- a/extra/apr/PKGBUILD +++ b/extra/apr/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72235 2010-03-13 20:22:25Z jgc $ +# $Id: PKGBUILD 123387 2011-05-10 21:11:03Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=apr -pkgver=1.4.2 +pkgver=1.4.4 pkgrel=1 pkgdesc="The Apache Portable Runtime" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('util-linux-ng>=2.16') options=('!libtool') license=('APACHE') source=(http://www.apache.org/dist/apr/apr-${pkgver}.tar.bz2) -md5sums=('4b00e8f70c067893d075577962656b35') +md5sums=('daf5487c82dd7bec9c005c96f8cb01b1') build() { cd "${srcdir}/apr-${pkgver}" diff --git a/extra/dconf/PKGBUILD b/extra/dconf/PKGBUILD index e0d1b48a0..d9054bb6d 100644 --- a/extra/dconf/PKGBUILD +++ b/extra/dconf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 123094 2011-05-08 12:20:20Z ibiru $ +# $Id: PKGBUILD 123352 2011-05-10 15:42:26Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=dconf -pkgver=0.7.4 -pkgrel=2 +pkgver=0.7.5 +pkgrel=1 pkgdesc="A low-level configuration system." arch=(i686 x86_64) url="http://live.gnome.org/dconf" @@ -11,16 +11,12 @@ depends=('glib2') makedepends=('vala' 'gobject-introspection' 'gtk3') optdepends=('gtk3: for dconf-editor') install=dconf.install -source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.bz2 - fix-crash-when-user-database-is-not-present.patch) -sha256sums=('299d79daf0b214c692e7d5788d7bda76d778c1748ea37c33256c4fa6143b22cd' - 'c78ea8db69a1be1286846282897f99e843e14d1e450beee4339d5500b2f0f73d') +source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('e2103e8207744903790e9fac6427fa394bb485a0c7f4e0d03b0fb43268c34f33') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/fix-crash-when-user-database-is-not-present.patch" - ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/dconf make diff --git a/extra/dconf/dconf.install b/extra/dconf/dconf.install index 5a87df82f..39bce8f45 100644 --- a/extra/dconf/dconf.install +++ b/extra/dconf/dconf.install @@ -1,5 +1,6 @@ post_install() { usr/bin/gio-querymodules usr/lib/gio/modules + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas } post_upgrade(){ diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD index 217a1a3e1..25e577816 100644 --- a/extra/evince/PKGBUILD +++ b/extra/evince/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 121987 2011-05-01 07:40:14Z ibiru $ +# $Id: PKGBUILD 123362 2011-05-10 16:22:31Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evince pkgver=3.0.0 -pkgrel=3 +pkgrel=4 pkgdesc="Simply a document viewer" url="http://projects.gnome.org/evince/" arch=('i686' 'x86_64') @@ -15,19 +15,25 @@ optdepends=('texlive-bin: DVI support') groups=('gnome-extra') install=evince.install options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('7c994a94200114ea7077d3348a03cbbad01c819ece2ec24b436b16e04386291b') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 + introspection-fix.patch) +sha256sums=('7c994a94200114ea7077d3348a03cbbad01c819ece2ec24b436b16e04386291b' + '897b8c77c5cda31f4f8d860cd6a7ad8ad986dbf3cf26b56acf054cc650e94be1') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/introspection-fix.patch" + autoreconf -fi + ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --libexecdir=/usr/lib/evince \ --disable-static --enable-nautilus \ --enable-pdf --enable-tiff \ --enable-djvu --enable-dvi \ --enable-t1lib --enable-comics \ - --disable-scrollkeeper --disable-schemas-compile + --disable-scrollkeeper --disable-schemas-compile \ + --enable-introspection make } diff --git a/extra/evince/introspection-fix.patch b/extra/evince/introspection-fix.patch new file mode 100644 index 000000000..6a64517bd --- /dev/null +++ b/extra/evince/introspection-fix.patch @@ -0,0 +1,11 @@ +diff a/libview/Makefile.am b/libview/Makefile.am +--- a/libview/Makefile.am ++++ b/libview/Makefile.am +@@ -136,6 +136,7 @@ EvinceView-$(EV_API_VERSION).gir: libevview3.la Makefile $(INST_H_FILES) $(filte + --output $@ \ + --pkg evince-document-$(EV_API_VERSION) \ + --pkg evince-view-$(EV_API_VERSION) \ ++ -L$(top_builddir)/libdocument/ \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + -DEVINCE_COMPILATION \ diff --git a/extra/glibmm/PKGBUILD b/extra/glibmm/PKGBUILD index 989a02410..dbcf18034 100644 --- a/extra/glibmm/PKGBUILD +++ b/extra/glibmm/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 118216 2011-04-05 22:43:03Z heftig $ +# $Id: PKGBUILD 123377 2011-05-10 16:36:13Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase=glibmm pkgname=('glibmm' 'glibmm-docs') -pkgver=2.28.0 -pkgrel=2 +pkgver=2.28.1 +pkgrel=1 arch=('i686' 'x86_64') license=('LGPL') makedepends=('glib2' 'libsigc++2.0' 'pkgconfig' 'mm-common') source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) options=('!libtool') url="http://gtkmm.sourceforge.net/" -sha256sums=('b1b99868896b028354141e3b2470d98799283e90154550e12614f692db17a5a3') +sha256sums=('ca74638b91296df127caab30f2d0664746bfefa942ce5a5ecc982e0f16edc145') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD index c393fcc30..78ff8869b 100644 --- a/extra/gnome-desktop/PKGBUILD +++ b/extra/gnome-desktop/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 120873 2011-04-26 21:57:00Z ibiru $ +# $Id: PKGBUILD 123357 2011-05-10 15:51:14Z ibiru $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gnome-desktop pkgver=3.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="Library with common API for various GNOME modules" arch=('i686' 'x86_64') license=('GPL' 'LGPL') @@ -12,11 +12,16 @@ makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection') url="http://www.gnome.org" groups=('gnome') options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('6d5e140a0d5f9bc131caff505bc4a2afa11e1839437f7fc3da73238b37a3f0a3') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 + randr-fix.patch) +sha256sums=('6d5e140a0d5f9bc131caff505bc4a2afa11e1839437f7fc3da73238b37a3f0a3' + '815a36c39d07eea48cb836bf25389c7057605239cb30b425d6c98763aeee4b89') build() { cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np1 -i "${srcdir}/randr-fix.patch" + ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --with-gnome-distributor="Arch Linux" \ diff --git a/extra/gnome-desktop/randr-fix.patch b/extra/gnome-desktop/randr-fix.patch new file mode 100644 index 000000000..c5d83ef2c --- /dev/null +++ b/extra/gnome-desktop/randr-fix.patch @@ -0,0 +1,26 @@ +From aa93854f2ba6b0f72f1bdff9699b5724a72c89c9 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen <mclasen@redhat.com> +Date: Sun, 01 May 2011 00:48:03 +0000 +Subject: Don't fall over if RANDR is missing + +When RANDR is not present, the screen object never gets an info, +and since screen_info_free asserts, we must not call it unconditionally +in finalize. +This fixes https://bugzilla.gnome.org/show_bug.cgi?id=649053 +--- +diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c +index 4a9d98e..eb3d735 100644 +--- a/libgnome-desktop/gnome-rr.c ++++ b/libgnome-desktop/gnome-rr.c +@@ -748,7 +748,8 @@ gnome_rr_screen_finalize (GObject *gobject) + + gdk_window_remove_filter (screen->priv->gdk_root, screen_on_event, screen); + +- screen_info_free (screen->priv->info); ++ if (screen->priv->info) ++ screen_info_free (screen->priv->info); + + G_OBJECT_CLASS (gnome_rr_screen_parent_class)->finalize (gobject); + } +-- +cgit v0.9 diff --git a/extra/gnome-shell/0001-Don-t-crash-when-removing-nameless-user.patch b/extra/gnome-shell/0001-Don-t-crash-when-removing-nameless-user.patch new file mode 100644 index 000000000..c07627338 --- /dev/null +++ b/extra/gnome-shell/0001-Don-t-crash-when-removing-nameless-user.patch @@ -0,0 +1,31 @@ +From 8977ba4f23aef8754c0a912e7e1ec46f8da4776e Mon Sep 17 00:00:00 2001 +From: Ionut Biru <ibiru@archlinux.org> +Date: Mon, 9 May 2011 13:03:17 -0700 +Subject: [PATCH] Don't crash when removing nameless user + +Fixes https://bugzilla.gnome.org/show_bug.cgi?id=647893 + +Signed-off-by: Ionut Biru <ibiru@archlinux.org> +--- + src/gdmuser/gdm-user-manager.c | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +diff --git a/src/gdmuser/gdm-user-manager.c b/src/gdmuser/gdm-user-manager.c +index eba9da1..543fcc3 100644 +--- a/src/gdmuser/gdm-user-manager.c ++++ b/src/gdmuser/gdm-user-manager.c +@@ -777,7 +777,10 @@ remove_user (GdmUserManager *manager, + if (gdm_user_get_object_path (user) != NULL) { + g_hash_table_remove (manager->priv->users_by_object_path, gdm_user_get_object_path (user)); + } +- g_hash_table_remove (manager->priv->users_by_name, gdm_user_get_user_name (user)); ++ ++ if (gdm_user_get_user_name (user) != NULL) { ++ g_hash_table_remove (manager->priv->users_by_name, gdm_user_get_user_name (user)); ++ } + + if (manager->priv->is_loaded) { + g_signal_emit (manager, signals[USER_REMOVED], 0, user); +-- +1.7.5.1 + diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index 55bf202d5..e1f13a17a 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 122711 2011-05-06 07:06:52Z ibiru $ +# $Id: PKGBUILD 123342 2011-05-10 13:48:13Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell pkgver=3.0.1 -pkgrel=3 +pkgrel=4 pkgdesc="The next generation GNOME Shell" arch=('i686' 'x86_64') url="http://live.gnome.org/GnomeShell" @@ -21,12 +21,14 @@ source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$p arch.patch network_fixes_up_to_5090a4ccce.patch shell-xfixes-cursor_missing_free.patch - st-private_fix_memory_leak.patch) + st-private_fix_memory_leak.patch + 0001-Don-t-crash-when-removing-nameless-user.patch) sha256sums=('01f7ae942ba9687a5e67d62423843ed404d77b35f74acc212a5f391beed8e079' 'a35d5e5f9f781728070aecae3bfe329f49dadcd50ca2984e0fbdd2219825a0db' '01bf41483d5d8935ed2dd6294ee04024f2d9bcb2ef13276b07331e485965c822' 'c8b92768c869d0d77595da3466cc0dba3b6f067ea5fac048f32a918bbe98bbf6' - '8b80a0cec39c38a47521183a3030a782ab84bb6ea5e9cc58213589245288e718') + '8b80a0cec39c38a47521183a3030a782ab84bb6ea5e9cc58213589245288e718' + '291d1fa51344325e3dabc0c1287750cde98605c30f079ffad9b3523a3aba860d') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -35,6 +37,7 @@ build() { patch -Np1 -i "${srcdir}/network_fixes_up_to_5090a4ccce.patch" patch -Np1 -i "${srcdir}/shell-xfixes-cursor_missing_free.patch" patch -Np1 -i "${srcdir}/st-private_fix_memory_leak.patch" + patch -Np1 -i "${srcdir}/0001-Don-t-crash-when-removing-nameless-user.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/gnome-shell \ diff --git a/extra/gtkmm3/PKGBUILD b/extra/gtkmm3/PKGBUILD index 0238faccb..d38b58afc 100644 --- a/extra/gtkmm3/PKGBUILD +++ b/extra/gtkmm3/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 118358 2011-04-06 12:31:04Z ibiru $ +# $Id: PKGBUILD 123382 2011-05-10 16:48:34Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=gtkmm3 _pkgbasename=gtkmm pkgname=('gtkmm3' 'gtkmm3-docs') -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 arch=('i686' 'x86_64') makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common') @@ -12,7 +12,7 @@ license=('LGPL') options=('!libtool' '!emptydirs') url="http://gtkmm.sourceforge.net/" source=(http://ftp.gnome.org/pub/GNOME/sources/${_pkgbasename}/3.0/${_pkgbasename}-${pkgver}.tar.bz2) -sha256sums=('567582948d4c47c29aa751162adc714644f50958d3d3e427c7a8c3818cd643f9') +sha256sums=('fb2d982095919e58ab5757042bf72e2a6243e77825c8ae6f46c41ab66cb68498') build() { cd "${srcdir}/${_pkgbasename}-${pkgver}" diff --git a/extra/libnotify/PKGBUILD b/extra/libnotify/PKGBUILD index f20fb9f0a..571001868 100644 --- a/extra/libnotify/PKGBUILD +++ b/extra/libnotify/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 115920 2011-03-22 14:03:02Z ibiru $ +# $Id: PKGBUILD 123347 2011-05-10 13:55:24Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libnotify -pkgver=0.7.2 +pkgver=0.7.3 pkgrel=1 pkgdesc="Desktop notification library" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('gdk-pixbuf2') makedepends=('gtk3' 'gobject-introspection') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('9b6a8459401e4af3da9cbc9e35a58d1a977273d3fe898d4a00a888f4191b85d6') +sha256sums=('322541fdf276eb803686df81763a5186af041b2ee3e9cc5fa1dc86c550388c88') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/lm_sensors/PKGBUILD b/extra/lm_sensors/PKGBUILD index 4e08276b3..fa90cc256 100644 --- a/extra/lm_sensors/PKGBUILD +++ b/extra/lm_sensors/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122622 2011-05-05 07:25:15Z eric $ +# $Id: PKGBUILD 123402 2011-05-11 03:51:18Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=lm_sensors pkgver=3.3.0 -pkgrel=2 +pkgrel=3 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring" arch=('i686' 'x86_64') url="http://www.lm-sensors.org/" @@ -15,7 +15,8 @@ backup=('etc/sensors3.conf' 'etc/conf.d/healthd' 'etc/conf.d/sensord') options=('!emptydirs') source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2 \ sensors.rc fancontrol.rc sensors-detect.patch healthd healthd.conf healthd.rc \ - sensord.conf sensord.rc daemonarg.patch) + sensord.conf sensord.rc daemonarg.patch \ + changeset_lm-sensors_trunk_prog_detect_sensors-detect_r5964.diff) md5sums=('5eb18d7531ead4f54f28a1133a606535' 'c370f5e620bfe41113354a1e22c0c18c' '232bedf043dd5dedde82df1a399c682c' @@ -25,7 +26,8 @@ md5sums=('5eb18d7531ead4f54f28a1133a606535' '970408d2e509dc4138927020efefe323' '96a8dd468e81d455ec9b165bdf33e0b7' '41a5c20854bbff00ea7174bd2276b736' - '40c8eb16af8249a0f1d851fc1057ea15') + '40c8eb16af8249a0f1d851fc1057ea15' + '2f1c004bd525bdc9b2495503a77d375a') sha1sums=('16c13a186557164fa51459a02209b120c0335f96' 'b2e664b9b87759991f02d0a1e8cac5e95098c0a5' 'a068ac0a3115a6191a487e11422506baa922b40a' @@ -35,12 +37,14 @@ sha1sums=('16c13a186557164fa51459a02209b120c0335f96' 'e662881f5d3f3f35a1bc97ba45d2c471dd28c37f' 'de8d4d65406815c389f8a04e2a8508a1ae6749c8' '72a60251d1d55a67307dab4105d9f3f01a080af4' - '34241388c4001bfb6e49b7e10da1217e29a258d6') + '34241388c4001bfb6e49b7e10da1217e29a258d6' + '0de66445805adaf65935764da9974df1db125865') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 < ../sensors-detect.patch patch -p1 < ../daemonarg.patch + patch -p2 < ../changeset_lm-sensors_trunk_prog_detect_sensors-detect_r5964.diff make PREFIX=/usr } diff --git a/extra/lm_sensors/changeset_lm-sensors_trunk_prog_detect_sensors-detect_r5964.diff b/extra/lm_sensors/changeset_lm-sensors_trunk_prog_detect_sensors-detect_r5964.diff new file mode 100644 index 000000000..eb3c591b9 --- /dev/null +++ b/extra/lm_sensors/changeset_lm-sensors_trunk_prog_detect_sensors-detect_r5964.diff @@ -0,0 +1,44 @@ +Index: lm-sensors/trunk/prog/detect/sensors-detect
+===================================================================
+--- lm-sensors/trunk/prog/detect/sensors-detect (revision 5963)
++++ lm-sensors/trunk/prog/detect/sensors-detect (revision 5964)
+@@ -2416,5 +2416,5 @@
+ # Try some known default udev db locations, just in case
+ if (-e '/dev/.udev.tdb' || -e '/dev/.udev'
+- || -e '/dev/.udevdb') {
++ || -e '/dev/.udevdb' || -e '/run/udev') {
+ $use_udev = 1;
+ $dev_i2c = '/dev/i2c-';
+@@ -6460,4 +6460,20 @@
+ close(SYSCONFIG);
+
++ if (-x "/bin/systemctl" && -d "/lib/systemd/system" &&
++ ! -f "/lib/systemd/system/lm_sensors.service") {
++ print "Copy prog/init/lm_sensors.service to /lib/systemd/system\n".
++ "and run 'systemctl enable lm_sensors.service'\n".
++ "for initialization at boot time.\n";
++ return;
++ }
++
++ if (-x "/bin/systemctl" &&
++ -f "/lib/systemd/system/lm_sensors.service") {
++ system("/bin/systemctl", "enable", "lm_sensors.service");
++ system("/bin/systemctl", "start", "lm_sensors.service");
++ # All done, don't check for /etc/init.d/lm_sensors
++ return;
++ }
++
+ print "Copy prog/init/lm_sensors.init to /etc/init.d/lm_sensors\n".
+ "for initialization at boot time.\n"
+@@ -6513,7 +6497,9 @@
+ exit -1;
+ }
+
+- if (-x "/sbin/service" && -f "/etc/rc.d/sensors" &&
+- -f "/var/lock/subsys/lm_sensors") {
++ if (-x "/bin/systemctl" && -f "/lib/systemd/system/lm_sensors.service") {
++ system("/bin/systemctl", "stop", "lm_sensors.service");
++ } elsif (-x "/sbin/service" && -f "/etc/init.d/lm_sensors" &&
++ -f "/var/lock/subsys/lm_sensors") {
+ system("/sbin/service", "lm_sensors", "stop");
+ }
diff --git a/extra/telepathy-logger/PKGBUILD b/extra/telepathy-logger/PKGBUILD index 7e0e7f1bd..74857964b 100644 --- a/extra/telepathy-logger/PKGBUILD +++ b/extra/telepathy-logger/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 117598 2011-04-04 12:33:45Z ibiru $ +# $Id: PKGBUILD 123372 2011-05-10 16:32:52Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=telepathy-logger -pkgver=0.2.8 +pkgver=0.2.9 pkgrel=1 pkgdesc="Telepathy framework logging daemon" arch=(i686 x86_64) @@ -11,7 +11,7 @@ depends=('telepathy-glib' 'sqlite3' 'libxml2' 'dconf') makedepends=('intltool' 'gnome-doc-utils' 'gobject-introspection') options=('!libtool') source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('755e6dcaa6a9ccf47f2fe73f3d4d888b') +md5sums=('6d4a1c916883e4d1f19ed1002be6700c') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/telepathy-mission-control/PKGBUILD b/extra/telepathy-mission-control/PKGBUILD index 1b086ce5f..01b065caa 100644 --- a/extra/telepathy-mission-control/PKGBUILD +++ b/extra/telepathy-mission-control/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 120802 2011-04-26 15:50:07Z ibiru $ +# $Id: PKGBUILD 123367 2011-05-10 16:31:02Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Ju Liu <liuju86 at gmail dot com> # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> # Contributor: Andreas Zwinkau <beza1e1@web.de> pkgname=telepathy-mission-control -pkgver=5.7.9 +pkgver=5.7.10 pkgrel=1 pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers." arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('telepathy-glib' 'libgnome-keyring') makedepends=('libxslt' 'python2') options=('!libtool') source=(http://telepathy.freedesktop.org/releases/telepathy-mission-control/$pkgname-$pkgver.tar.gz) -md5sums=('df7e63d857676fab9ec2261cffe5eb4a') +md5sums=('2793b7502c9a88dd1c7468c684bb7a5f') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/tomcat-native/PKGBUILD b/extra/tomcat-native/PKGBUILD index 8572c26fc..3686445e1 100644 --- a/extra/tomcat-native/PKGBUILD +++ b/extra/tomcat-native/PKGBUILD @@ -3,12 +3,12 @@ pkgname=tomcat-native pkgver=1.1.20 -pkgrel=1 +pkgrel=2 pkgdesc="The Apache Tomcat Native Library" arch=('i686' 'x86_64') url="http://tomcat.apache.org/" license="Apache" -depends=('tomcat' 'apr' 'openssl') +depends=('apr' 'openssl') makedepends=('java-environment') source=(http://www.apache.org/dist/tomcat/tomcat-connectors/native/${pkgver}/source/${pkgname}-${pkgver}-src.tar.gz) md5sums=('fb2b9d073cb6575c2d0020eda266ca0c') diff --git a/libre/kernel26-libre-lts/PKGBUILD b/libre/kernel26-libre-lts/PKGBUILD index 55cde1f43..f3588dc77 100644 --- a/libre/kernel26-libre-lts/PKGBUILD +++ b/libre/kernel26-libre-lts/PKGBUILD @@ -7,30 +7,22 @@ pkgname=('kernel26-libre-lts' 'kernel26-libre-lts-headers') # Build stock -lts k _kernelname=${pkgname#kernel26-libre} _basekernel=2.6.32 _preset=kernel26-lts.preset -pkgver=${_basekernel}.39 +pkgver=${_basekernel}.40 pkgrel=1 arch=('i686' 'x86_64') license=('GPL2') url="http://linux-libre.fsfla.org" source=(http://www.fsfla.org/svnwiki/selibre/linux-libre/download/releases/${pkgver}-libre2/linux-${pkgver}-libre2.tar.bz2 - libata-alignment.patch # the main kernel config files config.i686 config.x86_64 # standard config files for mkinitcpio ramdisk ${_preset} - ${pkgname}.install - buildfix-gcc46.diff) + ${pkgname}.install) options=(!strip) build() { cd ${srcdir}/linux-$pkgver - # fix 22343 udev crashes - patch -Np1 -i ${srcdir}/libata-alignment.patch - - # fix build with gcc46 - http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.38.y.git;a=commitdiff;h=b1d670f1#patch1 - patch -Np1 -i ${srcdir}/buildfix-gcc46.diff - cat ../config.$CARCH >./.config if [ "${_kernelname}" != "" ]; then sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config @@ -219,10 +211,8 @@ package_kernel26-libre-lts-headers() { # remove unneeded architectures rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa} } -md5sums=('9502a2248b2024da4f30a5d52a90322d' - '30851deee235a7486bd408cbe8eb2d71' +md5sums=('eabd563bea84785dd74f3f694162ca69' '3298f542840c52a8b8abc1b3795e455b' - 'cd1a62e81eb9e910779f3eb18a6e28c6' + 'f0fcf2ca389e8997a88963d70153a479' '2cbfeb3e2a18d45f82f613e97fc23355' - 'fbfc7a1af3208c7b729055d91e1c149a' - 'bb7410d7b740dfad0385a07b66e6621f') + 'fbfc7a1af3208c7b729055d91e1c149a') diff --git a/libre/kernel26-libre-lts/buildfix-gcc46.diff b/libre/kernel26-libre-lts/buildfix-gcc46.diff new file mode 100644 index 000000000..595f97d66 --- /dev/null +++ b/libre/kernel26-libre-lts/buildfix-gcc46.diff @@ -0,0 +1,32 @@ +From b1d670f10e8078485884f0cf7e384d890909aeaa Mon Sep 17 00:00:00 2001 +From: Greg Rose <gregory.v.rose@intel.com> +Date: Tue, 16 Nov 2010 19:41:36 -0800 +Subject: [PATCH] Remove extra struct page member from the buffer info + structure + +declaration. + +Reported-by: Andi Kleen <andi@firstfloor.org> +Signed-off-by: Greg Rose <gregory.v.rose@intel.com> +Tested-by: Emil Tantilov <emil.s.tantilov@intel.com> +Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> +--- + drivers/net/igbvf/igbvf.h | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/drivers/net/igbvf/igbvf.h b/drivers/net/igbvf/igbvf.h +index 63284e3..9d4d63e 100644 +--- a/drivers/net/igbvf/igbvf.h ++++ b/drivers/net/igbvf/igbvf.h +@@ -126,7 +126,6 @@ struct igbvf_buffer { + unsigned int page_offset; + }; + }; +- struct page *page; + }; + + union igbvf_desc { +-- +1.7.4.5 + + diff --git a/libre/kernel26-libre-lts/config b/libre/kernel26-libre-lts/config index d2bba6bee..fa7600cfb 100644 --- a/libre/kernel26-libre-lts/config +++ b/libre/kernel26-libre-lts/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32 -# Fri Feb 18 17:22:19 2011 +# Mon Apr 18 12:31:05 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2308,9 +2308,9 @@ CONFIG_TOUCHSCREEN_TOUCHRIGHT=m CONFIG_TOUCHSCREEN_TOUCHWIN=m CONFIG_TOUCHSCREEN_UCB1400=m CONFIG_TOUCHSCREEN_WM97XX=m -# CONFIG_TOUCHSCREEN_WM9705 is not set -# CONFIG_TOUCHSCREEN_WM9712 is not set -# CONFIG_TOUCHSCREEN_WM9713 is not set +CONFIG_TOUCHSCREEN_WM9705=y +CONFIG_TOUCHSCREEN_WM9712=y +CONFIG_TOUCHSCREEN_WM9713=y CONFIG_TOUCHSCREEN_USB_COMPOSITE=m CONFIG_TOUCHSCREEN_USB_EGALAX=y CONFIG_TOUCHSCREEN_USB_PANJIT=y @@ -2324,10 +2324,10 @@ CONFIG_TOUCHSCREEN_USB_IDEALTEK=y CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y CONFIG_TOUCHSCREEN_USB_GOTOP=y CONFIG_TOUCHSCREEN_USB_JASTEC=y -# CONFIG_TOUCHSCREEN_USB_E2I is not set +CONFIG_TOUCHSCREEN_USB_E2I=y CONFIG_TOUCHSCREEN_TOUCHIT213=m CONFIG_TOUCHSCREEN_TSC2007=m -# CONFIG_TOUCHSCREEN_PCAP is not set +CONFIG_TOUCHSCREEN_PCAP=m CONFIG_INPUT_MISC=y CONFIG_INPUT_PCSPKR=m CONFIG_INPUT_APANEL=m @@ -4457,7 +4457,7 @@ CONFIG_DLM=m # Kernel hacking # CONFIG_TRACE_IRQFLAGS_SUPPORT=y -# CONFIG_PRINTK_TIME is not set +CONFIG_PRINTK_TIME=y CONFIG_ENABLE_WARN_DEPRECATED=y # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_FRAME_WARN=1024 @@ -4567,7 +4567,8 @@ CONFIG_EARLY_PRINTK=y # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_DEBUG_PER_CPU_MAPS is not set # CONFIG_X86_PTDUMP is not set -# CONFIG_DEBUG_RODATA is not set +CONFIG_DEBUG_RODATA=y +# CONFIG_DEBUG_RODATA_TEST is not set # CONFIG_DEBUG_NX_TEST is not set # CONFIG_4KSTACKS is not set CONFIG_DOUBLEFAULT=y diff --git a/libre/kernel26-libre-lts/config.x86_64 b/libre/kernel26-libre-lts/config.x86_64 index 30cc5aefa..b0aadff4e 100644 --- a/libre/kernel26-libre-lts/config.x86_64 +++ b/libre/kernel26-libre-lts/config.x86_64 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32 -# Mon Apr 18 14:25:56 2011 +# Tue May 10 08:27:04 2011 # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -4378,7 +4378,8 @@ CONFIG_EARLY_PRINTK=y # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_DEBUG_PER_CPU_MAPS is not set # CONFIG_X86_PTDUMP is not set -# CONFIG_DEBUG_RODATA is not set +CONFIG_DEBUG_RODATA=y +# CONFIG_DEBUG_RODATA_TEST is not set # CONFIG_DEBUG_NX_TEST is not set # CONFIG_IOMMU_DEBUG is not set # CONFIG_IOMMU_STRESS is not set diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index a0d3f1497..29e055afe 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -3,7 +3,7 @@ pkgname=libretools pkgver=$(date -u +%Y%m%d) -pkgrel=1.1 +pkgrel=1 pkgdesc="Scripts for easing Parabola's tasks" arch=('any') url="http://parabolagnulinux.org" @@ -35,6 +35,7 @@ build() { package() { install -d ${pkgdir}/usr/bin + install -d ${pkgdir}/usr/sbin install -d ${pkgdir}/etc install -m644 ${_gitname}/libretools.conf ${pkgdir}/etc/ @@ -47,7 +48,6 @@ package() { install -m755 ${_gitname}/librechroot ${pkgdir}/usr/bin/ install -m755 ${_gitname}/librecommit ${pkgdir}/usr/bin/ install -m755 ${_gitname}/librediff ${pkgdir}/usr/bin/ - install -m755 ${_gitname}/libremakepkg ${pkgdir}/usr/bin/ install -m755 ${_gitname}/libremessages ${pkgdir}/usr/bin/ install -m755 ${_gitname}/librerelease ${pkgdir}/usr/bin/ install -m755 ${_gitname}/librerepkg ${pkgdir}/usr/bin @@ -56,5 +56,7 @@ package() { install -m755 ${_gitname}/pkgbuild-check-nonfree ${pkgdir}/usr/bin/ install -m755 ${_gitname}/toru ${pkgdir}/usr/bin install -m755 ${_gitname}/updateabslibre ${pkgdir}/usr/bin + + install -m755 ${_gitname}/libremakepkg ${pkgdir}/usr/sbin/ }
\ No newline at end of file diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install index 2657f5208..8eea37689 100644 --- a/libre/libretools/libretools.install +++ b/libre/libretools/libretools.install @@ -2,25 +2,8 @@ # arg 1: the new package version post_install() { cat <<EOF - -For using libremakepkg /etc/libretools.conf to fit your needs. - -For the scripts that can be run as normal user you can make -custom configuration by copying /etc/libretools.conf to -\$XDG_CONFIG_HOME/libretools/libretools.conf - -You should add this to your ~/.ssh/config file: - -# Parabola Host -Host parabola - Port 22 - HostName repo.parabolagnulinux.org - User parabolavnx - IdentityFile ~/.ssh/id_rsa -# End Parabola Host - -Edit IdentityFile as needed. - +Please check http://wiki.parabolagnulinux.org/hacking:packagers +and follow instructions there before using libretools. EOF } @@ -30,6 +13,7 @@ post_upgrade() { cat <<EOF Check your /etc/libretools.conf +Make sure LIBREDESTDIR finish with "repo" instead of "free" EOF } diff --git a/libre/unarchiver/PKGBUILD b/libre/unarchiver/PKGBUILD index eacbfdbb4..dcab9e342 100644 --- a/libre/unarchiver/PKGBUILD +++ b/libre/unarchiver/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Cedric Girard <girard.cedric@gmail.com> pkgname=unarchiver pkgver=2.7 -pkgrel=1 +pkgrel=2 pkgdesc="An Objective-C application for uncompressing archive files" arch=('x86_64' 'i686') url="http://wakaba.c3.cx/s/apps/unarchiver.html" @@ -12,18 +12,20 @@ source=(http://theunarchiver.googlecode.com/files/TheUnarchiver"$pkgver"_src.zip md5sums=('c6aed2fcb2b68d86a9d9d4fc39c4ea41') replaces=('unrar') conflicts=('unrar') +provides=('unrar') build() { cd "$srcdir/The Unarchiver/XADMaster" . /usr/share/GNUstep/Makefiles/GNUstep.sh - make -f Makefile.linux + make -f Makefile.linux unar lsar } package() { cd "$srcdir/The Unarchiver/XADMaster" install -d "$pkgdir/usr/bin/" - cp unar lsar "$pkgdir/usr/bin/" + install -m755 unar ${pkgdir}/usr/bin + install -m755 lsar ${pkgdir}/usr/bin } # vim:set ts=2 sw=2 et: diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD index 26df281b6..83f9070fc 100644 --- a/libre/your-freedom/PKGBUILD +++ b/libre/your-freedom/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Parabola Project <dev@list.parabolagnulinux.org> pkgname=your-freedom -pkgver=$(LC_ALL=C date +%Y%m%d) +pkgver=$(LC_ALL=C date -u +%Y%m%d) pkgrel=1 pkgdesc="This package conflicts with every unfree package known to date." arch=('any') @@ -8,25 +8,18 @@ url="http://parabolagnulinux.org" license=('GPL') groups=('base') install=${pkgname}.install -source=(http://repo.parabolagnulinux.org/docs/blacklist.txt - http://repo.parabolagnulinux.org/docs/whitelist.txt) +source=() +md5sums=() noextract=() -md5sums=() #generate with 'makepkg -g' - -get_blacklist() { - unfree=($(wget -q -O - ${source[0]} | \ - cut -d':' -f1,2 | \ - sed "s/:$//" | \ - grep -v ":" | \ - sort -u)) - echo "conflicts=(${unfree[@]})" -} build() { - install -d $pkgdir/usr/share/doc/${pkgname} - install -m644 $srcdir/{black,white}list.txt + cd ${srcdir} + wget http://repo.parabolagnulinux.org/docs/blacklist.txt + wget http://repo.parabolagnulinux.org/docs/whitelist.txt + install -d ${pkgdir}/usr/share/doc/${pkgname} + install -m644 {black,white}list.txt ${pkgdir}/usr/share/doc/${pkgname}/ } -md5sums=('2637ca96bd9e39dacd452bec01307345' - '98d40d324ed474a9b2a222432fb97f02') -conflicts=(abyssws aqua-data-studio arch-artwork arch-firefox-search archlinux-artwork archlinux-menus archlinux-themes-kde archlinux-themes-kdm archlinux-themes-slim archlinux-wallpaper arch-wiki-docs b43-fwcutter bass blobwars boinc boinc-nox chromium-bsu crafty d4x dina-font dosemu faac firefox-i18n firefox-spell-pt-br firefox-spell-ru flashplugin fmodex font-mathematica foomatic-db-nonfree gstreamer0.10-bad ipw2100-fw ipw2200-fw iwlwifi-1000-ucode iwlwifi-3945-ucode iwlwifi-4965-ucode iwlwifi-5000-ucode iwlwifi-5150-ucode iwlwifi-6000-ucode java-sun jdk jre kernel26-firmware lha lib32-libflashsupport lib32-nvidia-utils libflashsupport linux-firmware mac martian martian-utils mesa-demos mod_fastcgi monaco-linux-font ndiswrapper ndiswrapper-utils netperf nouveau-firmware nvidia nvidia-173xx nvidia-173xx-utils nvidia-96xx nvidia-96xx-utils nvidia-cg-toolkit nvidia-lts nvidia-utils nxclient openttd-opensfx opera povray profont pypy qingy-theme-arch qstat rt2870usb-fw rt2x00-rt61-fw rt2x00-rt71w-fw sdlmame sfarkxtc skype skype-oss skype-staticqt slim-themes snes9x sopcast sqlite3-doc tarsnap ttf-hannom ttf-ms-fonts urbanterror urbanterror-data vbaexpress virtualbox-additions virtualbox-additions-modules visualboyadvance warsow-data xdm-archlinux xf86-input-vmmouse xf86-video-vmware xorg-xlsfonts xpdf-chinese-simplified xpdf-chinese-traditional xpdf-japanese xpdf-korean xsnow xv zd1211-firmware) +package() { + conflicts=($(cut -d: -f1 ${pkgdir}/usr/share/doc/${pkgname}/blacklist.txt)) +} |