diff options
114 files changed, 3792 insertions, 404 deletions
diff --git a/community-staging/ekg2/PKGBUILD b/community-staging/ekg2/PKGBUILD new file mode 100644 index 000000000..403ec002d --- /dev/null +++ b/community-staging/ekg2/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 53828 2011-08-08 16:55:24Z jelle $ +# Maintainer: Mateusz Herych <heniekk@gmail.com> + +pkgname=ekg2 +pkgver=0.3.1 +pkgrel=1 +pkgdesc="ncurses based Jabber, Gadu-Gadu, Tlen and IRC client" +arch=('i686' 'x86_64') +url="http://ekg2.org/" +license=('GPL') +depends=('aspell' 'libjpeg' 'python2' 'libgadu' 'gnutls' 'gpm' 'libidn' 'giflib' 'gpgme') +optdepends=( 'xosd: for xosd support' + 'sqlite3: sqlite support' + 'gtk2: gtk support') +provides=('ekg2-unicode') +source=(http://pl.ekg2.org/ekg2-$pkgver.tar.gz) +md5sums=('652e492fcf72281a42c3e5960347516e') + +build() { + cd $srcdir/$pkgname-$pkgver + sed -i 's|ncursesw/ncurses.h|ncurses.h|g' configure plugins/ncurses/ecurses.h + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --with-libgadu \ + --with-xosd \ + --enable-unicode \ + --enable-shared \ + --without-gpg + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install + rm -rf $pkgdir/usr/lib/perl5/core_perl/perllocal.pod + mv $pkgdir/usr/libexec/ioctld $pkgdir/usr/lib/ekg2/ioctld + rm -rf $pkgdir/usr/libexec + chmod -R 755 $pkgdir/usr/lib/perl5 +} +md5sums=('68fc05b432c34622df6561eaabef5a40') diff --git a/community-staging/gtk-gnutella/PKGBUILD b/community-staging/gtk-gnutella/PKGBUILD new file mode 100644 index 000000000..1eb8c2b0f --- /dev/null +++ b/community-staging/gtk-gnutella/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 53764 2011-08-08 05:26:47Z ebelanger $ +# Contributor: Dan McGee <dan@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=gtk-gnutella +pkgver=0.97 +pkgrel=2 +pkgdesc="A Gnutella client written in C" +arch=('i686' 'x86_64') +url="http://gtk-gnutella.sourceforge.net/" +license=('GPL') +depends=('gtk2') +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('d44e1af3441fb07a5e5712b0d522fae5') +sha1sums=('1b50790adc494d7023a7cf9319d7cdef1c9ab51e') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./build.sh --prefix=/usr --gtk2 --disable-dbus +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make install INSTALL_PREFIX="${pkgdir}" +} diff --git a/community-staging/ifuse/PKGBUILD b/community-staging/ifuse/PKGBUILD new file mode 100644 index 000000000..e85372405 --- /dev/null +++ b/community-staging/ifuse/PKGBUILD @@ -0,0 +1,28 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Gabriel Martinez < reitaka at gmail dot com > + +pkgname=ifuse +pkgver=1.1.1 +pkgrel=4 +pkgdesc='A fuse filesystem to access the contents of an iPhone or iPod Touch' +url='http://libimobiledevice.org/' +arch=('i686' 'x86_64') +license=('LGPL2.1') +depends=('libimobiledevice' 'fuse') +source=("http://www.libimobiledevice.org/downloads/${pkgname}-${pkgver}.tar.bz2") +md5sums=('8d528a79de024b91f12f8ac67965c37c') + +build() { + cd ${pkgname}-${pkgver} + + ./configure \ + --prefix=/usr + + make +} + +package() { + cd ${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install +} diff --git a/community-staging/jabberd14/PKGBUILD b/community-staging/jabberd14/PKGBUILD new file mode 100644 index 000000000..fccef817a --- /dev/null +++ b/community-staging/jabberd14/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 53845 2011-08-08 21:03:13Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=jabberd14 +pkgver=1.6.1.1 +pkgrel=10 +pkgdesc="old (1.4) jabber server branch" +arch=(i686 x86_64) +url="http://jabberd.org/" +license=("GPL") +depends=(pth libidn expat popt gnutls) +optdepends=(libmysqlclient) +conflicts=(jabberd) +backup=(etc/jabberd/jabber.xml) +options=('!libtool') +source=(http://download.jabberd.org/jabberd14/jabberd14-$pkgver.tar.gz + build-fix.patch + jabberd) +md5sums=('597c7ee14518ba22b1cee883b4737d87' + 'ad795626f26c01700a23515e0e75d654' + '5869169394d70977858320648075c7a6') + +build() { + cd $srcdir/jabberd14-$pkgver + export LDFLAGS="$LDFLAGS -lgcrypt" + [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --enable-ssl --enable-legacy --sysconfdir=/etc/jabberd --localstatedir=/var + echo "#undef HAVE_GNUTLS_EXTRA" >>config.h + [ $NOEXTRACT -eq 1 ] || patch -Rp1 <$srcdir/build-fix.patch + make -j1 + make DESTDIR=$pkgdir install + install -D -m 0755 $srcdir/jabberd $pkgdir/etc/rc.d/jabberd + rm -rf $pkgdir/var/run +} diff --git a/community-staging/jabberd14/build-fix.patch b/community-staging/jabberd14/build-fix.patch new file mode 100644 index 000000000..4f39b523e --- /dev/null +++ b/community-staging/jabberd14/build-fix.patch @@ -0,0 +1,84 @@ +diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc +--- /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc 2011-08-09 00:37:29.000000000 +0400 ++++ jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc 2007-04-07 23:43:18.000000000 +0400 +@@ -910,8 +910,8 @@ + } + + /* separate this step from the next one, and check for a predicate in this step */ +- start_predicate = strchr((char*)path, '['); +- next_step = strchr((char*)path, '/'); ++ start_predicate = strchr(path, '['); ++ next_step = strchr(path, '/'); + if (start_predicate == NULL && next_step == NULL) { + this_step = pstrdup(p, path); + } else if (start_predicate == NULL || start_predicate > next_step && next_step != NULL) { +@@ -1833,8 +1833,7 @@ + if (lang != NULL && strchr(lang, '-') != NULL) { + snprintf(general_lang, sizeof(general_lang), "%s", lang); + if (strchr(lang, '-') != NULL) { +- char *tmp = strchr((char*)lang, '-'); +- tmp[0] = 0; ++ strchr(lang, '-')[0] = 0; + } else { + general_lang[0] = 0; + } +diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/log.cc jabberd14-1.6.1.1/jabberd/log.cc +--- /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/log.cc 2011-08-09 00:37:29.000000000 +0400 ++++ jabberd14-1.6.1.1/jabberd/log.cc 2007-07-20 17:56:59.000000000 +0400 +@@ -86,7 +86,7 @@ + char *pos, c = '\0'; + if(zone != NULL && debug__zones != NULL) + { +- pos = strchr((char*)zone,'.'); ++ pos = strchr(zone,'.'); + if(pos != NULL) + { + c = *pos; +diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/mio_tls.cc jabberd14-1.6.1.1/jabberd/mio_tls.cc +--- /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/mio_tls.cc 2011-08-09 00:53:55.000000000 +0400 ++++ jabberd14-1.6.1.1/jabberd/mio_tls.cc 2007-07-17 03:20:44.000000000 +0400 +@@ -43,7 +43,6 @@ + #include <vector> + #include <list> + #include <iostream> +-#include <gnutls/openpgp.h> + + // Tell gcrypt that we are using libpth - had to move this to a plain C file + extern "C" void mio_tls_gcrypt_init(void); +@@ -613,8 +612,7 @@ + } + + // load OpenPGP key/certificate +-// ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile); +- ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile, GNUTLS_OPENPGP_FMT_BASE64); ++ ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile); + if (ret < 0) { + log_error(NULL, "Error loading OpenPGP key pub=%s/priv=%s: %s", pubfile, privfile, gnutls_strerror(ret)); + continue; +@@ -633,8 +631,7 @@ + } + + // load the OpenPGP keyring +-// ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file); +- ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file, GNUTLS_OPENPGP_FMT_BASE64); ++ ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file); + if (ret < 0) { + log_error(NULL, "Error loading OpenPGP keyring %s: %s", file, gnutls_strerror(ret)); + continue; +@@ -643,8 +640,6 @@ + continue; + } + +- +-/* + // load GnuPG trustdb + if (j_strcmp(xmlnode_get_localname(cur), "trustdb") == 0) { + char const *const file = xmlnode_get_data(cur); +@@ -661,7 +656,6 @@ + continue; + } + } +-*/ + + // setup protocols to use + if (j_strcmp(xmlnode_get_localname(cur), "protocols") == 0) { diff --git a/community-staging/jabberd14/jabberd b/community-staging/jabberd14/jabberd new file mode 100644 index 000000000..afbe6ef69 --- /dev/null +++ b/community-staging/jabberd14/jabberd @@ -0,0 +1,58 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +get_pid() { + pidof /usr/bin/jabberd +} + +case "$1" in + start) + stat_busy "Starting Jabber daemon" + + [ -d /var/run/jabberd ] || mkdir -p /var/run/jabberd + [ -f /var/run/jabberd/jabber.pid ] && rm -f /var/run/jabberd/jabber.pid + PID=`get_pid` + if [ -z "$PID" ]; then + /usr/bin/jabberd -c /etc/jabberd/jabber.xml -B >/dev/null 2>/dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + sleep 1 # wait on children + echo `get_pid` > /var/run/jabberd/jabberd.pid + add_daemon jabberd + sleep 1 + stat_done + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping Jabber daemon" + PID=`get_pid` + [ ! -z "$PID" ] && kill $PID &> /dev/null + sleep 2 + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm -f /var/run/jabberd/jabberd.pid &> /dev/null + rm_daemon jabberd + stat_done + fi + ;; + + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/net6/PKGBUILD b/community-staging/net6/PKGBUILD new file mode 100644 index 000000000..1d5a6e025 --- /dev/null +++ b/community-staging/net6/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 53842 2011-08-08 20:25:54Z spupykin $ +# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> +# Contributor: William Rea <sillywilly@gmail.com> +# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + +pkgname=net6 +pkgver=1.3.12 +pkgrel=2 +pkgdesc="A library that provides a TCP protocol abstraction for C++" +arch=('i686' 'x86_64') +url="http://gobby.0x539.de/" +license=('LGPL') +depends=('gnutls' 'libsigc++2.0') +options=('!libtool') +source=(http://releases.0x539.de/$pkgname/$pkgname-$pkgver.tar.gz + build-fix.patch) +md5sums=('506776416d8aea2b9ea13a81f9145383' + '18ac67590d6bce0a0a4a6a21af8da429') + +build() { + cd ${srcdir}/$pkgname-$pkgver + patch -Rp1 <$srcdir/build-fix.patch + ./configure --prefix=/usr + make + make DESTDIR=${pkgdir} install +} diff --git a/community-staging/net6/build-fix.patch b/community-staging/net6/build-fix.patch new file mode 100644 index 000000000..7e932bce6 --- /dev/null +++ b/community-staging/net6/build-fix.patch @@ -0,0 +1,24 @@ +diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/inc/encrypt.hpp net6-1.3.12/inc/encrypt.hpp +--- /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/inc/encrypt.hpp 2011-08-09 00:19:29.000000000 +0400 ++++ net6-1.3.12/inc/encrypt.hpp 2009-11-15 16:02:46.000000000 +0300 +@@ -34,7 +34,7 @@ + typedef gnutls_anon_server_credentials gnutls_anon_server_credentials_t; + typedef gnutls_transport_ptr gnutls_transport_ptr_t; + typedef gnutls_dh_params gnutls_dh_params_t; +-//typedef gnutls_connection_end gnutls_connection_end_t; ++typedef gnutls_connection_end gnutls_connection_end_t; + + class dh_params: private net6::non_copyable + { +diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/src/encrypt.cpp net6-1.3.12/src/encrypt.cpp +--- /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/src/encrypt.cpp 2011-08-09 00:20:12.000000000 +0400 ++++ net6-1.3.12/src/encrypt.cpp 2009-11-15 16:02:46.000000000 +0300 +@@ -25,7 +25,7 @@ + { + const unsigned int DH_BITS = 1024; + +- net6::gnutls_session_t create_session(gnutls_connection_end_t end) ++ net6::gnutls_session_t create_session(net6::gnutls_connection_end_t end) + { + net6::gnutls_session_t session; + gnutls_init(&session, end); diff --git a/community-staging/nzbget/ChangeLog b/community-staging/nzbget/ChangeLog new file mode 100644 index 000000000..74030cd3d --- /dev/null +++ b/community-staging/nzbget/ChangeLog @@ -0,0 +1,18 @@ +2010-05-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Fixed FS#19399 - missing postprocess-example.conf file + +2010-05-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 0.7.0 + +2009-10-11 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Dependency added (gnutls) in v0.6.0-2 + +2008-03-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 0.6.0 + +2008-09-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 0.5.1 + +2008-09-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Package moved to [community] + * Update to major release 0.5.0 diff --git a/community-staging/nzbget/PKGBUILD b/community-staging/nzbget/PKGBUILD new file mode 100644 index 000000000..278e38ac8 --- /dev/null +++ b/community-staging/nzbget/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 53834 2011-08-08 19:30:16Z jelle $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + +pkgname=nzbget +pkgver=0.7.0 +pkgrel=3 +pkgdesc="Downloads from Usenet using .nzb files" +arch=('i686' 'x86_64') +url="http://nzbget.sourceforge.net/" +license=('GPL') +depends=('gnutls' 'libpar2' 'libxml2' 'ncurses') +makedepends=('autoconf' 'automake') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('27971846aba75f5e312d80dce7edbc5d') + +build() { + cd ${srcdir}/$pkgname-$pkgver + +# autoreconf -fi || return 1 +#uudeview ("uulib") has been removed, and "it did not work well anyway" + ./configure --prefix=/usr --enable-parcheck || return 1 + make +} +package() { + cd ${srcdir}/$pkgname-$pkgver + make DESTDIR=${pkgdir} install + +#other files + install -d ${pkgdir}/usr/share/$pkgname || return 1 + install -m644 -t ${pkgdir}/usr/share/$pkgname \ + AUTHORS postprocess-example.sh postprocess-example.conf \ + ChangeLog nzbget.conf.example README || return 1 +} diff --git a/community-staging/smalltalk/PKGBUILD b/community-staging/smalltalk/PKGBUILD new file mode 100644 index 000000000..1be6f7500 --- /dev/null +++ b/community-staging/smalltalk/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 53831 2011-08-08 19:25:38Z jelle $ +# Maintainer: Kaiting Chen <kaitocracy@gmail.com> +# Contributor: mrshpot <mrshpot at gmail dot com> +# Contributor: Michael Fellinger <m.fellinger@gmail.com> + +pkgname=smalltalk +pkgver=3.2.4 +pkgrel=2 +pkgdesc='A free implementation of Smalltalk-80 by the GNU project' +url='http://smalltalk.gnu.org/' +license=('GPL' 'LGPL') +arch=('i686' 'x86_64') +options=('!libtool') + +depends=('gmp' 'libffi' 'libsigsegv' 'readline') +makedepends=('gdbm' 'gtk2' 'sqlite3' 'tk' 'zip') + +source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('a36a7c9beddca08dc492b500738efc82') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr \ + --libexecdir=/usr/lib/smalltalk \ + --with-imagedir=/var/lib/smalltalk \ + --enable-gtk=yes \ + --with-system-libffi \ + --with-system-libsigsegv \ + --with-readline \ + --with-tcl --with-tk \ + --with-x --without-emacs + make +} +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="$pkgdir" install + + # fix manpage symlink + rm -f $pkgdir/usr/share/man/man1/gst-reload.1 + ln -s gst-load.1 $pkgdir/usr/share/man/man1/gst-reload.1 +} diff --git a/community/cdfs/PKGBUILD b/community/cdfs/PKGBUILD index 83b84bdba..8b79de1f5 100644 --- a/community/cdfs/PKGBUILD +++ b/community/cdfs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 52427 2011-07-25 09:33:20Z spupykin $ +# $Id: PKGBUILD 53785 2011-08-08 08:18:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar> pkgname=cdfs pkgver=2.6.27 -pkgrel=15 +pkgrel=16 pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files." arch=(i686 x86_64 'mips64el') url="http://www.elis.UGent.be/~ronsse/cdfs/" diff --git a/community/clamz/PKGBUILD b/community/clamz/PKGBUILD new file mode 100644 index 000000000..3b784be5d --- /dev/null +++ b/community/clamz/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 53892 2011-08-09 12:18:03Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=clamz +pkgver=0.4 +pkgrel=2 +pkgdesc="Command-line program to download MP3 files from Amazon.com's music store." +arch=('i686' 'x86_64') +url='http://code.google.com/p/clamz/' +license=('GPL3') +depends=('libgcrypt' 'curl' 'expat' 'shared-mime-info' 'desktop-file-utils') +install='clamz.install' +source=("http://clamz.googlecode.com/files/clamz-${pkgver}.tar.gz") +md5sums=('ab7661340ee27d206f36064cfbd5bfa4') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Fix issue with update-mime-database + sed -i 's|$(UPDATE_DESKTOP_DATABASE)\ $(DESTDIR)$(applications_dir)||' Makefile.in + sed -i 's|$(UPDATE_MIME_DATABASE)\ $(DESTDIR)$(mime_dir)||' Makefile.in + + ./configure --prefix=/usr/ + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/clamz/clamz.install b/community/clamz/clamz.install new file mode 100644 index 000000000..7daacb23a --- /dev/null +++ b/community/clamz/clamz.install @@ -0,0 +1,16 @@ +post_install() { + update-mime-database /usr/share/mime + update-desktop-database -q +} + +post_upgrade() { + update-mime-database /usr/share/mime + update-desktop-database -q +} + +post_remove() { + update-mime-database /usr/share/mime + update-desktop-database -q +} + +# vim:set ts=2 sw=2 et: diff --git a/community/fpc/Makefile-mk382.diff b/community/fpc/Makefile-mk382.diff new file mode 100644 index 000000000..00909766d --- /dev/null +++ b/community/fpc/Makefile-mk382.diff @@ -0,0 +1,174 @@ +--- Makefile.fpc.orig 2011-04-02 01:15:34.000000000 +0400 ++++ Makefile.fpc 2011-08-05 22:29:44.000000000 +0400 +@@ -4,7 +4,7 @@ + + [package] + name=compiler +-version=2.4.4 ++version=2.5.1 + + [target] + programs=pp +@@ -32,7 +32,7 @@ + unexport FPC_VERSION FPC_COMPILERINFO + + # Which platforms are ready for inclusion in the cycle +-CYCLETARGETS=i386 powerpc sparc arm x86_64 powerpc64 m68k armeb # mipsel mips ++CYCLETARGETS=i386 powerpc sparc arm x86_64 powerpc64 m68k armeb mipsel mips avr + + # All supported targets used for clean + ALLTARGETS=$(CYCLETARGETS) +@@ -148,6 +148,12 @@ + ifeq ($(CPC_TARGET),arm) + CPUSUF=arm + endif ++ifeq ($(CPC_TARGET),mips) ++CPUSUF=mips ++endif ++ifeq ($(CPC_TARGET),mipsel) ++CPUSUF=mipsel ++endif + + # Do not define the default -d$(CPU_TARGET) because that + # will conflict with our -d$(CPC_TARGET) +@@ -224,12 +230,39 @@ + override LOCALOPT+= + endif + ++# mipsel specific ++ifeq ($(PPC_TARGET),mipsel) ++override LOCALOPT+=-Fumips ++endif ++ ++ ++OPTWPOCOLLECT=-OWdevirtcalls,optvmts -FW$(BASEDIR)/pp1.wpo ++OPTWPOPERFORM=-Owdevirtcalls,optvmts -Fw$(BASEDIR)/pp1.wpo ++# symbol liveness WPO requires nm, smart linking and no stripping (the latter ++# is forced by the Makefile when necessary) ++ifneq ($(findstring $(OS_TARGET),darwin linux freebsd solaris),) ++ifdef LINKSMART ++ifdef CREATESMART ++OPTWPOCOLLECT+=-OWsymbolliveness -Xs- ++OPTWPOPERFORM+=-Owsymbolliveness ++endif ++endif ++endif ++ ++ + [rules] + ##################################################################### + # Setup Targets + ##################################################################### + + ifeq ($(OS_TARGET),win32) ++USE_CMP_FOR_DIFF=1 ++endif ++ifeq ($(OS_TARGET),win64) ++USE_CMP_FOR_DIFF=1 ++endif ++ ++ifdef USE_CMP_FOR_DIFF + ifdef CMP + override DIFF:=$(CMP) -i218 + endif +@@ -267,6 +300,8 @@ + TEMPNAME1=ppc1$(EXEEXT) + TEMPNAME2=ppc2$(EXEEXT) + TEMPNAME3=ppc3$(EXEEXT) ++TEMPWPONAME1=ppcwpo1$(EXEEXT) ++TEMPWPONAME2=ppcwpo2$(EXEEXT) + MAKEDEP=ppdep$(EXEEXT) + MSG2INC=./msg2inc$(EXEEXT) + ifdef CROSSINSTALL +@@ -327,15 +362,15 @@ + -$(DEL) $(addsuffix /*$(PPUEXT),$(COMPILERSOURCEDIR)) + + tempclean: +- -$(DEL) $(PPCROSSNAME) $(TEMPNAME) $(TEMPNAME1) $(TEMPNAME2) $(TEMPNAME3) $(MSG2INC) ++ -$(DEL) $(PPCROSSNAME) $(TEMPNAME) $(TEMPNAME1) $(TEMPNAME2) $(TEMPNAME3) $(MSG2INC) pp1.wpo pp2.wpo + + execlean : +- -$(DEL) ppc386$(EXEEXT) ppcaxp$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcsparc$(EXEEXT) $(EXENAME) ++ -$(DEL) ppc386$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcsparc$(EXEEXT) ppcppc64$(EXEEXT) ppcarm$(EXEEXT) ppcmips$(EXEEXT) ppcmipsel$(EXEEXT) $(EXENAME) $(TEMPWPONAME1) $(TEMPWPONAME2) + + $(addsuffix _clean,$(ALLTARGETS)): + -$(DELTREE) $(addprefix $(subst _clean,,$@),/units) + -$(DEL) $(addprefix $(subst _clean,,$@)/,*$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)) +- -$(DEL) $(addprefix $(subst _clean,,$@)/,ppc386$(EXEEXT) ppcaxp$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcppc$(EXEEXT) $(EXENAME)) ++ -$(DEL) $(addprefix $(subst _clean,,$@)/,ppc386$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcsparc$(EXEEXT) ppcppc64$(EXEEXT) ppcarm$(EXEEXT) ppcmips$(EXEEXT) ppcmipsel$(EXEEXT) $(EXENAME)) + + cycleclean: cleanall $(addsuffix _clean,$(CPC_TARGET)) + -$(DEL) $(EXENAME) +@@ -444,6 +479,28 @@ + # Normal cycle + # + ++ifndef NOWPOCYCLE ++ifdef RELEASE ++DOWPOCYCLE=1 ++# Two WPO cycles in case of RELEASE=1 ++wpocycle: ++# don't use cycle_clean, it will delete the compiler utilities again ++ $(RM) $(EXENAME) ++ $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OPT=$(LOCALOPT) $(OPTWPOCOLLECT)' compiler ++ $(RM) $(EXENAME) ++ $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OPT=$(RTLOPT) $(OPTWPOPERFORM)' rtlclean rtl ++ $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OPT=$(LOCALOPT) $(OPTWPOPERFORM) $(subst pp1.wpo,pp2.wpo,$(OPTWPOCOLLECT))' $(addsuffix _clean,$(ALLTARGETS)) compiler ++ $(MOVE) $(EXENAME) $(TEMPWPONAME1) ++ $(MAKE) 'FPC=$(BASEDIR)/$(TEMPWPONAME1)' 'OPT=$(RTLOPT) $(subst pp1.wpo,pp2.wpo,$(OPTWPOPERFORM))' rtlclean rtl ++ $(MAKE) 'FPC=$(BASEDIR)/$(TEMPWPONAME1)' 'OPT=$(LOCALOPT) $(subst pp1.wpo,pp2.wpo,$(OPTWPOPERFORM))' $(addsuffix _clean,$(ALLTARGETS)) compiler ++ $(COPY) $(EXENAME) $(TEMPWPONAME2) ++endif ++endif ++ ++ifndef DOWPOCYCLE ++wpocycle: ++endif ++ + # Used to avoid unnecessary steps + ifdef DIFF + ifdef OLDFPC +@@ -490,6 +547,7 @@ + $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OLDFPC=$(BASEDIR)/$(TEMPNAME2)' next + $(DIFF) $(TEMPNAME3) $(EXENAME) + $(MAKE) $(addsuffix _all,$(TARGET_DIRS)) 'FPC=$(BASEDIR)/$(EXENAME)' ++ $(MAKE) wpocycle + $(MAKE) echotime + + else +@@ -508,8 +566,11 @@ + # ppc<ARCH> (target native) + ifndef CROSSINSTALL + $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' rtlclean rtl ++# building a native compiler for embedded targets is not possible ++ifneq ($(OS_TARGET),embedded) + $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' cycleclean compiler + endif ++endif + + endif + +@@ -523,10 +584,10 @@ + # ppc3/ppcXXX = native (skipped for cross installation) + # + ++cycle: override FPC= + cycle: + # ppc (source native) + # Clear detected compiler binary, because it can be existing crosscompiler binary, but we need native compiler here +-override FPC= + $(MAKE) OS_TARGET=$(OS_SOURCE) CPU_TARGET=$(CPU_SOURCE) CROSSBINDIR= BINUTILSPREFIX= CROSSCYCLEBOOTSTRAP=1 rtlclean rtl + $(MAKE) OS_TARGET=$(OS_SOURCE) CPU_TARGET=$(CPU_SOURCE) EXENAME=$(TEMPNAME) CROSSBINDIR= BINUTILSPREFIX= CROSSCYCLEBOOTSTRAP=1 cycleclean compiler + # ppcross<ARCH> (source native) +@@ -535,8 +596,11 @@ + # ppc<ARCH> (target native) + ifndef CROSSINSTALL + $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' 'OPT=$(OPT) $(CROSSOPT)' rtlclean rtl ++# building a native compiler for embedded targets is not possible ++ifneq ($(OS_TARGET),embedded) + $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' 'OPT=$(OPT) $(CROSSOPT)' cycleclean compiler + endif ++endif + + endif + diff --git a/community/fpc/PKGBUILD b/community/fpc/PKGBUILD index e3d154b45..fa5ffb86e 100644 --- a/community/fpc/PKGBUILD +++ b/community/fpc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 48312 2011-05-31 09:49:30Z spupykin $ +# $Id: PKGBUILD 53775 2011-08-08 08:05:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Valeriy Lyasotskiy <onestep@ukr.net> # Contributor: Jan Willemson <janwil@hot.ee> @@ -8,7 +8,7 @@ pkgname=fpc pkgver=2.4.4 -pkgrel=1 +pkgrel=3 pkgdesc="The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32bit Pascal Compiler. It comes with fully TP 7.0 compatible run-time library." arch=('i686' 'x86_64' 'mips64el') url="http://www.freepascal.org/" @@ -17,18 +17,31 @@ backup=("etc/fpc.cfg") depends=(ncurses) makedepends=(fpc) options=(zipman) -source=(ftp://ftp.freepascal.org/pub/fpc/dist/$pkgver/source/fpcbuild-$pkgver.tar.gz) -md5sums=('d069dfd3412bd0d26dcd1b81ac998305') +source=(ftp://ftp.freepascal.org/pub/fpc/dist/$pkgver/source/fpcbuild-$pkgver.tar.gz + Makefile-mk382.diff) +md5sums=('d069dfd3412bd0d26dcd1b81ac998305' + 'a2242d261b055d08fa4d70e88ca1d1a7') build() { cd ${srcdir}/fpcbuild-$pkgver + pushd fpcsrc/compiler + patch -uN Makefile.fpc $srcdir/Makefile-mk382.diff + fpcmake -Tall + popd make NOGDB=1 build +# make NOGDB=1 build OS_TARGET=win32 CPU_TARGET=i386 } package() { cd ${srcdir}/fpcbuild-$pkgver + + export HOME=$srcdir + make -j1 NOGDB=1 PREFIX=${pkgdir}/usr install +# make NOGDB=1 PREFIX=${pkgdir}/usr crossinstall OS_TARGET=win32 CPU_TARGET=i386 +# ln -s /usr/lib/fpc/$pkgver/ppcross386 $pkgdir/usr/bin/ppcross386 + # install package license install -m 755 -d ${pkgdir}/usr/share/licenses/${pkgname} install -m 644 fpcsrc/rtl/COPYING.FPC ${pkgdir}/usr/share/licenses/${pkgname}/ diff --git a/community/gnome-system-tools/PKGBUILD b/community/gnome-system-tools/PKGBUILD index 9b242bc59..6962177cc 100644 --- a/community/gnome-system-tools/PKGBUILD +++ b/community/gnome-system-tools/PKGBUILD @@ -1,27 +1,34 @@ -# $Id: PKGBUILD 44473 2011-04-07 19:13:54Z ibiru $ +# $Id: PKGBUILD 53804 2011-08-08 09:59:18Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugodoria@archlinux-br.org> pkgname=gnome-system-tools pkgver=3.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Gnome System Configuration Utilities" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnome.org/projects/gst/" license=('GPL') options=('!libtool') depends=('wireless_tools' 'liboobs' 'nautilus' 'polkit-gnome' 'dconf') -makedepends=('gnome-doc-utils' 'intltool') +makedepends=('gnome-doc-utils' 'intltool' 'gnome-common') install=gnome-system-tools.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('905df26c02f00a6c2c18706ba3db7eab764e3df6576289e103504aa39a47ae0b') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2 + po.patch) +sha256sums=('905df26c02f00a6c2c18706ba3db7eab764e3df6576289e103504aa39a47ae0b' + '827c3169ae5060403b3f833b0f9c1d5cefe1d80aa5ade22e2ff7908b1ce1b5ef') build() { cd "${srcdir}/${pkgname}-${pkgver}" - + patch -Np1 -i "${srcdir}/po.patch" + gnome-autogen.sh ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-scrollkeeper --disable-static \ - --disable-services --disable-schemas-compile + --localstatedir=/var --disable-scrollkeeper --disable-static \ + --disable-services --disable-schemas-compile make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/community/gnome-system-tools/po.patch b/community/gnome-system-tools/po.patch new file mode 100644 index 000000000..0f89f2605 --- /dev/null +++ b/community/gnome-system-tools/po.patch @@ -0,0 +1,14 @@ +diff -Nur gnome-system-tools-3.0.0.orig//configure.in gnome-system-tools-3.0.0/configure.in +--- gnome-system-tools-3.0.0.orig//configure.in 2011-08-08 09:49:33.514034262 +0000 ++++ gnome-system-tools-3.0.0/configure.in 2011-08-08 09:50:06.967688099 +0000 +@@ -161,8 +161,8 @@ + AM_GNU_GETTEXT([external]) + AM_GNU_GETTEXT_VERSION([0.17]) + GETTEXT_PACKAGE=gnome-system-tools +-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package name]) +-AC_SUBST([GETTEXT_PACKAGE], GETTEXT_PACKAGE) ++AC_SUBST(GETTEXT_PACKAGE) # needed by gettext in po directory ++AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",[fix]) + + dnl ======================================================== + dnl END : Translations diff --git a/community/gpsim/PKGBUILD b/community/gpsim/PKGBUILD index 836a8d72a..c6b8536ca 100644 --- a/community/gpsim/PKGBUILD +++ b/community/gpsim/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 21223 2010-07-15 10:16:50Z spupykin $ +# $Id: PKGBUILD 53898 2011-08-09 13:35:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: mickael9 <mickael9 at gmail dot com> pkgname=gpsim -pkgver=0.25.0 +pkgver=0.26.1 pkgrel=1 pkgdesc="A full-featured software simulator for Microchip PIC microcontrollers" arch=(i686 x86_64 'mips64el') @@ -13,12 +13,11 @@ depends=('gtk2+extra' 'popt') makedepends=('gtk2+extra') options=('!libtool') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('36e2aeac30fad773f5fb934c867b42b7') +md5sums=('c994c23d2d75056dbefcf5d1d63596d7') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr - make || return 1 + make make DESTDIR=${pkgdir} install } diff --git a/community/java-oracle/PKGBUILD b/community/java-oracle/PKGBUILD index 61cce1d2a..ac8e89a76 100644 --- a/community/java-oracle/PKGBUILD +++ b/community/java-oracle/PKGBUILD @@ -10,18 +10,16 @@ pkgbase=java-oracle pkgname=('jre' 'jdk') pkgver=7 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') [ "${CARCH}" = 'i686' ] && _arch='i586' [ "${CARCH}" = 'x86_64' ] && _arch='x64' url='http://jdk7.java.net/' license=('custom') source=("http://download.oracle.com/otn-pub/java/jdk/7/jdk-7-linux-${_arch}.tar.gz" - 'java-control-panel.desktop' 'java-monitoring-and-management-console.desktop' 'java-policy-settings.desktop' 'java-visualvm.desktop' - 'java-web-start.desktop' 'jre.profile' 'jre.profile.csh' 'jdk.profile' @@ -31,22 +29,20 @@ source=("http://download.oracle.com/otn-pub/java/jdk/7/jdk-7-linux-${_arch}.tar. 'javaws-launcher') [ "${CARCH}" = 'i686' ] && md5sums=('f97244a104f03731e5ff69f0dd5a9927') [ "${CARCH}" = 'x86_64' ] && md5sums=('b3c1ef5faea7b180469c129a49762b64') -md5sums+=('e4d814c0f310d77ed6990c731bccd0fb' - '4bc2b0be93f76ed07b471e3c89eb5a8a' - '8e3cec7ab641ec449cabd068be583f5c' - '9ba148ebabce8ed3351b813a9a66b6e5' - '619ec32235dcfe454234ef4316f8a7cc' - '7cd3dc10e7a37468cad4053a067dcd01' - 'cc90df2df6fe80fab885a80036d420a1' - 'b83ab5742651b4234b7d2e20785c6693' - '6f4cbf332816d2c4e9578ecd1d0dce7f' - 'a279e195e249000646895d93e199860d' - '4bdff6982c66d24a879c424aaac3d04d' - '45c15a6b4767288f2f745598455ea2bf') +md5sums+=('81cf9b716263ba85f0528d3357dccb75' + '6614b04176b9b7dfe26f22e9ce846801' + 'ef27c6d4062f2f97c532a9e893b6adbe' + '7cd3dc10e7a37468cad4053a067dcd01' + 'cc90df2df6fe80fab885a80036d420a1' + 'b83ab5742651b4234b7d2e20785c6693' + '6f4cbf332816d2c4e9578ecd1d0dce7f' + 'a279e195e249000646895d93e199860d' + '4bdff6982c66d24a879c424aaac3d04d' + '45c15a6b4767288f2f745598455ea2bf') package_jre() { pkgdesc="Oracle's Java Runtime Environment" - depends=('libxtst') + depends=('libxtst' 'desktop-file-utils' 'xdg-utils' 'shared-mime-info') provides=('java-runtime=7') conflicts=('java-runtime') install='jre.install' @@ -55,6 +51,27 @@ package_jre() { mkdir -p ${pkgdir}/opt/java cp -r jdk1.7.0/jre ${pkgdir}/opt/java + # move icons to appropriate location + install -d ${pkgdir}/usr/share + mv ${pkgdir}/opt/java/jre/lib/desktop/icons ${pkgdir}/usr/share + + # install .desktop entries + mv ${pkgdir}/opt/java/jre/lib/desktop/applications ${pkgdir}/usr/share + # desktop entries + install -d ${pkgdir}/usr/share/applications + install -m644 \ + ${srcdir}/java-policy-settings.desktop \ + ${pkgdir}/usr/share/applications + + # move mime files + mv ${pkgdir}/opt/java/jre/lib/desktop/mime ${pkgdir}/usr/share + + # get rid of already installed files + rm -r ${pkgdir}/opt/java/jre/plugin/desktop + rm -r ${pkgdir}/opt/java/jre/lib/desktop + + # TODO: find out the purpose of ./jre/lib/images/icons + # profiles install -D ${srcdir}/jre.profile \ ${pkgdir}/etc/profile.d/jre.sh @@ -73,19 +90,20 @@ package_jre() { # licenses install -d ${pkgdir}/usr/share/licenses/jre - install -m644 ${pkgdir}/opt/java/jre/COPYRIGHT \ - ${pkgdir}/usr/share/licenses/jre - install -m644 ${pkgdir}/opt/java/jre/LICENSE \ - ${pkgdir}/usr/share/licenses/jre - install -m644 ${pkgdir}/opt/java/jre/THIRDPARTYLICENSEREADME.txt \ + install -m644 \ + ${pkgdir}/opt/java/jre/{COPYRIGHT,LICENSE,THIRDPARTYLICENSEREADME.txt} \ ${pkgdir}/usr/share/licenses/jre - # Fix system prefs folder FS#18872 - install -d ${pkgdir}/etc/.java/.systemPrefs - # Clicking a .jnlp file does not launch that file but launch javaws -viewer instead FS#22509 install ${srcdir}/javaws-launcher \ ${pkgdir}/opt/java/jre/bin + sed \ + -e 's/Exec=javaws/&-launcher %f/' \ + -e '/NoDisplay=true/d' \ + -i ${pkgdir}/usr/share/applications/sun-javaws.desktop + + # Fix system prefs folder FS#18872 + install -d ${pkgdir}/etc/.java/.systemPrefs } package_jdk() { @@ -101,14 +119,16 @@ package_jdk() { # main files install -d ${pkgdir}/opt - mv jdk1.7.0 ${pkgdir}/opt/java + cp -r jdk1.7.0 ${pkgdir}/opt/java - # cleanup jre folder - rm -rf ${pkgdir}/opt/java/jre + # remove jre folder provided by the jre package + rm -r ${pkgdir}/opt/java/jre # can not package src.zip due to international use restrictions for certain countries rm ${pkgdir}/opt/java/src.zip # remove windows specific batch files find ${pkgdir}/opt/java -name '*\.bat' -delete + # remove already installed icons, mime and .desktop files provided by jre + rm -r ${pkgdir}/opt/java/lib/desktop # profiles install -D ${srcdir}/jdk.profile \ @@ -118,24 +138,15 @@ package_jdk() { # licenses install -d ${pkgdir}/usr/share/licenses/jdk - install -m644 ${pkgdir}/opt/java/COPYRIGHT \ - ${pkgdir}/usr/share/licenses/jdk - install -m644 ${pkgdir}/opt/java/LICENSE \ - ${pkgdir}/usr/share/licenses/jdk - install -m644 ${pkgdir}/opt/java/THIRDPARTYLICENSEREADME.txt \ + install -m644 \ + ${pkgdir}/opt/java/{COPYRIGHT,LICENSE,THIRDPARTYLICENSEREADME.txt} \ ${pkgdir}/usr/share/licenses/jdk # desktop entries - install -Dm644 ${srcdir}/java-control-panel.desktop \ - ${pkgdir}/usr/share/applications/java-control-panel.desktop - install -Dm644 ${srcdir}/java-monitoring-and-management-console.desktop \ - ${pkgdir}/usr/share/applications/java-monitoring-and-management-console.desktop - install -Dm644 ${srcdir}/java-policy-settings.desktop \ - ${pkgdir}/usr/share/applications/java-policy-settings.desktop - install -Dm644 ${srcdir}/java-visualvm.desktop \ - ${pkgdir}/usr/share/applications/java-visualvm.desktop - install -Dm644 ${srcdir}/java-web-start.desktop \ - ${pkgdir}/usr/share/applications/java-web-start.desktop + install -d ${pkgdir}/usr/share/applications + install -m644 \ + ${srcdir}/java-{monitoring-and-management-console,visualvm}.desktop \ + ${pkgdir}/usr/share/applications # javadb (apache derby) daemon files FS#21186 install -D ${srcdir}/derby-network-server \ diff --git a/community/java-oracle/java-monitoring-and-management-console.desktop b/community/java-oracle/java-monitoring-and-management-console.desktop index c0e1e59f6..4de3bd293 100644 --- a/community/java-oracle/java-monitoring-and-management-console.desktop +++ b/community/java-oracle/java-monitoring-and-management-console.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=/opt/java/bin/jconsole +Exec=jconsole Icon=java Name[cs]=Konzole monitorovánà a správy prostředà Java Name=Java Monitoring and Management Console diff --git a/community/java-oracle/java-policy-settings.desktop b/community/java-oracle/java-policy-settings.desktop index 1009301b1..0e032258d 100644 --- a/community/java-oracle/java-policy-settings.desktop +++ b/community/java-oracle/java-policy-settings.desktop @@ -1,6 +1,6 @@ [Desktop Entry] -Exec=/opt/java/bin/policytool -Icon=java +Exec=policytool +Icon=sun-java.png Name[cs]=Nastavenà politiky Java aplikacà Name=Java Policy Settings Path= diff --git a/community/java-oracle/java-visualvm.desktop b/community/java-oracle/java-visualvm.desktop index 8aa9527c8..f7ad3e324 100644 --- a/community/java-oracle/java-visualvm.desktop +++ b/community/java-oracle/java-visualvm.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=/opt/java/bin/jvisualvm +Exec=jvisualvm GenericName[cs]=Nástroj pro monitorovánà a sledovánà výkonu Java aplikacà GenericName=Java Monitoring and Performance Monitoring Tool Icon=java diff --git a/community/java-oracle/jdk.install b/community/java-oracle/jdk.install index abe08b6a0..0d96b6572 100644 --- a/community/java-oracle/jdk.install +++ b/community/java-oracle/jdk.install @@ -1,7 +1,16 @@ post_install() { + update-desktop-database -q echo "The jdk package is licensed software." echo "You MUST read and agree to the license stored in" - echo "/opt/java/LICENSE before using it." + echo "/usr/share/licenses/jdk/LICENSE before using it." echo 'Please relogin to include jdk in your PATH' } + +post_upgrade() { + update-desktop-database -q +} + +post_remove() { + update-desktop-database -q +} diff --git a/community/java-oracle/jre.install b/community/java-oracle/jre.install index 111da3c2a..573f5f836 100644 --- a/community/java-oracle/jre.install +++ b/community/java-oracle/jre.install @@ -1,20 +1,35 @@ post_install() { - echo "The jre package is licensed software." - echo "You MUST read and agree to the license stored in" - echo "/opt/java/jre/LICENSE before using it." - if [ -f /etc/mailcap ] ; then - sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap - fi - echo 'application/x-java-jnlp-file;/opt/java/jre/bin/javaws %s' >>/etc/mailcap + update-desktop-database -q + xdg-icon-resource forceupdate + update-mime-database usr/share/mime &> /dev/null + + echo "The jre package is licensed software." + echo "You MUST read and agree to the license stored in" + echo "/usr/share/licenses/jre/LICENSE before using it." + + if [ -f /etc/mailcap ] ; then + sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap + fi + echo 'application/x-java-jnlp-file;/opt/java/jre/bin/javaws %s' >>/etc/mailcap echo 'Please relogin to include jre in your PATH.' } +post_upgrade() { + update-desktop-database -q + xdg-icon-resource forceupdate + update-mime-database usr/share/mime &> /dev/null +} + post_remove() { - mailcap=$(grep -v 'application/x-java-jnlp-file' /etc/mailcap) - if [ "$mailcap" != "" ] ; then - sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap - else - rm /etc/mailcap - fi + update-desktop-database -q + xdg-icon-resource forceupdate + update-mime-database usr/share/mime &> /dev/null + + mailcap=$(grep -v 'application/x-java-jnlp-file' /etc/mailcap) + if [ "$mailcap" != "" ] ; then + sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap + else + rm /etc/mailcap + fi } diff --git a/community/ltris/ChangeLog b/community/ltris/ChangeLog index 9975da0d0..b8c8e0cb0 100644 --- a/community/ltris/ChangeLog +++ b/community/ltris/ChangeLog @@ -1,3 +1,8 @@ +2011-08-09 Thorsten Töpper <atsutane-tu@freethoughts.de> + + * ltris 1.0.16-1 + * Upstream update + 2009-12-29 Eric Belanger <eric@archlinux.org> * ltris 1.0.14-1 diff --git a/community/ltris/PKGBUILD b/community/ltris/PKGBUILD index 3a2208e45..b9ed1af99 100644 --- a/community/ltris/PKGBUILD +++ b/community/ltris/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 7041 2009-12-30 05:28:27Z ebelanger $ +# $Id: PKGBUILD 53908 2011-08-09 20:01:00Z ttopper $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: SmackleFunky <smacklefunky@optusnet.com.au> pkgname=ltris -pkgver=1.0.14 +pkgver=1.0.16 pkgrel=1 pkgdesc="A tetris clone where you have a bowl with blocks falling down." arch=('i686' 'x86_64' 'mips64el') @@ -12,14 +12,14 @@ license=('GPL') depends=('sdl_mixer') install=ltris.install source=(http://downloads.sourceforge.net/lgames/${pkgname}-${pkgver}.tar.gz) -md5sums=('7eff57f492bc880a02a58c64f638959e') -sha1sums=('031262093c99376c3c7349798f099c1e7ea0867f') +md5sums=('07b5a41f8de62ea083575384f05545c6') +sha1sums=('08785fc962ed83678b955f61a9a87a0215938123') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --localstatedir=/var/games || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr --localstatedir=/var/games + make + make DESTDIR="${pkgdir}" install install -d "${pkgdir}/usr/share/pixmaps" install -m644 icons/ltris{16,32,48}.xpm "${pkgdir}/usr/share/pixmaps" @@ -29,3 +29,4 @@ build() { chmod 775 "${pkgdir}/var/games" rm "${pkgdir}/var/games/ltris.hscr" } + diff --git a/community/metapixel/PKGBUILD b/community/metapixel/PKGBUILD new file mode 100644 index 000000000..056f40d52 --- /dev/null +++ b/community/metapixel/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 53817 2011-08-08 13:44:50Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Daniel Isenmann <daniel.isenmann [at] gmx [dot] de> + +pkgname=metapixel +pkgver=1.0.2 +pkgrel=2 +pkgdesc='A program for generating photomosaics.' +arch=('i686' 'x86_64') +url='http://www.complang.tuwien.ac.at/schani/metapixel/' +license=('GPL') +depends=('libungif' 'libjpeg' 'libpng' 'perl') +source=("http://www.complang.tuwien.ac.at/schani/metapixel/files/${pkgname}-${pkgver}.tar.gz" + 'metapixel-1.0.2-libpng-1.5.patch') +md5sums=('af5d77d38826756af213a08e3ada9941' + '1832a79790b07402735bfeb9f71f36e9') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sed -i 's/lgif/lungif/g' Makefile + sed -ie '58,58d' Makefile + + patch -p1 -i ../metapixel-1.0.2-libpng-1.5.patch + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make PREFIX="${pkgdir}/usr" install +} diff --git a/community/metapixel/metapixel-1.0.2-libpng-1.5.patch b/community/metapixel/metapixel-1.0.2-libpng-1.5.patch new file mode 100644 index 000000000..ed787452f --- /dev/null +++ b/community/metapixel/metapixel-1.0.2-libpng-1.5.patch @@ -0,0 +1,174 @@ +--- metapixel-1.0.2.orig/rwimg/rwpng.c ++++ metapixel-1.0.2/rwimg/rwpng.c +@@ -57,19 +57,39 @@ + data->end_info = png_create_info_struct(data->png_ptr); + assert(data->end_info != 0); + ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ if (setjmp(png_jmpbuf((data->png_ptr)))) ++#else + if (setjmp(data->png_ptr->jmpbuf)) ++#endif + assert(0); + +- png_init_io(data->png_ptr, data->file); +- ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ png_init_io(data->png_ptr, data->file); ++ png_read_info(data->png_ptr, data->info_ptr); ++#else ++ png_init_io(data->png_ptr, data->file); + png_read_info(data->png_ptr, data->info_ptr); ++#endif + ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ *width = png_get_image_width(data->png_ptr, data->info_ptr); ++ *height = png_get_image_height(data->png_ptr, data->info_ptr); ++ { ++ png_byte value = png_get_bit_depth(data->png_ptr, data->info_ptr); ++ assert(value == 8 || value == 16); ++ value = png_get_color_type(data->png_ptr, data->info_ptr); ++ assert(value == PNG_COLOR_TYPE_RGB || value == PNG_COLOR_TYPE_RGB_ALPHA); ++ value = png_get_interlace_type(data->png_ptr, data->info_ptr); ++ assert(value == PNG_INTERLACE_NONE); ++ } ++#else + *width = data->info_ptr->width; + *height = data->info_ptr->height; +- + assert(data->info_ptr->bit_depth == 8 || data->info_ptr->bit_depth == 16); + assert(data->info_ptr->color_type == PNG_COLOR_TYPE_RGB || data->info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA); + assert(data->info_ptr->interlace_type == PNG_INTERLACE_NONE); ++#endif + + data->have_read = 0; + +@@ -81,32 +101,51 @@ + { + png_data_t *data = (png_data_t*)_data; + int i; +- int bps, spp; ++ int bps, spp, width; + unsigned char *row; + ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ ++ if (setjmp(png_jmpbuf((data->png_ptr)))) ++#else + if (setjmp(data->png_ptr->jmpbuf)) ++#endif + assert(0); + ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ if(png_get_color_type(data->png_ptr, data->info_ptr) == PNG_COLOR_TYPE_RGB) ++#else + if (data->info_ptr->color_type == PNG_COLOR_TYPE_RGB) ++#endif + spp = 3; + else + spp = 4; + ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ if(png_get_bit_depth(data->png_ptr, data->info_ptr) == 16) ++#else + if (data->info_ptr->bit_depth == 16) ++#endif + bps = 2; + else + bps = 1; + +- row = (unsigned char*)malloc(data->info_ptr->width * spp * bps); ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ width = png_get_image_width(data->png_ptr, data->info_ptr); ++#else ++ width = data->info_ptr->width: ++#endif ++ ++ row = (unsigned char*)malloc(width * spp * bps); + + for (i = 0; i < num_lines; ++i) + { + int j, channel; + + png_read_row(data->png_ptr, (png_bytep)row, 0); +- for (j = 0; j < data->info_ptr->width; ++j) ++ for (j = 0; j < width; ++j) + for (channel = 0; channel < 3; ++channel) +- lines[i * data->info_ptr->width * 3 + j * 3 + channel] = row[j * spp * bps + channel * bps]; ++ lines[i * width * 3 + j * 3 + channel] = row[j * spp * bps + channel * bps]; + } + + free(row); +@@ -119,7 +158,11 @@ + { + png_data_t *data = (png_data_t*)_data; + ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ if (setjmp(png_jmpbuf((data->png_ptr)))) ++#else + if (setjmp(data->png_ptr->jmpbuf)) ++#endif + assert(0); + + if (data->have_read) +@@ -148,7 +191,11 @@ + data->info_ptr = png_create_info_struct(data->png_ptr); + assert(data->info_ptr != 0); + ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ if (setjmp(png_jmpbuf((data->png_ptr)))) ++#else + if (setjmp(data->png_ptr->jmpbuf)) ++#endif + assert(0); + + if (pixel_stride == 4) +@@ -156,6 +203,16 @@ + + png_init_io(data->png_ptr, data->file); + ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ png_set_IHDR(data->png_ptr, data->info_ptr, ++ width, height, 8, PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE, ++ PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); ++ ++ /* Maybe does not need following. */ ++ png_set_tRNS(data->png_ptr, data->info_ptr, NULL, 0, NULL); ++ png_set_PLTE(data->png_ptr, data->info_ptr, NULL, 0); ++ png_set_invalid(data->png_ptr, data->info_ptr, 0); ++#else + data->info_ptr->width = width; + data->info_ptr->height = height; + data->info_ptr->valid = 0; +@@ -168,6 +225,7 @@ + data->info_ptr->compression_type = PNG_COMPRESSION_TYPE_DEFAULT; + data->info_ptr->filter_type = PNG_FILTER_TYPE_DEFAULT; + data->info_ptr->interlace_type = PNG_INTERLACE_NONE; ++#endif + + png_write_info(data->png_ptr, data->info_ptr); + +@@ -182,7 +240,11 @@ + png_data_t *data = (png_data_t*)_data; + int i; + ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ if (setjmp(png_jmpbuf((data->png_ptr)))) ++#else + if (setjmp(data->png_ptr->jmpbuf)) ++#endif + assert(0); + + for (i = 0; i < num_lines; ++i) +@@ -194,7 +256,11 @@ + { + png_data_t *data = (png_data_t*)_data; + ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ if (setjmp(png_jmpbuf((data->png_ptr)))) ++#else + if (setjmp(data->png_ptr->jmpbuf)) ++#endif + assert(0); + + png_write_end(data->png_ptr, data->info_ptr); diff --git a/community/open-vm-tools-modules/PKGBUILD b/community/open-vm-tools-modules/PKGBUILD index ee6e5ad4b..d1a2f988c 100644 --- a/community/open-vm-tools-modules/PKGBUILD +++ b/community/open-vm-tools-modules/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 52418 2011-07-24 20:40:05Z spupykin $ +# $Id: PKGBUILD 53790 2011-08-08 08:19:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Krzysztof Raczkowski <raczkow@gmail.com> pkgname=open-vm-tools-modules pkgver=2011.07.19 _pkgsubver=450511 -pkgrel=1 +pkgrel=2 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools" arch=('i686' 'x86_64' 'mips64el') url="http://open-vm-tools.sourceforge.net/" diff --git a/community/parcellite/PKGBUILD b/community/parcellite/PKGBUILD index 422df5989..f19c3c1be 100644 --- a/community/parcellite/PKGBUILD +++ b/community/parcellite/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 50742 2011-06-30 10:48:15Z spupykin $ +# $Id: PKGBUILD 53903 2011-08-09 19:26:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Alexander Fehr <pizzapunk gmail com> pkgname=parcellite -pkgver=1.0.2rc2 +pkgver=1.0.2rc3 pkgrel=1 pkgdesc="Lightweight GTK+ clipboard manager" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL3') depends=('gtk2') makedepends=('intltool') source=(http://downloads.sourceforge.net/parcellite/parcellite-$pkgver.tar.gz) -md5sums=('c1ade542f9b5e836af18773171e70e95') +md5sums=('3fe1196cc2bb3f34d57d0e34e10449b3') build() { cd "$srcdir/parcellite-$pkgver" diff --git a/community/python2-pyopencl/PKGBUILD b/community/python2-pyopencl/PKGBUILD index c5d2cbad4..8f24a281f 100644 --- a/community/python2-pyopencl/PKGBUILD +++ b/community/python2-pyopencl/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 53500 2011-08-04 16:53:43Z stephane $ +# $Id: PKGBUILD 53932 2011-08-10 01:28:16Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=python2-pyopencl pkgver=2011.1.2 -pkgrel=1 +pkgrel=2 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' 'libcl' 'opencl-headers') +depends=('python2' 'python2-numpy' 'python-mako' 'python2-pytools' 'libcl' 'opencl-headers') makedepends=('ctags' 'python2-distribute') provides=('pyopencl=${pkgver}') replaces=('pyopencl') @@ -19,9 +19,8 @@ sha1sums=('5ecc476b86317ed065c75c1d8efb2a53d1d8f075' build() { cd "${srcdir}/pyopencl-${pkgver}" - python2 ./configure.py --cl-inc-dir=/usr/include \ - --cl-lib-dir=/usr/lib \ - --cl-libname=OpenCL + python2 ./configure.py + python2 setup.py build } diff --git a/community/quvi/PKGBUILD b/community/quvi/PKGBUILD index 185fe2603..0b95cd2d6 100644 --- a/community/quvi/PKGBUILD +++ b/community/quvi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 52105 2011-07-20 08:21:04Z lfleischer $ +# $Id: PKGBUILD 53820 2011-08-08 14:10:47Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: joyfulgirl@archlinux.us pkgname=quvi -pkgver=0.2.18 +pkgver=0.2.19 pkgrel=1 pkgdesc='Command-line tool for parsing video download links.' arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('LGPL') depends=('curl' 'pcre' 'lua') options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('496bb7aad2f449c2a692aa48721b8a4a') +md5sums=('c96627374377b049ac60e7642eb7f838') build() { cd "${pkgname}-${pkgver}" diff --git a/community/ruby-atk/PKGBUILD b/community/ruby-atk/PKGBUILD index 3b471f6f6..781fdfd0c 100644 --- a/community/ruby-atk/PKGBUILD +++ b/community/ruby-atk/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 44814 2011-04-12 01:26:00Z bfanella $ +# $Id: PKGBUILD 53612 2011-08-07 01:11:19Z bfanella $ # Maintainer: Brad Fanella <bradfanella@archlinux.us> # Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl> # Contributor: kritoke <kritoke@nospam.gmail.com> pkgname=ruby-atk -pkgver=0.90.8 +pkgver=1.0.0 pkgrel=1 pkgdesc="Ruby bindings for atk." arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('LGPL') depends=('ruby-glib2') makedepends=('ruby-glib2' 'atk' 'ruby-pkgconfig') source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz) -md5sums=('74966bde5366bc9d09701e9f464d60c9') +md5sums=('e9711eb5bd88debda90a920deb96d7d0') build() { cd "$srcdir/ruby-gtk2-$pkgver" diff --git a/community/ruby-gdkpixbuf2/PKGBUILD b/community/ruby-gdkpixbuf2/PKGBUILD index 581bf5a26..ab085806a 100644 --- a/community/ruby-gdkpixbuf2/PKGBUILD +++ b/community/ruby-gdkpixbuf2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 44824 2011-04-12 01:33:28Z bfanella $ +# $Id: PKGBUILD 53620 2011-08-07 02:18:34Z bfanella $ # Maintainer: Brad Fanella <bradfanella@archlinux.us> # Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl> # Contributor: kritoke <kritoke@nospam.gmail.com> pkgname=ruby-gdkpixbuf2 -pkgver=0.90.8 +pkgver=1.0.0 pkgrel=1 pkgdesc="Ruby bindings for gdkpixbuf2." arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('LGPL') depends=('ruby-glib2' 'gtk2') makedepends=('ruby-glib2' 'ruby-pkgconfig') source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz) -md5sums=('74966bde5366bc9d09701e9f464d60c9') +md5sums=('e9711eb5bd88debda90a920deb96d7d0') build() { cd "$srcdir/ruby-gtk2-$pkgver" diff --git a/community/ruby-gio2/PKGBUILD b/community/ruby-gio2/PKGBUILD index 48d0f27ea..fe7e250e7 100644 --- a/community/ruby-gio2/PKGBUILD +++ b/community/ruby-gio2/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Brad Fanella <bradfanella@archlinux.us> pkgname=ruby-gio2 -pkgver=0.90.8 +pkgver=1.0.0 pkgrel=1 pkgdesc="Ruby bindings for gio2." arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('LGPL') depends=('ruby-glib2') makedepends=('ruby-pkgconfig') source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz) -md5sums=('74966bde5366bc9d09701e9f464d60c9') +md5sums=('e9711eb5bd88debda90a920deb96d7d0') build() { cd "$srcdir/ruby-gtk2-$pkgver" diff --git a/community/ruby-glib2/PKGBUILD b/community/ruby-glib2/PKGBUILD index 844006a7f..35baa822d 100644 --- a/community/ruby-glib2/PKGBUILD +++ b/community/ruby-glib2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 44809 2011-04-12 00:27:03Z bfanella $ +# $Id: PKGBUILD 53576 2011-08-05 22:47:58Z bfanella $ # Maintainer: Brad Fanella <bradfanella@archlinux.us> # Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl> # Contributor: kritoke <kritoke@nospam.gmail.com> pkgname=ruby-glib2 -pkgver=0.90.8 +pkgver=1.0.0 pkgrel=1 pkgdesc="Ruby bindings for glib2." arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('LGPL') depends=('ruby') makedepends=('ruby-pkgconfig') source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz) -md5sums=('74966bde5366bc9d09701e9f464d60c9') +md5sums=('e9711eb5bd88debda90a920deb96d7d0') build() { cd "$srcdir/ruby-gtk2-$pkgver" diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD index a95ed7771..040ac0f68 100644 --- a/community/ruby-gtk2/PKGBUILD +++ b/community/ruby-gtk2/PKGBUILD @@ -1,28 +1,23 @@ -# $Id: PKGBUILD 44925 2011-04-13 00:53:43Z bfanella $ +# $Id: PKGBUILD 53871 2011-08-09 01:21:52Z bfanella $ # Maintainer: Brad Fanella <bradfanella@archlinux.us> # Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl> # Contributor: kritoke <kritoke@nospam.gmail.com> pkgname=ruby-gtk2 -pkgver=0.90.8 -pkgrel=2 +pkgver=1.0.0 +pkgrel=1 pkgdesc="Ruby bindings for gtk2." arch=('i686' 'x86_64' 'mips64el') url="http://ruby-gnome2.sourceforge.jp" license=('LGPL') depends=('ruby-glib2' 'ruby-pango' 'ruby-atk' 'ruby-gdkpixbuf2') makedepends=('ruby-pkgconfig' 'ruby-cairo') -source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz - 'mkmf-gnome2.patch') -md5sums=('74966bde5366bc9d09701e9f464d60c9' - '5674ec349bec878c36f70102ca7acb0b') +source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz) +md5sums=('e9711eb5bd88debda90a920deb96d7d0') build() { cd "$srcdir/ruby-gtk2-$pkgver" - # Apply mkmf-gnome2.patch - patch -Np1 glib2/lib/mkmf-gnome2.rb < ${srcdir}/mkmf-gnome2.patch - export LANG="en_US.UTF-8" ruby extconf.rb gtk2 --topdir=$pkgdir make diff --git a/community/ruby-pango/PKGBUILD b/community/ruby-pango/PKGBUILD index d938b4540..577980c5c 100644 --- a/community/ruby-pango/PKGBUILD +++ b/community/ruby-pango/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 44819 2011-04-12 01:30:34Z bfanella $ +# $Id: PKGBUILD 53626 2011-08-07 02:29:56Z bfanella $ # Maintainer: Brad Fanella <bradfanella@archlinux.us> # Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl> # Contributor: kritoke <kritoke@nospam.gmail.com> pkgname=ruby-pango -pkgver=0.90.8 +pkgver=1.0.0 pkgrel=1 pkgdesc="Ruby bindings for pango." arch=('i686' 'x86_64' 'mips64el') @@ -13,10 +13,10 @@ license=('LGPL') depends=('ruby-glib2' 'ruby-cairo') makedepends=('ruby-glib2' 'pango' 'ruby-pkgconfig' 'ruby-cairo') source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz) -md5sums=('74966bde5366bc9d09701e9f464d60c9') +md5sums=('e9711eb5bd88debda90a920deb96d7d0') + build() { cd "$srcdir/ruby-gtk2-$pkgver" - ruby extconf.rb pango --topdir=$pkgdir make } diff --git a/community/systemd/PKGBUILD b/community/systemd/PKGBUILD index 7548d09b7..1e156047d 100644 --- a/community/systemd/PKGBUILD +++ b/community/systemd/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 53341 2011-08-03 04:06:06Z dreisner $ +# $Id: PKGBUILD 53877 2011-08-09 02:05:40Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=systemd pkgver=33 -pkgrel=1 +pkgrel=2 pkgdesc="Session and Startup manager" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2') -depends=('dbus-core' 'libcap' 'util-linux>=2.19' 'udev>=172') +depends=('dbus-core' 'kbd' 'libcap' 'util-linux>=2.19' 'udev>=172') makedepends=('docbook-xsl' 'libxslt' 'cryptsetup' 'gtk2' 'intltool' 'libnotify' 'gperf') optdepends=('cryptsetup: required for encrypted block devices' 'dbus-python: systemd-analyze' diff --git a/community/systemd/systemd.install b/community/systemd/systemd.install index 34f902276..04b29688a 100644 --- a/community/systemd/systemd.install +++ b/community/systemd/systemd.install @@ -1,7 +1,7 @@ #!/bin/sh checkgroups() { - if usr/bin/getent group lock >/dev/null; then + if ! usr/bin/getent group lock >/dev/null; then usr/sbin/groupadd -g 54 lock fi } @@ -13,7 +13,7 @@ sd_booted() { post_install() { checkgroups - if [ -f etc/machine-id ]; then + if [ ! -f etc/machine-id ]; then bin/systemd-machine-id-setup fi @@ -24,7 +24,7 @@ post_install() { post_upgrade() { checkgroups - if [ -f etc/machine-id ]; then + if [ ! -f etc/machine-id ]; then bin/systemd-machine-id-setup fi @@ -45,7 +45,9 @@ post_upgrade() { } post_remove() { - usr/bin/getent group lock >/dev/null && usr/sbin/groupdel lock + if usr/bin/getent group lock >/dev/null; then + usr/sbin/groupdel lock + fi } # vim:set ts=2 sw=2 et: diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD index 87106c1a9..ce3f065d7 100644 --- a/community/tea/PKGBUILD +++ b/community/tea/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 50314 2011-06-28 09:33:06Z spupykin $ +# $Id: PKGBUILD 53780 2011-08-08 08:12:58Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Zsolt Varadi <sysop_xxl@fibermail.hu> pkgname=tea -pkgver=30.0.0 +pkgver=30.1.0 pkgrel=1 pkgdesc="A QT-based text editor for Linux and *BSD. With an ultimate small size TEA provides you hundreds of functions." arch=('i686' 'x86_64' 'mips64el') @@ -14,9 +14,9 @@ url="http://tea-editor.sourceforge.net/" license=('GPL') depends=('qt' 'aspell' 'hunspell') install=tea.install -source=(http://downloads.sourceforge.net/tea-editor/${pkgname}-${pkgver}.tar.bz2 +source=(http://downloads.sourceforge.net/project/tea-editor/tea-editor/$pkgver/tea-$pkgver.tar.bz2 tea.desktop) -md5sums=('07508b4972403fc7c3a72169700e6157' +md5sums=('1b6bdadf7cd323f059b0b7b4420e186b' '377ace3363124f4c086de0babb820761') build() { diff --git a/community/vhba-module/PKGBUILD b/community/vhba-module/PKGBUILD index fc76e3b59..e463b65c9 100644 --- a/community/vhba-module/PKGBUILD +++ b/community/vhba-module/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 51733 2011-07-13 18:23:43Z schiv $ +# $Id: PKGBUILD 53809 2011-08-08 10:37:58Z jelle $ # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor: Charles Lindsay <charles@chaoslizard.org> pkgname=vhba-module pkgver=20110416 -_kernver='2.6.39-ARCH' -pkgrel=1 +_kernver='3.0-ARCH' +pkgrel=2 pkgdesc="Kernel module that emulates SCSI devices" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" license=('GPL2') -depends=('kernel26>=2.6.39' 'kernel26<2.6.40') -makedepends=('kernel26-headers>=2.6.39') +depends=('linux>=3.0' 'linux<3.1') +makedepends=('linux-headers>=3.0') install=vhba-module.install source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.gz) md5sums=('2f91dd4ee8648da92d625221d4275b60') diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD index a611a4b92..599232cfa 100644 --- a/community/virtualbox/PKGBUILD +++ b/community/virtualbox/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 53173 2011-07-31 12:12:47Z ibiru $ +# $Id: PKGBUILD 53837 2011-08-08 20:19:32Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=virtualbox pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-archlinux-modules' 'virtualbox-sdk') pkgver=4.1.0 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') @@ -26,7 +26,7 @@ build() { patch -Np1 -i "$srcdir/virtualbox-4-mkisofs-check.patch" patch -Np1 -i "$srcdir/vboxdrv-reference.patch" patch -Np1 -i "$srcdir/change_default_driver_dir.patch" - patch -Np0 -i "$srcdir/fix-kernel-panic.patch" + patch -Np2 -i "$srcdir/fix-kernel-panic.patch" cp "$srcdir/LocalConfig.kmk" . @@ -203,6 +203,6 @@ md5sums=('02556a6b4877cfdfbaa3ce0a0c0dcf31' 'ed1341881437455d9735875ddf455fbe' '4cf75d9c091199a47a7a1bc2f4e347d9' '78ffa67ff131680f1d2b6f06d4325c5b' - 'b3de603560b2fb2c33e704e4e8ab3de8' + '790a1456345fe74b6b714d71f90a1c6d' '97e193f050574dd272a38e5ee5ebe62b' - '19b05b85a8a46af5a429b2ab618638cd') + '863107a852607b758b356cd53850679d') diff --git a/community/virtualbox/fix-kernel-panic.patch b/community/virtualbox/fix-kernel-panic.patch index 237715db2..1f1ea993d 100644 --- a/community/virtualbox/fix-kernel-panic.patch +++ b/community/virtualbox/fix-kernel-panic.patch @@ -1,22 +1,11 @@ -Index: src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c
+Index: /trunk/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c
===================================================================
---- src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c (revision 73165)
-+++ src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c (revision 73166)
-@@ -32,6 +32,7 @@
- #include "internal/iprt.h"
-
- #include <iprt/mp.h>
-+#include <iprt/asm-amd64-x86.h>
- #include <iprt/err.h>
- #include <iprt/cpuset.h>
- #include <iprt/thread.h>
-@@ -82,7 +83,8 @@
- NOREF(pvUser1);
-
- AssertRelease(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
-- AssertRelease(idCpu == RTMpCpuId()); /* ASSUMES iCpu == RTCPUID */
-+ AssertReleaseMsg(idCpu == RTMpCpuId(), /* ASSUMES iCpu == RTCPUID */
-+ ("idCpu=%u RTMpCpuId=%d ApicId=%d\n", idCpu, RTMpCpuId(), ASMGetApicId() ));
-
- switch (ulNativeEvent)
- {
\ No newline at end of file +--- /trunk/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c (revision 38199)
++++ /trunk/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c (revision 38232)
+@@ -78,5 +78,5 @@
+ * @remarks This can be invoked in interrupt context.
+ */
+-static void rtMpNotificationLinuxOnCurrentCpu(RTCPUID idCpu, void *pvUser1, void *pvUser2)
++static DECLCALLBACK(void) rtMpNotificationLinuxOnCurrentCpu(RTCPUID idCpu, void *pvUser1, void *pvUser2)
+ {
+ unsigned long ulNativeEvent = *(unsigned long *)pvUser2;
diff --git a/community/virtualbox/vboxdrv.sh b/community/virtualbox/vboxdrv.sh index 845f6c769..aace25edf 100755 --- a/community/virtualbox/vboxdrv.sh +++ b/community/virtualbox/vboxdrv.sh @@ -21,7 +21,7 @@ fi case "$1" in setup) stat_busy "Unloading VirtualBox kernel modules" - for module in vbox{netflt,netadp,drv,pci}; do + for module in vbox{pci,netflt,netadp,drv}; do if grep -q "^${module}" /proc/modules; then MODLIST+=($module) modprobe -r $module diff --git a/community/xapian-core/PKGBUILD b/community/xapian-core/PKGBUILD index 5c98a15c8..214c31f00 100644 --- a/community/xapian-core/PKGBUILD +++ b/community/xapian-core/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 44794 2011-04-11 20:41:06Z ebelanger $ +# $Id: PKGBUILD 53882 2011-08-09 08:32:11Z spupykin $ # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: William Rea <sillywilly@gmail.com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=xapian-core -pkgver=1.2.5 +pkgver=1.2.6 pkgrel=1 pkgdesc='Open source search engine library.' arch=('i686' 'x86_64' 'mips64el') url='http://www.xapian.org/' license=('GPL') -depends=('sh' 'gcc-libs' 'zlib') +depends=('sh' 'gcc-libs' 'zlib' 'util-linux') # xapian config requires libxapian.la options=('libtool') source=("http://oligarchy.co.uk/xapian/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('775995b7036b01b8b864a95d5646f42d') +md5sums=('30f5cc976f063694f93cbdf9b83dc2ea') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/xcircuit/PKGBUILD b/community/xcircuit/PKGBUILD index e7ddd42e0..1cf9b6a4d 100644 --- a/community/xcircuit/PKGBUILD +++ b/community/xcircuit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 43609 2011-03-27 20:50:31Z spupykin $ +# $Id: PKGBUILD 53887 2011-08-09 08:33:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Giovanni Scafora <linuxmania@gmail.com> # Contributor: simo <simo@archlinux.org> pkgname=xcircuit -pkgver=3.6.168 +pkgver=3.7.26 pkgrel=1 pkgdesc="A program for drawing publishable-quality electrical circuit schematic diagrams" arch=('i686' 'x86_64' 'mips64el') @@ -13,16 +13,16 @@ license=('GPL2') depends=('tk' 'libxpm' 'zlib') makedepends=('chrpath') source=(http://opencircuitdesign.com/xcircuit/archive/$pkgname-$pkgver.tgz) -md5sums=('240cc5a2f9934430b4438052eafb96c5') +md5sums=('6026f65a4bc327e5769157ffd1387342') build() { cd $srcdir/$pkgname-$pkgver - sed -i 's|am__api_version="1.9"|am__api_version="1.11"|' configure +# sed -i 's|am__api_version="1.9"|am__api_version="1.11"|' configure ./configure prefix=/usr --with-tcl=/usr/lib --with-tk=/usr/lib --mandir=/usr/share/man make make DESTDIR=$pkgdir install mkdir -p $pkgdir/usr/share/man/man1 - mv $pkgdir/usr/lib/xcircuit-3.6/man/* $pkgdir/usr/share/man/man1/ - rm -rf $pkgdir/usr/lib/xcircuit-3.6/man/ - chrpath -d $pkgdir/usr/lib/xcircuit-3.6/xcircexec + mv $pkgdir/usr/lib/xcircuit-3.7/man/* $pkgdir/usr/share/man/man1/ + rm -rf $pkgdir/usr/lib/xcircuit-3.7/man/ + chrpath -d $pkgdir/usr/lib/xcircuit-3.7/xcircexec } diff --git a/extra/aterm/PKGBUILD b/extra/aterm/PKGBUILD index 161e43890..25e2b51e0 100644 --- a/extra/aterm/PKGBUILD +++ b/extra/aterm/PKGBUILD @@ -1,15 +1,14 @@ -# $Id: PKGBUILD 47932 2009-07-29 18:24:49Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# $Id: PKGBUILD 135001 2011-08-09 20:47:19Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=aterm pkgver=1.0.1 -pkgrel=2 +pkgrel=3 pkgdesc="An xterm replacement with transparency support" arch=('i686' 'x86_64' 'mips64el') url="http://aterm.sourceforge.net/" license=('GPL') -depends=('libxext' 'libsm') +depends=('libx11') makedepends=('libxt') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) md5sums=('c2eede028e1011e0ec7035cf319c9b5a') @@ -19,7 +18,11 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --enable-transparency=yes \ --enable-background-image --enable-fading --enable-menubar \ - --enable-graphics || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + --enable-graphics + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index 179624811..776e0e882 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 123590 2011-05-11 17:20:39Z andyrtr $ +# $Id: PKGBUILD 134967 2011-08-09 17:31:55Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> # Contributor: GARETTE Emmanuel <gnunux at laposte dot net> -# Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=dovecot pkgver=2.0.13 -pkgrel=1 +pkgrel=2 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64' 'mips64el') url="http://dovecot.org/" @@ -26,7 +26,7 @@ backup=(etc/dovecot/dovecot.conf install=$pkgname.install source=(http://dovecot.org/releases/2.0/${pkgname}-${pkgver}.tar.gz dovecot.sh) md5sums=('fd8a0702275a61332db7353dadff0f92' - 'd020d43eab4ded6fb379dadc570a9490') + '587159e84e2da6f83d70b3c706ba87cc') build() { cd ${srcdir}/$pkgname-$pkgver @@ -66,9 +66,4 @@ package() { install -m 644 ${srcdir}/$pkgname-$pkgver/doc/dovecot-openssl.cnf ${pkgdir}/etc/ssl/ rm ${pkgdir}/etc/dovecot/README - - # install dovecot userdir - https://bugs.archlinux.org/task/20533 - install -d -m755 ${pkgdir}/var/run/dovecot/{login,empty} - chmod 755 ${pkgdir}/var/run/dovecot - chmod 750 ${pkgdir}/var/run/dovecot/login } diff --git a/extra/dovecot/dovecot.install b/extra/dovecot/dovecot.install index 51d1509ee..ddec178a4 100644 --- a/extra/dovecot/dovecot.install +++ b/extra/dovecot/dovecot.install @@ -11,9 +11,9 @@ post_install() { fi if grep -q "^dovecot:" /etc/passwd 2> /dev/null ; then - usermod -s /sbin/nologin -c "Dovecot user" -d /var/run/dovecot/login -u 76 -g dovecot dovecot &> /dev/null + usermod -s /sbin/nologin -c "Dovecot user" -d /var/empty -u 76 -g dovecot dovecot &> /dev/null else - useradd -s /sbin/nologin -c "Dovecot user" -d /var/run/dovecot/login -u 76 -g dovecot -m -r dovecot &> /dev/null + useradd -s /sbin/nologin -c "Dovecot user" -d /var/empty -u 76 -g dovecot -r dovecot &> /dev/null fi # dovenull @@ -24,9 +24,9 @@ post_install() { fi if grep -q "^dovenull:" /etc/passwd 2> /dev/null ; then - usermod -s /sbin/nologin -c "Dovecot user for completely untrustworthy processes" -d /var/run/dovecot/login -u 74 -g dovenull dovenull &> /dev/null + usermod -s /sbin/nologin -c "Dovecot user for completely untrustworthy processes" -d /var/empty -u 74 -g dovenull dovenull &> /dev/null else - useradd -s /sbin/nologin -c "Dovecot user for completely untrustworthy processes" -d /var/run/dovecot/login -u 74 -g dovenull -m -r dovenull &> /dev/null + useradd -s /sbin/nologin -c "Dovecot user for completely untrustworthy processes" -d /var/empty -u 74 -g dovenull -r dovenull &> /dev/null fi # harden some permissions @@ -36,15 +36,19 @@ post_install() { # arg 1: the new package version # arg 2: the old package version post_upgrade() { - post_install $1 if [ "`vercmp $2 2.0.0`" -lt 0 ]; then # important upgrade notice echo "> IMPORTANT DOVECOT 2.0 UPGRADE NOTICE" echo "> ------------------------------------" echo "> see http://wiki2.dovecot.org/Upgrading/2.0" echo "> make sure, you convert the dovecot.conf file" - fi - + fi + if [ "`vercmp $2 2.0.13-2`" -lt 0 ]; then + # to remove no more existant usersdirs simply remove the dovecot users and let them recreate later + userdel dovecot &> /dev/null + userdel dovenull &> /dev/null + fi + post_install $1 } # arg 1: the old package version diff --git a/extra/dovecot/dovecot.sh b/extra/dovecot/dovecot.sh index b7555fe50..e8966bd55 100755 --- a/extra/dovecot/dovecot.sh +++ b/extra/dovecot/dovecot.sh @@ -1,36 +1,69 @@ #!/bin/bash +daemon_name=dovecot + . /etc/rc.conf . /etc/rc.d/functions +#. /etc/conf.d/$daemon_name.conf + +get_pid() { + pidof -o %PPID $daemon_name +} -PID=`pidof -o %PPID /usr/sbin/dovecot` case "$1" in - start) - stat_busy "Starting Dovecot" - [ -z "$PID" ] && /usr/sbin/dovecot - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon dovecot - stat_done - fi - ;; - stop) - stat_busy "Stopping Dovecot" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon dovecot - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" + start) + stat_busy "Starting $daemon_name daemon" + + PID=$(get_pid) + if [[ -z $PID ]]; then + [[ -f /var/run/$daemon_name.pid ]] && + rm -f /var/run/$daemon_name.pid + # RUN + $daemon_name + # + if [[ $? -gt 0 ]]; then + stat_fail + exit 1 + else + echo $(get_pid) > /var/run/$daemon_name.pid + add_daemon $daemon_name + stat_done + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping $daemon_name daemon" + PID=$(get_pid) + # KILL + [[ -n $PID ]] && kill $PID &> /dev/null + # + if [[ $? -gt 0 ]]; then + stat_fail + exit 1 + else + rm -f /var/run/$daemon_name.pid &> /dev/null + rm_daemon $daemon_name + stat_done + fi + ;; + + restart) + $0 stop + sleep 3 + $0 start + ;; + + status) + stat_busy "Checking $daemon_name status"; + ck_status $daemon_name + ;; + + *) + echo "usage: $0 {start|stop|restart|status}" esac + exit 0 diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD index ec11d1c4b..71e2f1d5a 100644 --- a/extra/ekiga/PKGBUILD +++ b/extra/ekiga/PKGBUILD @@ -1,25 +1,29 @@ -# $Id: PKGBUILD 132764 2011-07-25 20:58:05Z ibiru $ +# $Id: PKGBUILD 134880 2011-08-08 09:42:48Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=ekiga pkgver=3.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)" url="http://www.ekiga.org" license=(GPL) arch=(i686 x86_64 mips64el) depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'gtk2' 'gconf') -makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost') +makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost' 'gnome-common') optdepends=('evolution-data-server: Evolution integration') options=(!emptydirs) groups=('gnome-extra') install=ekiga.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('4776834810f213a93cd6c307108c505970fe22e4803935134dd9f6b0bc834e06') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz + fix-generation-po.patch) +sha256sums=('4776834810f213a93cd6c307108c505970fe22e4803935134dd9f6b0bc834e06' + 'b87a3a044253f96631dd13453034e14ce4698a9106acf39e5816b8776d0de529') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/fix-generation-po.patch" + autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-schemas-install \ --disable-scrollkeeper --enable-dbus diff --git a/extra/ekiga/fix-generation-po.patch b/extra/ekiga/fix-generation-po.patch new file mode 100644 index 000000000..ebec28433 --- /dev/null +++ b/extra/ekiga/fix-generation-po.patch @@ -0,0 +1,24 @@ +From ebd9de96878c224145c0b1d7bf21c7151c0563bf Mon Sep 17 00:00:00 2001 +From: Eugen Dedu <Eugen.Dedu@pu-pm.univ-fcomte.fr> +Date: Tue, 19 Jul 2011 08:15:52 +0000 +Subject: Fix generation of po translation files + +Bug introduced by commit 2bfaf29. +--- +diff --git a/configure.ac b/configure.ac +index 63d8685..eefae22 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -770,7 +770,9 @@ AM_CONDITIONAL(DEBUG, test "x$has_debug" = "xyes") + dnl ######################################################################### + dnl Support for internationalization + dnl ######################################################################## +-AC_DEFINE(GETTEXT_PACKAGE, "[AC_PACKAGE_NAME]",[fix]) ++GETTEXT_PACKAGE=AC_PACKAGE_NAME ++AC_SUBST(GETTEXT_PACKAGE) # needed by gettext in po directory ++AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",[fix]) + AM_GLIB_GNU_GETTEXT + + +-- +cgit v0.9 diff --git a/extra/flac/PKGBUILD b/extra/flac/PKGBUILD index 4a507612d..df4d98eb1 100644 --- a/extra/flac/PKGBUILD +++ b/extra/flac/PKGBUILD @@ -1,29 +1,51 @@ -# $Id: PKGBUILD 48440 2009-08-02 03:15:27Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# $Id: PKGBUILD 135033 2011-08-09 23:31:20Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> -pkgname=flac +pkgbase=flac +pkgname=('flac' 'flac-doc') pkgver=1.2.1 -pkgrel=2 -pkgdesc="Free Lossless Audio Codec" +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url="http://flac.sourceforge.net/" -license=('custom:Xiph' 'LGPL' 'GPL' 'FDL') -depends=('glibc' 'libogg') +license=('BSD' 'GPL') +depends=('libogg') makedepends=('nasm' 'xmms') options=('!libtool' '!makeflags') -source=(http://downloads.sf.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz flac-1.2.1-gcc-4.3-includes.patch) -md5sums=('153c8b15a54da428d1f0fadc756c22c7' 'b9d245422bbc547b18a72897366bea77') -sha1sums=('bd54354900181b59db3089347cc84ad81e410b38' '7e9f8c2ef4d9daf5ddd20df63b608fe19b8c1560') +source=(http://downloads.sf.net/sourceforge/${pkgbase}/${pkgbase}-${pkgver}.tar.gz + flac-1.2.1-gcc-4.3-includes.patch) +md5sums=('153c8b15a54da428d1f0fadc756c22c7' + 'b9d245422bbc547b18a72897366bea77') +sha1sums=('bd54354900181b59db3089347cc84ad81e410b38' + '7e9f8c2ef4d9daf5ddd20df63b608fe19b8c1560') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/flac-1.2.1-gcc-4.3-includes.patch" || return 1 - ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared --disable-sse \ - --disable-rpath --with-pic || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + cd "${srcdir}/${pkgbase}-${pkgver}" + patch -Np1 -i "${srcdir}/flac-1.2.1-gcc-4.3-includes.patch" + ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared \ + --disable-sse --disable-rpath --with-pic + make +} + +check() { + cd "${srcdir}/${pkgbase}-${pkgver}" + make check +} + +package_flac() { + pkgdesc="Free Lossless Audio Codec" + optdepends=('xmms: for using the xmms plugin') + options=('!libtool' '!docs') + + cd "${srcdir}/${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING.Xiph "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + +package_flac-doc() { + pkgdesc="Developer documentation for the Free Lossless Audio Codec" + depends=('flac') - # install license - install -Dm0644 COPYING.Xiph "${pkgdir}/usr/share/licenses/${pkgname}/COPYING.Xiph" || return 1 + cd "${srcdir}/${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}" -C doc install + install -D -m644 COPYING.Xiph "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/glib/PKGBUILD b/extra/glib/PKGBUILD index dc2d075a1..1bb00ade4 100644 --- a/extra/glib/PKGBUILD +++ b/extra/glib/PKGBUILD @@ -1,31 +1,37 @@ -# $Id: PKGBUILD 55861 2009-10-15 02:42:14Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: dorphell <dorphell@archlinux.org> +# $Id: PKGBUILD 135061 2011-08-10 01:01:44Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=glib pkgver=1.2.10 -pkgrel=8.1 +pkgrel=9 pkgdesc="Common C routines used by Gtk+ and other libs" arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" license=('LGPL') -depends=('glibc' 'texinfo') +depends=('glibc') options=('!libtool') install=glib.install source=(ftp://ftp.gtk.org/pub/gtk/v1.2/${pkgname}-${pkgver}.tar.gz \ gcc340.patch aclocal-fixes.patch) -md5sums=('6fe30dad87c77b91b632def29dd69ef9' '877b3330e822a4be69a0f8a8c268cfd7'\ +md5sums=('6fe30dad87c77b91b632def29dd69ef9' + '877b3330e822a4be69a0f8a8c268cfd7' 'e52c4b88427b9785bb8049dbdc9ff6fb') -sha1sums=('e5a9361c594608d152d5d9650154c2e3260b87fa' 'a2cc224a66aeffdcac16ebd9e8af18143cf54918'\ - 'ae4438cf56c0c9264ee36f6973fb445f9a820be0') +sha1sums=('e5a9361c594608d152d5d9650154c2e3260b87fa' + 'a2cc224a66aeffdcac16ebd9e8af18143cf54918' + 'ae4438cf56c0c9264ee36f6973fb445f9a820be0') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ../gcc340.patch || return 1 - patch -Np0 -i ../aclocal-fixes.patch || return 1 + patch -Np1 -i ../gcc340.patch + patch -Np0 -i ../aclocal-fixes.patch - [ "$CARCH" = "x86_64" ] && CONFIGFLAG="--host=x86_64-unknown-linux-gnu --target=x86_64-unknown-linux-gnu" - ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info $CONFIGFLAG + [ "$CARCH" = 'x86_64' ] && CONFIGFLAG='--host=x86_64-unknown-linux-gnu --target=x86_64-unknown-linux-gnu' + ./configure --prefix=/usr --mandir=/usr/share/man \ + --infodir=/usr/share/info $CONFIGFLAG make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/glib/glib.install b/extra/glib/glib.install index 140fd2fe9..c0046feba 100644 --- a/extra/glib/glib.install +++ b/extra/glib/glib.install @@ -1,4 +1,4 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(glib.info.gz) post_install() { diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD index 945af2f09..476f7c22e 100644 --- a/extra/gnome-control-center/PKGBUILD +++ b/extra/gnome-control-center/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 124765 2011-05-24 09:14:06Z heftig $ +# $Id: PKGBUILD 134972 2011-08-09 17:45:09Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-control-center pkgver=3.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="The Control Center for GNOME" arch=('i686' 'x86_64') -depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop' 'krb5') -optdepends=('apg: adds password generation for user accounts') -makedepends=('gnome-doc-utils' 'intltool' 'networkmanager') +depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop') +optdepends=('mesa-demos-libre: provides glxinfo for graphics information' + 'apg: adds password generation for user accounts') +makedepends=('gnome-doc-utils' 'intltool' 'networkmanager' 'namcap') url="http://www.gnome.org" groups=('gnome') install=gnome-control-center.install @@ -22,6 +23,9 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --disable-scrollkeeper --disable-update-mimedb + + #https://bugzilla.gnome.org/show_bug.cgi?id=656229 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool make } diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD index 38617dc2e..08e91fcaf 100644 --- a/extra/gnome-settings-daemon/PKGBUILD +++ b/extra/gnome-settings-daemon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 124605 2011-05-23 10:48:57Z ibiru $ +# $Id: PKGBUILD 134977 2011-08-09 18:01:57Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-settings-daemon pkgver=3.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -24,6 +24,8 @@ build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/bin --disable-static --enable-pulse + #https://bugzilla.gnome.org/show_bug.cgi?id=656231 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make } diff --git a/extra/hylafax/PKGBUILD b/extra/hylafax/PKGBUILD index a5f794452..56881e4bb 100644 --- a/extra/hylafax/PKGBUILD +++ b/extra/hylafax/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 62528 2010-01-09 20:34:27Z tpowa $ +# $Id: PKGBUILD 134870 2011-08-08 08:29:49Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=hylafax -pkgver=6.0.4 +pkgver=6.0.5 pkgrel=1 pkgdesc="Fax Server" arch=('i686' 'x86_64' 'mips64el') @@ -10,12 +10,14 @@ license=('custom') depends=('libtiff' 'pam' 'ghostscript') makedepends=('smtp-server') url="http://www.hylafax.org/" -backup=(var/spool/hylafax/bin/{faxrcvd,notify} \ - usr/lib/fax/{faxcover.ps,hfaxd.conf,pagesizes,typerules} \ +backup=(var/spool/hylafax/bin/{faxrcvd,notify} + usr/lib/fax/{faxcover.ps,hfaxd.conf,pagesizes,typerules} var/spool/hylafax/etc/hosts.hfaxd) -source=(ftp://ftp.hylafax.org/source/${pkgname}-${pkgver}.tar.gz hylafax \ - hylafax.cron.daily config.local) -options=('!makeflags') +source=(ftp://ftp.hylafax.org/source/${pkgname}-${pkgver}.tar.gz + hylafax + hylafax.cron.daily + config.local + configure-6.0.5.patch) # build as root for successful build! build() { @@ -26,16 +28,22 @@ build() { useradd -u 10 -g uucp -d '/' -s /bin/false uucp &>/dev/null useradd -u 69 -g daemon -d '/' -s /bin/false fax &>/dev/null fi - mkdir -p $pkgdir/usr/{bin,lib/fax,sbin,share/ghostscript/fonts} || return 1 - mkdir -p $pkgdir/var/{spool/hylafax,lock} || return 1 - cd $srcdir/${pkgname}-${pkgver} || return 1 + mkdir -p $pkgdir/usr/{bin,lib/fax,sbin,share/ghostscript/fonts} + mkdir -p $pkgdir/var/{spool/hylafax,lock} + cd $srcdir/${pkgname}-${pkgver} - cp ../config.local . || return 1 - ./configure --nointeractive --with-OPTIMIZER="${CFLAGS}" || return 1 - make || return 1 - make ROOT=$pkgdir install || return 1 - install -D -m 755 $srcdir/hylafax $pkgdir/etc/rc.d/hylafax || return 1 - install -D -m 744 $srcdir/hylafax.cron.daily $pkgdir/etc/cron.daily/hylafax || return 1 + cp ../config.local . + # fix compiling + patch -Np0 -i ../configure-6.0.5.patch + ./configure --nointeractive --with-OPTIMIZER="${CFLAGS}" + make +} + +package () { + cd $srcdir/${pkgname}-${pkgver} + make ROOT=$pkgdir install + install -D -m 755 $srcdir/hylafax $pkgdir/etc/rc.d/hylafax + install -D -m 744 $srcdir/hylafax.cron.daily $pkgdir/etc/cron.daily/hylafax # remove group if created if [ $uucp_created -eq 1 ]; then userdel uucp &>/dev/null @@ -44,13 +52,14 @@ build() { fi # add missing awk file for notify-4.1 script install -D -m 755 $srcdir/${pkgname}-${pkgver}/util/notify.awk \ - $spkgdir/var/spool/hylafax/bin/notify.awk || return 1 + $spkgdir/var/spool/hylafax/bin/notify.awk # fix permission on /var/lock chmod 1777 $pkgdir/var/lock install -D -m644 COPYRIGHT $startdir/pkg/usr/share/licenses/$pkgname/COPYRIGHT } -md5sums=('6ba4bc3a47c9d2634de1b14f4ab34c80' +md5sums=('eb9ac942354ad708e20e4583cec6615f' '6602288a405324d8c8e3c5eac2bf19fd' '52beffe7dc296b4f9ce9fd0387f7804e' - '0d2ce24d918226a852539aebf57d3f4a') + '0d2ce24d918226a852539aebf57d3f4a' + '51d9f639bb76e5e39cdc8e2ac07e208d') diff --git a/extra/hylafax/configure-6.0.5.patch b/extra/hylafax/configure-6.0.5.patch new file mode 100644 index 000000000..e1f1126a5 --- /dev/null +++ b/extra/hylafax/configure-6.0.5.patch @@ -0,0 +1,11 @@ +--- configure.old 2011-08-08 10:19:37.619657223 +0200 ++++ configure 2011-08-08 10:20:26.422189170 +0200 +@@ -2882,7 +2882,7 @@ + echo '#define HAS_FCHMOD 1' + Note "... configure use of fchmod" + CheckFuncDecl fchmod 'extern int fchmod(int, mode_t);' \ +- unistd.h libc.h $OSFCNH sys/stat.h ++ unistd.h $OSFCNH sys/stat.h libc.h + } + CheckFuncDecl mknod 'extern int mknod(const char*, mode_t, dev_t);' \ + unistd.h sys/stat.h diff --git a/extra/hylafax/hylafax.install b/extra/hylafax/hylafax.install index d9d991e6b..bd97d42bd 100644 --- a/extra/hylafax/hylafax.install +++ b/extra/hylafax/hylafax.install @@ -42,8 +42,3 @@ pre_remove() { userdel fax &>/dev/null print_remove } - -op=$1 -shift - -$op $* diff --git a/extra/libogg/PKGBUILD b/extra/libogg/PKGBUILD index 5da319fdc..13274421d 100644 --- a/extra/libogg/PKGBUILD +++ b/extra/libogg/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 104973 2011-01-05 16:46:37Z heftig $ +# $Id: PKGBUILD 134991 2011-08-09 20:12:08Z eric $ # Maintainer: # Contributor: John Proctor <jproctor@prium.net> pkgname=libogg -pkgver=1.2.2 -pkgrel=1.1 +pkgver=1.3.0 +pkgrel=1 pkgdesc="Ogg bitstream and framing library" arch=('i686' 'x86_64' 'mips64el') url="http://www.xiph.org/ogg/" @@ -13,27 +13,26 @@ depends=('glibc') options=('!libtool') source=(http://downloads.xiph.org/releases/ogg/$pkgname-$pkgver.tar.xz config_types.h) -md5sums=('203c28a1d356b641253c960365e4cc48' +md5sums=('84a35715170f2cd4c77a4448772b95d5' 'a4d786b1b1955cb85b64fd16cbbee3f9') build() { - cd $srcdir/${pkgname}-${pkgver} - ./configure --prefix=/usr - make + cd "$srcdir/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make } package() { - cd $srcdir/${pkgname}-${pkgver} - make DESTDIR=$pkgdir install + cd "$srcdir/${pkgname}-${pkgver}" + make DESTDIR="$pkgdir" install - # install BSD license - install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \ - $pkgdir/usr/share/licenses/$pkgname/COPYING +# install BSD license + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" - # Resolve multilib conflict - if [[ $CARCH == "x86_64" ]]; then - mv "$pkgdir"/usr/include/ogg/config_types{,-64}.h - install -m 644 "$srcdir/config_types.h" \ - "${pkgdir}/usr/include/ogg/config_types.h" - fi +# Resolve multilib conflict + if [[ $CARCH == "x86_64" ]]; then + mv "$pkgdir"/usr/include/ogg/config_types{,-64}.h + install -m 644 "$srcdir/config_types.h" \ + "${pkgdir}/usr/include/ogg/config_types.h" + fi } diff --git a/extra/nedit/PKGBUILD b/extra/nedit/PKGBUILD index 4dca6ad0d..dbf451fa8 100644 --- a/extra/nedit/PKGBUILD +++ b/extra/nedit/PKGBUILD @@ -1,30 +1,38 @@ -# $Id: PKGBUILD 47944 2009-07-29 19:36:14Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> and Dale Blount <dale@archlinux.org> +# $Id: PKGBUILD 135019 2011-08-09 21:15:50Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=nedit pkgver=5.5 -pkgrel=5 +pkgrel=6 pkgdesc="A Unix text editor for programmers and general users" arch=('i686' 'x86_64' 'mips64el') url="http://www.nedit.org/" license=('GPL') depends=('lesstif' 'libxpm') -source=(http://www.nedit.org/ftp/v5_5/${pkgname}-${pkgver}-src.tar.bz2 nedit_xorg_composite_fix.patch) -md5sums=('48cb3dce52d44988f3a4d7c6f47b6bbe' 'ae1f56ae9b23163882051720ac52412d') -sha1sums=('7d3c87a793a5047cf857af1ac82e39f3b33e8a87' '1f6c75075a6bdc7b0dd8ca89d8117d68af8fc54e') +source=(http://www.nedit.org/ftp/v5_5/${pkgname}-${pkgver}-src.tar.bz2 + nedit_xorg_composite_fix.patch) +md5sums=('48cb3dce52d44988f3a4d7c6f47b6bbe' + 'ae1f56ae9b23163882051720ac52412d') +sha1sums=('7d3c87a793a5047cf857af1ac82e39f3b33e8a87' + '1f6c75075a6bdc7b0dd8ca89d8117d68af8fc54e') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < ../nedit_xorg_composite_fix.patch || return 1 - sed -i 's/-Wl,-Bstatic//' makefiles/Makefile.linux || return 1 - sed -i 's|fgets|//fgets|' util/check_lin_tif.c || return 1 - sed -i "s/CFLAGS=-O/CFLAGS=${CFLAGS} -DBUILD_UNTESTED_NEDIT/" makefiles/Makefile.linux || return 1 - sed -i 's|"/bin/csh"|"/bin/sh"|' source/preferences.c || return 1 + patch -p1 < ../nedit_xorg_composite_fix.patch + sed -i 's/-Wl,-Bstatic//' makefiles/Makefile.linux + sed -i 's|fgets|//fgets|' util/check_lin_tif.c + sed -i "s/CFLAGS=-O/CFLAGS=${CFLAGS} -DBUILD_UNTESTED_NEDIT/" makefiles/Makefile.linux + sed -i 's|"/bin/csh"|"/bin/sh"|' source/preferences.c - make linux || return 1 - install -D -m755 source/nedit "${pkgdir}/usr/bin/nedit" || return 1 - install -D -m755 source/nc "${pkgdir}/usr/bin/nedit-client" || return 1 - install -D -m644 doc/nedit.man "${pkgdir}/usr/share/man/man1/nedit.1" || return 1 - install -D -m644 doc/nc.man "${pkgdir}/usr/share/man/man1/nedit-client.1" || return 1 + make linux docs +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + install -Dm755 source/nedit "${pkgdir}/usr/bin/nedit" + install -Dm755 source/nc "${pkgdir}/usr/bin/nedit-client" + install -Dm644 doc/nedit.man "${pkgdir}/usr/share/man/man1/nedit.1" + install -Dm644 doc/nc.man "${pkgdir}/usr/share/man/man1/nedit-client.1" + install -Dm644 doc/nedit.html "${pkgdir}/usr/share/doc/nedit/nedit.html" } diff --git a/extra/qiv/PKGBUILD b/extra/qiv/PKGBUILD index affe7369a..94505ed1d 100644 --- a/extra/qiv/PKGBUILD +++ b/extra/qiv/PKGBUILD @@ -1,21 +1,25 @@ -# $Id: PKGBUILD 84750 2010-07-04 02:53:11Z angvp $ +# $Id: PKGBUILD 134996 2011-08-09 20:30:46Z eric $ # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: Paul Mattal <paul@archlinux.org> + pkgname=qiv -pkgver=2.2.3 -pkgrel=2 +pkgver=2.2.4 +pkgrel=1 pkgdesc="Quick Image Viewer (qiv) is a very small and fast GDK/Imlib image viewer" arch=('i686' 'x86_64' 'mips64el') +url="http://spiegl.de/qiv/" license=('GPL2') depends=('file' 'gtk2' 'imlib2') -makedepends=('pkgconfig') source=(http://spiegl.de/qiv/download/$pkgname-$pkgver.tgz) -url="http://spiegl.de/qiv/" -md5sums=('f692f665ad429f13c732156351420850') +md5sums=('1425f89c90f9c045858fccf24d894c97') build() { - cd $startdir/src/$pkgname-$pkgver || return 1 - make || return 1 - install -D -m 0755 qiv $startdir/pkg/usr/bin/qiv || return 1 - install -D -m 0644 qiv.1 $startdir/pkg/usr/share/man/man1/qiv.1 || return 1 + cd "$srcdir/$pkgname-$pkgver" + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + install -D -m 0755 qiv "$pkgdir/usr/bin/qiv" + install -D -m 0644 qiv.1 "$pkgdir/usr/share/man/man1/qiv.1" } diff --git a/extra/rubberband/PKGBUILD b/extra/rubberband/PKGBUILD index 5326396dc..f13c7c7e0 100644 --- a/extra/rubberband/PKGBUILD +++ b/extra/rubberband/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 86992 2010-08-08 20:57:26Z schiv $ -# Maintainer: Ray Rashif <schivmeister@gmail.com> +# $Id: PKGBUILD 135007 2011-08-09 21:02:54Z schiv $ +# Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Felipe Machado aka arch_audio <machado.felipe@gmail.com> pkgname=rubberband -pkgver=1.5.0 +pkgver=1.6.0 pkgrel=1 pkgdesc="Time-stretching and pitch-shifting audio library and utility" arch=('i686' 'x86_64' 'mips64el') @@ -11,12 +11,17 @@ url="http://www.breakfastquay.com/rubberband/" license=('GPL') depends=('libsamplerate' 'fftw' 'vamp-plugin-sdk') makedepends=('ladspa') -source=(http://code.breakfastquay.com/attachments/download/1/$pkgname-$pkgver.tar.bz2) -md5sums=('c5f288d644fcd46bd159e187bcc33f25') +source=("http://code.breakfastquay.com/attachments/download/16/$pkgname-$pkgver.tar.bz2" + 'gcc46.patch') +md5sums=('28e3dc1f5ae694d6846bcb0ef3d597fc' + '7c2f404975da6052f6b80eac12efbeb4') build() { cd "$srcdir/$pkgname-$pkgver" + # fix gcc 4.6 compatibility + patch -Np1 -i "$srcdir/gcc46.patch" + ./configure --prefix=/usr make } @@ -24,7 +29,7 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir/" install } # vim:set ts=2 sw=2 et: diff --git a/extra/rubberband/gcc46.patch b/extra/rubberband/gcc46.patch new file mode 100644 index 000000000..38ac76d42 --- /dev/null +++ b/extra/rubberband/gcc46.patch @@ -0,0 +1,10 @@ +--- rubberband-1.6.0.orig/rubberband/RubberBandStretcher.h ++++ rubberband-1.6.0/rubberband/RubberBandStretcher.h +@@ -21,6 +21,7 @@ + + #include <vector> + #include <map> ++#include <cstddef> + + /** + * @mainpage RubberBand diff --git a/extra/snd/PKGBUILD b/extra/snd/PKGBUILD index a86d3e9a0..0d4d21212 100644 --- a/extra/snd/PKGBUILD +++ b/extra/snd/PKGBUILD @@ -1,28 +1,40 @@ -# $Id: PKGBUILD 84807 2010-07-04 16:07:26Z eric $ -# Maintainer: Juergen Hoetzel <juergen@archlinux.org> +# $Id: PKGBUILD 135006 2011-08-09 21:00:16Z schiv $ +# Maintainer: Ray Rashif <schiv@archlinux.org> +# Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: dorphell <dorphell@archlinux.org> pkgname=snd -pkgver=11.6 +pkgver=12.3 pkgrel=1 pkgdesc="An advanced sound editor" arch=('i686' 'x86_64' 'mips64el') url="http://ccrma.stanford.edu/software/snd/" license=('custom') -depends=('lesstif' 'fam') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('a48bb692ecba320fe6aa2e00fd6d360b') -sha1sums=('383978c94a1f503e331f8f84b21df375fb208c27') +depends=('lesstif' 'jack' 'fam' 'gsl' 'fftw') +makedepends=('ladspa' 'wavpack' 'flac' 'speex' 'libxpm' + 'timidity++' 'mpg123' 'vorbis-tools' 'gmp') +optdepends=('ladspa' 'wavpack' 'flac' 'speex' + 'timidity++' 'mpg123' 'vorbis-tools') +source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('e1dab6945b9583f02aa6ae73d3780c98') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --without-gsl --without-fftw + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr \ + --with-alsa \ + --with-jack make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make prefix="${pkgdir}/usr" install - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" + cd "$srcdir/$pkgname-$pkgver" + + make prefix="$pkgdir/usr" install + + install -Dm644 COPYING \ + "$pkgdir/usr/share/licenses/$pkgname/COPYING" } + +# vim:set ts=2 sw=2 et: diff --git a/extra/tomcat-native/PKGBUILD b/extra/tomcat-native/PKGBUILD index 3686445e1..62e1d8555 100644 --- a/extra/tomcat-native/PKGBUILD +++ b/extra/tomcat-native/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua pkgname=tomcat-native -pkgver=1.1.20 -pkgrel=2 +pkgver=1.1.22 +pkgrel=1 pkgdesc="The Apache Tomcat Native Library" arch=('i686' 'x86_64') url="http://tomcat.apache.org/" @@ -11,7 +11,7 @@ license="Apache" 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') +md5sums=('44d764f8d99d0454c7337ba9701558ee') build() { cd "${srcdir}/tomcat-native-${pkgver}-src/jni/native" diff --git a/extra/vamp-plugin-sdk/PKGBUILD b/extra/vamp-plugin-sdk/PKGBUILD index 2474db6da..599b1c642 100644 --- a/extra/vamp-plugin-sdk/PKGBUILD +++ b/extra/vamp-plugin-sdk/PKGBUILD @@ -1,27 +1,24 @@ -# $Id: PKGBUILD 86992 2010-08-08 20:57:26Z schiv $ -# Maintainer: Ray Rashif <schivmeister@gmail.com> +# $Id: PKGBUILD 134888 2011-08-08 13:42:21Z schiv $ +# Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Orivej Desh <smpuj@bk.ru> pkgname=vamp-plugin-sdk -pkgver=2.1 +pkgver=2.2 pkgrel=1 -pkgdesc="The Vamp audio analysis plugin system" +pkgdesc="The Vamp audio analysis plug-in system" arch=('i686' 'x86_64' 'mips64el') url="http://www.vamp-plugins.org/" license=('BSD') depends=('gcc-libs' 'libsndfile') -#options=('!libtool') -source=(http://downloads.sourceforge.net/vamp/$pkgname-$pkgver.tar.gz - gcc44.patch) -md5sums=('13252077a73987dae72a9174e529b6b9' +options=('!libtool') +source=("http://downloads.sourceforge.net/vamp/$pkgname-$pkgver.tar.gz" + 'gcc44.patch') +md5sums=('037cdb83f20a331ff1fa07d54550c773' 'a07e3ef9c657a56cf2e8c4afc0ba1cec') build() { cd "$srcdir/$pkgname-$pkgver" - # gcc 4.4 compatibility - patch -Np1 -i ../gcc44.patch - ./configure --prefix=/usr make } @@ -29,7 +26,7 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir" install install -Dm644 COPYING \ "$pkgdir/usr/share/licenses/$pkgname/COPYING" diff --git a/extra/vcdimager/PKGBUILD b/extra/vcdimager/PKGBUILD index e3d114dbb..f824436cd 100644 --- a/extra/vcdimager/PKGBUILD +++ b/extra/vcdimager/PKGBUILD @@ -1,24 +1,32 @@ -# $Id: PKGBUILD 59898 2009-11-29 15:48:57Z jgc $ +# $Id: PKGBUILD 135066 2011-08-10 01:37:52Z eric $ # Maintainer: damir <damir@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=vcdimager -pkgver=0.7.23 -pkgrel=7 -pkgdesc="GNU VCDImager is a full-featured mastering suite for authoring disassembling and analyzing Video CD's and Super Video CD's" -arch=(i686 x86_64 'mips64el') -license=('GPL') +pkgver=0.7.24 +pkgrel=1 +pkgdesc="A full-featured mastering suite for authoring disassembling and analyzing Video CD's and Super Video CD's" +arch=('i686' 'x86_64' 'mips64el') url="http://www.vcdimager.org/" +license=('GPL') depends=('libcdio>=0.82' 'libxml2>=2.7.3' 'popt') options=('!libtool') install=vcdimager.install source=(ftp://ftp.gnu.org/gnu/vcdimager/${pkgname}-${pkgver}.tar.gz) -md5sums=('5e7d80fdbf0037ad20e438f2a9573253') +md5sums=('3af22978fd79c79d5fda6513b6811145') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --mandir=/usr/share/man --infodir=/usr/share/info || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/vcdimager/vcdimager.install b/extra/vcdimager/vcdimager.install index faa9748c2..79e07b5bc 100644 --- a/extra/vcdimager/vcdimager.install +++ b/extra/vcdimager/vcdimager.install @@ -1,7 +1,8 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(vcd-info.info.gz vcdimager.info.gz vcdxrip.info.gz) post_install() { + [[ -x usr/bin/install-info ]] || return 0 for file in ${filelist[@]}; do install-info $infodir/$file $infodir/dir 2> /dev/null done @@ -12,6 +13,7 @@ post_upgrade() { } pre_remove() { + [[ -x usr/bin/install-info ]] || return 0 for file in ${filelist[@]}; do install-info --delete $infodir/$file $infodir/dir 2> /dev/null done diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index d40dd9d01..7550063d1 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,29 +1,27 @@ -# $Id: PKGBUILD 130953 2011-07-09 08:01:22Z andyrtr $ +# $Id: PKGBUILD 134875 2011-08-08 08:40:10Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.10.3 -pkgrel=2 +pkgver=1.10.3.901 +pkgrel=1 arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org" -makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp') +makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto') options=('!libtool') source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 - #git-fixes.patch + randr-compare-all-the-bytes-in-rrpostpendingproperties.patch bg-none-revert.patch xserver-1.10-pointer-barriers.patch - xorg-redhat-die-ugly-pattern-die-die-die.patch autoconfig-nvidia.patch xvfb-run xvfb-run.1 10-quirks.conf) -sha1sums=('1699be5c0edeca553cfa3ee6caa228483465136b' - # '6dd2bcd9d8b17d1a50ed8c15eb1cba480558e695' +sha1sums=('c7b0d4a29adf91baeae4783841303ccf8ba285e2' + '571f2925f2f3d1b5cdbb2e5a676205fcea256198' '629c6d8d52126eab81ee1b72a9e4209535f8cb81' '1b95e91384a57d966428c7db98ed06f4cc562f91' - '0efcdf61bde3c0cd813072b94e2b30ab922775b9' 'f9328fd7bc931bb02c8909ecfcef35403de33782' 'c94f742d3f9cabf958ae58e4015d9dd185aabedc' '6838fc00ef4618c924a77e0fb03c05346080908a' @@ -31,18 +29,19 @@ sha1sums=('1699be5c0edeca553cfa3ee6caa228483465136b' build() { cd "${srcdir}/${pkgbase}-${pkgver}" + # Upstream post-release commit + patch -Np1 -i "${srcdir}/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch" - patch -Np1 -i "${srcdir}/vbe-fix-malloc-size-bug.patch" + # Add pointer barrier support, patch from Fedora + patch -Np1 -i "${srcdir}/xserver-1.10-pointer-barriers.patch" # Patches from ~ajax/xserver xserver-next branch patch -Np1 -i "${srcdir}/bg-none-revert.patch" - # Upstream fixes from 1.10 branch - #patch -Np1 -i "${srcdir}/git-fixes.patch" - # Use nouveau/nv/nvidia drivers for nvidia devices patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch" + autoreconf ./configure --prefix=/usr \ --enable-ipv6 \ --enable-dri \ @@ -66,10 +65,10 @@ build() { --localstatedir=/var \ --with-xkb-path=/usr/share/X11/xkb \ --with-xkb-output=/var/lib/xkb \ - --with-dri-driver-path=/usr/lib/xorg/modules/dri \ --with-fontrootdir=/usr/share/fonts make + # Disable subdirs for make install rule to make splitting easier sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \ -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \ -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \ @@ -88,7 +87,7 @@ package_xorg-server-common() { make -C xkb DESTDIR="${pkgdir}" install-data install -m755 -d "${pkgdir}/usr/share/man/man1" - install -m644 doc/Xserver.1 "${pkgdir}/usr/share/man/man1/" + install -m644 doc/man/Xserver.1 "${pkgdir}/usr/share/man/man1/" install -m755 -d "${pkgdir}/usr/lib/xorg" install -m644 dix/protocol.txt "${pkgdir}/usr/lib/xorg/" diff --git a/extra/xorg-server/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch b/extra/xorg-server/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch new file mode 100644 index 000000000..36d28ded0 --- /dev/null +++ b/extra/xorg-server/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch @@ -0,0 +1,36 @@ +From fa425363e3927e86d57f42c4b6e4995d26d6bd0c Mon Sep 17 00:00:00 2001 +From: Aaron Plattner <aplattner@nvidia.com> +Date: Fri, 29 Jul 2011 23:12:06 +0000 +Subject: randr: Compare all the bytes in RRPostPendingProperties + +RRPostPendingProperties tries to compare the pending and current +property values to decide whether they're actually changing. However, +it does this using a memcmp that passes in pending_value->size as the +number of bytes. This is actually the number of elements, where each +element is (pending_value->format / 8) bytes long. This causes the +pending value to not be propagated if the first pending_value->size +bytes are the same and only the end of it is changing. + +Fix this by computing the total number of bytes to compare in the +memcmp. + +Signed-off-by: Aaron Plattner <aplattner@nvidia.com> +Reviewed-by: Keith Packard <keithp@keithp.com> +Signed-off-by: Keith Packard <keithp@keithp.com> +(cherry picked from commit 08dfff92e8d0c2b1726634392c147f6634d1706d) +--- +diff --git a/randr/rrproperty.c b/randr/rrproperty.c +index ba04c16..61e7bb4 100644 +--- a/randr/rrproperty.c ++++ b/randr/rrproperty.c +@@ -283,7 +283,7 @@ RRPostPendingProperties (RROutputPtr output) + pending_value->format == current_value->format && + pending_value->size == current_value->size && + !memcmp (pending_value->data, current_value->data, +- pending_value->size)) ++ pending_value->size * (pending_value->format / 8))) + continue; + + if (RRChangeOutputProperty (output, property->propertyName, +-- +cgit v0.8.3-6-g21f6 diff --git a/staging/claws-mail/PKGBUILD b/staging/claws-mail/PKGBUILD new file mode 100644 index 000000000..b395a6177 --- /dev/null +++ b/staging/claws-mail/PKGBUILD @@ -0,0 +1,60 @@ +# $Id: PKGBUILD 134940 2011-08-09 15:03:29Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> + +pkgname=claws-mail +pkgver=3.7.9 +pkgrel=5 +pkgdesc="A GTK+ based e-mail client." +arch=('i686' 'x86_64') +license=('GPL3') +url="http://www.claws-mail.org" +depends=('gtk2' 'gnutls' 'startup-notification' 'pilot-link' 'enchant' + 'gpgme' 'libetpan' 'libsm' 'db' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils') +makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind') +optdepends=('python2: needed for some tools' + 'perl: needed for some tools' + 'spamassassin: adds support for spamfiltering' + 'bogofilter: adds support for spamfiltering' + 'html2ps: AUR pkg - adds support for printing html mails together with html plugins') +replaces=('sylpheed-claws') +provides=('claws') +options=(!libtool) +install=claws-mail.install +source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2 + claws-notify-crash.patch) +md5sums=('2f9d2dcabf84e312cfeb56efa799b5b3' + '9a2903449f679344b5f5f51c91825b45') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + patch -Np0 -i $srcdir/claws-notify-crash.patch + sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py + + ./configure --prefix=/usr --disable-static \ + --enable-enchant \ + --enable-gnutls \ + --enable-ldap \ + --disable-dillo-viewer-plugin \ + --enable-crash-dialog \ + --enable-pgpmime-plugin \ + --enable-spamassassin-plugin \ + --enable-bogofilter-plugin \ + --enable-jpilot + + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + + # build and install extra tools + cd tools + make + # all executables and .conf files ; only top directory + find -maxdepth 1 -type f -and -perm /111 -or -name '*.conf' | while read i ; do + install -D -m755 ${i} \ + ${pkgdir}/usr/lib/claws-mail/tools/${i} + done +} diff --git a/staging/claws-mail/claws-mail.install b/staging/claws-mail/claws-mail.install new file mode 100644 index 000000000..648480c3b --- /dev/null +++ b/staging/claws-mail/claws-mail.install @@ -0,0 +1,13 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + diff --git a/staging/claws-mail/claws-notify-crash.patch b/staging/claws-mail/claws-notify-crash.patch new file mode 100644 index 000000000..e1d4eb686 --- /dev/null +++ b/staging/claws-mail/claws-notify-crash.patch @@ -0,0 +1,18 @@ +Index: src/main.c +=================================================================== +RCS file: //claws/src/main.c,v +retrieving revision 1.115.2.237 +retrieving revision 1.115.2.238 +diff -u -r1.115.2.237 -r1.115.2.238 +--- src/main.c 10 Apr 2011 17:19:04 -0000 1.115.2.237 ++++ src/main.c 30 Apr 2011 19:27:15 -0000 1.115.2.238 +@@ -331,7 +331,7 @@ + gtk_widget_show(hack); + } + +- xdisplay = gdk_display_get_default(); ++ xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default()); + sn_display = sn_display_new(xdisplay, + sn_error_trap_push, + sn_error_trap_pop); + diff --git a/staging/cups/PKGBUILD b/staging/cups/PKGBUILD new file mode 100644 index 000000000..628600839 --- /dev/null +++ b/staging/cups/PKGBUILD @@ -0,0 +1,148 @@ +# $Id: PKGBUILD 134929 2011-08-09 13:34:46Z ibiru $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> + +pkgbase="cups" +pkgname=('libcups' 'cups') +pkgver=1.4.8 +pkgrel=2 +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.cups.org/" +makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'poppler>=0.12.3' + 'xinetd' 'gzip' 'autoconf' 'php' 'libusb-compat' 'dbus-core' 'avahi' 'hicolor-icon-theme') +source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 + cups-avahi.patch + cups-no-export-ssllibs.patch + cups-no-gcrypt.patch + cups cups.logrotate cups.pam) +#options=('!emptydirs') +md5sums=('0ec52d3f3c69bc2ab5ed70c594edbce6' + '8ebd390197501ffd709f0ee546937fd5' + '9b8467a1e51d360096b70e2c3c081e6c' + 'c9ede95cfc8e76571bd8156f0a573e3b' + '9657daa21760bb0b5fa3d8b51d5e01a1' + 'f861b18f4446c43918c8643dcbbd7f6d' + '96f82c38f3f540b53f3e5144900acf17') + +# move client.conf man page for next update to the client pkg. + +build() { + cd ${srcdir}/${pkgbase}-${pkgver} + # Avahi support in the dnssd backend. patch from Fedora + patch -Np1 -i ${srcdir}/cups-avahi.patch + + # Do not export SSL libs in cups-config + patch -Np1 -i "${srcdir}/cups-no-export-ssllibs.patch" + + patch -Np1 -i "${srcdir}/cups-no-gcrypt.patch" + + # Rebuild configure script for --enable-avahi. + aclocal -I config-scripts + autoconf -I config-scripts + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libdir=/usr/lib \ + --with-logdir=/var/log/cups \ + --with-docdir=/usr/share/cups/doc \ + --with-cups-user=daemon \ + --with-cups-group=lp \ + --enable-pam=yes \ + --disable-ldap \ + --enable-raw-printing \ + --enable-dbus --with-dbusdir=/etc/dbus-1 \ + --enable-ssl=yes --enable-gnutls \ + --disable-threads \ + --enable-avahi\ + --with-php=/usr/bin/php-cgi \ + --with-pdftops=pdftops \ + --with-optim="$CFLAGS" + + #reminder + #Restored support for GNU TLS and OpenSSL with threading enabled (STR #3605) in cups 1.5b1 + + make +} + +check() { + cd "$srcdir/$pkgbase-$pkgver" + #httpAddrGetList(workstation64): FAIL + #1 TESTS FAILED! + #make[1]: *** [testhttp] Error 1 + make -k check || /bin/true +} + +package_libcups() { +pkgdesc="The CUPS Printing System - client libraries and headers" +depends=('gnutls>=2.8.3' 'libtiff>=3.9.2-2' 'libpng>=1.4.0' 'krb5' 'avahi') + + cd ${srcdir}/${pkgbase}-${pkgver} + make BUILDROOT=${pkgdir} install-headers install-libs + # put this into the libs pkg to make other software find the libs(no pkg-config file included) + mkdir -p ${pkgdir}/usr/bin + install -m755 ${srcdir}/${pkgbase}-${pkgver}/cups-config ${pkgdir}/usr/bin/cups-config +} + +package_cups() { +pkgdesc="The CUPS Printing System - deamon package" +install=cups.install +backup=(etc/cups/cupsd.conf + etc/cups/mime.convs + etc/cups/mime.types + etc/cups/snmp.conf + etc/cups/printers.conf + etc/cups/classes.conf + etc/cups/client.conf + etc/cups/subscriptions.conf + etc/dbus-1/system.d/cups.conf + etc/logrotate.d/cups + etc/pam.d/cups + etc/xinetd.d/cups-lpd) +depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'poppler>=0.12.3' 'libusb-compat' 'dbus-core' 'hicolor-icon-theme') +optdepends=('php: for included phpcups.so module' + 'ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images' + 'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly' + 'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly' + 'foomatic-db-nonfree: drivers use Ghostscript to convert PostScript to a printable form directly' + 'xdg-utils: xdg .desktop file support') + + cd ${srcdir}/${pkgbase}-${pkgver} + make BUILDROOT=${pkgdir} install-data install-exec + + # this one we ship in the libcups pkg + rm -f ${pkgdir}/usr/bin/cups-config + + # kill the sysv stuff + rm -rf ${pkgdir}/etc/rc*.d + rm -rf ${pkgdir}/etc/init.d + install -D -m755 ../cups ${pkgdir}/etc/rc.d/cupsd + install -D -m644 ../cups.logrotate ${pkgdir}/etc/logrotate.d/cups + install -D -m644 ../cups.pam ${pkgdir}/etc/pam.d/cups + + # fix perms on /var/spool and /etc + chmod 755 ${pkgdir}/var/spool + chmod 755 ${pkgdir}/etc + + # serial backend needs to run as root (http://bugs.archlinux.org/task/20396) + chmod 700 ${pkgdir}/usr/lib/cups/backend/serial + + # install ssl directory where to store the certs, solves some samba issues + install -dm700 -g lp ${pkgdir}/etc/cups/ssl + # remove directory from package, we create it in cups rc.d file + rm -rf ${pkgdir}/var/run +# install -dm511 -g lp ${pkgdir}/var/run/cups/certs + + # install some more configuration files that will get filled by cupsd + touch ${pkgdir}/etc/cups/printers.conf + touch ${pkgdir}/etc/cups/classes.conf + touch ${pkgdir}/etc/cups/client.conf + echo "# see 'man client.conf'" >> ${pkgdir}/etc/cups/client.conf + echo "ServerName /var/run/cups/cups.sock # alternative: ServerName hostname-or-ip-address[:port] of a remote server" >> ${pkgdir}/etc/cups/client.conf + touch ${pkgdir}/etc/cups/subscriptions.conf + chgrp lp ${pkgdir}/etc/cups/{printers.conf,classes.conf,client.conf,subscriptions.conf} + + # fix .desktop file + sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' ${pkgdir}/usr/share/applications/cups.desktop + + # compress some driver files, adopted from Fedora + find ${pkgdir}/usr/share/cups/model -name "*.ppd" | xargs gzip -n9f +} diff --git a/staging/cups/cups b/staging/cups/cups new file mode 100755 index 000000000..744c8e663 --- /dev/null +++ b/staging/cups/cups @@ -0,0 +1,68 @@ +#!/bin/bash + +daemon_name=cupsd + +. /etc/rc.conf +. /etc/rc.d/functions +#. /etc/conf.d/$daemon_name.conf + +get_pid() { + pidof -o %PPID $daemon_name +} + +case "$1" in + start) + stat_busy "Starting $daemon_name daemon" + + PID=$(get_pid) + if [ -z "$PID" ]; then + [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid + # RUN + $daemon_name + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + echo $(get_pid) > /var/run/$daemon_name.pid + add_daemon $daemon_name + stat_done + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping $daemon_name daemon" + PID=$(get_pid) + # KILL + [ ! -z "$PID" ] && kill $PID &> /dev/null + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm -f /var/run/$daemon_name.pid &> /dev/null + rm_daemon $daemon_name + stat_done + fi + ;; + + restart) + $0 stop + sleep 3 + $0 start + ;; + + status) + stat_busy "Checking $daemon_name status"; + ck_status $daemon_name + ;; + + *) + echo "usage: $0 {start|stop|restart|status}" +esac + +exit 0 diff --git a/staging/cups/cups-avahi.patch b/staging/cups/cups-avahi.patch new file mode 100644 index 000000000..cf1056a75 --- /dev/null +++ b/staging/cups/cups-avahi.patch @@ -0,0 +1,1089 @@ +diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c +--- cups-1.4.5/backend/dnssd.c.avahi 2009-08-08 00:27:12.000000000 +0200 ++++ cups-1.4.5/backend/dnssd.c 2010-11-12 13:13:31.000000000 +0100 +@@ -22,6 +22,7 @@ + * exec_backend() - Execute the backend that corresponds to the + * resolved service name. + * get_device() - Create or update a device. ++* find_device() + * query_callback() - Process query data. + * sigterm_handler() - Handle termination signals... + * unquote() - Unquote a name string. +@@ -33,7 +34,18 @@ + + #include "backend-private.h" + #include <cups/array.h> +-#include <dns_sd.h> ++#ifdef HAVE_DNSSD ++# include <dns_sd.h> ++#endif /* HAVE_DNSSD */ ++#ifdef HAVE_AVAHI ++# include <avahi-client/client.h> ++# include <avahi-client/lookup.h> ++# include <avahi-common/simple-watch.h> ++# include <avahi-common/domain.h> ++# include <avahi-common/error.h> ++# include <avahi-common/malloc.h> ++#define kDNSServiceMaxDomainName AVAHI_DOMAIN_NAME_MAX ++#endif /* HAVE_AVAHI */ + + + /* +@@ -52,7 +64,12 @@ typedef enum + + typedef struct + { ++#ifdef HAVE_DNSSD + DNSServiceRef ref; /* Service reference for resolve */ ++#endif /* HAVE_DNSSD */ ++#ifdef HAVE_AVAHI ++ int resolved; /* Did we resolve the device? */ ++#endif /* HAVE_AVAHI */ + char *name, /* Service name */ + *domain, /* Domain name */ + *fullName, /* Full name */ +@@ -64,6 +81,20 @@ typedef struct + sent; /* Did we list the device? */ + } cups_device_t; + ++typedef struct ++{ ++ char key[256]; ++ char value[256]; ++ ++#ifdef HAVE_DNSSD ++ const uint8_t *data; ++ const uint8_t *datanext; ++ const uint8_t *dataend; ++#else /* HAVE_AVAHI */ ++ AvahiStringList *txt; ++#endif /* HAVE_DNSSD */ ++} cups_txt_records_t; ++ + + /* + * Local globals... +@@ -77,6 +108,7 @@ static int job_canceled = 0; + * Local functions... + */ + ++#ifdef HAVE_DNSSD + static void browse_callback(DNSServiceRef sdRef, + DNSServiceFlags flags, + uint32_t interfaceIndex, +@@ -92,12 +124,6 @@ static void browse_local_callback(DNSSe + const char *regtype, + const char *replyDomain, + void *context); +-static int compare_devices(cups_device_t *a, cups_device_t *b); +-static void exec_backend(char **argv); +-static cups_device_t *get_device(cups_array_t *devices, +- const char *serviceName, +- const char *regtype, +- const char *replyDomain); + static void query_callback(DNSServiceRef sdRef, + DNSServiceFlags flags, + uint32_t interfaceIndex, +@@ -106,9 +132,111 @@ static void query_callback(DNSServiceRe + uint16_t rrclass, uint16_t rdlen, + const void *rdata, uint32_t ttl, + void *context); ++#endif /* HAVE_DNSSD */ ++#ifdef HAVE_AVAHI ++static void avahi_client_callback (AvahiClient *client, ++ AvahiClientState state, ++ void *context); ++static void avahi_browse_callback (AvahiServiceBrowser *browser, ++ AvahiIfIndex interface, ++ AvahiProtocol protocol, ++ AvahiBrowserEvent event, ++ const char *serviceName, ++ const char *regtype, ++ const char *replyDomain, ++ AvahiLookupResultFlags flags, ++ void *context); ++#endif /* HAVE_AVAHI */ ++ ++static cups_device_t * find_device (cups_array_t *devices, ++ cups_txt_records_t *txt, ++ cups_device_t *dkey); ++static int compare_devices(cups_device_t *a, cups_device_t *b); ++static void exec_backend(char **argv); ++static cups_device_t *get_device(cups_array_t *devices, ++ const char *serviceName, ++ const char *regtype, ++ const char *replyDomain); + static void sigterm_handler(int sig); + static void unquote(char *dst, const char *src, size_t dstsize); + ++#ifdef HAVE_AVAHI ++static AvahiSimplePoll *simple_poll = NULL; ++static int avahi_got_callback; ++#endif /* HAVE_AVAHI */ ++ ++ ++/* ++ * cups_txt_records_t access functions ++ */ ++static cups_txt_records_t * ++next_txt_record (cups_txt_records_t *txt) ++{ ++#ifdef HAVE_DNSSD ++ txt->data = txt->datanext; ++#else /* HAVE_AVAHI */ ++ txt->txt = avahi_string_list_get_next (txt->txt); ++ if (txt->txt == NULL) ++ return NULL; ++#endif /* HAVE_DNSSD */ ++ ++ return txt; ++} ++ ++static int ++parse_txt_record_pair (cups_txt_records_t *txt) ++{ ++#ifdef HAVE_DNSSD ++ uint8_t datalen; ++ uint8_t *data = txt->data; ++ char *ptr; ++ ++ /* ++ * Read a key/value pair starting with an 8-bit length. Since the ++ * length is 8 bits and the size of the key/value buffers is 256, we ++ * don't need to check for overflow... ++ */ ++ ++ datalen = *data++; ++ if (!datalen || (data + datalen) >= txt->dataend) ++ return NULL; ++ txt->datanext = data + datalen; ++ ++ for (ptr = txt->key; data < txt->datanext && *data != '='; data ++) ++ *ptr++ = *data; ++ *ptr = '\0'; ++ ++ if (data < txt->datanext && *data == '=') ++ { ++ data++; ++ ++ if (data < datanext) ++ memcpy (txt->value, data, txt->datanext - data); ++ value[txt->datanext - data] = '\0'; ++ } ++ else ++ return 1; ++#else /* HAVE_AVAHI */ ++ char *key, *value; ++ size_t len; ++ avahi_string_list_get_pair (txt->txt, &key, &value, &len); ++ if (len > sizeof (txt->value) - 1) ++ len = sizeof (txt->value) - 1; ++ ++ memcpy (txt->value, value, len); ++ txt->value[len] = '\0'; ++ len = strlen (key); ++ if (len > sizeof (txt->key) - 1) ++ len = sizeof (txt->key) - 1; ++ ++ memcpy (txt->key, key, len); ++ txt->key[len] = '\0'; ++ avahi_free (key); ++ avahi_free (value); ++#endif /* HAVE_AVAHI */ ++ ++ return 0; ++} + + /* + * 'main()' - Browse for printers. +@@ -119,6 +247,13 @@ main(int argc, /* I - Number of comm + char *argv[]) /* I - Command-line arguments */ + { + const char *name; /* Backend name */ ++ cups_array_t *devices; /* Device array */ ++ cups_device_t *device; /* Current device */ ++ char uriName[1024]; /* Unquoted fullName for URI */ ++#ifdef HAVE_DNSSD ++ int fd; /* Main file descriptor */ ++ fd_set input; /* Input set for select() */ ++ struct timeval timeout; /* Timeout for select() */ + DNSServiceRef main_ref, /* Main service reference */ + fax_ipp_ref, /* IPP fax service reference */ + ipp_ref, /* IPP service reference */ +@@ -130,12 +265,11 @@ main(int argc, /* I - Number of comm + pdl_datastream_ref, /* AppSocket service reference */ + printer_ref, /* LPD service reference */ + riousbprint_ref; /* Remote IO service reference */ +- int fd; /* Main file descriptor */ +- fd_set input; /* Input set for select() */ +- struct timeval timeout; /* Timeout for select() */ +- cups_array_t *devices; /* Device array */ +- cups_device_t *device; /* Current device */ +- char uriName[1024]; /* Unquoted fullName for URI */ ++#endif /* HAVE_DNSSD */ ++#ifdef HAVE_AVAHI ++ AvahiClient *client; ++ int error; ++#endif /* HAVE_AVAHI */ + #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET) + struct sigaction action; /* Actions for POSIX signals */ + #endif /* HAVE_SIGACTION && !HAVE_SIGSET */ +@@ -194,6 +328,49 @@ main(int argc, /* I - Number of comm + * Browse for different kinds of printers... + */ + ++#ifdef HAVE_AVAHI ++ if ((simple_poll = avahi_simple_poll_new ()) == NULL) ++ { ++ perror ("ERROR: Unable to create avahi simple poll object"); ++ return (1); ++ } ++ ++ client = avahi_client_new (avahi_simple_poll_get (simple_poll), ++ 0, avahi_client_callback, NULL, &error); ++ if (!client) ++ { ++ perror ("ERROR: Unable to create avahi client"); ++ return (1); ++ } ++ ++ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, ++ AVAHI_PROTO_UNSPEC, ++ "_fax-ipp._tcp", NULL, 0, ++ avahi_browse_callback, devices); ++ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, ++ AVAHI_PROTO_UNSPEC, ++ "_ipp._tcp", NULL, 0, ++ avahi_browse_callback, devices); ++ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, ++ AVAHI_PROTO_UNSPEC, ++ "_ipp-tls._tcp", NULL, 0, ++ avahi_browse_callback, devices); ++ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, ++ AVAHI_PROTO_UNSPEC, ++ "_pdl-datastream._tcp", ++ NULL, 0, ++ avahi_browse_callback, ++ devices); ++ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, ++ AVAHI_PROTO_UNSPEC, ++ "_printer._tcp", NULL, 0, ++ avahi_browse_callback, devices); ++ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, ++ AVAHI_PROTO_UNSPEC, ++ "_riousbprint._tcp", NULL, 0, ++ avahi_browse_callback, devices); ++#endif /* HAVE_AVAHI */ ++#ifdef HAVE_DNSSD + if (DNSServiceCreateConnection(&main_ref) != kDNSServiceErr_NoError) + { + perror("ERROR: Unable to create service connection"); +@@ -245,6 +422,7 @@ main(int argc, /* I - Number of comm + riousbprint_ref = main_ref; + DNSServiceBrowse(&riousbprint_ref, kDNSServiceFlagsShareConnection, 0, + "_riousbprint._tcp", NULL, browse_callback, devices); ++#endif /* HAVE_DNSSD */ + + /* + * Loop until we are killed... +@@ -252,6 +430,9 @@ main(int argc, /* I - Number of comm + + while (!job_canceled) + { ++ int announce = 0; ++ ++#ifdef HAVE_DNSSD + FD_ZERO(&input); + FD_SET(fd, &input); + +@@ -271,11 +452,35 @@ main(int argc, /* I - Number of comm + } + else + { ++ announce = 1; ++ } ++#else /* HAVE_AVAHI */ ++ int r; ++ avahi_got_callback = 0; ++ r = avahi_simple_poll_iterate (simple_poll, 1); ++ if (r != 0 && r != EINTR) ++ { ++ /* ++ * We've been told to exit the loop. Perhaps the connection to ++ * avahi failed. ++ */ ++ ++ break; ++ } ++ ++ if (avahi_got_callback) ++ announce = 1; ++#endif /* HAVE_DNSSD */ ++ ++ if (announce) ++ { + /* + * Announce any devices we've found... + */ + ++#ifdef HAVE_DNSSD + DNSServiceErrorType status; /* DNS query status */ ++#endif /* HAVE_DNSSD */ + cups_device_t *best; /* Best matching device */ + char device_uri[1024]; /* Device URI */ + int count; /* Number of queries */ +@@ -285,6 +490,7 @@ main(int argc, /* I - Number of comm + best = NULL, count = 0; + device; + device = (cups_device_t *)cupsArrayNext(devices)) ++#ifdef HAVE_DNSSD + if (!device->ref && !device->sent) + { + /* +@@ -313,14 +519,23 @@ main(int argc, /* I - Number of comm + count ++; + } + } +- else if (!device->sent) ++ else ++#endif /* HAVE_DNSSD */ ++#ifdef HAVE_AVAHI ++ if (!device->resolved) ++ continue; ++ else ++#endif /* HAVE_AVAHI */ ++ if (!device->sent) + { ++#ifdef HAVE_DNSSD + /* + * Got the TXT records, now report the device... + */ + + DNSServiceRefDeallocate(device->ref); + device->ref = 0; ++#endif /* HAVE_DNSSD */ + + if (!best) + best = device; +@@ -372,6 +587,7 @@ main(int argc, /* I - Number of comm + * 'browse_callback()' - Browse devices. + */ + ++#ifdef HAVE_DNSSD + static void + browse_callback( + DNSServiceRef sdRef, /* I - Service reference */ +@@ -405,12 +621,14 @@ browse_callback( + + get_device((cups_array_t *)context, serviceName, regtype, replyDomain); + } ++#endif /* HAVE_DNSSD */ + + + /* + * 'browse_local_callback()' - Browse local devices. + */ + ++#ifdef HAVE_DNSSD + static void + browse_local_callback( + DNSServiceRef sdRef, /* I - Service reference */ +@@ -456,6 +674,7 @@ browse_local_callback( + device->fullName); + device->sent = 1; + } ++#endif /* HAVE_DNSSD */ + + + /* +@@ -528,6 +747,32 @@ exec_backend(char **argv) /* I - Comman + exit(CUPS_BACKEND_STOP); + } + ++static int ++device_type (const char *regtype) ++{ ++#ifdef HAVE_AVAHI ++ if (!strcmp(regtype, "_ipp._tcp") || ++ !strcmp(regtype, "_ipp-tls._tcp")) ++ return (CUPS_DEVICE_IPP); ++ else if (!strcmp(regtype, "_fax-ipp._tcp")) ++ return (CUPS_DEVICE_FAX_IPP); ++ else if (!strcmp(regtype, "_printer._tcp")) ++ return (CUPS_DEVICE_PDL_DATASTREAM); ++#else ++ if (!strcmp(regtype, "_ipp._tcp.") || ++ !strcmp(regtype, "_ipp-tls._tcp.")) ++ return (CUPS_DEVICE_IPP); ++ else if (!strcmp(regtype, "_fax-ipp._tcp.")) ++ return (CUPS_DEVICE_FAX_IPP); ++ else if (!strcmp(regtype, "_printer._tcp.")) ++ return (CUPS_DEVICE_PRINTER); ++ else if (!strcmp(regtype, "_pdl-datastream._tcp.")) ++ return (CUPS_DEVICE_PDL_DATASTREAM); ++#endif /* HAVE_AVAHI */ ++ ++ return (CUPS_DEVICE_RIOUSBPRINT); ++} ++ + + /* + * 'get_device()' - Create or update a device. +@@ -550,18 +795,7 @@ get_device(cups_array_t *devices, /* I - + */ + + key.name = (char *)serviceName; +- +- if (!strcmp(regtype, "_ipp._tcp.") || +- !strcmp(regtype, "_ipp-tls._tcp.")) +- key.type = CUPS_DEVICE_IPP; +- else if (!strcmp(regtype, "_fax-ipp._tcp.")) +- key.type = CUPS_DEVICE_FAX_IPP; +- else if (!strcmp(regtype, "_printer._tcp.")) +- key.type = CUPS_DEVICE_PRINTER; +- else if (!strcmp(regtype, "_pdl-datastream._tcp.")) +- key.type = CUPS_DEVICE_PDL_DATASTREAM; +- else +- key.type = CUPS_DEVICE_RIOUSBPRINT; ++ key.type = device_type (regtype); + + for (device = cupsArrayFind(devices, &key); + device; +@@ -581,8 +815,14 @@ get_device(cups_array_t *devices, /* I - + free(device->domain); + device->domain = strdup(replyDomain); + ++#ifdef HAVE_DNSSD + DNSServiceConstructFullName(fullName, device->name, regtype, + replyDomain); ++#else /* HAVE_AVAHI */ ++ avahi_service_name_join (fullName, kDNSServiceMaxDomainName, ++ serviceName, regtype, replyDomain); ++#endif /* HAVE_DNSSD */ ++ + free(device->fullName); + device->fullName = strdup(fullName); + } +@@ -602,6 +842,9 @@ get_device(cups_array_t *devices, /* I - + device->domain = strdup(replyDomain); + device->type = key.type; + device->priority = 50; ++#ifdef HAVE_AVAHI ++ device->resolved = 0; ++#endif /* HAVE_AVAHI */ + + cupsArrayAdd(devices, device); + +@@ -609,7 +852,13 @@ get_device(cups_array_t *devices, /* I - + * Set the "full name" of this service, which is used for queries... + */ + ++#ifdef HAVE_DNSSD + DNSServiceConstructFullName(fullName, serviceName, regtype, replyDomain); ++#else /* HAVE_AVAHI */ ++ avahi_service_name_join (fullName, kDNSServiceMaxDomainName, ++ serviceName, regtype, replyDomain); ++#endif /* HAVE_DNSSD */ ++ + device->fullName = strdup(fullName); + + return (device); +@@ -620,6 +869,7 @@ get_device(cups_array_t *devices, /* I - + * 'query_callback()' - Process query data. + */ + ++#ifdef HAVE_DNSSD + static void + query_callback( + DNSServiceRef sdRef, /* I - Service reference */ +@@ -639,7 +889,7 @@ query_callback( + *ptr; /* Pointer into string */ + cups_device_t dkey, /* Search key */ + *device; /* Device */ +- ++ cups_txt_records_t txt; + + fprintf(stderr, "DEBUG2: query_callback(sdRef=%p, flags=%x, " + "interfaceIndex=%d, errorCode=%d, fullName=\"%s\", " +@@ -673,84 +923,212 @@ query_callback( + if ((ptr = strstr(name, "._")) != NULL) + *ptr = '\0'; + +- if (strstr(fullName, "_ipp._tcp.") || +- strstr(fullName, "_ipp-tls._tcp.")) +- dkey.type = CUPS_DEVICE_IPP; +- else if (strstr(fullName, "_fax-ipp._tcp.")) +- dkey.type = CUPS_DEVICE_FAX_IPP; +- else if (strstr(fullName, "_printer._tcp.")) +- dkey.type = CUPS_DEVICE_PRINTER; +- else if (strstr(fullName, "_pdl-datastream._tcp.")) +- dkey.type = CUPS_DEVICE_PDL_DATASTREAM; ++ dkey.type = device_type (fullName); ++ ++ txt.data = rdata; ++ txt.dataend = rdata + rdlen; ++ device = find_device ((cups_array_t *) context, &txt, &dkey); ++ if (!device) ++ fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName); ++} ++#endif /* HAVE_DNSSD */ ++ ++#ifdef HAVE_AVAHI ++static void ++avahi_client_callback(AvahiClient *client, ++ AvahiClientState state, ++ void *context) ++{ ++ /* ++ * If the connection drops, quit. ++ */ ++ ++ if (state == AVAHI_CLIENT_FAILURE) ++ { ++ fprintf (stderr, "ERROR: Avahi connection failed\n"); ++ avahi_simple_poll_quit (simple_poll); ++ } ++} ++ ++static void ++avahi_query_callback(AvahiServiceResolver *resolver, ++ AvahiIfIndex interface, ++ AvahiProtocol protocol, ++ AvahiResolverEvent event, ++ const char *name, ++ const char *type, ++ const char *domain, ++ const char *host_name, ++ const AvahiAddress *address, ++ uint16_t port, ++ AvahiStringList *txt, ++ AvahiLookupResultFlags flags, ++ void *context) ++{ ++ AvahiClient *client; ++ cups_device_t key, ++ *device; ++ char uqname[1024], ++ *ptr; ++ cups_txt_records_t txtr; ++ ++ client = avahi_service_resolver_get_client (resolver); ++ if (event != AVAHI_RESOLVER_FOUND) ++ { ++ if (event == AVAHI_RESOLVER_FAILURE) ++ { ++ fprintf (stderr, "ERROR: %s\n", ++ avahi_strerror (avahi_client_errno (client))); ++ } ++ ++ avahi_service_resolver_free (resolver); ++ return; ++ } ++ ++ /* ++ * Set search key for device. ++ */ ++ ++ key.name = uqname; ++ unquote (uqname, name, sizeof (uqname)); ++ if ((ptr = strstr(name, "._")) != NULL) ++ *ptr = '\0'; ++ ++ key.domain = (char *) domain; ++ key.type = device_type (type); ++ ++ /* ++ * Find the device and the the TXT information. ++ */ ++ ++ txtr.txt = txt; ++ device = find_device ((cups_array_t *) context, &txtr, &key); ++ if (device) ++ { ++ /* ++ * Let the main loop know to announce the device. ++ */ ++ ++ device->resolved = 1; ++ avahi_got_callback = 1; ++ } + else +- dkey.type = CUPS_DEVICE_RIOUSBPRINT; ++ fprintf (stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", name); ++ ++ avahi_service_resolver_free (resolver); ++} ++ ++static void ++avahi_browse_callback(AvahiServiceBrowser *browser, ++ AvahiIfIndex interface, ++ AvahiProtocol protocol, ++ AvahiBrowserEvent event, ++ const char *name, ++ const char *type, ++ const char *domain, ++ AvahiLookupResultFlags flags, ++ void *context) ++{ ++ AvahiClient *client = avahi_service_browser_get_client (browser); ++ ++ switch (event) ++ { ++ case AVAHI_BROWSER_FAILURE: ++ fprintf (stderr, "ERROR: %s\n", ++ avahi_strerror (avahi_client_errno (client))); ++ avahi_simple_poll_quit (simple_poll); ++ return; ++ ++ case AVAHI_BROWSER_NEW: ++ /* ++ * This object is new on the network. ++ */ ++ ++ if (flags & AVAHI_LOOKUP_RESULT_LOCAL) ++ { ++ /* ++ * This comes from the local machine so ignore it. ++ */ ++ ++ fprintf (stderr, "DEBUG: ignoring local service %s\n", name); ++ } ++ else ++ { ++ /* ++ * Create a device entry for it if it doesn't yet exist. ++ */ ++ ++ get_device ((cups_array_t *)context, name, type, domain); ++ ++ /* ++ * Now look for a TXT entry. ++ */ ++ ++ if (avahi_service_resolver_new (client, interface, protocol, ++ name, type, domain, ++ AVAHI_PROTO_UNSPEC, 0, ++ avahi_query_callback, context) == NULL) ++ { ++ fprintf (stderr, "ERROR: failed to resolve service %s: %s\n", ++ name, avahi_strerror (avahi_client_errno (client))); ++ } ++ } ++ ++ break; + +- for (device = cupsArrayFind(devices, &dkey); ++ case AVAHI_BROWSER_REMOVE: ++ case AVAHI_BROWSER_ALL_FOR_NOW: ++ case AVAHI_BROWSER_CACHE_EXHAUSTED: ++ break; ++ } ++} ++#endif /* HAVE_AVAHI */ ++ ++static cups_device_t * ++find_device (cups_array_t *devices, ++ cups_txt_records_t *txt, ++ cups_device_t *dkey) ++{ ++ cups_device_t *device; ++ char *ptr; ++ ++ for (device = cupsArrayFind(devices, dkey); + device; + device = cupsArrayNext(devices)) + { +- if (strcasecmp(device->name, dkey.name) || +- strcasecmp(device->domain, dkey.domain)) ++ if (strcasecmp(device->name, dkey->name) || ++ strcasecmp(device->domain, dkey->domain)) + { + device = NULL; + break; + } +- else if (device->type == dkey.type) ++ else if (device->type == dkey->type) + { + /* + * Found it, pull out the priority and make and model from the TXT + * record and save it... + */ + +- const uint8_t *data, /* Pointer into data */ +- *datanext, /* Next key/value pair */ +- *dataend; /* End of entire TXT record */ +- uint8_t datalen; /* Length of current key/value pair */ +- char key[256], /* Key string */ +- value[256], /* Value string */ +- make_and_model[512], ++ char make_and_model[512], + /* Manufacturer and model */ + model[256], /* Model */ +- device_id[2048];/* 1284 device ID */ +- ++ device_id[2048]; /* 1284 device ID */ + + device_id[0] = '\0'; + make_and_model[0] = '\0'; + + strcpy(model, "Unknown"); + +- for (data = rdata, dataend = data + rdlen; +- data < dataend; +- data = datanext) ++ for (;;) + { +- /* +- * Read a key/value pair starting with an 8-bit length. Since the +- * length is 8 bits and the size of the key/value buffers is 256, we +- * don't need to check for overflow... +- */ +- +- datalen = *data++; +- +- if (!datalen || (data + datalen) >= dataend) +- break; +- +- datanext = data + datalen; ++ char *key; ++ char *value; + +- for (ptr = key; data < datanext && *data != '='; data ++) +- *ptr++ = *data; +- *ptr = '\0'; +- +- if (data < datanext && *data == '=') +- { +- data ++; +- +- if (data < datanext) +- memcpy(value, data, datanext - data); +- value[datanext - data] = '\0'; +- } +- else +- continue; ++ if (parse_txt_record_pair (txt)) ++ goto next; + ++ key = txt->key; ++ value = txt->value; + if (!strncasecmp(key, "usb_", 4)) + { + /* +@@ -805,6 +1183,10 @@ query_callback( + if (device->type == CUPS_DEVICE_PRINTER) + device->sent = 1; + } ++ ++ next: ++ if (next_txt_record (txt) == NULL) ++ break; + } + + if (device->device_id) +@@ -854,11 +1236,9 @@ query_callback( + } + } + +- if (!device) +- fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName); ++ return device; + } + +- + /* + * 'sigterm_handler()' - Handle termination signals... + */ +diff -up cups-1.4.5/config.h.in.avahi cups-1.4.5/config.h.in +--- cups-1.4.5/config.h.in.avahi 2010-08-13 06:11:46.000000000 +0200 ++++ cups-1.4.5/config.h.in 2010-11-12 13:13:31.000000000 +0100 +@@ -344,6 +344,13 @@ + + + /* ++ * Do we have Avahi for DNS Service Discovery? ++ */ ++ ++#undef HAVE_AVAHI ++ ++ ++/* + * Do we have <sys/ioctl.h>? + */ + +diff -up cups-1.4.5/config-scripts/cups-dnssd.m4.avahi cups-1.4.5/config-scripts/cups-dnssd.m4 +--- cups-1.4.5/config-scripts/cups-dnssd.m4.avahi 2009-08-29 00:54:34.000000000 +0200 ++++ cups-1.4.5/config-scripts/cups-dnssd.m4 2010-11-12 13:13:31.000000000 +0100 +@@ -27,6 +27,21 @@ AC_ARG_WITH(dnssd-includes, [ --with-dn + DNSSDLIBS="" + DNSSD_BACKEND="" + ++AC_ARG_ENABLE(avahi, [ --enable-avahi turn on DNS Service Discovery support, default=no], ++ [if test x$enable_avahi = xyes; then ++ AC_MSG_CHECKING(for Avahi) ++ if $PKGCONFIG --exists avahi-client; then ++ AC_MSG_RESULT(yes) ++ CFLAGS="$CFLAGS `$PKGCONFIG --cflags avahi-client`" ++ DNSSDLIBS="`$PKGCONFIG --libs avahi-client`" ++ DNSSD_BACKEND="dnssd" ++ AC_DEFINE(HAVE_AVAHI) ++ enable_dnssd=no ++ else ++ AC_MSG_RESULT(no) ++ fi ++ fi]) ++ + if test x$enable_dnssd != xno; then + AC_CHECK_HEADER(dns_sd.h, [ + case "$uname" in +diff -up cups-1.4.5/cups/http-support.c.avahi cups-1.4.5/cups/http-support.c +--- cups-1.4.5/cups/http-support.c.avahi 2010-10-02 00:40:38.000000000 +0200 ++++ cups-1.4.5/cups/http-support.c 2010-11-12 13:28:45.000000000 +0100 +@@ -55,6 +55,11 @@ + # include <dns_sd.h> + # include <poll.h> + #endif /* HAVE_DNSSD */ ++#ifdef HAVE_AVAHI ++# include <avahi-client/client.h> ++# include <avahi-client/lookup.h> ++# include <avahi-common/simple-watch.h> ++#endif /* HAVE_AVAHI */ + + + /* +@@ -121,6 +126,24 @@ static void resolve_callback(DNSService + void *context); + #endif /* HAVE_DNSSD */ + ++#ifdef HAVE_AVAHI ++static void avahi_resolve_uri_client_cb(AvahiClient *client, ++ AvahiClientState state, ++ void *simple_poll); ++static void avahi_resolve_uri_resolver_cb(AvahiServiceResolver *resolver, ++ AvahiIfIndex interface, ++ AvahiProtocol protocol, ++ AvahiResolverEvent event, ++ const char *name, ++ const char *type, ++ const char *domain, ++ const char *host_name, ++ const AvahiAddress *address, ++ uint16_t port, ++ AvahiStringList *txt, ++ AvahiLookupResultFlags flags, ++ void *context); ++#endif /* HAVE_AVAHI */ + + /* + * 'httpAssembleURI()' - Assemble a uniform resource identifier from its +@@ -1351,16 +1374,27 @@ _httpResolveURI( + + if (strstr(hostname, "._tcp")) + { ++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) ++ char *regtype, /* Pointer to type in hostname */ ++ *domain; /* Pointer to domain in hostname */ + #ifdef HAVE_DNSSD + DNSServiceRef ref, /* DNS-SD master service reference */ + domainref, /* DNS-SD service reference for domain */ + localref; /* DNS-SD service reference for .local */ + int domainsent = 0, /* Send the domain resolve? */ + offline = 0; /* offline-report state set? */ +- char *regtype, /* Pointer to type in hostname */ +- *domain; /* Pointer to domain in hostname */ + _http_uribuf_t uribuf; /* URI buffer */ + struct pollfd polldata; /* Polling data */ ++#else /* HAVE_AVAHI */ ++ AvahiSimplePoll *simple_poll; ++ AvahiClient *client; ++ int error; ++ struct ++ { ++ AvahiSimplePoll *poll; ++ _http_uribuf_t uribuf; ++ } user_data; ++#endif /* HAVE_DNSSD */ + + + if (logit) +@@ -1398,8 +1432,13 @@ _httpResolveURI( + if (domain) + *domain++ = '\0'; + ++#ifdef HAVE_DNSSD + uribuf.buffer = resolved_uri; + uribuf.bufsize = resolved_size; ++#else ++ user_data.uribuf.buffer = resolved_uri; ++ user_data.uribuf.bufsize = resolved_size; ++#endif + + resolved_uri[0] = '\0'; + +@@ -1414,6 +1453,7 @@ _httpResolveURI( + + uri = NULL; + ++#ifdef HAVE_DNSSD + if (DNSServiceCreateConnection(&ref) == kDNSServiceErr_NoError) + { + localref = ref; +@@ -1500,6 +1540,36 @@ _httpResolveURI( + + DNSServiceRefDeallocate(ref); + } ++#else /* HAVE_AVAHI */ ++ if ((simple_poll = avahi_simple_poll_new ()) != NULL) ++ { ++ if ((client = avahi_client_new (avahi_simple_poll_get (simple_poll), ++ 0, avahi_resolve_uri_client_cb, ++ &simple_poll, &error)) != NULL) ++ { ++ user_data.poll = simple_poll; ++ if (avahi_service_resolver_new (client, AVAHI_IF_UNSPEC, ++ AVAHI_PROTO_UNSPEC, hostname, ++ regtype, domain, AVAHI_PROTO_UNSPEC, 0, ++ avahi_resolve_uri_resolver_cb, ++ &user_data) != NULL) ++ { ++ avahi_simple_poll_loop (simple_poll); ++ ++ /* ++ * Collect the result. ++ */ ++ ++ if (resolved_uri[0]) ++ uri = resolved_uri; ++ } ++ ++ avahi_client_free (client); ++ } ++ ++ avahi_simple_poll_free (simple_poll); ++ } ++#endif /* HAVE_DNSSD */ + + if (logit) + { +@@ -1511,13 +1581,13 @@ _httpResolveURI( + fputs("STATE: -connecting-to-device,offline-report\n", stderr); + } + +-#else ++#else /* HAVE_DNSSD || HAVE_AVAHI */ + /* + * No DNS-SD support... + */ + + uri = NULL; +-#endif /* HAVE_DNSSD */ ++#endif /* HAVE_DNSSD || HAVE_AVAHI */ + + if (logit && !uri) + _cupsLangPuts(stderr, _("Unable to find printer!\n")); +@@ -1722,6 +1792,105 @@ resolve_callback( + } + #endif /* HAVE_DNSSD */ + ++#ifdef HAVE_AVAHI ++static void ++avahi_resolve_uri_client_cb (AvahiClient *client, ++ AvahiClientState state, ++ void *simple_poll) ++{ ++ DEBUG_printf(("avahi_resolve_uri_client_callback(client=%p, state=%d, " ++ "simple_poll=%p)\n", client, state, simple_poll)); ++ ++ /* ++ * If the connection drops, quit. ++ */ ++ ++ if (state == AVAHI_CLIENT_FAILURE) ++ avahi_simple_poll_quit (simple_poll); ++} ++ ++static void ++avahi_resolve_uri_resolver_cb (AvahiServiceResolver *resolver, ++ AvahiIfIndex interface, ++ AvahiProtocol protocol, ++ AvahiResolverEvent event, ++ const char *name, ++ const char *type, ++ const char *domain, ++ const char *host_name, ++ const AvahiAddress *address, ++ uint16_t port, ++ AvahiStringList *txt, ++ AvahiLookupResultFlags flags, ++ void *context) ++{ ++ const char *scheme; /* URI scheme */ ++ char rp[256]; /* Remote printer */ ++ AvahiStringList *pair; ++ char *value; ++ size_t valueLen = 0; ++ char addr[AVAHI_ADDRESS_STR_MAX]; ++ struct ++ { ++ AvahiSimplePoll *poll; ++ _http_uribuf_t uribuf; ++ } *poll_uribuf = context; ++ ++ DEBUG_printf(("avahi_resolve_uri_resolver_callback(resolver=%p, " ++ "interface=%d, protocol=%d, event=%d, name=\"%s\", " ++ "type=\"%s\", domain=\"%s\", host_name=\"%s\", address=%p, " ++ "port=%d, txt=%p, flags=%d, context=%p)\n", ++ resolver, interface, protocol, event, name, type, domain, ++ host_name, address, port, txt, flags, context)); ++ ++ if (event != AVAHI_RESOLVER_FOUND) ++ { ++ avahi_service_resolver_free (resolver); ++ avahi_simple_poll_quit (poll_uribuf->poll); ++ return; ++ } ++ ++ /* ++ * Figure out the scheme from the full name... ++ */ ++ ++ if (strstr(type, "_ipp.")) ++ scheme = "ipp"; ++ else if (strstr(type, "_printer.")) ++ scheme = "lpd"; ++ else if (strstr(type, "_pdl-datastream.")) ++ scheme = "socket"; ++ else ++ scheme = "riousbprint"; ++ ++ /* ++ * Extract the "remote printer key from the TXT record... ++ */ ++ ++ if ((pair = avahi_string_list_find (txt, "rp")) != NULL) ++ { ++ avahi_string_list_get_pair (pair, NULL, &value, &valueLen); ++ rp[0] = '/'; ++ memcpy (rp + 1, value, valueLen); ++ rp[valueLen + 1] = '\0'; ++ } ++ else ++ rp[0] = '\0'; ++ ++ /* ++ * Assemble the final device URI... ++ */ ++ ++ avahi_address_snprint (addr, AVAHI_ADDRESS_STR_MAX, address); ++ httpAssembleURI(HTTP_URI_CODING_ALL, poll_uribuf->uribuf.buffer, ++ poll_uribuf->uribuf.bufsize, scheme, NULL, ++ addr, port, rp); ++ DEBUG_printf(("avahi_resolve_uri_resolver_callback: Resolved URI is \"%s\"\n", ++ poll_uribuf->uribuf.buffer)); ++ avahi_simple_poll_quit (poll_uribuf->poll); ++} ++#endif /* HAVE_AVAHI */ ++ + + /* + * End of "$Id: http-support.c 9322 2010-10-01 22:40:38Z mike $". diff --git a/staging/cups/cups-no-export-ssllibs.patch b/staging/cups/cups-no-export-ssllibs.patch new file mode 100644 index 000000000..9be3c819b --- /dev/null +++ b/staging/cups/cups-no-export-ssllibs.patch @@ -0,0 +1,12 @@ +diff -up cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs cups-1.5b1/config-scripts/cups-ssl.m4 +--- cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs 2011-05-11 02:52:08.000000000 +0200 ++++ cups-1.5b1/config-scripts/cups-ssl.m4 2011-05-23 17:47:27.000000000 +0200 +@@ -164,7 +164,7 @@ AC_SUBST(IPPALIASES) + AC_SUBST(SSLFLAGS) + AC_SUBST(SSLLIBS) + +-EXPORT_SSLLIBS="$SSLLIBS" ++EXPORT_SSLLIBS="" + AC_SUBST(EXPORT_SSLLIBS) + + diff --git a/staging/cups/cups-no-gcrypt.patch b/staging/cups/cups-no-gcrypt.patch new file mode 100644 index 000000000..203b4f4ac --- /dev/null +++ b/staging/cups/cups-no-gcrypt.patch @@ -0,0 +1,39 @@ +diff -ruN cups-1.4.7.orig//config-scripts/cups-ssl.m4 cups-1.4.7/config-scripts/cups-ssl.m4 +--- cups-1.4.7.orig//config-scripts/cups-ssl.m4 2011-01-11 08:05:58.000000000 +0100 ++++ cups-1.4.7/config-scripts/cups-ssl.m4 2011-08-02 10:44:26.011047900 +0200 +@@ -74,7 +74,6 @@ + dnl Then look for GNU TLS... + if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then + AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config) +- AC_PATH_PROG(LIBGCRYPTCONFIG,libgcrypt-config) + if $PKGCONFIG --exists gnutls; then + if test "x$have_pthread" = xyes; then + AC_MSG_WARN([The current version of GNU TLS cannot be made thread-safe.]) +@@ -96,16 +95,6 @@ + AC_DEFINE(HAVE_GNUTLS) + fi + fi +- +- if test $have_ssl = 1; then +- if $PKGCONFIG --exists gcrypt; then +- SSLLIBS="$SSLLIBS `$PKGCONFIG --libs gcrypt`" +- SSLFLAGS="$SSLFLAGS `$PKGCONFIG --cflags gcrypt`" +- elif test "x$LIBGCRYPTCONFIG" != x; then +- SSLLIBS="$SSLLIBS `$LIBGCRYPTCONFIG --libs`" +- SSLFLAGS="$SSLFLAGS `$LIBGCRYPTCONFIG --cflags`" +- fi +- fi + fi + + dnl Check for the OpenSSL library last... +diff -ruN cups-1.4.7.orig//cups/http-private.h cups-1.4.7/cups/http-private.h +--- cups-1.4.7.orig//cups/http-private.h 2011-01-22 01:07:22.000000000 +0100 ++++ cups-1.4.7/cups/http-private.h 2011-08-02 10:42:43.341604107 +0200 +@@ -98,7 +98,6 @@ + * The GNU TLS library is more of a "bare metal" SSL/TLS library... + */ + # include <gnutls/gnutls.h> +-# include <gcrypt.h> + + typedef struct + { diff --git a/staging/cups/cups.install b/staging/cups/cups.install new file mode 100644 index 000000000..47c3d9b82 --- /dev/null +++ b/staging/cups/cups.install @@ -0,0 +1,26 @@ +post_install() { + if [ -x usr/bin/xdg-icon-resource ]; then + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + fi + echo ">> If you use an HTTPS connection to CUPS, the first time you access" + echo ">> the interface it may take a very long time before the site comes up." + echo ">> This is because the first request triggers the generation of the CUPS" + echo ">> SSL certificates which can be a very time-consuming job." +} + +post_upgrade() { + if [ -x usr/bin/xdg-icon-resource ]; then + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + fi + if [ "`vercmp $2 1.4.7-2`" -lt 0 ]; then + # important upgrade notice + echo "daemon script has been renamed to /etc/rc.d/cupsd" + echo "change your entry in /etc/rc.conf" + fi +} + +post_remove() { + if [ -x usr/bin/xdg-icon-resource ]; then + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + fi +} diff --git a/staging/cups/cups.logrotate b/staging/cups/cups.logrotate new file mode 100644 index 000000000..9c49bbdaf --- /dev/null +++ b/staging/cups/cups.logrotate @@ -0,0 +1,8 @@ +/var/log/cups/*log { + missingok + notifempty + delaycompress + postrotate + /bin/kill -HUP `cat /var/run/cups.pid 2>/dev/null` 2>/dev/null || true + endscript +} diff --git a/staging/cups/cups.pam b/staging/cups/cups.pam new file mode 100644 index 000000000..53724d1f8 --- /dev/null +++ b/staging/cups/cups.pam @@ -0,0 +1,3 @@ +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so diff --git a/staging/empathy/PKGBUILD b/staging/empathy/PKGBUILD new file mode 100644 index 000000000..952c577d6 --- /dev/null +++ b/staging/empathy/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 134982 2011-08-09 18:33:31Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +pkgname=empathy +pkgver=3.0.2 +pkgrel=2 +pkgdesc="A GNOME instant messaging client using the Telepathy framework." +arch=('i686' 'x86_64') +url="http://live.gnome.org/Empathy" +license=('GPL2') +depends=('telepathy-glib' 'telepathy-mission-control' 'folks' 'telepathy-logger' 'telepathy-farsight' 'gnome-keyring' 'gnutls' 'evolution-data-server' + 'libcanberra' 'libnotify' 'enchant' 'iso-codes' 'libwebkit3' 'dconf' 'ca-certificates') +makedepends=('intltool' 'gnome-doc-utils' 'nautilus-sendto' 'gnome-control-center') +optdepends=('telepathy-gabble: XMPP/Jabber support' + 'telepathy-butterfly: MSN support' + 'telepathy-idle: IRC support' + 'telepathy-salut: Link-local XMPP support' + 'telepathy-sofiasip: SIP support' + 'telepathy-haze: libpurple support') +options=('!libtool') +groups=('gnome-extra') +install=empathy.install +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('8074f6ce951fb95b1e13c546497e22d487bca9a87d88f1ebb903cdd2fd48bdc2') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/empathy \ + --disable-static \ + --disable-scrollkeeper \ + --disable-schemas-compile + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/empathy/empathy.install b/staging/empathy/empathy.install new file mode 100644 index 000000000..63dd6b907 --- /dev/null +++ b/staging/empathy/empathy.install @@ -0,0 +1,16 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + echo "To use Empathy you need to install at least one Telepathy connection manager." +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/staging/glib-networking/PKGBUILD b/staging/glib-networking/PKGBUILD new file mode 100644 index 000000000..dc775a49b --- /dev/null +++ b/staging/glib-networking/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 134916 2011-08-09 12:05:52Z ibiru $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +pkgname=glib-networking +pkgver=2.28.7 +pkgrel=3 +pkgdesc="Network-related giomodules for glib" +arch=('i686' 'x86_64') +url="http://www.gtk.org/" +license=('GPL2') +depends=('glib2' 'libproxy' 'gnutls' 'libgcrypt' 'ca-certificates' 'gsettings-desktop-schemas') +makedepends=('intltool') +options=('!libtool') +install=glib-networking.install +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2) +sha256sums=('98bedfbd530c4b1b53c91025fe82290bafd289d249e4eb549c3b90d23a76021c') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure \ + --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/glib-networking --disable-static + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="${pkgdir}" install +} + +# vim:set ts=2 sw=2 et: diff --git a/staging/glib-networking/glib-networking.install b/staging/glib-networking/glib-networking.install new file mode 100644 index 000000000..595f1c75b --- /dev/null +++ b/staging/glib-networking/glib-networking.install @@ -0,0 +1,11 @@ +post_install() { + usr/bin/gio-querymodules usr/lib/gio/modules +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/gtk-vnc/PKGBUILD b/staging/gtk-vnc/PKGBUILD new file mode 100644 index 000000000..b8e4c8856 --- /dev/null +++ b/staging/gtk-vnc/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 134864 2011-08-08 05:59:44Z eric $ +# Maintainer: +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: Allan McRae <mcrae_allan@hotmail.com> +# Contributor: lp76 <l.peduto@gmail.com> + +pkgname=gtk-vnc +pkgver=0.4.3 +pkgrel=2 +pkgdesc="A VNC viewer widget for GTK" +arch=('i686' 'x86_64') +url="http://live.gnome.org/gtk-vnc" +license=('LGPL') +depends=('gtk3') +optdepends=('gtk2: GTK2 widget') +makedepends=('intltool' 'pygtk' 'pygobject-devel' 'gtk-doc' 'gtk2') +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('b9870d923d636d2e7547267d01c8cafdc06ad5b5b4987003ea3cd567bfbb6377') + +build() { + cd "$srcdir" + cp -a $pkgname-$pkgver gtk3-build + + ( cd $pkgname-$pkgver + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --with-python --disable-static --with-gtk=2.0 + make ) + + ( cd gtk3-build + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --with-python --with-examples --disable-static --with-gtk=3.0 + make ) +} + +package() { + cd "${srcdir}" + make -C $pkgname-$pkgver -j1 DESTDIR="${pkgdir}" install + make -C gtk3-build -j1 DESTDIR="${pkgdir}" install +} diff --git a/staging/lftp/PKGBUILD b/staging/lftp/PKGBUILD new file mode 100644 index 000000000..9cd8e8d15 --- /dev/null +++ b/staging/lftp/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 134943 2011-08-09 15:13:13Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Aaron Griffin <aaron@archlinux.org> + +pkgname=lftp +pkgver=4.3.1 +pkgrel=2 +pkgdesc="Sophisticated command line based FTP client" +arch=('i686' 'x86_64') +license=('GPL3') +depends=('gcc-libs' 'readline>=6.2' "gnutls" "expat>=2.0.1-4" 'sh') +optdepends=('perl: needed for convert-netscape-cookies and verify-file') +makedepends=('autoconf') +url="http://lftp.yar.ru/" +backup=('etc/lftp.conf') +source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2) +md5sums=('ea45acfb47b5590d4675c50dc0c6e13c') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --with-gnutls \ + --without-openssl --disable-static + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + rm -rf ${pkgdir}/usr/lib +}
\ No newline at end of file diff --git a/staging/libgpod/PKGBUILD b/staging/libgpod/PKGBUILD new file mode 100644 index 000000000..58ef7b358 --- /dev/null +++ b/staging/libgpod/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 134924 2011-08-09 13:21:55Z ibiru $ +# Maintainer: Daniel Isenmann <daniel@archlinux.org> +# Contributor: William Rea <sillywilly@gmail.com> + +pkgname=libgpod +pkgver=0.8.2 +pkgrel=2 +pkgdesc="A shared library to access the contents of an iPod" +arch=(i686 x86_64) +license=('LGPL') +depends=('gdk-pixbuf2' 'mutagen' 'sg3_utils' 'libimobiledevice') +makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject-devel' 'gtk-sharp-2') +optdepends=('gtk-sharp-2: Mono bindings') +url="http://www.gtkpod.org/libgpod/" +source=(http://downloads.sourceforge.net/sourceforge/gtkpod/${pkgname}-${pkgver}.tar.bz2) +options=('!libtool' '!emptydirs') +md5sums=('ff0fd875fa08f2a6a49dec57ce3367ab') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ + --enable-udev --with-python=/usr/bin/python2 + make PREFIX=/usr +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make PREFIX=/usr DESTDIR="${pkgdir}" install +} + diff --git a/staging/libimobiledevice/PKGBUILD b/staging/libimobiledevice/PKGBUILD new file mode 100644 index 000000000..a6f48d786 --- /dev/null +++ b/staging/libimobiledevice/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 134921 2011-08-09 12:21:53Z ibiru $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: Gabriel Martinez < reitaka at gmail dot com > + +pkgname=libimobiledevice +pkgver=1.1.1 +pkgrel=2 +pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux" +url="http://libimobiledevice.org/" +arch=('i686' 'x86_64') +license=('GPL2' 'LGPL2.1') +depends=('glib2' 'gnutls' 'libgcrypt' 'libplist' 'usbmuxd') +makedepends=('swig' 'python2') +options=('!libtool') +source=(http://libimobiledevice.org/downloads/${pkgname}-${pkgver}.tar.bz2 + swig-version-check.patch) +md5sums=('cdc13037e822d9ac2e109536701d153a' + '8bb215e36fe0e08a72332c108c7842cc') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + # SWIG version check is wrong (still not fixed upstream) + patch -p1 -i "$srcdir"/swig-version-check.patch + PYTHON=/usr/bin/python2 ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/libimobiledevice/swig-version-check.patch b/staging/libimobiledevice/swig-version-check.patch new file mode 100644 index 000000000..c56b095db --- /dev/null +++ b/staging/libimobiledevice/swig-version-check.patch @@ -0,0 +1,14 @@ +diff -Nur libimobiledevice-1.0.3.old/configure libimobiledevice-1.0.3/configure +--- libimobiledevice-1.0.3.old/configure 2010-10-04 07:38:37.000000000 -0700 ++++ libimobiledevice-1.0.3/configure 2010-10-08 05:43:05.466686656 -0700 +@@ -3477,9 +3477,7 @@ + if test -z "$available_patch" ; then + available_patch=0 + fi +- if test $available_major -ne $required_major \ +- -o $available_minor -ne $required_minor \ +- -o $available_patch -lt $required_patch ; then ++ if test $available_major -lt $required_major ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SWIG version >= 1.3.21 is required. You have $swig_version. You should look at http://www.swig.org" >&5 + $as_echo "$as_me: WARNING: SWIG version >= 1.3.21 is required. You have $swig_version. You should look at http://www.swig.org" >&2;} + SWIG=false diff --git a/staging/msmtp/PKGBUILD b/staging/msmtp/PKGBUILD new file mode 100644 index 000000000..44d3e6209 --- /dev/null +++ b/staging/msmtp/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 134900 2011-08-08 19:38:44Z eric $ +# Maintainer: tobias <tobias@archlinux.org> +# Contributor: Ben Mazer <blm@groknil.org> + +pkgname=msmtp +pkgver=1.4.24 +pkgrel=3 +pkgdesc="A mini smtp client" +arch=('i686' 'x86_64') +license=('GPL3') +url="http://msmtp.sourceforge.net" +depends=('gnutls' 'libidn') +makedepends=('texlive-core') +provides=('smtp-forwarder') +install=msmtp.install +source=(http://download.sourceforge.net/sourceforge/msmtp/${pkgname}-${pkgver}.tar.bz2) +md5sums=('3ed704fbd3e7419cab5c65bb7928d9ba') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --with-ssl=gnutls + make + make -C doc html pdf +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" -C doc install-html install-pdf + +# Installing example configs and scripts to /usr/share/doc/msmtp +# as they are not installed by default (Debian and Gentoo do it this way) + install -d "${pkgdir}/usr/share/doc/msmtp" + cp -r scripts/{find_alias,msmtp-gnome-tool,msmtpqueue,msmtpq,set_sendmail} "${pkgdir}/usr/share/doc/msmtp/" + install -D -m644 doc/*.example "${pkgdir}/usr/share/doc/msmtp/" + + install -D -m644 scripts/vim/msmtp.vim "${pkgdir}/usr/share/vim/vimfiles/syntax/msmtp.vim" +} diff --git a/staging/msmtp/msmtp.install b/staging/msmtp/msmtp.install new file mode 100644 index 000000000..c4dd76476 --- /dev/null +++ b/staging/msmtp/msmtp.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(msmtp.info) + +post_install() { + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +# vim:set ts=2 sw=2 et: diff --git a/staging/telepathy-gabble/PKGBUILD b/staging/telepathy-gabble/PKGBUILD new file mode 100644 index 000000000..04a19b6a9 --- /dev/null +++ b/staging/telepathy-gabble/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 134985 2011-08-09 18:45:11Z ibiru $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: Daniel Balieiro <daniel@balieiro.com> +# Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org> +pkgname=telepathy-gabble +pkgver=0.12.4 +pkgrel=2 +pkgdesc="A Jabber/XMPP connection manager for Telepathy" +arch=('i686' 'x86_64') +url="http://telepathy.freedesktop.org" +groups=('telepathy') +license=('LGPL2.1') +depends=('telepathy-glib' 'libsoup' 'libnice' 'sqlite3') +makedepends=('libxslt' 'python2') +options=('!libtool') +source=(http://telepathy.freedesktop.org/releases/telepathy-gabble/${pkgname}-${pkgver}.tar.gz) +install=telepathy-gabble.install +md5sums=('428962565d568667d3ff1aa7eee3da51') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --libexecdir=/usr/lib/telepathy + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/staging/telepathy-gabble/telepathy-gabble.install b/staging/telepathy-gabble/telepathy-gabble.install new file mode 100644 index 000000000..87d7838b8 --- /dev/null +++ b/staging/telepathy-gabble/telepathy-gabble.install @@ -0,0 +1,13 @@ +post_install() { + killall -HUP dbus-daemon 2>&1 +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} + +# vim:set ts=2 sw=2 et: diff --git a/staging/vino/PKGBUILD b/staging/vino/PKGBUILD new file mode 100644 index 000000000..ddd37f61e --- /dev/null +++ b/staging/vino/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 134988 2011-08-09 18:47:51Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=vino +pkgver=3.0.3 +pkgrel=2 +pkgdesc="a VNC server for the GNOME desktop" +arch=('i686' 'x86_64') +license=('GPL') +depends=('libnotify' 'libxtst' 'libsm' 'libsoup' 'telepathy-glib' 'gtk3' 'libgnome-keyring' 'avahi' 'desktop-file-utils') +makedepends=('intltool' 'networkmanager') +groups=('gnome-extra') +url="http://www.gnome.org" +options=(!emptydirs) +install=vino.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('0e58027d3c10649da61445cdd5205e31c4d1aa0b63f4911de3db4e7052d7bbfb') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/vino \ + --localstatedir=/var \ + --enable-gnome-keyring \ + --enable-avahi + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/vino/vino.install b/staging/vino/vino.install new file mode 100644 index 000000000..469266843 --- /dev/null +++ b/staging/vino/vino.install @@ -0,0 +1,18 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q +} + +pre_upgrade() { + if (( $(vercmp $2 2.90.0) < 0 )); then + usr/sbin/gconfpkg --uninstall vino + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/vlc/PKGBUILD b/staging/vlc/PKGBUILD new file mode 100644 index 000000000..c7d6642bf --- /dev/null +++ b/staging/vlc/PKGBUILD @@ -0,0 +1,73 @@ +# $Id: PKGBUILD 135024 2011-08-09 21:18:13Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> +# Contributor: Martin Sandsmark <martin.sandsmark@kde.org> + +pkgname=vlc +pkgver=1.1.11 +pkgrel=4 +pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" +arch=('i686' 'x86_64') +url="http://www.videolan.org/vlc/" +license=('GPL') +depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libxpm' 'libcdio' + 'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa' + 'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi' + 'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' + 'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug' + 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils') +makedepends=('avahi' 'pkgconfig' 'live-media' 'libnotify' + 'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev' + 'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse' + 'lirc-utils' 'gnutls' 'libcaca') +optdepends=('avahi: for service discovery using bonjour protocol' + 'libnotify: for notification plugin' + 'ncurses: for ncurses interface support' + 'libdvdcss: for decoding encrypted DVDs' + 'lirc-utils: for lirc plugin' + 'libavc1394: for devices using the 1394ta AV/C' + 'libdc1394: for IEEE 1394 plugin' + 'kdelibs: KDE Solid hardware integration' + 'vdpau-video: VDPAU backend for VA API (for GPU acceleration on Nvidia cards)' + 'libpulse: PulseAudio support') +conflicts=('vlc-plugin') +replaces=('vlc-plugin') +backup=('usr/share/vlc/http/.hosts' + 'usr/share/vlc/http/dialogs/.hosts' + 'usr/share/vlc/lua/http/.hosts' + 'usr/share/vlc/lua/http/dialogs/.hosts') +options=('!libtool') +install=vlc.install +source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('a64846d6f21ea179ae8e8bfb6f9447fe') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c + + ./configure --prefix=/usr \ + --disable-rpath \ + --enable-faad \ + --enable-v4l \ + --enable-snapshot \ + --enable-dbus-control \ + --enable-nls \ + --enable-lirc \ + --enable-pvr \ + --enable-ncurses \ + --with-live555-tree=/usr/lib/live \ + --enable-upnp \ + --enable-realrtsp + make +} +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}/" install + + for res in 16 32 48 128; do + install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \ + "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png" + done +} diff --git a/staging/vlc/vlc.install b/staging/vlc/vlc.install new file mode 100644 index 000000000..4a1091bc5 --- /dev/null +++ b/staging/vlc/vlc.install @@ -0,0 +1,18 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + usr/lib/vlc/vlc-cache-gen -f usr/lib/vlc/plugins + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +pre_remove() { + rm -f usr/lib/vlc/plugins/plugins-*.dat +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} diff --git a/staging/weechat/PKGBUILD b/staging/weechat/PKGBUILD new file mode 100644 index 000000000..6e53c7d86 --- /dev/null +++ b/staging/weechat/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 135012 2011-08-09 21:04:57Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: lucke <lucke at o2 dot pl> + +pkgname=weechat +pkgver=0.3.5 +pkgrel=3 +pkgdesc="Fast, light and extensible IRC client (curses UI)" +arch=('i686' 'x86_64') +url="http://www.weechat.org/" +license=('GPL') +depends=('gnutls') +makedepends=('cmake' 'pkgconfig' 'perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell') +optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell') +options=('!libtool') +source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2") +md5sums=('0d2a089bfbfa550e0c65618a171fb3c4') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + mkdir build + cd build + cmake .. -DPREFIX=/usr \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 \ + -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}/build" + + make DESTDIR="${pkgdir}/" install +} diff --git a/staging/wireshark/PKGBUILD b/staging/wireshark/PKGBUILD new file mode 100644 index 000000000..66b2f859c --- /dev/null +++ b/staging/wireshark/PKGBUILD @@ -0,0 +1,58 @@ +# $Id: PKGBUILD 134932 2011-08-09 14:19:48Z guillaume $ +# Maintainer: Guillaume ALAUX <guillaume at alaux dot net> +# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> +pkgname=(wireshark-cli wireshark-gtk) +pkgbase=wireshark +pkgver=1.6.1 +pkgrel=2 +arch=('i686' 'x86_64') +license=('GPL2') +makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libpcap' 'bash' 'gnutls' 'libcap' 'lua') +url="http://www.wireshark.org/" +options=(!libtool) +source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2) +md5sums=('dc1e8c9800b64130674b120a183e2308') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + export CFLAGS="-fno-unit-at-a-time ${CFLAGS}" + + ./configure \ + --prefix=/usr \ + --with-ssl \ + --with-zlib=yes \ + --with-lua + make all +} + +package_wireshark-cli() { + pkgdesc="A free network protocol analyzer for Unix/Linux and Windows - CLI version" + depends=('krb5' 'libpcap' 'bash' 'gnutls' 'libcap' 'glib2' 'lua') + install=wireshark.install + conflicts=(wireshark) + + cd "${srcdir}/${pkgbase}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + #wireshark uid group is 150 + chgrp 150 "${pkgdir}/usr/bin/dumpcap" + chmod 754 "${pkgdir}/usr/bin/dumpcap" + rm "$pkgdir/usr/bin/wireshark" +} + +package_wireshark-gtk() { + pkgdesc="A free network protocol analyzer for Unix/Linux and Windows - GTK frontend" + depends=('gtk2' 'wireshark-cli') + install=wireshark-gtk.install + replaces=(wireshark) + conflicts=(wireshark) + + cd "${srcdir}/${pkgbase}-${pkgver}" + + install -Dm755 .libs/wireshark "$pkgdir/usr/bin/wireshark" + for d in 16 32 48; do + install -Dm644 image/hi${d}-app-wireshark.png ${pkgdir}/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png + done + install -Dm644 wireshark.desktop ${pkgdir}/usr/share/applications/wireshark.desktop +} diff --git a/staging/wireshark/wireshark-gtk.install b/staging/wireshark/wireshark-gtk.install new file mode 100644 index 000000000..6b1b64bdd --- /dev/null +++ b/staging/wireshark/wireshark-gtk.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/wireshark/wireshark.install b/staging/wireshark/wireshark.install new file mode 100644 index 000000000..6585ba272 --- /dev/null +++ b/staging/wireshark/wireshark.install @@ -0,0 +1,18 @@ +post_install() { + getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null + + setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap + echo "NOTE: To run wireshark as normal user you have to add yourself into wireshark group" +} + +post_upgrade() { + getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null + + setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap +} + +post_remove() { + if getent group wireshark >/dev/null 2>&1; then + groupdel wireshark + fi +} diff --git a/staging/xfce4-mailwatch-plugin/PKGBUILD b/staging/xfce4-mailwatch-plugin/PKGBUILD new file mode 100644 index 000000000..4a992bd09 --- /dev/null +++ b/staging/xfce4-mailwatch-plugin/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 134951 2011-08-09 15:38:12Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> +# Contributor: Suzy Williams <suzanne.williams3@verizon.net> + +pkgname=xfce4-mailwatch-plugin +pkgver=1.1.0 +pkgrel=4 +pkgdesc="A mailbox watch/check plugin for the Xfce4 panel" +arch=(i686 x86_64) +license=('GPL2') +url="http://spurint.org/projects/xfce4-mailwatch-plugin/" +groups=('xfce4-goodies') +depends=('xfce4-panel' 'libxfcegui4' 'gnutls' 'libgcrypt' 'hicolor-icon-theme') +makedepends=('intltool' 'xfce4-dev-tools') +options=('!libtool') +install=${pkgname}.install +source=(http://spuriousinterrupt.org/files/mailwatch/${pkgname}-${pkgver}.tar.bz2 + xfce4-mailwatch-plugin-1.1.0-underlink.patch) +md5sums=('f84dce86be1d7f25f169f262aaacee4e' + '47fe8588e3bb642e1b507a854927e6db') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + # fix for panel4.8 from Fedora + patch -Np1 -i ${srcdir}/xfce4-mailwatch-plugin-1.1.0-underlink.patch + xdt-autogen + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-static \ + --disable-debug + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/staging/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0-underlink.patch b/staging/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0-underlink.patch new file mode 100644 index 000000000..ada0df041 --- /dev/null +++ b/staging/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0-underlink.patch @@ -0,0 +1,21 @@ +--- xfce4-mailwatch-plugin-1.1.0/panel-plugin/Makefile.am 2008-08-26 03:42:36.000000000 +0100 ++++ xfce4-mailwatch-plugin-1.1.0/panel-plugin/Makefile.am.new 2011-01-14 17:27:44.116199383 +0000 +@@ -50,6 +50,7 @@ + -I$(top_srcdir)/libmailwatch-core \ + @GTHREAD_CFLAGS@ \ + @LIBXFCE4PANEL_CFLAGS@ \ ++ @LIBXFCEGUI4_CFLAGS@ \ + -DDATADIR=\"$(datadir)\" \ + -DLOCALEDIR=\"$(localedir)\" + +@@ -60,7 +61,9 @@ + $(top_builddir)/libmailwatch-core/libmailwatch-core.la \ + @GTHREAD_LIBS@ \ + @LIBXFCE4PANEL_LIBS@ \ +- @GNUTLS_LIBS@ ++ @LIBXFCEGUI4_LIBS@ \ ++ @GNUTLS_LIBS@ \ ++ -lgcrypt + + if HAVE_CYGWIN + xfce4_mailwatch_plugin_LDFLAGS += \ diff --git a/staging/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.install b/staging/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.install new file mode 100644 index 000000000..21b79d2d4 --- /dev/null +++ b/staging/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/staging/xmlsec/PKGBUILD b/staging/xmlsec/PKGBUILD new file mode 100644 index 000000000..c15a0ac98 --- /dev/null +++ b/staging/xmlsec/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 134954 2011-08-09 15:50:09Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: Hussam Al-Tayeb <ht990332@gmail.com> + +pkgname=xmlsec +pkgver=1.2.18 +pkgrel=2 +pkgdesc="XML Security Library is a C library based on LibXML2" +license=('custom') +arch=(i686 x86_64) +url="http://www.aleksey.com/xmlsec/index.html" +depends=('libxslt>=1.1.26' 'openssl>=1.0.0' 'gnutls' 'nss>=3.12.10' 'libtool') +makedepends=('pkgconfig') +options=('!libtool') +source=(http://www.aleksey.com/xmlsec/download/${pkgname}1-${pkgver}.tar.gz) +md5sums=('8694b4609aab647186607f79e1da7f1a') + +build() { + cd ${srcdir}/${pkgname}1-${pkgver} + ./configure --prefix=/usr --disable-static + make +} + +check() { + cd "$srcdir/${pkgname}1-$pkgver" + make -k check +} + +package() { + cd ${srcdir}/${pkgname}1-${pkgver} + make DESTDIR=${pkgdir} install + install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname} + install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ +} diff --git a/testing/dash/PKGBUILD b/testing/dash/PKGBUILD new file mode 100644 index 000000000..50aaf36c0 --- /dev/null +++ b/testing/dash/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 135041 2011-08-09 23:37:21Z tomegun $ +# Maintainer: Dan McGee <dan@archlinux.org> + +pkgname=dash +pkgver=0.5.7 +pkgrel=2 +pkgdesc="A POSIX compliant shell that aims to be as small as possible" +arch=('i686' 'x86_64') +url="http://gondor.apana.org.au/~herbert/dash/" +license=('BSD') +depends=('glibc') +install=dash.install +source=("http://gondor.apana.org.au/~herbert/dash/files/${pkgname}-${pkgver}.tar.gz") +sha1sums=('a3ebc16f2e2c7ae8adf64e5e62ae3dcb631717c6') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --mandir=/usr/share/man --exec-prefix="" + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + # license + install -m644 -D COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING +} diff --git a/testing/dash/dash.install b/testing/dash/dash.install new file mode 100644 index 000000000..6b04cba30 --- /dev/null +++ b/testing/dash/dash.install @@ -0,0 +1,11 @@ +post_install() { + grep -q '/bin/dash' etc/shells || echo '/bin/dash' >> etc/shells +} + +post_upgrade() { + post_install +} + +pre_remove() { + sed -i '/^\/bin\/dash/d' etc/shells +} diff --git a/testing/wget/PKGBUILD b/testing/wget/PKGBUILD new file mode 100644 index 000000000..43a6c0535 --- /dev/null +++ b/testing/wget/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 135027 2011-08-09 21:59:45Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Judd Vinet <jvinet@zeroflux.org> + +pkgname=wget +pkgver=1.13 +pkgrel=1 +pkgdesc="A network utility to retrieve files from the Web" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/wget/wget.html" +license=('GPL3') +groups=('base') +depends=('glibc' 'openssl') +optdepends=('ca-certificates: HTTPS downloads') +backup=('etc/wgetrc') +install=wget.install +source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz) +md5sums=('48c5384123156e7b7501d2f5b5c7189a') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Note : We do not build with --enable-nls, because there is a bug in wget causing + # international domain names to be not properly converted to punycode if + # the current locale is a UTF-8 one + # See : http://lists.gnu.org/archive/html/bug-wget/2011-02/msg00026.html + + ./configure -with-ssl=openssl --prefix=/usr --sysconfdir=/etc + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + cat >> "$pkgdir/etc/wgetrc" <<EOF + +# default root certs location +ca_certificate=/etc/ssl/certs/ca-certificates.crt +EOF + + # remove IRI option from wgetrc as it does not work (see above) + sed -i '118,120d' $pkgdir/etc/wgetrc + +} diff --git a/testing/wget/wget.install b/testing/wget/wget.install new file mode 100644 index 000000000..8eb6a2c3f --- /dev/null +++ b/testing/wget/wget.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(wget.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file $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 $infodir/dir 2> /dev/null + done +} |