diff options
Diffstat (limited to 'community')
-rw-r--r-- | community/astyle/PKGBUILD | 6 | ||||
-rw-r--r-- | community/autofs/0001-autofs-5.0.5-include-krb5-library.patch | 206 | ||||
-rw-r--r-- | community/autofs/0002-autofs-5.0.5-remove-ERR_remove_state-openssl-call.patch | 59 | ||||
-rw-r--r-- | community/autofs/PKGBUILD | 31 | ||||
-rw-r--r-- | community/autofs/auto.master | 6 | ||||
-rw-r--r-- | community/autofs/auto.misc | 7 | ||||
-rw-r--r-- | community/autofs/autofs.install | 4 | ||||
-rw-r--r-- | community/botan/PKGBUILD | 6 | ||||
-rw-r--r-- | community/brise/PKGBUILD | 10 | ||||
-rw-r--r-- | community/dvtm/0001-Makefile-respect-DESTDIR-in-tic-invocation.patch | 25 | ||||
-rw-r--r-- | community/dvtm/PKGBUILD | 16 | ||||
-rw-r--r-- | community/dvtm/config.h | 2 | ||||
-rw-r--r-- | community/ibus-rime/PKGBUILD | 8 | ||||
-rw-r--r-- | community/ioping/PKGBUILD | 6 | ||||
-rw-r--r-- | community/librime/PKGBUILD | 8 | ||||
-rw-r--r-- | community/libx86/PKGBUILD | 4 | ||||
-rw-r--r-- | community/lilypond/PKGBUILD | 6 | ||||
-rw-r--r-- | community/liteide/PKGBUILD | 37 | ||||
-rw-r--r-- | community/liteide/liteide.sh | 7 | ||||
-rw-r--r-- | community/lz4/PKGBUILD | 12 | ||||
-rw-r--r-- | community/ntop/PKGBUILD | 3 | ||||
-rw-r--r-- | community/tre/PKGBUILD | 35 |
22 files changed, 92 insertions, 412 deletions
diff --git a/community/astyle/PKGBUILD b/community/astyle/PKGBUILD index b0aed8acc..a0b384431 100644 --- a/community/astyle/PKGBUILD +++ b/community/astyle/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92315 2013-06-03 21:55:18Z lfleischer $ +# $Id: PKGBUILD 103213 2013-12-30 12:53:05Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Thomas Mader <thezema@gmail.com> @@ -6,7 +6,7 @@ # Contributor: tardo <tardo@nagi-fanboi.net> pkgname=astyle -pkgver=2.03 +pkgver=2.04 pkgrel=1 pkgdesc='A free, fast and small automatic formatter for C, C++, C#, and Java source code.' arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ url='http://sourceforge.net/projects/astyle/' license=('LGPL') depends=('gcc-libs') source=("http://downloads.sourceforge.net/sourceforge/astyle/${pkgname}_${pkgver}_linux.tar.gz") -md5sums=('ba84eaa8564155babd4ba1458d4eaa11') +md5sums=('30b1193a758b0909d06e7ee8dd9627f6') build() { cd "$srcdir/$pkgname/build/gcc" 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 deleted file mode 100644 index 572ca97fd..000000000 --- a/community/autofs/0001-autofs-5.0.5-include-krb5-library.patch +++ /dev/null @@ -1,206 +0,0 @@ -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 deleted file mode 100644 index e4e480e82..000000000 --- a/community/autofs/0002-autofs-5.0.5-remove-ERR_remove_state-openssl-call.patch +++ /dev/null @@ -1,59 +0,0 @@ -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 a9b396fd7..0618daea0 100644 --- a/community/autofs/PKGBUILD +++ b/community/autofs/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 92244 2013-06-03 11:15:10Z allan $ +# $Id: PKGBUILD 103218 2013-12-30 14:30:57Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=autofs -pkgver=5.0.7 -pkgrel=3 +pkgver=5.0.8 +pkgrel=1 pkgdesc='A kernel-based automounter for Linux.' arch=('i686' 'x86_64') url='http://freshmeat.net/projects/autofs' @@ -18,19 +18,17 @@ backup=('etc/default/autofs' 'etc/autofs/auto.master' 'etc/autofs/auto.misc') options=(!makeflags) -install='autofs.install' -source=("http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar.bz2" - 'auto.master' - 'auto.misc') -md5sums=('bc46838dece83c02d800ff144ed9f431' - 'a6cefb591e77b31b79dbb7243646c96b' - 'd8a15ec9186c5c0b36e5cea1e2739e8a') +source=("http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar.xz") +sha256sums=('32c41fb4e3439f18400468e84dc82fbbd4b14156bef6b9a7f09196ecd9299d52') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" + sed -i -e 's|/etc/auto.misc|/etc/autofs/auto.misc|' \ + -e 's|/etc/auto.master.d|/etc/autofs/auto.master.d|' samples/auto.master +} - sed -i "s:SUBDIRS = lib daemon modules man samples:SUBDIRS = lib daemon modules man:" \ - Makefile.rules +build() { + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc/autofs --sbindir=/usr/bin \ --with-mapdir=/etc/autofs --without-hesiod \ @@ -42,11 +40,8 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make INSTALLROOT="${pkgdir}" install - - install -Dm0644 "${srcdir}/auto.master" "${pkgdir}/etc/autofs/auto.master" - install -Dm0644 "${srcdir}/auto.misc" "${pkgdir}/etc/autofs/auto.misc" - - install -Dm0644 "samples/autofs.service" "${pkgdir}/usr/lib/systemd/system/autofs.service" + rm -r "$pkgdir/run" + install -dm755 "$pkgdir/etc/autofs/auto.master.d" } # vim:set ts=2 sw=2 et: diff --git a/community/autofs/auto.master b/community/autofs/auto.master deleted file mode 100644 index be4ea73ae..000000000 --- a/community/autofs/auto.master +++ /dev/null @@ -1,6 +0,0 @@ -# Sample auto.master file -# Format of this file: -# mountpoint map options -# For details of the format look at autofs(5). - -#/media /etc/autofs/auto.media diff --git a/community/autofs/auto.misc b/community/autofs/auto.misc deleted file mode 100644 index 569156626..000000000 --- a/community/autofs/auto.misc +++ /dev/null @@ -1,7 +0,0 @@ -# This is an automounter map and it has the following format -# key [ -mount-options-separated-by-comma ] location -# Details may be found in the autofs(5) manpage - -cdrom -fstype=iso9660,ro,nodev,nosuid :/dev/cdrom -floppy -fstype=auto,async,nodev,nosuid,umask=000 :/dev/fl -usbstick -fstype=auto,async,nodev,nosuid,umask=000 :/dev/sda1 diff --git a/community/autofs/autofs.install b/community/autofs/autofs.install deleted file mode 100644 index 34ae75f1e..000000000 --- a/community/autofs/autofs.install +++ /dev/null @@ -1,4 +0,0 @@ -post_install(){ - echo "> In autofs5 --ghost option isn't valid. In order to start autofs you" - echo "> must remove that option from your /etc/conf.d/autofs." -} diff --git a/community/botan/PKGBUILD b/community/botan/PKGBUILD index 33bd091be..cba820be1 100644 --- a/community/botan/PKGBUILD +++ b/community/botan/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 101428 2013-11-25 13:19:55Z arodseth $ +# $Id: PKGBUILD 103215 2013-12-30 13:50:26Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: d'Ronin <daronin@2600.com> pkgname=botan -pkgver=1.10.6 +pkgver=1.10.7 pkgrel=1 pkgdesc='Crypto library written in C++' license=('BSD') @@ -14,7 +14,7 @@ url='http://botan.randombit.net/' depends=('gcc-libs' 'sh') makedepends=('python2') source=("http://files.randombit.net/botan/Botan-${pkgver}.tbz") -sha256sums=('72a9be97350523ee1b06c8722032faa566fcb98456b0b7ac06b45a1dc4446fa7') +sha256sums=('19f79ae670cb2ea7c290244ff6ff564ce74b45d8845af52787a30c646e16324d') build() { cd "Botan-$pkgver" diff --git a/community/brise/PKGBUILD b/community/brise/PKGBUILD index b525a3e4c..aa81fd222 100644 --- a/community/brise/PKGBUILD +++ b/community/brise/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 100938 2013-11-13 14:17:31Z fyan $ +# $Id: PKGBUILD 103210 2013-12-30 09:12:40Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: GONG Chen <chen dot sst at gmail dot com> pkgname=brise -pkgver=0.30 +pkgver=0.32 pkgrel=1 pkgdesc="Rime schema repository" arch=('i686' 'x86_64') url="http://code.google.com/p/rimeime/" license=('GPL3') depends=() -makedepends=('cmake' 'librime>=1.0') +makedepends=('cmake' 'librime>=1.1') provides=('librime-data') -conflicts=('librime<1.0' 'ibus-rime<1.0') +conflicts=('librime<1.1' 'ibus-rime<1.1') source=("http://rimeime.googlecode.com/files/$pkgname-$pkgver.tar.gz") build() { @@ -25,4 +25,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums=('1d727e71ad9aabbbfab04e934f6a26bee75f8d277eb2a1c67a05616c36b2e029b0b3958eaf94af4263aa6fe350738c96e7c084fe4a5ecc45474a8900d4927748') +sha512sums=('c41d4a7399a963b9e023015e1268f0f63693091d0ae2edff9db68397d223bb25ea6c392d2649f7817edd40998b1ed144d63478a01241cdaa5f2e84fd846e24d7') diff --git a/community/dvtm/0001-Makefile-respect-DESTDIR-in-tic-invocation.patch b/community/dvtm/0001-Makefile-respect-DESTDIR-in-tic-invocation.patch deleted file mode 100644 index 9ce462240..000000000 --- a/community/dvtm/0001-Makefile-respect-DESTDIR-in-tic-invocation.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4ab5ed57a3b53e0271cf50f256cd7904c50cac55 Mon Sep 17 00:00:00 2001 -From: Douglas Jerome <douglas@ttylinux.org> -Date: Wed, 15 May 2013 14:33:31 +0200 -Subject: [PATCH] Makefile: respect ${DESTDIR} in tic invocation - ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index ff85deb..eb849f4 100644 ---- a/Makefile -+++ b/Makefile -@@ -55,7 +55,7 @@ install: dvtm - @sed "s/VERSION/${VERSION}/g" < dvtm.1 > ${DESTDIR}${MANPREFIX}/man1/dvtm.1 - @chmod 644 ${DESTDIR}${MANPREFIX}/man1/dvtm.1 - @echo installing terminfo description -- @tic -s dvtm.info -+ @tic -o ${DESTDIR}/usr/share/terminfo -s dvtm.info - - uninstall: - @echo removing executable file from ${DESTDIR}${PREFIX}/bin --- -1.8.3.450.gf3f2a46 - diff --git a/community/dvtm/PKGBUILD b/community/dvtm/PKGBUILD index bedae4873..96c1e20b6 100644 --- a/community/dvtm/PKGBUILD +++ b/community/dvtm/PKGBUILD @@ -1,28 +1,24 @@ -# $Id: PKGBUILD 92416 2013-06-04 19:05:34Z lfleischer $ +# $Id: PKGBUILD 103206 2013-12-30 02:12:50Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Giorgio Lando <patroclo7@gmail.com> # Contributor: bender02 at gmx dot com pkgname=dvtm -pkgver=0.9 -pkgrel=2 +pkgver=0.10 +pkgrel=1 pkgdesc='Dynamic virtual terminal manager.' arch=('i686' 'x86_64') url='http://www.brain-dump.org/projects/dvtm/' license=('MIT') depends=('ncurses') source=("http://www.brain-dump.org/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'config.h' - '0001-Makefile-respect-DESTDIR-in-tic-invocation.patch') -md5sums=('7de1103abb0ca410f7250cf89f019a38' - '41107e5e84a8572f70d6cb111b4e07f8' - 'c85d8265ced45d014a7d3f05134bf6a1') + 'config.h') +md5sums=('0c7167dc898df1693c20e2a34ba3e947' + '15dd5c17d39fca0e043577985ee1c6a6') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../0001-Makefile-respect-DESTDIR-in-tic-invocation.patch - cp "${srcdir}/config.h" . sed -i 's/CFLAGS =/CFLAGS +=/' config.mk } diff --git a/community/dvtm/config.h b/community/dvtm/config.h index 48367695a..727dce4c1 100644 --- a/community/dvtm/config.h +++ b/community/dvtm/config.h @@ -77,7 +77,6 @@ static Key keys[] = { { MOD, '8', { focusn, { "8" } } }, { MOD, '9', { focusn, { "9" } } }, { MOD, 'q', { quit, { NULL } } }, - { MOD, 'G', { escapekey, { NULL } } }, { MOD, 'a', { togglerunall, { NULL } } }, { MOD, 'r', { redraw, { NULL } } }, { MOD, 'X', { lock, { NULL } } }, @@ -89,6 +88,7 @@ static Key keys[] = { { MOD, KEY_PPAGE, { scrollback, { "-1" } } }, { MOD, KEY_NPAGE, { scrollback, { "1" } } }, { MOD, KEY_F(1), { create, { "man dvtm", "dvtm help" } } }, + { MOD, MOD, { send, { (const char []){MOD, 0} } } }, }; static const ColorRule colorrules[] = { diff --git a/community/ibus-rime/PKGBUILD b/community/ibus-rime/PKGBUILD index 5749d51c2..2f4e56338 100644 --- a/community/ibus-rime/PKGBUILD +++ b/community/ibus-rime/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 100941 2013-11-13 14:17:34Z fyan $ +# $Id: PKGBUILD 103211 2013-12-30 09:12:41Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: GONG Chen <chen dot sst at gmail dot com> # Contributor: 網軍總司令 pkgname=ibus-rime -pkgver=1.0 +pkgver=1.1 pkgrel=1 pkgdesc="Rime input method engine for ibus" arch=('i686' 'x86_64') url="http://code.google.com/p/rimeime/" license=('GPL3') -depends=('ibus' 'libnotify' 'librime>=1.0' 'brise') +depends=('ibus' 'libnotify' 'librime>=1.1' 'brise') makedepends=('cmake') install='ibus-rime.install' source=("http://rimeime.googlecode.com/files/$pkgname-$pkgver.tar.gz") @@ -25,4 +25,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums=('75ed251c62fc4772ffd05f95b599932ebed3cb7c52406daa785ef755f825b32d22e6ce3dce94fcb28a88480b696e1014578e4d2210c933bae5fb00a1b0b8e275') +sha512sums=('2510f9019045013f85af5b8401286b338b739fa0e908a3e30e1d59971a43c32212f388d367b51942292e236859feb1a70d7e7b8deb17eafd8b4f878cc7ba018f') diff --git a/community/ioping/PKGBUILD b/community/ioping/PKGBUILD index 1b8482b6c..94790d61a 100644 --- a/community/ioping/PKGBUILD +++ b/community/ioping/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 93783 2013-07-10 08:34:25Z seblu $ +# $Id: PKGBUILD 103240 2013-12-30 22:20:06Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Kovivchak Evgen <oneonfire@gmail.com> pkgname=ioping -pkgver=0.7 +pkgver=0.8 pkgrel=1 pkgdesc='Simple disk I/0 latency measuring tool' arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('GPL3') url='http://ioping.googlecode.com' depends=('glibc') source=("http://ioping.googlecode.com/files/$pkgname-$pkgver.tar.gz") -sha1sums=('f841244149830506daca1b052694965d94fe2408') +sha1sums=('7d4fe1414cdd5887c332426a8844e17eca5e5646') build() { cd $pkgname-$pkgver diff --git a/community/librime/PKGBUILD b/community/librime/PKGBUILD index d35e2a059..87ab8a4ba 100644 --- a/community/librime/PKGBUILD +++ b/community/librime/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 102255 2013-12-07 10:36:39Z bpiotrowski $ +# $Id: PKGBUILD 103209 2013-12-30 09:12:39Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: GONG Chen <chen dot sst at gmail dot com> # Contributor: 網軍總司令 pkgname=librime -pkgver=1.0 -pkgrel=3 +pkgver=1.1 +pkgrel=1 pkgdesc="Rime input method engine" arch=('i686' 'x86_64') url="http://code.google.com/p/rimeime/" @@ -25,4 +25,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums=('79f51174043e0ff524f8af090fd1d0a21301b4e5e530c772648ff59894d39135d15c53c0f4d197895c301defca2e084635eb222464dd20859ab3bdbc6ae8fb2c') +sha512sums=('deb0142fe193f7d445f5008f2cfebb813e4db662f5c474dcb5b8d9f1a9ea8c2e7dc384f3dfae32e7fd13c08f55852124089db08cb96928b98e94128b10847af0') diff --git a/community/libx86/PKGBUILD b/community/libx86/PKGBUILD index 460166174..44baf6331 100644 --- a/community/libx86/PKGBUILD +++ b/community/libx86/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 55525 2011-09-14 07:30:42Z andrea $ +# $Id: PKGBUILD 103236 2013-12-30 17:06:11Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: tardo <tardo@nagi-fanboi.net> @@ -6,7 +6,7 @@ pkgname=libx86 pkgver=1.1 -pkgrel=3 +pkgrel=4 pkgdesc="Provides an lrmi interface that works on x86, am64 and alpha" arch=('i686' 'x86_64') url="http://www.codon.org.uk/~mjg59/libx86/" diff --git a/community/lilypond/PKGBUILD b/community/lilypond/PKGBUILD index c179fafe6..ce971f550 100644 --- a/community/lilypond/PKGBUILD +++ b/community/lilypond/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 102973 2013-12-25 08:45:14Z bgyorgy $ +# $Id: PKGBUILD 103224 2013-12-30 15:18:05Z bgyorgy $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Geoffroy Carrier <geoffroy@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> @@ -6,7 +6,7 @@ pkgname=lilypond pkgver=2.16.2 -pkgrel=4 +pkgrel=5 pkgdesc="An automated music engraving system" arch=('i686' 'x86_64') url="http://lilypond.org" @@ -35,7 +35,7 @@ prepare() { sed -i 's|GUILE_CFLAGS=.*|GUILE_CFLAGS="`pkg-config --cflags guile-1.8`"|' configure sed -i 's|GUILE_LDFLAGS=.*|GUILE_LDFLAGS="`pkg-config --libs guile-1.8`"|' configure - rm -rf python/out/ + rm -rf lily/out/ python/out/ # Fix build patch -Np1 -i "$srcdir/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch" diff --git a/community/liteide/PKGBUILD b/community/liteide/PKGBUILD index d94bb5526..9069d0264 100644 --- a/community/liteide/PKGBUILD +++ b/community/liteide/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 99195 2013-10-25 12:43:33Z arodseth $ +# $Id: PKGBUILD 103220 2013-12-30 14:57:33Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: spambanane <happy.house@gmx.de> # Contributor: Matteo <matteo.dek@gmail.com> +# Contributor: Matthew Zimmerman <mzimmerman@gmail.com> pkgname=liteide -pkgver=19 -pkgrel=4 +pkgver=20.1 +pkgrel=1 pkgdesc='IDE for editing and building projects written in the Go programming language ("golangide")' license=('LGPL') arch=('x86_64' 'i686') @@ -13,25 +14,29 @@ url='https://github.com/visualfc/liteide' depends=('go' 'qt5-webkit') replaces=('golangide') conflicts=('golangide') -makedepends=('gendesk') +makedepends=('gendesk' 'git') options=('!strip' '!emptydirs') source=("$pkgname.zip::https://github.com/visualfc/liteide/archive/x$pkgver.zip" - 'liteide.png' - 'liteide.sh') -sha256sums=('182694341940878cf5df4f083a750659bffc97eb4ae517410e157bebc14f97df' - '47c52b22326034bd3d6a7b11b05a53c8b3838c08e145171cf5cad2ca00260697' - '5d6f05b072586c31e3a4a08ea2d7332dd0a78f5db6b2d088fb76e8cb032672f0') + 'liteide.png') +sha256sums=('3a3e664e9a76745308fd14eb89b4376f1fb1ac1195b8e2cefcef922e8e93dde2' + '47c52b22326034bd3d6a7b11b05a53c8b3838c08e145171cf5cad2ca00260697') prepare() { - gendesk -n --name 'Golang IDE' --pkgname "$pkgname" --pkgdesc "$pkgdesc" + gendesk -f -n --name 'Golang IDE' --pkgname "$pkgname" --pkgdesc "$pkgdesc" cd "liteide-x$pkgver/build" - chmod +x build_linux.sh + chmod +x *_*.sh } build() { cd "liteide-x$pkgver/build" - QTDIR=/usr ./build_linux.sh + export QTDIR=/usr + + mkdir -p go + export GOPATH=`pwd`/go + + ./update_pkg.sh + ./build_linux.sh # Fixing insecure RPATH, need to test if this is still needed cd ../liteidex @@ -40,7 +45,7 @@ build() { } package() { - cd "liteide-x$pkgver/build/liteide" + cd "liteide-x$pkgver/build/liteide" msg2 'Creating directories...' mkdir -p \ @@ -49,12 +54,10 @@ package() { "$pkgdir/usr/share/doc/$pkgname" msg2 'Packaging executables...' - for binary in goastview goapi goexec godocview; do + for binary in goastview goapi goexec godocview liteide; do install -Dm755 "bin/$binary" "$pkgdir/usr/bin/$binary" done - install -Dm755 bin/liteide "$pkgdir/usr/bin/liteide.elf" - install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/$pkgname" - install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/golangide" + ln -s /usr/bin/liteide "$pkgdir/usr/bin/golangide" cd "$srcdir/liteide-x$pkgver/liteidex" diff --git a/community/liteide/liteide.sh b/community/liteide/liteide.sh deleted file mode 100644 index 3fe9adf82..000000000 --- a/community/liteide/liteide.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -ELF=/usr/bin/liteide.elf -if [ ! -z $GOROOT -a -e $GOROOT ]; then - $ELF $@ -else - GOROOT=/usr/lib/go $ELF $@ -fi diff --git a/community/lz4/PKGBUILD b/community/lz4/PKGBUILD index d9f56aa5d..0fc508a3f 100644 --- a/community/lz4/PKGBUILD +++ b/community/lz4/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 102089 2013-12-04 21:52:14Z seblu $ +# $Id: PKGBUILD 103238 2013-12-30 22:18:53Z seblu $ # Maintainer: Sébastien Luttringer # Contacted by mail, author use svn commit as release version. # He only push tested release code into svn and support using revision as version pkgname=lz4 -pkgver=109 -pkgrel=2 +pkgver=110 +pkgrel=1 pkgdesc='Very fast lossless compression algorithm' arch=('i686' 'x86_64') url='https://code.google.com/p/lz4/' @@ -18,14 +18,12 @@ md5sums=('SKIP') build() { cd $pkgname - make lz4 lz4c + make } package() { cd $pkgname - install -Dm755 lz4 "$pkgdir/usr/bin/lz4" - install -Dm755 lz4c "$pkgdir/usr/bin/lz4c" - install -Dm644 lz4.1 "$pkgdir/usr/share/man/man1/lz4.1" + make install DESTDIR="$pkgdir" } # vim:set ts=2 sw=2 et: diff --git a/community/ntop/PKGBUILD b/community/ntop/PKGBUILD index 4274b6ac5..02cf48dfd 100644 --- a/community/ntop/PKGBUILD +++ b/community/ntop/PKGBUILD @@ -1,10 +1,9 @@ -# $Id: PKGBUILD 99930 2013-10-31 02:32:10Z allan $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=ntop pkgver=5.0.1 -pkgrel=4 +pkgrel=5 pkgdesc='A network traffic probe that shows the network usage.' arch=('i686' 'x86_64') url='http://www.ntop.org/' diff --git a/community/tre/PKGBUILD b/community/tre/PKGBUILD index d5438c092..101515357 100644 --- a/community/tre/PKGBUILD +++ b/community/tre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 100003 2013-10-31 02:56:45Z allan $ -# Maintainer: Stefan Husmann <stefan-husmann@t-online.de +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Stefan Husmann <stefan-husmann@t-online.de # Contributor: Igor Galic<i.galic@gmail.com> pkgname=tre pkgver=0.8.0 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') pkgdesc="POSIX compliant regexp matching library. Includes agrep for aproximate grepping." url="http://laurikari.net/tre" @@ -14,19 +14,22 @@ source=("http://laurikari.net/tre/$pkgname-$pkgver.tar.bz2") md5sums=('b4d3232593dadf6746f4727bdda20b41') build() { - cd ${srcdir}/$pkgname-$pkgver - ./configure --prefix=/usr --enable-static - make + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --enable-static + make } -package(){ - cd ${srcdir}/$pkgname-$pkgver - make DESTDIR=$pkgdir install - install -Dm644 ${srcdir}/$pkgname-$pkgver/LICENSE \ - ${pkgdir}/usr/share/licenses/$pkgname/LICENSE - install -d ${pkgdir}/usr/share/doc/$pkgname - cd doc - for _i in default.css tre-api.html tre-syntax.html; do - install -Dm644 ${_i} ${pkgdir}/usr/share/doc/$pkgname/${_i} - done +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + install -Dm644 "$srcdir/$pkgname-$pkgver/LICENSE" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -d "$pkgdir/usr/share/doc/$pkgname" + + cd doc + for f in default.css tre-api.html tre-syntax.html; do + install -Dm644 "$f" "$pkgdir/usr/share/doc/$pkgname/$f" + done } |