diff options
63 files changed, 1182 insertions, 245 deletions
diff --git a/community/bibletime/PKGBUILD b/community/bibletime/PKGBUILD index 069524e3e..057c61125 100644 --- a/community/bibletime/PKGBUILD +++ b/community/bibletime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 61103 2011-12-21 20:53:10Z andrea $ +# $Id: PKGBUILD 61169 2011-12-23 14:46:29Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Tobias T. <OldShatterhand at gmx-topmail dot de> pkgname=bibletime -pkgver=2.9.0 -pkgrel=2 +pkgver=2.9.1 +pkgrel=1 pkgdesc="Bible study tool for KDE4" arch=('x86_64' 'i686') url="http://www.bibletime.info/" @@ -12,13 +12,15 @@ depends=('qt' 'sword' 'openssl' 'clucene' 'qtwebkit') makedepends=('cmake' 'boost-libs') install=$pkgname.install source=("http://sourceforge.net/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2") -md5sums=('0190b64de5892fc5f45e9a3d46bb29d6') +sha256sums=('308a86d4a1f63203e01438e75be8306377927498b5d0ae8769a4df3c828013b5') build() { cd "$srcdir/$pkgname-$pkgver" - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release "$srcdir/$pkgname-$pkgver" + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + "$srcdir/$pkgname-$pkgver" make } diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index 5bda97fa5..fa28ea23d 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 60656 2011-12-16 15:19:32Z giovanni $ +# $Id: PKGBUILD 61189 2011-12-24 00:16:51Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Petrov Roman <nwhisper@gmail.com> # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> pkgname=calibre -pkgver=0.8.31 +pkgver=0.8.32 pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64' 'mips64el') @@ -21,7 +21,7 @@ install=calibre.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('c2373e34d83b81a321cebea043d5f160' +md5sums=('ee973514615fc104be7cc41adf0862a6' '253ce4fe5d01f8ff76b63cd3825755ea' '675cd87d41342119827ef706055491e7') diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index 6bf329e70..4403207ff 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58992 2011-11-20 19:44:35Z spupykin $ +# $Id: PKGBUILD 61213 2011-12-24 17:41:33Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Christian Himpel <chressie at gmail dot com> # Contributor: Johannes Hanika <hanatos at gmail dot com> @@ -6,16 +6,16 @@ pkgname=darktable pkgver=0.9.3 _pkgver=0.9 -pkgrel=3 +pkgrel=4 pkgdesc="Utility to organize and develop raw images" arch=('i686' 'x86_64' 'mips64el') url=http://darktable.sf.net/ license=('GPL3') depends=('exiv2>=0.18' 'intltool>=0.40' 'lcms2' 'lensfun>=0.2.3' 'libglade' 'dbus-glib' 'curl' 'libgnome-keyring' 'libgphoto2' 'libusb-compat' 'openexr' 'sqlite3') -makedepends=('intltool>=0.40' 'cmake') +makedepends=('intltool>=0.40' 'cmake' 'librsvg') # 'gnome-doc-utils' 'libxslt' 'fop') -optdepends=( 'librsvg') +optdepends=('librsvg') install=darktable.install options=(!libtool) source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.gz) diff --git a/community/dia/PKGBUILD b/community/dia/PKGBUILD index c6597a9ac..8af32da0d 100644 --- a/community/dia/PKGBUILD +++ b/community/dia/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 57536 2011-10-30 12:24:25Z ttopper $ +# $Id: PKGBUILD 61137 2011-12-22 11:13:11Z spupykin $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Gregor Ibic <gregor.ibic@intelicom.si> pkgname=dia -pkgver=0.97.1 -pkgrel=5 +pkgver=0.97.2 +pkgrel=1 pkgdesc="A GTK+ based diagram creation program" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -16,9 +16,9 @@ depends=('libxslt' 'desktop-file-utils' 'libart-lgpl' 'gtk2') makedepends=('intltool' 'python2' 'docbook-xsl') optdepends=('python2') options=('!libtool' 'docs') -source=("ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.97/${pkgname}-${pkgver}.tar.bz2" +source=("ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.97/${pkgname}-${pkgver}.tar.xz" "dia-overflow-fix.patch") -md5sums=('57e44bb9f387559a0506b52a134deaf0' +md5sums=('1e1180a513fb567709b09bc19f12105e' '8fd9a2ad35b5a6fd8c758d7c73dbfe66') build() { @@ -26,7 +26,7 @@ build() { export PYTHON=/usr/bin/python2 sed -i 's#python2\.1#python2 python2.1#' configure - patch -p1 <$srcdir/dia-overflow-fix.patch +# patch -p1 <$srcdir/dia-overflow-fix.patch ./configure --prefix=/usr \ --with-cairo \ diff --git a/community/freedroidrpg/PKGBUILD b/community/freedroidrpg/PKGBUILD index 85eb1d089..387f78b70 100644 --- a/community/freedroidrpg/PKGBUILD +++ b/community/freedroidrpg/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 60343 2011-12-11 19:59:55Z spupykin $ +# $Id: PKGBUILD 61165 2011-12-23 11:47:47Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: nut543 <kfs1@online.no> #pkgbase=freedroidrpg #pkgname=('freedroidrpg' 'freedroidrpg-data') pkgname='freedroidrpg' -pkgver=0.15rc2 +pkgver=0.15 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') # depends=('sdl_mixer' 'sdl_image' 'libogg' 'libvorbis' 'libgl' 'freedroidrpg-data') @@ -17,7 +17,7 @@ license=("GPL") source=(http://downloads.sourceforge.net/project/freedroid/freedroidRPG/freedroidRPG-0.15/freedroidrpg-$pkgver.tar.gz freedroidrpg.jpg freedroidrpg.desktop) -md5sums=('0e098aae0b16b6f87ffe5f7932580491' +md5sums=('003a3f34619cfaa87add2030fea5d120' 'b73d9dac44c7e83a6c80fbe4eb96ba79' '9a10c2a2064439cdcff5b945dfb1c3ac') diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index e0d056345..c5dc7c94b 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 61105 2011-12-21 20:56:54Z andrea $ +# $Id: PKGBUILD 61221 2011-12-24 21:45:52Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> pkgbase=gambas3 @@ -12,8 +12,8 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') -pkgver=2.99.6 -pkgrel=5 +pkgver=2.99.7 +pkgrel=1 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64' 'mips64el') url="http://gambas.sourceforge.net/" @@ -27,7 +27,7 @@ makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils options=('!emptydirs' '!makeflags') source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" 'gambas3-script.install' 'gambas3-runtime.install') -md5sums=('746aaae5494c4b267bdae802c5c006d5' +md5sums=('674f73cd7d4d37b3c62a4b9261dadb5d' 'b284be39d147ec799f1116a6abc068b4' 'b5cc403990f31b8ea1c5cf37366d3d29') diff --git a/community/i3-wm/PKGBUILD b/community/i3-wm/PKGBUILD index abb7ae4ed..0a2ae1e12 100644 --- a/community/i3-wm/PKGBUILD +++ b/community/i3-wm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 60124 2011-12-05 19:50:21Z ibiru $ +# $Id: PKGBUILD 61211 2011-12-24 17:06:50Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=i3-wm _pkgsourcename=i3 -pkgver=4.1 -pkgrel=2 +pkgver=4.1.1 +pkgrel=1 pkgdesc="An improved dynamic tiling window manager" arch=('i686' 'x86_64' 'mips64el') url="http://i3wm.org/" @@ -19,13 +19,13 @@ optdepends=('rxvt-unicode: The terminal emulator used in the default config.' 'i3status: To display systeminformation with a bar.' 'perl: To migrate your configuration to v4 format.') options=('docs' '!strip') -source=(http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2) -md5sums=('1a05d605624506c2b4b9f1272fd84a5a') +source=("http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2") +md5sums=('25bc29349b65000a2b0afc0655a80035') build() { cd "$srcdir/$_pkgsourcename-$pkgver" - # To avoid problems with bison use only a single process + # In order to avoid problems with bison use only a single process MAKEFLAGS="-j1" make } diff --git a/community/inn/PKGBUILD b/community/inn/PKGBUILD index bf7e5856b..880fbd1ed 100644 --- a/community/inn/PKGBUILD +++ b/community/inn/PKGBUILD @@ -5,7 +5,7 @@ pkgname=inn pkgver=2.5.2 -pkgrel=6 +pkgrel=8 pkgdesc="Complete open source Usenet system. De facto standard for handling news routing, news spool and serving the spool to customers." url="http://www.isc.org/software/inn/" arch=('i686' 'x86_64' 'mips64el') @@ -53,7 +53,7 @@ source=(http://ftp.isc.org/isc/inn/inn-$pkgver.tar.gz nnrpd.conf site.make.patch) md5sums=('a6e577dceb90d07501b96149508b974b' - '2ad5138dac7c7535278f73f30020d656' + 'a243d9498568f1beee20da5684b5fbfc' 'a0b1ff8501ac8a31ce81a2f9c9b4bac9' 'fbf1d2c5b3c5a08ae3e515c71c2e2e4a' 'bb4bbe86ae52fbbf08b0f6f370dea052' diff --git a/community/inn/innd.rc b/community/inn/innd.rc index e88bd0c39..5e36aec0d 100644 --- a/community/inn/innd.rc +++ b/community/inn/innd.rc @@ -4,11 +4,15 @@ . /etc/rc.d/functions [ -f /etc/conf.d/innd ] && . /etc/conf.d/innd [ -z "$NEWS_USER" ] && print "Please set news username" && exit 1; +[ -z "$NEWS_GROUP" ] && print "Please set news groupname" && exit 1; case "$1" in start) stat_busy "Starting InterNetNews" - [ -d /var/run/inn ] || mkdir -p /var/run/inn + [ -d /var/run/inn ] || { + mkdir -p /var/run/inn + chown -R $NEWS_USER:$NEWS_GROUP /var/run/inn + } su $NEWS_USER -c /usr/bin/rc.news 2>&- >&- if [ $? -gt 0 ]; then stat_fail @@ -21,10 +25,12 @@ case "$1" in ;; stop) stat_busy "Stopping InterNetNews" + ctlinnd throttle "shutting down" 2>&- >&- su $NEWS_USER -c /usr/bin/rc.news stop 2>&- >&- if [ $? -gt 0 ]; then stat_fail else + kill `ps faxu| grep ^$NEWS_USER | awk -- '{print $2}'` 2>&- >&- rm /var/run/innd.pid rm_daemon innd stat_done diff --git a/community/jshon/PKGBUILD b/community/jshon/PKGBUILD index 38674cb01..2dd156623 100644 --- a/community/jshon/PKGBUILD +++ b/community/jshon/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 57971 2011-11-05 09:47:31Z kkeen $ +# $Id: PKGBUILD 61131 2011-12-22 05:37:54Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> pkgname=jshon -pkgver=20111105 +pkgver=20111222 pkgrel=1 pkgdesc="A json parser for the shell." arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ depends=('jansson') makedepends=() optdepends=() source=(http://kmkeen.com/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('5d4c6d40ef4497473445931e777e280b') +md5sums=('bcc8b8b6e8c09af7d053471a473ef6e8') build() { cd "$srcdir/$pkgname" diff --git a/community/libdnet/PKGBUILD b/community/libdnet/PKGBUILD index 433626ab2..c7dd280e1 100644 --- a/community/libdnet/PKGBUILD +++ b/community/libdnet/PKGBUILD @@ -1,15 +1,14 @@ -# $Id: PKGBUILD 58611 2011-11-16 15:32:03Z spupykin $ +# $Id: PKGBUILD 61173 2011-12-23 18:40:57Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: James Fryman <jfryman@gmail.com> pkgname=libdnet pkgver=1.12 -pkgrel=5 +pkgrel=6 pkgdesc="A simplified, portable interface to several low-level networking routines" arch=(i686 x86_64 'mips64el') makedepends=(python2) optdepends=(python2) -install=libdnet.install license=("BSD") url="http://code.google.com/p/libdnet/" options=('!libtool') @@ -17,18 +16,19 @@ source=(http://libdnet.googlecode.com/files/libdnet-$pkgver.tgz) md5sums=('9253ef6de1b5e28e9c9a62b882e44cc9') build() { - mkdir -p $pkgdir/usr/bin + cd $srcdir/$pkgname-$pkgver - [ $CARCH == "x86_64" ] && export CFLAGS=-fPIC - [ $CARCH == "mips64el" ] && export CFLAGS+=-fPIC + autoreconf -I config --force --install + ./configure --prefix=/usr + make +} +package() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --target=${CHOST} --host=${CHOST} --build=${CHOST} - make && make DESTDIR=$pkgdir install + make DESTDIR="$pkgdir/" install cd python && \ python2 setup.py install --root=$pkgdir install -D -m0644 ../LICENSE $pkgdir/usr/share/licenses/libdnet/license - mv $pkgdir/usr/man $startdir/pkg/usr/share/ } diff --git a/community/libdnet/libdnet.install b/community/libdnet/libdnet.install index cb8146f24..3264378fd 100644 --- a/community/libdnet/libdnet.install +++ b/community/libdnet/libdnet.install @@ -1,3 +1,3 @@ post_install() { - /sbin/ldconfig + /sbin/ldconfig } diff --git a/community/linphone/PKGBUILD b/community/linphone/PKGBUILD index 080dc9ed7..f52b03963 100644 --- a/community/linphone/PKGBUILD +++ b/community/linphone/PKGBUILD @@ -1,33 +1,32 @@ -# $Id: PKGBUILD 49813 2011-06-21 09:18:21Z spupykin $ +# $Id: PKGBUILD 61187 2011-12-23 22:08:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Darwin Bautista <djclue917@gmail.com> pkgname=linphone -pkgver=3.4.3 -pkgrel=4 +pkgver=3.5.0 +pkgrel=1 pkgdesc="A Voice-over-IP phone" arch=('i686' 'x86_64' 'mips64el') url="http://www.linphone.org/index.php/eng" license=('GPL') depends=('alsa-lib' 'ffmpeg' 'gtk2' 'libexosip2' 'speex' 'libv4l' 'libglade' 'v4l-utils' - 'libpulse' 'libxv' 'mediastreamer' 'ortp') + 'libpulse' 'libxv') +# 'mediastreamer' 'ortp') makedepends=('pkgconfig' 'perlxml' 'intltool' 'sgmltools-lite') optdepends=('pulseaudio') options=('!libtool' '!emptydirs') -source=("http://download-mirror.savannah.gnu.org/releases/linphone/3.4.x/sources/linphone-$pkgver.tar.gz" - "disable-v4l1.patch") -md5sums=('66e21f36d62c2094f7b4360262c46f20' - '7ee15689eed1adbdcf0ddab8fadca34a') +conflicts=('ortp' 'mediastreamer') +source=("http://download-mirror.savannah.gnu.org/releases/linphone/3.5.x/sources/linphone-$pkgver.tar.gz") +md5sums=('ad89cd6030a131f2b17ea50eb6f4c6f2') build() { cd "$srcdir/$pkgname-$pkgver" export PKG_CONFIG=/usr/bin/pkg-config unset SGML_CATALOG_FILES -# patch -p1 <$srcdir/disable-v4l1.patch ./configure --prefix=/usr --disable-static --enable-ipv6 --enable-video \ --enable-alsa --enable-pulseaudio --disable-artsc --disable-strict \ --libexecdir=/usr/lib/$pkgname \ - --enable-external-mediastreamer --enable-external-ortp + --disable-external-mediastreamer --disable-external-ortp make } diff --git a/community/lxpanel/PKGBUILD b/community/lxpanel/PKGBUILD index 2d4d83d47..e890567e6 100644 --- a/community/lxpanel/PKGBUILD +++ b/community/lxpanel/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 53158 2011-07-31 08:25:21Z angvp $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Maintainer: Juergen Hoetzel <juergen@archlinux.org> +# $Id: PKGBUILD 61193 2011-12-24 11:33:27Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> +# Contributor: Angel Velasquez <angvp@archlinux.org> +# Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=lxpanel pkgver=0.5.8 -pkgrel=1 +pkgrel=2 pkgdesc="Panel of the LXDE Desktop" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') url="http://lxde.org/" groups=('lxde') depends=('gtk2' 'alsa-lib' 'menu-cache' 'lxmenu-data') -source=(http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz) +source=(http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz + battery.patch) optdepends=(pcmanfm) -md5sums=('129fae75d1cd3983fd94542c573a70a1') build() { cd "$srcdir/$pkgname-$pkgver" + + patch -Np1 -i "$srcdir/battery.patch" + ./configure --sysconfdir=/etc --prefix=/usr make } @@ -25,3 +29,7 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } +md5sums=('129fae75d1cd3983fd94542c573a70a1' + '5fadb4d5aca09c81138677e91f995d98') +md5sums=('129fae75d1cd3983fd94542c573a70a1' + '5fadb4d5aca09c81138677e91f995d98') diff --git a/community/lxpanel/battery.patch b/community/lxpanel/battery.patch new file mode 100644 index 000000000..5d701ea6d --- /dev/null +++ b/community/lxpanel/battery.patch @@ -0,0 +1,72 @@ +diff --git plugins/batt/batt_sys.c plugins/batt/batt_sys.c +index 54ff678..1eebab5 100644 +--- a/src/plugins/batt/batt_sys.c ++++ b/src/plugins/batt/batt_sys.c +@@ -35,15 +35,6 @@ + #include <stdlib.h> + #include <string.h> + +-battery* battery_new() { +- static int battery_num = 1; +- battery * b = g_new0 ( battery, 1 ); +- battery_reset(b); +- b->battery_num = battery_num; +- battery_num++; +- return b; +-} +- + void battery_reset( battery * b) { + b->type_battery = TRUE; + b->capacity_unit = "mAh"; +@@ -58,6 +49,15 @@ void battery_reset( battery * b) { + b->state = NULL; + } + ++battery* battery_new() { ++ static int battery_num = 1; ++ battery * b = g_new0 ( battery, 1 ); ++ battery_reset(b); ++ b->battery_num = battery_num; ++ battery_num++; ++ return b; ++} ++ + static gchar* parse_info_file(char *filename) + { + char *buf = NULL; +@@ -194,7 +194,7 @@ void battery_update( battery *b ) { + + /* convert energy values (in mWh) to charge values (in mAh) if needed and possible */ + if (b->last_capacity_unit != -1 && b->last_capacity == -1) { +- if (b->voltage != -1) { ++ if (b->voltage > 0) { + b->last_capacity = b->last_capacity_unit * 1000 / b->voltage; + } else { + b->last_capacity = b->last_capacity_unit; +@@ -202,7 +202,7 @@ void battery_update( battery *b ) { + } + } + if (b->design_capacity_unit != -1 && b->design_capacity == -1) { +- if (b->voltage != -1) { ++ if (b->voltage > 0) { + b->design_capacity = b->design_capacity_unit * 1000 / b->voltage; + } else { + b->design_capacity = b->design_capacity_unit; +@@ -210,7 +210,7 @@ void battery_update( battery *b ) { + } + } + if (b->remaining_energy != -1 && b->remaining_capacity == -1) { +- if (b->voltage != -1) { ++ if (b->voltage > 0) { + b->remaining_capacity = b->remaining_energy * 1000 / b->voltage; + b->present_rate = b->present_rate * 1000 / b->voltage; + } else { +@@ -220,7 +220,7 @@ void battery_update( battery *b ) { + if (b->last_capacity < MIN_CAPACITY) + b->percentage = 0; + else +- b->percentage = ((float) b->remaining_energy * 100.0) / (float) b->last_capacity_unit; ++ b->percentage = (float) b->remaining_capacity * 100 / b->last_capacity; + + if (b->percentage > 100) + b->percentage = 100; diff --git a/community/oolite/PKGBUILD b/community/oolite/PKGBUILD index 9bad89c5d..08f9e0d71 100644 --- a/community/oolite/PKGBUILD +++ b/community/oolite/PKGBUILD @@ -2,8 +2,8 @@ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Lone_Wolf <lonewolf@xs4all.nl> pkgname=oolite -pkgver=1.75.3 -pkgrel=2 +pkgver=1.76 +pkgrel=1 pkgdesc="A space-sim based on the classic Elite" arch=('i686' 'x86_64' 'mips64el') url="http://oolite-linux.berlios.de" @@ -11,13 +11,13 @@ license=('GPL2') depends=('gnustep-gui' 'sdl_mixer' 'mesa' 'espeak' 'nspr' 'python2' 'icu') makedepends=('gcc-objc' 'gnustep-make' 'curl' 'zip') options=(!makeflags) -source=(oolite http://download2.berlios.de/oolite-linux/oolite-dev-source-${pkgver}.tar.bz2) +source=(oolite http://download2.berlios.de/oolite-linux/oolite-source-${pkgver}.tar.bz2) md5sums=('b182976fade9b64a3b3702e2a8c72bf0' - 'e6c3d1e41f60f8cf410f766a3ecadcc7') + 'd540486facd8275dc6bceebae8428dce') build() { cd $srcdir - cp -r ${srcdir}/oolite-dev-source-${pkgver} ${srcdir}/${pkgname}-build + cp -r ${srcdir}/oolite-source-${pkgver} ${srcdir}/${pkgname}-build cd ${srcdir}/${pkgname}-build sed -i "/ADDITIONAL_OBJCFLAGS/s/=/= -fobjc-exceptions/" GNUmakefile diff --git a/community/ozerocdoff/PKGBUILD b/community/ozerocdoff/PKGBUILD index 452fc41ff..b8e9b7352 100644 --- a/community/ozerocdoff/PKGBUILD +++ b/community/ozerocdoff/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 60103 2011-12-05 08:41:04Z spupykin $ +# $Id: PKGBUILD 61135 2011-12-22 10:38:39Z spupykin $ # Maintainer: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> pkgname=ozerocdoff pkgver=2 -pkgrel=4 +pkgrel=5 pkgdesc="Userspace driver for Option High Speed Mobile Devices" arch=('i686' 'x86_64' 'mips64el') url="http://www.pharscape.org/ozerocdoff.html" @@ -13,7 +13,7 @@ options=('!emptydirs') source=(udev.tar.gz::"http://www.pharscape.org/forum/index.php?action=dlattach;topic=545.0;attach=4" "remove-old-rules.patch") md5sums=('88a78f9380d9591f8d20a657b72e3e5c' - '2b28c8310b615e7283c2c38f62533c4f') + '213737cfccde2fe49a334db2b681c3f5') build() { cd "${srcdir}/udev" diff --git a/community/ozerocdoff/remove-old-rules.patch b/community/ozerocdoff/remove-old-rules.patch index 0a5e7fecc..c395280cb 100644 --- a/community/ozerocdoff/remove-old-rules.patch +++ b/community/ozerocdoff/remove-old-rules.patch @@ -1,7 +1,16 @@ diff -wbBur udev/hso.udev udev.my/hso.udev --- udev/hso.udev 2008-06-19 14:34:07.000000000 +0400 -+++ udev.my/hso.udev 2011-12-05 12:36:34.000000000 +0400 -@@ -63,60 +63,6 @@ ++++ udev.my/hso.udev 2011-12-22 14:31:29.000000000 +0400 +@@ -1,8 +1,5 @@ + ACTION!="add", GOTO="hso_end" + +-# Syntax switch, need possibly for upcoming Distros +-ATTR{dev}!="?*", GOTO="hso_old_syntax" +- + ############################### NEW SYNTAX ############################### + + LABEL="hso_new_syntax" +@@ -63,60 +60,6 @@ SUBSYSTEM=="tty", SUBSYSTEMS=="usb", ATTR{hsotype}=="PCSC", SYMLINK+="wpcsc0" GOTO="hso_tty_permission" diff --git a/community/pingus/PKGBUILD b/community/pingus/PKGBUILD index 887484957..1f8b53b9d 100644 --- a/community/pingus/PKGBUILD +++ b/community/pingus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 59956 2011-12-02 21:00:04Z ibiru $ +# $Id: PKGBUILD 61223 2011-12-24 23:23:29Z lcarlier $ # Maintainer: Eric Belanger <eric@archlinux.org> pkgname=pingus -pkgver=0.7.5 -pkgrel=2 +pkgver=0.7.6 +pkgrel=1 pkgdesc="A Lemmings clone, i.e. a level-based puzzle game." arch=('i686' 'x86_64' 'mips64el') url="http://pingus.seul.org" @@ -11,9 +11,9 @@ license=('GPL') depends=('sdl_image' 'sdl_mixer' 'libgl' 'boost-libs>=1.48') makedepends=('scons' 'boost>=1.48' 'mesa') source=(http://pingus.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 pingus.desktop) -md5sums=('68e0bd1327e0eedcaab64d64528540ba' +md5sums=('561798686f34d3fa4e69135d655f47ac' '9eec34047bdcff49e08f41e81764e20c') -sha1sums=('65493f9c9914bb401dbcfe1fe6bf2fad2388b755' +sha1sums=('b5f5a25d71beb197c9466fb8928018a377f56487' '579a1144f161ce89e6e024cea37210149b89c0c0') build() { diff --git a/community/python2-pyopencl/PKGBUILD b/community/python2-pyopencl/PKGBUILD index 65c20847a..bc8e85fcf 100644 --- a/community/python2-pyopencl/PKGBUILD +++ b/community/python2-pyopencl/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 60633 2011-12-15 21:15:10Z stephane $ +# $Id: PKGBUILD 61157 2011-12-22 18:02:54Z ibiru $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=python2-pyopencl pkgver=2011.1.2 -pkgrel=3 +pkgrel=4 pkgdesc="A complete, object-oriented language binding of OpenCL to Python" arch=('i686' 'x86_64' 'mips64el') url="http://mathema.tician.de/software/pyopencl" license=('custom') -depends=('python2' 'python2-numpy' 'python-mako' 'python2-pytools' 'libcl' 'opencl-headers' 'mesa') +depends=('python2' 'python2-numpy' 'python2-mako' 'python2-pytools' 'libcl' 'opencl-headers' 'mesa') makedepends=('ctags' 'python2-distribute') provides=('pyopencl=${pkgver}') replaces=('pyopencl') diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD index 1f8d2451b..a5f192e51 100644 --- a/community/spring/PKGBUILD +++ b/community/spring/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 60207 2011-12-07 16:26:35Z svenstaro $ +# $Id: PKGBUILD 61151 2011-12-22 17:17:17Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=spring -pkgver=0.84.0 -_pkgver=84.0 -pkgrel=2 +pkgver=0.85.0 +_pkgver=85.0 +pkgrel=1 pkgdesc='A free 3D real-time-strategy (RTS) game engine' arch=('i686' 'x86_64' 'mips64el') url="http://springrts.com/" license=('GPL') -depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis' 'sdl') -makedepends=('boost' 'cmake' 'zip' 'lzma-utils' 'p7zip' 'python2') +depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis' 'sdl' + 'libxcursor') +makedepends=('boost' 'cmake' 'zip' 'lzma-utils' 'p7zip' 'python2' 'java-environment') optdepends=('python2: python-based bots' 'java-runtime: java-based bots') source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma) -md5sums=('2aae395c055adceec5326fb3faec92ba') +md5sums=('ea90c264faa517e4d70542fb2082a2f3') build() { bsdtar -xf ${pkgname}_${_pkgver}_src.tar.lzma diff --git a/community/stow/PKGBUILD b/community/stow/PKGBUILD index c362a08d0..d52341b39 100644 --- a/community/stow/PKGBUILD +++ b/community/stow/PKGBUILD @@ -5,14 +5,14 @@ # Contributor: Chris Brannon <cmbrannon79@gmail.com> pkgname=stow -pkgver=2.1.0 +pkgver=2.1.2 pkgrel=1 pkgdesc='GNU Stow is a program for managing the installation of software packages' url='http://www.gnu.org/software/stow/' arch=('i686' 'x86_64') source=("ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz") license=('GPL2') -md5sums=('5526fdb8c76d0aee35eb304d7f55d2f6') +md5sums=('82857e43531cf6936aed99ef3b86b446') build() { cd $pkgname-$pkgver diff --git a/community/tcpreplay/PKGBUILD b/community/tcpreplay/PKGBUILD new file mode 100644 index 000000000..054c87d7e --- /dev/null +++ b/community/tcpreplay/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 61217 2011-12-24 18:01:44Z tredaelli $ +# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> +# Contributor: Sébastien Duquette <ekse.0x@gmail.com> +# Contributor: Dawid Wrobel <cromo@klej.net> +pkgname=tcpreplay +pkgver=3.4.4 +pkgrel=3 +pkgdesc="Gives the ability to replay previously captured traffic in a libpcap format" +url="http://tcpreplay.synfin.net" +arch=('i686' 'x86_64') +license=('GPL3') +depends=('libpcap' 'libdnet') +makedepends=('tcpdump') +optdepends=('tcpdump: decoding of packets support') +options=('!emptydirs') +source=("http://downloads.sourceforge.net/sourceforge/tcpreplay/${pkgname}-${pkgver}.tar.gz") +md5sums=('22725feb9b2590809f9350308ec65180') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --enable-dynamic-link --with-tcpdump=/usr/sbin/tcpdump + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/community/texmaker/PKGBUILD b/community/texmaker/PKGBUILD index 710f4c4a8..04196b219 100644 --- a/community/texmaker/PKGBUILD +++ b/community/texmaker/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 61099 2011-12-21 20:52:54Z andrea $ +# $Id: PKGBUILD 61145 2011-12-22 15:39:01Z tdziedzic $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: furester <xfurester@hotmail.com> @@ -6,15 +6,15 @@ # Contributor: Paulo Matias <matiasΘarchlinux-br·org> pkgname=texmaker -pkgver=3.1 -pkgrel=2 +pkgver=3.2 +pkgrel=1 pkgdesc='Free cross-platform latex editor' arch=('i686' 'x86_64' 'mips64el') url="http://www.xm1math.net/texmaker/index.html" license=('GPL') depends=('poppler-qt' 'ghostscript' 'qtwebkit') source=("http://www.xm1math.net/texmaker/${pkgname}-${pkgver}.tar.bz2") -md5sums=('10a14c75abbb7234d4e5e58a7c85b110') +md5sums=('506f8b234e1266b188e73e2fc61c68d5') build() { cd ${pkgname}-${pkgver} diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD index 6f896a7c9..40d3a2a99 100644 --- a/community/vtk/PKGBUILD +++ b/community/vtk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58425 2011-11-12 17:19:02Z ibiru $ +# $Id: PKGBUILD 61185 2011-12-23 22:04:01Z tdziedzic $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Christofer Bertonha <christoferbertonha at gmail dot com> # Contributor: leepesjee <lpeschier at xs4all dot nl> @@ -9,7 +9,7 @@ pkgname=vtk pkgver=5.8.0 -pkgrel=6 +pkgrel=7 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' 'mips64el') url='http://www.vtk.org' @@ -24,11 +24,13 @@ optdepends=('python2: python bindings' source=("http://www.vtk.org/files/release/${pkgver:0:3}/vtk-${pkgver}.tar.gz" "http://www.vtk.org/files/release/${pkgver:0:3}/vtkdata-${pkgver}.tar.gz" 'fixkernelversioncheck.diff' - 'ffmpeg-0.8.diff') + 'ffmpeg-0.8.diff' + 'fix-boost-graph-api-changes.diff') md5sums=('37b7297d02d647cc6ca95b38174cb41f' 'a05295b81930e894fc0e31866f399151' '9e137af23701f76fc727222ebac23389' - 'e992321c9d1def6034d0fa6607b40c5a') + 'e992321c9d1def6034d0fa6607b40c5a' + 'e715aef2aea26fc05f904efb5d0d5627') build() { cd VTK @@ -41,6 +43,10 @@ build() { # remove next pkgver bump patch -Np1 -i ${srcdir}/ffmpeg-0.8.diff + # fix compilation error: http://vtk.org/Bug/view.php?id=12772 + # remove next pkgver bump + patch -Np1 -i ${srcdir}/fix-boost-graph-api-changes.diff + cd ${srcdir} rm -rf build @@ -82,6 +88,7 @@ build() { -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" \ -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \ -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 \ ${srcdir}/VTK make diff --git a/community/vtk/fix-boost-graph-api-changes.diff b/community/vtk/fix-boost-graph-api-changes.diff new file mode 100644 index 000000000..2162e7a28 --- /dev/null +++ b/community/vtk/fix-boost-graph-api-changes.diff @@ -0,0 +1,42 @@ +commit d3ecc2c459dd1df937fc97887581ace1036da533 +Author: Marcus D. Hanwell <marcus.hanwell@kitware.com> +Date: Tue Dec 13 15:36:06 2011 -0500 + + BUG: 12772 fixes for change in Boost graph API + + This fixes bug 12772, where an API change in Boost was causing + compilation failures using Boost 1.38. Thanks to Orion Poplawski for + reporting the issue and posting the patch. + + Change-Id: I491b0f1650c0be19319533306eb10597dc96fa06 + +diff --git a/Infovis/vtkBoostBreadthFirstSearchTree.cxx b/Infovis/vtkBoostBreadthFirstSearchTree.cxx +index c789f6b..cf7cd47 100644 +--- a/Infovis/vtkBoostBreadthFirstSearchTree.cxx ++++ b/Infovis/vtkBoostBreadthFirstSearchTree.cxx +@@ -47,6 +47,15 @@ using namespace boost; + vtkStandardNewMacro(vtkBoostBreadthFirstSearchTree); + + ++namespace { ++ vtkIdType unwrap_edge_id(vtkEdgeType const &e) { ++ return e.Id; ++ } ++ vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) { ++ return e.underlying_desc.Id; ++ } ++} ++ + // Redefine the bfs visitor, the only visitor we + // are using is the tree_edge visitor. + template <typename IdMap> +@@ -95,7 +104,8 @@ public: + + // Copy the vertex and edge data from the graph to the tree. + tree->GetVertexData()->CopyData(graph->GetVertexData(), v, tree_v); +- tree->GetEdgeData()->CopyData(graph->GetEdgeData(), e.Id, tree_e.Id); ++ tree->GetEdgeData()->CopyData(graph->GetEdgeData(), ++ unwrap_edge_id(e), tree_e.Id); + } + + private: diff --git a/extra/botan/PKGBUILD b/extra/botan/PKGBUILD index 1623c55c4..5b21ffbe5 100644 --- a/extra/botan/PKGBUILD +++ b/extra/botan/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 128341 2011-06-23 05:31:14Z angvp $ +# $Id: PKGBUILD 145616 2011-12-24 05:45:52Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: d'Ronin <daronin@2600.com> pkgname=botan -pkgver=1.10.0 +pkgver=1.10.1 pkgrel=1 pkgdesc="BSD-licensed crypto library written in C++" license=('BSD') @@ -12,7 +12,7 @@ url="http://botan.randombit.net/" depends=('gcc-libs' 'sh') makedepends=('python2') source=(http://files.randombit.net/botan/Botan-${pkgver}.tgz) -md5sums=('1f03a6a84f402a12e50665868dddae99') +md5sums=('5e1e7f3458e2e6aa56f7e41941eefb9d') build() { cd ${srcdir}/Botan-${pkgver} diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD index eb145f5c0..ab0301ad7 100644 --- a/extra/gcin/PKGBUILD +++ b/extra/gcin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145112 2011-12-17 04:54:41Z bisson $ +# $Id: PKGBUILD 145630 2011-12-24 17:43:03Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=gcin -pkgver=2.6.0 +pkgver=2.6.6 pkgrel=1 pkgdesc='Input method server supporting various input methods' url='http://hyperrate.com/dir.php?eid=67' @@ -18,8 +18,8 @@ optdepends=('qt: support for qt4 input method' 'libchewing: support for chewing input method') source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz" 'qt4-lib64.patch') -sha1sums=('4abef8d37492b68d54ba40420f65d04779ee2ec5' - '4b121e9a86a2ca25869c69b7d4d9623a0c8f55fc') +sha1sums=('ef2ba1af83ce5f25cf54a7d3e84a5739d3a9e5e0' + '3d1b769dcd8820c8351f239ec32ee5bcd9d98b70') install=install diff --git a/extra/gcin/qt4-lib64.patch b/extra/gcin/qt4-lib64.patch index abc15950e..c47248beb 100644 --- a/extra/gcin/qt4-lib64.patch +++ b/extra/gcin/qt4-lib64.patch @@ -1,6 +1,6 @@ diff -aur old/configure new/configure ---- old/configure 2011-11-07 06:51:12.000000000 +1100 -+++ new/configure 2011-11-25 14:02:10.819256960 +1100 +--- old/configure 2011-12-21 00:48:03.000000000 +1100 ++++ new/configure 2011-12-25 04:06:14.424317251 +1100 @@ -188,7 +188,7 @@ @@ -10,9 +10,18 @@ diff -aur old/configure new/configure echo "testing if you have qt4 support" pkg-config --libs QtCore QtGui > /dev/null 2> /dev/null if [ $? = 0 ]; then +@@ -245,7 +245,7 @@ + mv gcin.spec gcin.spec.tmp + grep -v qt4/plugins/inputmethods gcin.spec.tmp > gcin.spec + else +- for i in /usr/share/qt4/bin/moc /usr/lib/qt4/bin/moc /usr/lib64/qt4/bin/moc ++ for i in /usr/share/qt4/bin/moc /usr/lib/qt4/bin/moc /usr/lib64/qt4/bin/moc /usr/bin/moc + do + [ -x $i ] && QT4_MOC=$i + done diff -aur old/qt4-im/Makefile new/qt4-im/Makefile ---- old/qt4-im/Makefile 2011-06-08 23:03:50.000000000 +1000 -+++ new/qt4-im/Makefile 2011-11-25 14:05:28.844110772 +1100 +--- old/qt4-im/Makefile 2011-12-19 14:52:46.000000000 +1100 ++++ new/qt4-im/Makefile 2011-12-25 04:06:14.424317251 +1100 @@ -1,5 +1,5 @@ include ../config.mak -QT=qt4 @@ -20,12 +29,3 @@ diff -aur old/qt4-im/Makefile new/qt4-im/Makefile QTIM=$(QT)/plugins/inputmethods IMMODULES=$(libdir)/$(QTIM) -@@ -15,7 +15,7 @@ - $(CXX) -E $(CFLAGS) $(INCS) $< > $@ - - moc_gcin-qt.cpp: gcin-qt.h -- /usr/$(LIB)/$(QT)/bin/moc $< -o moc_gcin-qt.cpp -+ /usr/bin/moc $< -o moc_gcin-qt.cpp - - im-gcin.so: $(OBJS) - export LD_RUN_PATH=$(gcinlibdir) ;\ diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD index 7d809f25d..8a32428f4 100644 --- a/extra/kdebindings-python/PKGBUILD +++ b/extra/kdebindings-python/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 144629 2011-12-08 09:18:34Z andrea $ +# $Id: PKGBUILD 145595 2011-12-23 10:46:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-python pkgver=4.7.4 -pkgrel=1 +pkgrel=2 pkgdesc="KDE bindings for Python" url="http://kde.org/" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') -depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla' 'boost-libs') +depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla') makedepends=('cmake' 'automoc4' 'boost') source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.bz2") sha1sums=('cac4b94098dba73d58fb4f7d73d7c65c306517d1') diff --git a/extra/libmtp/PKGBUILD b/extra/libmtp/PKGBUILD index 78018661f..2dd96a307 100644 --- a/extra/libmtp/PKGBUILD +++ b/extra/libmtp/PKGBUILD @@ -1,23 +1,22 @@ -# $Id: PKGBUILD 127351 2011-06-13 11:09:19Z stephane $ +# $Id: PKGBUILD 145614 2011-12-24 03:54:58Z dreisner $ # Contributor: damir <damir@archlinux.org> # Contributor: Kevin Edmonds <edmondskevin@hotmail.com> pkgname=libmtp -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=1 pkgdesc="library implementation of the Media Transfer Protocol" arch=("i686" "x86_64" 'mips64el') url="http://libmtp.sourceforge.net" license=('LGPL') depends=('libusb-compat') -makedepends=('doxygen') options=('!libtool') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('fd7b293436528f4c780a9da6e5cc5398') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('073e1c2a00ba377f68dce47727e185ae') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --with-udev-rules=52-libmtp.rules + ./configure --prefix=/usr make } diff --git a/extra/libmythes/PKGBUILD b/extra/libmythes/PKGBUILD index 8a86b2f38..c5e5899da 100644 --- a/extra/libmythes/PKGBUILD +++ b/extra/libmythes/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 144883 2011-12-08 21:25:55Z andyrtr $ +# $Id: PKGBUILD 145626 2011-12-24 14:41:49Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgname=libmythes -pkgver=1.2.1 -pkgrel=2 +pkgver=1.2.2 +pkgrel=1 epoch=1 pkgdesc="a simple thesaurus" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('hunspell') options=('!libtool') provides=('mythes') source=(http://downloads.sourceforge.net/hunspell/${pkgname/lib/}-${pkgver}.tar.gz) -md5sums=('54b310488dda6929cf31ae859928c945') +md5sums=('e1e255dc43dbcbb34cb19e8a0eba90ae') build() { cd ${srcdir}/${pkgname/lib/}-$pkgver diff --git a/extra/libxfce4ui/PKGBUILD b/extra/libxfce4ui/PKGBUILD index e6051915a..069eb2ea6 100644 --- a/extra/libxfce4ui/PKGBUILD +++ b/extra/libxfce4ui/PKGBUILD @@ -1,35 +1,39 @@ -# $Id: PKGBUILD 124354 2011-05-20 06:47:50Z andyrtr $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> +# $Id: PKGBUILD 145607 2011-12-23 17:37:26Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Xavier Devlamynck <magicrhesus@ouranos.be> pkgname=libxfce4ui -pkgver=4.8.0 -pkgrel=3.1 -pkgdesc="share commonly used Xfce widgets among the Xfce applications" +pkgver=4.8.1 +pkgrel=1 +pkgdesc="Commonly used Xfce widgets among Xfce applications" arch=('i686' 'x86_64' 'mips64el') -license=('GPL2') url="http://www.xfce.org/" -depends=('libxfce4util>=4.8.0' 'gtk2' "xfconf>=4.8.0" 'libsm' 'startup-notification') +license=('GPL2') +depends=('libxfce4util' 'gtk2' 'xfconf' 'libsm' 'startup-notification') makedepends=('intltool' 'gtk-doc' 'glade') optdepends=('glade: for using the included glade module') #replaces=('libxfcegui4') - later when all is ported options=('!libtool') -source=(http://archive.xfce.org/src/xfce/libxfce4ui/4.8/${pkgname}-${pkgver}.tar.bz2) -md5sums=('df9acb3328dff905bd0777b84532b69f') +source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2) +sha256sums=('39cbed29da06960074014b74abc2ba57db49dc81ab8995fb2160579c51669956') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-static \ - --enable-gtk-doc \ - --disable-debug + cd "$srcdir/$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-static \ + --enable-gtk-doc \ + --disable-debug make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/extra/libxi/PKGBUILD b/extra/libxi/PKGBUILD index 90eee20de..d500fb58a 100644 --- a/extra/libxi/PKGBUILD +++ b/extra/libxi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 145122 2011-12-17 08:47:23Z andyrtr $ +# $Id: PKGBUILD 145628 2011-12-24 14:44:56Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxi -pkgver=1.4.4 +pkgver=1.4.5 pkgrel=1 pkgdesc="X11 Input extension library" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ options=(!libtool) license=('custom') source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2 XExtInt-align-classes-n32.diff) -sha1sums=('e4ca1b45368214ba246bfad398ea087125c79f31' +sha1sums=('8ac24dec8e488f49fd6a6b256c815da9ceec9737' '30931831efa9a7f8a888f41bb9284fa32f2e2392') build() { diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 8b5dbf8b6..de3e672d2 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 144603 2011-12-07 21:23:41Z giovanni $ +# $Id: PKGBUILD 145447 2011-12-22 13:02:48Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2011.12.02 +pkgver=2011.12.20 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64' 'mips64el') @@ -11,6 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") +md5sums=('1bcbd2e45149c0d918c63df8f6d7d0e0') build() { cd ${srcdir}/live @@ -37,4 +38,3 @@ package() { install ${testprog} ${pkgdir}/usr/bin done } -md5sums=('4f10d93d33f6714a980fd1655ead69cd') diff --git a/extra/phonon/PKGBUILD b/extra/phonon/PKGBUILD index a257a5c38..3a7e1755d 100644 --- a/extra/phonon/PKGBUILD +++ b/extra/phonon/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 145248 2011-12-20 07:59:43Z andrea $ +# $Id: PKGBUILD 145472 2011-12-22 22:17:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=phonon @@ -11,7 +11,7 @@ license=('LGPL') pkgdesc="The multimedia framework for KDE" depends=('qt' 'phonon-backend' 'libpulse' 'libqzeitgeist') optdepends=('pulseaudio: PulseAudio support') -makedepends=('cmake' 'automoc4' 'pulseaudio') +makedepends=('cmake' 'automoc4' 'pulseaudio' 'qtwebkit') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") md5sums=('bbe0c1c62ed14c31479c4c1a6cf1e173') @@ -22,7 +22,7 @@ build() { cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_PREFIX=/usr -DPHONON_QT_MKSPECS_INSTALL_DIR=/usr/share/qt/mkspecs/modules \ -DPHONON_QT_PLUGIN_INSTALL_DIR=/usr/lib/qt/plugins/designer make diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD index f3523f20f..e44555352 100644 --- a/extra/pyqt/PKGBUILD +++ b/extra/pyqt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 145329 2011-12-21 20:47:08Z andrea $ +# $Id: PKGBUILD 145605 2011-12-23 14:48:45Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> @@ -6,18 +6,23 @@ pkgbase=pyqt pkgname=('pyqt' 'python2-pyqt') -pkgver=4.8.6 +pkgver=4.9 pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://riverbankcomputing.co.uk/software/pyqt/intro" license=('GPL') makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon' 'python-opengl' 'qt-assistant-compat' 'qtwebkit') -source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz") -md5sums=('9bfd7b08b8e438b83cc50d5c58191f97') +source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz" + 'fix-qthelp-build.patch') +md5sums=('61619500d09d87b6c2a25bd3ea994504' + '356a453331a33c507b1baba4a9771764') build() { cd "${srcdir}" + + patch -p0 -i "${srcdir}"/fix-qthelp-build.patch + cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver} cd "${srcdir}/PyQt-x11-gpl-${pkgver}" diff --git a/extra/pyqt/fix-qthelp-build.patch b/extra/pyqt/fix-qthelp-build.patch new file mode 100644 index 000000000..cd565e646 --- /dev/null +++ b/extra/pyqt/fix-qthelp-build.patch @@ -0,0 +1,11 @@ +--- PyQt-x11-gpl-4.9/configure.py~ 2011-12-23 14:53:07.981490550 +0100 ++++ PyQt-x11-gpl-4.9/configure.py 2011-12-23 14:52:38.384984221 +0100 +@@ -1264,7 +1264,7 @@ + opengl = (mname == "QtOpenGL") + + qt = [mname] +- if mname in ("QtOpenGL", "QtWebKit"): ++ if mname in ("QtHelp", "QtOpenGL", "QtWebKit"): + qt.append("QtCore") + + makefile = sipconfig.ProgramMakefile(sipcfg, console=1, qt=qt, warnings=0, diff --git a/extra/python-markupsafe/PKGBUILD b/extra/python-markupsafe/PKGBUILD index a71fc67fb..ca5cfcea0 100644 --- a/extra/python-markupsafe/PKGBUILD +++ b/extra/python-markupsafe/PKGBUILD @@ -1,22 +1,41 @@ -# $Id: PKGBUILD 113450 2011-03-08 17:36:15Z ibiru $ +# $Id: PKGBUILD 145461 2011-12-22 18:14:12Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Alex Anthony <alex.anthony28991@gmail.com> -pkgname=python-markupsafe -pkgver=0.12 -pkgrel=0 +pkgname=('python-markupsafe' 'python2-markupsafe') +pkgver=0.15 +pkgrel=1 pkgdesc="Implements a XML/HTML/XHTML Markup safe string for Python" arch=('i686' 'x86_64' 'mips64el') url="http://pypi.python.org/pypi/MarkupSafe" license=('custom') -depends=('python2') -makedepends=('setuptools') -source=(http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${pkgver}.tar.gz) -md5sums=('edd4b6950f6d4ddc6e23fa322f8f0f53') +makedepends=('python-distribute' 'python2-distribute') +source=("http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${pkgver}.tar.gz") +md5sums=('4e7c4d965fe5e033fa2d7bb7746bb186') build() { + cp -r MarkupSafe-${pkgver} python2-MarkupSafe-${pkgver} cd ${srcdir}/MarkupSafe-${pkgver} + python setup.py build + + cd ${srcdir}/python2-MarkupSafe-${pkgver} + python2 setup.py build +} + +package_python-markupsafe() { + depends=('python') + + cd ${srcdir}/MarkupSafe-${pkgver} + python setup.py install --root=${pkgdir} --optimize=1 + + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/python-markupsafe/LICENSE +} + +package_python2-markupsafe() { + depends=('python2') + + cd ${srcdir}/python2-MarkupSafe-${pkgver} python2 setup.py install --root=${pkgdir} --optimize=1 - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/python2-markupsafe/LICENSE } diff --git a/extra/python-urwid/PKGBUILD b/extra/python-urwid/PKGBUILD index b29fdccd6..08fec228f 100644 --- a/extra/python-urwid/PKGBUILD +++ b/extra/python-urwid/PKGBUILD @@ -3,21 +3,40 @@ # Maintainer: Sergej Pupykin <sergej@aur.archlinux.org> # Maintainer: Douglas Soares de Andrade <dsandrade@gmail.com> -pkgname=python-urwid -pkgver=0.9.9.2 +pkgname=('python-urwid' 'python2-urwid') +pkgver=1.0.1 pkgrel=1 pkgdesc="Urwid is a curses-based user interface library." license=('GPL') arch=('i686' 'x86_64' 'mips64el') -depends=('python2') +makedepends=('python2-distribute' 'python-distribute') url="http://excess.org/urwid/" source=(http://excess.org/urwid/urwid-$pkgver.tar.gz) -md5sums=('e58b86a983fe5474a07749501748b728') +md5sums=('828f7144b94920205e755c249d2e297f') build() { - cd $startdir/src/urwid-$pkgver + cp -r urwid-$pkgver python2-urwid-$pkgver + + cd $srcdir/urwid-$pkgver + python setup.py build + + cd $srcdir/python2-urwid-$pkgver sed -i 's#bin/python#bin/python2#' urwid/*.py - python2 setup.py install --prefix=/usr --root=$startdir/pkg || return 1 + + python2 setup.py build +} + +package_python-urwid() { + depends=('python') - rm -rf $startdir/src/$_hgname-build + cd $srcdir/urwid-$pkgver + python setup.py install --prefix=/usr --root=$pkgdir --optimize=1 } + +package_python2-urwid() { + depends=('python2') + + cd $srcdir/python2-urwid-$pkgver + python2 setup.py install --prefix=/usr --root=$pkgdir --optimize=1 +} + diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD index 657199f72..47e381721 100644 --- a/extra/qscintilla/PKGBUILD +++ b/extra/qscintilla/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 142563 2011-11-12 08:13:52Z andrea $ +# $Id: PKGBUILD 145611 2011-12-23 20:54:15Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> @@ -6,7 +6,7 @@ pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla') pkgver=2.6 -pkgrel=1 +pkgrel=2 license=('GPL') arch=('i686' 'x86_64' 'mips64el') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" @@ -58,9 +58,6 @@ package_python-qscintilla() { cd "${srcdir}/QScintilla-gpl-${pkgver}/Python" install -Dm755 Qsci.so \ "${pkgdir}/usr/lib/python3.2/site-packages/PyQt4/Qsci.so" - - # Fix RPATH - chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/python3.2/site-packages/PyQt4/Qsci.so } package_python2-qscintilla() { @@ -69,7 +66,4 @@ package_python2-qscintilla() { cd "${srcdir}/QScintilla-gpl-${pkgver}/Python2" make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install - - # Fix RPATH - chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/python2.7/site-packages/PyQt4/Qsci.so } diff --git a/extra/qtwebkit/PKGBUILD b/extra/qtwebkit/PKGBUILD index ad8e6471d..651370de9 100644 --- a/extra/qtwebkit/PKGBUILD +++ b/extra/qtwebkit/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 145321 2011-12-21 20:46:56Z andrea $ +# $Id: PKGBUILD 145469 2011-12-22 22:02:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=qtwebkit -pkgver=2.2.0 -pkgrel=3 +pkgver=2.2.1 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://trac.webkit.org/wiki/QtWebKit' pkgdesc='An open source web browser engine (Qt port)' license=('LGPL2.1' 'GPL3') -depends=('qt' 'gperf' 'bison' 'phonon' 'gstreamer0.10-base') +depends=('qt' 'gperf' 'bison' 'gstreamer0.10-base') makedepends=('python2' 'mesa' 'chrpath') conflicts=('qt<4.8') -source=("http://get.qt.nokia.com/${pkgname}/QtWebKit-${pkgver}.tar.gz" +#source=("http://get.qt.nokia.com/${pkgname}/QtWebKit-${pkgver}.tar.gz" +source=("ftp://ftp.archlinux.org/other/${pkgname}/QtWebKit-${pkgver}.tar.gz" 'python2-path.patch') -sha1sums=('3582f3a8b593140af004a19479f5ec19693b3df7' +sha1sums=('283fc116882157df0474af496be73bb9b34cb001' 'b0ef3d5596171e3900a685df9bcfac3068ad6330') build() { diff --git a/extra/rhythmbox/PKGBUILD b/extra/rhythmbox/PKGBUILD index 6eb3ce681..f95604103 100644 --- a/extra/rhythmbox/PKGBUILD +++ b/extra/rhythmbox/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 139425 2011-10-01 19:01:11Z ibiru $ +# $Id: PKGBUILD 145457 2011-12-22 17:55:49Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=rhythmbox -pkgver=2.90.1.git20110928 +pkgver=2.90.1.git20111222 pkgrel=1 -pkgdesc="An iTunes-like music player/libary" +pkgdesc="An iTunes-like music playback and management application" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.rhythmbox.org" depends=('libgpod' 'gvfs-afc' 'totem-plparser' 'libmusicbrainz3' 'libmtp' 'lirc-utils' 'libwebkit3' 'libdmapsharing' 'media-player-info' 'python2-gobject' - 'python-gnomekeyring' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'json-glib' 'desktop-file-utils' 'libpeas' 'python-mako' 'grilo' 'dconf') + 'python-gnomekeyring' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'json-glib' 'desktop-file-utils' 'libpeas' 'python2-mako' 'grilo' 'dconf' 'libnotify') makedepends=('pkgconfig' 'gnome-doc-utils>=0.20.1' 'intltool' 'brasero' 'gnome-common' 'gtk-doc' 'gobject-introspection') optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs' 'gstreamer0.10-bad-plugins: Extra media codecs' @@ -19,11 +19,11 @@ optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs' options=('!libtool' '!emptydirs' '!strip') install=rhythmbox.install #source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.13/${pkgname}-${pkgver}.tar.bz2) -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('b95b2aed0cd485198fbefdcb8dbf2a1ca3d4eb7d31b1e02d610fb16384191e8a') +source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz) +sha256sums=('06cb3dda1871060c192e32c7f8237c046d120946a3647ebe2041695bce90a839') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" export CFLAGS="$CFLAGS -g -O1" export CXXFLAGS="$CXXFLAGS -g -O1" PYTHON=/usr/bin/python2 ./autogen.sh @@ -36,7 +36,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install } diff --git a/extra/rxvt-unicode/ChangeLog b/extra/rxvt-unicode/ChangeLog index a374f7b27..f343b86cb 100644 --- a/extra/rxvt-unicode/ChangeLog +++ b/extra/rxvt-unicode/ChangeLog @@ -1,4 +1,7 @@ 2011-12-02 Angel Velasquez <angvp@archlinux.org> + * Version bump to 9.14 + +2011-12-02 Angel Velasquez <angvp@archlinux.org> * Moved perl from optdepend to depend (closes FS#25782) 2011-05-22 Angel Velasquez <angvp@archlinux.org> diff --git a/extra/rxvt-unicode/PKGBUILD b/extra/rxvt-unicode/PKGBUILD index ef8c89f59..9f688a959 100644 --- a/extra/rxvt-unicode/PKGBUILD +++ b/extra/rxvt-unicode/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 144079 2011-12-03 04:45:00Z angvp $ +# $Id: PKGBUILD 145618 2011-12-24 05:53:53Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: tobias <tobias@archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org pkgname=rxvt-unicode -pkgver=9.12 -pkgrel=2 +pkgver=9.14 +pkgrel=1 pkgdesc="An unicode enabled rxvt-clone terminal emulator (urxvt)" arch=('i686' 'x86_64' 'mips64el') url="http://software.schmorp.de/pkg/rxvt-unicode.html" @@ -15,9 +15,9 @@ optdepends=('gtk2-perl: to use the urxvt-tabbed') changelog=ChangeLog source=(http://dist.schmorp.de/rxvt-unicode/${pkgname}-${pkgver}.tar.bz2 \ ${pkgname}.desktop) -md5sums=('945af37d661c8c45a7cac292160e7c70' +md5sums=('022235a9a8b012c29e72c49177be6ce4' '3de6c13126a45bc3bc9f6bba077a1311') -sha1sums=('4cbf0516b8304dfb041b9f3e5aaba662fee4b979' +sha1sums=('e303b7591225b06bc04e18a875461438c635014e' '962aebc88982dbeb62a7c4a051ff567e015f61a0') build() { diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD index bd17db2be..9b061a986 100644 --- a/extra/sip/PKGBUILD +++ b/extra/sip/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141389 2011-10-30 11:14:14Z andrea $ +# $Id: PKGBUILD 145600 2011-12-23 10:58:52Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> @@ -6,14 +6,14 @@ pkgbase=sip pkgname=('sip' 'python2-sip') -pkgver=4.13 +pkgver=4.13.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.riverbankcomputing.com/software/sip/" license=('custom:"sip"') makedepends=('python' 'python2') source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz") -md5sums=('21b4e2cad56e4156df2220143264b8ff') +md5sums=('3f61fd39d5b0c8fa9e43b59af04de924') build() { cd "${srcdir}" diff --git a/extra/xfconf/PKGBUILD b/extra/xfconf/PKGBUILD index 8f57230a6..1f253d1d0 100644 --- a/extra/xfconf/PKGBUILD +++ b/extra/xfconf/PKGBUILD @@ -1,43 +1,49 @@ -# $Id: PKGBUILD 130064 2011-07-01 20:39:13Z andyrtr $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> +# $Id: PKGBUILD 145609 2011-12-23 17:39:17Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfconf -pkgver=4.8.0 -pkgrel=3 -pkgdesc="a simple client-server configuration storage and query system" +pkgver=4.8.1 +pkgrel=1 +pkgdesc="A simple client-server configuration storage and query system" arch=('i686' 'x86_64' 'mips64el') -license=('GPL2') url="http://www.xfce.org/" +license=('GPL2') groups=('xfce4') # http://www.xfce.org/documentation/requirements -# keep dbus and gtk2, see also http://bugs.archlinux.org/task/14536 -depends=( "libxfce4util>=4.8.0" "dbus-glib" 'dbus' 'gtk2') +# keep dbus, see also http://bugs.archlinux.org/task/14536 +depends=('libxfce4util' 'dbus-glib' 'dbus') makedepends=('pkgconfig' 'perl-extutils-depends' 'perl-extutils-pkgconfig' -'perl-xml-parser' 'glib-perl' 'intltool' 'gtk-doc' 'chrpath') + 'glib-perl' 'intltool' 'gtk-doc' 'chrpath') options=('!libtool' '!emptydirs') -source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2) -md5sums=('0f11ed1ec7789c5c4c3fcc7cdb3c2940') +source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2) +sha256sums=('9860737539fab2b852e8c07c50c205a5fbe894b08bcb4488a70e3fd6c75993cb') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/xfce4 \ - --localstatedir=/var \ - --disable-static \ - --enable-gtk-doc \ - --with-perl-options=INSTALLDIRS="vendor" \ - --disable-debug + cd "$srcdir/$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/xfce4 \ + --localstatedir=/var \ + --disable-static \ + --enable-gtk-doc \ + --with-perl-options=INSTALLDIRS="vendor" \ + --disable-debug make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + # remove unneeded dynloader bootstrap file - rm ${pkgdir}/usr/lib/perl5/vendor_perl/auto/Xfce4/Xfconf/Xfconf.bs - + rm "$pkgdir/usr/lib/perl5/vendor_perl/auto/Xfce4/Xfconf/Xfconf.bs" + # fix insecure rpath, http://bugs.archlinux.org/task/19980 - chrpath -d ${pkgdir}/usr/lib/perl5/vendor_perl/auto/Xfce4/Xfconf/Xfconf.so + chrpath -d "$pkgdir/usr/lib/perl5/vendor_perl/auto/Xfce4/Xfconf/Xfconf.so" } + +# vim:set ts=2 sw=2 et: diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD index 3bb44bf29..a387ab785 100644 --- a/extra/xulrunner/PKGBUILD +++ b/extra/xulrunner/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 145292 2011-12-21 10:20:13Z ibiru $ +# $Id: PKGBUILD 145467 2011-12-22 20:32:10Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xulrunner -pkgver=9.0 +pkgver=9.0.1 pkgrel=1 pkgdesc="Mozilla Runtime Environment" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//$pkgver/source/f mozilla-pkgconfig.patch) options=('!emptydirs') replaces=('xulrunner-oss') -md5sums=('d8d0c8c79660752b02d9e9ab69a68f94' +md5sums=('7cf2bd379792a9b232267c6a79680566' '8dfb78c5bd0581c8cf4753813132bf0b' '27271ce647a83906ef7a24605e840d61') diff --git a/~lukeshu/android-udev/51-android.rules b/~lukeshu/android-udev/51-android.rules index 37ea75649..51f80cf54 100644 --- a/~lukeshu/android-udev/51-android.rules +++ b/~lukeshu/android-udev/51-android.rules @@ -19,10 +19,6 @@ SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", ATTR{idProduct}=="1411", SYMLINK+="and # Asus SUBSYSTEM=="usb", ATTR{idVendor}=="0b05", MODE="0666", GROUP="adbusers" -# Blade -SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", ATTR{idProduct}=="1354", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="d00d", SYMLINK+="android_fastboot" - # Dell SUBSYSTEM=="usb", ATTR{idVendor}=="413c", MODE="0666", GROUP="adbusers" @@ -233,4 +229,4 @@ SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", MODE="0666", GROUP="adbusers" # Blade SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", ATTR{idProduct}=="1353", SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", ATTR{idProduct}=="1351", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", ATTR{idProduct}=="1354", SYMLINK+="android_fastboot" + diff --git a/~lukeshu/android-udev/PKGBUILD b/~lukeshu/android-udev/PKGBUILD index f495690bb..6900b46da 100644 --- a/~lukeshu/android-udev/PKGBUILD +++ b/~lukeshu/android-udev/PKGBUILD @@ -10,7 +10,6 @@ arch=('any') url="http://developer.android.com/guide/developing/device.html" license=('unknown') source=('51-android.rules') -md5sums=('818395c180666e4e9a4a5f1d18434674') depends=('udev' 'libmtp') conflicts=('udev-android-rules') install='android-udev.install' @@ -20,3 +19,4 @@ package() { install -m644 "$srcdir/51-android.rules" "$pkgdir/etc/udev/rules.d/51-android.rules" } +md5sums=('909eb7629683efae838c6e9d65966b3b') diff --git a/~lukeshu/git-svn-abandon-git/PKGBUILD b/~lukeshu/git-svn-abandon-git/PKGBUILD new file mode 100644 index 000000000..51cd83817 --- /dev/null +++ b/~lukeshu/git-svn-abandon-git/PKGBUILD @@ -0,0 +1,51 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> + +_pkgname=git-svn-abandon +pkgname=$_pkgname-git +provides=($_pkgname) +conflicts=($_pkgname) +pkgver=20111224 +pkgrel=1 +pkgdesc="" +arch=('any') +url="http://blog.woobling.org/2009/06/git-svn-abandon.html" +license=('MIT') +depends=('git') +makedepends=('git' 'python-markdown') + +_gitroot=https://github.com/nothingmuch/git-svn-abandon.git +_gitname=$_pkgname + +build() { + cd "$srcdir" + msg "Connecting to GIT server...." + + if [[ -d "$_gitname" ]]; then + cd "$_gitname" && git pull origin + msg "The local files are updated." + else + git clone "$_gitroot" "$_gitname" + fi + + msg "GIT checkout done or server timeout" + msg "Starting build..." + + rm -rf "$srcdir/$_gitname-build" + git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build" + cd "$srcdir/$_gitname-build" + + # + # BUILD HERE + # + markdown README.mkdn > README.html +} + +package() { + cd "$srcdir/$_gitname-build" + install -d "$pkgdir/usr/lib/git-core" + install -m755 git-* "$pkgdir/usr/lib/git-core" + + install -D -m644 README.mkdn "$pkgdir/usr/doc/git-svn-abandon/README.md" + install -D -m644 README.html "$pkgdir/usr/doc/git-svn-abandon/README.html" + install -D -m644 LICENSE "$pkgdir/usr/licenses/git-svn-abandon/LICENSE" +} diff --git a/~lukeshu/make-graph/PKGBUILD b/~lukeshu/make-graph/PKGBUILD new file mode 100644 index 000000000..f7f7cd0b1 --- /dev/null +++ b/~lukeshu/make-graph/PKGBUILD @@ -0,0 +1,64 @@ +# $Id: PKGBUILD 138004 2011-09-14 05:05:12Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +_pkgname=make +pkgname=$_pkgname-graph +pkgver=3.82 +pkgrel=4.1 +provides=("$_pkgname=$pkgver") +conflicts=("$_pkgname") +pkgdesc="GNU make utility to maintain groups of programs, with patch to dump a Graphviz dependency graph." +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/make" +license=('GPL3') +groups=('base-devel') +depends=('glibc' 'sh') +install=$_pkgname.install +source=(ftp://ftp.gnu.org/gnu/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2 + bug30612.patch + bug30723.patch + make-3.82-sort-blank.patch + make-3.82-makeflags.patch) +md5sums=('1a11100f3c63fcf5753818e59d63088f' + 'c8f496b22191f9fb9420ab14c1a19a47' + '662e6450e19a5acdaa5c9fcb8ad78dea' + '7d01a99f389d8f08dec93ed479071ee4' + 'bc12ad4d0c6e6c0e72d9fb61054f446b') + +source+=('make-graph.patch') +md5sums+=('c1f1d652004a36c69b1f7f42a6849356') +depends+=('graphviz') + +build() { + cd ${srcdir}/${_pkgname}-${pkgver} + + # http://savannah.gnu.org/bugs/?30612 + patch -Np1 -i $srcdir/bug30612.patch + + # http://savannah.gnu.org/bugs/?30723 + patch -Np1 -i $srcdir/bug30723.patch + + # https://bugs.archlinux.org/task/22733 (fix from Fedora) + patch -Np1 -i $srcdir/make-3.82-sort-blank.patch + + # https://savannah.gnu.org/support/index.php?107487 + # https://savannah.gnu.org/bugs/?33873 + patch -Np0 -i $srcdir/make-3.82-makeflags.patch + + # https://savannah.gnu.org/patch/?7447 + patch -Np1 -i $srcdir/make-graph.patch + + ./configure --prefix=/usr + make +} + +check() { + cd ${srcdir}/${_pkgname}-${pkgver} + make check +} + +package() { + cd ${srcdir}/${_pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/~lukeshu/make-graph/bug30612.patch b/~lukeshu/make-graph/bug30612.patch new file mode 100644 index 000000000..fb843bcd9 --- /dev/null +++ b/~lukeshu/make-graph/bug30612.patch @@ -0,0 +1,66 @@ +diff -Naur make-3.82-orig/main.c make-3.82-fix30612//main.c +--- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000 ++++ make-3.82-fix30612//main.c 2010-09-23 23:33:37.908855839 +1000 +@@ -1,3 +1,4 @@ ++ + /* Argument parsing and main program of GNU Make. + Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, + 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, +@@ -1138,7 +1139,7 @@ + a macro and some compilers (MSVC) don't like conditionals in macros. */ + { + const char *features = "target-specific order-only second-expansion" +- " else-if shortest-stem undefine" ++ " else-if shortest-stem undefine oneshell" + #ifndef NO_ARCHIVES + " archives" + #endif +diff -Naur make-3.82-orig/read.c make-3.82-fix30612//read.c +--- make-3.82-orig/read.c 2010-07-13 11:20:42.000000000 +1000 ++++ make-3.82-fix30612//read.c 2010-09-23 23:30:58.018855839 +1000 +@@ -3028,7 +3028,7 @@ + { + /* This looks like the first element in an open archive group. + A valid group MUST have ')' as the last character. */ +- const char *e = p + nlen; ++ const char *e = p; + do + { + e = next_token (e); +@@ -3084,19 +3084,19 @@ + Go to the next item in the string. */ + if (flags & PARSEFS_NOGLOB) + { +- NEWELT (concat (2, prefix, tp)); ++ NEWELT (concat (2, prefix, tmpbuf)); + continue; + } + + /* If we get here we know we're doing glob expansion. + TP is a string in tmpbuf. NLEN is no longer used. + We may need to do more work: after this NAME will be set. */ +- name = tp; ++ name = tmpbuf; + + /* Expand tilde if applicable. */ +- if (tp[0] == '~') ++ if (tmpbuf[0] == '~') + { +- tildep = tilde_expand (tp); ++ tildep = tilde_expand (tmpbuf); + if (tildep != 0) + name = tildep; + } +@@ -3152,7 +3152,11 @@ + else + { + /* We got a chain of items. Attach them. */ +- (*newp)->next = found; ++ if (*newp) ++ (*newp)->next = found; ++ else ++ *newp = found; ++ + + /* Find and set the new end. Massage names if necessary. */ + while (1) diff --git a/~lukeshu/make-graph/bug30723.patch b/~lukeshu/make-graph/bug30723.patch new file mode 100644 index 000000000..84e7ebe7a --- /dev/null +++ b/~lukeshu/make-graph/bug30723.patch @@ -0,0 +1,12 @@ +diff -Naur make-3.82-orig/main.c make-3.82-fix30723//main.c +--- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000 ++++ make-3.82-fix30723//main.c 2010-09-23 23:34:10.932188592 +1000 +@@ -2093,7 +2093,7 @@ + const char *pv = define_makeflags (1, 1); + char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1); + sprintf (p, "MAKEFLAGS=%s", pv); +- putenv (p); ++ putenv (allocated_variable_expand (p)); + } + + if (ISDB (DB_BASIC)) diff --git a/~lukeshu/make-graph/make-3.82-makeflags.patch b/~lukeshu/make-graph/make-3.82-makeflags.patch new file mode 100644 index 000000000..3cba3c402 --- /dev/null +++ b/~lukeshu/make-graph/make-3.82-makeflags.patch @@ -0,0 +1,36 @@ +Index: main.c +=================================================================== +RCS file: /sources/make/make/main.c,v +retrieving revision 1.246 +diff -u -r1.246 main.c +--- main.c 29 Aug 2010 23:05:27 -0000 1.246 ++++ main.c 27 Jul 2011 22:03:12 -0000 +@@ -2091,10 +2095,16 @@ + + /* Reset makeflags in case they were changed. */ + { ++ if (master_job_slots) ++ { ++ assert (job_slots == default_job_slots); ++ job_slots = master_job_slots; ++ } + const char *pv = define_makeflags (1, 1); + char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1); + sprintf (p, "MAKEFLAGS=%s", pv); + putenv (allocated_variable_expand (p)); ++ job_slots = default_job_slots; + } + + if (ISDB (DB_BASIC)) +@@ -2825,9 +2852,11 @@ + && (*(unsigned int *) cs->value_ptr == + *(unsigned int *) cs->noarg_value)) + ADD_FLAG ("", 0); /* Optional value omitted; see below. */ ++#if 0 + else if (cs->c == 'j') + /* Special case for `-j'. */ + ADD_FLAG ("1", 1); ++#endif + else + { + char *buf = alloca (30); diff --git a/~lukeshu/make-graph/make-3.82-sort-blank.patch b/~lukeshu/make-graph/make-3.82-sort-blank.patch new file mode 100644 index 000000000..2e73f5b7c --- /dev/null +++ b/~lukeshu/make-graph/make-3.82-sort-blank.patch @@ -0,0 +1,17 @@ +diff -urp make-3.82/function.c make-3.82-pm/function.c +--- make-3.82/function.c 2010-07-13 03:20:39.000000000 +0200 ++++ make-3.82-pm/function.c 2010-10-27 01:43:27.000000000 +0200 +@@ -1138,12 +1138,12 @@ func_sort (char *o, char **argv, const c + { + char c = *(t++); + +- if (! isspace ((unsigned char)c)) ++ if (! isblank ((unsigned char)c)) + continue; + + ++wordi; + +- while (isspace ((unsigned char)*t)) ++ while (isblank ((unsigned char)*t)) + ++t; + } diff --git a/~lukeshu/make-graph/make-graph.patch b/~lukeshu/make-graph/make-graph.patch new file mode 100644 index 000000000..083db55e4 --- /dev/null +++ b/~lukeshu/make-graph/make-graph.patch @@ -0,0 +1,273 @@ +diff -ur make-3.82/file.c make-wch/file.c +--- make-3.82/file.c 2010-07-12 21:20:39.000000000 -0400 ++++ make-wch/file.c 2010-08-19 23:28:20.162660391 -0400 +@@ -1021,6 +1021,129 @@ + hash_print_stats (&files, stdout); + } + ++/* Dump the dependency graph to a Graphviz file (on stdout) */ ++ ++void ++print_graph_prereqs (const char *filename, const struct dep *deps) ++{ ++ const struct dep *ood = 0; ++ ++ /* Print all normal dependencies; note any order-only deps. */ ++ for (; deps != 0; deps = deps->next) ++ if (! deps->ignore_mtime) ++ printf (" \"%s\" -> \"%s\";\n", filename, dep_name (deps)); ++ ++ /* Print order-only deps, if we have any. */ ++ if (ood) ++ { ++ for (ood = ood->next; ood != 0; ood = ood->next) ++ if (ood->ignore_mtime) ++ printf (" %s -> %s [style=dotted];\n", filename, dep_name (ood)); ++ /* XXX: we need to distinguish these some how. ++ * Is dotting them the right way? */ ++ } ++} ++ ++static void ++print_graph_file (const void *item) ++{ ++ const struct file *f = item; ++ ++ int built_in_special_target=( ++ (0==strcmp(f->name,".PHONY")) ++ || (0==strcmp(f->name,".SUFFIXES")) ++ || (0==strcmp(f->name,".DEFAULT")) ++ || (0==strcmp(f->name,".PRECIOUS")) ++ || (0==strcmp(f->name,".INTERMEDIATE")) ++ || (0==strcmp(f->name,".SECONDARY")) ++ || (0==strcmp(f->name,".SECONDEXPANSION")) ++ || (0==strcmp(f->name,".DELETE_ON_ERROR")) ++ || (0==strcmp(f->name,".IGNORE")) ++ || (0==strcmp(f->name,".LOW_RESOLUTION_TIME")) ++ || (0==strcmp(f->name,".SILENT")) ++ || (0==strcmp(f->name,".EXPORT_ALL_VARIABLES")) ++ || (0==strcmp(f->name,".NOTPARALLEL")) ++ || (0==strcmp(f->name,".ONESHELL")) ++ || (0==strcmp(f->name,".POSIX")) ++ ); ++ if ((f->is_target) && (!built_in_special_target)) ++ { ++ printf (" \"%s\" [", f->name); ++ /* XXX some of these should be attached to the nodes in some way; ++ * though I'm not sure what style changes should be made for which ones. ++ * ~ LukeShu ++ if (f->double_colon) puts (_("// Double-colon rule.")); ++ if (f->precious) puts (_("// Precious file (prerequisite of .PRECIOUS).")); ++ */if (f->phony) puts (_(" color=blue "));/* ++ if (f->cmd_target) puts (_("// Command line target.")); ++ if (f->dontcare) puts (_("// A default, MAKEFILES, or -include/sinclude makefile.")); ++ if (f->tried_implicit) puts (_("// Implicit rule search has been done.")); ++ else puts (_("// Implicit rule search has not been done.")); ++ if (f->stem != 0) printf (_("// Implicit/static pattern stem: `%s'\n"), f->stem); ++ if (f->intermediate) puts (_("// File is an intermediate prerequisite.")); ++ if (f->also_make != 0) ++ { ++ const struct dep *d; ++ fputs (_("# Also makes:"), stdout); ++ for (d = f->also_make; d != 0; d = d->next) ++ printf (" %s\n", dep_name (d)); ++ } ++ if (f->last_mtime == UNKNOWN_MTIME) puts (_("// Modification time never checked.")); ++ else if (f->last_mtime == NONEXISTENT_MTIME) puts (_("// File does not exist.")); ++ else if (f->last_mtime == OLD_MTIME) puts (_("// File is very old.")); ++ else ++ { ++ char buf[FILE_TIMESTAMP_PRINT_LEN_BOUND + 1]; ++ file_timestamp_sprintf (buf, f->last_mtime); ++ printf (_("// Last modified %s\n"), buf); ++ } ++ if (f->updated) puts (_("// File has been updated.")); ++ else puts (_("// File has not been updated.")); ++ switch (f->command_state) ++ { ++ case cs_running: puts (_("// Update: Running (THIS IS A BUG).")); break; ++ case cs_deps_running: puts (_("// Update: Dependencies running (THIS IS A BUG).")); break; ++ case cs_not_started: ++ case cs_finished: ++ switch (f->update_status) ++ { ++ case -1: break; ++ case 0: puts (_("// Update: Successfully")); break; ++ case 1: assert (question_flag); ++ puts (_("// Update: Needs to be (-q is set)")); break; ++ case 2: puts (_("// Update: Failed")); break; ++ default: puts (_("// Update: Invalid `update_status' value)); ++ fflush (stdout); ++ fflush (stderr); ++ abort (); ++ } ++ break; ++ default: puts (_("// Update: Invalid `command_state' value")); ++ fflush (stdout); ++ fflush (stderr); ++ abort (); ++ } ++ if (f->variables != 0) print_file_variables (f); ++ if (f->cmds != 0) print_commands (f->cmds); ++ */ ++ puts("];"); ++ print_graph_prereqs (f->name, f->deps); ++ } ++ ++ if (f->prev) ++ print_graph_file ((const void *) f->prev); ++} ++ ++void ++print_graph (void) ++{ ++ printf ("%sgraph make%i {\n", ++ (makelevel==0)?"di":"sub", ++ getpid()); ++ hash_map (&files, print_graph_file); ++ puts ("}"); ++} ++ + /* Verify the integrity of the data base of files. */ + + #define VERIFY_CACHED(_p,_n) \ +diff -ur make-3.82/filedef.h make-wch/filedef.h +--- make-3.82/filedef.h 2010-07-12 21:20:39.000000000 -0400 ++++ make-wch/filedef.h 2010-08-19 21:09:34.314660209 -0400 +@@ -116,6 +116,7 @@ + char *build_target_list (char *old_list); + void print_prereqs (const struct dep *deps); + void print_file_data_base (void); ++void print_graph (void); + + #if FILE_TIMESTAMP_HI_RES + # define FILE_TIMESTAMP_STAT_MODTIME(fname, st) \ +diff -ur make-3.82/main.c make-wch/main.c +--- make-3.82/main.c 2010-07-19 03:10:53.000000000 -0400 ++++ make-wch/main.c 2010-08-21 22:32:56.818417305 -0400 +@@ -175,6 +175,11 @@ + + int print_data_base_flag = 0; + ++/* Nonzero means don't remake anything, just print the dependency graph ++ that results from reading the makefile (-g). */ ++ ++int print_graph_flag = 0; ++ + /* Nonzero means don't remake anything; just return a nonzero status + if the specified targets are not up to date (-q). */ + +@@ -321,6 +326,9 @@ + -f FILE, --file=FILE, --makefile=FILE\n\ + Read FILE as a makefile.\n"), + N_("\ ++ -g, --graph Print make's internal dependency graph\n\ ++ in Graphviz format, without remaking makefiles.\n"), ++ N_("\ + -h, --help Print this message and exit.\n"), + N_("\ + -i, --ignore-errors Ignore errors from recipes.\n"), +@@ -385,6 +393,7 @@ + #endif + { 'e', flag, &env_overrides, 1, 1, 0, 0, 0, "environment-overrides", }, + { 'f', filename, &makefiles, 0, 0, 0, 0, 0, "file" }, ++ { 'g', flag, &print_graph_flag, 1, 1, 0, 0, 0, "graph" }, + { 'h', flag, &print_usage_flag, 0, 0, 0, 0, 0, "help" }, + { 'i', flag, &ignore_errors_flag, 1, 1, 0, 0, 0, "ignore-errors" }, + { 'I', filename, &include_directories, 1, 1, 0, 0, 0, +@@ -1946,7 +1955,10 @@ + define_makeflags (1, 1); + + rebuilding_makefiles = 1; +- status = update_goal_chain (read_makefiles); ++ if (print_graph_flag) ++ status = -1; ++ else ++ status = update_goal_chain (read_makefiles); + rebuilding_makefiles = 0; + + switch (status) +@@ -2278,33 +2290,37 @@ + + { + int status; ++ if (print_graph_flag) ++ status=0; ++ else ++ { ++ switch (update_goal_chain (goals)) ++ { ++ case -1: ++ /* Nothing happened. */ ++ case 0: ++ /* Updated successfully. */ ++ status = makefile_status; ++ break; ++ case 1: ++ /* We are under -q and would run some commands. */ ++ status = MAKE_TROUBLE; ++ break; ++ case 2: ++ /* Updating failed. POSIX.2 specifies exit status >1 for this; ++ but in VMS, there is only success and failure. */ ++ status = MAKE_FAILURE; ++ break; ++ default: ++ abort (); ++ } + +- switch (update_goal_chain (goals)) +- { +- case -1: +- /* Nothing happened. */ +- case 0: +- /* Updated successfully. */ +- status = makefile_status; +- break; +- case 1: +- /* We are under -q and would run some commands. */ +- status = MAKE_TROUBLE; +- break; +- case 2: +- /* Updating failed. POSIX.2 specifies exit status >1 for this; +- but in VMS, there is only success and failure. */ +- status = MAKE_FAILURE; +- break; +- default: +- abort (); +- } +- +- /* If we detected some clock skew, generate one last warning */ +- if (clock_skew_detected) +- error (NILF, +- _("warning: Clock skew detected. Your build may be incomplete.")); +- ++ /* If we detected some clock skew, generate one last warning */ ++ if (clock_skew_detected) ++ error (NILF, ++ _("warning: Clock skew detected. Your build may be incomplete.")); ++ } ++ + /* Exit. */ + die (status); + } +@@ -3042,7 +3058,7 @@ + { + static int printed_version = 0; + +- char *precede = print_data_base_flag ? "# " : ""; ++ char *precede = (print_data_base_flag||print_graph_flag) ? "# " : ""; + + if (printed_version) + /* Do it only once. */ +@@ -3188,6 +3204,10 @@ + if (print_data_base_flag) + print_data_base (); + ++ ++ if (print_graph_flag) ++ print_graph (); ++ + verify_file_data_base (); + + clean_jobserver (status); diff --git a/~lukeshu/make-graph/make.install b/~lukeshu/make-graph/make.install new file mode 100644 index 000000000..6cf8b0dc4 --- /dev/null +++ b/~lukeshu/make-graph/make.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(make.info make.info-1 make.info-2) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/~lukeshu/redo/PKGBUILD b/~lukeshu/redo/PKGBUILD new file mode 100644 index 000000000..95e75dd0e --- /dev/null +++ b/~lukeshu/redo/PKGBUILD @@ -0,0 +1,36 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> + +pkgname=redo +pkgver=0.06 +pkgrel=1 +pkgdesc="A competitor to make based on essays by DJB.") +arch=('any') +url="https://github.com/apenwarr/$pkgname" +license=('GPL2') +depends=('python2') +source=("$pkgname-$pkgver.tar.gz::https://github.com/apenwarr/$pkgname/tarball/$pkgname-$pkgver") + +build() { + cd "$srcdir/apenwarr-$pkgname-"* + + # Make everything use python2 + sed -i 's@^#!/usr/bin/python$@#!/usr/bin/python2@' *.py + sed -i 's@/usr/bin/env python@/usr/bin/env python2@' Documentation/md2man.py + sed -i -e 's@^python @python2 @' \ + -e 's@/usr/bin/python$@/usr/bin/python2@' \ + install.do + + make +} + +check() { + cd "$srcdir/apenwarr-$pkgname-"* + make test +} + +package() { + cd "$srcdir/apenwarr-$pkgname-"* + make install DESTDIR="$pkgdir" +} + +md5sums=('0faa0e98f3d60fdcdea826dad59923c8') diff --git a/~lukeshu/stow/PKGBUILD b/~lukeshu/stow/PKGBUILD new file mode 100644 index 000000000..24a2dcb1c --- /dev/null +++ b/~lukeshu/stow/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> + +pkgname=stow +pkgver=2.1.2 +pkgrel=1 +pkgdesc="A program for managing the installation of software packages, keeping them separate while making them appear to be installed in the same place." +arch=(any) +url="https://www.gnu.org/software/$pkgname/" +license=('GPL2') +depends=('perl>=5.6.1') +source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + +md5sums=('82857e43531cf6936aed99ef3b86b446') diff --git a/~lukeshu/terminal-colors/PKGBUILD b/~lukeshu/terminal-colors/PKGBUILD new file mode 100644 index 000000000..662e5b5ef --- /dev/null +++ b/~lukeshu/terminal-colors/PKGBUILD @@ -0,0 +1,23 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> + +pkgname=terminal-colors +pkgver=1.3 +pkgrel=1 +pkgdesc="Displays charts for 256/88/16 terminal color modes. Also supports converting between 256/88 color values." +arch=('any') +url="http://zhar.net/projects/shell/" +license=('GPL3') +depends=('python2') +source=("terminal-colors.py::http://zhar.net/projects/shell/terminal-colors") + +build() { + cd "$srcdir" + sed 's@/usr/bin/env python$@/usr/bin/env python2@' < terminal-colors.py > terminal-colors +} + +package() { + cd "$srcdir" + install -D -m755 terminal-colors "$pkgdir/usr/bin/terminal-colors" +} + +md5sums=('30e3ab6cde416df110110244ce40eb94') diff --git a/~lukeshu/thingutils-git/PKGBUILD b/~lukeshu/thingutils-git/PKGBUILD new file mode 100644 index 000000000..5ef2c1c56 --- /dev/null +++ b/~lukeshu/thingutils-git/PKGBUILD @@ -0,0 +1,55 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> + +_pkgname=thingutils +pkgname=$_pkgname-git +provides=($_pkgname) +conflicts=($_pkgname) +pkgver=20111224 +pkgrel=1 +pkgdesc="" +arch=('any') +url="https://gitorious.org/thingutils" +license=('MIT') +depends=( + 'php' # roll, urldecode + 'bash' # daemon, newegg, sysfiles + 'emacs' # emacsmail, emacsterm, e + 'wget' # whatismyip + 'findutils' # maildups, whatismyip + 'sysstat' # sysfiles + 'offlineimap' # offlineimap-runner + 'wdiff' # chardiff +) +makedepends=('git') + +_gitroot=https://git.gitorious.org/thingutils/thingutils.git +_gitname=$_pkgname + +build() { + cd "$srcdir" + msg "Connecting to GIT server...." + + if [[ -d "$_gitname" ]]; then + cd "$_gitname" && git pull origin + msg "The local files are updated." + else + git clone "$_gitroot" "$_gitname" + fi + + msg "GIT checkout done or server timeout" + msg "Starting build..." + + rm -rf "$srcdir/$_gitname-build" + git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build" + cd "$srcdir/$_gitname-build" + + # + # BUILD HERE + # + make prefix=/usr +} + +package() { + cd "$srcdir/$_gitname-build" + make install prefix=/usr DESTDIR="$pkgdir" +} diff --git a/~lukeshu/wdiff/PKGBUILD b/~lukeshu/wdiff/PKGBUILD new file mode 100644 index 000000000..6092b3d76 --- /dev/null +++ b/~lukeshu/wdiff/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> + +pkgname=wdiff +pkgver=1.1.0 +pkgrel=1 +pkgdesc="A front end to diff for comparing files on a word per word basis." +arch=('i686' 'x86_64') +url="https://www.gnu.org/software/$pkgname/" +license=('GPL3') +depends=('diffutils') +source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + +md5sums=('aa4dd87a9140a96ee85d2502673d19f3') |