diff options
| author | root <root@rshg054.dnsready.net> | 2011-11-30 23:15:09 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2011-11-30 23:15:09 +0000 |
| commit | fd115d7057eb8243df6edfaf1ed440d6f3e70692 (patch) | |
| tree | 0a32bcfa47c11eb3e1127b1de196fb6385ed8723 | |
| parent | 946f0c9fe48dfb648a8a0be065e92f237ce210fd (diff) | |
Wed Nov 30 23:15:09 UTC 2011
69 files changed, 1511 insertions, 331 deletions
diff --git a/community/courier-authlib/PKGBUILD b/community/courier-authlib/PKGBUILD index 5f8ec29e8..99e43c8c3 100644 --- a/community/courier-authlib/PKGBUILD +++ b/community/courier-authlib/PKGBUILD @@ -5,7 +5,7 @@ pkgname=courier-authlib pkgver=0.63.0 -pkgrel=4 +pkgrel=5 pkgdesc="Authentification library for the courier mailserver(s)" arch=(i686 x86_64) license=('GPL2') @@ -17,6 +17,7 @@ makedepends=('pam' 'expect' 'libldap' 'libmysqlclient' 'postgresql-libs>=8.3.0') optdepends=('libmysqlclient' 'libldap' 'postgresql-libs') conflicts=('courier-imap-mysql' 'courier-imap-pgsql' 'courier-imap-ldap') provides=('courier-imap-mysql' 'courier-imap-pgsql' 'courier-imap-ldap') +options=(!libtool) install=${pkgname}.install source=(http://downloads.sourceforge.net/project/courier/authlib/${pkgver}/${pkgname}-${pkgver}.tar.bz2 authdaemond.rc.d) diff --git a/community/courier-imap/PKGBUILD b/community/courier-imap/PKGBUILD index 400ed830f..d45dbf1d1 100644 --- a/community/courier-imap/PKGBUILD +++ b/community/courier-imap/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 54864 2011-08-26 22:00:47Z svenstaro $ +# $Id: PKGBUILD 59702 2011-11-29 13:34:05Z stephane $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: tobias <tobias@archlinux.org> # Committer: Manolis Tzanidakis <manolis@archlinux.org> pkgname=courier-imap pkgver=4.9.3 -pkgrel=4 +pkgrel=5 pkgdesc="IMAP(s)/POP3(s) Server" arch=('i686' 'x86_64') license=('GPL2') diff --git a/community/courier-maildrop/PKGBUILD b/community/courier-maildrop/PKGBUILD index 7ac0627a9..a2cd7edb0 100644 --- a/community/courier-maildrop/PKGBUILD +++ b/community/courier-maildrop/PKGBUILD @@ -6,7 +6,7 @@ pkgname=courier-maildrop _srcname=maildrop pkgver=2.5.4 -pkgrel=2 +pkgrel=3 pkgdesc="mail delivery agent - procmail like but nicer syntax" arch=('i686' 'x86_64') license=('GPL2') diff --git a/community/courier-mta/PKGBUILD b/community/courier-mta/PKGBUILD index d4ceae821..82df2e28f 100644 --- a/community/courier-mta/PKGBUILD +++ b/community/courier-mta/PKGBUILD @@ -8,7 +8,7 @@ pkgname=courier-mta pkgver=0.66.3 -pkgrel=4 +pkgrel=5 pkgdesc="IMAP(s)/POP3(s) and SMTP Server with ML-manager, webmail and webconfig" arch=(i686 x86_64) license=('GPL2') diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD index a510f1298..908f47ca5 100644 --- a/community/freeradius/PKGBUILD +++ b/community/freeradius/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 58983 2011-11-20 19:26:37Z spupykin $ +# $Id: PKGBUILD 59708 2011-11-29 13:34:54Z stephane $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jason R Begley (jayray@digitalgoat.com> pkgname=freeradius pkgver=2.1.12 -pkgrel=1 +pkgrel=2 pkgdesc="The premier open source RADIUS server" arch=('i686' 'x86_64') url="http://www.freeradius.org/" diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD index 1fb966840..a2bdd189c 100644 --- a/community/gmic/PKGBUILD +++ b/community/gmic/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58115 2011-11-06 17:48:06Z spupykin $ +# $Id: PKGBUILD 59673 2011-11-29 10:05:44Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: farid <farid at archlinuc-br.org> @@ -6,7 +6,7 @@ pkgbase=gmic pkgname=('gmic' 'gimp-plugin-gmic') -pkgver=1.5.0.6 +pkgver=1.5.0.7 pkgrel=1 pkgdesc="image procession framework" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ makedepends=('gimp' 'fftw' 'lapack' 'opencv' 'graphicsmagick' 'openexr' 'imagema options=('docs' '!emptydirs') source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_$pkgver.tar.gz" opencv-buildfix.patch) -md5sums=('01ddab64ed2d127c2ee35602a3e141f5' +md5sums=('66ef32dab2b424c25ac7ced06fc69bbf' 'f135182ced743c296e08ddd560fa6be9') build() { diff --git a/community/gtypist/PKGBUILD b/community/gtypist/PKGBUILD index 19ceb6a79..ae82be66a 100644 --- a/community/gtypist/PKGBUILD +++ b/community/gtypist/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 57751 2011-11-02 08:47:29Z spupykin $ +# $Id: PKGBUILD 59675 2011-11-29 10:07:33Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Ben Mazer <blm@groknil.org> # Contributor: Mike Douglas <code_monkey@gooeylinux.org> pkgname=gtypist -pkgver=2.9 +pkgver=2.9.1 pkgrel=1 pkgdesc="universal typing tutor" arch=('i686' 'x86_64') @@ -15,8 +15,8 @@ makedepends=('emacs') install=gtypist.install source=(ftp://ftp.gnu.org/gnu/gtypist/$pkgname-$pkgver.tar.gz ncurses.patch) -md5sums=('4500940fb1cde36899afd957d64236bb' - '17b3a69119e3bd791f0941e0f93fb8b3') +md5sums=('8b7e5595fcabd254f85c2e171dcaf4fc' + 'ba5e990d948ba5019391094dac890aa6') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/gtypist/ncurses.patch b/community/gtypist/ncurses.patch index ae17733fb..c06424623 100644 --- a/community/gtypist/ncurses.patch +++ b/community/gtypist/ncurses.patch @@ -1,32 +1,63 @@ -diff -wbBur gtypist-2.9/configure gtypist-2.9.my/configure ---- gtypist-2.9/configure 2011-11-01 01:31:47.000000000 +0400 -+++ gtypist-2.9.my/configure 2011-11-02 12:31:42.000000000 +0400 -@@ -4478,8 +4478,8 @@ +diff -wbBur gtypist-2.9.1/configure gtypist-2.9.1.my/configure +--- gtypist-2.9.1/configure 2011-11-29 00:14:11.000000000 +0400 ++++ gtypist-2.9.1.my/configure 2011-11-29 13:03:51.000000000 +0400 +@@ -4011,13 +4011,13 @@ + ALL_LINGUAS="cs de es eu fi fr nl pl ru tr zh_CN zh_TW" + + # Checks for libraries. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for add_wch in -lncursesw" >&5 +-$as_echo_n "checking for add_wch in -lncursesw... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for add_wch in -lncurses" >&5 ++$as_echo_n "checking for add_wch in -lncurses... " >&6; } + if ${ac_cv_lib_ncursesw_add_wch+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lncursesw $LIBS" ++LIBS="-lncurses $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -4464,7 +4464,7 @@ + done - #AC_CHECK_HEADER(curses.h, HAVE_CURSES_H=1) -ac_fn_c_check_header_mongrel "$LINENO" "ncursesw/ncurses.h" "ac_cv_header_ncursesw_ncurses_h" "$ac_includes_default" --if test "x$ac_cv_header_ncursesw_ncurses_h" = xyes; then : -+ac_fn_c_check_header_mongrel "$LINENO" "ncurses.h" "ac_cv_header_ncurses_h" "$ac_includes_default" -+if test "x$ac_cv_header_ncurses_h" = xyes; then : ++ac_fn_c_check_header_mongrel "$LINENO" "ncurses.h" "ac_cv_header_ncursesw_ncurses_h" "$ac_includes_default" + if test "x$ac_cv_header_ncursesw_ncurses_h" = xyes; then : HAVE_NCURSESW_H=1 fi +@@ -4473,7 +4473,7 @@ + + # sanity check for libncursesw: + if test -n "$HAVE_NCURSESW_H" -a -n "$HAVE_LIBNCURSESW"; then +- LIBS="-lncursesw $LIBS" ++ LIBS="-lncurses $LIBS" + else + echo -e "Error: both library and header files for the ncursesw library\n"\ + "are required to build this package. See INSTALL file for"\ +diff -wbBur gtypist-2.9.1/configure.ac gtypist-2.9.1.my/configure.ac +--- gtypist-2.9.1/configure.ac 2011-11-21 03:27:02.000000000 +0400 ++++ gtypist-2.9.1.my/configure.ac 2011-11-29 13:02:53.000000000 +0400 +@@ -21,13 +21,13 @@ + ALL_LINGUAS="cs de es eu fi fr nl pl ru tr zh_CN zh_TW" + + # Checks for libraries. +-AC_CHECK_LIB(ncursesw, add_wch, HAVE_LIBNCURSESW=1) ++AC_CHECK_LIB(ncurses, add_wch, HAVE_LIBNCURSESW=1) -diff -wbBur gtypist-2.9/configure.ac gtypist-2.9.my/configure.ac ---- gtypist-2.9/configure.ac 2011-10-30 19:26:40.000000000 +0400 -+++ gtypist-2.9.my/configure.ac 2011-11-02 12:30:18.000000000 +0400 -@@ -40,7 +40,7 @@ + # Checks for header files. + AC_HEADER_STDC AC_CHECK_HEADERS([unistd.h alloca.h argz.h errno.h fcntl.h langinfo.h libintl.h limits.h locale.h malloc.h stddef.h stdio_ext.h stdlib.h string.h strings.h sys/param.h unistd.h]) - #AC_CHECK_HEADER(curses.h, HAVE_CURSES_H=1) -AC_CHECK_HEADER(ncursesw/ncurses.h, HAVE_NCURSESW_H=1) +AC_CHECK_HEADER(ncurses.h, HAVE_NCURSESW_H=1) - # We prefer ncurses to curses if both are found. - dnl if test -n "$HAVE_NCURSES_H" -a -n "$HAVE_LIBNCURSES"; then -diff -wbBur gtypist-2.9/src/cursmenu.c gtypist-2.9.my/src/cursmenu.c ---- gtypist-2.9/src/cursmenu.c 2011-10-31 01:35:20.000000000 +0400 -+++ gtypist-2.9.my/src/cursmenu.c 2011-11-02 12:30:27.000000000 +0400 + # sanity check for libncursesw: + if test -n "$HAVE_NCURSESW_H" -a -n "$HAVE_LIBNCURSESW"; then +diff -wbBur gtypist-2.9.1/src/cursmenu.c gtypist-2.9.1.my/src/cursmenu.c +--- gtypist-2.9.1/src/cursmenu.c 2011-11-01 04:13:02.000000000 +0400 ++++ gtypist-2.9.1.my/src/cursmenu.c 2011-11-29 13:04:15.000000000 +0400 @@ -24,7 +24,7 @@ #ifdef HAVE_PDCURSES #include <curses.h> @@ -36,9 +67,9 @@ diff -wbBur gtypist-2.9/src/cursmenu.c gtypist-2.9.my/src/cursmenu.c #endif #include "error.h" -diff -wbBur gtypist-2.9/src/error.c gtypist-2.9.my/src/error.c ---- gtypist-2.9/src/error.c 2011-09-26 15:35:03.000000000 +0400 -+++ gtypist-2.9.my/src/error.c 2011-11-02 12:30:30.000000000 +0400 +diff -wbBur gtypist-2.9.1/src/error.c gtypist-2.9.1.my/src/error.c +--- gtypist-2.9.1/src/error.c 2011-11-01 04:13:02.000000000 +0400 ++++ gtypist-2.9.1.my/src/error.c 2011-11-29 13:04:15.000000000 +0400 @@ -25,7 +25,7 @@ #ifdef HAVE_PDCURSES #include <curses.h> @@ -48,9 +79,9 @@ diff -wbBur gtypist-2.9/src/error.c gtypist-2.9.my/src/error.c #endif #include <stdlib.h> -diff -wbBur gtypist-2.9/src/gtypist.c gtypist-2.9.my/src/gtypist.c ---- gtypist-2.9/src/gtypist.c 2011-10-31 03:24:25.000000000 +0400 -+++ gtypist-2.9.my/src/gtypist.c 2011-11-02 12:30:24.000000000 +0400 +diff -wbBur gtypist-2.9.1/src/gtypist.c gtypist-2.9.1.my/src/gtypist.c +--- gtypist-2.9.1/src/gtypist.c 2011-11-22 17:31:25.000000000 +0400 ++++ gtypist-2.9.1.my/src/gtypist.c 2011-11-29 13:04:15.000000000 +0400 @@ -31,7 +31,7 @@ #ifdef HAVE_PDCURSES #include <curses.h> @@ -60,9 +91,9 @@ diff -wbBur gtypist-2.9/src/gtypist.c gtypist-2.9.my/src/gtypist.c #endif #include <time.h> -diff -wbBur gtypist-2.9/src/script.c gtypist-2.9.my/src/script.c ---- gtypist-2.9/src/script.c 2011-10-26 12:51:57.000000000 +0400 -+++ gtypist-2.9.my/src/script.c 2011-11-02 12:30:37.000000000 +0400 +diff -wbBur gtypist-2.9.1/src/script.c gtypist-2.9.1.my/src/script.c +--- gtypist-2.9.1/src/script.c 2011-11-28 19:39:48.000000000 +0400 ++++ gtypist-2.9.1.my/src/script.c 2011-11-29 13:04:15.000000000 +0400 @@ -24,7 +24,7 @@ #ifdef HAVE_PDCURSES #include <curses.h> @@ -72,9 +103,9 @@ diff -wbBur gtypist-2.9/src/script.c gtypist-2.9.my/src/script.c #endif #include "error.h" -diff -wbBur gtypist-2.9/src/utf8.c gtypist-2.9.my/src/utf8.c ---- gtypist-2.9/src/utf8.c 2011-10-31 03:11:27.000000000 +0400 -+++ gtypist-2.9.my/src/utf8.c 2011-11-02 12:30:43.000000000 +0400 +diff -wbBur gtypist-2.9.1/src/utf8.c gtypist-2.9.1.my/src/utf8.c +--- gtypist-2.9.1/src/utf8.c 2011-11-28 19:39:19.000000000 +0400 ++++ gtypist-2.9.1.my/src/utf8.c 2011-11-29 13:04:15.000000000 +0400 @@ -23,7 +23,7 @@ #ifdef HAVE_PDCURSES #include <curses.h> diff --git a/community/hubbub/PKGBUILD b/community/hubbub/PKGBUILD index f7adf9934..cf1651064 100644 --- a/community/hubbub/PKGBUILD +++ b/community/hubbub/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 56215 2011-10-03 14:01:41Z arodseth $ +# $Id: PKGBUILD 59698 2011-11-29 12:42:33Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Paulo Matias <matiasΘarchlinux-br·org> pkgname=hubbub pkgver=0.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="HTML5 compliant parsing library" arch=('x86_64' 'i686') url="http://www.netsurf-browser.org/projects/hubbub/" license=('MIT') depends=('libparserutils') -source=("http://www.netsurf-browser.org/projects/releases/${pkgname}-${pkgver}-src.tar.gz") +source=("http://www.netsurf-browser.org/projects/releases/$pkgname-$pkgver-src.tar.gz") md5sums=('98f49be58e228010c88381bc39f39e19') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" sed -i 's:-Werror::' Makefile make PREFIX=/usr COMPONENT_TYPE="lib-shared" @@ -22,11 +22,11 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" - make install PREFIX=/usr DESTDIR="${pkgdir}" COMPONENT_TYPE="lib-shared" - make install PREFIX=/usr DESTDIR="${pkgdir}" COMPONENT_TYPE="lib-static" - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" + make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-shared" + make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-static" + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } # vim:set ts=2 sw=2 et: diff --git a/community/iat/PKGBUILD b/community/iat/PKGBUILD index 1a965d77b..c458937fa 100644 --- a/community/iat/PKGBUILD +++ b/community/iat/PKGBUILD @@ -1,26 +1,29 @@ -# $Id: PKGBUILD 49702 2011-06-19 11:29:43Z andrea $ -# Maintainer: -# Contributor: Biru Ionut <ionut@archlinux.ro> +# $Id: PKGBUILD 59656 2011-11-29 08:40:05Z arodseth $ +# Maintainer: Alexander Rødseth +# Contributor: Biru Ionut <ionut@archlinux.ro> # Contributor: Jeff Mickey <jeff@archlinux.org> - pkgname=iat pkgver=0.1.7 -pkgrel=3 -pkgdesc="Detects many formats of cd-rom image files (BIN,MDF,PDI,CDI,NRG,B5I) and converts them to ISO-9660" -arch=('i686' 'x86_64') +pkgrel=4 +pkgdesc="Detects and converts DVD/CD images from BIN/MDF/PDI/CDI/NRG/B5I to ISO-9660" +arch=('x86_64' 'i686') url="http://iat.berlios.de/" license=('GPL') depends=('glibc') -source=("http://download.berlios.de/${pkgname}/$pkgname-$pkgver.tar.bz2") +source=("http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.bz2") md5sums=('5e1ffd82000ea4c80ffb2d63ae55120c') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --includedir=/usr/include/$pkgname + + ./configure --prefix=/usr --includedir="/usr/include/$pkgname" make } package() { cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/community/libnsbmp/PKGBUILD b/community/libnsbmp/PKGBUILD index 04bfb620e..8193e85dd 100644 --- a/community/libnsbmp/PKGBUILD +++ b/community/libnsbmp/PKGBUILD @@ -1,28 +1,31 @@ -# $Id: PKGBUILD 52352 2011-07-23 20:45:39Z ebelanger $ -# Contributor; Paulo Matias <matiasΘarchlinux-br·org> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - +# $Id: PKGBUILD 59663 2011-11-29 08:59:46Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Paulo Matias <matiasΘarchlinux-br·org> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=libnsbmp pkgver=0.0.3 -pkgrel=1 +pkgrel=3 pkgdesc="Decoding library for BMP and ICO image file formats" -arch=('i686' 'x86_64') -url="http://www.netsurf-browser.org/projects/libnsbmp" +arch=('x86_64' 'i686') +url="http://www.netsurf-browser.org/projects/libnsbmp/" license=('MIT') depends=('glibc') -source=("http://www.netsurf-browser.org/projects/releases/${pkgname}-${pkgver}-src.tar.gz") +source=("http://www.netsurf-browser.org/projects/releases/$pkgname-$pkgver-src.tar.gz") md5sums=('52eef940713a4c8a7afbb6888583057c') build() { - cd "${srcdir}"/${pkgname}-${pkgver}-src + cd "$srcdir/$pkgname-$pkgver-src" + make PREFIX=/usr COMPONENT_TYPE="lib-shared" make PREFIX=/usr COMPONENT_TYPE="lib-static" } package() { - cd "${srcdir}"/${pkgname}-${pkgver}-src - make install PREFIX=/usr DESTDIR="${pkgdir}" COMPONENT_TYPE="lib-shared" - make install PREFIX=/usr DESTDIR="${pkgdir}" COMPONENT_TYPE="lib-static" - install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/COPYING + cd "$srcdir/$pkgname-$pkgver-src" + + make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-shared" + make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-static" + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } +# vim:set ts=2 sw=2 et: diff --git a/community/libnsgif/PKGBUILD b/community/libnsgif/PKGBUILD index 679d24926..b31fff221 100644 --- a/community/libnsgif/PKGBUILD +++ b/community/libnsgif/PKGBUILD @@ -1,28 +1,32 @@ -# $Id: PKGBUILD 52357 2011-07-23 20:52:47Z ebelanger $ +# $Id: PKGBUILD 59664 2011-11-29 09:06:33Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Paulo Matias <matiasΘarchlinux-br·org> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - pkgname=libnsgif pkgver=0.0.3 -pkgrel=1 +pkgrel=3 pkgdesc="Decoding library for the GIF image file format" -arch=('i686' 'x86_64') -url="http://www.netsurf-browser.org/projects/libnsgif" +arch=('x86_64' 'i686') +url="http://www.netsurf-browser.org/projects/libnsgif/" license=('MIT') depends=('glibc') -source=("http://www.netsurf-browser.org/projects/releases/${pkgname}-${pkgver}-src.tar.gz") +source=("http://www.netsurf-browser.org/projects/releases/$pkgname-$pkgver-src.tar.gz") md5sums=('d4fa9679939e9b1b243799d6a0623cec') build() { - cd "${srcdir}"/${pkgname}-${pkgver}-src + cd "$srcdir/$pkgname-$pkgver-src" + CFLAGS="$CFLAGS -fno-strict-aliasing" make PREFIX=/usr COMPONENT_TYPE="lib-shared" make PREFIX=/usr COMPONENT_TYPE="lib-static" } package() { - cd "${srcdir}"/${pkgname}-${pkgver}-src - make install PREFIX=/usr DESTDIR="${pkgdir}" COMPONENT_TYPE="lib-shared" - make install PREFIX=/usr DESTDIR="${pkgdir}" COMPONENT_TYPE="lib-static" - install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/COPYING + cd "$srcdir/$pkgname-$pkgver-src" + + make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-shared" + make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-static" + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } + +# vim:set ts=2 sw=2 et: diff --git a/community/libopenraw/PKGBUILD b/community/libopenraw/PKGBUILD index 7d73f78ac..dfc0fcd36 100644 --- a/community/libopenraw/PKGBUILD +++ b/community/libopenraw/PKGBUILD @@ -1,28 +1,31 @@ -# $Id: PKGBUILD 55459 2011-09-13 00:37:08Z ebelanger $ +# $Id: PKGBUILD 59667 2011-11-29 09:17:08Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Ronald van Haren <ronald.archlinux.org> -# Contributor: boromil@gmail.com -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: <boromil@gmail.com> pkgname=libopenraw -pkgver=0.0.8 -pkgrel=4 -pkgdesc="A software implementation for camera RAW files decoding" -arch=('i686' 'x86_64') -url="http://libopenraw.freedesktop.org" +pkgver=0.0.9 +pkgrel=1 +pkgdesc="Library for decoding RAW files" +arch=('x86_64' 'i686') +url="http://libopenraw.freedesktop.org/" license=('LGPL') -depends=('gtk2') -makedepends=('boost' 'libjpeg') +makedepends=('boost' 'libjpeg' 'libxml2') options=('!libtool') -source=(http://libopenraw.freedesktop.org/download/${pkgname}-${pkgver}.tar.gz) -md5sums=('fc26f146586a4b601326130bce6ffd88') +source=("http://libopenraw.freedesktop.org/download/$pkgname-$pkgver.tar.bz2") +md5sums=('3611d8aea870d25314665ef53093288e') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/community/librep/PKGBUILD b/community/librep/PKGBUILD index c784160b8..6d795f55a 100644 --- a/community/librep/PKGBUILD +++ b/community/librep/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55390 2011-09-11 18:27:38Z shusmann $ +# $Id: PKGBUILD 59710 2011-11-29 13:35:00Z stephane $ # Maintainer: stefan-husmann@t-online.de # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=librep pkgver=0.92.1b -pkgrel=1 +pkgrel=2 pkgdesc="A Lisp system for UNIX" license=('GPL2') arch=('i686' 'x86_64') @@ -29,5 +29,5 @@ package() { # create some directories or make install fails # install -d $pkgdir/usr/{share/aclocal,lib/pkgconfig} - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install } diff --git a/community/librep/librep.install b/community/librep/librep.install index 4bc79b7e2..7e1b990bf 100644 --- a/community/librep/librep.install +++ b/community/librep/librep.install @@ -1,4 +1,4 @@ -info_dir=/usr/share/info +info_dir=usr/share/info info_files=(librep.info) post_install() { diff --git a/community/mailutils/PKGBUILD b/community/mailutils/PKGBUILD index 917bd53bd..81afe7b4c 100644 --- a/community/mailutils/PKGBUILD +++ b/community/mailutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 58984 2011-11-20 19:26:47Z spupykin $ +# $Id: PKGBUILD 59712 2011-11-29 13:35:07Z stephane $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=mailutils pkgver=2.2 -pkgrel=3 +pkgrel=4 pkgdesc="MUA command line tool (mailx)" arch=(i686 x86_64) url="http://www.gnu.org/software/mailutils/" diff --git a/community/mtpaint/PKGBUILD b/community/mtpaint/PKGBUILD index 12a07818c..cae6deaeb 100644 --- a/community/mtpaint/PKGBUILD +++ b/community/mtpaint/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56207 2011-10-03 12:32:35Z arodseth $ +# $Id: PKGBUILD 59671 2011-11-29 09:34:27Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: yosh64 <yosh64.at.gmail.dot.com> pkgname=mtpaint pkgver=3.31 -pkgrel=6 +pkgrel=7 pkgdesc="A simple GTK2 painting program designed for creating icons and pixel based artwork" arch=('x86_64' 'i686') url="http://mtpaint.sourceforge.net/" @@ -19,19 +19,18 @@ md5sums=('fbe34eb25f96b6092403115f1f6ab387' '1bd546a8efeae01e8fd8a5c7f213012e') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i ${srcdir}/libpng14.patch + patch -Np1 -i "$srcdir/libpng14.patch" ./configure --prefix=/usr --mandir=/usr/share/man/man1 man intl gif jpeg tiff make } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir/$pkgname-$pkgver" - make DESTDIR=${pkgdir} install - install -Dm644 COPYING \ - "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } # vim:set ts=2 sw=2 et: diff --git a/community/nemiver/PKGBUILD b/community/nemiver/PKGBUILD index aa1c44307..6622ff29c 100644 --- a/community/nemiver/PKGBUILD +++ b/community/nemiver/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 57366 2011-10-26 13:00:32Z arodseth $ +# $Id: PKGBUILD 59670 2011-11-29 09:31:30Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: jordz <jordz@archlinux.us> pkgname=nemiver -pkgver=0.9.0 -pkgrel=3 -pkgdesc="A C/C++ debugger for GNOME" +pkgver=0.9.1 +pkgrel=1 +pkgdesc="C/C++ debugger for GNOME" arch=('x86_64' 'i686') license=('GPL') url="http://www.gnome.org/projects/nemiver/" -depends=('gdb' 'gtksourceviewmm' 'libgtop' 'vte3' 'ghex' 'gconf') +depends=('gdb' 'gtksourceviewmm' 'libgtop' 'vte3' 'ghex' 'gconf' 'dconf') makedepends=('boost' 'intltool' 'gnome-doc-utils') install=nemiver.install -source=("http://ftp.acc.umu.se/pub/GNOME/sources/${pkgname}/0.9/${pkgname}-${pkgver}.tar.xz") +source=("http://ftp.acc.umu.se/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz") options=('!libtool' '!emptydirs') -md5sums=('03a2c34d4c04fd69749c01975a97c0c2') +md5sums=('9c0275e7a2d9f9fb48f279387969281b') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ @@ -27,13 +27,13 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" - make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${pkgdir} install - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" \ - --domain nemiver ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install + install -m755 -d "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" \ + --domain nemiver "$pkgdir"/etc/gconf/schemas/*.schemas + rm -f "$pkgdir"/etc/gconf/schemas/*.schemas } # vim:set ts=2 sw=2 et: diff --git a/community/netsurf/PKGBUILD b/community/netsurf/PKGBUILD index bd4cac2fe..beddbb372 100644 --- a/community/netsurf/PKGBUILD +++ b/community/netsurf/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 58607 2011-11-16 15:29:25Z spupykin $ +# $Id: PKGBUILD 59684 2011-11-29 11:46:42Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Contributor: Georgij Kondratjev <smpuj@bk.ru> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=netsurf pkgver=2.8 -pkgrel=1 -pkgdesc="Lightweight, fast web browser" +pkgrel=2 +pkgdesc="Lightweight and fast web browser" arch=('x86_64' 'i686') url="http://www.netsurf-browser.org/" license=('GPL') @@ -14,32 +14,30 @@ depends=('libmng' 'curl' 'libglade' 'librsvg' 'desktop-file-utils' 'libnsbmp' 'l makedepends=('re2c' 'lcms') provides=('netsurf') conflicts=('netsurf') -install="${pkgname}.install" -source=("${pkgname}.desktop" - "${pkgname}.install" - "http://ubuntu.allmyapps.com/data/n/e/netsurf-netsurf-web-browser/icon_48x48_netsurf.png" - "http://www.netsurf-browser.org/downloads/releases/${pkgname}-${pkgver}-src.tar.gz") -md5sums=('85e0af265e77607596fd90db9ac707ad' - '69445d7ccf7df8c7ff134f04f36342b0' - '4f28912e5df4b826b819e175265bcc9c' - '49c41f281f3e9ca28a24da505fad2e3a') +install=netsurf.install +source=("netsurf.png::http://ubuntu.allmyapps.com/data/n/e/netsurf-netsurf-web-browser/icon_48x48_netsurf.png" + "http://www.netsurf-browser.org/downloads/releases/$pkgname-$pkgver-src.tar.gz" + "$pkgname.desktop") +md5sums=('4f28912e5df4b826b819e175265bcc9c' + '49c41f281f3e9ca28a24da505fad2e3a' + '85e0af265e77607596fd90db9ac707ad') build() { - cd "${srcdir}/${pkgname}" + cd "$srcdir/$pkgname" make PREFIX=/usr TARGET=gtk } package() { - cd "${srcdir}/${pkgname}" + cd "$srcdir/$pkgname" - make install PREFIX=/usr DESTDIR="${pkgdir}" - install -Dm644 "../icon_48x48_netsurf.png" \ - "${pkgdir}/usr/share/pixmaps/${pkgname}.png" - install -Dm644 "../${pkgname}.desktop" \ - "${pkgdir}/usr/share/applications/${pkgname}.desktop" + make install PREFIX=/usr DESTDIR="$pkgdir" + install -Dm644 "../$pkgname.png" \ + "$pkgdir/usr/share/pixmaps/$pkgname.png" + install -Dm644 "../$pkgname.desktop" \ + "$pkgdir/usr/share/applications/$pkgname.desktop" install -Dm644 COPYING \ - "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" + "$pkgdir/usr/share/licenses/$pkgname/COPYING" } # vim:set ts=2 sw=2 et: diff --git a/community/netsurf/netsurf.install b/community/netsurf/netsurf.install index fb5b06997..966f361ea 100644 --- a/community/netsurf/netsurf.install +++ b/community/netsurf/netsurf.install @@ -1,20 +1,15 @@ -post_install() { - echo "Updating icon cache" - gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor - echo "Updating mime entries" - update-desktop-database -q -} - post_upgrade() { echo "Updating icon cache" gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor - echo "Updating mime entries" - update-desktop-database -q + echo "Updating mime entries" + update-desktop-database -q +} +post_install() { + post_upgrade } post_remove() { - echo "Updating icon cache" - gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor - echo "Updating mime entries" - update-desktop-database -q + post_upgrade } + +# vim:set ts=2 sw=2 et: diff --git a/community/ntop/PKGBUILD b/community/ntop/PKGBUILD index 695144eee..a44a800cd 100644 --- a/community/ntop/PKGBUILD +++ b/community/ntop/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 54260 2011-08-15 15:17:24Z lfleischer $ +# $Id: PKGBUILD 59714 2011-11-29 13:35:19Z stephane $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=ntop pkgver=4.1.0 -pkgrel=1 +pkgrel=2 pkgdesc='A network traffic probe that shows the network usage.' arch=('i686' 'x86_64') url='http://www.ntop.org/' diff --git a/community/oss/PKGBUILD b/community/oss/PKGBUILD index cb9e8432e..076e17329 100644 --- a/community/oss/PKGBUILD +++ b/community/oss/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 54037 2011-08-12 13:13:29Z bluewind $ +# $Id: PKGBUILD 59729 2011-11-29 20:14:19Z bluewind $ # Maintainer: Florian Pritz <bluewind@xinu.at> # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=oss pkgver=4.2_2005 -pkgrel=1 +pkgrel=2 pkgdesc="Open Sound System UNIX audio architecture" arch=('i686' 'x86_64') url="http://developer.opensound.com/" @@ -65,6 +65,10 @@ build() { # remove hal dependency patch -p0 -i "${srcdir}/remove-hal.patch" rm -rf usr/lib/oss/scripts/oss_usb-create-devices usr/lib/oss/scripts/90-oss_usb-create-device.fdi + + sed -i 's#/lib/modules/$KERNEL_VERSION/kernel/#/lib/modules/$KERNEL_VERSION/extramodules/kernel/#g' usr/sbin/soundon + sed -i 's#/lib/modules/$UNAME/kernel/#/lib/modules/$UNAME/extramodules/kernel/#g' usr/lib/oss/build/install.sh + sed -i 's#mkdir /lib/modules#mkdir -p /lib/modules#' usr/lib/oss/build/install.sh } package() { diff --git a/community/passenger/PKGBUILD b/community/passenger/PKGBUILD index 7ebf7fd69..4fcab1d40 100644 --- a/community/passenger/PKGBUILD +++ b/community/passenger/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55084 2011-09-02 09:22:31Z spupykin $ +# $Id: PKGBUILD 59679 2011-11-29 10:41:58Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=passenger -pkgver=3.0.8 +pkgver=3.0.11 pkgrel=1 -pkgdlnr=75219 +_pkgdlnr=75548 pkgdesc="mod_rails passenger" arch=('i686' 'x86_64') url="http://www.modrails.com" @@ -12,9 +12,9 @@ license=('GPL') depends=('apache' 'ruby' 'ruby-rack' 'curl') install=$pkgname.install options=('!emptydirs') -source=(http://rubyforge.org/frs/download.php/$pkgdlnr/$pkgname-$pkgver.tar.gz +source=(http://rubyforge.org/frs/download.php/${_pkgdlnr}/$pkgname-$pkgver.tar.gz $pkgname-install-apache2-module.patch) -md5sums=('b283f3be6bbbc93a94cc30f99ab0263e' +md5sums=('9186d799e065ccad803cbc0289954f40' '3d04eba10c55a955c378678d5df8497f') build(){ diff --git a/community/ruby-ncurses/PKGBUILD b/community/ruby-ncurses/PKGBUILD index 2d74ed30a..79e296738 100644 --- a/community/ruby-ncurses/PKGBUILD +++ b/community/ruby-ncurses/PKGBUILD @@ -1,27 +1,29 @@ -# $Id: PKGBUILD 2365 2009-09-16 18:43:17Z shusmann $ +# $Id: PKGBUILD 59686 2011-11-29 12:01:49Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Jeff Mickey <j@codemac.net> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> -# Maintainer: Brad Fanella <bradfanella@archlinux.us> - pkgname=ruby-ncurses pkgver=1.3.1 -pkgrel=1 -pkgdesc="This ruby extension makes most functions, constants, and external variables of the C library ncurses accessible from the Ruby programming language." -arch=('i686' 'x86_64') -url="http://ncurses-ruby.berlios.de" +pkgrel=2 +pkgdesc="Module for interactive text console applications (ncurses)" +arch=('x86_64' 'i686') +url="http://ncurses-ruby.berlios.de/" license=('GPL') depends=('ruby') -source=(http://download.berlios.de/ncurses-ruby/ncurses-ruby-$pkgver.tar.bz2) +source=("http://download.berlios.de/ncurses-ruby/ncurses-ruby-$pkgver.tar.bz2") md5sums=('63fd3d09a51cdd745e1ed37f85621ea2') build() { - cd $srcdir/ncurses-ruby-$pkgver + cd "$srcdir/ncurses-ruby-$pkgver" - ruby extconf.rb - make + ruby extconf.rb + make } package() { - cd $srcdir/ncurses-ruby-$pkgver - make DESTDIR=$pkgdir install + cd "$srcdir/ncurses-ruby-$pkgver" + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD index 68ffa84a5..d240ce248 100644 --- a/community/sage-mathematics/PKGBUILD +++ b/community/sage-mathematics/PKGBUILD @@ -5,7 +5,7 @@ pkgname=sage-mathematics pkgver=4.7.2 -pkgrel=1 +pkgrel=2 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.' url='http://www.sagemath.org' arch=('i686' 'x86_64') diff --git a/community/setconf/PKGBUILD b/community/setconf/PKGBUILD index 27a2eb3a9..ba7b6d89a 100644 --- a/community/setconf/PKGBUILD +++ b/community/setconf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id$ +# $Id: PKGBUILD 59692 2011-11-29 12:22:12Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> pkgname=setconf pkgver=0.2 -pkgrel=7 +pkgrel=8 pkgdesc="A utility to easily change settings in Makefiles and other configuration files" arch=('x86_64' 'i686') url="http://setconf.roboticoverlords.org/" @@ -10,23 +10,23 @@ license=('GPL') depends=('pcre' 'gc') makedepends=('shedskin>=0.1.2') md5sums=('ccd0ca9527d8406d5393d77a6a56686b') -source=("http://${pkgname}.roboticoverlords.org/${pkgname}-${pkgver}.tbz2") +source=("http://setconf.roboticoverlords.org/$pkgname-$pkgver.tbz2") build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" - shedskin ${pkgname}.py + shedskin "$pkgname.py" make CPPFLAGS="-march=native -fomit-frame-pointer" } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" - install -Dm755 "${pkgname}" "$pkgdir/usr/bin/${pkgname}" - install -Dm644 "${pkgname}.1.gz" \ - "$pkgdir/usr/share/man/man1/${pkgname}.1.gz" + install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname" + install -Dm644 "$pkgname.1.gz" \ + "$pkgdir/usr/share/man/man1/$pkgname.1.gz" install -Dm644 COPYING \ - "$pkgdir/usr/share/licenses/${pkgname}/COPYING" + "$pkgdir/usr/share/licenses/$pkgname/COPYING" } # vim:set ts=2 sw=2 et: diff --git a/community/smalltalk/PKGBUILD b/community/smalltalk/PKGBUILD index 6efbe0334..2522e8a89 100644 --- a/community/smalltalk/PKGBUILD +++ b/community/smalltalk/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 54483 2011-08-18 15:08:42Z bluewind $ +# $Id: PKGBUILD 59718 2011-11-29 13:35:33Z stephane $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: mrshpot <mrshpot at gmail dot com> # Contributor: Michael Fellinger <m.fellinger@gmail.com> pkgname=smalltalk pkgver=3.2.4 -pkgrel=2 +pkgrel=3 pkgdesc='A free implementation of Smalltalk-80 by the GNU project' url='http://smalltalk.gnu.org/' license=('GPL' 'LGPL') diff --git a/community/smem/PKGBUILD b/community/smem/PKGBUILD index ee5f99ff4..9843a5a1e 100644 --- a/community/smem/PKGBUILD +++ b/community/smem/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 41843 2011-03-09 18:16:06Z dreisner $ +# $Id: PKGBUILD 59733 2011-11-30 03:48:48Z dreisner $ # Maintainer: Dave Reisner <d@falconindy.com> # Contributor: Isaac Dupree <id@isaac.cedarswampstudios.org> # Contributor: Sebastien Duquette <ekse.0x@gmail.com> pkgname=smem pkgver=1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Generate reports on memory usage." url="http://www.selenic.com/smem/" license=("GPL") @@ -19,7 +19,7 @@ build() { cd $srcdir/$pkgname-$pkgver sed -i '1s/python$/python2/' smem - gcc $CFLAGS $LDFLAGS smemcap.c -o smemcap + make smemcap } package() { diff --git a/community/xemacs/PKGBUILD b/community/xemacs/PKGBUILD index 8e7d3fe69..65f2b441d 100644 --- a/community/xemacs/PKGBUILD +++ b/community/xemacs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 49690 2011-06-19 10:01:11Z ebelanger $ +# $Id: PKGBUILD 59720 2011-11-29 13:35:44Z stephane $ # Maintainer: juergen <juergen@archlinux.org> # Contributor : Stéphane Gaudreault <stephane@archlinux.org> pkgname=xemacs pkgver=21.5.31 -pkgrel=2 +pkgrel=3 pkgdesc="An highly customizable open source text editor and application development system forked from GNU Emacs" arch=('i686' 'x86_64') url="http://www.xemacs.org/" diff --git a/community/xkbsel/PKGBUILD b/community/xkbsel/PKGBUILD index 13b51a615..e6114985f 100644 --- a/community/xkbsel/PKGBUILD +++ b/community/xkbsel/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 58985 2011-11-20 19:27:14Z spupykin $ +# $Id: PKGBUILD 59722 2011-11-29 13:35:50Z stephane $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=xkbsel pkgver=0.13 -pkgrel=4 +pkgrel=5 pkgdesc="framework for defining, selecting and indicating XKB keyboard mappings" arch=('i686' 'x86_64') url="http://www.meduna.org/sw_xkbsel_en.html" diff --git a/community/yajl/PKGBUILD b/community/yajl/PKGBUILD index 894228fda..cd3afc507 100644 --- a/community/yajl/PKGBUILD +++ b/community/yajl/PKGBUILD @@ -5,14 +5,14 @@ pkgname=yajl pkgver=2.0.2 -pkgrel=1 +pkgrel=2 pkgdesc='Yet Another JSON Library.' arch=('i686' 'x86_64') url='http://lloyd.github.com/yajl/' license=('ISC') makedepends=('cmake') source=("$pkgname-$pkgver.tar.gz::https://github.com/lloyd/$pkgname/tarball/$pkgver") -md5sums=('df6a751e7797b9c2182efd91b5d64017') +md5sums=('0cea435187c45e02972093ae537a2831') build() { dirname=$(tar tf "$srcdir/$pkgname-$pkgver.tar.gz" | sed 1q); @@ -31,4 +31,3 @@ package() { install -Dm644 COPYING "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" } -md5sums=('0cea435187c45e02972093ae537a2831') diff --git a/core/bison/PKGBUILD b/core/bison/PKGBUILD index ebd193784..90cf43059 100644 --- a/core/bison/PKGBUILD +++ b/core/bison/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142169 2011-11-05 11:41:16Z allan $ +# $Id: PKGBUILD 143798 2011-11-29 12:24:20Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> pkgname=bison pkgver=2.5 -pkgrel=2 +pkgrel=3 pkgdesc="The GNU general-purpose parser generator" arch=('i686' 'x86_64') license=('GPL3') @@ -12,22 +12,28 @@ url="http://www.gnu.org/software/bison/bison.html" depends=('glibc' 'm4' 'sh') groups=('base-devel') install=bison.install -source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.bz2{,.sig}) +source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.bz2{,.sig} + bison-2.5-undefined-reference.patch) md5sums=('9dba20116b13fc61a0846b0058fbe004' - '610b73db67bd4760209458efe7554ca3') + '610b73db67bd4760209458efe7554ca3' + '2015c5421b2ad99032154f27bf5c4772') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${srcdir}/${pkgname}-${pkgver} + + # workaround for FS#26794 + patch -Np1 -i $srcdir/bison-2.5-undefined-reference.patch + ./configure --prefix=/usr --datadir=/usr/share make } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${srcdir}/${pkgname}-${pkgver} make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install } diff --git a/core/bison/bison-2.5-undefined-reference.patch b/core/bison/bison-2.5-undefined-reference.patch new file mode 100644 index 000000000..ea390259e --- /dev/null +++ b/core/bison/bison-2.5-undefined-reference.patch @@ -0,0 +1,11 @@ +diff -Naur bison-2.5-orig/lib/yyerror.c bison-2.5/lib/yyerror.c +--- bison-2.5-orig/lib/yyerror.c 2011-01-04 00:50:42.000000000 +1000 ++++ bison-2.5/lib/yyerror.c 2011-11-09 22:01:48.725507079 +1000 +@@ -18,6 +18,7 @@ + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + + #include <stdio.h> ++#undef fprintf + + int yyerror (char const *); + diff --git a/core/gdbm/PKGBUILD b/core/gdbm/PKGBUILD index e36a059ac..30570ddf8 100644 --- a/core/gdbm/PKGBUILD +++ b/core/gdbm/PKGBUILD @@ -1,24 +1,22 @@ -# $Id: PKGBUILD 142193 2011-11-06 02:28:38Z stephane $ -# Maintainer: Allan McRae <allan@archlinux.org> +# $Id: PKGBUILD 143800 2011-11-29 13:32:53Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=gdbm -pkgver=1.8.3 -pkgrel=9 +pkgver=1.10 +pkgrel=1 pkgdesc="GNU database library" url="http://www.gnu.org/software/gdbm/gdbm.html" license=('GPL') arch=('i686' 'x86_64') depends=('glibc' 'sh') source=(ftp://ftp.gnu.org/gnu/gdbm/${pkgname}-${pkgver}.tar.gz - gdbm-1.8.3-zeroheaders.patch - gdbm-1.8.3-fhs.patch) + gdbm-1.10-zeroheaders.patch) options=('!libtool' '!makeflags') install=gdbm.install -md5sums=('1d1b1d5c0245b1c00aff92da751e9aa1' - 'a2ed344be9258775bd718074cf2e4ec6' - '66a7c235416c136dc89efc7d03352514') - +md5sums=('88770493c2559dc80b561293e39d3570' + 'ac255b10452005237836cd2d3a470733') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -28,32 +26,32 @@ build() { # from other applications. # https://bugzilla.redhat.com/show_bug.cgi?id=4457 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=208927 - patch -Np1 -i ../gdbm-1.8.3-zeroheaders.patch - - # Make gdbm buildable. - patch -Np1 -i ../gdbm-1.8.3-fhs.patch - - libtoolize --force --copy - aclocal - autoconf - - ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info + patch -Np1 -i ../gdbm-1.10-zeroheaders.patch - # flock does not work on nfs, we use fcntl instead - # https://bugzilla.redhat.com/show_bug.cgi?id=477300 - echo "/* We use fcntl locking (POSIX) instead of flock (BSD) */" >> autoconf.h - echo "#undef HAVE_FLOCK" >> autoconf.h + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --enable-libgdbm-compat make prefix=/usr } -package() { +check() { cd "${srcdir}/${pkgname}-${pkgver}" - make prefix=$pkgdir/usr \ - manprefix=$pkgdir/usr/share/man \ - man3dir=$pkgdir/usr/share/man/man3 \ - infodir=$pkgdir/usr/share/info \ - install install-compat + make check +} - ln -sf gdbm/gdbm.h $pkgdir/usr/include +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make prefix="${pkgdir}"/usr \ + manprefix="${pkgdir}"/usr/share/man \ + man3dir="${pkgdir}"/usr/share/man/man3 \ + infodir="${pkgdir}"/usr/share/info \ + install + + # create symlinks for compatibility + install -dm755 "${pkgdir}"/usr/include/gdbm + ln -sf ../gdbm.h "${pkgdir}"/usr/include/gdbm/gdbm.h + ln -sf ../ndbm.h "${pkgdir}"/usr/include/gdbm/ndbm.h + ln -sf ../dbm.h "${pkgdir}"/usr/include/gdbm/dbm.h } diff --git a/core/gdbm/gdbm-1.10-zeroheaders.patch b/core/gdbm/gdbm-1.10-zeroheaders.patch new file mode 100644 index 000000000..a268f6bdf --- /dev/null +++ b/core/gdbm/gdbm-1.10-zeroheaders.patch @@ -0,0 +1,33 @@ +diff -up gdbm-1.10/src/falloc.c.zeroheaders gdbm-1.10/src/falloc.c +--- gdbm-1.10/src/falloc.c.zeroheaders 2011-11-11 11:59:11.000000000 +0100 ++++ gdbm-1.10/src/falloc.c 2011-11-14 17:34:32.487604027 +0100 +@@ -255,7 +255,7 @@ push_avail_block (GDBM_FILE dbf) + + + /* Split the header block. */ +- temp = (avail_block *) malloc (av_size); ++ temp = (avail_block *) calloc (1, av_size); + if (temp == NULL) _gdbm_fatal (dbf, _("malloc error")); + /* Set the size to be correct AFTER the pop_avail_block. */ + temp->size = dbf->header->avail.size; +diff -up gdbm-1.10/src/gdbmopen.c.zeroheaders gdbm-1.10/src/gdbmopen.c +--- gdbm-1.10/src/gdbmopen.c.zeroheaders 2011-11-11 19:39:42.000000000 +0100 ++++ gdbm-1.10/src/gdbmopen.c 2011-11-14 17:33:24.867608650 +0100 +@@ -264,7 +264,7 @@ gdbm_open (const char *file, int block_s + (dbf->header->block_size - sizeof (hash_bucket)) + / sizeof (bucket_element) + 1; + dbf->header->bucket_size = dbf->header->block_size; +- dbf->bucket = (hash_bucket *) malloc (dbf->header->bucket_size); ++ dbf->bucket = (hash_bucket *) calloc (1, dbf->header->bucket_size); + if (dbf->bucket == NULL) + { + gdbm_close (dbf); +@@ -456,7 +456,7 @@ _gdbm_init_cache(GDBM_FILE dbf, size_t s + for(index = 0; index < size; index++) + { + (dbf->bucket_cache[index]).ca_bucket +- = (hash_bucket *) malloc (dbf->header->bucket_size); ++ = (hash_bucket *) calloc (1, dbf->header->bucket_size); + if ((dbf->bucket_cache[index]).ca_bucket == NULL) + { + gdbm_errno = GDBM_MALLOC_ERROR; diff --git a/core/man-db/PKGBUILD b/core/man-db/PKGBUILD index 25675079f..ca050cef0 100644 --- a/core/man-db/PKGBUILD +++ b/core/man-db/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 126294 2011-06-04 09:41:54Z andyrtr $ +# $Id: PKGBUILD 143802 2011-11-29 13:32:56Z stephane $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Sergej Pupykin <sergej@aur.archlinux.org> pkgname=man-db pkgver=2.6.0.2 -pkgrel=2 +pkgrel=3 pkgdesc="A utility for reading man pages" arch=('i686' 'x86_64') url="http://www.nongnu.org/man-db/" diff --git a/core/perl/PKGBUILD b/core/perl/PKGBUILD index 46ca72ef2..91a2e33d5 100644 --- a/core/perl/PKGBUILD +++ b/core/perl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 139103 2011-09-29 12:44:13Z angvp $ +# $Id: PKGBUILD 143804 2011-11-29 13:33:00Z stephane $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: kevin <kevin.archlinux.org> # Contributor: judd <jvinet.zeroflux.org> # Contributor: francois <francois.archlinux.org> pkgname=perl pkgver=5.14.2 -pkgrel=2 +pkgrel=4 pkgdesc="A highly capable, feature-rich programming language" arch=(i686 x86_64) license=('GPL' 'PerlArtistic') @@ -36,6 +36,10 @@ build() { # for i686 arch_opts="" fi + + # remove rpath FS#27173 + sed -i 's#xxx="-Wl,-rpath,$shrpdir"##' Configure + ./Configure -des -Dusethreads -Duseshrplib -Doptimize="${CFLAGS}" \ -Dprefix=/usr -Dinstallprefix=${pkgdir}/usr -Dvendorprefix=/usr \ -Dprivlib=/usr/share/perl5/core_perl \ @@ -53,6 +57,12 @@ build() { patch -Np1 -i $srcdir/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch make } + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make test +} + package() { # hack to work around makepkg running the subshell in check_sanity() new_provides=($(cd "$srcdir/perl-$pkgver"; LD_PRELOAD=./libperl.so ./perl -Ilib "$srcdir/provides.pl" .)) diff --git a/extra/apr-util/PKGBUILD b/extra/apr-util/PKGBUILD index 5cdab4d99..037dabef7 100644 --- a/extra/apr-util/PKGBUILD +++ b/extra/apr-util/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 129453 2011-06-28 01:17:42Z stephane $ +# $Id: PKGBUILD 143806 2011-11-29 13:33:24Z stephane $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=apr-util pkgver=1.3.12 -pkgrel=2 +pkgrel=3 pkgdesc="The Apache Portable Runtime" arch=('i686' 'x86_64') url="http://apr.apache.org/" diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD index b298f17e3..1d5f9ccc9 100644 --- a/extra/avahi/PKGBUILD +++ b/extra/avahi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 136347 2011-08-26 22:11:46Z allan $ +# $Id: PKGBUILD 143808 2011-11-29 13:33:28Z stephane $ # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=avahi pkgver=0.6.30 -pkgrel=5 +pkgrel=6 pkgdesc='A multicast/unicast DNS-SD framework' arch=('i686' 'x86_64') url='http://www.avahi.org/' diff --git a/extra/f-spot/PKGBUILD b/extra/f-spot/PKGBUILD index 17488c5a5..6b846e191 100644 --- a/extra/f-spot/PKGBUILD +++ b/extra/f-spot/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 125874 2011-05-31 09:04:12Z ibiru $ +# $Id: PKGBUILD 143780 2011-11-29 08:49:53Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Kritoke <kritoke@nospam.gmail.com> # Contributor: György Balló <ballogy@freestart.hu> pkgname=f-spot pkgver=0.8.2 -pkgrel=2 +pkgrel=3 pkgdesc="A personal photo management program for GNOME" url="http://www.gnome.org/projects/f-spot/" arch=(i686 x86_64) @@ -15,9 +15,11 @@ makedepends=('intltool' 'gnome-doc-utils' 'gnome-screensaver') options=('!libtool') install=$pkgname.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 - mono-2.8.patch) + mono-2.8.patch + flickrnet-3.0.patch) sha256sums=('24448d3431a95a9faa0aa975554414eb638f918811507177e9d69d11d417873a' - '4e7d2f1909870b842bbbe087f4381f325d5281d2deae0d32ba5713ee66d52b65') + '4e7d2f1909870b842bbbe087f4381f325d5281d2deae0d32ba5713ee66d52b65' + 'e8e4470c7cd29c000a9505bcd85cb25641890f66e568edb33d495e8e38fc92a5') build() { export MONO_SHARED_DIR="${srcdir}/.wabi" @@ -25,11 +27,17 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i "${srcdir}/mono-2.8.patch" + # https://bugzilla.gnome.org/show_bug.cgi?id=665063 + patch -Np1 -i "${srcdir}/flickrnet-3.0.patch" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --disable-scrollkeeper --disable-schemas-install --enable-release \ --with-vendor-build-id=ArchLinux make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR=${pkgdir} install install -m755 -d "${pkgdir}/usr/share/gconf/schemas" diff --git a/extra/f-spot/flickrnet-3.0.patch b/extra/f-spot/flickrnet-3.0.patch new file mode 100644 index 000000000..c79e3c442 --- /dev/null +++ b/extra/f-spot/flickrnet-3.0.patch @@ -0,0 +1,114 @@ +diff -Naur f-spot-0.8.2.orig/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs f-spot-0.8.2/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs +--- f-spot-0.8.2.orig/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs 2010-12-19 14:34:42.000000000 +0100 ++++ f-spot-0.8.2/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs 2011-11-28 14:23:08.000000000 +0100 +@@ -124,9 +124,9 @@ + do_export_flickr.Sensitive = true; + auth_flickr.Sensitive = true; + auth_label.Text = System.String.Format (Catalog.GetString ("Welcome {0} you are connected to {1}"), +- auth.User.Username, ++ auth.User.UserName, + current_service.Name); +- auth_flickr.Label = String.Format (Catalog.GetString ("Sign in as a different user"), auth.User.Username); ++ auth_flickr.Label = String.Format (Catalog.GetString ("Sign in as a different user"), auth.User.UserName); + used_bandwidth.Visible = !fr.Connection.PeopleGetUploadStatus().IsPro && + fr.Connection.PeopleGetUploadStatus().BandwidthMax > 0; + if (used_bandwidth.Visible) { +@@ -326,7 +326,7 @@ + progress_dialog.ProgressText = String.Format (Catalog.GetString ("Waiting for response {0} of {1}"), + photo_index, selection.Count); + } +- progress_dialog.Fraction = (photo_index - 1.0 + (args.Bytes / (double) info.Length)) / (double) selection.Count; ++ progress_dialog.Fraction = (photo_index - 1.0 + (args.BytesSent / (double) info.Length)) / (double) selection.Count; + } + + private class DateComparer : IComparer +@@ -370,7 +370,7 @@ + App.Instance.Database.Exports.Create ((photo as FSpot.Photo).Id, + (photo as FSpot.Photo).DefaultVersionId, + ExportStore.FlickrExportType, +- auth.User.UserId + ":" + auth.User.Username + ":" + current_service.Name + ":" + id); ++ auth.User.UserId + ":" + auth.User.UserName + ":" + current_service.Name + ":" + id); + + } catch (System.Exception e) { + progress_dialog.Message = String.Format (Catalog.GetString ("Error Uploading To {0}: {1}"), +@@ -393,7 +393,7 @@ + if (open && ids.Count != 0) { + string view_url; + if (current_service.Name == "Zooomr.com") +- view_url = string.Format ("http://www.{0}/photos/{1}/", current_service.Name, auth.User.Username); ++ view_url = string.Format ("http://www.{0}/photos/{1}/", current_service.Name, auth.User.UserName); + else { + view_url = string.Format ("http://www.{0}/tools/uploader_edit.gne?ids", current_service.Name); + bool first = true; +diff -Naur f-spot-0.8.2.orig/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrRemote.cs f-spot-0.8.2/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrRemote.cs +--- f-spot-0.8.2.orig/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrRemote.cs 2010-12-19 14:34:42.000000000 +0100 ++++ f-spot-0.8.2/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrRemote.cs 2011-11-28 15:42:01.000000000 +0100 +@@ -22,7 +22,7 @@ + + namespace FSpot.Exporters.Flickr { + public class FlickrRemote { +- public static Licenses licenses; ++ public static LicenseCollection licenses; + private string frob; + private string token; + private Auth auth; +@@ -62,28 +62,30 @@ + get { return flickr; } + } + +- public License[] GetLicenses () ++ public LicenseCollection GetLicenses () + { + // Licenses won't change normally in a user session + if (licenses == null) { + try { + licenses = flickr.PhotosLicensesGetInfo(); + } catch (FlickrNet.FlickrApiException e ) { +- Log.Error (e.Code + ": " + e.Verbose ); ++ Log.Error (e.Code + ": " + e.OriginalMessage ); + return null; + } + } +- return licenses.LicenseCollection; ++ return licenses; + } + + public ArrayList Search (string[] tags, int licenseId) + { + ArrayList photos_url = new ArrayList (); + // Photos photos = flickr.PhotosSearchText (tags, licenseId); +- Photos photos = flickr.PhotosSearch (tags); ++ PhotoSearchOptions options = new PhotoSearchOptions (); ++ options.Tags = string.Join(",", tags); ++ PhotoCollection photos = flickr.PhotosSearch (options); + + if (photos != null) { +- foreach (FlickrNet.Photo photo in photos.PhotoCollection) { ++ foreach (FlickrNet.Photo photo in photos) { + photos_url.Add (photo.ThumbnailUrl); + } + } +@@ -94,10 +96,12 @@ + public ArrayList Search (string tags, int licenseId) + { + ArrayList photos_url = new ArrayList (); +- Photos photos = flickr.PhotosSearchText (tags, licenseId); ++ PhotoSearchOptions options = new PhotoSearchOptions (); ++ options.Tags = tags; ++ PhotoCollection photos = flickr.PhotosSearch (options); + + if (photos != null) { +- foreach (FlickrNet.Photo photo in photos.PhotoCollection) { ++ foreach (FlickrNet.Photo photo in photos) { + photos_url.Add (photo.ThumbnailUrl); + } + } +@@ -126,7 +130,7 @@ + + return auth; + } catch (FlickrNet.FlickrApiException ex) { +- Log.Error ("Problems logging in to Flickr - " + ex.Verbose); ++ Log.Error ("Problems logging in to Flickr - " + ex.OriginalMessage); + return null; + } + } diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index cdbe94d39..424492fe1 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 143028 2011-11-21 05:59:12Z ibiru $ +# $Id: PKGBUILD 143841 2011-11-29 20:18:51Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtk3 pkgver=3.2.2 -pkgrel=2 +pkgrel=3 pkgdesc="GTK+ is a multi-platform toolkit (v3)" arch=('i686' 'x86_64') url="http://www.gtk.org/" @@ -15,14 +15,14 @@ backup=(etc/gtk-3.0/settings.ini) license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.2/gtk+-$pkgver.tar.xz settings.ini - fix_crash_treeview.patch) + filechooserdefault_do_not_unref_value_twice.patch) sha256sums=('f7ec82de393cd7ae2aa45022576400941704709d1f0f35fb0b17f3be1f2e7d84' 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621' - 'eb187ef05f3735b24b58cd4c533dc3d4f616103cafba399c009ea3eb519be0b9') + '0d6b04d5fc12b7c08e0cff4b94d001d5c167a944b72579fb14fd6de2ee4ad9e6') build() { cd "$srcdir/gtk+-$pkgver" - patch -Np1 -R -i "$srcdir/fix_crash_treeview.patch" + patch -Np1 -i "$srcdir/filechooserdefault_do_not_unref_value_twice.patch" CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/extra/gtk3/filechooserdefault_do_not_unref_value_twice.patch b/extra/gtk3/filechooserdefault_do_not_unref_value_twice.patch new file mode 100644 index 000000000..3a0f8320e --- /dev/null +++ b/extra/gtk3/filechooserdefault_do_not_unref_value_twice.patch @@ -0,0 +1,24 @@ +From aca43f43be3886f1a0befda0178ebb94ea2cf7b1 Mon Sep 17 00:00:00 2001 +From: Benjamin Otte <otte@redhat.com> +Date: Tue, 29 Nov 2011 19:39:21 +0000 +Subject: filechooserdefault: Don't unref value twice + +Double unref was introduced in eb02dacb370e8b4e6ef62328d0c09673b1234b32 + +https://bugzilla.gnome.org/show_bug.cgi?id=646461 +https://bugzilla.gnome.org/show_bug.cgi?id=664137 +--- +diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c +index e33b91e..a74aacc 100644 +--- a/gtk/gtkfilechooserdefault.c ++++ b/gtk/gtkfilechooserdefault.c +@@ -10127,7 +10127,6 @@ list_row_activated (GtkTreeView *tree_view, + if (is_folder && file) + { + change_folder_and_display_error (impl, file, FALSE); +- g_object_unref (file); + goto out; + } + +-- +cgit v0.9.0.2 diff --git a/extra/gutenprint/PKGBUILD b/extra/gutenprint/PKGBUILD index 602d12bb4..fa41c86b2 100644 --- a/extra/gutenprint/PKGBUILD +++ b/extra/gutenprint/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 123069 2011-05-07 23:28:40Z stephane $ +# $Id: PKGBUILD 143830 2011-11-29 16:30:26Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=gutenprint pkgver=5.2.7 -pkgrel=2 +pkgrel=3 pkgdesc="Top quality printer drivers for POSIX systems" arch=('i686' 'x86_64') license=('GPL') @@ -14,14 +14,16 @@ optdepends=('cups: to use cups printer spooler(recommended)' 'foomatic-db-engine: to use foomatic spooler' 'ghostscript: adds postscript support for ijsgutenprint' 'gimp: adds gutenprint plugin to gimp') -source=(http://downloads.sourceforge.net/gimp-print/$pkgname-$pkgver.tar.bz2) +source=(http://downloads.sourceforge.net/gimp-print/$pkgname-$pkgver.tar.bz2 buildfix.patch) url="http://gimp-print.sourceforge.net/" replaces=('gimp-print') options=('!libtool' '!emptydirs') -md5sums=('b19029972bf28f6efd693270daf8f5de') +md5sums=('b19029972bf28f6efd693270daf8f5de' + '2354cdecf1fbab32eca84266c8c72e7d') build() { cd ${srcdir}/${pkgname}-${pkgver} + patch -Np1 -i ${srcdir}/buildfix.patch ./configure --prefix=/usr --disable-samples --with-cups --with-gimp2 \ --disable-translated-cups-ppds --with-gimp2-as-gutenprint \ --disable-libgutenprintui --enable-libgutenprintui2 --disable-gtktest \ diff --git a/extra/gutenprint/buildfix.patch b/extra/gutenprint/buildfix.patch new file mode 100644 index 000000000..6b17a4029 --- /dev/null +++ b/extra/gutenprint/buildfix.patch @@ -0,0 +1,22 @@ +diff -up gutenprint-5.2.7/src/cups/commandtocanon.c.build gutenprint-5.2.7/src/cups/commandtocanon.c +--- gutenprint-5.2.7/src/cups/commandtocanon.c.build 2011-06-07 13:32:37.372042304 +0100 ++++ gutenprint-5.2.7/src/cups/commandtocanon.c 2011-06-07 13:32:41.270970750 +0100 +@@ -13,6 +13,7 @@ + + #include <cups/cups.h> + #include <ctype.h> ++#include <stdio.h> + #include <stdlib.h> + + +diff -up gutenprint-5.2.7/src/cups/commandtoepson.c.build gutenprint-5.2.7/src/cups/commandtoepson.c +--- gutenprint-5.2.7/src/cups/commandtoepson.c.build 2007-12-24 17:19:20.000000000 +0000 ++++ gutenprint-5.2.7/src/cups/commandtoepson.c 2011-06-07 13:32:35.656073794 +0100 +@@ -30,6 +30,7 @@ + + #include <cups/cups.h> + #include <ctype.h> ++#include <stdio.h> + #include <stdlib.h> + #include <string.h> + diff --git a/extra/iperf/PKGBUILD b/extra/iperf/PKGBUILD index e07fa4562..9cd6d49bd 100644 --- a/extra/iperf/PKGBUILD +++ b/extra/iperf/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 132026 2011-07-19 09:15:09Z giovanni $ +# $Id: PKGBUILD 143786 2011-11-29 11:18:28Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Dale Blount <dale@archlinux.org> pkgname=iperf pkgver=2.0.5 -pkgrel=2 +pkgrel=3 pkgdesc="A tool to measure maximum TCP bandwidth" arch=('i686' 'x86_64') license=('custom') url="http://iperf.sourceforge.net" depends=('gcc-libs') -source=(http://downloads.sourceforge.net/iperf/iperf-2.0.5.tar.gz - license - client.cpp.patch) +source=("http://downloads.sourceforge.net/iperf/iperf-2.0.5.tar.gz" + 'license' + 'client.cpp.patch') md5sums=('44b5536b67719f4250faed632a3cd016' 'a2879f900b76668b28a1cc922909db18' '82ce63c87cc8bb2f0f94069857ac14a9') diff --git a/extra/ivtv-utils/PKGBUILD b/extra/ivtv-utils/PKGBUILD index 57d810d9d..33e1cf1bc 100644 --- a/extra/ivtv-utils/PKGBUILD +++ b/extra/ivtv-utils/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 89079 2010-08-29 10:28:03Z thomas $ +# $Id: PKGBUILD 143788 2011-11-29 11:25:59Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Andrea Scarpino <bash.lnx@gmail.com> +# Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=ivtv-utils pkgver=1.4.1 -pkgrel=3 +pkgrel=4 pkgdesc="Userspace utilities for Hauppauge PVR cards" arch=('i686' 'x86_64') license=('GPL') url="http://ivtvdriver.org" -source=(http://dl.ivtvdriver.org/ivtv/stable/${pkgname}-${pkgver}.tar.gz - http://dl.ivtvdriver.org/ivtv/firmware/ivtv-firmware.tar.gz) +source=("http://dl.ivtvdriver.org/ivtv/stable/${pkgname}-${pkgver}.tar.gz" + "http://dl.ivtvdriver.org/ivtv/firmware/ivtv-firmware.tar.gz") depends=('gcc-libs') md5sums=('3a4219d698262ca2b28e41f0f547b0a2' 'b9a871f1c569025be9c48a77b3515faf') diff --git a/extra/lbreakout2/PKGBUILD b/extra/lbreakout2/PKGBUILD index 2744d3bd1..fa036bb63 100644 --- a/extra/lbreakout2/PKGBUILD +++ b/extra/lbreakout2/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 113510 2011-03-09 01:34:28Z giovanni $ +# $Id: PKGBUILD 143790 2011-11-29 11:41:15Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=lbreakout2 pkgver=2.6.3 -pkgrel=1 +pkgrel=2 pkgdesc="A breakout game with nice effects, graphics, and sounds" arch=('i686' 'x86_64') url="http://lgames.sourceforge.net" license=('GPL') depends=('sdl_mixer' 'libpng') backup=('var/games/lbreakout2/lbreakout2.hscr') -source=(http://downloads.sourceforge.net/lgames/${pkgname}-${pkgver/_/-}.tar.gz - lbreakout2.desktop - lbreakout2.png) +source=("http://downloads.sourceforge.net/lgames/${pkgname}-${pkgver/_/-}.tar.gz" + 'lbreakout2.desktop' + 'lbreakout2.png') md5sums=('43900187bc935475cd6489569cd2230a' '14cd34a72a8f4e3b8f385f9023625241' '94e2fa393eb2a7d4494641dec580573b') diff --git a/extra/lcab/PKGBUILD b/extra/lcab/PKGBUILD index bebea4c52..35252cdbb 100644 --- a/extra/lcab/PKGBUILD +++ b/extra/lcab/PKGBUILD @@ -1,21 +1,26 @@ -# $Id: PKGBUILD 68001 2010-02-10 12:31:34Z giovanni $ +# $Id: PKGBUILD 143792 2011-11-29 11:52:09Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=lcab pkgver=1.0b12 -pkgrel=2 +pkgrel=3 pkgdesc="A program to make Microsoft cabinet files" arch=('i686' 'x86_64') license=('GPL') url="http://freshmeat.net/projects/lcab/" depends=('glibc') -source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.gz) +source=("ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.gz") md5sums=('9403e08f53fcf262e25641a9b900d4de') build() { cd "${srcdir}/${pkgname}-${pkgver}" - make || return 1 - install -D -m755 lcab "${pkgdir}/usr/bin/lcab" || return 1 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + install -D -m755 lcab "${pkgdir}/usr/bin/lcab" } diff --git a/extra/libass/PKGBUILD b/extra/libass/PKGBUILD index a8bc64db7..ce99e9c8a 100644 --- a/extra/libass/PKGBUILD +++ b/extra/libass/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 140250 2011-10-10 22:45:12Z giovanni $ +# $Id: PKGBUILD 143794 2011-11-29 11:56:48Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de> pkgname=libass pkgver=0.10.0 -pkgrel=1 +pkgrel=2 pkgdesc="A portable library for SSA/ASS subtitles rendering" arch=('i686' 'x86_64') url="http://code.google.com/p/libass/" diff --git a/extra/libebml/PKGBUILD b/extra/libebml/PKGBUILD index 275dbc9c9..7302de3d0 100644 --- a/extra/libebml/PKGBUILD +++ b/extra/libebml/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 138665 2011-09-27 14:36:55Z giovanni $ +# $Id: PKGBUILD 143796 2011-11-29 12:02:45Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: 03/08/04 <lefungus@altern.org> pkgname=libebml pkgver=1.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="Extensible Binary Meta Language library" arch=('i686' 'x86_64') url="http://dl.matroska.org/downloads/libebml/" diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD index d6bc1f95d..1d9c20cb4 100644 --- a/extra/lighttpd/PKGBUILD +++ b/extra/lighttpd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 134666 2011-08-07 10:50:50Z pierre $ +# $Id: PKGBUILD 143810 2011-11-29 13:33:30Z stephane $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=lighttpd pkgver=1.4.29 -pkgrel=2 +pkgrel=3 pkgdesc='a secure, fast, compliant and very flexible web-server' license=('custom') arch=('i686' 'x86_64') @@ -17,8 +17,10 @@ optdepends=('libxml2: mod_webdav' backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd') options=('!libtool' 'emptydirs') source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2" + "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2.asc" 'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf') md5sums=('e6e67b09986cb504db630b5a86b2dd76' + 'de2afb4ed6a088fd7fa5f13c387a08f0' '268386e71f5748dc1d887b9a0ab65589' '913e2157fa78d990c32146f387d44c2b' 'acdaa94299e6299cb5085e6d88babeca') diff --git a/extra/mutt/PKGBUILD b/extra/mutt/PKGBUILD index 9a940857c..9b97bf170 100644 --- a/extra/mutt/PKGBUILD +++ b/extra/mutt/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 121107 2011-04-29 00:34:05Z stephane $ +# $Id: PKGBUILD 143812 2011-11-29 13:33:33Z stephane $ # Contributor: tobias [tobias [at] archlinux.org] # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=mutt pkgver=1.5.21 -pkgrel=5 +pkgrel=6 pkgdesc='Small but very powerful text-based mail client' url='http://www.mutt.org/' license=('GPL') backup=('etc/Muttrc') arch=('i686' 'x86_64') +optdepends=('smtp-forwarder: to send mail') depends=('gpgme' 'ncurses' 'openssl' 'libsasl' 'gdbm' 'libidn' 'mime-types' 'krb5') source=("ftp://ftp.mutt.org/mutt/devel/${pkgname}-${pkgver}.tar.gz") sha1sums=('a8475f2618ce5d5d33bff85c0affdf21ab1d76b9') diff --git a/extra/ocaml/PKGBUILD b/extra/ocaml/PKGBUILD index 97decbd24..7ba798ba7 100644 --- a/extra/ocaml/PKGBUILD +++ b/extra/ocaml/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 138196 2011-09-18 13:56:45Z tpowa $ +# $Id: PKGBUILD 143814 2011-11-29 13:33:35Z stephane $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgbase='ocaml' pkgname=('ocaml' 'ocaml-compiler-libs') pkgver=3.12.1 -pkgrel=2 +pkgrel=3 pkgdesc="A functional language with OO extensions" arch=('i686' 'x86_64') license=('LGPL2' 'custom: QPL-1.0') @@ -27,7 +27,7 @@ package_ocaml() { make PREFIX="${pkgdir}/usr" MANDIR="${pkgdir}/usr/share/man" install # Save >10MB with this one, makepkg only strips debug symbols. - #find ${startdir}/pkg/usr/lib -type f -name '*.so.*' -exec strip --strip-unneeded {} \; + #find "${pkgdir}/usr/lib" -type f -name '*.so.*' -exec strip --strip-unneeded {} \; # install license install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" @@ -50,4 +50,8 @@ optdepends=() cp utils/*.{cmi,cmo,cmx,ml,mli,o} "$compiler_libs"/utils # duplicated by installation rm -f "$compiler_libs"/typing/outcometree.{cmi,mli} + + # install license + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index bc1c8cbb1..81688e917 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 139482 2011-10-02 02:49:43Z eric $ +# $Id: PKGBUILD 143816 2011-11-29 13:33:39Z stephane $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -23,7 +23,7 @@ pkgname=('php' 'php-xsl') pkgver=5.3.8 _suhosinver=5.3.7-0.9.10 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') license=('PHP') url='http://www.php.net' @@ -33,10 +33,12 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2') source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz" + "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz.sig" 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch' 'logrotate.d.php-fpm') md5sums=('704cd414a0565d905e1074ffdc1fadfb' '08582e502fed8221c6577042ca45ddb8' + '5bf4473f658404aa9a97bf026ecef8e9' '65606c606df97a0760dfe5aaf9893afc' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' 'b01be5f816988fcee7e78225836e5e27' diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD index f90d8576f..d96900b36 100644 --- a/extra/python/PKGBUILD +++ b/extra/python/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 136999 2011-09-05 05:47:36Z allan $ +# $Id: PKGBUILD 143818 2011-11-29 13:33:44Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=python pkgver=3.2.2 -pkgrel=1 +pkgrel=2 _pybasever=3.2 pkgdesc="Next generation of the python high-level scripting language" arch=('i686' 'x86_64') @@ -17,8 +17,10 @@ optdepends=('tk: for tkinter' 'sqlite3') provides=('python3') replaces=('python3') options=('!makeflags') -source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz) -sha1sums=('5e654dbd48476193ccdef4d604ed4f45b48c6769') +source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz + gdbm-magic-values.patch) +sha1sums=('5e654dbd48476193ccdef4d604ed4f45b48c6769' + '43bfbe3e23360f412b95cb284ff29b2cbe338be9') build() { cd "${srcdir}/Python-${pkgver}" @@ -26,6 +28,10 @@ build() { # FS#23997 sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py + # gdbm has new magic that whichdb does not recognize + # http://bugs.python.org/issue13007 + patch -Np1 -i ../gdbm-magic-values.patch + # Ensure that we are using the system copy of various libraries (expat, zlib and libffi), # rather than copies shipped in the tarball rm -r Modules/expat @@ -40,6 +46,7 @@ build() { --with-valgrind \ --with-wide-unicode \ --with-system-expat \ + --with-dbmliborder=gdbm:ndbm \ --with-system-ffi make @@ -48,7 +55,7 @@ build() { check() { cd "${srcdir}/Python-${pkgver}" LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \ - "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_distutils test_site + "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_distutils test_site test_uuid } package() { diff --git a/extra/python/gdbm-magic-values.patch b/extra/python/gdbm-magic-values.patch new file mode 100644 index 000000000..e8ce828cf --- /dev/null +++ b/extra/python/gdbm-magic-values.patch @@ -0,0 +1,13 @@ +diff -up Python-3.2.2/Lib/dbm/__init__.py.gdbm-1.9-magic Python-3.2.2/Lib/dbm/__init__.py +--- Python-3.2.2/Lib/dbm/__init__.py.gdbm-1.9-magic 2011-09-03 12:16:40.000000000 -0400 ++++ Python-3.2.2/Lib/dbm/__init__.py 2011-09-30 15:47:27.488863694 -0400 +@@ -166,7 +166,7 @@ def whichdb(filename): + return "" + + # Check for GNU dbm +- if magic == 0x13579ace: ++ if magic in (0x13579ace, 0x13579acd, 0x13579acf): + return "dbm.gnu" + + # Later versions of Berkeley db hash file have a 12-byte pad in +diff -up Python-3.2.2/Misc/NEWS.gdbm-1.9-magic Python-3.2.2/Misc/NEWS diff --git a/extra/qrencode/PKGBUILD b/extra/qrencode/PKGBUILD index 54915dcd0..a57ce304e 100644 --- a/extra/qrencode/PKGBUILD +++ b/extra/qrencode/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 133485 2011-07-28 15:04:33Z andrea $ +# $Id: PKGBUILD 143784 2011-11-29 10:37:04Z bluewind $ # Maintainer: Florian Pritz< flo@xinu.at> # Contributor: Dany Martineau <dany.luc.martineau@gmail.com> pkgname=qrencode -pkgver=3.1.1 -pkgrel=2 +pkgver=3.2.0 +pkgrel=1 pkgdesc="C library for encoding data in a QR Code symbol." arch=(i686 x86_64) depends=('libpng>=1.4.0') @@ -12,13 +12,12 @@ makedepends=(sdl) url="http://megaui.net/fukuchi/works/qrencode/index.en.html" license=('GPL') options=(!libtool) -source=(http://megaui.net/fukuchi/works/${pkgname}/${pkgname}-${pkgver}.tar.bz2 libpng14.diff) -md5sums=('e7feb2c2c65d0f2f4010a14da3ecdb89' '93e87b2751b0d422a08e96ccaae4d082') +source=(http://megaui.net/fukuchi/works/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('7e90615eb314abcd2eb2eab5c8155b97') build() { cd "${srcdir}/$pkgname-$pkgver" - patch -p1 < "$srcdir/libpng14.diff" - autoreconf +# autoreconf ./autogen.sh ./configure --prefix=/usr make diff --git a/extra/raptor/PKGBUILD b/extra/raptor/PKGBUILD index 01bedf9e0..62a6a6e50 100644 --- a/extra/raptor/PKGBUILD +++ b/extra/raptor/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142784 2011-11-15 06:17:05Z andrea $ +# $Id: PKGBUILD 143845 2011-11-30 01:41:45Z eric $ # Maintainer: Andreas Radke <andyrtr at archlinux.org> # Contributor: eric <eric@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=raptor -pkgver=2.0.5 +pkgver=2.0.6 pkgrel=1 pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('curl>=7.22.0' 'libxslt>=1.1.26') license=('LGPL') options=('!libtool') source=("http://librdf.org/dist/source/raptor2-$pkgver.tar.gz") -md5sums=('ffa2aa82c83dbd5b1f77835348ed2c2a') +md5sums=('1f07af81cbe3cf1bf0d1d250b18d9f93') build() { cd "${srcdir}"/raptor2-${pkgver} diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD index 63b9c7194..760386762 100644 --- a/extra/ruby/PKGBUILD +++ b/extra/ruby/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 142306 2011-11-08 07:15:40Z angvp $ +# $Id: PKGBUILD 143822 2011-11-29 13:33:50Z stephane $ # Maintainer: # Contributor: Allan McRae <allan@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> @@ -7,7 +7,7 @@ pkgbase=ruby pkgname=('ruby' 'ruby-docs') pkgver=1.9.3_p0 -pkgrel=1 +pkgrel=2 pkgdesc="An object-oriented language for quick and easy programming" arch=('i686' 'x86_64') url="http://www.ruby-lang.org/en/" diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD index 8f8e8adbe..2cd85eb0d 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 130071 2011-07-01 21:53:41Z stephane $ +# $Id: PKGBUILD 143824 2011-11-29 13:33:54Z stephane $ # Maintainer: Paul Mattal <paul@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=subversion pkgver=1.6.17 -pkgrel=6 +pkgrel=7 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64') license=('apache' 'bsd') depends=('neon' 'apr-util' 'sqlite3') optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion') -makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'ruby' 'java-runtime' +makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'ruby' 'java-runtime' 'java-environment' 'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') url="http://subversion.apache.org/" diff --git a/extra/ypserv/PKGBUILD b/extra/ypserv/PKGBUILD index 598e8684b..a99ca0501 100644 --- a/extra/ypserv/PKGBUILD +++ b/extra/ypserv/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 136459 2011-08-29 19:26:01Z bisson $ +# $Id: PKGBUILD 143826 2011-11-29 13:33:57Z stephane $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=ypserv pkgver=2.26 -pkgrel=1 +pkgrel=3 pkgdesc='Linux NIS Server' arch=('i686' 'x86_64') url='http://www.linux-nis.org/nis/ypserv/' license=('GPL2') -depends=('gdbm' 'openslp') +depends=('gdbm' 'openslp' 'inetutils') backup=('etc/ypserv.conf' 'etc/netgroup' 'var/yp/securenets') source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${pkgname}-${pkgver}.tar.gz" \ 'yppasswd' diff --git a/extra/zsh/PKGBUILD b/extra/zsh/PKGBUILD index 027b192d2..352881046 100644 --- a/extra/zsh/PKGBUILD +++ b/extra/zsh/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 127893 2011-06-19 11:12:41Z pierre $ +# $Id: PKGBUILD 143828 2011-11-29 13:33:59Z stephane $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=zsh pkgver=4.3.12 -pkgrel=2 +pkgrel=3 pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX' arch=('i686' 'x86_64') url='http://www.zsh.org/' diff --git a/libre/lsb-release-libre/PKGBUILD b/libre/lsb-release-libre/PKGBUILD index 0f2457924..06521d21d 100644 --- a/libre/lsb-release-libre/PKGBUILD +++ b/libre/lsb-release-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgname=lsb-release pkgname=lsb-release-libre pkgver=1.4 -pkgrel=11 +pkgrel=10.1 pkgdesc="LSB version query program with Parabola name" arch=('any') url="http://www.linuxbase.org/" diff --git a/staging/avogadro/PKGBUILD b/staging/avogadro/PKGBUILD new file mode 100644 index 000000000..0b90bcbde --- /dev/null +++ b/staging/avogadro/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 143838 2011-11-29 20:05:21Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Nick B <Shirakawasuna at gmail _dot_com> + +pkgname=avogadro +pkgver=1.0.3 +pkgrel=4 +pkgdesc="An advanced molecular editor based on Qt" +arch=('i686' 'x86_64') +url="http://avogadro.openmolecules.net/wiki/Main_Page" +license=('GPL2') +depends=('eigen2' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 'python2-numpy') +makedepends=('cmake' 'boost') +install=avogadro.install +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'replace-qt4_automoc-with-qt4_wrap_cpp.patch' + 'fix-boost.patch') +md5sums=('92c2702c1980f70fb6d87a1a58147911' + 'aec516daab066c15326a9681f8f15abc' + '46282e4709429447e44a0a54d51ad2ec') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/replace-qt4_automoc-with-qt4_wrap_cpp.patch + patch -p1 -i "${srcdir}"/fix-boost.patch + + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 \ + -DQT_MKSPECS_RELATIVE=share/qt/mkspecs + make +} + +package() { + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/avogadro/avogadro.install b/staging/avogadro/avogadro.install new file mode 100644 index 000000000..2eaa60550 --- /dev/null +++ b/staging/avogadro/avogadro.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/staging/avogadro/fix-boost.patch b/staging/avogadro/fix-boost.patch new file mode 100644 index 000000000..8fb53ef12 --- /dev/null +++ b/staging/avogadro/fix-boost.patch @@ -0,0 +1,33 @@ +--- avogadro-1.0.3/libavogadro/src/CMakeLists.txt~ 2011-11-29 18:33:01.777291627 +0000 ++++ avogadro-1.0.3/libavogadro/src/CMakeLists.txt 2011-11-29 18:33:23.480814612 +0000 +@@ -149,7 +149,7 @@ + endforeach(P_ITEM ${PYTHON_SRCS}) + endif(NOT ENABLE_PYTHON OR NOT ALL_PYTHON_FOUND) + +-QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS}) ++QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) + + # you have to add link_directories before you add the target + if(ENABLE_PYTHON AND ALL_PYTHON_FOUND) +--- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt~ 2011-11-29 18:37:15.449506548 +0000 ++++ avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt 2011-11-29 18:37:52.729831744 +0000 +@@ -11,7 +11,7 @@ + # use all cpp files in this directory + FILE(GLOB wrapper_SRCS "*.cpp") + +-QT4_WRAP_CPP(MOC_SRCS moleculelist.h) ++QT4_WRAP_CPP(MOC_SRCS moleculelist.h OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) + + ADD_LIBRARY(python-module MODULE ${wrapper_SRCS} ${MOC_SRCS}) + SET_TARGET_PROPERTIES(python-module PROPERTIES OUTPUT_NAME Avogadro) +--- avogadro-1.0.3/libavogadro/CMakeLists.txt~ 2011-11-29 19:41:34.066938217 +0000 ++++ avogadro-1.0.3/libavogadro/CMakeLists.txt 2011-11-29 19:42:53.084320315 +0000 +@@ -18,7 +18,7 @@ + # Assume all MOC stuff is in the headers, replace .cpp and use qt4_wrap_cpp + # We should probably scan the header to verify the Q_OBJECT macro is used + string(REPLACE ".cpp" ".h" hdr_list "${src_list}") +- qt4_wrap_cpp(moc_files ${hdr_list}) ++ qt4_wrap_cpp(moc_files ${hdr_list} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) + # Now sort out the ui and qrc files, process them as appropriate + set(ui_plugin_files) + set(qrc_plugin_files) diff --git a/staging/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch b/staging/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch new file mode 100644 index 000000000..11f58a505 --- /dev/null +++ b/staging/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch @@ -0,0 +1,778 @@ +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/CMakeLists.txt avogadro-1.0.3-edit/libavogadro/src/CMakeLists.txt +--- avogadro-1.0.3/libavogadro/src/CMakeLists.txt 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/CMakeLists.txt 2011-11-29 18:49:58.520790652 +0100 +@@ -75,6 +75,42 @@ + zmatrix.h + ) + ++SET(libavogadro_MOC_HDRS ++ animation.h ++ atom.h ++ bond.h ++ color.h ++ colorbutton.h ++ colors/elementcolor.h ++ cube.h ++ elementdetail_p.h ++ elementtranslator.h ++ engine.h ++ engines/bsdyengine.h ++ extension.h ++ fragment.h ++ glwidget.h ++ mesh.h ++ molecule.h ++ moleculefile.h ++ moleculefile_p.h ++ periodictablescene_p.h ++ periodictableview.h ++ plotwidget.h ++ plugin.h ++ pluginmanager.h ++ primitive.h ++ protein.h ++ pythonengine_p.h ++ pythonerror.h ++ pythonextension_p.h ++ pythontool_p.h ++ residue.h ++ tool.h ++ toolgroup.h ++ zmatrix.h ++) ++ + set(libavogadro_SRCS ${libavogadro_SRCS} ${libavogadro_UIS}) + # Also add in the qtiocompressor class + #set(libavogadro_SRCS ${libavogadro_SRCS} ../qtiocompressor/qtiocompressor.cpp) +@@ -113,7 +148,7 @@ + endforeach(P_ITEM ${PYTHON_SRCS}) + endif(NOT ENABLE_PYTHON OR NOT ALL_PYTHON_FOUND) + +-qt4_automoc(${libavogadro_SRCS}) ++QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS}) + + # you have to add link_directories before you add the target + if(ENABLE_PYTHON AND ALL_PYTHON_FOUND) +@@ -149,7 +184,7 @@ + COMMAND ${CMAKE_COMMAND} -E ${header_cmd} "${from}" "${to}") + endforeach(headerFile ${libavogadro_HDRS}) + +-add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS}) ++add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_MOC_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS}) + set_target_properties(avogadro + PROPERTIES VERSION ${Avogadro_VERSION_FULL} SOVERSION 1 ) + target_link_libraries(avogadro ${AVO_LINK_LIBRARIES}) +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/animation.cpp avogadro-1.0.3-edit/libavogadro/src/animation.cpp +--- avogadro-1.0.3/libavogadro/src/animation.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/animation.cpp 2011-11-29 18:48:47.967839537 +0100 +@@ -224,5 +224,3 @@ + } + + } // end namespace Avogadro +- +-#include "animation.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/atom.cpp avogadro-1.0.3-edit/libavogadro/src/atom.cpp +--- avogadro-1.0.3/libavogadro/src/atom.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/atom.cpp 2011-11-29 18:48:39.561218412 +0100 +@@ -293,5 +293,3 @@ + } + + } // End namespace Avogadro +- +-#include "atom.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/bond.cpp avogadro-1.0.3-edit/libavogadro/src/bond.cpp +--- avogadro-1.0.3/libavogadro/src/bond.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/bond.cpp 2011-11-29 18:49:00.067773985 +0100 +@@ -166,5 +166,3 @@ + } + + } // End namespace Avogadro +- +-#include "bond.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/color.cpp avogadro-1.0.3-edit/libavogadro/src/color.cpp +--- avogadro-1.0.3/libavogadro/src/color.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/color.cpp 2011-11-29 18:49:05.207746140 +0100 +@@ -152,5 +152,3 @@ + return "Generic Color"; + } + } +- +-#include "color.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/colorbutton.cpp avogadro-1.0.3-edit/libavogadro/src/colorbutton.cpp +--- avogadro-1.0.3/libavogadro/src/colorbutton.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/colorbutton.cpp 2011-11-29 18:49:11.987709410 +0100 +@@ -94,5 +94,3 @@ + } + + } // end namespace +- +-#include "colorbutton.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/colors/elementcolor.cpp avogadro-1.0.3-edit/libavogadro/src/colors/elementcolor.cpp +--- avogadro-1.0.3/libavogadro/src/colors/elementcolor.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/colors/elementcolor.cpp 2011-11-29 18:50:11.077389292 +0100 +@@ -63,7 +63,5 @@ + + } + +-#include "elementcolor.moc" + //this is a static color plugin... + //Q_EXPORT_PLUGIN2(elementcolor, Avogadro::ElementColorFactory) +- +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/cube.cpp avogadro-1.0.3-edit/libavogadro/src/cube.cpp +--- avogadro-1.0.3/libavogadro/src/cube.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/cube.cpp 2011-11-29 18:50:26.357306516 +0100 +@@ -322,5 +322,3 @@ + } + + } // End namespace Avogadro +- +-#include "cube.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/elementdetail_p.cpp avogadro-1.0.3-edit/libavogadro/src/elementdetail_p.cpp +--- avogadro-1.0.3/libavogadro/src/elementdetail_p.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/elementdetail_p.cpp 2011-11-29 18:50:37.680578505 +0100 +@@ -132,5 +132,3 @@ + } + + } // End namespace Avogadro +- +-#include "elementdetail_p.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/elementtranslator.cpp avogadro-1.0.3-edit/libavogadro/src/elementtranslator.cpp +--- avogadro-1.0.3/libavogadro/src/elementtranslator.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/elementtranslator.cpp 2011-11-29 18:50:48.160521729 +0100 +@@ -401,5 +401,3 @@ + } + + } // End namespace Avogadro +- +-#include "elementtranslator.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/engine.cpp avogadro-1.0.3-edit/libavogadro/src/engine.cpp +--- avogadro-1.0.3/libavogadro/src/engine.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/engine.cpp 2011-11-29 18:50:54.397154610 +0100 +@@ -377,5 +377,3 @@ + return m_molecule->bonds(); + } + } +- +-#include "engine.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/engines/bsdyengine.cpp avogadro-1.0.3-edit/libavogadro/src/engines/bsdyengine.cpp +--- avogadro-1.0.3/libavogadro/src/engines/bsdyengine.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/engines/bsdyengine.cpp 2011-11-29 18:51:18.733689435 +0100 +@@ -442,7 +442,5 @@ + } + + } +- +-#include "bsdyengine.moc" + // This is a static engine... + // Q_EXPORT_PLUGIN2( bsdyengine, Avogadro::BSDYEngineFactory ) +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/extension.cpp avogadro-1.0.3-edit/libavogadro/src/extension.cpp +--- avogadro-1.0.3/libavogadro/src/extension.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/extension.cpp 2011-11-29 18:51:56.360152261 +0100 +@@ -80,5 +80,3 @@ + } + + } +- +-#include "extension.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/fragment.cpp avogadro-1.0.3-edit/libavogadro/src/fragment.cpp +--- avogadro-1.0.3/libavogadro/src/fragment.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/fragment.cpp 2011-11-29 18:52:01.906788880 +0100 +@@ -82,5 +82,3 @@ + } + + } // End namespace Avogadro +- +-#include "fragment.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/glwidget.cpp avogadro-1.0.3-edit/libavogadro/src/glwidget.cpp +--- avogadro-1.0.3/libavogadro/src/glwidget.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/glwidget.cpp 2011-11-29 18:52:14.346721486 +0100 +@@ -1966,5 +1966,3 @@ + d->updateCache = true; + } + } +- +-#include "glwidget.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/mesh.cpp avogadro-1.0.3-edit/libavogadro/src/mesh.cpp +--- avogadro-1.0.3/libavogadro/src/mesh.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/mesh.cpp 2011-11-29 18:52:23.033341093 +0100 +@@ -231,5 +231,3 @@ + } + + } // End namespace Avogadro +- +-#include "mesh.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/molecule.cpp avogadro-1.0.3-edit/libavogadro/src/molecule.cpp +--- avogadro-1.0.3/libavogadro/src/molecule.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/molecule.cpp 2011-11-29 18:52:33.573283993 +0100 +@@ -1575,5 +1575,3 @@ + } + + } // End namespace Avogadro +- +-#include "molecule.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/moleculefile.cpp avogadro-1.0.3-edit/libavogadro/src/moleculefile.cpp +--- avogadro-1.0.3/libavogadro/src/moleculefile.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/moleculefile.cpp 2011-11-29 18:56:26.728687548 +0100 +@@ -22,23 +22,14 @@ + 02110-1301, USA. + **********************************************************************/ + +-#include "moleculefile.h" ++#include "moleculefile_p.h" + + #include <avogadro/molecule.h> + +-#include <QFile> + #include <QFileInfo> +-#include <QStringList> +-#include <QThread> + #include <QDebug> + #include <QPointer> + +-#include <openbabel/mol.h> +-#include <openbabel/obconversion.h> +- +-// Included in obconversion.h +-//#include <iostream> +- + namespace Avogadro { + + using OpenBabel::OBConversion; +@@ -578,164 +569,6 @@ + return false; + } + +- class ReadFileThread : public QThread +- { +- // Q_OBJECT +- +- public: +- ReadFileThread(MoleculeFile *moleculeFile) : m_moleculeFile(moleculeFile) +- { +- } +- +- void addConformer(const OpenBabel::OBMol &conformer) +- { +- unsigned int numAtoms = conformer.NumAtoms(); +- std::vector<Eigen::Vector3d> *coords = new std::vector<Eigen::Vector3d>(numAtoms); +- for (unsigned int i = 0; i < numAtoms; ++i) +- coords->push_back(Eigen::Vector3d(conformer.GetAtom(i+1)->GetVector().AsArray())); +- m_moleculeFile->m_conformers.push_back(coords); +- } +- +- void detectConformers(unsigned int c, const OpenBabel::OBMol &first, const OpenBabel::OBMol ¤t) +- { +- if (!c) { +- // this is the first molecule read +- m_moleculeFile->setConformerFile(true); +- addConformer(current); +- return; +- } +- +- if (!m_moleculeFile->isConformerFile()) +- return; +- +- // as long as we are not sure if this really is a +- // conformer/trajectory file, add the conformers +- addConformer(current); +- +- // performance: check only certain molecule 1-10,20,50 +- switch (c) { +- case 1: +- case 2: +- case 3: +- case 4: +- case 5: +- case 6: +- case 7: +- case 8: +- case 9: +- case 10: +- case 20: +- case 50: +- break; +- default: +- return; +- } +- +- if (first.NumAtoms() != current.NumAtoms()) { +- m_moleculeFile->setConformerFile(false); +- m_moleculeFile->m_conformers.clear(); +- return; +- } +- +- for (unsigned int i = 0; i < first.NumAtoms(); ++i) { +- OpenBabel::OBAtom *firstAtom = first.GetAtom(i+1); +- OpenBabel::OBAtom *currentAtom = current.GetAtom(i+1); +- if (firstAtom->GetAtomicNum() != currentAtom->GetAtomicNum()) { +- m_moleculeFile->setConformerFile(false); +- m_moleculeFile->m_conformers.clear(); +- return; +- } +- } +- } +- +- void run() +- { +- // Check that the file can be read from disk +- if (!MoleculeFile::canOpen(m_moleculeFile->m_fileName, QFile::ReadOnly | QFile::Text)) { +- // Cannot read the file +- m_moleculeFile->m_error.append(QObject::tr("File %1 cannot be opened for reading.") +- .arg(m_moleculeFile->m_fileName)); +- return; +- } +- +- // Construct the OpenBabel objects, set the file type +- OpenBabel::OBConversion conv; +- OpenBabel::OBFormat *inFormat; +- if (!m_moleculeFile->m_fileType.isEmpty() && !conv.SetInFormat(m_moleculeFile->m_fileType.toAscii().data())) { +- // Input format not supported +- m_moleculeFile->m_error.append( +- QObject::tr("File type '%1' is not supported for reading.").arg(m_moleculeFile->m_fileType)); +- return; +- } else { +- inFormat = conv.FormatFromExt(m_moleculeFile->m_fileName.toAscii().data()); +- if (!inFormat || !conv.SetInFormat(inFormat)) { +- // Input format not supported +- m_moleculeFile->m_error.append(QObject::tr("File type for file '%1' is not supported for reading.") +- .arg(m_moleculeFile->m_fileName)); +- return; +- } +- } +- +- // set any options +- if (!m_moleculeFile->m_fileOptions.isEmpty()) { +- foreach(const QString &option, +- m_moleculeFile->m_fileOptions.split('\n', QString::SkipEmptyParts)) { +- conv.AddOption(option.toAscii().data(), OBConversion::INOPTIONS); +- } +- } +- +- // Now attempt to read the molecule in +- ifstream ifs; +- ifs.open(m_moleculeFile->m_fileName.toLocal8Bit()); // This handles utf8 file names etc +- if (!ifs) // Should not happen, already checked file could be opened +- return; +- +- // read all molecules +- OpenBabel::OBMol firstOBMol, currentOBMol; +- unsigned int c = 0; +- conv.SetInStream(&ifs); +- m_moleculeFile->streamposRef().push_back(ifs.tellg()); +- while (ifs.good() && conv.Read(¤tOBMol)) { +- if (!c) +- firstOBMol = currentOBMol; +- +- if (c > 20 && !m_moleculeFile->isConformerFile()) +- m_moleculeFile->setFirstReady(true); +- +- // detect conformer/trajectory files +- detectConformers(c, firstOBMol, currentOBMol); +- // store information about molecule +- m_moleculeFile->streamposRef().push_back(ifs.tellg()); +- m_moleculeFile->titlesRef().append(currentOBMol.GetTitle()); +- // increment count +- ++c; +- } +- m_moleculeFile->streamposRef().pop_back(); +- +- // signle molecule files are not conformer files +- if (c == 1) { +- m_moleculeFile->setConformerFile(false); +- m_moleculeFile->m_conformers.clear(); +- } +- +- // check for empty titles +- for (int i = 0; i < m_moleculeFile->titlesRef().size(); ++i) { +- if (!m_moleculeFile->titlesRef()[i].isEmpty()) +- continue; +- +- QString title; +- if (m_moleculeFile->isConformerFile()) +- title = tr("Conformer %1").arg(i+1); +- else +- title = tr("Molecule %1").arg(i+1); +- +- m_moleculeFile->titlesRef()[i] = title; +- } +- } +- +- MoleculeFile *m_moleculeFile; +- }; // end ReadFileThread class +- + MoleculeFile* MoleculeFile::readFile(const QString &fileName, + const QString &fileType, const QString &fileOptions, bool wait) + { +@@ -794,6 +627,3 @@ + } + + } // end namespace Avogadro +- +-#include "moleculefile.moc" +- +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/moleculefile_p.h avogadro-1.0.3-edit/libavogadro/src/moleculefile_p.h +--- avogadro-1.0.3/libavogadro/src/moleculefile_p.h 1970-01-01 01:00:00.000000000 +0100 ++++ avogadro-1.0.3-edit/libavogadro/src/moleculefile_p.h 2011-11-29 18:57:43.108273764 +0100 +@@ -0,0 +1,202 @@ ++/********************************************************************** ++ MoleculeFile - Class representing molecule file. ++ ++ Copyright (C) 2009 Marcus Hanwell, Tim Vandermeersch ++ ++ This file is part of the Avogadro molecular editor project. ++ For more information, see <http://avogadro.openmolecules.net/> ++ ++ Avogadro 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. ++ ++ Avogadro 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 this program; if not, write to the Free Software ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++ 02110-1301, USA. ++ **********************************************************************/ ++ ++#ifndef MOLECULEFILE_P_H ++#define MOLECULEFILE_P_H ++ ++#include "moleculefile.h" ++ ++#include <openbabel/mol.h> ++#include <openbabel/obconversion.h> ++ ++#include <QFile> ++#include <QStringList> ++#include <QThread> ++ ++namespace Avogadro { ++ ++ using OpenBabel::OBConversion; ++ using std::ifstream; ++ ++class ReadFileThread : public QThread ++{ ++ Q_OBJECT ++ ++ public: ++ ReadFileThread(MoleculeFile *moleculeFile) : m_moleculeFile(moleculeFile) ++ { ++ } ++ ++ void addConformer(const OpenBabel::OBMol &conformer) ++ { ++ unsigned int numAtoms = conformer.NumAtoms(); ++ std::vector<Eigen::Vector3d> *coords = new std::vector<Eigen::Vector3d>(numAtoms); ++ for (unsigned int i = 0; i < numAtoms; ++i) ++ coords->push_back(Eigen::Vector3d(conformer.GetAtom(i+1)->GetVector().AsArray())); ++ m_moleculeFile->m_conformers.push_back(coords); ++ } ++ ++ void detectConformers(unsigned int c, const OpenBabel::OBMol &first, const OpenBabel::OBMol ¤t) ++ { ++ if (!c) { ++ // this is the first molecule read ++ m_moleculeFile->setConformerFile(true); ++ addConformer(current); ++ return; ++ } ++ ++ if (!m_moleculeFile->isConformerFile()) ++ return; ++ ++ // as long as we are not sure if this really is a ++ // conformer/trajectory file, add the conformers ++ addConformer(current); ++ ++ // performance: check only certain molecule 1-10,20,50 ++ switch (c) { ++ case 1: ++ case 2: ++ case 3: ++ case 4: ++ case 5: ++ case 6: ++ case 7: ++ case 8: ++ case 9: ++ case 10: ++ case 20: ++ case 50: ++ break; ++ default: ++ return; ++ } ++ ++ if (first.NumAtoms() != current.NumAtoms()) { ++ m_moleculeFile->setConformerFile(false); ++ m_moleculeFile->m_conformers.clear(); ++ return; ++ } ++ ++ for (unsigned int i = 0; i < first.NumAtoms(); ++i) { ++ OpenBabel::OBAtom *firstAtom = first.GetAtom(i+1); ++ OpenBabel::OBAtom *currentAtom = current.GetAtom(i+1); ++ if (firstAtom->GetAtomicNum() != currentAtom->GetAtomicNum()) { ++ m_moleculeFile->setConformerFile(false); ++ m_moleculeFile->m_conformers.clear(); ++ return; ++ } ++ } ++ } ++ ++ void run() ++ { ++ // Check that the file can be read from disk ++ if (!MoleculeFile::canOpen(m_moleculeFile->m_fileName, QFile::ReadOnly | QFile::Text)) { ++ // Cannot read the file ++ m_moleculeFile->m_error.append(QObject::tr("File %1 cannot be opened for reading.") ++ .arg(m_moleculeFile->m_fileName)); ++ return; ++ } ++ ++ // Construct the OpenBabel objects, set the file type ++ OpenBabel::OBConversion conv; ++ OpenBabel::OBFormat *inFormat; ++ if (!m_moleculeFile->m_fileType.isEmpty() && !conv.SetInFormat(m_moleculeFile->m_fileType.toAscii().data())) { ++ // Input format not supported ++ m_moleculeFile->m_error.append( ++ QObject::tr("File type '%1' is not supported for reading.").arg(m_moleculeFile->m_fileType)); ++ return; ++ } else { ++ inFormat = conv.FormatFromExt(m_moleculeFile->m_fileName.toAscii().data()); ++ if (!inFormat || !conv.SetInFormat(inFormat)) { ++ // Input format not supported ++ m_moleculeFile->m_error.append(QObject::tr("File type for file '%1' is not supported for reading.") ++ .arg(m_moleculeFile->m_fileName)); ++ return; ++ } ++ } ++ ++ // set any options ++ if (!m_moleculeFile->m_fileOptions.isEmpty()) { ++ foreach(const QString &option, ++ m_moleculeFile->m_fileOptions.split('\n', QString::SkipEmptyParts)) { ++ conv.AddOption(option.toAscii().data(), OBConversion::INOPTIONS); ++ } ++ } ++ ++ // Now attempt to read the molecule in ++ ifstream ifs; ++ ifs.open(m_moleculeFile->m_fileName.toLocal8Bit()); // This handles utf8 file names etc ++ if (!ifs) // Should not happen, already checked file could be opened ++ return; ++ ++ // read all molecules ++ OpenBabel::OBMol firstOBMol, currentOBMol; ++ unsigned int c = 0; ++ conv.SetInStream(&ifs); ++ m_moleculeFile->streamposRef().push_back(ifs.tellg()); ++ while (ifs.good() && conv.Read(¤tOBMol)) { ++ if (!c) ++ firstOBMol = currentOBMol; ++ ++ if (c > 20 && !m_moleculeFile->isConformerFile()) ++ m_moleculeFile->setFirstReady(true); ++ ++ // detect conformer/trajectory files ++ detectConformers(c, firstOBMol, currentOBMol); ++ // store information about molecule ++ m_moleculeFile->streamposRef().push_back(ifs.tellg()); ++ m_moleculeFile->titlesRef().append(currentOBMol.GetTitle()); ++ // increment count ++ ++c; ++ } ++ m_moleculeFile->streamposRef().pop_back(); ++ ++ // signle molecule files are not conformer files ++ if (c == 1) { ++ m_moleculeFile->setConformerFile(false); ++ m_moleculeFile->m_conformers.clear(); ++ } ++ ++ // check for empty titles ++ for (int i = 0; i < m_moleculeFile->titlesRef().size(); ++i) { ++ if (!m_moleculeFile->titlesRef()[i].isEmpty()) ++ continue; ++ ++ QString title; ++ if (m_moleculeFile->isConformerFile()) ++ title = tr("Conformer %1").arg(i+1); ++ else ++ title = tr("Molecule %1").arg(i+1); ++ ++ m_moleculeFile->titlesRef()[i] = title; ++ } ++ } ++ ++ MoleculeFile *m_moleculeFile; ++}; ++ ++} // end namespace Avogadro ++ ++#endif // MOLECULEFILE_P_H +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/periodictablescene_p.cpp avogadro-1.0.3-edit/libavogadro/src/periodictablescene_p.cpp +--- avogadro-1.0.3/libavogadro/src/periodictablescene_p.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/periodictablescene_p.cpp 2011-11-29 18:52:50.259860261 +0100 +@@ -213,5 +213,3 @@ + } + + } // End namespace Avogadro +- +-#include "periodictablescene_p.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/periodictableview.cpp avogadro-1.0.3-edit/libavogadro/src/periodictableview.cpp +--- avogadro-1.0.3/libavogadro/src/periodictableview.cpp 2011-11-29 19:30:25.130970122 +0000 ++++ avogadro-1.0.3-edit/libavogadro/src/periodictableview.cpp 2011-11-29 18:52:50.259860261 +0100 +@@ -69,4 +69,3 @@ + + } // End namespace Avogadro + +-#include "periodictableview.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/plotwidget.cpp avogadro-1.0.3-edit/libavogadro/src/plotwidget.cpp +--- avogadro-1.0.3/libavogadro/src/plotwidget.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/plotwidget.cpp 2011-11-29 18:53:09.389756626 +0100 +@@ -27,7 +27,6 @@ + **********************************************************************/ + + #include "plotwidget.h" +-#include "plotwidget.moc" + + #include <math.h> + #include <QDebug> +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/plugin.cpp avogadro-1.0.3-edit/libavogadro/src/plugin.cpp +--- avogadro-1.0.3/libavogadro/src/plugin.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/plugin.cpp 2011-11-29 18:53:16.016387394 +0100 +@@ -65,5 +65,3 @@ + } + + } // end namespace Avogadro +- +-#include "plugin.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pluginmanager.cpp avogadro-1.0.3-edit/libavogadro/src/pluginmanager.cpp +--- avogadro-1.0.3/libavogadro/src/pluginmanager.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/pluginmanager.cpp 2011-11-29 18:53:23.569679807 +0100 +@@ -784,5 +784,3 @@ + } + + } +- +-#include "pluginmanager.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/primitive.cpp avogadro-1.0.3-edit/libavogadro/src/primitive.cpp +--- avogadro-1.0.3/libavogadro/src/primitive.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/primitive.cpp 2011-11-29 18:53:29.139649631 +0100 +@@ -77,5 +77,3 @@ + } + + } +- +-#include "primitive.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/protein.cpp avogadro-1.0.3-edit/libavogadro/src/protein.cpp +--- avogadro-1.0.3/libavogadro/src/protein.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/protein.cpp 2011-11-29 18:53:37.952935219 +0100 +@@ -978,5 +978,3 @@ + } + + } // End namespace Avogadro +- +-#include "protein.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt avogadro-1.0.3-edit/libavogadro/src/python/CMakeLists.txt +--- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/python/CMakeLists.txt 2011-11-29 18:58:02.354836165 +0100 +@@ -11,9 +11,9 @@ + # use all cpp files in this directory + FILE(GLOB wrapper_SRCS "*.cpp") + +-qt4_automoc(moleculelist.cpp) ++QT4_WRAP_CPP(MOC_SRCS moleculelist.h) + +-ADD_LIBRARY(python-module MODULE ${wrapper_SRCS}) ++ADD_LIBRARY(python-module MODULE ${wrapper_SRCS} ${MOC_SRCS}) + SET_TARGET_PROPERTIES(python-module PROPERTIES OUTPUT_NAME Avogadro) + SET_TARGET_PROPERTIES(python-module PROPERTIES PREFIX "") + if (WIN32) +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/python/moleculelist.cpp avogadro-1.0.3-edit/libavogadro/src/python/moleculelist.cpp +--- avogadro-1.0.3/libavogadro/src/python/moleculelist.cpp 2011-11-29 19:26:07.562214311 +0100 ++++ avogadro-1.0.3-edit/libavogadro/src/python/moleculelist.cpp 2011-11-29 19:26:14.538843182 +0100 +@@ -70,4 +70,3 @@ + + } + +-#include "moleculelist.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonengine_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythonengine_p.cpp +--- avogadro-1.0.3/libavogadro/src/pythonengine_p.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/pythonengine_p.cpp 2011-11-29 18:53:45.492894371 +0100 +@@ -289,5 +289,3 @@ + + + } +- +-#include "pythonengine_p.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonerror.cpp avogadro-1.0.3-edit/libavogadro/src/pythonerror.cpp +--- avogadro-1.0.3/libavogadro/src/pythonerror.cpp 2011-11-29 19:24:26.949426045 +0100 ++++ avogadro-1.0.3-edit/libavogadro/src/pythonerror.cpp 2011-11-29 19:24:41.176015640 +0100 +@@ -112,4 +112,3 @@ + + } // namespace + +-#include "pythonerror.moc" + +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonextension_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythonextension_p.cpp +--- avogadro-1.0.3/libavogadro/src/pythonextension_p.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/pythonextension_p.cpp 2011-11-29 18:53:54.082847836 +0100 +@@ -340,5 +340,3 @@ + } + + } +- +-#include "pythonextension_p.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythontool_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythontool_p.cpp +--- avogadro-1.0.3/libavogadro/src/pythontool_p.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/pythontool_p.cpp 2011-11-29 18:54:02.269470152 +0100 +@@ -344,5 +344,3 @@ + } + + } +- +-#include "pythontool_p.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/residue.cpp avogadro-1.0.3-edit/libavogadro/src/residue.cpp +--- avogadro-1.0.3/libavogadro/src/residue.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/residue.cpp 2011-11-29 18:54:14.316071557 +0100 +@@ -160,6 +160,3 @@ + } + + } // End namespace Avogadro +- +- #include "residue.moc" +- +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/tool.cpp avogadro-1.0.3-edit/libavogadro/src/tool.cpp +--- avogadro-1.0.3/libavogadro/src/tool.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/tool.cpp 2011-11-29 18:55:05.515794184 +0100 +@@ -117,5 +117,3 @@ + } + + } // end namespace Avogadro +- +-#include "tool.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/toolgroup.cpp avogadro-1.0.3-edit/libavogadro/src/toolgroup.cpp +--- avogadro-1.0.3/libavogadro/src/toolgroup.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/toolgroup.cpp 2011-11-29 18:55:11.699094018 +0100 +@@ -206,5 +206,3 @@ + } + + } // end namespace Avogadro +- +-#include "toolgroup.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/zmatrix.cpp avogadro-1.0.3-edit/libavogadro/src/zmatrix.cpp +--- avogadro-1.0.3/libavogadro/src/zmatrix.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/zmatrix.cpp 2011-11-29 18:55:17.209064168 +0100 +@@ -149,5 +149,3 @@ + + + } // End namespace Avogadro +- +-#include "zmatrix.moc" diff --git a/staging/mkvtoolnix/PKGBUILD b/staging/mkvtoolnix/PKGBUILD index 94300cb62..87a5a5633 100644 --- a/staging/mkvtoolnix/PKGBUILD +++ b/staging/mkvtoolnix/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 143592 2011-11-26 22:32:50Z giovanni $ +# $Id: PKGBUILD 143843 2011-11-29 22:35:31Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgbase=mkvtoolnix pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk') pkgver=5.0.1 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') license=('GPL') url="http://www.bunkus.org/videotools/mkvtoolnix/index.html" @@ -26,6 +26,13 @@ build() { autoreconf ./configure --prefix=/usr \ + --with-boost-libdir=/usr/lib \ + --disable-gui + rake + + mv src/mkvinfo{,-cli} + + ./configure --prefix=/usr \ --with-boost-libdir=/usr/lib rake } @@ -40,6 +47,9 @@ package_mkvtoolnix-cli() { cd "${srcdir}/${pkgbase}-${pkgver}" rake DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}"/usr/bin/mkvinfo + install -Dm755 src/mkvinfo-cli "${pkgdir}"/usr/bin/mkvinfo + rm -rf "${pkgdir}"/usr/bin/mmg rm -rf "${pkgdir}"/usr/share/man/ja/man1/mmg.1 rm -rf "${pkgdir}"/usr/share/man/man1/mmg.1 @@ -59,6 +69,9 @@ package_mkvtoolnix-gtk() { rake DESTDIR="${pkgdir}" install rm -rf "${pkgdir}"/usr/bin/mkv* + install -Dm755 src/mkvinfo "${pkgdir}"/usr/bin/mkvinfo-gtk + sed -ri 's/^(Exec=mkvinfo)/\1-gtk/' "${pkgdir}"/usr/share/applications/mkvinfo.desktop + rm -rf "${pkgdir}"/usr/share/doc rm -rf "${pkgdir}"/usr/share/locale rm -rf "${pkgdir}"/usr/share/man/ja/man1/mkv* |