diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-28 02:44:47 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-28 02:44:47 -0300 |
| commit | c3b94090a6330f678ade2f767e76ab7802d3463e (patch) | |
| tree | e3d2321dce46bfdbc070fcee19e2852566510fe8 /community | |
| parent | 652c41cc5fd8dc5f23ef6a6c93f488911e1054c7 (diff) | |
| parent | 33feb015eb09eee76827f359e685fce981d88111 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/chmsee/PKGBUILD
community/flumotion/PKGBUILD
community/gnash/PKGBUILD
community/kadu/PKGBUILD
community/mythplugins/PKGBUILD
community/performous/PKGBUILD
community/sleuthkit/PKGBUILD
community/virtualbox/PKGBUILD
community/wbar/PKGBUILD
core/attr/PKGBUILD
core/binutils/PKGBUILD
core/heimdal/PKGBUILD
core/sqlite3/PKGBUILD
extra/acpid/PKGBUILD
extra/apache-ant/PKGBUILD
extra/aria2/PKGBUILD
extra/boost/PKGBUILD
extra/bs/PKGBUILD
extra/bzr/PKGBUILD
extra/cvsps/PKGBUILD
extra/dosbox/PKGBUILD
extra/ettercap-gtk/PKGBUILD
extra/fetchmail/PKGBUILD
extra/gnome-desktop-sharp/PKGBUILD
extra/gnome-panel/PKGBUILD
extra/gptfdisk/PKGBUILD
extra/gqmpeg/PKGBUILD
extra/gstreamer0.10-base/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/gtk-theme-switch2/PKGBUILD
extra/icecast/PKGBUILD
extra/kdeedu/PKGBUILD
extra/kmldonkey/PKGBUILD
extra/kmplayer/PKGBUILD
extra/libbtctl/PKGBUILD
extra/libftdi/PKGBUILD
extra/liborigin2/PKGBUILD
extra/libpst/PKGBUILD
extra/libx86/PKGBUILD
extra/lsdvd/PKGBUILD
extra/mc/PKGBUILD
extra/monotone/PKGBUILD
extra/multitail/PKGBUILD
extra/nbsmtp/PKGBUILD
extra/nickle/PKGBUILD
extra/nppangband/PKGBUILD
extra/numlockx/PKGBUILD
extra/pidgin/PKGBUILD
extra/poppler/PKGBUILD
extra/python-gtkglext/PKGBUILD
extra/scim/PKGBUILD
extra/socat/PKGBUILD
extra/speedcrunch/PKGBUILD
extra/transmission/PKGBUILD
extra/vbetool/PKGBUILD
extra/vlc/PKGBUILD
extra/xchat-gnome/xchat-gnome.install
libre/kernel26-libre/PKGBUILD
libre/pacman/PKGBUILD
libre/xchat-gnome-libre/PKGBUILD
libre/xchat-gnome-libre/gtk2-2.20.patch
libre/xchat-gnome-libre/xchat-gnome-0.26.1-deprecated-symbol.patch
libre/xchat-gnome-libre/xchat-gnome.install
multilib/nspluginwrapper/PKGBUILD
testing/libgweather/libgweather.install
testing/mesa/PKGBUILD
Diffstat (limited to 'community')
108 files changed, 1672 insertions, 868 deletions
diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD index 65727809c..b3851c4b6 100644 --- a/community/aria2/PKGBUILD +++ b/community/aria2/PKGBUILD @@ -1,27 +1,31 @@ -# $Id: PKGBUILD 46952 2011-05-13 20:41:04Z andrea $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=aria2 -pkgver=1.11.1 +pkgver=1.11.2 pkgrel=1 -pkgdesc="Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink" +pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink' arch=('i686' 'x86_64') -url="http://aria2.sourceforge.net/" +url='http://aria2.sourceforge.net/' license=('GPL') depends=('gnutls' 'libxml2' 'sqlite3' 'c-ares' 'ca-certificates') -source=(http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.bz2) -md5sums=('da785645a6d92450b0a54f384202ba6b') -sha1sums=('b3b37cc7363305d55e86dcd74a73dc493ecfa530') +source=("http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.bz2") +sha1sums=('db4761fa311e6d1f9526d1ee25461c2db84750ff') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt + cd aria2-${pkgver} + + ./configure \ + --prefix=/usr \ + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd aria2-${pkgver} + + make DESTDIR=${pkgdir} install } diff --git a/community/autofs/0001-autofs-5.0.5-include-krb5-library.patch b/community/autofs/0001-autofs-5.0.5-include-krb5-library.patch new file mode 100644 index 000000000..572ca97fd --- /dev/null +++ b/community/autofs/0001-autofs-5.0.5-include-krb5-library.patch @@ -0,0 +1,206 @@ +From e467755fac27630730be25c4b41e5d0cfcd89c67 Mon Sep 17 00:00:00 2001 +From: Ian Kent <raven@themaw.net> +Date: Tue, 10 Aug 2010 15:48:21 +0800 +Subject: [PATCH 1/2] autofs-5.0.5 - include krb5 library + +Since the Cyrus SASL module calls Kerberos directly we should be +linking against the Kerberos librarys. +--- + Makefile.conf.in | 2 + + aclocal.m4 | 19 +++++++++++++++ + configure | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++- + configure.in | 5 +++- + modules/Makefile | 4 +- + 5 files changed, 93 insertions(+), 4 deletions(-) + +diff --git a/Makefile.conf.in b/Makefile.conf.in +index f0287c3..a9bcf8c 100644 +--- a/Makefile.conf.in ++++ b/Makefile.conf.in +@@ -31,6 +31,8 @@ XML_FLAGS = @XML_FLAGS@ + SASL = @HAVE_SASL@ + LIBSASL= @LIBSASL@ + SASL_FLAGS = @SASL_FLAGS@ ++KRB5_LIBS=@KRB5_LIBS@ ++KRB5_FLAGS=@KRB5_FLAGS@ + + # NIS+ support: yes (1) no (0) + NISPLUS = @HAVE_NISPLUS@ +diff --git a/aclocal.m4 b/aclocal.m4 +index e7f1a30..750a159 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -215,6 +215,25 @@ else + fi]) + + dnl -------------------------------------------------------------------------- ++dnl AF_CHECK_KRB5 ++dnl ++dnl Check for Kerberos 5 ++dnl -------------------------------------------------------------------------- ++AC_DEFUN([AF_CHECK_KRB5], ++[AC_PATH_PROGS(KRB5_CONFIG, krb5-config, no) ++AC_MSG_CHECKING(for Kerberos library) ++if test "$KRB5_CONFIG" = "no" ++then ++ AC_MSG_RESULT(no) ++ HAVE_KRB5=0 ++else ++ AC_MSG_RESULT(yes) ++ HAVE_KRB5=1 ++ KRB5_LIBS=`$KRB5_CONFIG --libs` ++ KRB5_FLAGS=`$KRB5_CONFIG --cflags` ++fi]) ++ ++dnl -------------------------------------------------------------------------- + dnl AF_CHECK_LIBHESIOD + dnl + dnl Check for lib hesiod +diff --git a/configure b/configure +index 159f25f..500411c 100755 +--- a/configure ++++ b/configure +@@ -640,6 +640,8 @@ ac_subst_vars='LTLIBOBJS + LIBOBJS + DAEMON_LDFLAGS + DAEMON_CFLAGS ++KRB5_FLAGS ++KRB5_LIBS + LIBSASL + HAVE_SASL + SASL_FLAGS +@@ -657,6 +659,7 @@ LIBHESIOD + HAVE_HESIOD + LIBRESOLV + LIBNSL ++KRB5_CONFIG + XML_CONFIG + PATH_RPCGEN + RPCGEN +@@ -3723,7 +3726,7 @@ $as_echo "no" >&6; } + fi + fi + +-# LDAP SASL auth need libxml ++# LDAP SASL auth needs libxml and Kerberos + for ac_prog in xml2-config + do + # Extract the first word of "$ac_prog", so it can be a program name with args. +@@ -3801,6 +3804,66 @@ _ACEOF + fi + fi + fi ++for ac_prog in krb5-config ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_KRB5_CONFIG+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ case $KRB5_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_KRB5_CONFIG="$KRB5_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_path_KRB5_CONFIG="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++KRB5_CONFIG=$ac_cv_path_KRB5_CONFIG ++if test -n "$KRB5_CONFIG"; then ++ { $as_echo "$as_me:$LINENO: result: $KRB5_CONFIG" >&5 ++$as_echo "$KRB5_CONFIG" >&6; } ++else ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$KRB5_CONFIG" && break ++done ++test -n "$KRB5_CONFIG" || KRB5_CONFIG="no" ++ ++{ $as_echo "$as_me:$LINENO: checking for Kerberos library" >&5 ++$as_echo_n "checking for Kerberos library... " >&6; } ++if test "$KRB5_CONFIG" = "no" ++then ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++ HAVE_KRB5=0 ++else ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } ++ HAVE_KRB5=1 ++ KRB5_LIBS=`$KRB5_CONFIG --libs` ++ KRB5_FLAGS=`$KRB5_CONFIG --cflags` ++fi + + # + # glibc/libc 6 new libraries +@@ -5178,6 +5241,8 @@ fi + + + ++ ++ + LDFLAGS="${AF_tmp_ldflags}" + + # +diff --git a/configure.in b/configure.in +index f649a58..70b45e8 100644 +--- a/configure.in ++++ b/configure.in +@@ -144,8 +144,9 @@ AF_CHECK_PROG(RPCGEN, rpcgen, , $searchpath) + # + AF_SLOPPY_MOUNT() + +-# LDAP SASL auth need libxml ++# LDAP SASL auth needs libxml and Kerberos + AF_CHECK_LIBXML() ++AF_CHECK_KRB5() + + # + # glibc/libc 6 new libraries +@@ -274,6 +275,8 @@ AC_SUBST(XML_LIBS) + AC_SUBST(SASL_FLAGS) + AC_SUBST(HAVE_SASL) + AC_SUBST(LIBSASL) ++AC_SUBST(KRB5_LIBS) ++AC_SUBST(KRB5_FLAGS) + LDFLAGS="${AF_tmp_ldflags}" + + # +diff --git a/modules/Makefile b/modules/Makefile +index 13b3bd8..2389196 100644 +--- a/modules/Makefile ++++ b/modules/Makefile +@@ -42,8 +42,8 @@ ifeq ($(LDAP), 1) + MODS += lookup_ldap.so + ifeq ($(SASL), 1) + SASL_OBJ = cyrus-sasl.o +- LDAP_FLAGS += $(SASL_FLAGS) $(XML_FLAGS) -DLDAP_THREAD_SAFE +- LIBLDAP += $(LIBSASL) $(XML_LIBS) ++ LDAP_FLAGS += $(SASL_FLAGS) $(XML_FLAGS) $(KRB5_FLAGS) -DLDAP_THREAD_SAFE ++ LIBLDAP += $(LIBSASL) $(XML_LIBS) $(KRB5_LIBS) + endif + endif + +-- +1.7.5.1 + diff --git a/community/autofs/0002-autofs-5.0.5-remove-ERR_remove_state-openssl-call.patch b/community/autofs/0002-autofs-5.0.5-remove-ERR_remove_state-openssl-call.patch new file mode 100644 index 000000000..e4e480e82 --- /dev/null +++ b/community/autofs/0002-autofs-5.0.5-remove-ERR_remove_state-openssl-call.patch @@ -0,0 +1,59 @@ +From 205c305922cdbded91ff8fadbaad7959bdb497bc Mon Sep 17 00:00:00 2001 +From: Ian Kent <raven@themaw.net> +Date: Wed, 11 Aug 2010 09:33:09 +0800 +Subject: [PATCH 2/2] autofs-5.0.5 - remove ERR_remove_state() openssl call + +autofs should never have had to use ERR_remove_state() so remove that call. + +Lukas: Resolve a conflict in "CHANGELOG" that occured due to cherry +picking Kerberos related patches from the 5.0.6 development branch. + +Conflicts: + + CHANGELOG + +Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de> +--- + CHANGELOG | 4 ++++ + modules/lookup_ldap.c | 12 +----------- + 2 files changed, 5 insertions(+), 11 deletions(-) + +diff --git a/CHANGELOG b/CHANGELOG +index e734cb3..1a20a81 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -1,3 +1,7 @@ ++??/??/20?? autofs-5.0.6 ++----------------------- ++- remove ERR_remove_state() openssl call. ++ + 03/09/2009 autofs-5.0.5 + ----------------------- + - fix dumb libxml2 check +diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c +index 2ecf5fe..1221c2c 100644 +--- a/modules/lookup_ldap.c ++++ b/modules/lookup_ldap.c +@@ -168,18 +168,8 @@ int unbind_ldap_connection(unsigned logopt, LDAP *ldap, struct lookup_context *c + int rv; + + #ifdef WITH_SASL +- /* +- * The OpenSSL library can't handle having its message and error +- * string database loaded multiple times and segfaults if the +- * TLS environment is not reset at the right times. As there +- * is no ldap_stop_tls call in the openldap library we have +- * to do the job ourselves, here and in lookup_done when the +- * module is closed. +- */ +- if (ctxt->use_tls == LDAP_TLS_RELEASE) { +- ERR_remove_state(0); ++ if (ctxt->use_tls == LDAP_TLS_RELEASE) + ctxt->use_tls = LDAP_TLS_INIT; +- } + autofs_sasl_unbind(ctxt); + #endif + +-- +1.7.5.1 + diff --git a/community/autofs/PKGBUILD b/community/autofs/PKGBUILD index 26894dd02..743fde93c 100644 --- a/community/autofs/PKGBUILD +++ b/community/autofs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 46345 2011-05-05 11:57:37Z spupykin $ +# $Id: PKGBUILD 47057 2011-05-15 17:16:45Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Dale Blount <dale@archlinux.org> @@ -6,7 +6,7 @@ pkgname=autofs pkgver=5.0.5 -pkgrel=6 +pkgrel=7 pkgdesc='A kernel-based automounter for Linux.' arch=('i686' 'x86_64' 'mips64el') url='http://freshmeat.net/projects/autofs' @@ -18,11 +18,15 @@ backup=('etc/autofs/auto.master' options=(!makeflags) install='autofs.install' source=("http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar.bz2" + "0001-${pkgname}-5.0.5-include-krb5-library.patch" + "0002-${pkgname}-5.0.5-remove-ERR_remove_state-openssl-call.patch" 'autofs' 'autofs.conf.d' 'auto.master' 'auto.misc') md5sums=('a1d262cb6ebef0c2dd0fe22232fb3d5a' + '478737b8e3e79365a0e183aa95aab307' + 'e347999e5dffe142e7e57b067d3d9e9f' 'e307bf6d2638e46eeb916cf42fe029b2' '47f597c870410055e0fdb66103daf928' 'a6cefb591e77b31b79dbb7243646c96b' @@ -34,6 +38,9 @@ build() { sed -i "s:SUBDIRS = lib daemon modules man samples:SUBDIRS = lib daemon modules man:" \ Makefile.rules + patch -p1 -i "../0001-${pkgname}-5.0.5-include-krb5-library.patch" + patch -p1 -i "../0002-${pkgname}-5.0.5-remove-ERR_remove_state-openssl-call.patch" + ./configure --prefix=/usr --sysconfdir=/etc/autofs --with-mapdir=/etc/autofs --without-hesiod \ --enable-ignore-busy make diff --git a/community/autofs/heimdal.patch b/community/autofs/heimdal.patch deleted file mode 100644 index 4aa321834..000000000 --- a/community/autofs/heimdal.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- autofs-5.0.5/modules/cyrus-sasl.c~ 2010-03-03 01:38:41.582901786 +0100 -+++ autofs-5.0.5/modules/cyrus-sasl.c 2010-03-03 01:41:32.313704755 +0100 -@@ -66,6 +66,15 @@ - #endif - #endif - -+/** -+ * The type of a principal is different for MIT Krb5 and Heimdal. -+ * These macros are provided by Heimdal, and introduced here for MIT. -+ */ -+#ifndef krb5_realm_length -+#define krb5_realm_length(r) ((r).length) -+#define krb5_realm_data(r) ((r).data) -+#endif -+ - /* - * Once a krb5 credentials cache is setup, we need to set the KRB5CCNAME - * environment variable so that the library knows where to find it. -@@ -452,11 +452,11 @@ - - /* setup a principal for the ticket granting service */ - ret = krb5_build_principal_ext(ctxt->krb5ctxt, &tgs_princ, -- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length, -- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data, -+ krb5_realm_length(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)), -+ krb5_realm_data(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)), - strlen(KRB5_TGS_NAME), KRB5_TGS_NAME, -- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length, -- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data, -+ krb5_realm_length(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)), -+ krb5_realm_data(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)), - 0); - if (ret) { - error(logopt, ---- autofs-5.0.5/modules/Makefile~ 2010-03-03 01:42:18.532868539 +0100 -+++ autofs-5.0.5/modules/Makefile 2010-03-03 01:42:35.360367371 +0100 -@@ -43,7 +43,7 @@ - ifeq ($(SASL), 1) - SASL_OBJ = cyrus-sasl.o - LDAP_FLAGS += $(SASL_FLAGS) $(XML_FLAGS) -DLDAP_THREAD_SAFE -- LIBLDAP += $(LIBSASL) $(XML_LIBS) -+ LIBLDAP += $(LIBSASL) $(XML_LIBS) -lkrb5 - endif - endif
\ No newline at end of file diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index e6f9c227c..9ec165ff9 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 46560 2011-05-09 06:22:55Z andrea $ +# $Id: PKGBUILD 47955 2011-05-26 11:34:38Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Petrov Roman <nwhisper@gmail.com> # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> pkgname=calibre -pkgver=0.7.59 -pkgrel=3 +pkgver=0.8.2 +pkgrel=2 pkgdesc="Ebook management application" arch=('i686' 'x86_64') url="http://calibre-ebook.com/" license=('GPL3') -depends=('python-dateutil' 'python2-cssutils' 'python-pypdf' 'python2-cherrypy' +depends=('python-dateutil' 'python2-cssutils' 'python2-cherrypy' 'python-mechanize' 'podofo' 'libwmf' 'python-beautifulsoup' 'imagemagick' 'poppler-qt' 'chmlib' 'python-lxml' 'libusb' 'python-imaging' 'desktop-file-utils' 'shared-mime-info' @@ -20,13 +20,14 @@ optdepends=('ipython: to use calibre-debug') install=calibre.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz desktop_integration.patch) -md5sums=('78ebed5248758b9be1d135ae018b8dfe' +md5sums=('e64c92ccf29ac17bfaf4a296e17a38ba' 'bcc538a3b004429bf8f5a0ac1d89a37f') build() { cd "${srcdir}/${pkgname}" - rm -rf src/{cherrypy,pyPdf} + #rm -rf src/{cherrypy,pyPdf} + rm -rf src/cherrypy sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \ $(find . -regex ".*.py\|.*.recipe") diff --git a/community/cclive/PKGBUILD b/community/cclive/PKGBUILD index c7c273d5d..4acbcb555 100644 --- a/community/cclive/PKGBUILD +++ b/community/cclive/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 43777 2011-03-29 18:26:08Z lfleischer $ +# $Id: PKGBUILD 47638 2011-05-24 14:28:23Z tdziedzic $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: joyfulgirl@archlinux.us # Contributor: nathan owe ndowens04 at gmail dot com pkgname=cclive pkgver=0.7.3.1 -pkgrel=2 +pkgrel=3 pkgdesc='Commandline downloader for popular video websites.' arch=('i686' 'x86_64' 'mips64el') url='http://cclive.sourceforge.net/' @@ -16,11 +16,15 @@ source=("http://downloads.sourceforge.net/project/${pkgname}/0.7/${pkgname}-${pk md5sums=('de25297e9f34677d4d1920078d9cf254') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - cmake -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=/usr + cd ${pkgname}-${pkgver} + + cmake \ + -DCMAKE_BUILD_TYPE=debug \ + -DCMAKE_INSTALL_PREFIX=/usr } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install } diff --git a/community/ccrtp/PKGBUILD b/community/ccrtp/PKGBUILD index 9ec615de8..e50fdefcc 100644 --- a/community/ccrtp/PKGBUILD +++ b/community/ccrtp/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 33232 2010-11-23 12:15:12Z spupykin $ +# $Id: PKGBUILD 47033 2011-05-14 10:27:41Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=ccrtp -pkgver=1.7.1 +pkgver=1.8.0 pkgrel=1 pkgdesc="GNU ccRTP" arch=('i686' 'x86_64' 'mips64el') @@ -13,11 +13,13 @@ url="http://www.gnu.org/software/ccrtp" license=('GPL' 'custom') depends=('commoncpp2' 'zlib' 'libxml2' 'libgcrypt') options=('!libtool') -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('9f5d34a18f2c1c779d2e5818cc4987f8') +source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz gcc46.patch) +md5sums=('3410d2f43a6a28679bd091ed8b2ed228' + '17ce9c79c4518f35f484b539bcff570d') build() { cd ${srcdir}/${pkgname}-${pkgver} + patch -Np1 -i $srcdir/gcc46.patch # arch64 fix from Mandriva [ "$CARCH" == "x86_64" ] && export CXXFLAGS="$CXXFLAGS -fpermissive" ./configure --prefix=/usr diff --git a/community/ccrtp/gcc46.patch b/community/ccrtp/gcc46.patch new file mode 100644 index 000000000..a4b25b369 --- /dev/null +++ b/community/ccrtp/gcc46.patch @@ -0,0 +1,11 @@ +diff -aur ccrtp-1.8.0.old//src/ccrtp/sources.h ccrtp-1.8.0.new//src/ccrtp/sources.h +--- ccrtp-1.8.0.old//src/ccrtp/sources.h 2011-05-14 03:15:35.993564505 -0700 ++++ ccrtp-1.8.0.new//src/ccrtp/sources.h 2011-05-14 03:19:02.033569568 -0700 +@@ -46,6 +46,7 @@ + + #include <string> + #include <ccrtp/rtcppkt.h> ++#include <stddef.h> + + #ifdef CCXX_NAMESPACES + namespace ost { diff --git a/community/cherokee/PKGBUILD b/community/cherokee/PKGBUILD index 091e9dfa9..e312ba5ef 100644 --- a/community/cherokee/PKGBUILD +++ b/community/cherokee/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 42879 2011-03-22 02:06:35Z foutrelis $ +# $Id: PKGBUILD 47874 2011-05-25 20:20:57Z foutrelis $ # Maintainer: Evangelos Foutras <foutrelis@gmail.com> # Contributor: Link Dupont <link@subpop.net> pkgname=cherokee -pkgver=1.2.2 -pkgrel=2 +pkgver=1.2.98 +pkgrel=1 pkgdesc="A very fast, flexible and easy to configure Web Server" arch=('i686' 'x86_64' 'mips64el') url="http://www.cherokee-project.com/" @@ -25,7 +25,7 @@ options=('!libtool') source=(http://www.cherokee-project.com/download/1.2/$pkgver/cherokee-$pkgver.tar.gz cherokee.rc cherokee.logrotate) -md5sums=('6450f0aa116966227c477a1930292e53' +md5sums=('21b01e7d45c0e82ecc0c4257a9c27feb' 'a2d2b69c6220fab57cda4f531b680f9f' '8d69341bd4002bffd69c6e82ff6c905f') @@ -38,10 +38,15 @@ build() { # Use Python 2 in cherokee-admin sed -i 's/"python"/"python2"/' cherokee/main_admin.c - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --with-wwwroot=/srv/http --disable-static \ - --with-wwwuser=http --with-wwwgroup=http \ - --enable-os-string="Arch Linux" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --with-wwwroot=/srv/http \ + --with-wwwuser=http \ + --with-wwwgroup=http \ + --enable-os-string="Arch Linux" make } diff --git a/community/chmsee/PKGBUILD b/community/chmsee/PKGBUILD index f8def59e5..aeb5968f6 100644 --- a/community/chmsee/PKGBUILD +++ b/community/chmsee/PKGBUILD @@ -4,16 +4,16 @@ # Contributor: Ermanno <erm67@yahoo.it> pkgname=chmsee -pkgver=1.3.0 -pkgrel=2 -arch=('i686' 'x86_64' 'mips64el') +pkgver=1.3.1.1 +pkgrel=1 +arch=('i686' 'x86_64') pkgdesc="A chm (MS HTML help file format) viewer based on xulrunner." url="http://chmsee.googlecode.com/" license="GPL" -depends=('xulrunner' 'libglade' 'chmlib') +depends=('xulrunner>=2.0' 'libglade' 'chmlib') makedepends=('intltool' 'cmake') source=(http://chmsee.googlecode.com/files/$pkgname-$pkgver.tar.gz) -md5sums=('5ba68ccee32ba782486badc025842ccf') +md5sums=('7c226e6f518284a040ad3b9433d5e218') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/courier-imap/PKGBUILD b/community/courier-imap/PKGBUILD index caaba4ce1..e54fb7dd5 100644 --- a/community/courier-imap/PKGBUILD +++ b/community/courier-imap/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75457 2010-04-01 16:36:45Z giovanni $ +# $Id: PKGBUILD 47569 2011-05-23 20:05:54Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: tobias <tobias@archlinux.org> # Committer: Manolis Tzanidakis <manolis@archlinux.org> pkgname=courier-imap -pkgver=4.9.1 +pkgver=4.9.3 pkgrel=1 pkgdesc="IMAP(s)/POP3(s) Server" arch=('i686' 'x86_64' 'mips64el') @@ -21,7 +21,7 @@ options=('!libtool') source=(http://downloads.sourceforge.net/project/courier/imap/${pkgver}/${pkgname}-${pkgver}.tar.bz2 courier-imap.conf.d courier-imap.rc.d) -md5sums=('780929e509c4e9199d5efc68d9158ba1' +md5sums=('703ddbb090569436dbda61d0d62b1eb8' '3e08f017f6c5a52dea28f6f0dbd50b86' '3e4910c5a34af68dfdeed932e573a9f9') diff --git a/community/courier-maildrop/PKGBUILD b/community/courier-maildrop/PKGBUILD index 3ded9fd3b..e0706c442 100644 --- a/community/courier-maildrop/PKGBUILD +++ b/community/courier-maildrop/PKGBUILD @@ -5,7 +5,7 @@ pkgname=courier-maildrop _srcname=maildrop -pkgver=2.5.3 +pkgver=2.5.4 pkgrel=1 pkgdesc="mail delivery agent - procmail like but nicer syntax" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ depends=('courier-authlib>=0.63.0' 'fam' 'pcre' 'gdbm') conflicts=('courier-mta') options=(!libtool) source=(http://downloads.sourceforge.net/project/courier/${_srcname}/${pkgver}/${_srcname}-${pkgver}.tar.bz2) -md5sums=('5ba52236cec2947e75fafcd6146fd8cd') +md5sums=('5770345cdceae28bdc24809e7adb3426') build() { cd ${srcdir}/${_srcname}-${pkgver} diff --git a/community/deadbeef/PKGBUILD b/community/deadbeef/PKGBUILD index fee376514..c4c21332d 100644 --- a/community/deadbeef/PKGBUILD +++ b/community/deadbeef/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 36041 2010-12-25 20:18:47Z lfleischer $ +# $Id: PKGBUILD 47194 2011-05-18 15:41:47Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Alexey Yakovenko <waker@users.sourceforge.net> pkgname=deadbeef -pkgver=0.4.4 +pkgver=0.5.0 pkgrel=2 pkgdesc='An audio player for GNU/Linux based on GTK2.' arch=('i686' 'x86_64' 'mips64el') url='http://deadbeef.sourceforge.net' license=('GPL2') -depends=('gtk2' 'libsamplerate' 'alsa-lib') -makedepends=('gtk2' 'libsamplerate' 'libvorbis' 'libmad' 'flac' 'curl' 'alsa-lib' 'wavpack' 'libsndfile' 'libcdio' 'libcddb' 'ffmpeg' 'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig' 'libpulse') +depends=('gtk2' 'libsamplerate' 'alsa-lib' 'hicolor-icon-theme' 'desktop-file-utils') +makedepends=('libvorbis' 'libmad' 'flac' 'curl' 'wavpack' 'libsndfile' 'libcdio' 'libcddb' 'ffmpeg' + 'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig' 'libpulse' 'libzip') optdepends=('libvorbis: for Ogg Vorbis playback' 'libmad: for MP1/MP2/MP3 playback' 'flac: for FLAC playback' @@ -28,7 +29,7 @@ optdepends=('libvorbis: for Ogg Vorbis playback' options=('!libtool') install='deadbeef.install' source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('546e63d456d6a5625461019b15501e38') +md5sums=('713c47c5e7bb9a29cd0de877aff04ae6') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/dmenu/PKGBUILD b/community/dmenu/PKGBUILD index bb01f18f4..39157f110 100644 --- a/community/dmenu/PKGBUILD +++ b/community/dmenu/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 32958 2010-11-20 11:22:07Z ttopper $ +# $Id: PKGBUILD 47199 2011-05-18 20:06:50Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Thayer Williams <thayer@archlinux.org> # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> pkgname=dmenu -pkgver=4.2.1 +pkgver=4.3.1 pkgrel=1 pkgdesc="A generic menu for X" url="http://tools.suckless.org/dmenu/" @@ -14,7 +14,7 @@ license=('MIT') depends=('sh' 'libxinerama') #source=("http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz") source=("$pkgname-$pkgver.tar.gz::http://hg.suckless.org/dmenu/archive/tip.tar.gz") -md5sums=('48b1e63cbf0ae7993cc68d365412d5e5') +md5sums=('a0e253e2a38c96f7bfd80b23a9ba6a12') build(){ # cd $srcdir/$pkgname-$pkgver diff --git a/community/docky/bzr-1798.diff b/community/docky/bzr-1798.diff deleted file mode 100644 index 4fcfb9fa2..000000000 --- a/community/docky/bzr-1798.diff +++ /dev/null @@ -1,170 +0,0 @@ -=== modified file 'Docky.CairoHelper/Docky.CairoHelper/DockySurface.cs' ---- Docky.CairoHelper/Docky.CairoHelper/DockySurface.cs 2010-12-29 15:35:31 +0000 -+++ Docky.CairoHelper/Docky.CairoHelper/DockySurface.cs 2011-03-13 17:16:18 +0000 -@@ -150,7 +150,7 @@ - { - DockySurface result = new DockySurface (area.Width, area.Height, this); - -- Internal.Show (result.Context, 0 - area.X, 0 - area.Y); -+ Internal.Show (result.Context, -area.X, -area.Y); - - return result; - } - -=== modified file 'Docky.Items/Docky.Painters/PagingDockPainter.cs' ---- Docky.Items/Docky.Painters/PagingDockPainter.cs 2011-01-26 04:43:08 +0000 -+++ Docky.Items/Docky.Painters/PagingDockPainter.cs 2011-03-13 17:16:18 +0000 -@@ -117,7 +117,7 @@ - ShowBuffer (surface, LastPage, offset); - } else { - ShowBuffer (surface, Page, Allocation.Width - offset); -- ShowBuffer (surface, LastPage, 0 - offset); -+ ShowBuffer (surface, LastPage, -offset); - } - - // fade out the edges during a slide - -=== modified file 'Docky/Docky/CairoHelper/DockySurface_Extensions.cs' ---- Docky/Docky/CairoHelper/DockySurface_Extensions.cs 2010-12-29 08:12:28 +0000 -+++ Docky/Docky/CairoHelper/DockySurface_Extensions.cs 2011-03-13 17:16:18 +0000 -@@ -44,15 +44,15 @@ - double cos, sin; - cos = Math.Cos (rotation); - sin = Math.Sin (rotation); -- Matrix m = new Matrix (cos, sin, 0 - sin, cos, point.X, point.Y); -+ Matrix m = new Matrix (cos, sin, -sin, cos, point.X, point.Y); - cr.Transform (m); - - if (zoom != 1) - cr.Scale (zoom, zoom); - - cr.SetSource (self.Internal, -- 0 - self.Width / 2, -- 0 - self.Height / 2); -+ -self.Width / 2, -+ -self.Height / 2); - - cr.PaintWithAlpha (opacity); - -@@ -85,7 +85,7 @@ - double cos, sin; - cos = Math.Cos (rotation); - sin = Math.Sin (rotation); -- Matrix m = new Matrix (cos, sin, 0 - sin, cos, point.X, point.Y); -+ Matrix m = new Matrix (cos, sin, -sin, cos, point.X, point.Y); - cr.Transform (m); - - if (zoom != 1) -@@ -97,8 +97,8 @@ - cr.Scale (1, -1); - - cr.SetSource (self.Internal, -- 0 - self.Width / 2, -- 0 - self.Height / 2); -+ -self.Width / 2, -+ -self.Height / 2); - - cr.PaintWithAlpha (opacity * .3); - - -=== modified file 'Docky/Docky/Interface/DockWindow.cs' ---- Docky/Docky/Interface/DockWindow.cs 2011-03-03 08:59:59 +0000 -+++ Docky/Docky/Interface/DockWindow.cs 2011-03-13 17:16:18 +0000 -@@ -2749,10 +2749,10 @@ - } else { - switch (Position) { - case DockPosition.Top: -- cr.SetSource (main_buffer.Internal, 0, 0 - HideOffset * ZoomedDockHeight); -+ cr.SetSource (main_buffer.Internal, 0, -HideOffset * ZoomedDockHeight); - break; - case DockPosition.Left: -- cr.SetSource (main_buffer.Internal, 0 - HideOffset * ZoomedDockHeight, 0); -+ cr.SetSource (main_buffer.Internal, -HideOffset * ZoomedDockHeight, 0); - break; - case DockPosition.Right: - cr.SetSource (main_buffer.Internal, HideOffset * ZoomedDockHeight, 0); - -=== modified file 'Docky/Docky/Menus/DockMenu.cs' ---- Docky/Docky/Menus/DockMenu.cs 2010-10-15 15:32:36 +0000 -+++ Docky/Docky/Menus/DockMenu.cs 2011-03-13 17:16:18 +0000 -@@ -543,15 +543,15 @@ - switch (Orientation) { - case DockPosition.Top: - cr.Scale (1, -1); -- cr.Translate (0, 0 - background_buffer.Height); -+ cr.Translate (0, -background_buffer.Height); - break; - case DockPosition.Left: - cr.Rotate (Math.PI * .5); -- cr.Translate (0, 0 - background_buffer.Height); -+ cr.Translate (0, -background_buffer.Height); - break; - case DockPosition.Right: - cr.Rotate (Math.PI * -0.5); -- cr.Translate (0 - background_buffer.Width, 0); -+ cr.Translate (-background_buffer.Width, 0); - break; - } - - -=== modified file 'StandardPlugins/Clock/src/ClockDockItem.cs' ---- StandardPlugins/Clock/src/ClockDockItem.cs 2010-11-21 22:19:54 +0000 -+++ StandardPlugins/Clock/src/ClockDockItem.cs 2011-03-13 17:16:18 +0000 -@@ -388,20 +388,20 @@ - double minuteRotation = 2 * Math.PI * (DateTime.Now.Minute / 60.0) + Math.PI; - cr.Rotate (minuteRotation); - cr.MoveTo (0, radius - radius * .35); -- cr.LineTo (0, 0 - radius * .15); -+ cr.LineTo (0, -radius * .15); - cr.Stroke (); -- cr.Rotate (0 - minuteRotation); -+ cr.Rotate (-minuteRotation); - - cr.Color = new Cairo.Color (0, 0, 0); - double hourRotation = 2 * Math.PI * (DateTime.Now.Hour / (ShowMilitary ? 24.0 : 12.0)) + - Math.PI + (Math.PI / (ShowMilitary ? 12.0 : 6.0)) * DateTime.Now.Minute / 60.0; - cr.Rotate (hourRotation); - cr.MoveTo (0, radius - radius * .5); -- cr.LineTo (0, 0 - radius * .15); -+ cr.LineTo (0, -radius * .15); - cr.Stroke (); -- cr.Rotate (0 - hourRotation); -+ cr.Rotate (-hourRotation); - -- cr.Translate (0 - center, 0 - center); -+ cr.Translate (-center, -center); - - RenderFileOntoContext (cr, System.IO.Path.Combine (ThemePath, "clock-glass.svg"), radius * 2); - RenderFileOntoContext (cr, System.IO.Path.Combine (ThemePath, "clock-frame.svg"), radius * 2); - -=== modified file 'Docky/Docky/ConfigurationWindow.cs' ---- Docky/Docky/ConfigurationWindow.cs 2011-02-05 08:06:51 +0000 -+++ Docky/Docky/ConfigurationWindow.cs 2011-03-15 07:48:42 +0000 -@@ -94,9 +94,10 @@ - this.SetCompositeColormap (); - Stick (); - -- // why 1? because Compiz sucks... thats why! -- Move (0, 1); -- SetSizeRequest (Screen.Width, Screen.Height - 1); -+ // make the window extend off screen in all directions -+ // to work around problems with struts -+ Move (-50, -50); -+ SetSizeRequest (Screen.Width + 100, Screen.Height + 100); - } - - void HandleRealized (object sender, EventArgs e) - -=== modified file 'Docky/Docky/Interface/DockDragTracker.cs' ---- Docky/Docky/Interface/DockDragTracker.cs 2011-03-10 10:48:09 +0000 -+++ Docky/Docky/Interface/DockDragTracker.cs 2011-03-15 07:49:42 +0000 -@@ -539,7 +539,7 @@ - EnableDragTo (); - } else if ((Owner.CursorTracker.Modifier & ModifierType.Button1Mask) == ModifierType.Button1Mask) { - Gdk.Window bestProxy = BestProxyWindow (); -- if (proxy_window != bestProxy) { -+ if (bestProxy != null && proxy_window != bestProxy) { - proxy_window = bestProxy; - Gtk.Drag.DestSetProxy (Owner, proxy_window, DragProtocol.Xdnd, true); - } - diff --git a/community/elinks/PKGBUILD b/community/elinks/PKGBUILD index 0411750a5..d93e15ab6 100644 --- a/community/elinks/PKGBUILD +++ b/community/elinks/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 40826 2011-02-28 13:59:43Z spupykin $ +# $Id: PKGBUILD 47522 2011-05-23 18:32:02Z kkeen $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: damir <damir@archlinux.org> @@ -6,22 +6,38 @@ pkgname=elinks pkgver=0.13 -pkgrel=4 +_commit="fe83703714fd5e16401dcd152d9bdcec6036424d" +pkgrel=5 pkgdesc="An advanced and well-established feature-rich text mode web browser." arch=("i686" "x86_64" 'mips64el') url="http://elinks.or.cz" license=('GPL') depends=('bzip2' 'expat>=2.0' 'gpm>=1.20.4' 'openssl' 'lua>=5.1.1' 'libidn' 'spidermonkey>=1.7.0' 'gc' 'tre' 'smbclient') -_commit="dfc666dd754491a9c986fbd19179b354acde30b9" -#source=("elinks-$pkgver-${_commit}.tar.gz::http://repo.or.cz/w/elinks.git/snapshot/${_commit}.tar.gz" -source=("http://arch.p5n.pp.ru/~sergej/dl/elinks-$pkgver-${_commit}.tar.gz" - "${pkgname}.desktop") -md5sums=('c41d66285654d72c197a99973393bf06' - 'ef70f6bb7457799a979fb201615369e6') +source=() +md5sums=() + +__gitroot="http://elinks.cz/elinks.git" +__gitname="elinks" build() { - cd elinks || cd `find $srcdir -maxdepth 1 -type d -name elinks-$pkgver\*` + cd "$srcdir" + msg "Connecting to GIT server...." + + if [ -d $__gitname ] ; then + cd $__gitname && git pull origin + msg "The local files are updated." + else + git clone $__gitroot + fi + + msg "GIT checkout done or server timeout" + msg "Starting make..." + + rm -rf "$srcdir/$__gitname-build" + git clone "$srcdir/$__gitname" "$srcdir/$__gitname-build" + cd "$srcdir/$__gitname-build" + git checkout "$_commit" [ -x configure ] || sh autogen.sh ./configure --prefix=/usr --mandir=/usr/share/man \ @@ -30,9 +46,13 @@ build() { --enable-leds --enable-256-colors --enable-html-highlight \ --with-zlib make - make DESTDIR=${pkgdir} install - rm -f ${pkgdir}/usr/share/locale/locale.alias +} + +package() { + cd "$srcdir/$__gitname-build" + make DESTDIR="$pkgdir" install + rm -f "$pkgdir/usr/share/locale/locale.alias" - install -D -m644 ${srcdir}/${pkgname}.desktop \ - ${pkgdir}/usr/share/applications/${pkgname}.desktop + install -D -m644 "$srcdir/$__gitname-build/contrib/debian/$pkgname.desktop" \ + "$pkgdir/usr/share/applications/$pkgname.desktop" } diff --git a/community/encfs/PKGBUILD b/community/encfs/PKGBUILD index decc78a79..b996779ba 100644 --- a/community/encfs/PKGBUILD +++ b/community/encfs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 40979 2011-03-02 23:44:42Z tdziedzic $ +# $Id: PKGBUILD 47658 2011-05-24 17:28:48Z jelle $ # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: Sven Kauber, <celeon@gmail.com> @@ -6,7 +6,7 @@ pkgname=encfs pkgver=1.7.4 -pkgrel=3 +pkgrel=4 pkgdesc='Encrypted filesystem in user-space' arch=('i686' 'x86_64' 'mips64el') url='http://www.arg0.net/encfs' diff --git a/community/eterm/PKGBUILD b/community/eterm/PKGBUILD index ea705b225..332dfcd9b 100644 --- a/community/eterm/PKGBUILD +++ b/community/eterm/PKGBUILD @@ -1,10 +1,11 @@ # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Adam 'battlemidget' Stokes <adam.stokes@gmail.com> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Maintainer: Brad Fanella <bradfanella@archlinux.us> pkgname=eterm -pkgver=0.9.5 -pkgrel=4 +pkgver=0.9.6 +pkgrel=1 pkgdesc="A vt102 terminal emulator intended as a replacement for xterm." arch=('i686' 'x86_64' 'mips64el') url="http://www.eterm.org/" @@ -12,7 +13,7 @@ license=('custom') depends=('freetype2>=2.3.5' 'libast>=0.7' 'libxmu' 'libxres') options=('!libtool') source=(http://www.eterm.org/download/Eterm-${pkgver}.tar.gz) -md5sums=('87220a61f763d111a4f5fc88ef9e50f1') +md5sums=('90e424584c22d4050496874d14f78bb1') build() { cd ${srcdir}/Eterm-${pkgver} @@ -32,3 +33,4 @@ package() { install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } + diff --git a/community/fatrat/PKGBUILD b/community/fatrat/PKGBUILD index 55ee84975..e3d246e34 100644 --- a/community/fatrat/PKGBUILD +++ b/community/fatrat/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 40982 2011-03-03 00:04:39Z tdziedzic $ +# $Id: PKGBUILD 47629 2011-05-24 14:03:19Z tdziedzic $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=fatrat pkgver=1.1.3 -pkgrel=3 +pkgrel=4 pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more" arch=('i686' 'x86_64' 'mips64el') url="http://fatrat.dolezel.info/" @@ -14,16 +14,20 @@ source=(http://www.dolezel.info/download/data/fatrat/fatrat-$pkgver.tar.gz) md5sums=('6d4a00cdd0b59a05b1521184508d4637') build() { - cd "$srcdir"/$pkgname-$pkgver + cd $pkgname-$pkgver export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" - cmake -DWITH_EVERYTHING=ON -DCMAKE_INSTALL_PREFIX=/usr . + cmake \ + -DWITH_EVERYTHING=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + . + make } package() { - cd "$srcdir"/$pkgname-$pkgver + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/community/filezilla/PKGBUILD b/community/filezilla/PKGBUILD index 8667a63bb..ba65abe77 100644 --- a/community/filezilla/PKGBUILD +++ b/community/filezilla/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 43810 2011-03-29 21:55:24Z jelle $ +# $Id: PKGBUILD 47441 2011-05-23 10:00:33Z jelle $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=filezilla -pkgver=3.4.0 +pkgver=3.5.0 pkgrel=1 pkgdesc="Fast and reliable FTP, FTPS and SFTP client" arch=('i686' 'x86_64' 'mips64el') url="http://filezilla-project.org/" license=('GPL') -depends=('dbus-core' 'xdg-utils' 'wxgtk' 'libidn' 'hicolor-icon-theme') +depends=('dbus-core' 'xdg-utils' 'wxgtk' 'libidn' 'hicolor-icon-theme' 'sqlite3') install=filezilla.install source=("http://downloads.sourceforge.net/project/filezilla/FileZilla_Client/${pkgver}/FileZilla_${pkgver}_src.tar.bz2") md5sums=('25617d75167d07c0d3cfced69a4cf7cc') @@ -32,4 +32,4 @@ package() { make DESTDIR=${pkgdir} install } -md5sums=('837fbea08366b9f9de02b1671994697e') +md5sums=('6a83c3afe99c2679d5a3aa73607d80a7') diff --git a/community/flumotion/PKGBUILD b/community/flumotion/PKGBUILD index 74c1461cd..531c49b97 100644 --- a/community/flumotion/PKGBUILD +++ b/community/flumotion/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 40273 2011-02-22 18:15:11Z spupykin $ +# $Id: PKGBUILD 47404 2011-05-22 20:37:23Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> # Contributor: William Rea <sillywilly@gmail.com> pkgname=flumotion -pkgver=0.8.0 -pkgrel=6 -arch=('i686' 'x86_64' 'mips64el') +pkgver=0.8.1 +pkgrel=1 +arch=('i686' 'x86_64') pkgdesc="A streaming media server" url="http://www.flumotion.net" options=('!libtool') @@ -16,10 +16,8 @@ backup=(etc/flumotion/workers/default.xml depends=('gtk2' 'pygtk' 'gstreamer0.10-python' 'kiwi' 'gstreamer0.10-good-plugins' 'gstreamer0.10-base-plugins' 'python2-pyopenssl' 'twisted' 'gnome-vfs') makedepends=('perlxml') -source=(http://www.flumotion.net/src/$pkgname/$pkgname-$pkgver.tar.bz2 - python27.patch) -md5sums=('1df1f8fc47ca4cc6d3ead912f2ac76af' - '623a41a985d2b114c58db701c6d5d13e') +source=(http://www.flumotion.net/src/$pkgname/$pkgname-$pkgver.tar.bz2) +md5sums=('8970bb126a1720ae3f0b2d02924e5700') build() { cd "$srcdir/$pkgname-$pkgver" @@ -31,9 +29,6 @@ build() { sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file done - # python2.7 patch - patch -Np0 -i "$srcdir/python27.patch" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var install -d "$pkgdir/etc/$pkgname" diff --git a/community/frogatto/PKGBUILD b/community/frogatto/PKGBUILD index b4da0526c..fb3b6553d 100644 --- a/community/frogatto/PKGBUILD +++ b/community/frogatto/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 46852 2011-05-12 23:55:35Z svenstaro $ +# $Id: PKGBUILD 47675 2011-05-24 19:05:16Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Tom Wambold <tom5760@gmail.com> pkgname='frogatto' arch=('i686' 'x86_64') pkgver=1.1 -pkgrel=1 +pkgrel=2 pkgdesc="An old-school 2d platformer game, starring a certain quixotic frog" url="http://www.frogatto.com" license=('GPL') diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index 692b8894b..54a07dce9 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -7,12 +7,12 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' 'gambas3-gb-form-stock' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl' - 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre' + 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu' 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') pkgver=2.99.1 -pkgrel=1 +pkgrel=2 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64' 'mips64el') url="http://gambas.sourceforge.net/" @@ -21,15 +21,12 @@ groups=('gambas3') makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils' 'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'qt' 'gtk2' 'imlib2' 'gdk-pixbuf2' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3' 'librsvg' - 'curl' 'poppler' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'omniorb' + 'curl' 'poppler' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring') options=('!emptydirs' '!makeflags') source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" - 'gambas3.desktop' 'gambas3.png' 'gambas3-script.install' 'gambas3-runtime.install') -md5sums=('a888b85a926e713a953d6b0b261f820d' - '98472c78df490dec171851d81ddc495f' - 'ffc75028b45bd48f5cd79d36f3859cd2' +md5sums=('ab4c182b9d7dfec06b3a42bb002a779a' 'b284be39d147ec799f1116a6abc068b4' 'a8ec8e5a6aba7a7e453ce7a35c1800a9') @@ -96,9 +93,9 @@ package_gambas3-ide() { make XDG_UTILS='' DESTDIR="${pkgdir}" install #!! with the ide !! - install -D -m644 ${srcdir}/gambas3.desktop \ + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.desktop \ ${pkgdir}/usr/share/applications/gambas3.desktop - install -D -m644 ${srcdir}/gambas3.png \ + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.png \ ${pkgdir}/usr/share/pixmaps/gambas3.png rm -r ${pkgdir}/usr/bin/gb* @@ -697,6 +694,24 @@ package_gambas3-gb-opengl() { ## } +package_gambas3-gb-opengl-glu() { + depends=('gambas3-gb-opengl') + pkgdesc="Gambas3 GL Utility component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + package_gambas3-gb-opengl-glsl() { depends=('gambas3-gb-opengl') pkgdesc="Gambas3 GLSL component" diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD index 7a291ddb0..433981d5d 100644 --- a/community/gedit-plugins/PKGBUILD +++ b/community/gedit-plugins/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 45665 2011-04-26 21:32:06Z ibiru $ +# $Id: PKGBUILD 47971 2011-05-26 16:56:27Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> #Contributor: Hugo Doria <hugo@archlinux.org> #Contributor: Sergej Chodarev <sergejx@centrum.sk> #Contributor: zhuqin <zhuqin83@gmail.com> pkgname=gedit-plugins -pkgver=3.0.2 +pkgver=3.0.3 pkgrel=1 pkgdesc="Set of plugins for gedit" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ makedepends=('intltool' 'gnome-doc-utils') options=('!libtool' '!emptydirs') install=gedit-plugins.install source=(ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/3.0/$pkgname-$pkgver.tar.bz2) -sha256sums=('7152d3f5639258a0b5fb873521d36fc9919dee4c00ce9fb414045a2d8b0c06f6') +sha256sums=('d574accc1238fb45759c7b088154f934cdd1ef8f7dcb42420db02ee73a46af4b') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/glob2/PKGBUILD b/community/glob2/PKGBUILD index 9fc2ca432..053da0ecd 100644 --- a/community/glob2/PKGBUILD +++ b/community/glob2/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 40961 2011-03-02 21:23:41Z lcarlier $ +# $Id: PKGBUILD 47655 2011-05-24 16:52:31Z schuay $ # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> pkgname=glob2 pkgver=0.9.4.4 -pkgrel=7 +pkgrel=8 pkgdesc="RTS game which minimizes micro-management by automatically assigning tasks to units" arch=('i686' 'x86_64' 'mips64el') url="http://www.globulation2.org/" license=('GPL3') -depends=('boost-libs>=1.46' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'mesa' \ +depends=('boost-libs' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'mesa' \ 'fribidi' 'desktop-file-utils') -makedepends=('scons' 'boost>=1.46') +makedepends=('scons' 'boost') install=glob2.install source=(http://dl.sv.nongnu.org/releases/${pkgname}/0.9.4/${pkgname}-${pkgver}.tar.gz \ glob2-0.9.4.1-gcc44.patch) diff --git a/community/glom/PKGBUILD b/community/glom/PKGBUILD index 6200c084a..4dbef2056 100644 --- a/community/glom/PKGBUILD +++ b/community/glom/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 41025 2011-03-03 06:39:10Z svenstaro $ +# $Id: PKGBUILD 47669 2011-05-24 17:51:15Z schuay $ # Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=glom pkgver=1.16.1 -pkgrel=5 +pkgrel=6 pkgdesc="An easy-to-use database designer and user interface" arch=('i686' 'x86_64' 'mips64el') url="http://www.glom.org/" license=('GPL') -depends=('libgdamm>=3.99.21' 'libxml++>=2.30.1' 'gconfmm>=2.28.2' 'pygtk' +depends=('libgdamm' 'libxml++' 'gconfmm' 'pygtk' 'python2-gda' 'libgtksourceviewmm2' 'goocanvasmm' 'libepc' 'iso-codes' 'postgresql' 'hicolor-icon-theme' 'shared-mime-info' - 'gtkmm>=2.22.0' 'boost-libs>=1.45' 'gettext') -makedepends=('intltool' 'gnome-doc-utils>=0.20.2' 'boost>=1.45' 'python-sphinx' 'glibmm-docs') + 'gtkmm' 'boost-libs' 'gettext') +makedepends=('intltool' 'gnome-doc-utils' 'boost' 'python-sphinx' 'mm-common') options=('!libtool') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/glom/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) @@ -22,6 +22,12 @@ md5sums=('9ae56e0886f14a48cedaef9beb9c3cc9') build() { cd "$srcdir/$pkgname-$pkgver" + + # doctooldir is now owned by mm-common-util instead of glibmm + # the following sed line can be removed once (if) upstream provides a fixed + # configure script + sed -i 's%\(MMDOCTOOLDIR=`$PKG_CONFIG --variable=doctooldir \)glibmm-2.4%\1mm-common-util%' configure + ./configure --prefix=/usr \ --with-postgres-utils=/usr/bin \ --disable-scrollkeeper \ diff --git a/community/gnash/PKGBUILD b/community/gnash/PKGBUILD index 557c1edd1..f962211b1 100644 --- a/community/gnash/PKGBUILD +++ b/community/gnash/PKGBUILD @@ -4,8 +4,8 @@ pkgbase=gnash pkgname=(gnash-common gnash-gtk) pkgver=0.8.9 -pkgrel=2 -arch=(i686 x86_64 'mips64el') +pkgrel=3 +arch=(i686 x86_64) url="http://www.gnu.org/software/gnash/" license=(GPL3) makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool @@ -20,6 +20,10 @@ md5sums=('5b2be6b04a1bcc5fb404cc377034499e') build() { cd "$srcdir/gnash-$pkgver" + # Version is now in version.h + sed -i 's/avcodec\.h/version.h/' macros/ffmpeg.m4 + ./autogen.sh + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/community/gnome-mplayer/PKGBUILD b/community/gnome-mplayer/PKGBUILD index 549571f5b..a435daaaa 100644 --- a/community/gnome-mplayer/PKGBUILD +++ b/community/gnome-mplayer/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 46877 2011-05-13 10:25:53Z lfleischer $ +# $Id: PKGBUILD 47944 2011-05-26 08:59:17Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=gnome-mplayer pkgver=1.0.3 -pkgrel=2 +pkgrel=3 pkgdesc='A simple MPlayer GUI.' arch=('i686' 'x86_64' 'mips64el') url='http://gnome-mplayer.googlecode.com/' license=('GPL') -depends=('mplayer' 'dbus-glib' 'libnotify' 'gtk2' 'hicolor-icon-theme') +depends=('mplayer' 'dbus-glib' 'libnotify' 'gtk2' 'hicolor-icon-theme' 'dconf') makedepends=('gnome-power-manager' 'nautilus') install="${pkgname}.install" source=("http://gnome-mplayer.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") @@ -19,7 +19,7 @@ md5sums=('72a1c7d640a67eb2d60f2671108919c2') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-install --without-gconf + ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-install make } diff --git a/community/gnome-packagekit/PKGBUILD b/community/gnome-packagekit/PKGBUILD index cd517d218..20c933ec7 100644 --- a/community/gnome-packagekit/PKGBUILD +++ b/community/gnome-packagekit/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 47009 2011-05-14 01:24:52Z jconder $ +# $Id: PKGBUILD 48001 2011-05-26 23:17:43Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> pkgname=gnome-packagekit -pkgver=3.0.0 -pkgrel=2 +pkgver=3.0.2 +pkgrel=1 pkgdesc='Collection of graphical tools for PackageKit to be used in the GNOME desktop' arch=('i686' 'x86_64') url='http://www.packagekit.org/' license=('GPL') depends=('dconf' 'desktop-file-utils' 'gnome-menus' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'packagekit') -makedepends=('gconf' 'gtk-doc' 'intltool' 'libcanberra' 'upower') +makedepends=('gconf' 'gtk-doc' 'gnome-common' 'intltool' 'libcanberra' 'upower') optdepends=('gnome-settings-daemon-updates: update and message notifications') options=('!emptydirs' '!libtool') install="$pkgname.install" source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2" 'arch.patch') -sha256sums=('838ca07168dbf7f29fc83ff3c0ef570e7703082d44f5607b09af01972fc52a49' +sha256sums=('faaae52d839a66d0bcb7d7cf97ef62d11bccf558e6aa9fdb0dbc8d61dbaf714f' '9c809ac3c8bbf870442e7bc4123c70b144930a287b28626be1b8bae95edf71ac') build() { @@ -26,7 +26,8 @@ build() { sed -i 's@python@python2@' 'python/enum-convertor.py' export PYTHON=/usr/bin/python2 - ./configure --prefix=/usr \ + # TODO: remove gnome-common dependency and switch back to configure + gnome-autogen.sh --prefix=/usr \ --sysconfdir=/etc \ --disable-gtk-doc \ --disable-schemas-compile \ diff --git a/community/gnome-settings-daemon-updates/PKGBUILD b/community/gnome-settings-daemon-updates/PKGBUILD index 26279b4aa..e1c0348e9 100644 --- a/community/gnome-settings-daemon-updates/PKGBUILD +++ b/community/gnome-settings-daemon-updates/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 46899 2011-05-13 15:02:09Z jconder $ +# $Id: PKGBUILD 48006 2011-05-26 23:21:11Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> _pkgname=gnome-settings-daemon pkgname=$_pkgname-updates -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 pkgdesc="Updates plugin for the GNOME Settings daemon" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ options=('!emptydirs' '!libtool') install=$_pkgname.install source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.bz2" 'arch.patch') -sha256sums=('51cdd0842b907e95c79d4e2b26f554e26fc626f7c2e6c3a14e3fc7954ca91117' +sha256sums=('f304aa54c59ab23f7ef55bfeefeecfd6f7a95cabbeed2ea802c94463d4234eec' '91700d5c7c52cb6e15ed46ec61a150af58e073de7332351a1f7863a41042d134') build() { diff --git a/community/gource/PKGBUILD b/community/gource/PKGBUILD index d823e9fc6..5c834fe41 100644 --- a/community/gource/PKGBUILD +++ b/community/gource/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 42923 2011-03-22 18:17:04Z svenstaro $ +# $Id: PKGBUILD 47420 2011-05-23 01:24:33Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com> # Contributor: Olivier Ramonat <olivier at ramonat dot fr> pkgname=gource -pkgver=0.32 +pkgver=0.34 pkgrel=1 pkgdesc="software version control visualization" license=(GPL3) @@ -11,7 +11,7 @@ arch=(i686 x86_64 'mips64el') url=http://code.google.com/p/gource/ depends=('ftgl' 'sdl' 'sdl_image' 'pcre' 'glew') source=(http://gource.googlecode.com/files/$pkgname-$pkgver.tar.gz) -md5sums=('7aed2fcf8f0c09b8cea5b19a418b0724') +md5sums=('292a62d687874e871067e985d717d71a') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gpsdrive/PKGBUILD b/community/gpsdrive/PKGBUILD index f3f104163..b8b6efcc2 100644 --- a/community/gpsdrive/PKGBUILD +++ b/community/gpsdrive/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 45236 2011-04-18 13:25:52Z spupykin $ +# $Id: PKGBUILD 47650 2011-05-24 16:23:35Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: damir <damir@archlinux.org> pkgname=gpsdrive pkgver=2.11 -pkgrel=7 +pkgrel=8 pkgdesc="A car (bike, ship, plane) navigation system" arch=("i686" "x86_64" 'mips64el') url="http://www.gpsdrive.de/" diff --git a/community/ibus-anthy/PKGBUILD b/community/ibus-anthy/PKGBUILD index e639dc22a..442493585 100644 --- a/community/ibus-anthy/PKGBUILD +++ b/community/ibus-anthy/PKGBUILD @@ -1,9 +1,10 @@ +# $Id: PKGBUILD 47888 2011-05-25 23:35:15Z ebelanger $ # Contributor: Rainy <rainylau(at)gmail(dot)com> # Contributor: Lee.MaRS <leemars at gmail dot com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=ibus-anthy -pkgver=1.2.5 +pkgver=1.2.6 pkgrel=1 pkgdesc="Japanese input method Anthy IMEngine for IBus Framework" arch=('i686' 'x86_64' 'mips64el') @@ -11,28 +12,22 @@ license=('LGPL') url="http://ibus.googlecode.com" depends=('ibus' 'anthy' 'python2') makedepends=('swig' 'intltool') -provides=('ibus-anthy') options=('!libtool') -source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('00b44c874616d797a0117d087cf33341') +source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) +md5sums=('894c7311f4d5c96b1fdb8b3795446ead') build() { - cd ${pkgname}-${pkgver} - - # python2 fix + cd "${srcdir}/${pkgname}-${pkgver}" +# python2 fix for file in setup/ibus-setup-anthy.in engine/ibus-engine-anthy.in; do sed -i 's_exec python_exec python2_' $file done - ./configure \ - --prefix=/usr \ - --libexec=/usr/lib/ibus - + ./configure --prefix=/usr --libexec=/usr/lib/ibus make } package() { - cd ${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD index a18f124fe..5d18ef625 100644 --- a/community/intellij-idea-libs/PKGBUILD +++ b/community/intellij-idea-libs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 44325 2011-04-05 15:37:14Z stativ $ +# $Id: PKGBUILD 47243 2011-05-19 13:26:51Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=intellij-idea-libs -pkgver=10.0.3 -_pkgver=103.255 +pkgver=10.5 +_pkgver=107.105 pkgrel=1 pkgdesc="Architecture dependend libraries needed by the Intellij Idea IDE" arch=('i686' 'x86_64' 'mips64el') @@ -10,7 +10,7 @@ url="http://www.jetbrains.org/" license=('apache') depends=('glibc') source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz) -md5sums=('0309a9583febf6d9bfc803c386efcad4') +md5sums=('365d1a5ee9255175065c764d634b3698') build() { cd "$srcdir" diff --git a/community/john/PKGBUILD b/community/john/PKGBUILD index bed806c4e..db91491a9 100644 --- a/community/john/PKGBUILD +++ b/community/john/PKGBUILD @@ -5,8 +5,8 @@ # Contributor: Michal Krenek <mikos@sg1.cz> pkgname=john -pkgver=1.7.6 -pkgrel=3 +pkgver=1.7.7 +pkgrel=1 pkgdesc="John The Ripper - A fast password cracker. Additional patches (NTLM, MySQL, Kerberos V5, etc.) included." arch=('i686' 'x86_64' 'mips64el') url="http://www.openwall.com/$pkgname/" @@ -14,18 +14,18 @@ license=('GPL2' 'custom') depends=('openssl') backup=('etc/john/john.conf') source=(http://www.openwall.com/$pkgname/g/$pkgname-$pkgver.tar.bz2 - http://www.openwall.com/john/g/john-$pkgver-jumbo-12.diff.gz + http://www.openwall.com/john/g/john-$pkgver-jumbo-1.diff.gz ftp://ftp.kfki.hu/pub/packages/security/ssh/ossh/libdes-4.04b.tar.gz params.h.patch) -md5sums=('321ac0793f1aa4f0603b33a393133756' - '405750a1d8f5c62d434e97cd2775843b' +md5sums=('be316618de834a58573a21225d4a2674' + 'ee776d17726e7c15e90f2cf7ca85492f' 'c8d5c69f86c2eedb485583b0305284a1' 'f69ed632eba8fb9e45847a4b4a323787') build() { # jumbo patch cd ${srcdir}/$pkgname-$pkgver - patch -p1 < ${srcdir}/$pkgname-$pkgver-jumbo-12.diff + patch -p1 < ${srcdir}/$pkgname-$pkgver-jumbo-1.diff cd ${srcdir}/john-$pkgver/src/ # patch default params diff --git a/community/kadu/PKGBUILD b/community/kadu/PKGBUILD index f48350f9e..7b452c180 100644 --- a/community/kadu/PKGBUILD +++ b/community/kadu/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 44782 2011-04-11 20:09:55Z mherych $ +# $Id: PKGBUILD 47304 2011-05-21 11:51:25Z mherych $ # Maintainer: Mateusz Herych # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> pkgname=kadu -pkgver=0.9.1 +pkgver=0.9.2 pkgrel=1 -pkgdesc="A Qt-based Gadu-Gadu client" -arch=('i686' 'x86_64' 'mips64el') +pkgdesc="A Qt-based Jabber/XMPP and Gadu-Gadu client" +arch=('i686' 'x86_64') url="http://www.kadu.net/" license=('GPL') depends=('libgadu' 'libxss' 'aspell' 'phonon' 'qca-ossl' 'libidn') makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl') source=(http://www.kadu.net/download/stable/$pkgname-$pkgver.tar.bz2) -md5sums=('99cb6e9d4acea6dbb15ff98dfe44dff9') +md5sums=('e23d39a2233a0585febe5a8ab50274dc') build() { cd $srcdir/kadu-$pkgver diff --git a/community/libexosip2/PKGBUILD b/community/libexosip2/PKGBUILD index ff90d44f9..c2b2b6d0c 100644 --- a/community/libexosip2/PKGBUILD +++ b/community/libexosip2/PKGBUILD @@ -1,22 +1,25 @@ -# $Id: PKGBUILD 29647 2010-10-18 08:56:03Z spupykin $ +# $Id: PKGBUILD 47119 2011-05-17 07:23:32Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Darwin Bautista <djclue917@gmail.com> pkgname=libexosip2 -pkgver=3.3.0 +pkgver=3.5.0 pkgrel=1 pkgdesc="A library that hides the complexity of using SIP for multimedia session establishement" arch=('i686' 'x86_64' 'mips64el') url="http://savannah.nongnu.org/projects/exosip/" license=('GPL') -depends=('libosip2>=3.1.0' 'openssl') +depends=('libosip2>=3.5.0' 'openssl') options=(!libtool) source=(http://download.savannah.nongnu.org/releases/exosip/libeXosip2-${pkgver/_/-}.tar.gz) -md5sums=('a2739067b51c1e417c5aef9606b285b2') +md5sums=('51e85725571870614e448f63c33c8996') build() { cd "$srcdir/libeXosip2-${pkgver/_/-}" ./configure --prefix=/usr make +} +package() { + cd "$srcdir/libeXosip2-${pkgver/_/-}" make DESTDIR="$pkgdir" install } diff --git a/community/libfaketime/PKGBUILD b/community/libfaketime/PKGBUILD new file mode 100644 index 000000000..a95ab380d --- /dev/null +++ b/community/libfaketime/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 47438 2011-05-23 06:26:34Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Dan Serban +# Contributor: Ross Melin <rdmelin@gmail.com> + +pkgname=libfaketime +pkgver=0.8.1 +pkgrel=1 +pkgdesc='Report fake dates and times to programs without having to change the system-wide time.' +arch=('i686' 'x86_64') +url='http://www.code-wizards.com/projects/libfaketime/' +license=('GPL2') +source=("http://www.code-wizards.com/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('113d75d73e39f0f5022dc7385628d57c') + +build() { + cd "${pkgname}-${pkgver}" + make +} + +package() { + cd "${pkgname}-${pkgver}" + make PREFIX=/usr DESTDIR="${pkgdir}" install +} diff --git a/community/libosip2/PKGBUILD b/community/libosip2/PKGBUILD index 15b725432..5ab3ef63f 100644 --- a/community/libosip2/PKGBUILD +++ b/community/libosip2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 19146 2010-06-21 08:41:34Z spupykin $ +# $Id: PKGBUILD 47083 2011-05-16 14:18:27Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Michal Hybner <dta081@gmail.com> pkgname=libosip2 -pkgver=3.3.0 -pkgrel=2 +pkgver=3.5.0 +pkgrel=1 pkgdesc="oSIP is an implementation of SIP" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/osip/" @@ -12,7 +12,7 @@ license=('LGPL') depends=(glibc) options=(!emptydirs !libtool) source=(http://ftp.gnu.org/gnu/osip/libosip2-${pkgver/_/-}.tar.gz) -md5sums=('81493bb4d4ae6d55b71a0d4369339125') +md5sums=('7691546f6b3349d10007fc1aaff0f4e0') build() { cd $srcdir/libosip2-${pkgver/_/-}/ @@ -39,6 +39,6 @@ diff -wbBur libosip2-3.1.0/src/osip2/port_sema.c libosip2-3.1.0.my/src/osip2/por EOF ./configure --prefix=/usr --disable-semaphore --enable-sysv - make || return 1 + make make DESTDIR=$pkgdir install } diff --git a/community/libzrtpcpp/PKGBUILD b/community/libzrtpcpp/PKGBUILD index e4a1ee0b5..415edc81a 100644 --- a/community/libzrtpcpp/PKGBUILD +++ b/community/libzrtpcpp/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 32643 2010-11-16 09:56:02Z spupykin $ +# $Id: PKGBUILD 47218 2011-05-19 07:44:23Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: # Contributor: Jeff Mickey <jeff@archlinux.org> @@ -6,7 +6,7 @@ pkgname=libzrtpcpp pkgver=1.4.2 -pkgrel=4 +pkgrel=5 pkgdesc="An extension to Real-time Transport Protocol (RTP) which describes a method of Diffie-Hellman key agreement for Secure Real-time Transport Protocol (SRTP)" arch=('i686' 'x86_64' 'mips64el') url="http://zfoneproject.com" diff --git a/community/lightspark/PKGBUILD b/community/lightspark/PKGBUILD index 84aa865ff..e8bac217b 100644 --- a/community/lightspark/PKGBUILD +++ b/community/lightspark/PKGBUILD @@ -3,7 +3,7 @@ pkgname=lightspark pkgver=0.4.7.1 -pkgrel=2 +pkgrel=3 pkgdesc='An alternative Flash Player for Linux.' arch=('i686' 'x86_64' 'mips64el') url='http://lightspark.sourceforge.net' diff --git a/community/linphone/PKGBUILD b/community/linphone/PKGBUILD index 3a257f3c3..2d502fa73 100644 --- a/community/linphone/PKGBUILD +++ b/community/linphone/PKGBUILD @@ -1,11 +1,10 @@ -# $Id: PKGBUILD 43994 2011-04-01 15:09:07Z spupykin $ +# $Id: PKGBUILD 47124 2011-05-17 07:27:45Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Darwin Bautista <djclue917@gmail.com> # Contributor: Darwin Bautista <djclue917@gmail.com> pkgname=linphone pkgver=3.4.3 -pkgrel=2 +pkgrel=3 pkgdesc="A Voice-over-IP phone" arch=('i686' 'x86_64' 'mips64el') url="http://www.linphone.org/index.php/eng" @@ -30,5 +29,9 @@ build() { --libexecdir=/usr/lib/$pkgname \ --enable-external-mediastreamer --enable-external-ortp make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/community/luxrender/PKGBUILD b/community/luxrender/PKGBUILD index 3ccc1e039..e60fdd628 100644 --- a/community/luxrender/PKGBUILD +++ b/community/luxrender/PKGBUILD @@ -5,7 +5,7 @@ pkgname=luxrender pkgver=0.7.1 _pkgver=9206b3ba7011 _luxblend=f93faf8189c1 -pkgrel=4 +pkgrel=5 pkgdesc="Rendering system for physically correct, unbiased image synthesis" arch=('i686' 'x86_64' 'mips64el') url="http://www.luxrender.net/" diff --git a/community/mapnik/PKGBUILD b/community/mapnik/PKGBUILD index 6b7e96899..25f922cd8 100644 --- a/community/mapnik/PKGBUILD +++ b/community/mapnik/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 41028 2011-03-03 07:23:21Z tdziedzic $ +# $Id: PKGBUILD 47631 2011-05-24 14:03:50Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: David Dent <thewinch@gmail.com> # Contributor: orbisvicis <orbisvicis@gmail.com> pkgname=mapnik pkgver=0.7.1 -pkgrel=8 +pkgrel=9 pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps." arch=('i686' 'x86_64' 'mips64el') url="http://mapnik.org/" @@ -42,6 +42,9 @@ build() { INPUT_PLUGINS=all \ DESTDIR="$pkgdir" scons +} +package(){ + cd "$srcdir/$pkgname-$pkgver" scons install # fix permissions on SCons-autogenerated files diff --git a/community/mednafen/ChangeLog b/community/mednafen/ChangeLog new file mode 100644 index 000000000..a3097076c --- /dev/null +++ b/community/mednafen/ChangeLog @@ -0,0 +1,6 @@ +2011-05-17 Angel Velasquez <angvp@archlinux.org> + * Updated to 0.8.D.3 + * Removed fix_build patch + * Cleaned PKGBUILD + * Adding ChangeLog + diff --git a/community/mednafen/PKGBUILD b/community/mednafen/PKGBUILD index ea13f23d5..5a9120418 100755 --- a/community/mednafen/PKGBUILD +++ b/community/mednafen/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer: Daenyth <Daenyth+Arch [at] gmail [dot] com> -# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com> # Contributor: kagan <juanynie@mi.madritel.es> pkgname=mednafen -pkgver=0.8.D +pkgver=0.8.D.3 pkgrel=1 pkgdesc="A command-line multi-system gaming emulator" url="http://mednafen.sourceforge.net/" @@ -10,14 +10,17 @@ license=(GPL) arch=('i686' 'x86_64' 'mips64el') depends=('libcdio>=0.82' 'libsamplerate' 'libogg' 'libvorbis' 'sdl' 'sdl_net' 'libsndfile' 'zlib') makedepends=('pkgconfig' 'mesa') -source=(http://downloads.sourceforge.net/mednafen/$pkgname-$pkgver.tar.bz2 fix_build.diff) -md5sums=('4c3f337f80bf54d2df0f3a0f24203141' - '0f44ef41b0220b66579626548d044f15') +changelog=ChangeLog +source=(http://downloads.sourceforge.net/mednafen/$pkgname-$pkgver.tar.bz2) +md5sums=('57d22805071becd81858b0c088a275e5') build() { cd $srcdir/$pkgname - patch -Np1 -i $srcdir/fix_build.diff || return 1 - ./configure --prefix=/usr || return 1 - make || return 1 + ./configure --prefix=/usr + make +} + +package() { + cd $srcdir/$pkgname make DESTDIR=$pkgdir install } diff --git a/community/minbif/PKGBUILD b/community/minbif/PKGBUILD index 4bf9bd33e..d7248698e 100644 --- a/community/minbif/PKGBUILD +++ b/community/minbif/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 44211 2011-04-04 13:30:46Z lfleischer $ +# $Id: PKGBUILD 47062 2011-05-15 17:37:33Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: AkiraYB <brunoyb!yahoo,com,br> pkgname=minbif pkgver=1.0.4 -pkgrel=2 +pkgrel=3 pkgdesc='An IRC gateway to IM networks that uses libpurple.' arch=('i686' 'x86_64' 'mips64el') url='http://minbif.im/' @@ -24,7 +24,7 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" make PREFIX=/usr CONF_PREFIX=/etc/minbif ENABLE_MINBIF=ON ENABLE_IMLIB=ON ENABLE_CACA=ON \ - ENABLE_VIDEO=ON ENABLE_PLUGIN=OFF ENABLE_PAM=ON ENABLE_TLS=ON DEBUG=OFF + ENABLE_VIDEO=OFF ENABLE_PLUGIN=OFF ENABLE_PAM=ON ENABLE_TLS=ON DEBUG=OFF } package() { diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD index 0d3c48c5a..3e20e38ea 100644 --- a/community/mongodb/PKGBUILD +++ b/community/mongodb/PKGBUILD @@ -4,7 +4,7 @@ pkgname=mongodb pkgver=1.8.1 -pkgrel=1 +pkgrel=2 pkgdesc='A high-performance, open source, schema-free document-oriented database.' arch=('i686' 'x86_64' 'mips64el') url='http://www.mongodb.org' @@ -16,16 +16,23 @@ backup=('etc/mongodb.conf') install="mongodb.install" source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz" 'mongodb.rc' - 'mongodb.conf') + 'mongodb.conf' + 'gcc46fixes.diff' + 'gcc46fixes2.diff') md5sums=('e75a5cae641a53760df8cb866ad5d929' '859f8f9bb32ef2bd21fec55ae9a87d0a' - '9e0ea3f96732bb7811f0b64dace56440') + '9e0ea3f96732bb7811f0b64dace56440' + 'e90c78350e25df2d24f98e4767677d4b' + '5097de6ce2c347c3703ab8cf5a611052') build() { export SCONSFLAGS="$MAKEFLAGS" cd ${pkgname}-src-r${pkgver} + patch -Np1 -i ${srcdir}/gcc46fixes.diff + patch -Np1 -i ${srcdir}/gcc46fixes2.diff + # scons is "special" sed -i 's/-Wall -Wsign-compare/& -DBOOST_FILESYSTEM_VERSION=2/' SConstruct diff --git a/community/mongodb/gcc46fixes.diff b/community/mongodb/gcc46fixes.diff new file mode 100644 index 000000000..487c88f16 --- /dev/null +++ b/community/mongodb/gcc46fixes.diff @@ -0,0 +1,132 @@ +commit fa7cd65e480d80ba1cd196bdcec8f4714e361e8e +Author: Mathias Stearn <redbeard0531@gmail.com> +Date: Sun Apr 3 19:10:36 2011 -0400 + + g++ 4.6 compile (new -Wunused-but-set-variable warning) + +diff --git a/db/btree.cpp b/db/btree.cpp +index 2758f72..4162d6a 100644 +--- a/db/btree.cpp ++++ b/db/btree.cpp +@@ -1226,8 +1226,6 @@ namespace mongo { + out() << " " << thisLoc.toString() << ".insertHere " << key.toString() << '/' << recordLoc.toString() << ' ' + << lchild.toString() << ' ' << rchild.toString() << " keypos:" << keypos << endl; + +- DiskLoc oldLoc = thisLoc; +- + if ( !basicInsert(thisLoc, keypos, recordLoc, key, order) ) { + // If basicInsert() fails, the bucket will be packed as required by split(). + thisLoc.btreemod()->split(thisLoc, keypos, recordLoc, key, order, lchild, rchild, idx); +diff --git a/db/dbcommands.cpp b/db/dbcommands.cpp +index 2580f86..56c0fce 100644 +--- a/db/dbcommands.cpp ++++ b/db/dbcommands.cpp +@@ -1460,7 +1460,7 @@ namespace mongo { + uassert( 13049, "godinsert must specify a collection", !coll.empty() ); + string ns = dbname + "." + coll; + BSONObj obj = cmdObj[ "obj" ].embeddedObjectUserCheck(); +- DiskLoc loc = theDataFileMgr.insertWithObjMod( ns.c_str(), obj, true ); ++ theDataFileMgr.insertWithObjMod( ns.c_str(), obj, true ); + return true; + } + } cmdGodInsert; +diff --git a/db/index.cpp b/db/index.cpp +index c696e27..218ecb3 100644 +--- a/db/index.cpp ++++ b/db/index.cpp +@@ -127,7 +127,6 @@ namespace mongo { + void getIndexChanges(vector<IndexChanges>& v, NamespaceDetails& d, BSONObj newObj, BSONObj oldObj, bool &changedId) { + int z = d.nIndexesBeingBuilt(); + v.resize(z); +- NamespaceDetails::IndexIterator i = d.ii(); + for( int i = 0; i < z; i++ ) { + IndexDetails& idx = d.idx(i); + BSONObj idxKey = idx.info.obj().getObjectField("key"); // eg { ts : 1 } +diff --git a/db/update.cpp b/db/update.cpp +index e173902..85c3f9c 100644 +--- a/db/update.cpp ++++ b/db/update.cpp +@@ -992,7 +992,7 @@ namespace mongo { + BSONObj newObj = mss->createNewFromMods(); + checkTooLarge(newObj); + assert(nsdt); +- DiskLoc newLoc = theDataFileMgr.updateRecord(ns, d, nsdt, r, loc , newObj.objdata(), newObj.objsize(), debug); ++ theDataFileMgr.updateRecord(ns, d, nsdt, r, loc , newObj.objdata(), newObj.objsize(), debug); + } + + if ( logop ) { +diff --git a/dbtests/queryoptimizertests.cpp b/dbtests/queryoptimizertests.cpp +index acf9217..2d6f752 100644 +--- a/dbtests/queryoptimizertests.cpp ++++ b/dbtests/queryoptimizertests.cpp +@@ -1558,7 +1558,6 @@ namespace QueryOptimizerTests { + theDataFileMgr.insertWithObjMod( ns(), temp ); + } + BSONObj hint = fromjson( "{$hint:{a:1,b:1}}" ); +- BSONElement hintElt = hint.firstElement(); + auto_ptr< FieldRangeSet > frs( new FieldRangeSet( ns(), fromjson( "{a:5,b:{$in:[2,3,6,9,11]}}" ) ) ); + QueryPlan qp( nsd(), 1, *frs, *frs, fromjson( "{a:5,b:{$in:[2,3,6,9,11]}}" ), BSONObj() ); + boost::shared_ptr<Cursor> c = qp.newCursor(); +@@ -1581,7 +1580,6 @@ namespace QueryOptimizerTests { + theDataFileMgr.insertWithObjMod( ns(), temp ); + } + BSONObj hint = fromjson( "{$hint:{a:1,b:1}}" ); +- BSONElement hintElt = hint.firstElement(); + auto_ptr< FieldRangeSet > frs( new FieldRangeSet( ns(), fromjson( "{a:{$gte:5},b:{$in:[2,3,6,9,11]}}" ) ) ); + QueryPlan qp( nsd(), 1, *frs, *frs, fromjson( "{a:{$gte:5},b:{$in:[2,3,6,9,11]}}" ), BSONObj() ); + boost::shared_ptr<Cursor> c = qp.newCursor(); +diff --git a/shell/shell_utils.cpp b/shell/shell_utils.cpp +index 6c398ef..53484fd 100644 +--- a/shell/shell_utils.cpp ++++ b/shell/shell_utils.cpp +@@ -260,7 +260,7 @@ namespace mongo { + BSONElement e = oneArg(args); + bool found = false; + +- path root( args.firstElement().valuestrsafe() ); ++ path root( e.valuestrsafe() ); + if ( boost::filesystem::exists( root ) ) { + found = true; + boost::filesystem::remove_all( root ); +diff --git a/tools/tool.cpp b/tools/tool.cpp +index 92a4bd4..150481b 100644 +--- a/tools/tool.cpp ++++ b/tools/tool.cpp +@@ -413,14 +413,14 @@ namespace mongo { + ProgressMeter m( fileLength ); + + while ( read < fileLength ) { +- int readlen = fread(buf, 4, 1, file); ++ fread(buf, 4, 1, file); + int size = ((int*)buf)[0]; + if ( size >= BUF_SIZE ) { + cerr << "got an object of size: " << size << " terminating..." << endl; + } + uassert( 10264 , "invalid object size" , size < BUF_SIZE ); + +- readlen = fread(buf+4, size-4, 1, file); ++ fread(buf+4, size-4, 1, file); + + BSONObj o( buf ); + if ( _objcheck && ! o.valid() ) { +diff --git a/util/ramlog.h b/util/ramlog.h +index fc588e6..b2f3aa0 100644 +--- a/util/ramlog.h ++++ b/util/ramlog.h +@@ -108,7 +108,6 @@ namespace mongo { + vector<const char*> v; + get( v ); + +- bool first = true; + s << "<pre>\n"; + for( int i = 0; i < (int)v.size(); i++ ) { + assert( strlen(v[i]) > 20 ); +@@ -126,7 +125,7 @@ namespace mongo { + stringstream r; + if( nr == 1 ) r << "repeat last line"; + else r << "repeats last " << nr << " lines; ends " << string(v[last]+4,0,15); +- first = false; s << html::a("", r.str(), clean(v,i,x.str())); ++ s << html::a("", r.str(), clean(v,i,x.str())); + } + else s << x.str(); + s << '\n'; diff --git a/community/mongodb/gcc46fixes2.diff b/community/mongodb/gcc46fixes2.diff new file mode 100644 index 000000000..17257b136 --- /dev/null +++ b/community/mongodb/gcc46fixes2.diff @@ -0,0 +1,26 @@ +commit 5931bc0231c91ecdfc5dd313d8cce578eae426bb +Author: Eliot Horowitz <eliot@10gen.com> +Date: Wed Mar 30 01:01:18 2011 -0400 + + remove unused variable + +diff --git a/db/commands.cpp b/db/commands.cpp +index c301fb3..0bbd765 100644 +--- a/db/commands.cpp ++++ b/db/commands.cpp +@@ -127,7 +127,6 @@ namespace mongo { + if ( strcmp(p, ".$cmd") != 0 ) return false; + + bool ok = false; +- bool valid = false; + + BSONElement e = jsobj.firstElement(); + map<string,Command*>::iterator i; +@@ -138,7 +137,6 @@ namespace mongo { + migrated over to the command object format. + */ + else if ( (i = _commands->find(e.fieldName())) != _commands->end() ) { +- valid = true; + string errmsg; + Command *c = i->second; + if ( c->adminOnly() && !startsWith(ns, "admin.") ) { diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD new file mode 100644 index 000000000..828951df8 --- /dev/null +++ b/community/mplayer2/PKGBUILD @@ -0,0 +1,59 @@ +# $Id: PKGBUILD 46583 2011-05-09 18:34:40Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Bartek Piotrowski <barthalion@gmail.com> + +pkgname=mplayer2 +pkgver=2.0 +pkgrel=12 +pkgdesc="A movie player" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.mplayer2.org/" +depends=('libgl' 'libvdpau' 'ffmpeg' 'libdvdcss' 'libdvdread' 'libdvdnav' 'libxvmc' 'libass' 'fontconfig' 'freetype2' + 'ttf-dejavu' 'sdl' 'aalib' 'libcaca' 'faad2' 'libpulse' 'jack' 'ncurses' 'libxxf86vm' 'cdparanoia' 'libmad' + 'a52dec' 'libdca' 'libxxf86dga' 'libxss' 'mpg123') +makedepends=('live-media' 'mesa' 'unzip' 'yasm') +backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') +provides=('mplayer') +conflicts=('mplayer') +source=(http://ftp.mplayer2.org/pub/release/${pkgname}-${pkgver/_/-}.tar.xz + mplayer2-remove-mp3lib.patch) +sha1sums=('0df8d4e5484128b7b28029273b7704ab5d5419bc' + 'c55128a99406a5e01ab077555b7b24aa7b54110c') +options=('!emptydirs') + +build() { + # Custom CFLAGS break the mplayer build + unset CFLAGS LDFLAGS + + cd "${srcdir}/${pkgname}-${pkgver}" + + # Drop internal mp3lib (FS#24149) + # Default decoder for mp3 will be mpg123 + rm -fr mp3lib + patch -Np1 -i ../mplayer2-remove-mp3lib.patch + + ./configure --prefix=/usr \ + --enable-runtime-cpudetection \ + --disable-arts \ + --disable-speex \ + --disable-openal \ + --disable-libdv \ + --disable-musepack \ + --disable-esd \ + --disable-mga \ + --enable-xvmc \ + --language=all \ + --enable-translation \ + --confdir=/etc/mplayer + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + install -Dm644 etc/{codecs.conf,input.conf,example.conf} "${pkgdir}"/etc/mplayer/ + install -dm755 "${pkgdir}"/usr/share/mplayer/ + ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "${pkgdir}"/usr/share/mplayer/subfont.ttf +} diff --git a/community/mplayer2/mplayer2-remove-mp3lib.patch b/community/mplayer2/mplayer2-remove-mp3lib.patch new file mode 100644 index 000000000..057a91295 --- /dev/null +++ b/community/mplayer2/mplayer2-remove-mp3lib.patch @@ -0,0 +1,297 @@ +diff -Naur mplayer2-2.0.ori/configure mplayer2-2.0/configure +--- mplayer2-2.0.ori/configure 2011-03-24 17:40:29.000000000 -0400 ++++ mplayer2-2.0/configure 2011-05-09 14:11:10.717630210 -0400 +@@ -376,7 +376,6 @@ + --disable-mad disable libmad (MPEG audio) support [autodetect] + --enable-xmms enable XMMS input plugin support [disabled] + --enable-libdca enable libdca support [autodetect] +- --disable-mp3lib disable builtin mp3lib [autodetect] + --disable-liba52 disable liba52 [autodetect] + --enable-musepack enable libmpcdec support (deprecated, libavcodec + Musepack decoder is preferred) [disabled] +@@ -610,7 +609,6 @@ + _speex=auto + _theora=auto + _mpg123=auto +-_mp3lib=auto + _liba52=auto + _libdca=auto + _faad=auto +@@ -965,8 +963,6 @@ + --disable-theora) _theora=no ;; + --enable-mpg123) _mpg123=yes ;; + --disable-mpg123) _mpg123=no ;; +- --enable-mp3lib) _mp3lib=yes ;; +- --disable-mp3lib) _mp3lib=no ;; + --enable-liba52) _liba52=yes ;; + --disable-liba52) _liba52=no ;; + --enable-libdca) _libdca=yes ;; +@@ -5731,19 +5727,6 @@ + fi + echores "$_theora" + +-echocheck "mp3lib support" +-if test "$_mp3lib" = auto ; then +- test "$cc_vendor" = intel && test "$_cc_major" -le 10 -o "$_cc_major" -eq 11 -a "$_cc_minor" -eq 0 && _mp3lib=no || _mp3lib=yes +-fi +-if test "$_mp3lib" = yes ; then +- def_mp3lib='#define CONFIG_MP3LIB 1' +- codecmodules="mp3lib(internal) $codecmodules" +-else +- def_mp3lib='#undef CONFIG_MP3LIB' +- nocodecmodules="mp3lib(internal) $nocodecmodules" +-fi +-echores "$_mp3lib" +- + # Any version of libmpg123 shall be fine. + echocheck "mpg123 support" + def_mpg123='#undef CONFIG_MPG123' +@@ -6823,7 +6806,6 @@ + MD5SUM = $_md5sum + MGA = $_mga + MNG = $_mng +-MP3LIB = $_mp3lib + MPG123 = $_mpg123 + MUSEPACK = $_musepack + NAS = $_nas +@@ -7084,7 +7066,6 @@ + $def_libdca + $def_libdv + $def_mad +-$def_mp3lib + $def_mpg123 + $def_musepack + $def_speex +diff -Naur mplayer2-2.0.ori/etc/codecs.conf mplayer2-2.0/etc/codecs.conf +--- mplayer2-2.0.ori/etc/codecs.conf 2011-03-24 17:40:29.000000000 -0400 ++++ mplayer2-2.0/etc/codecs.conf 2011-05-09 14:11:10.717630210 -0400 +@@ -4220,23 +4220,6 @@ + driver ffmpeg + dll "sonic" + +-audiocodec mp3 +- ; this is preferred over ffmp2/ffmp3 since it is faster due to using +- ; floating point and there are even broken mkv files where the audio +- ; needs to be parsed, making this codec work more reliably +- info "mp3lib MPEG layer-2, layer-3" +- status working +- comment "Optimized to MMX/SSE/3Dnow!" +- format 0x50 ; layer-1 && layer-2 +- format 0x55 ; layer-3 +- format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files) +- format 0x5000736d ; "ms\0\x50" older mp2 fcc (MOV files) +- format 0x55005354 ; broken file +- fourcc ".mp3" ; CBR/VBR MP3 (MOV files) +- fourcc "MP3 " ; used in .nsv files +- fourcc "LAME" ; used in mythtv .nuv files +- driver mp3lib +- + audiocodec mpg123 + ; this is preferred over ffmp2/ffmp3 since it is faster, generally + info "MPEG 1.0/2.0/2.5 layers I, II, III" +diff -Naur mplayer2-2.0.ori/libmpcodecs/ad.c mplayer2-2.0/libmpcodecs/ad.c +--- mplayer2-2.0.ori/libmpcodecs/ad.c 2011-03-24 17:40:29.000000000 -0400 ++++ mplayer2-2.0/libmpcodecs/ad.c 2011-05-09 14:11:10.717630210 -0400 +@@ -32,7 +32,6 @@ + /* Missed vorbis, mad, dshow */ + + extern const ad_functions_t mpcodecs_ad_mpg123; +-extern const ad_functions_t mpcodecs_ad_mp3lib; + extern const ad_functions_t mpcodecs_ad_ffmpeg; + extern const ad_functions_t mpcodecs_ad_liba52; + extern const ad_functions_t mpcodecs_ad_hwac3; +@@ -63,9 +62,6 @@ + #ifdef CONFIG_MPG123 + &mpcodecs_ad_mpg123, + #endif +-#ifdef CONFIG_MP3LIB +- &mpcodecs_ad_mp3lib, +-#endif + #ifdef CONFIG_LIBA52 + &mpcodecs_ad_liba52, + #endif +diff -Naur mplayer2-2.0.ori/libmpcodecs/ad_mp3lib.c mplayer2-2.0/libmpcodecs/ad_mp3lib.c +--- mplayer2-2.0.ori/libmpcodecs/ad_mp3lib.c 2011-03-24 17:40:29.000000000 -0400 ++++ mplayer2-2.0/libmpcodecs/ad_mp3lib.c 2011-05-09 14:11:10.717630210 -0400 +@@ -1,100 +0,0 @@ +-/* +- * This file is part of MPlayer. +- * +- * MPlayer is free software; you can redistribute it and/or modify +- * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation; either version 2 of the License, or +- * (at your option) any later version. +- * +- * MPlayer is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License along +- * with MPlayer; if not, write to the Free Software Foundation, Inc., +- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +- */ +- +-#include <stdio.h> +-#include <stdlib.h> +-#include <unistd.h> +- +-#include "config.h" +- +-#include "ad_internal.h" +-#include "ad_mp3lib.h" +- +-static const ad_info_t info = +-{ +- "MPEG layer-2, layer-3", +- "mp3lib", +- "Nick Kurshev", +- "mpg123", +- "Optimized to MMX/SSE/3Dnow!" +-}; +- +-LIBAD_EXTERN(mp3lib) +- +-#include "mp3lib/mp3.h" +- +-extern int fakemono; +- +-static sh_audio_t* dec_audio_sh=NULL; +- +-// MP3 decoder buffer callback: +-int mplayer_audio_read(char *buf,int size){ +- return demux_read_data(dec_audio_sh->ds,buf,size); +-} +- +-static int preinit(sh_audio_t *sh) +-{ +- sh->audio_out_minsize=32*36*2*2; //4608; +- return 1; +-} +- +-static int init(sh_audio_t *sh) +-{ +- // MPEG Audio: +- dec_audio_sh=sh; // save sh_audio for the callback: +-// MP3_Init(fakemono,mplayer_accel,&mplayer_audio_read); // TODO!!! +-#ifdef CONFIG_FAKE_MONO +- MP3_Init(fakemono); +-#else +- MP3_Init(); +-#endif +- MP3_samplerate=MP3_channels=0; +- sh->a_buffer_len=MP3_DecodeFrame(sh->a_buffer,-1); +- if(!sh->a_buffer_len) return 0; // unsupported layer/format +- sh->channels=2; // hack +- sh->samplesize=2; +- sh->samplerate=MP3_samplerate; +- sh->i_bps=MP3_bitrate*(1000/8); +- MP3_PrintHeader(); +- return 1; +-} +- +-static void uninit(sh_audio_t *sh) +-{ +-} +- +-static int control(sh_audio_t *sh,int cmd,void* arg, ...) +-{ +- switch(cmd) +- { +- case ADCTRL_RESYNC_STREAM: +- MP3_DecodeFrame(NULL,-2); // resync +- MP3_DecodeFrame(NULL,-2); // resync +- MP3_DecodeFrame(NULL,-2); // resync +- return CONTROL_TRUE; +- case ADCTRL_SKIP_FRAME: +- MP3_DecodeFrame(NULL,-2); // skip MPEG frame +- return CONTROL_TRUE; +- } +- return CONTROL_UNKNOWN; +-} +- +-static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen) +-{ +- return MP3_DecodeFrame(buf,-1); +-} +diff -Naur mplayer2-2.0.ori/libmpcodecs/ad_mp3lib.h mplayer2-2.0/libmpcodecs/ad_mp3lib.h +--- mplayer2-2.0.ori/libmpcodecs/ad_mp3lib.h 2011-03-24 17:40:29.000000000 -0400 ++++ mplayer2-2.0/libmpcodecs/ad_mp3lib.h 2011-05-09 14:11:10.717630210 -0400 +@@ -1,24 +0,0 @@ +-/* +- * This file is part of MPlayer. +- * +- * MPlayer is free software; you can redistribute it and/or modify +- * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation; either version 2 of the License, or +- * (at your option) any later version. +- * +- * MPlayer is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License along +- * with MPlayer; if not, write to the Free Software Foundation, Inc., +- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +- */ +- +-#ifndef MPLAYER_AD_MP3LIB_H +-#define MPLAYER_AD_MP3LIB_H +- +-int mplayer_audio_read(char *buf, int size); +- +-#endif /* MPLAYER_AD_MP3LIB_H */ +diff -Naur mplayer2-2.0.ori/Makefile mplayer2-2.0/Makefile +--- mplayer2-2.0.ori/Makefile 2011-03-24 17:40:29.000000000 -0400 ++++ mplayer2-2.0/Makefile 2011-05-09 14:11:10.714296876 -0400 +@@ -122,21 +122,6 @@ + SRCS_COMMON-$(MNG) += libmpdemux/demux_mng.c + SRCS_COMMON-$(MPG123) += libmpcodecs/ad_mpg123.c + +-SRCS_MP3LIB-X86-$(HAVE_AMD3DNOW) += mp3lib/dct36_3dnow.c \ +- mp3lib/dct64_3dnow.c +-SRCS_MP3LIB-X86-$(HAVE_AMD3DNOWEXT) += mp3lib/dct36_k7.c \ +- mp3lib/dct64_k7.c +-SRCS_MP3LIB-X86-$(HAVE_MMX) += mp3lib/dct64_mmx.c +-SRCS_MP3LIB-$(ARCH_X86_32) += mp3lib/decode_i586.c \ +- $(SRCS_MP3LIB-X86-yes) +-SRCS_MP3LIB-$(HAVE_ALTIVEC) += mp3lib/dct64_altivec.c +-SRCS_MP3LIB-$(HAVE_MMX) += mp3lib/decode_mmx.c +-SRCS_MP3LIB-$(HAVE_SSE) += mp3lib/dct64_sse.c +-SRCS_MP3LIB += mp3lib/sr1.c \ +- $(SRCS_MP3LIB-yes) +-SRCS_COMMON-$(MP3LIB) += libmpcodecs/ad_mp3lib.c \ +- $(SRCS_MP3LIB) +- + SRCS_COMMON-$(MUSEPACK) += libmpcodecs/ad_mpc.c \ + libmpdemux/demux_mpc.c + SRCS_COMMON-$(NATIVE_RTSP) += stream/stream_rtsp.c \ +@@ -578,7 +563,6 @@ + loader/dshow \ + loader/dmo \ + loader/wine \ +- mp3lib \ + osdep \ + stream \ + stream/freesdp \ +@@ -675,8 +659,6 @@ + #loader/%: CFLAGS += -Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT + loader/win32%: CFLAGS += $(CFLAGS_STACKREALIGN) + +-mp3lib/decode_i586%: CFLAGS += -fomit-frame-pointer +- + stream/stream_dvdnav%: CFLAGS := $(CFLAGS_LIBDVDNAV) $(CFLAGS) + + +@@ -767,9 +749,7 @@ + loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): CFLAGS += -g + loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): $(LOADER_TEST_OBJS) + +-mp3lib/test$(EXESUF) mp3lib/test2$(EXESUF): $(SRCS_MP3LIB:.c=.o) libvo/aclib.o cpudetect.o $(TEST_OBJS) +- +-TESTS = codecs2html codec-cfg-test libvo/aspecttest mp3lib/test mp3lib/test2 ++TESTS = codecs2html codec-cfg-test libvo/aspecttest + + ifdef ARCH_X86 + TESTS += loader/qtx/list loader/qtx/qtxload diff --git a/community/mypaint/PKGBUILD b/community/mypaint/PKGBUILD index 8e5cc26b7..fa2ace03d 100644 --- a/community/mypaint/PKGBUILD +++ b/community/mypaint/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 41759 2011-03-08 20:17:20Z spupykin $ +# $Id: PKGBUILD 47074 2011-05-16 14:01:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jon Nordby <jononor@gmail.com> pkgname=mypaint pkgver=0.9.1 -pkgrel=1 +pkgrel=2 pkgdesc="A fast and easy painting application for digital painters, with brush dynamics" arch=('i686' 'x86_64' 'mips64el') url="http://mypaint.intilinux.com/" license=('GPL' 'LGPL') depends=('pygtk' 'python-numpy' 'protobuf-python' 'python2') makedepends=('scons>=0.97' 'swig>=1.3.39') +install=mypaint.install source=(http://download.gna.org/$pkgname/$pkgname-$pkgver.tar.bz2) md5sums=('6249a16359a438d6dc658f5765b35515') diff --git a/community/mypaint/mypaint.install b/community/mypaint/mypaint.install new file mode 100644 index 000000000..5f0358791 --- /dev/null +++ b/community/mypaint/mypaint.install @@ -0,0 +1,13 @@ +post_install() { + [ -x `which update-mime-database` ] && update-mime-database usr/share/mime + [ -x `which gtk-update-icon-cache` ] && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + /bin/true +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community/mysql-workbench/PKGBUILD b/community/mysql-workbench/PKGBUILD index 5934210e6..240bf0076 100644 --- a/community/mysql-workbench/PKGBUILD +++ b/community/mysql-workbench/PKGBUILD @@ -1,36 +1,36 @@ -# $Id: PKGBUILD 46305 2011-05-04 18:56:20Z andrea $ +# $Id: PKGBUILD 47963 2011-05-26 13:44:42Z ibiru $ # Maintainer: # Contributor : Ionut Biru <ibiru@archlinux.org> # Contributor: totoloco <totoloco at gmail _dot_com> pkgname=mysql-workbench epoch=1 -pkgver=5.2.33b +pkgver=5.2.34 pkgrel=1 pkgdesc="A cross-platform, visual database design tool developed by MySQL" arch=('i686' 'x86_64' 'mips64el') url="http://wb.mysql.com/" license=('GPL2') -depends=('libgnome' 'libzip' 'libmysqlclient' 'lua' 'gtkmm' 'libglade' 'libgl' +depends=('libzip' 'libmysqlclient' 'lua' 'gtkmm' 'libgl' 'libsigc++' 'python-paramiko' 'python-pexpect') makedepends=('boost' 'curl' 'mesa') options=('!libtool') source=(ftp://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQLGUITools/${pkgname}-gpl-${pkgver}-src.tar.gz ArchLinux.xml arch.patch python27.patch gcc46.patch) -md5sums=('850e081eeaea87a88c408483817e4b1f' +md5sums=('781a4e9f6b5573b06a838d53ddb9136d' 'c2f986cd5737413d020c55db32713c48' '23430d24400fd65c9fd872bd8e2411e5' '47bc4cdfaa035a0132392e94c462ebf7' - '8e7a6d5aa59b73727e862724f115d90a') + '43917ebc79794ba15a64f7ba820fa20b') build() { - cd "${srcdir}/${pkgname}-gpl-5.2.33-src" + cd "${srcdir}/${pkgname}-gpl-${pkgver}-src" cp "${srcdir}/ArchLinux.xml" res/mysql.profiles patch -Np1 -i ${srcdir}/arch.patch patch -Np0 -i ${srcdir}/python27.patch - patch -p1 -i ${srcdir}/gcc46.patch + patch -Np1 -i ${srcdir}/gcc46.patch #we use System provided libraries rm -rf ext/curl @@ -46,8 +46,9 @@ build() { } package() { - cd "${srcdir}/${pkgname}-gpl-5.2.33-src" + cd "${srcdir}/${pkgname}-gpl-${pkgver}-src" make DESTDIR="${pkgdir}" install sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" $pkgdir/usr/share/mysql-workbench/sshtunnel.py + sed -i -e "s|python|python2|" $pkgdir/usr/lib/mysql-workbench/modules/wb_utils_grt.py } diff --git a/community/mysql-workbench/gcc46.patch b/community/mysql-workbench/gcc46.patch index 9daa162c8..6a0d2cd97 100644 --- a/community/mysql-workbench/gcc46.patch +++ b/community/mysql-workbench/gcc46.patch @@ -1,108 +1,6 @@ -diff -up mysql-workbench-gpl-5.2.33-src/backend/wbprivate/workbench/metaclasses.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/backend/wbprivate/workbench/metaclasses.cpp ---- mysql-workbench-gpl-5.2.33-src/backend/wbprivate/workbench/metaclasses.cpp.gcc46 2011-03-23 17:05:33.000000000 +0100 -+++ mysql-workbench-gpl-5.2.33-src/backend/wbprivate/workbench/metaclasses.cpp 2011-03-23 17:06:02.000000000 +0100 -@@ -23,7 +23,7 @@ - #include "grts/structs.workbench.model.reporting.h"
- #include "grts/structs.workbench.physical.h"
-
--
-+namespace wb {
- void register_all_metaclasses()
- {
- register_structs_app_xml();
-@@ -46,3 +46,6 @@ void register_all_metaclasses()
- register_structs_workbench_model_reporting_xml();
- register_structs_workbench_physical_xml();
- }
-+// end of namespace wb
-+}
-+
-diff -up mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp ---- mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp.gcc46 2011-03-23 16:56:16.000000000 +0100 -+++ mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp 2011-03-23 17:07:36.000000000 +0100 -@@ -31,7 +31,7 @@ static Gtk::ComboBox *create_color_combo - } - - Glib::RefPtr<Gtk::ListStore> model= Gtk::ListStore::create(*color_combo_columns); -- Gtk::ComboBox *combo= new Gtk::ComboBox(model); -+ Gtk::ComboBox *combo= new Gtk::ComboBox((Glib::RefPtr<Gtk::TreeModel> &)model); - - combo->pack_start(color_combo_columns->image); - -diff -up mysql-workbench-gpl-5.2.33-src/library/forms/utilities.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/library/forms/utilities.cpp ---- mysql-workbench-gpl-5.2.33-src/library/forms/utilities.cpp.gcc46 2011-03-23 17:04:17.000000000 +0100 -+++ mysql-workbench-gpl-5.2.33-src/library/forms/utilities.cpp 2011-03-23 17:04:40.000000000 +0100 -@@ -32,10 +32,11 @@ - #include <math.h> - #include "base/log.h" - ENABLE_LOG("mforms.utils") -- - using namespace mforms; - -+namespace mforms { - GThread *_mforms_main_thread=0; -+} - - static std::map<std::string, int> remembered_message_answers; - static std::string remembered_message_answer_file; -diff -up mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_lua_help.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_lua_help.cpp ---- mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_lua_help.cpp.gcc46 2011-03-17 13:48:45.000000000 +0100 -+++ mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_lua_help.cpp 2011-03-23 16:44:22.000000000 +0100 -@@ -1909,6 +1909,8 @@ static MYX_GRT_SHELL_COMMAND_HELP_GROUP - - //============================================================================ - -+namespace grt { -+ - static void myx_grt_shell_show_command_help_print(grt::GRT *grt, const char *group_name, const char *cmd) - { - MYX_GRT_SHELL_COMMAND_HELP_GROUP help_group; -@@ -2097,3 +2099,6 @@ void myx_grt_shell_show_help(grt::GRT *g - } - } - -+// End of namspace grt -+} -+ -diff -up mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.cpp ---- mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.cpp.gcc46 2011-03-17 13:48:41.000000000 +0100 -+++ mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.cpp 2011-03-23 16:44:22.000000000 +0100 -@@ -187,7 +187,7 @@ NL - }; - - --void grt_shell_show_python_help(grt::GRT *grt, const char *command) -+void grt::grt_shell_show_python_help(grt::GRT *grt, const char *command) - { - if (!command || !*command) - grt->send_output( -diff -up mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.h.gcc46 mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.h ---- mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.h.gcc46 2011-03-17 13:48:39.000000000 +0100 -+++ mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.h 2011-03-23 16:44:22.000000000 +0100 -@@ -21,6 +21,8 @@ - #ifndef __grtpp_shell_python_help_h__ - #define __grtpp_shell_python_help_h__ - -+namespace grt { - void grt_shell_show_python_help(grt::GRT *grt, const char *command); -+} - --#endif /* __grtpp_shell_python_help_h__ */ -\ Pas de fin de ligne à la fin du fichier. -+#endif /* __grtpp_shell_python_help_h__ */ -diff -up mysql-workbench-gpl-5.2.33-src/modules/db.mysql/src/db_mysql_catalog_report.h.gcc46 mysql-workbench-gpl-5.2.33-src/modules/db.mysql/src/db_mysql_catalog_report.h ---- mysql-workbench-gpl-5.2.33-src/modules/db.mysql/src/db_mysql_catalog_report.h.gcc46 2011-03-23 16:51:30.000000000 +0100 -+++ mysql-workbench-gpl-5.2.33-src/modules/db.mysql/src/db_mysql_catalog_report.h 2011-03-23 16:52:33.000000000 +0100 -@@ -10,6 +10,7 @@ - #include "config.h" - #endif - -+#include <cstddef> - #include "ctemplate/template.h" - - #include "grt/common.h" ---- mysql-workbench-gpl-5.2.33-src/ext/ctemplate/ctemplate-src/src/ctemplate/template_dictionary.h.in~ 2011-05-04 00:57:31.029029610 -0700 -+++ mysql-workbench-gpl-5.2.33-src/ext/ctemplate/ctemplate-src/src/ctemplate/template_dictionary.h.in 2011-05-04 00:57:45.162361700 -0700 +diff -Nur mysql-workbench-gpl-5.2.34-src.orig/ext/ctemplate/ctemplate-src/src/ctemplate/template_dictionary.h.in mysql-workbench-gpl-5.2.34-src/ext/ctemplate/ctemplate-src/src/ctemplate/template_dictionary.h.in +--- mysql-workbench-gpl-5.2.34-src.orig/ext/ctemplate/ctemplate-src/src/ctemplate/template_dictionary.h.in 2011-05-26 09:33:54.128803186 +0000 ++++ mysql-workbench-gpl-5.2.34-src/ext/ctemplate/ctemplate-src/src/ctemplate/template_dictionary.h.in 2011-05-26 09:34:45.312611839 +0000 @@ -54,6 +54,7 @@ #include <map> #include <string> diff --git a/community/mythplugins/PKGBUILD b/community/mythplugins/PKGBUILD index 874021e5a..e3ec00716 100644 --- a/community/mythplugins/PKGBUILD +++ b/community/mythplugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 42515 2011-03-17 12:34:35Z andrea $ +# $Id: PKGBUILD 47935 2011-05-26 08:19:27Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -14,20 +14,21 @@ pkgname=('mythplugins-mytharchive' 'mythplugins-mythweather' 'mythplugins-mythweb' 'mythplugins-mythzoneminder') -pkgver=0.24 +pkgver=0.24.1 pkgrel=3 -arch=('i686' 'x86_64' 'mips64el') +epoch=1 +arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') -makedepends=("mythtv>=$pkgver" 'cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' - 'python-imaging' 'libexif' 'perl-date-manip' 'zlib' 'cdparanoia' - 'flac' 'libcdaudio' 'libvisual' 'libvorbis' 'sdl' 'taglib' - 'python2-oauth' 'python-pycurl' 'mplayer' 'perl-date-manip' - 'perl-libwww' 'perl-soap-lite' 'perl-xml-sax' 'perl-xml-simple' - 'perl-xml-xpath' 'perl-image-size' 'perl-datetime-format-iso8601') +makedepends=('cdparanoia' 'cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac' + 'libcdaudio' 'libexif' 'libvisual' 'libvorbis' 'mplayer' 'mythtv' + 'perl-datetime-format-iso8601' 'perl-date-manip' 'perl-image-size' + 'perl-libwww' 'perl-soap-lite' 'perl-xml-sax' 'perl-xml-simple' + 'perl-xml-xpath' 'python2-oauth' 'python-imaging' 'python-pycurl' + 'sdl' 'taglib' 'zlib') source=("ftp://ftp.osuosl.org/pub/mythtv/$pkgbase-$pkgver.tar.bz2" 'mtd.rc') -md5sums=('2bcb195a82475648040910d7afd054d1' +md5sums=('76aeefeff70b550b2d35c2d9d751df18' '476c12ba074794ad7f4ae092bdf949d6') build() { @@ -43,7 +44,7 @@ build() { package_mythplugins-mytharchive() { pkgdesc="Create DVDs or archive recorded shows in MythTV" - depends=("mythtv>=$pkgver" 'cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' + depends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'mythtv' 'python-imaging') cd "$srcdir/$pkgbase-$pkgver/mytharchive" @@ -52,7 +53,7 @@ package_mythplugins-mytharchive() { package_mythplugins-mythbrowser() { pkgdesc="Mini web browser for MythTV" - depends=("mythtv>=$pkgver") + depends=('mythtv') cd "$srcdir/$pkgbase-$pkgver/mythbrowser" make INSTALL_ROOT="$pkgdir" install @@ -60,7 +61,7 @@ package_mythplugins-mythbrowser() { package_mythplugins-mythgallery() { pkgdesc="Image gallery plugin for MythTV" - depends=("mythtv>=$pkgver" 'libexif') + depends=('libexif' 'mythtv') cd "$srcdir/$pkgbase-$pkgver/mythgallery" make INSTALL_ROOT="$pkgdir" install @@ -68,7 +69,7 @@ package_mythplugins-mythgallery() { package_mythplugins-mythgame() { pkgdesc="Game emulator plugin for MythTV" - depends=("mythtv>=$pkgver") + depends=('mythtv') cd "$srcdir/$pkgbase-$pkgver/mythgame" make INSTALL_ROOT="$pkgdir" install @@ -76,8 +77,8 @@ package_mythplugins-mythgame() { package_mythplugins-mythmusic() { pkgdesc="Music playing plugin for MythTV" - depends=("mythtv>=$pkgver" 'cdparanoia' 'flac' 'libcdaudio' 'libvisual' - 'libvorbis' 'sdl' 'taglib') + depends=('cdparanoia' 'flac' 'libcdaudio' 'libvisual' 'libvorbis' 'mythtv' + 'sdl' 'taglib') cd "$srcdir/$pkgbase-$pkgver/mythmusic" make INSTALL_ROOT="$pkgdir" install @@ -85,7 +86,7 @@ package_mythplugins-mythmusic() { package_mythplugins-mythnetvision() { pkgdesc="MythNetvision plugin for MythTV" - depends=("mythtv>=$pkgver" 'python2-oauth' 'python-pycurl') + depends=('mythtv' 'python2-oauth' 'python-pycurl') cd "$srcdir/$pkgbase-$pkgver/mythnetvision" make INSTALL_ROOT="$pkgdir" install @@ -93,7 +94,7 @@ package_mythplugins-mythnetvision() { package_mythplugins-mythnews() { pkgdesc="News checking plugin for MythTV" - depends=("mythtv>=$pkgver") + depends=('mythtv') cd "$srcdir/$pkgbase-$pkgver/mythnews" make INSTALL_ROOT="$pkgdir" install @@ -101,7 +102,7 @@ package_mythplugins-mythnews() { package_mythplugins-mythvideo() { pkgdesc="Video playback and browsing plugin for MythTV" - depends=("mythtv>=$pkgver" 'mplayer') + depends=('mplayer' 'mythtv') cd "$srcdir/$pkgbase-$pkgver/mythvideo" make INSTALL_ROOT="$pkgdir" install @@ -111,9 +112,9 @@ package_mythplugins-mythvideo() { package_mythplugins-mythweather() { pkgdesc="Weather checking plugin for MythTV" - depends=("mythtv>=$pkgver" 'perl-date-manip' 'perl-libwww' 'perl-soap-lite' - 'perl-xml-sax' 'perl-xml-simple' 'perl-xml-xpath' 'perl-image-size' - 'perl-datetime-format-iso8601') + depends=('mythtv' 'perl-date-manip' 'perl-libwww' + 'perl-soap-lite' 'perl-xml-sax' 'perl-xml-simple' 'perl-xml-xpath' + 'perl-image-size' 'perl-datetime-format-iso8601') cd "$srcdir/$pkgbase-$pkgver/mythweather" make INSTALL_ROOT="$pkgdir" install @@ -121,19 +122,19 @@ package_mythplugins-mythweather() { package_mythplugins-mythweb() { pkgdesc="Web interface for the MythTV scheduler" - depends=("mythtv>=$pkgver") - optdepends=('php-apache' - 'lighttpd') + depends=('mythtv') + optdepends=('lighttpd' + 'php-apache') mkdir -p "$pkgdir/srv/http/mythweb"/{image_cache,php_sessions} cp -R "$srcdir/$pkgbase-$pkgver/mythweb"/* "$pkgdir/srv/http/mythweb" chown -R http:http "$pkgdir/srv/http/mythweb" - chmod g+rw "$pkgdir/srv/http/mythweb"/{image_cache,php_sessions,data} + chmod g+rw "$pkgdir/srv/http/mythweb"/{image_cache,php_sessions} } package_mythplugins-mythzoneminder() { pkgdesc="View CCTV footage from zoneminder in MythTV" - depends=("mythtv>=$pkgver") + depends=('mythtv') install='mythplugins-mythzoneminder.install' cd "$srcdir/$pkgbase-$pkgver/mythzoneminder" diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD index 6628b9001..45b18a7bd 100644 --- a/community/mythtv/PKGBUILD +++ b/community/mythtv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 46888 2011-05-13 13:31:23Z jconder $ +# $Id: PKGBUILD 47228 2011-05-19 08:27:51Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -6,8 +6,8 @@ # Contributor: dorphell <dorphell@archlinux.org> pkgname=mythtv -pkgver=0.24 -pkgrel=2 +pkgver=0.24.1 +pkgrel=1 epoch=1 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64' 'mips64el') @@ -24,7 +24,7 @@ install='mythtv.install' source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" 'mythbackend.rc' 'mythbackend.conf') -md5sums=('1abe1d3cc72fdbde6daa4247dedbf29a' +md5sums=('6870c679619ec58456e76839745411d8' 'feadcc9ad064d93d6dceab1efc0bd9ed' 'bb8e4033d82428d827570fae9ba15e6a') diff --git a/community/naev/PKGBUILD b/community/naev/PKGBUILD index 8da191d9c..629a4d257 100644 --- a/community/naev/PKGBUILD +++ b/community/naev/PKGBUILD @@ -1,45 +1,32 @@ -# $Id: PKGBUILD 23139 2010-08-07 06:55:11Z svenstaro $ +# $Id: PKGBUILD 47428 2011-05-23 01:57:56Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Johan Rehnberg <cleanrock@gmail.com> pkgname=naev -pkgver=0.4.2 -pkgrel=3 +pkgver=0.5.0beta2 +_pkgver=0.5.0-beta2 +pkgrel=1 pkgdesc='2D action/rpg space game' arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/naev/" license=('GPL3') depends=('openal' 'libvorbis' 'sdl_image' 'sdl_mixer' 'libgl' 'libxml2' 'freetype2' 'libpng' 'naev-data') makedepends=('freeglut') -options=( ) -source=("http://naev.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2" +source=("http://naev.googlecode.com/files/${pkgname}-${_pkgver}.tar.bz2" "naev.png" "naev.desktop") -md5sums=('307bec2704e98f0af6f13e50f2737b0c' +md5sums=('45d3abff357a347c3f2e9db93d184ba3' '5945aa4fa7c0b046ad48f2fb9cbbbdd3' '134032fb35eb2953e9a1bbee3a6dcf63') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-$_pkgver" - ./configure --prefix=/usr --disable-debug --disable-shave --with-ndata-path=/usr/share/naev/ndata-${pkgver} + ./configure --prefix=/usr --disable-debug --disable-shave --with-ndata-path=/usr/share/naev/ndata-${_pkgver} make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-$_pkgver" make DESTDIR="$pkgdir/" install - - install -m644 "$srcdir/$pkgname-$pkgver/conf.example" "$pkgdir/usr/share/doc/naev/" - - mkdir -p "$pkgdir/usr/share/naev/" - - mkdir -p "$pkgdir/usr/share/pixmaps/" - install -m644 "$srcdir/naev.png" "$pkgdir/usr/share/pixmaps/" - - mkdir -p "$pkgdir/usr/share/applications/" - install -m644 "$srcdir/naev.desktop" "$pkgdir/usr/share/applications/" - - mkdir -p "$pkgdir/usr/share/licenses/naev/" - install -m644 "$srcdir/$pkgname-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/naev/" } diff --git a/community/nautilus-actions/PKGBUILD b/community/nautilus-actions/PKGBUILD index baa835c84..afd7efdc3 100644 --- a/community/nautilus-actions/PKGBUILD +++ b/community/nautilus-actions/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 46806 2011-05-12 16:08:55Z ibiru $ +# $Id: PKGBUILD 47289 2011-05-20 18:44:43Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Tor Krill <tor@krill.nu> pkgname=nautilus-actions -pkgver=3.1.2 +pkgver=3.1.3 pkgrel=1 pkgdesc="Configures programs to be launched when files are selected in Nautilus" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('intltool' 'gnome-doc-utils') install=nautilus-actions.install options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/nautilus-actions/3.1/$pkgname-$pkgver.tar.bz2) -sha256sums=('868c0f87cc80ee31074dcf4df736757655e396a9eafc19cd81b3dd05e4f940ac') +sha256sums=('d7cab5b1a75f4cbeb68e7d2bfe4834ee13890abf6cab9254326f871ee07c9924') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/nethogs/PKGBUILD b/community/nethogs/PKGBUILD new file mode 100644 index 000000000..3ed0be492 --- /dev/null +++ b/community/nethogs/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer: Kyle Keen <keenerd@gmail.com> +# Contributor: ViNS <gladiator@fastwebnet.it> +# Contributor: Daenyth +pkgname=nethogs +pkgver=0.7.0 +pkgrel=4 +pkgdesc="A net top tool which displays traffic used per process instead of per IP or interface" +url="http://nethogs.sourceforge.net" +license=(GPL) +depends=(libpcap ncurses gcc-libs) +arch=(i686 x86_64) +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz gcc44.patch) +md5sums=('e5f04071571e469e14c89f637cfa34a2' + '62eb824fbbadd1c60d0749593c16d293') + +build() { + cd "$srcdir/$pkgname" + + sed -i '/sbin :=/ s/sbin/bin/g' Makefile + + # Patch the code to work with gcc 4.4 + patch -Np1 -i "$srcdir/gcc44.patch" + + make + install -d "$pkgdir/usr/bin" + install -d "$pkgdir/usr/share/man/man8" + make DESTDIR="$pkgdir/usr" install +} +# vim:set ts=2 sw=2 et: diff --git a/community/nethogs/gcc44.patch b/community/nethogs/gcc44.patch new file mode 100644 index 000000000..7fedbf978 --- /dev/null +++ b/community/nethogs/gcc44.patch @@ -0,0 +1,11 @@ +diff -ruN nethogs-old/conninode.cpp nethogs/conninode.cpp +--- nethogs-old/conninode.cpp 2009-05-17 09:05:32.000000000 -0400 ++++ nethogs/conninode.cpp 2009-05-17 09:06:47.000000000 -0400 +@@ -1,6 +1,7 @@ + #include <netinet/in.h> + #include <map> + #include <stdlib.h> ++#include <cstdio> + + #include "nethogs.h" + #include "conninode.h" diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index 52e644464..4baafd3d9 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 46704 2011-05-10 20:38:51Z spupykin $ +# $Id: PKGBUILD 47990 2011-05-26 22:02:37Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> @@ -11,7 +11,7 @@ _user=http _group=http pkgname=nginx -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=1 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server" arch=('i686' 'x86_64' 'mips64el') @@ -27,7 +27,7 @@ backup=("etc/nginx/conf/nginx.conf" "etc/logrotate.d/nginx") source=(http://sysoev.ru/nginx/nginx-${pkgver}.tar.gz nginx) -md5sums=('8a528ccaab3ddba84e72443fa40b19e7' +md5sums=('eebf1e9c7e86f923923b828ae0156103' '837b010afcbdfe82d8e65ef00c4e14ba') build() { diff --git a/community/nut/PKGBUILD b/community/nut/PKGBUILD index 70108db54..ba7d575b7 100644 --- a/community/nut/PKGBUILD +++ b/community/nut/PKGBUILD @@ -2,14 +2,14 @@ # Contributor: Slash <demodevil5 [at] yahoo [dot] com> pkgname=nut -pkgver=16.10 +pkgver=16.12 pkgrel=1 pkgdesc='Records what you eat and analyzes your meals for nutrient levels in terms of the Daily Value or DV which is the standard for food labeling in the US.' url='http://nut.sourceforge.net/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') source=("http://downloads.sourceforge.net/project/nut/nut/${pkgver}/nut-${pkgver}.tar.gz") -md5sums=('7b360d0cc7fed5361f1220385af7aa1b') +md5sums=('12b33ddad0e04ce1e3846fdcdd927dde') build() { cd ${pkgname}-${pkgver} diff --git a/community/ogre/PKGBUILD b/community/ogre/PKGBUILD index f732f1646..39fa1917e 100644 --- a/community/ogre/PKGBUILD +++ b/community/ogre/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 46578 2011-05-09 16:26:46Z svenstaro $ +# $Id: PKGBUILD 47685 2011-05-24 19:41:50Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgbase=ogre pkgname=('ogre' 'ogre-docs') pkgver=1.7.3 -pkgrel=1 +pkgrel=2 pkgdesc="A scene-oriented, flexible 3D engine written in C++" arch=('i686' 'x86_64' 'mips64el') url='http://www.ogre3d.org' diff --git a/community/openscenegraph/PKGBUILD b/community/openscenegraph/PKGBUILD index 9bf11948b..52e6d413e 100644 --- a/community/openscenegraph/PKGBUILD +++ b/community/openscenegraph/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 38818 2011-02-01 11:50:23Z spupykin $ +# $Id: PKGBUILD 47048 2011-05-14 19:07:46Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Hans Janssen <janserv@gmail.com> # Contributor: my64 <packages@obordes.com> # Contributor: Colin Pitrat <colin.pitrat@gmail.com> pkgname=openscenegraph -pkgver=2.8.3 -pkgrel=5 +pkgver=2.8.4 +pkgrel=1 pkgdesc="An Open Source, high performance real-time graphics toolkit" arch=('i686' 'x86_64' 'mips64el') license=('custom:OSGPL') @@ -16,17 +16,23 @@ makedepends=('cmake' 'libvncserver') optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib') conflicts=('openthreads') provides=('openthreads') -source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip - build-fix.diff) -md5sums=('dc43b9161555c4eab7f5a678dd4e01ab' - '0fbcd32f129f94ac4775de326775b3cf') +source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip) +md5sums=('283215b4040f7c5b85d30862a8eba97c') build() { - cd "$srcdir/OpenSceneGraph-$pkgver" + cd OpenSceneGraph-$pkgver + [ $NOEXTRACT -eq 1 ] || cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release - patch -p1 <$srcdir/build-fix.diff || true + make +} + +package() { + cd OpenSceneGraph-$pkgver + make DESTDIR="$pkgdir" install + install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + [ -d "$pkgdir/usr/lib64" ] && mv "$pkgdir/usr/lib64" "$pkgdir/usr/lib" || true } diff --git a/community/openscenegraph/build-fix.diff b/community/openscenegraph/build-fix.diff deleted file mode 100644 index 7e9fb0baa..000000000 --- a/community/openscenegraph/build-fix.diff +++ /dev/null @@ -1,137 +0,0 @@ -diff -wbBur OpenSceneGraph-2.8.3/include/osg/AudioStream OpenSceneGraph-2.8.3.my/include/osg/AudioStream ---- OpenSceneGraph-2.8.3/include/osg/AudioStream 2010-03-19 09:14:12.000000000 +0000 -+++ OpenSceneGraph-2.8.3.my/include/osg/AudioStream 2011-02-01 10:50:20.000000000 +0000 -@@ -68,7 +68,7 @@ - virtual int audioFrequency() const = 0; - virtual int audioNbChannels() const = 0; - -- enum SampleFormat -+ enum XSampleFormat - { - SAMPLE_FORMAT_U8, - SAMPLE_FORMAT_S16, -@@ -76,8 +76,7 @@ - SAMPLE_FORMAT_S32, - SAMPLE_FORMAT_F32 - }; -- -- virtual SampleFormat audioSampleFormat() const = 0; -+ virtual XSampleFormat audioSampleFormat() const = 0; - }; - - } // namespace -diff -wbBur OpenSceneGraph-2.8.3/src/osgPlugins/ffmpeg/FFmpegAudioStream.cpp OpenSceneGraph-2.8.3.my/src/osgPlugins/ffmpeg/FFmpegAudioStream.cpp ---- OpenSceneGraph-2.8.3/src/osgPlugins/ffmpeg/FFmpegAudioStream.cpp 2010-03-19 08:48:34.000000000 +0000 -+++ OpenSceneGraph-2.8.3.my/src/osgPlugins/ffmpeg/FFmpegAudioStream.cpp 2011-02-01 10:52:42.000000000 +0000 -@@ -1,3 +1,10 @@ -+#include <stdint.h> -+ -+# if __WORDSIZE == 64 -+# define UINT64_C(c) c ## UL -+# else -+# define UINT64_C(c) c ## ULL -+# endif - - #include "FFmpegAudioStream.hpp" - -@@ -66,7 +71,7 @@ - - - --osg::AudioStream::SampleFormat FFmpegAudioStream::audioSampleFormat() const -+osg::AudioStream::XSampleFormat FFmpegAudioStream::audioSampleFormat() const - { - return m_decoder->audio_decoder().sampleFormat(); - } -diff -wbBur OpenSceneGraph-2.8.3/src/osgPlugins/ffmpeg/FFmpegAudioStream.hpp OpenSceneGraph-2.8.3.my/src/osgPlugins/ffmpeg/FFmpegAudioStream.hpp ---- OpenSceneGraph-2.8.3/src/osgPlugins/ffmpeg/FFmpegAudioStream.hpp 2010-03-19 08:48:36.000000000 +0000 -+++ OpenSceneGraph-2.8.3.my/src/osgPlugins/ffmpeg/FFmpegAudioStream.hpp 2011-02-01 10:52:33.000000000 +0000 -@@ -23,7 +23,7 @@ - - int audioFrequency() const; - int audioNbChannels() const; -- osg::AudioStream::SampleFormat audioSampleFormat() const; -+ osg::AudioStream::XSampleFormat audioSampleFormat() const; - - double duration() const; - -diff -wbBur OpenSceneGraph-2.8.3/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp OpenSceneGraph-2.8.3.my/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp ---- OpenSceneGraph-2.8.3/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp 2010-03-19 09:14:34.000000000 +0000 -+++ OpenSceneGraph-2.8.3.my/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp 2011-02-01 10:52:12.000000000 +0000 -@@ -80,7 +79,7 @@ - - m_frequency = m_context->sample_rate; - m_nb_channels = m_context->channels; -- m_sample_format = osg::AudioStream::SampleFormat(m_context->sample_fmt); -+ m_sample_format = osg::AudioStream::XSampleFormat(m_context->sample_fmt); - - // Check stream sanity - if (m_context->codec_id == CODEC_ID_NONE) -diff -wbBur OpenSceneGraph-2.8.3/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.hpp OpenSceneGraph-2.8.3.my/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.hpp ---- OpenSceneGraph-2.8.3/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.hpp 2010-03-19 09:14:18.000000000 +0000 -+++ OpenSceneGraph-2.8.3.my/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.hpp 2011-02-01 10:51:34.000000000 +0000 -@@ -13,8 +13,7 @@ - - #include "BoundedMessageQueue.hpp" - -- -- -+#include <libavcore/samplefmt.h> - - namespace osgFFmpeg { - -@@ -45,7 +42,7 @@ - bool validContext() const; - int frequency() const; - int nbChannels() const; -- osg::AudioStream::SampleFormat sampleFormat() const; -+ osg::AudioStream::XSampleFormat sampleFormat() const; - - private: - -@@ -71,7 +68,7 @@ - - int m_frequency; - int m_nb_channels; -- osg::AudioStream::SampleFormat m_sample_format; -+ osg::AudioStream::XSampleFormat m_sample_format; - - SinkPtr m_audio_sink; - -@@ -104,7 +101,7 @@ - } - - --inline osg::AudioStream::SampleFormat FFmpegDecoderAudio::sampleFormat() const -+inline osg::AudioStream::XSampleFormat FFmpegDecoderAudio::sampleFormat() const - { - return m_sample_format; - } -diff -wbBur OpenSceneGraph-2.8.3/src/osgPlugins/ffmpeg/FFmpegImageStream.cpp OpenSceneGraph-2.8.3.my/src/osgPlugins/ffmpeg/FFmpegImageStream.cpp ---- OpenSceneGraph-2.8.3/src/osgPlugins/ffmpeg/FFmpegImageStream.cpp 2010-03-19 09:14:18.000000000 +0000 -+++ OpenSceneGraph-2.8.3.my/src/osgPlugins/ffmpeg/FFmpegImageStream.cpp 2011-01-31 18:04:48.000000000 +0000 -@@ -1,3 +1,10 @@ -+#include <stdint.h> -+ -+# if __WORDSIZE == 64 -+# define UINT64_C(c) c ## UL -+# else -+# define UINT64_C(c) c ## ULL -+# endif - - #include "FFmpegImageStream.hpp" - #include "FFmpegAudioStream.hpp" -diff -wbBur OpenSceneGraph-2.8.3/src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp OpenSceneGraph-2.8.3.my/src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp ---- OpenSceneGraph-2.8.3/src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp 2010-03-19 09:04:40.000000000 +0000 -+++ OpenSceneGraph-2.8.3.my/src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp 2011-01-31 17:52:59.000000000 +0000 -@@ -1,3 +1,10 @@ -+#include <stdint.h> -+ -+# if __WORDSIZE == 64 -+# define UINT64_C(c) c ## UL -+# else -+# define UINT64_C(c) c ## ULL -+# endif - /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield - * - * This library is open source and may be redistributed and/or modified under diff --git a/community/packagekit/PKGBUILD b/community/packagekit/PKGBUILD index ad0079971..e1161594c 100644 --- a/community/packagekit/PKGBUILD +++ b/community/packagekit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 46893 2011-05-13 13:47:07Z jconder $ +# $Id: PKGBUILD 47014 2011-05-14 04:04:32Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> pkgbase='packagekit' -pkgname=('packagekit' 'packagekit-qt' 'packagekit-python') +pkgname=('packagekit' 'packagekit-qt' 'packagekit-qt2' 'packagekit-python') pkgver=0.6.14 -pkgrel=1 +pkgrel=2 pkgdesc="A system designed to make installation and updates of packages easier." arch=('i686' 'x86_64' 'mips64el') url="http://www.packagekit.org" @@ -84,6 +84,15 @@ package_packagekit-qt() { make DESTDIR="$pkgdir" install } +package_packagekit-qt2() { + depends=('packagekit' 'qt') + pkgdesc=('Qt bindings for PackageKit') + + cd "$srcdir/PackageKit-$pkgver/lib/packagekit-qt2" + + make DESTDIR="$pkgdir" install +} + package_packagekit-python() { depends=('packagekit' 'python2') pkgdesc=('Python bindings for PackageKit') diff --git a/community/paraview/PKGBUILD b/community/paraview/PKGBUILD index 929c59363..4a6694a29 100644 --- a/community/paraview/PKGBUILD +++ b/community/paraview/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Simon Zilliken <simon____AT____zilliken____DOT____name> pkgname=paraview -pkgver=3.10.0 -pkgrel=2 +pkgver=3.10.1 +pkgrel=1 pkgdesc='Parallel Visualization Application using VTK.' arch=('i686' 'x86_64' 'mips64el') url='http://www.paraview.org' @@ -15,7 +15,7 @@ source=("http://paraview.org/files/v${pkgver:0:4}/ParaView-${pkgver}.tar.gz" "${pkgname}.profile" "${pkgname}.png" "${pkgname}.desktop") -md5sums=('5369f05667f1ad8aaca7a879208aeb3c' +md5sums=('d8a9d4a997a720589ffd57568bcdd449' '534ef49689a7f630c98380f5ab4bf915' 'db623002bc71a257ddfdd0c9c7b14c3f' '4e4b7172ed18171c37446fd7c4f1e8f5') @@ -23,6 +23,10 @@ md5sums=('5369f05667f1ad8aaca7a879208aeb3c' build() { cd ParaView-${pkgver} + sed -i '20 i#include <stddef.h>' VTK/Utilities/vtkmetaio/metaUtils.cxx + sed -i 's/stddef.h/cstddef/' VTK/Wrapping/Python/vtkPythonUtil.cxx + sed -i '36 i#include <vtksys/cstddef>' VTK/Wrapping/Python/PyVTKObject.cxx + # Paraview wants to be built out of source mkdir -p build cd build diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD index 87c07ae56..16518d9c9 100644 --- a/community/performous/PKGBUILD +++ b/community/performous/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 40964 2011-03-02 22:24:28Z lcarlier $ +# $Id: PKGBUILD 47641 2011-05-24 14:35:06Z tdziedzic $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=performous pkgver=0.6.1 -pkgrel=4 +pkgrel=5 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' -arch=('i686' 'x86_64' 'mips64el') -url="http://$pkgname.org/" +arch=('i686' 'x86_64') +url="http://performous.org/" license=('GPL') depends=('boost-libs>=1.46' 'sdl' 'jack' 'imagemagick' 'ffmpeg' 'glew' 'libxml++' 'portaudio' 'portmidi' \ 'opencv' 'librsvg' 'libjpeg' 'libpng' 'cairo') diff --git a/community/perl-datetime/PKGBUILD b/community/perl-datetime/PKGBUILD index e2663d0f9..b843c710b 100644 --- a/community/perl-datetime/PKGBUILD +++ b/community/perl-datetime/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 46321 2011-05-05 10:16:29Z spupykin $ +# $Id: PKGBUILD 47204 2011-05-18 20:20:25Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-datetime -pkgver=0.69 -pkgrel=2 +pkgver=0.70 +pkgrel=1 pkgdesc="A complete, easy to use date and time object" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/DateTime" @@ -15,7 +15,7 @@ LC_NUMERIC=C provides=("perl-datetime=`printf %.4f $pkgver`") options=('!emptydirs') source=(http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-$pkgver.tar.gz) -md5sums=('d14c4439bd0b81446e54504db68fd64f') +md5sums=('228a3ca93b49e308fc7a3b7a47341ab3') build() { cd $srcdir/DateTime-$pkgver diff --git a/community/perl-params-validate/PKGBUILD b/community/perl-params-validate/PKGBUILD index 37cab9a15..bb201a4a4 100644 --- a/community/perl-params-validate/PKGBUILD +++ b/community/perl-params-validate/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-params-validate -pkgver=0.95 -pkgrel=3 +pkgver=0.98 +pkgrel=1 pkgdesc="Validate sub params against a spec" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Params-Validate" @@ -11,12 +11,15 @@ license=('GPL' 'PerlArtistic') depends=('perl>=5.10.0') options=('!emptydirs') source=(http://www.cpan.org/authors/id/D/DR/DROLSKY/Params-Validate-$pkgver.tar.gz) -md5sums=('f544f12357ae4ba44044cd8cb2b83a9f') +md5sums=('6dacb26b1bdb6338b6eed45cd86958bb') build() { cd $startdir/src/Params-Validate-$pkgver perl ./Build.PL --installdirs=vendor ./Build +} +package(){ + cd $startdir/src/Params-Validate-$pkgver ./Build install --destdir=$pkgdir find $startdir/pkg -name '.packlist' -delete find $startdir/pkg -name '*.pod' -delete diff --git a/community/pingus/PKGBUILD b/community/pingus/PKGBUILD index 0e0c3ee7c..751711d03 100644 --- a/community/pingus/PKGBUILD +++ b/community/pingus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 40956 2011-03-02 21:08:01Z lcarlier $ +# $Id: PKGBUILD 47672 2011-05-24 18:43:41Z tdziedzic $ # Maintainer: Eric Belanger <eric@archlinux.org> pkgname=pingus pkgver=0.7.3 -pkgrel=3 +pkgrel=4 pkgdesc="A Lemmings clone, i.e. a level-based puzzle game." arch=('i686' 'x86_64' 'mips64el') url="http://pingus.seul.org" @@ -17,14 +17,15 @@ sha1sums=('ca7fe5cea65fb3392d1e81056a879831925502f2' 'f35649f3b0b2bfcb01ce75085cf719dcaa609a54') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} scons prefix=/usr } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./install.sh "${pkgdir}/usr" + install -D -m644 "${srcdir}/pingus.desktop" "${pkgdir}/usr/share/applications/pingus.desktop" } diff --git a/community/pokerth/PKGBUILD b/community/pokerth/PKGBUILD index e34e02601..cc4df5fca 100644 --- a/community/pokerth/PKGBUILD +++ b/community/pokerth/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 45135 2011-04-17 08:17:41Z tdziedzic $ +# $Id: PKGBUILD 47635 2011-05-24 14:23:55Z tdziedzic $ # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor: Vasco Costa <vasco.costa@meiodigital.com> pkgname=pokerth _realname=PokerTH pkgver=0.8.3 -pkgrel=3 +pkgrel=4 pkgdesc="Poker game written in C++/QT4" arch=('i686' 'x86_64' 'mips64el') url="http://www.pokerth.net/" @@ -16,16 +16,23 @@ source=(http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver- md5sums=('adbe56ad5f547eb255dad91de564bf1c') build() { - cd "$srcdir/$_realname-$pkgver-src" + cd $_realname-$pkgver-src sed -i 's/QMAKE_CXXFLAGS += -std=gnu++0x/QMAKE_CXXFLAGS += -std=gnu++0x -DBOOST_FILESYSTEM_VERSION=2/' *.pro + + # fix g++: error: unrecognized option '-no_dead_strip_inits_and_terms' + sed \ + -e 's/QMAKE_LFLAGS += -no_dead_strip_inits_and_terms//' \ + -i zlib_compress.pro pokerth_game.pro pokerth_server.pro + qmake $pkgname.pro + make } package() { - cd "$srcdir/$_realname-$pkgver-src" + cd $_realname-$pkgver-src make INSTALL_ROOT="$pkgdir" install diff --git a/community/qbittorrent/PKGBUILD b/community/qbittorrent/PKGBUILD index 591963f40..82b0f5e0b 100644 --- a/community/qbittorrent/PKGBUILD +++ b/community/qbittorrent/PKGBUILD @@ -4,7 +4,7 @@ pkgname=qbittorrent pkgver=2.7.3 -pkgrel=1 +pkgrel=2 pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library" arch=('i686' 'x86_64' 'mips64el') url="http://www.qbittorrent.org/" diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD index 3fa7ecf2b..8b63ff96f 100644 --- a/community/qlandkartegt/PKGBUILD +++ b/community/qlandkartegt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 45140 2011-04-17 12:03:02Z andrea $ +# $Id: PKGBUILD 47374 2011-05-22 09:38:33Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Matthias Maennich <arch@maennich.net> # Contributor: <boenki@gmx.de> pkgname=qlandkartegt -pkgver=1.1.1 -pkgrel=2 +pkgver=1.1.2 +pkgrel=1 pkgdesc="Use your GPS with Linux" arch=('i686' 'x86_64' 'mips64el') url="http://www.qlandkarte.org/" @@ -16,17 +16,13 @@ optdepends=('garmindev: to connect garmin devices') install=$pkgname.install changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz - $pkgname-mimetypes.xml - gpsd-2.96.patch) -sha256sums=('0288c94edcb0af4e39bc045c8607ed9404b4692c44e5409eff64329a21b33af9' - 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0' - 'b641c94c6db4087c9ae1a79e31e2ea126830abf7ff1b05c27953edc6afebf8c7') + $pkgname-mimetypes.xml) +sha256sums=('8eedc414b4f89c9519e4b15c2ac7e5986b8e0834d237cde5fedc619c61ad0175' + 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0') build() { cd ${srcdir}/$pkgname-$pkgver - patch -Np0 -i ${srcdir}/gpsd-2.96.patch - install -d ${srcdir}/$pkgname-$pkgver/build cd ${srcdir}/$pkgname-$pkgver/build diff --git a/community/qlandkartegt/qlandkartegt.changelog b/community/qlandkartegt/qlandkartegt.changelog index c832cc8d2..d7fb41e6f 100644 --- a/community/qlandkartegt/qlandkartegt.changelog +++ b/community/qlandkartegt/qlandkartegt.changelog @@ -1,3 +1,6 @@ +2011-05-22 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qlandkartegt 1.1.2-1 + 2011-03-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qlandkartegt 1.1.1-1 diff --git a/community/qlandkartegt/qlandkartegt.install b/community/qlandkartegt/qlandkartegt.install index aacc9e6a8..e55805570 100644 --- a/community/qlandkartegt/qlandkartegt.install +++ b/community/qlandkartegt/qlandkartegt.install @@ -1,7 +1,7 @@ post_install() { -update-mime-database usr/share/mime > /dev/null + update-mime-database usr/share/mime > /dev/null } post_remove() { -update-mime-database usr/share/mime > /dev/null + post_install $1 } diff --git a/community/qtmpc/PKGBUILD b/community/qtmpc/PKGBUILD new file mode 100644 index 000000000..95900ba1a --- /dev/null +++ b/community/qtmpc/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 47054 2011-05-14 19:45:44Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Shaika-Dzari <shaikadzari at gmail dot com> + +pkgname=qtmpc +pkgver=0.6.1 +pkgrel=2 +pkgdesc="Qt4-based front-end for MPD" +arch=('i686' 'x86_64') +url="http://qtmpc.lowblog.nl/" +license=('GPL') +depends=('hicolor-icon-theme' 'kdebase-runtime' 'qt') +makedepends=('automoc4' 'cmake') +install=$pkgname.install +changelog=$pkgname.changelog +source=(http://files.lowblog.nl/$pkgname/QtMPC-$pkgver.tar.bz2) +sha256sums=('82287a26788b36d49db26518b66203f332cf686eefb81ee2d9be095e61123a62') + +build() { + cd ${srcdir}/QtMPC + + cmake . -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd ${srcdir}/QtMPC + + make DESTDIR=${pkgdir} install +} diff --git a/community/qtmpc/qtmpc.changelog b/community/qtmpc/qtmpc.changelog new file mode 100644 index 000000000..f4271103c --- /dev/null +++ b/community/qtmpc/qtmpc.changelog @@ -0,0 +1,3 @@ +2011-05-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qtmpc 0.6.1-2 + * moved to [community] with 109 votes diff --git a/community/qtmpc/qtmpc.install b/community/qtmpc/qtmpc.install new file mode 100644 index 000000000..1c0de2e4f --- /dev/null +++ b/community/qtmpc/qtmpc.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index 8e6536288..60f22d91b 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 46370 2011-05-06 10:37:59Z spupykin $ +# $Id: PKGBUILD 47038 2011-05-14 10:40:55Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us> # Contributor: nofxx <x@<nick>.com> pkgname=redis -pkgver=2.2.6 +pkgver=2.2.7 pkgrel=1 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ backup=("etc/redis.conf" source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" "redis.d" "redis.logrotate") -md5sums=('0aa7dafe34faacf3303afc3c06e92548' +md5sums=('86937a61b9788d1d06fbfbd2bff03916' 'bf61968d18d0e42529880f5c488ea9ed' '9e2d75b7a9dc421122d673fe520ef17f') diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD index e9ce6ed22..6a0d17ffa 100644 --- a/community/root/PKGBUILD +++ b/community/root/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Sebastian Voecking <voeck@web.de> pkgname=root -pkgver=5.28.00c +pkgver=5.28.00d pkgrel=1 pkgdesc='C++ data analysis framework and interpreter from CERN.' arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz" 'rootd' 'root.desktop' 'root.xml') -md5sums=('0e997f14cb1c671987e1780d2b6375f8' +md5sums=('53505fcb256df38526d446916e6efc15' '0e883ad44f99da9bc7c23bc102800b62' 'efd06bfa230cc2194b38e0c8939e72af' 'ac61b17395d75a2705fefa2ef841a6bf' diff --git a/community/schroot/PKGBUILD b/community/schroot/PKGBUILD index 2c60c4f3e..3601e266b 100644 --- a/community/schroot/PKGBUILD +++ b/community/schroot/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 43438 2011-03-26 08:44:13Z spupykin $ +# $Id: PKGBUILD 47626 2011-05-24 13:55:50Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de> pkgname=schroot -pkgver=1.4.21 +pkgver=1.4.22 pkgrel=1 pkgdesc="Allows users to execute shell commands under different root filesystems. \ (Successor to dchroot)." url="http://packages.qa.debian.org/s/schroot.html" license=('GPL3') -depends=('pam' 'lockdev' 'boost>=1.41' 'e2fsprogs') +depends=('pam' 'lockdev' 'boost' 'e2fsprogs') optdepends=('btrfs-progs-unstable' 'lvm2') arch=('i686' 'x86_64' 'mips64el') conflicts=('dchroot') @@ -24,13 +24,13 @@ source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}. 'script-arch32' 'copyfiles-arch32' 'mount-arch32') -md5sums=('fbbb65213e26a0a3e2e1bac04a24d20d' +md5sums=('0dde4c76b1623cc277d92f8dc06109d1' '8e86445e188129232e1782d978dfc967' 'd4558d5691fbdaa46ce669e8f327133b' 'f0d5d5b5e34a860f6f90b5628c680f46') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" @@ -43,7 +43,13 @@ build() { # --enable-csbuild make +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR=$pkgdir install + install -m 644 ${srcdir}/script-arch32 ${pkgdir}/etc/schroot install -m 644 ${srcdir}/mount-arch32 ${pkgdir}/etc/schroot install -m 644 ${srcdir}/copyfiles-arch32 ${pkgdir}/etc/schroot diff --git a/community/sleuthkit/PKGBUILD b/community/sleuthkit/PKGBUILD index 960e3c262..acb31c73b 100644 --- a/community/sleuthkit/PKGBUILD +++ b/community/sleuthkit/PKGBUILD @@ -1,32 +1,32 @@ -# $Id: PKGBUILD 32586 2010-11-15 00:28:04Z lfleischer $ +# $Id: PKGBUILD 47379 2011-05-22 09:59:29Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=sleuthkit -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 -pkgdesc='File system and media management forensic analysis tools.' -arch=('i686' 'x86_64' 'mips64el') +pkgdesc='File system and media management forensic analysis tools' +arch=('i686' 'x86_64') url='http://www.sleuthkit.org/sleuthkit' license=('GPL2' 'CPL' 'custom:"IBM Public Licence"') depends=('perl') options=('!libtool') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('05517963942aa92be77c05ca1c47f0de') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) +sha256sums=('e0f257d2c6856dc1c1cd2a704c6cb8906ca688f0cdbb1d0665fd7a5a2f83ad37') build() { - cd "${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --without-afflib --without-ewf --prefix=/usr make LDFLAGS+="-lpthread -ldl" } package() { - cd "${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install + make DESTDIR=${pkgdir} install - # licenses - install -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -Dm0644 licenses/* "${pkgdir}/usr/share/licenses/${pkgname}" +# licenses + install -d ${pkgdir}/usr/share/licenses/${pkgname} + install -Dm0644 licenses/* ${pkgdir}/usr/share/licenses/${pkgname} } diff --git a/community/smc/PKGBUILD b/community/smc/PKGBUILD index 46c7da2e5..74b9e3bfc 100644 --- a/community/smc/PKGBUILD +++ b/community/smc/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 40953 2011-03-02 21:01:34Z lcarlier $ +# $Id: PKGBUILD 47652 2011-05-24 16:35:46Z schuay $ # Maintainer: # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Kritoke <typeolinux@yahoo.com> pkgname=smc pkgver=1.9 -pkgrel=10 +pkgrel=11 pkgdesc="Secret Maryo Chronicles" arch=('i686' 'x86_64' 'mips64el') url="http://www.secretmaryo.org/" license=('GPL3') -depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'cegui>=0.7' 'boost-libs>=1.46' 'smc-data') -makedepends=('autoconf' 'automake' 'boost>=1.46') +depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'cegui' 'boost-libs' 'smc-data') +makedepends=('autoconf' 'automake' 'boost') source=(http://downloads.sourceforge.net/smclone/$pkgname-$pkgver.tar.bz2 smc-for-cegui-v0-7.diff smc.desktop diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD index 92cb5c5ed..7a32da2c9 100644 --- a/community/spring/PKGBUILD +++ b/community/spring/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 41178 2011-03-04 19:28:06Z svenstaro $ +# $Id: PKGBUILD 47736 2011-05-25 04:13:58Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=spring pkgver=0.82.7.1 -pkgrel=2 +pkgrel=3 pkgdesc='A free 3D real-time-strategy (RTS) game engine' arch=('i686' 'x86_64' 'mips64el') url="http://springrts.com/" @@ -14,8 +14,10 @@ depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis') makedepends=('boost' 'cmake' 'zip' 'lzma-utils' 'p7zip' 'python' 'java-environment') optdepends=('python: python-based bots' 'java-runtime: java-based bots') -source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma) -md5sums=('378cf0b18a5dd5b840964e5945778503') +source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma + gcc46.patch) +md5sums=('378cf0b18a5dd5b840964e5945778503' + 'e9586b611db1ed04fe4f0c5982fda7d2') build() { bsdtar -xf ${pkgname}_${pkgver}_src.tar.lzma @@ -24,6 +26,7 @@ build() { sed -i '1i\ #include <list>' rts/lib/lobby/Connection.h + patch -Np1 < $srcdir/gcc46.patch cmake . \ -DCMAKE_INSTALL_PREFIX=/usr \ -DDATADIR=share/spring diff --git a/community/spring/gcc46.patch b/community/spring/gcc46.patch new file mode 100644 index 000000000..4f6865cac --- /dev/null +++ b/community/spring/gcc46.patch @@ -0,0 +1,67 @@ +From: Jan Dittberner <jandd@debian.org> +Subject: Patch for FTBFS with g++ 4.6.0 +Bug-Debian: http://bugs.debian.org/625097 +Bug: http://springrts.com/mantis/view.php?id=2415 +--- a/AI/Skirmish/E323AI/AAStar.h ++++ b/AI/Skirmish/E323AI/AAStar.h +@@ -4,6 +4,7 @@ + #include <queue> + #include <vector> + #include <list> ++#include <cstddef> // for NULL + + class AAStar { + public: +--- a/rts/Rendering/ShadowHandler.cpp ++++ b/rts/Rendering/ShadowHandler.cpp +@@ -318,6 +318,11 @@ + xmid = 1.0f - (sqrt(fabs(x2)) / (sqrt(fabs(x2)) + sqrt(fabs(x1)))); + ymid = 1.0f - (sqrt(fabs(y2)) / (sqrt(fabs(y2)) + sqrt(fabs(y1)))); + ++ shadowParams.x = xmid; ++ shadowParams.y = ymid; ++ shadowParams.z = p17; ++ shadowParams.w = p18; ++ + shadowMatrix[ 0] = cross1.x / maxLengthX; + shadowMatrix[ 4] = cross1.y / maxLengthX; + shadowMatrix[ 8] = cross1.z / maxLengthX; +--- a/rts/Rendering/ShadowHandler.h ++++ b/rts/Rendering/ShadowHandler.h +@@ -38,7 +38,7 @@ + CMatrix44f shadowMatrix; + void CalcMinMaxView(void); + +- const float4 GetShadowParams() const { return float4(xmid, ymid, p17, p18); } ++ const float4& GetShadowParams() const { return shadowParams; } + + enum ShadowGenProgram { + SHADOWGEN_PROGRAM_MODEL = 0, +@@ -76,6 +76,7 @@ + //! to write the (FBO) depth-buffer texture + std::vector<Shader::IProgramObject*> shadowGenProgs; + ++ float4 shadowParams; + float x1, x2, y1, y2; + float xmid, ymid; + float p17, p18; +--- a/rts/Rendering/GLContext.cpp ++++ b/rts/Rendering/GLContext.cpp +@@ -9,6 +9,7 @@ + #include "GLContext.h" + + #include <list> ++#include <cstddef> // for NULL + + + using namespace std; +--- a/rts/System/MemPool.h ++++ b/rts/System/MemPool.h +@@ -4,6 +4,7 @@ + #define _MEM_POOL_H_ + + #include <new> ++#include <cstddef> // for NULL + + const size_t MAX_MEM_SIZE=200; + diff --git a/community/springlobby/PKGBUILD b/community/springlobby/PKGBUILD index b7924959c..aeb542a56 100644 --- a/community/springlobby/PKGBUILD +++ b/community/springlobby/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 46590 2011-05-09 22:11:42Z svenstaro $ +# $Id: PKGBUILD 47682 2011-05-24 19:40:45Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: DuGi <dugi@irc.pl> pkgname=springlobby pkgver=0.131 -pkgrel=1 +pkgrel=2 pkgdesc="A free cross-platform lobby client for the Spring RTS project." arch=('i686' 'x86_64' 'mips64el') url="http://springlobby.info/" diff --git a/community/sxiv/PKGBUILD b/community/sxiv/PKGBUILD new file mode 100644 index 000000000..04e771c57 --- /dev/null +++ b/community/sxiv/PKGBUILD @@ -0,0 +1,35 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Bert Muennich <muennich at informatik.hu-berlin.de> + +pkgname=sxiv +pkgver=0.8.1 +pkgrel=2 +pkgdesc='simple x image viewer' +arch=('i686' 'x86_64') +license=('GPL2') +install=('sxiv.install') +url='https://github.com/muennich/sxiv' +depends=('libx11' 'xproto' 'imlib2') +source=("https://github.com/downloads/muennich/sxiv/sxiv-${pkgver}.tar.gz" + 'sxiv.desktop' + 'config.h') +md5sums=('23006a1900690d46c0ff126c76cdbd02' + '0b6d43bd356aadc12537c010950e2272' + '8018e9f2f63b155098428be9dbaf8b5c') + +build() { + cd sxiv-${pkgver} + + cp ${srcdir}/config.h . + + make +} + +package() { + cd sxiv-${pkgver} + + make PREFIX=${pkgdir}/usr install + + install -D -m644 ${srcdir}/sxiv.desktop \ + ${pkgdir}/usr/share/applications/sxiv.desktop +} diff --git a/community/sxiv/config.h b/community/sxiv/config.h new file mode 100644 index 000000000..14a65bd4f --- /dev/null +++ b/community/sxiv/config.h @@ -0,0 +1,41 @@ +/* default window dimensions (overwritten via -g option): */ +#define WIN_WIDTH 800 +#define WIN_HEIGHT 600 + +/* default color for window background: * + * (see X(7) "COLOR NAMES" section for valid values) */ +#define BG_COLOR "#999999" +/* default color for thumbnail selection: */ +#define SEL_COLOR "#0040FF" + +/* how should images be scaled when they are loaded?: * + * (also controllable via -d/-s/-Z/-z options) * + * SCALE_DOWN: 100%, but fit large images into window, * + * SCALE_FIT: fit all images into window, * + * SCALE_ZOOM: use current zoom level, 100% at startup */ +#define SCALE_MODE SCALE_DOWN + +/* levels (percent) to use when zooming via '-' and '+': */ +static const float zoom_levels[] = { + 12.5, 25.0, 50.0, 75.0, + 100.0, 150.0, 200.0, 400.0, 800.0 +}; + +/* default dimension of thumbnails (width == height): */ +#define THUMB_SIZE 60 + +/* enable external commands (defined below)? 0=off, 1=on: */ +#define EXT_COMMANDS 0 + +/* external commands and corresponding key mappings: */ +#ifdef MAIN_C +#if EXT_COMMANDS +static const command_t commands[] = { + /* ctrl-... reload? command, '#' is replaced by filename */ + { XK_comma, True, "jpegtran -rotate 270 -copy all -outfile # #" }, + { XK_period, True, "jpegtran -rotate 90 -copy all -outfile # #" }, + { XK_less, True, "mogrify -rotate -90 #" }, + { XK_greater, True, "mogrify -rotate +90 #" } +}; +#endif +#endif diff --git a/community/sxiv/sxiv.desktop b/community/sxiv/sxiv.desktop new file mode 100644 index 000000000..f510d49ea --- /dev/null +++ b/community/sxiv/sxiv.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Type=Application +Name=sxiv +GenericName=Image Viewer +Exec=sxiv %f +MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/png;image/tiff;image/x-bmp; +NoDisplay=true diff --git a/community/sxiv/sxiv.install b/community/sxiv/sxiv.install new file mode 100644 index 000000000..02fd31189 --- /dev/null +++ b/community/sxiv/sxiv.install @@ -0,0 +1,10 @@ +post_install () { + echo "* Look into config.h to customize sxiv to your needs." + echo " Use 'makepkg --skipinteg' to rebuild the package after changing config.h." + echo "* Create the directory ~/.sxiv/ to enable thumbnail caching." + echo " See sxiv(1) for more information." +} + +post_upgrade () { + post_install ${1} +} diff --git a/community/systemd/PKGBUILD b/community/systemd/PKGBUILD index 2eab37e96..325223225 100644 --- a/community/systemd/PKGBUILD +++ b/community/systemd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 45855 2011-04-30 03:24:21Z dreisner $ +# $Id: PKGBUILD 47976 2011-05-26 18:14:34Z dreisner $ # Maintainer: Dave Reisner <d@falconindy.com> pkgname=systemd -pkgver=26 +pkgver=28 pkgrel=1 pkgdesc="Session and Startup manager" arch=('i686' 'x86_64' 'mips64el') @@ -20,12 +20,14 @@ optdepends=('cryptsetup: required for encrypted block devices' groups=('systemd') options=('!libtool') backup=(etc/systemd/system.conf - etc/tmpfiles.d/systemd.conf - etc/tmpfiles.d/x11.conf) + etc/tmpfiles.d/console.conf + usr/lib/tmpfiles.d/legacy.conf + usr/lib/tmpfiles.d/systemd.conf + usr/lib/tmpfiles.d/x11.conf) install=systemd.install source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2" "os-release") -md5sums=('b7c468aa400c64d02d533eba6359e283' +md5sums=('be37500f576a0494f82fed7fa47cc306' '752636def0db3c03f121f8b4f44a63cd') build() { diff --git a/community/systemd/mqueue-signed-int.patch b/community/systemd/mqueue-signed-int.patch new file mode 100644 index 000000000..dc9ac3524 --- /dev/null +++ b/community/systemd/mqueue-signed-int.patch @@ -0,0 +1,38 @@ +diff --git a/src/dbus-common.c b/src/dbus-common.c +index fe7f84b..9bf0dab 100644 +--- a/src/dbus-common.c ++++ b/src/dbus-common.c +@@ -569,15 +569,15 @@ int bus_property_append_ul(DBusMessageIter *i, const char *property, void *data) + } + + int bus_property_append_long(DBusMessageIter *i, const char *property, void *data) { +- uint64_t u; ++ int64_t l; + + assert(i); + assert(property); + assert(data); + +- u = (int64_t) *(long*) data; ++ l = (int64_t) *(long*) data; + +- if (!dbus_message_iter_append_basic(i, DBUS_TYPE_INT64, &u)) ++ if (!dbus_message_iter_append_basic(i, DBUS_TYPE_INT64, &l)) + return -ENOMEM; + + return 0; +diff --git a/src/dbus-socket.c b/src/dbus-socket.c +index b81569d..7194611 100644 +--- a/src/dbus-socket.c ++++ b/src/dbus-socket.c +@@ -115,8 +115,8 @@ DBusHandlerResult bus_socket_message_handler(Unit *u, DBusConnection *c, DBusMes + { "org.freedesktop.systemd1.Socket", "MaxConnections", bus_property_append_unsigned, "u", &u->socket.max_connections }, + { "org.freedesktop.systemd1.Socket", "NConnections", bus_property_append_unsigned, "u", &u->socket.n_connections }, + { "org.freedesktop.systemd1.Socket", "NAccepted", bus_property_append_unsigned, "u", &u->socket.n_accepted }, +- { "org.freedesktop.systemd1.Socket", "MessageQueueMaxMessages", bus_property_append_long,"t", &u->socket.mq_maxmsg }, +- { "org.freedesktop.systemd1.Socket", "MessageQueueMessageSize", bus_property_append_long,"t", &u->socket.mq_msgsize }, ++ { "org.freedesktop.systemd1.Socket", "MessageQueueMaxMessages", bus_property_append_long,"x", &u->socket.mq_maxmsg }, ++ { "org.freedesktop.systemd1.Socket", "MessageQueueMessageSize", bus_property_append_long,"x", &u->socket.mq_msgsize }, + { NULL, NULL, NULL, NULL, NULL } + }; + diff --git a/community/tagpy/PKGBUILD b/community/tagpy/PKGBUILD index bf1af0741..51c11eaf4 100644 --- a/community/tagpy/PKGBUILD +++ b/community/tagpy/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 41005 2011-03-03 04:37:04Z tdziedzic $ +# $Id: PKGBUILD 47614 2011-05-24 13:24:59Z jelle $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Callan Barrett <wizzomafizzo@gmail.com> # Contributor: Scott Horowitz <stonecrest@gmail.com> pkgname=tagpy pkgver=0.94.8 -pkgrel=3 +pkgrel=4 pkgdesc="Python bindings for TagLib" arch=('i686' 'x86_64' 'mips64el') url="http://pypi.python.org/pypi/tagpy" @@ -32,6 +32,5 @@ build() { package(){ cd ${srcdir}/${pkgname}-${pkgver} python2 setup.py install --root="${pkgdir}" --optimize=1 - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" } diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD index 9d7f46ce9..cafa11dc2 100644 --- a/community/tea/PKGBUILD +++ b/community/tea/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 44713 2011-04-11 12:23:03Z spupykin $ +# $Id: PKGBUILD 47317 2011-05-21 17:27:47Z jelle $ # 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=29.0.2 +pkgver=29.0.3 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') @@ -16,7 +16,7 @@ depends=('qt' 'aspell' 'hunspell') install=tea.install source=(http://downloads.sourceforge.net/tea-editor/$pkgname-$pkgver.tar.bz2 tea.desktop) -md5sums=('7b93a54df1a699cb02b188d918ecc9e8' +md5sums=('1c900e7f57a0fe72fb4cc481450a5b32' '377ace3363124f4c086de0babb820761') build() { @@ -24,6 +24,9 @@ build() { qmake make +} +package(){ + cd ${srcdir}/$pkgname-$pkgver make INSTALL_ROOT=${pkgdir} install install -Dm755 ${pkgdir}/usr/local/bin/tea ${pkgdir}/usr/bin/tea diff --git a/community/twinkle/PKGBUILD b/community/twinkle/PKGBUILD index 7909fc7e7..3bbc94879 100644 --- a/community/twinkle/PKGBUILD +++ b/community/twinkle/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 41011 2011-03-03 04:44:11Z tdziedzic $ +# $Id: PKGBUILD 47620 2011-05-24 13:41:29Z jelle $ # Maintainer: # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> @@ -6,7 +6,7 @@ pkgname=twinkle pkgver=1.4.2 -pkgrel=8 +pkgrel=10 pkgdesc="A softphone for voice over IP and instant messaging communications using the SIP protocol" arch=('i686' 'x86_64' 'mips64el') url="http://www.twinklephone.com/" diff --git a/community/unbound/PKGBUILD b/community/unbound/PKGBUILD index d7cb8de65..1c312b3d5 100644 --- a/community/unbound/PKGBUILD +++ b/community/unbound/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service> pkgname=unbound -pkgver=1.4.9 +pkgver=1.4.10 pkgrel=1 pkgdesc='Validating, recursive, and caching DNS resolver' arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ backup=('etc/unbound/unbound.conf') source=("http://unbound.net/downloads/$pkgname-$pkgver.tar.gz" 'unbound.conf' 'rc.d') -sha1sums=('f2ac7b4ef1d1b330e2dd5e2eedeb6fd2bbad8478' +sha1sums=('ac9ab61a51e147ade69ca8b043fee2ed76336a62' '5d473ec2943fd85367cdb653fcd58e186f07383f' 'a0c8c496d71d43ed9e09b170d3df836dfb096480') diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD index 1d7a68e1d..0e267725f 100644 --- a/community/virtualbox/PKGBUILD +++ b/community/virtualbox/PKGBUILD @@ -1,22 +1,28 @@ -# $Id: PKGBUILD 45439 2011-04-21 19:40:11Z ibiru $ +# $Id: PKGBUILD 47286 2011-05-20 18:13:22Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=virtualbox pkgname=('virtualbox' 'virtualbox-guest-additions' 'virtualbox-guest-modules' 'virtualbox-sdk') -pkgver=4.0.6 -pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') +pkgver=4.0.8 +pkgrel=2 +arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst' -'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'kernel26-headers>=2.6.38' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'jdk' 'gsoap' 'vde2' +'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'kernel26-headers>=2.6.38' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'jdk' 'gsoap' 'vde2' 'xorg-server-devel' 'xf86driproto' 'libxcomposite') [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 http://download.virtualbox.org/virtualbox/${pkgver}/UserManual.pdf virtualbox-4-makeself-check.patch virtualbox-4-mkisofs-check.patch 10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxdrv.sh +<<<<<<< HEAD 18-system-xorg.patch gcc46.patch) _kernver=2.6.38-LIBRE +======= + 18-system-xorg.patch + change_default_driver_dir.patch) +_kernver=2.6.38-ARCH +>>>>>>> 33feb015eb09eee76827f359e685fce981d88111 build() { cd "$srcdir/VirtualBox-${pkgver}_OSE" @@ -25,7 +31,7 @@ build() { patch -Np1 -i "$srcdir/virtualbox-4-mkisofs-check.patch" patch -Np1 -i "$srcdir/vboxdrv-reference.patch" patch -Np1 -i "$srcdir/18-system-xorg.patch" - patch -Np1 -i "$srcdir/gcc46.patch" + patch -Np1 -i "$srcdir/change_default_driver_dir.patch" cp "$srcdir/LocalConfig.kmk" . @@ -203,8 +209,8 @@ package_virtualbox-guest-modules(){ sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/virtualbox-guest-modules.install" } -md5sums=('cf274f0585c35c5c137e2bd9b48b462a' - '7d3ee86e998fa24b07a157add9fb7766' +md5sums=('a3e81289f2357fcf4bbe3e77805f38b6' + '39712ccbc16b04c1cda209ae16446bf2' '44efb3c4be214daa453a317d527f1f30' '32a232b43852b9a08cb11a7bcd64b347' '5f85710e0b8606de967716ded7b2d351' @@ -213,4 +219,4 @@ md5sums=('cf274f0585c35c5c137e2bd9b48b462a' 'c1a07f044c476a190af8486fe78bee0f' '47da2e88de582bb2bab14580a3aa47b1' '8a22b33c9dfaf8fb79bb2d26304e650b' - 'a28b48ff01149acbca4bbe6a676a06da') + 'ac43f7cf44b934d8dbdbc3bb6f7879ad') diff --git a/community/virtualbox/change_default_driver_dir.patch b/community/virtualbox/change_default_driver_dir.patch new file mode 100644 index 000000000..71930f062 --- /dev/null +++ b/community/virtualbox/change_default_driver_dir.patch @@ -0,0 +1,18 @@ +diff -Nur VirtualBox-4.0.8_OSE.orig//src/VBox/Additions/common/crOpenGL/fakedri_drv.c VirtualBox-4.0.8_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c +--- VirtualBox-4.0.8_OSE.orig//src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2011-05-18 04:28:14.545495222 -0700 ++++ VirtualBox-4.0.8_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2011-05-18 04:29:57.945499707 -0700 +@@ -36,13 +36,8 @@ + //#define DEBUG_DRI_CALLS + + //@todo this could be different... +-#ifdef RT_ARCH_AMD64 +-# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri" ++# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri" + # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/" +-#else +-# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri" +-# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/" +-#endif + + #ifdef DEBUG_DRI_CALLS + #define SWDRI_SHOWNAME(pext, func) \ diff --git a/community/virtualbox/gcc46.patch b/community/virtualbox/gcc46.patch deleted file mode 100644 index 9786a7287..000000000 --- a/community/virtualbox/gcc46.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Nur VirtualBox-4.0.6_OSE.orig//configure VirtualBox-4.0.6_OSE/configure ---- VirtualBox-4.0.6_OSE.orig//configure 2011-04-21 03:29:30.000000000 -0700 -+++ VirtualBox-4.0.6_OSE/configure 2011-04-21 11:42:57.517216676 -0700 -@@ -412,9 +412,9 @@ - elif [ $cc_maj -lt 3 \ - -o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \ - -o \( $cc_maj -eq 4 -a $cc_min -lt 1 -a "$OS" != "darwin" \) \ -- -o \( $cc_maj -eq 4 -a $cc_min -gt 5 \) \ -+ -o \( $cc_maj -eq 4 -a $cc_min -gt 6 \) \ - -o $cc_maj -gt 4 ]; then -- log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<5" -+ log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<=6" - fail really - else - log_success "found version $cc_ver" diff --git a/community/warmux/PKGBUILD b/community/warmux/PKGBUILD index d4268ee38..3fd4f09a0 100644 --- a/community/warmux/PKGBUILD +++ b/community/warmux/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 45573 2011-04-24 16:51:07Z lcarlier $ +# $Id: PKGBUILD 47366 2011-05-22 06:58:10Z lcarlier $ # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: pukyxd # Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com> pkgname=warmux -pkgver=11.04 -pkgrel=2 +pkgver=11.04.1 +pkgrel=3 pkgdesc="A clone of the worms game" arch=('i686' 'x86_64' 'mips64el') url="http://www.wormux.org/" @@ -13,22 +13,22 @@ license=('GPL') makedepends=('pkgconfig' 'libxml++' 'sdl_image' 'sdl_gfx>=2.0.19' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2') replaces=('wormux') source=(http://download.gna.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('668cd4c22afde352c566454e65fc4144') +md5sums=('26ff65c43a9bb61a3f0529c98b943e35') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver/.1/}" #gcc 4.6.0 fix - sed -i '27i#include <stddef.h>' lib/warmux/include/WARMUX_action.h + #sed -i '27i#include <stddef.h>' lib/warmux/include/WARMUX_action.h ./configure --prefix=/usr make } package() { - depends=('libxml++' 'sdl_image' 'sdl_gfx>=2.0.19' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2' "warmux-data>=${pkgver}") + depends=('libxml++' 'sdl_image' 'sdl_gfx>=2.0.19' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2' "warmux-data>=${pkgver/.1/}") - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver/.1/}" make DESTDIR="${pkgdir}" install rm -r ${pkgdir}/usr/share/warmux diff --git a/community/wbar/PKGBUILD b/community/wbar/PKGBUILD index bc5e87290..ffed2afe7 100644 --- a/community/wbar/PKGBUILD +++ b/community/wbar/PKGBUILD @@ -1,21 +1,28 @@ -# $Id: PKGBUILD 38239 2011-01-23 22:13:38Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# $Id: PKGBUILD 47294 2011-05-21 08:20:51Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=wbar -pkgver=2.1.1 +pkgver=2.2.2 pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') -depends=('imlib2' 'gcc-libs') -optdepends=('libglade') -pkgdesc="A quick launch bar developed with speed in mind." +pkgdesc="A quick launch bar developed with speed in mind" +arch=('i686' 'x86_64') url="http://code.google.com/p/wbar" license=('GPL') +depends=('libglade' 'imlib2' 'gcc-libs') +makedepends=('intltool') source=(http://wbar.googlecode.com/files/$pkgname-$pkgver.tar.gz) -md5sums=('637433fc2995a0e45e644fd992e970f6') +sha256sums=('0d7ae78d02d52cdb046a47286341ad6ff42dd9aff667f7d389b4f352046d4db0') build() { cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --exec_prefix=/usr --sysconfdir=/etc make +} + +package () { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=${pkgdir} install } diff --git a/community/wbar/wbar.changelog b/community/wbar/wbar.changelog new file mode 100644 index 000000000..17916badd --- /dev/null +++ b/community/wbar/wbar.changelog @@ -0,0 +1,9 @@ +2011-05-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * wbar 2.2.2-1 + +2011-01-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * wbar 2.1.1-1 + +2008-10-13 Allan McRae <allan@archlinux.org> + * wbar 1.3.3-2 + * Moved to [community] repo diff --git a/community/xboard/PKGBUILD b/community/xboard/PKGBUILD index 3552ea441..e060ead17 100644 --- a/community/xboard/PKGBUILD +++ b/community/xboard/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 42695 2011-03-19 21:22:32Z spupykin $ +# $Id: PKGBUILD 47322 2011-05-21 17:35:38Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jason Chu <jason@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=xboard -pkgver=4.5.1 +pkgver=4.5.2 pkgrel=1 pkgdesc="A graphical user interfaces for chess" arch=('i686' 'x86_64' 'mips64el') @@ -14,8 +14,6 @@ depends=('libxaw' 'gnuchess' 'texinfo' 'xdg-utils') install=${pkgname}.install source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz 'xboard.desktop') -md5sums=('704cd7be87aada1f24c33e616b3ec2b5' - '1d9d4a7864465a703fe4a215e83f4806') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -31,3 +29,5 @@ package() { install -Dm644 ${srcdir}/${pkgname}.desktop \ ${pkgdir}/usr/share/applications/${pkgname}.desktop } +md5sums=('2fa92fceeda344ef935bc97bef5f9fc5' + '1d9d4a7864465a703fe4a215e83f4806') diff --git a/community/zeromq/PKGBUILD b/community/zeromq/PKGBUILD index 748c9cc97..713475249 100644 --- a/community/zeromq/PKGBUILD +++ b/community/zeromq/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Kyle Keen <keenerd@gmail.com> pkgname=zeromq -pkgver=2.1.6 +pkgver=2.1.7 pkgrel=1 pkgdesc="Fast messaging system built on sockets, C and C++ bindings. aka 0MQ, ZMQ." arch=('i686' 'x86_64' 'mips64el') @@ -9,7 +9,7 @@ license=('LGPL') depends=('gcc-libs' 'util-linux-ng') makedepends=() source=(http://download.zeromq.org/$pkgname-$pkgver.tar.gz) -md5sums=('77b9ca20e8f2426874022080f41d7b0b') +md5sums=('7d3120f8a8fb913a7e55c57c6eb024f3') build() { cd "$srcdir/$pkgname-$pkgver" |