From 380530d02a5449fdef97b63b394a6743c3de0092 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 16 Jul 2013 01:17:00 -0700 Subject: Tue Jul 16 01:16:20 PDT 2013 --- libre/linux-libre/PKGBUILD | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) (limited to 'libre/linux-libre/PKGBUILD') diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 78293fad3..9c0090083 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189197 2013-06-29 09:29:53Z tpowa $ +# $Id: PKGBUILD 190068 2013-07-14 09:54:17Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): André Silva @@ -9,11 +9,11 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name -_basekernel=3.9 -_sublevel=9 +_basekernel=3.10 +_sublevel=1 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.0 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -30,18 +30,18 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") -md5sums=('120df29f88622dabf7015a22c7cc8e25' - 'e143fc381f4d2fdfc18686b867a5e6a5' - '5bb868d38a27edafac1eb114cd2f3659' - 'c180de34b0450d7eef8e0c1a68433d7c' +md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' + '5561eca43f9b46ad5a341b0cf59f3226' + '542fc77350e62009bca7af080359b286' + 'bd77b7112db61fb184139daaa1e390ac' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - '30092ce96affb12f89a9eddfad966741') + '536d322b78a2bde29c0b49b577d8a43a') if [ "$CARCH" != "mips64el" ]; then - # Don't use the Loongson-specific patches on non-mips64el arches. + # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] unset md5sums[${#md5sums[@]}-1] fi @@ -56,7 +56,7 @@ prepare() { patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" fi - # Add freedo as boot logo + # add freedo as boot logo patch -Np1 -i "${srcdir}/boot-logo.patch" # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) @@ -72,10 +72,10 @@ prepare() { patch -Np1 -i ${srcdir}/${_basekernel}*-*-loongson-community.patch patch -Np0 -i lxo-config.patch -# ensure N32, add localversion, remove uevent helper as per -# https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README -# and make USB storage support builtin (e.g. for booting from USB -# disks without slowly loading an initramfs) + # ensure N32, add localversion, remove uevent helper as per + # https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README + # and make USB storage support builtin (e.g. for booting from USB + # disks without slowly loading an initramfs) sed -ri \ -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \ -e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \ @@ -151,6 +151,11 @@ _package() { replaces=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}") backup=("etc/mkinitcpio.d/${pkgbase}.preset") install=${pkgbase}.install + if [ "$CARCH" != "mips64el" ]; then + provides+=('linux-libre-kmod-alx') + conflicts+=('linux-libre-kmod-alx') + replaces+=('linux-libre-kmod-alx') + fi if [ "$CARCH" = "mips64el" ]; then optdepends+=('mkinitcpio: to make the initramfs (needs reinstall of this package)') conflicts+=('mkinitcpio<0.7') @@ -198,7 +203,7 @@ _package() { -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgbase}-fallback.img\"|" \ -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" -# mkinitcpio 0.7 relies on bzImage to find the kernel version + # mkinitcpio 0.7 relies on bzImage to find the kernel version if [ "$CARCH" == "mips64el" ]; then sed -e "s|ALL_kver=.*|ALL_kver=\"${_kernver}\"|" \ -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" @@ -232,7 +237,7 @@ _package-headers() { KARCH=x86 [ $CARCH = "mips64el" ] && KARCH=mips -# In case of repackaging this is empty + # in case of repackaging this is empty if [ -z "${_kernver}" ]; then cd "${srcdir}/linux-${_basekernel}" _kernver="$(make LOCALVERSION= kernelrelease)" @@ -375,7 +380,7 @@ _package-headers() { done # remove unneeded architectures - rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arc,arm,arm26,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa} + rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arc,arm,arm26,arm64,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa} if [ "$CARCH" = "mips64el" ]; then rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/x86 else -- cgit v1.2.3-54-g00ecf From 113b1085958460c3c47be9d93c1b851f60d5d662 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 23 Jul 2013 01:23:27 -0700 Subject: Tue Jul 23 01:22:55 PDT 2013 --- community/arm-elf-binutils/PKGBUILD | 54 ------ community/arm-elf-gcc-base/PKGBUILD | 61 ------- community/gimp-refocus/PKGBUILD | 4 +- community/gimp-refocus/refocus-gimp-2.0.patch | 2 +- community/glusterfs/PKGBUILD | 12 +- community/guvcview/PKGBUILD | 8 +- community/id3lib-rcc/PKGBUILD | 43 ----- community/id3lib-rcc/arch.patch | 39 ----- community/id3lib-rcc/id3lib-gcc4.patch | 189 --------------------- community/meterbridge/PKGBUILD | 36 ++++ community/myodbc/PKGBUILD | 8 +- community/oath-toolkit/PKGBUILD | 6 +- community/pcmanfm/PKGBUILD | 6 +- community/php-mongo/PKGBUILD | 7 +- community/poedit/PKGBUILD | 6 +- community/rusxmms/PKGBUILD | 63 ------- community/scribus/PKGBUILD | 49 ++++++ community/scribus/install | 11 ++ community/taglib-rcc/PKGBUILD | 38 ----- community/tigervnc/PKGBUILD | 31 ++-- community/tigervnc/gethomedir.patch | 20 +++ community/tigervnc/getmaster.patch | 96 +++++++++++ community/tigervnc/vncviewer.desktop | 2 +- community/tigervnc/xserver114.patch | 84 --------- community/xcircuit/PKGBUILD | 6 +- extra/a2ps/PKGBUILD | 42 ++--- extra/ardour/PKGBUILD | 7 +- extra/ardour/ardour.install | 5 +- extra/cln/PKGBUILD | 16 +- extra/glib/PKGBUILD | 43 +++-- extra/glib/glib1-autotools.patch | 33 ++++ extra/gnet/PKGBUILD | 11 +- extra/gtk/PKGBUILD | 33 ++-- extra/idnkit/PKGBUILD | 16 +- extra/libxfont/PKGBUILD | 6 +- extra/loudmouth/07-glib-single-include.patch | 17 ++ extra/loudmouth/08-fix-ipv6-connect.patch | 28 +++ extra/loudmouth/PKGBUILD | 27 ++- extra/nedit/PKGBUILD | 20 +-- extra/rosegarden/PKGBUILD | 7 +- extra/scribus/PKGBUILD | 49 ------ extra/scribus/install | 11 -- kernels/linux-libre-pae/PKGBUILD | 6 +- kernels/linux-libre-xen/PKGBUILD | 6 +- libre/linux-libre/PKGBUILD | 10 +- libre/xscreensaver-libre/PKGBUILD | 33 ++-- libre/xscreensaver-libre/add-electricsheep.diff | 12 -- .../xscreensaver-add-electricsheep.diff | 10 ++ libre/xscreensaver-libre/xscreensaver.pam | 1 - pcr/command-not-found/PKGBUILD | 47 ++--- pcr/command-not-found/install | 3 +- pcr/etckeeper/PKGBUILD | 33 ++-- 52 files changed, 542 insertions(+), 871 deletions(-) delete mode 100644 community/arm-elf-binutils/PKGBUILD delete mode 100644 community/arm-elf-gcc-base/PKGBUILD delete mode 100644 community/id3lib-rcc/PKGBUILD delete mode 100644 community/id3lib-rcc/arch.patch delete mode 100644 community/id3lib-rcc/id3lib-gcc4.patch create mode 100644 community/meterbridge/PKGBUILD delete mode 100644 community/rusxmms/PKGBUILD create mode 100644 community/scribus/PKGBUILD create mode 100644 community/scribus/install delete mode 100644 community/taglib-rcc/PKGBUILD create mode 100644 community/tigervnc/gethomedir.patch create mode 100644 community/tigervnc/getmaster.patch delete mode 100644 community/tigervnc/xserver114.patch create mode 100644 extra/glib/glib1-autotools.patch create mode 100644 extra/loudmouth/07-glib-single-include.patch create mode 100644 extra/loudmouth/08-fix-ipv6-connect.patch delete mode 100644 extra/scribus/PKGBUILD delete mode 100644 extra/scribus/install delete mode 100644 libre/xscreensaver-libre/add-electricsheep.diff create mode 100644 libre/xscreensaver-libre/xscreensaver-add-electricsheep.diff delete mode 100644 libre/xscreensaver-libre/xscreensaver.pam (limited to 'libre/linux-libre/PKGBUILD') diff --git a/community/arm-elf-binutils/PKGBUILD b/community/arm-elf-binutils/PKGBUILD deleted file mode 100644 index 15768e09e..000000000 --- a/community/arm-elf-binutils/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# $Id: PKGBUILD 79080 2012-10-30 09:53:07Z spupykin $ -# Maintainer: Sergej Pupykin - -pkgname=arm-elf-binutils -pkgver=2.23 -pkgrel=1 -_xprefix=/usr -pkgdesc="A set of programs to assemble and manipulate binary and object files" -arch=(i686 x86_64) -license=(GPL) -options=(!libtool) -url="http://sources.redhat.com/binutils" -depends=('glibc' 'zlib') -source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.gz) -md5sums=('ed58f50d8920c3f1d9cb110d5c972c27') - -build() { - cd $srcdir/binutils-${pkgver} - - [ $NOEXTRACT -eq 1 ] || ./configure --prefix=${_xprefix} \ - --program-prefix=arm-elf- \ - --enable-shared \ - --disable-multilib \ - --with-lib-path=${_xprefix}/lib/binutils/arm-elf \ - --disable-nls \ - --target=arm-elf \ - --host=$CHOST \ - --build=$CHOST \ - --with-sysroot=/usr/$CHOST/arm-elf \ -# --with-build-sysroot=/usr/i686-pc-linux-gnu/arm-elf/ - -# mkdir -p $pkgdir/${_xprefix}/lib/binutils -# sed -i 's|know (S_GET_VALUE (frag->tc_frag_data.last_map) < S_GET_VALUE (symbolP));|{know (S_GET_VALUE (frag->tc_frag_data.last_map) < S_GET_VALUE (symbolP));}|' gas/config/tc-arm.c - - make configure-host - make tooldir=$pkgdir/${_xprefix} - make prefix=$pkgdir/${_xprefix} tooldir=$pkgdir/${_xprefix} install - - mkdir -p $pkgdir/${_xprefix}/lib/binutils/arm-elf - cp -v include/libiberty.h $pkgdir/${_xprefix}/lib/binutils/arm-elf - - rm -f $pkgdir/${_xprefix}/man/man1/{dlltool,nlmconv,windres}* - - rm -f $pkgdir/usr/bin/ar - rm -f $pkgdir/usr/bin/as - rm -f $pkgdir/usr/bin/ld - rm -f $pkgdir/usr/bin/nm - rm -f $pkgdir/usr/bin/objdump - rm -f $pkgdir/usr/bin/ranlib - rm -f $pkgdir/usr/bin/strip - rm -f $pkgdir/usr/bin/objcopy - rm -f $pkgdir/usr/lib/libiberty.a - rm -rf $pkgdir/usr/share -} diff --git a/community/arm-elf-gcc-base/PKGBUILD b/community/arm-elf-gcc-base/PKGBUILD deleted file mode 100644 index 5627f8c6e..000000000 --- a/community/arm-elf-gcc-base/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# $Id: PKGBUILD 82198 2013-01-11 12:12:37Z spupykin $ -# Maintainer: Sergej Pupykin - -pkgname=arm-elf-gcc-base -pkgver=4.7.2 -pkgrel=1 -pkgdesc="The GNU Compiler Collection" -arch=(i686 x86_64) -license=('GPL' 'LGPL') -url="http://gcc.gnu.org" -depends=('arm-elf-binutils' 'libmpc' 'libelf') -options=(!libtool !emptydirs zipman docs !strip) -source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2) -md5sums=('cc308a0891e778cfda7a151ab8a6e762') - -build() { - cd $srcdir/gcc-$pkgver - - export CFLAGS="-O2 -pipe" - export CXXFLAGS="-O2 -pipe" - - rm -rf build - mkdir build - cd build - - ../configure --prefix=/usr \ - --target=arm-elf \ - --enable-obsolete \ - --host=$CHOST \ - --build=$CHOST \ - --enable-shared --disable-nls --enable-languages=c --enable-multilib \ - --with-local-prefix=/usr/lib/arm-elf \ - --with-as=/usr/bin/arm-elf-as --with-ld=/usr/bin/arm-elf-ld \ - --enable-softfloat \ - --with-float=soft \ - --with-newlib \ - --with-sysroot=/usr/$CHOST/arm-elf - - make all-gcc all-target-libgcc -} - -package() { - cd $srcdir/gcc-$pkgver/build - - export CFLAGS="-O2 -pipe" - export CXXFLAGS="-O2 -pipe" - - make DESTDIR=$pkgdir install-gcc install-target-libgcc - - rm -f $pkgdir/usr/share/man/man7/fsf-funding.7* - rm -f $pkgdir/usr/share/man/man7/gfdl.7* - rm -f $pkgdir/usr/share/man/man7/gpl.7* - rm -rf $pkgdir/usr/share/info - - cp -r $pkgdir/usr/libexec/* $pkgdir/usr/lib/ - rm -rf $pkgdir/usr/libexec - - # strip it manually - strip $pkgdir/usr/bin/* 2>/dev/null || true - find $pkgdir/usr/lib -type f -exec arm-elf-strip --strip-debug --strip-unneeded {} \; 2>/dev/null || true -} diff --git a/community/gimp-refocus/PKGBUILD b/community/gimp-refocus/PKGBUILD index 5cc3b5703..28a68328a 100644 --- a/community/gimp-refocus/PKGBUILD +++ b/community/gimp-refocus/PKGBUILD @@ -4,7 +4,7 @@ pkgname=gimp-refocus pkgver=0.9.0 -pkgrel=3 +pkgrel=4 pkgdesc="A sharpen plugin for gimp using FIR Wiener filtering" arch=('i686' 'x86_64') url="http://refocus.sourceforge.net/" @@ -13,7 +13,7 @@ depends=('gimp') source=(http://downloads.sourceforge.net/sourceforge/refocus/refocus-${pkgver}.tar.gz \ refocus-gimp-2.0.patch refocus-mirror-fix.patch refocus-gimp-preview.patch) md5sums=('8d4eac4ef45c904fb5e73021696bec94' - '8ef9dfe697cd20be2be14c1ee53a240a' + '1b7bc13154f483994af3846c7ee29ad7' '532593cba030feab8ffa7800fc9cd782' '6b55dbdc656646c765064cf21e1a3c57') diff --git a/community/gimp-refocus/refocus-gimp-2.0.patch b/community/gimp-refocus/refocus-gimp-2.0.patch index 259ee9f87..454b8d999 100644 --- a/community/gimp-refocus/refocus-gimp-2.0.patch +++ b/community/gimp-refocus/refocus-gimp-2.0.patch @@ -68,7 +68,7 @@ diff -u -u -r1.1.1.1 Makefile.am refocus_SOURCES = refocus.c conv.c gimppreview.c prevman.c util.c matrix.c tilebuf.c bdclosure.c fwlapack.c -refocus_LDADD = @GTK_LIBS@ -lgimp ${ldadd_atlas} -+refocus_LDADD = @GIMP_LIBS@ ${ldadd_atlas} ++refocus_LDADD = @GIMP_LIBS@ ${ldadd_atlas} -lm refocus_DEPENDENCIES=@LAPACK_LIB_DIR@/liblapack.a test_matrix_SOURCES = matrix.c test-matrix.c fwlapack.c diff --git a/community/glusterfs/PKGBUILD b/community/glusterfs/PKGBUILD index bcb2fb7c5..71e6e5072 100644 --- a/community/glusterfs/PKGBUILD +++ b/community/glusterfs/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 92260 2013-06-03 11:49:45Z foutrelis $ +# $Id: PKGBUILD 94386 2013-07-22 14:09:30Z spupykin $ # Maintainer: Sergej Pupykin # Contributors: # Andrei Antoukh - niwi@niwi.be - http://www.niwi.be # henning mueller pkgname=glusterfs -pkgver=3.3.1 +pkgver=3.4.0 _basever=`echo $pkgver | cut -f1-2 -d.` -pkgrel=5 +pkgrel=1 pkgdesc='Is a cluster file-system capable of scaling to several peta-bytes.' arch=(i686 x86_64) url='http://www.gluster.org/' @@ -17,9 +17,7 @@ makedepends=(flex bison) options=(!libtool) source=(http://download.gluster.org/pub/gluster/glusterfs/$_basever/$pkgver/glusterfs-$pkgver.tar.gz glusterd.service) -sha256sums=('19aaefe3a0f9059ae831b44c92944503cf439da82da23467101ac13da8b77519' - 'e9aa54fcff422e0266e0f89d4bda73e0c77458f7c5443b8327db1e7b4242e6f7') -sha256sums=('19aaefe3a0f9059ae831b44c92944503cf439da82da23467101ac13da8b77519' +sha256sums=('2a2a43fb52a7f6b8b00331acc5ea2c86a067a2f2901cca886a2348e919c0cbd8' '18e6c3bcca396a4524d866977d3fa86135377d7bf5d28a130e697ae2e85f043b') build() { @@ -46,7 +44,7 @@ build() { package() { cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + make -j1 DESTDIR=$pkgdir install install -D -m 644 \ $srcdir/$pkgname-$pkgver/{README,INSTALL,COPYING*} \ diff --git a/community/guvcview/PKGBUILD b/community/guvcview/PKGBUILD index b63e5b471..26fd5b405 100644 --- a/community/guvcview/PKGBUILD +++ b/community/guvcview/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90045 2013-05-06 19:37:46Z foutrelis $ +# $Id: PKGBUILD 94403 2013-07-22 17:10:07Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Maxwell Pray a.k.a. Synthead pkgname=guvcview -pkgver=1.7.0 -pkgrel=2 +pkgver=1.7.1 +pkgrel=1 pkgdesc="A video viewer and capturer for the linux uvc driver" arch=('i686' 'x86_64') url="http://guvcview.sourceforge.net/" @@ -14,7 +14,7 @@ makedepends=('pkg-config' 'intltool') optdepends=('pulseaudio: for PulseAudio support') options=('!docs') source=("http://downloads.sourceforge.net/project/${pkgname}/source/${pkgname}-src-${pkgver}.tar.gz") -md5sums=('fe141fe2fe2a16df69f7866c27334a56') +md5sums=('5ca1b9c89d2b9370ee203dcc24efd695') build() { cd "${srcdir}/${pkgname}-src-${pkgver}" diff --git a/community/id3lib-rcc/PKGBUILD b/community/id3lib-rcc/PKGBUILD deleted file mode 100644 index cb62b1ef9..000000000 --- a/community/id3lib-rcc/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 55559 2011-09-14 10:08:38Z andrea $ -# Maintainer: Sergej Pupykin - -pkgname=id3lib-rcc -pkgver=3.8.3 -pkgrel=7 -pkgdesc="id3lib with librcc patch" -arch=('i686' 'x86_64') -url="http://id3lib.sourceforge.net/" -license=('GPL') -depends=('libxml2' 'librcc' 'gcc-libs') -provides=('id3lib') -conflicts=('id3lib') -options=('!libtool') -source=(http://downloads.sourceforge.net/id3lib/id3lib-$pkgver.tar.gz - http://downloads.sourceforge.net/rusxmms/id3lib-csa2.tar.bz2 - arch.patch - id3lib-gcc4.patch) -md5sums=('19f27ddd2dda4b2d26a559a4f0f402a7' - '608a475f119974c8f72406fd84e1030f' - '8b503330d653578f75fc9f2bf3c3833d' - '94191cf1fe6f5fd391d95a6de81a48b9') - -build() { - cd "${srcdir}"/id3lib-$pkgver - - patch -Np1 -i "${srcdir}"/id3lib/id3lib-ds-rcc.patch - patch -Np1 -i "${srcdir}"/id3lib-gcc4.patch - cd src - patch -Np0 -i "${srcdir}"/arch.patch - cd .. - - sed -i 's#iomanip.h##' configure - sed -i 's|size_t size_t, size_t \*size_t|size_t s1, size_t *s2|' src/rccpatch.h - - ./configure --prefix=/usr - make LDFLAGS=-lrcc -} - -package() { - cd "${srcdir}"/id3lib-$pkgver - make DESTDIR="${pkgdir}" install -} diff --git a/community/id3lib-rcc/arch.patch b/community/id3lib-rcc/arch.patch deleted file mode 100644 index 2732fde5e..000000000 --- a/community/id3lib-rcc/arch.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- Makefile.in.org 2003-03-02 03:23:00.000000000 +0300 -+++ Makefile.in 2006-07-14 08:33:40.000000000 +0400 -@@ -172,7 +172,8 @@ - tag_parse_v1.cpp \ - tag_render.cpp \ - utils.cpp \ -- writers.cpp -+ writers.cpp \ -+ rccpatch.cpp - - - lib_LTLIBRARIES = libid3.la -@@ -200,7 +201,7 @@ - io_decorators.lo io_helpers.lo misc_support.lo mp3_parse.lo \ - readers.lo spec.lo tag.lo tag_file.lo tag_find.lo tag_impl.lo \ - tag_parse.lo tag_parse_lyrics3.lo tag_parse_musicmatch.lo \ -- tag_parse_v1.lo tag_render.lo utils.lo writers.lo -+ tag_parse_v1.lo tag_render.lo utils.lo writers.lo rccpatch.lo - am_libid3_la_OBJECTS = $(am__objects_1) - libid3_la_OBJECTS = $(am_libid3_la_OBJECTS) - -@@ -233,7 +234,8 @@ - @AMDEP_TRUE@ ./$(DEPDIR)/tag_parse_musicmatch.Plo \ - @AMDEP_TRUE@ ./$(DEPDIR)/tag_parse_v1.Plo \ - @AMDEP_TRUE@ ./$(DEPDIR)/tag_render.Plo ./$(DEPDIR)/utils.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/writers.Plo -+@AMDEP_TRUE@ ./$(DEPDIR)/writers.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/rccpatch.Plo - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ -@@ -328,6 +330,7 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tag_render.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writers.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rccpatch.Plo@am__quote@ - - distclean-depend: - -rm -rf ./$(DEPDIR) diff --git a/community/id3lib-rcc/id3lib-gcc4.patch b/community/id3lib-rcc/id3lib-gcc4.patch deleted file mode 100644 index 7f4ef666a..000000000 --- a/community/id3lib-rcc/id3lib-gcc4.patch +++ /dev/null @@ -1,189 +0,0 @@ -diff -wbBur id3lib-3.8.3/configure.in id3lib-3.8.3.my/configure.in ---- id3lib-3.8.3/configure.in 2008-10-27 18:24:52.000000000 +0000 -+++ id3lib-3.8.3.my/configure.in 2009-09-08 15:09:40.000000000 +0000 -@@ -227,7 +227,6 @@ - ) - AC_CHECK_HEADERS( \ - string \ -- iomanip.h \ - ,,AC_MSG_ERROR([Missing a vital header file for id3lib]) - ) - -@@ -296,11 +295,11 @@ - AC_DEFINE_UNQUOTED(_ID3LIB_BINARY_AGE, $ID3LIB_BINARY_AGE) - AC_DEFINE_UNQUOTED(_ID3_COMPILED_WITH_DEBUGGING, "${enable_debug}") - --CONDITIONAL_SUBDIRS= --if test "x$ac_cv_lib_z_uncompress" = "xno"; then -- CONDITIONAL_SUBDIRS="$CONDITIONAL_SUBDIRS zlib" --fi --AC_CONFIG_SUBDIRS(zlib) -+#CONDITIONAL_SUBDIRS= -+#if test "x$ac_cv_lib_z_uncompress" = "xno"; then -+# CONDITIONAL_SUBDIRS="$CONDITIONAL_SUBDIRS zlib" -+#fi -+#AC_CONFIG_SUBDIRS(zlib) - - CFLAGS="$CFLAGS -Wall" - -diff -wbBur id3lib-3.8.3/doc/Doxyfile.in id3lib-3.8.3.my/doc/Doxyfile.in ---- id3lib-3.8.3/doc/Doxyfile.in 2008-10-27 18:24:52.000000000 +0000 -+++ id3lib-3.8.3.my/doc/Doxyfile.in 2009-09-08 15:10:40.000000000 +0000 -@@ -263,8 +263,10 @@ - - INPUT = ../src \ - ../include/id3/field.h \ -- ../include/id3/frame.h \ - ../include/id3/globals.h \ -+ ../include/id3/io_decorators.h \ -+ ../include/id3/io_helpers.h \ -+ ../include/id3/io_strings.h \ - ../include/id3/misc_support.h \ - ../include/id3/reader.h \ - ../include/id3/readers.h \ -diff -wbBur id3lib-3.8.3/examples/demo_convert.cpp id3lib-3.8.3.my/examples/demo_convert.cpp ---- id3lib-3.8.3/examples/demo_convert.cpp 2008-10-27 18:24:52.000000000 +0000 -+++ id3lib-3.8.3.my/examples/demo_convert.cpp 2009-09-08 15:09:26.000000000 +0000 -@@ -84,7 +84,7 @@ - } - } - --int main( unsigned int argc, char * const argv[]) -+int main( int argc, char * const argv[]) - { - flags_t ulFlag = ID3TT_ALL; - gengetopt_args_info args; -diff -wbBur id3lib-3.8.3/examples/demo_copy.cpp id3lib-3.8.3.my/examples/demo_copy.cpp ---- id3lib-3.8.3/examples/demo_copy.cpp 2008-10-27 18:24:52.000000000 +0000 -+++ id3lib-3.8.3.my/examples/demo_copy.cpp 2009-09-08 15:09:26.000000000 +0000 -@@ -81,7 +81,7 @@ - } - } - --int main( unsigned int argc, char * const argv[]) -+int main( int argc, char * const argv[]) - { - int ulFlag = ID3TT_ID3; - ID3D_INIT_DOUT(); -diff -wbBur id3lib-3.8.3/examples/demo_info.cpp id3lib-3.8.3.my/examples/demo_info.cpp ---- id3lib-3.8.3/examples/demo_info.cpp 2008-10-27 18:24:52.000000000 +0000 -+++ id3lib-3.8.3.my/examples/demo_info.cpp 2009-09-08 15:09:26.000000000 +0000 -@@ -309,7 +309,7 @@ - - #define DEBUG - --int main( unsigned int argc, char * const argv[]) -+int main( int argc, char * const argv[]) - { - ID3D_INIT_DOUT(); - -diff -wbBur id3lib-3.8.3/examples/demo_tag.cpp id3lib-3.8.3.my/examples/demo_tag.cpp ---- id3lib-3.8.3/examples/demo_tag.cpp 2008-10-27 18:24:52.000000000 +0000 -+++ id3lib-3.8.3.my/examples/demo_tag.cpp 2009-09-08 15:09:26.000000000 +0000 -@@ -46,7 +46,7 @@ - os << "v2"; - } - --int main( unsigned int argc, char * const argv[]) -+int main( int argc, char * const argv[]) - { - int ulFlag = ID3TT_ID3; - ID3D_INIT_DOUT(); -diff -wbBur id3lib-3.8.3/include/id3/id3lib_strings.h id3lib-3.8.3.my/include/id3/id3lib_strings.h ---- id3lib-3.8.3/include/id3/id3lib_strings.h 2008-10-27 18:24:52.000000000 +0000 -+++ id3lib-3.8.3.my/include/id3/id3lib_strings.h 2009-09-08 15:09:26.000000000 +0000 -@@ -30,6 +30,7 @@ - #define _ID3LIB_STRINGS_H_ - - #include -+#include - - #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000)) - namespace std -diff -wbBur id3lib-3.8.3/include/id3/writers.h id3lib-3.8.3.my/include/id3/writers.h ---- id3lib-3.8.3/include/id3/writers.h 2008-10-27 18:24:52.000000000 +0000 -+++ id3lib-3.8.3.my/include/id3/writers.h 2009-09-08 15:09:26.000000000 +0000 -@@ -30,7 +30,7 @@ - - #include "id3/writer.h" - #include "id3/id3lib_streams.h" --//#include -+#include - - class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer - { -diff -wbBur id3lib-3.8.3/src/Makefile.am id3lib-3.8.3.my/src/Makefile.am ---- id3lib-3.8.3/src/Makefile.am 2008-10-27 18:24:52.000000000 +0000 -+++ id3lib-3.8.3.my/src/Makefile.am 2009-09-08 15:09:49.000000000 +0000 -@@ -76,6 +76,8 @@ - LDADD = $(top_builddir)/zlib/src/libz.la - endif - -+libid3_la_LIBADD = -lz -lstdc++ -+ - libid3_la_LDFLAGS = \ - -version-info $(LT_VERSION) \ - -release $(LT_RELEASE) \ -diff -wbBur id3lib-3.8.3/src/Makefile.in id3lib-3.8.3.my/src/Makefile.in ---- id3lib-3.8.3/src/Makefile.in 2008-10-27 18:24:52.000000000 +0000 -+++ id3lib-3.8.3.my/src/Makefile.in 2009-09-08 15:09:49.000000000 +0000 -@@ -192,7 +192,8 @@ - CONFIG_CLEAN_FILES = - LTLIBRARIES = $(lib_LTLIBRARIES) - --libid3_la_LIBADD = -+libid3_la_LIBADD = -lz -lstdc++ -+ - am__objects_1 = c_wrapper.lo field.lo field_binary.lo field_integer.lo \ - field_string_ascii.lo field_string_unicode.lo frame.lo \ - frame_impl.lo frame_parse.lo frame_render.lo globals.lo \ -diff -wbBur id3lib-3.8.3/src/tag_file.cpp id3lib-3.8.3.my/src/tag_file.cpp ---- id3lib-3.8.3/src/tag_file.cpp 2008-10-27 18:24:52.000000000 +0000 -+++ id3lib-3.8.3.my/src/tag_file.cpp 2009-09-08 15:10:22.000000000 +0000 -@@ -242,8 +242,8 @@ - strcpy(sTempFile, filename.c_str()); - strcat(sTempFile, sTmpSuffix.c_str()); - --#if ((defined(__GNUC__) && __GNUC__ >= 3 ) || !defined(HAVE_MKSTEMP)) -- // This section is for Windows folk && gcc 3.x folk -+#if !defined(HAVE_MKSTEMP) -+ // This section is for Windows folk - fstream tmpOut; - createFile(sTempFile, tmpOut); - -@@ -257,7 +257,7 @@ - tmpOut.write((char *)tmpBuffer, nBytes); - } - --#else //((defined(__GNUC__) && __GNUC__ >= 3 ) || !defined(HAVE_MKSTEMP)) -+#else //!defined(HAVE_MKSTEMP) - - // else we gotta make a temp file, copy the tag into it, copy the - // rest of the old file after the tag, delete the old file, rename -@@ -270,7 +270,7 @@ - //ID3_THROW_DESC(ID3E_NoFile, "couldn't open temp file"); - } - -- ofstream tmpOut(fd); -+ ofstream tmpOut(sTempFile); - if (!tmpOut) - { - tmpOut.close(); -@@ -285,14 +285,14 @@ - uchar tmpBuffer[BUFSIZ]; - while (file) - { -- file.read(tmpBuffer, BUFSIZ); -+ file.read((char *)tmpBuffer, BUFSIZ); - size_t nBytes = file.gcount(); -- tmpOut.write(tmpBuffer, nBytes); -+ tmpOut.write((char *)tmpBuffer, nBytes); - } - - close(fd); //closes the file - --#endif ////((defined(__GNUC__) && __GNUC__ >= 3 ) || !defined(HAVE_MKSTEMP)) -+#endif ////!defined(HAVE_MKSTEMP) - - tmpOut.close(); - file.close(); diff --git a/community/meterbridge/PKGBUILD b/community/meterbridge/PKGBUILD new file mode 100644 index 000000000..3cc12bb90 --- /dev/null +++ b/community/meterbridge/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 94414 2013-07-22 22:01:34Z speps $ +# Maintainer: speps + +pkgname=meterbridge +pkgver=0.9.2 +pkgrel=1 +pkgdesc="Collection of Audio meters for the JACK audio server" +arch=('i686' 'x86_64') +url="http://plugin.org.uk/meterbridge/" +license=('GPL') +depends=('jack' 'sdl_image') +source=("http://plugin.org.uk/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('ef5d20761755c88e5b5a0c35f11f670e') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + # gcc 4.x fix + sed -i "s/ buf_rect.*,//" src/main.h + + # iec scale fix + # http://lists.linuxaudio.org/pipermail/linux-audio-dev/2012-June/032475.html + sed -i 's/ 5.0/ 2.5/' src/dpm_meters.c +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + aclocal && automake -a && autoconf + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/community/myodbc/PKGBUILD b/community/myodbc/PKGBUILD index 201a434ae..be3e9f3cf 100644 --- a/community/myodbc/PKGBUILD +++ b/community/myodbc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 87009 2013-03-25 19:16:48Z bpiotrowski $ +# $Id: PKGBUILD 94357 2013-07-22 11:20:31Z spupykin $ # Maintainer: Sergej Pupykin pkgname=myodbc -pkgver=5.2.4 -pkgrel=2 +pkgver=5.2.5 +pkgrel=1 pkgdesc="ODBC driver/connector for mariadb" arch=(i686 x86_64) url="http://dev.mysql.com/downloads/connector/odbc/" @@ -12,7 +12,7 @@ makedepends=('cmake') license=('GPL') options=('libtool') source=("http://cdn.mysql.com/Downloads/Connector-ODBC/5.2/mysql-connector-odbc-$pkgver-src.tar.gz") -md5sums=('0ace04820794ea1712b2a303ebd99dba') +md5sums=('909e0c3c9c341fe777d0a620c4084442') build() { cd $srcdir/mysql-connector-odbc-${pkgver}-src diff --git a/community/oath-toolkit/PKGBUILD b/community/oath-toolkit/PKGBUILD index e5aee3cbc..9b6bee941 100644 --- a/community/oath-toolkit/PKGBUILD +++ b/community/oath-toolkit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 93727 2013-07-08 23:58:49Z seblu $ +# $Id: PKGBUILD 94352 2013-07-22 08:32:55Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Christian Hesse # Contributor: L42y <423300@gmail.com> pkgname=oath-toolkit -pkgver=2.2.0 +pkgver=2.4.0 pkgrel=1 pkgdesc='OATH one-time password toolkit' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL3') depends=('glibc' 'pam' 'xmlsec') options=('!libtool') source=("http://download.savannah.nongnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('2afc64577936a1a79cff72b0718c9636') +md5sums=('456774fbc37d5267e4e8920694b7ad48') build() { cd $pkgname-$pkgver diff --git a/community/pcmanfm/PKGBUILD b/community/pcmanfm/PKGBUILD index 70d01156c..781a46f6b 100644 --- a/community/pcmanfm/PKGBUILD +++ b/community/pcmanfm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 79229 2012-11-01 10:32:52Z bpiotrowski $ +# $Id: PKGBUILD 94411 2013-07-22 20:03:04Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Unknown47 # Contributor: Angel Velasquez # Contributor: Juergen Hoetzel pkgname=pcmanfm -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=1 pkgdesc="An extremely fast and lightweight file manager" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ depends=('gtk2' 'desktop-file-utils' 'libfm' 'lxmenu-data') makedepends=('intltool' 'pkgconfig') install=$pkgname.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.gz) -md5sums=('af0cff78690e658f3c06ceabf27bc71a') +md5sums=('853ef5e3eba6bf36e15985bfe3170456') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/php-mongo/PKGBUILD b/community/php-mongo/PKGBUILD index 33213a413..7dffb0ade 100644 --- a/community/php-mongo/PKGBUILD +++ b/community/php-mongo/PKGBUILD @@ -1,10 +1,9 @@ -# $Id: PKGBUILD 92665 2013-06-11 09:54:52Z idevolder $ # Maintainer: BlackEagle < ike DOT devolder AT gmail DOT com > # Contributor: Jarek Sedlacek pkgname=php-mongo -pkgver=1.4.1 -pkgrel=2 +pkgver=1.4.2 +pkgrel=1 pkgdesc="Officially supported PHP driver for MongoDB" arch=("i686" "x86_64") url="http://www.mongodb.org/display/DOCS/PHP+Language+Center" @@ -27,5 +26,5 @@ package() { make INSTALL_ROOT="$pkgdir" install install -Dm644 "$srcdir/mongo.ini" "$pkgdir/etc/php/conf.d/mongo.ini" } -sha256sums=('230e7d26eaa826c7aacfc90fd1128f8c390216abe7f588d3bbcd130bd1fb84b6' +sha256sums=('ecbf8621c418c35abb0d5e9719432a2f315db2559023861105635bae5bfbd120' 'c89685eee842d5c3a85149a5bb8e310e62bf1a17f94183bb66401593ab2b191b') diff --git a/community/poedit/PKGBUILD b/community/poedit/PKGBUILD index ea6fa780e..0a90eae35 100644 --- a/community/poedit/PKGBUILD +++ b/community/poedit/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87572 2013-04-03 10:14:55Z spupykin $ +# $Id: PKGBUILD 94359 2013-07-22 11:20:50Z spupykin $ # Contributor: Andrea Scarpino # Contributor: Giovanni Scafora # Contributor: Alexander Fehr # Contributor: Daniel J Griffiths pkgname=poedit -pkgver=1.5.5 +pkgver=1.5.7 pkgrel=1 pkgdesc="Cross-platform gettext catalogs (.po files) editor" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ depends=('wxgtk2.9' 'gtkspell' 'db>=5.1' 'hicolor-icon-theme' 'gettext') makedepends=('pkgconfig' 'boost') install=poedit.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('da86cb73cee9d006a42f9574811d13ab') +md5sums=('f5b53ec66a606f088b0aa388595ea5f9') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/rusxmms/PKGBUILD b/community/rusxmms/PKGBUILD deleted file mode 100644 index a9d9209e5..000000000 --- a/community/rusxmms/PKGBUILD +++ /dev/null @@ -1,63 +0,0 @@ -# $Id: PKGBUILD 85265 2013-02-28 10:39:00Z spupykin $ -# Maintainer: Sergej Pupykin -# Contributor: Sergej Pupykin - -pkgname=rusxmms -pkgver=1.2.11_csa43 -_xmmsver=1.2.11 -_csaver=csa43 -pkgrel=3 -pkgdesc="XMMS with librcc" -arch=(i686 x86_64) -license=(GPL) -url="http://rusxmms.sourceforge.net/" -depends=(libsm libxxf86vm zlib gtk libvorbis alsa-lib libgl librcc librcd openssl) -makedepends=(mesa patch) -provides=(xmms) -conflicts=(xmms) -options=('!libtool' '!distcc') -source=(http://xmms.org/files/1.2.x/xmms-${_xmmsver}.tar.bz2 \ - http://dside.dyndns.org/files/rusxmms/RusXMMS2-${_csaver}.tar.bz2) -md5sums=('f3e6dbaf0b3f571a532ab575656be506' - '8f387dd2e5c95f8730979e09687b6e02') - -build() { - cd "${srcdir}"/xmms-${_xmmsver} - sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/g' configure.in libxmms/configure.in - - ln -s "$srcdir"/RusXMMS2 "$srcdir"/xmms-${_xmmsver}/RusXMMS2 - (cd "$srcdir"/xmms-${_xmmsver}/RusXMMS2 && ./apply.sh) - - mv "$srcdir"/RusXMMS2/source/* "$srcdir"/xmms-${_xmmsver}/libxmms/ - autoconf - sed -i 's/unicode.c//g' Input/mpg123/Makefile.in - sed -i 's/unicode.lo//g' Input/mpg123/Makefile.in - - (cd libxmms && aclocal && automake && autoconf) - - case $CARCH in - x86_64) - ./configure --prefix=/usr --disable-mikmod --disable-simd - ;; - i686) - ./configure --prefix=/usr --disable-mikmod --enable-simd --disable-vorbis --disable-vorbistest - ;; - *) - return 1 - ;; - esac - - make -} - -package(){ - cd "${srcdir}"/xmms-${_xmmsver} - make DESTDIR="$pkgdir" install - - mkdir -p "$pkgdir"/usr/share/{applications,pixmaps} - install -m 644 xmms/xmms.desktop "$pkgdir"/usr/share/applications - install -m 644 xmms/xmms_mini.xpm "$pkgdir"/usr/share/pixmaps/xmms.xpm - # don't want wmxmms - rm -rf "$pkgdir"/usr/bin/wmxmms "$pkgdir"/usr/share/xmms - rm -f "$pkgdir"/usr/share/man/man1/{gnomexmms.1,wmxmms.1} -} diff --git a/community/scribus/PKGBUILD b/community/scribus/PKGBUILD new file mode 100644 index 000000000..43cc53638 --- /dev/null +++ b/community/scribus/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 94350 2013-07-22 08:05:18Z bisson $ +# Maintainer: Gaetan Bisson +# Contributor: Daniel J Griffiths +# Contributor: Ronald van Haren +# Contributor: tobias +# Contributor: Ben + +pkgname=scribus +pkgver=1.4.2 +pkgrel=4 +pkgdesc='Desktop publishing software' +url="http://www.scribus.net/" +license=('GPL') +arch=('i686' 'x86_64') +makedepends=('cmake' 'boost' 'mesa') +depends=('qt4' 'cairo' 'lcms2' 'libcups' 'libxml2' 'hyphen' + 'ghostscript' 'python2' 'aspell' 'podofo' 'boost-libs' + 'desktop-file-utils' 'shared-mime-info') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz") +sha1sums=('6e67e98fa315a2890d9cbb12eed49ecebb7f11cb') + +options=('!libtool') +install=install + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' -i scribus.desktop + sed \ + -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \ + -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ + -i scribus/plugins/scriptplugin/{samples,scripts}/* + install -d ../build +} + +build() { + cd "${srcdir}/build" + cmake "../${pkgname}-${pkgver}" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DLIB_SUFFIX="" + make +} + +package() { + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install + install -Dm644 "../${pkgname}-${pkgver}/scribus.desktop" "${pkgdir}/usr/share/applications/scribus.desktop" +} diff --git a/community/scribus/install b/community/scribus/install new file mode 100644 index 000000000..8040f715b --- /dev/null +++ b/community/scribus/install @@ -0,0 +1,11 @@ +post_install() { + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/taglib-rcc/PKGBUILD b/community/taglib-rcc/PKGBUILD deleted file mode 100644 index 673927582..000000000 --- a/community/taglib-rcc/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 59135 2011-11-21 12:15:14Z spupykin $ -# Maintainer: Sergej Pupykin -# Contributor: Sergej Pupykin - -pkgname=taglib-rcc -pkgver=1.7 -pkgrel=1 -pkgdesc="taglib with librcc patch" -arch=('i686' 'x86_64') -url="http://developer.kde.org/~wheeler/taglib.html" -depends=('gcc-libs' 'zlib' 'bash' 'libxml2' 'db' 'librcc') -makedepends=('patch' 'cmake') -license=('GPL') -provides=("taglib=$pkgver") -conflicts=("taglib") -options=('!libtool') -source=(http://developer.kde.org/~wheeler/files/src/taglib-$pkgver.tar.gz - http://downloads.sourceforge.net/rusxmms/taglib-csa6.tar.bz2) -md5sums=('6a7e312668f153fa905a81714aebc257' - '0868d633843ecd87526c77d788b3d3b6') - -build() { - cd $srcdir/taglib-$pkgver - [ $NOEXTRACT -eq 1 ] || patch -Np1 <$srcdir/taglib/taglib-1.5-ds-rusxmms.patch || true - [ $NOEXTRACT -eq 1 ] || sed -i 's|#include |#include |' $srcdir/taglib-$pkgver/taglib/toolkit/rccpatch.cpp - - cd .. - mkdir build - cd build - - [ $NOEXTRACT -eq 1 ] || cmake ../taglib-$pkgver \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DWITH_MP4=ON \ - -DWITH_ASF=ON - make VERBOSE=1 - make DESTDIR=${pkgdir} install -} diff --git a/community/tigervnc/PKGBUILD b/community/tigervnc/PKGBUILD index 4e2ad657b..a37192c1e 100644 --- a/community/tigervnc/PKGBUILD +++ b/community/tigervnc/PKGBUILD @@ -1,50 +1,53 @@ -# $Id: PKGBUILD 93706 2013-07-08 14:56:58Z spupykin $ +# $Id: PKGBUILD 94384 2013-07-22 13:59:43Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Uroš Vampl pkgname=tigervnc pkgver=1.3.0 -pkgrel=1 +pkgrel=2 _xorgver=1.14.2 pkgdesc="suite of VNC servers and clients. VNC 4 branch of TightVNC." arch=('i686' 'x86_64') url="http://www.tigervnc.org" license=('GPL') -depends=('pam' 'gnutls' 'libjpeg-turbo' 'libxft' 'libxinerama' 'libxcursor' - 'libxtst' 'libxfont' 'pixman' 'xorg-xauth' 'xorg-xsetroot' - 'xkeyboard-config' 'libgl' 'libgcrypt' 'perl' 'xorg-xkbcomp' - 'fltk') +depends=('fltk' 'pam' 'gnutls' 'libjpeg-turbo' 'libxtst' 'libxfont' 'pixman' + 'xorg-xauth' 'xorg-xsetroot' 'xkeyboard-config' 'xorg-xkbcomp' + 'libgl' 'libgcrypt' 'perl' ) makedepends=('cmake' 'nasm' 'xorg-font-util' 'xorg-util-macros' 'bigreqsproto' 'compositeproto' 'damageproto' 'randrproto' 'resourceproto' 'scrnsaverproto' 'videoproto' 'xcmiscproto' 'xf86vidmodeproto' - 'xtrans' 'mesa' 'glproto' 'dri2proto' 'imagemagick' 'librsvg') + 'xtrans' 'mesa' 'glproto' 'dri2proto' 'imagemagick') options=(!libtool) conflicts=('tightvnc') source=(http://downloads.sourceforge.net/project/tigervnc/tigervnc/$pkgver/tigervnc-$pkgver.tar.bz2 ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${_xorgver}.tar.bz2 vncserver.service vncviewer.desktop - xserver114.patch) + gethomedir.patch + getmaster.patch) md5sums=('a5158228e64d14496821a39bf3851f1b' '5d36a6483e8e301875131e8302c67727' '0903d5a0dfa38e0b04964505b644585c' - '15c0405f920c3dac250692e8922578d1' - '928faf837ba5b1b34283f9f018df2f5e') + '71cac0fb9701b0a041430f0fddfe00c8' + '22f1523a0eca56ad79cfabd0db6e2cf6' + 'e056a2502dfe0cb3b02e08cab689482f') prepare() { cd ${srcdir}/${pkgname}-${pkgver} cp -r ${srcdir}/xorg-server-${_xorgver}/* unix/xserver + + patch -Np1 -i ${srcdir}/gethomedir.patch + patch -Np1 -i ${srcdir}/getmaster.patch } build() { cd ${srcdir}/${pkgname}-${pkgver} - cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr -DUSE_INCLUDED_FLTK=yes + cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr make - make -C media cd unix/xserver - patch -Np1 -i ${srcdir}/xserver114.patch + patch -Np1 -i ../xserver114.patch autoreconf -fiv ./configure --prefix=/usr \ --disable-static --disable-xinerama --without-dtrace \ @@ -63,7 +66,5 @@ package() { make DESTDIR=${pkgdir} install sed -i 's/iconic/nowin/' ${pkgdir}/usr/bin/vncserver install -Dm0644 $srcdir/vncserver.service $pkgdir/usr/lib/systemd/system/vncserver.service - install -dm0755 $pkgdir/usr/share/icons - install -m0644 ${srcdir}/${pkgname}-${pkgver}/media/icons/* $pkgdir/usr/share/icons/ install -Dm0644 $srcdir/vncviewer.desktop $pkgdir/usr/share/applications/vncviewer.desktop } diff --git a/community/tigervnc/gethomedir.patch b/community/tigervnc/gethomedir.patch new file mode 100644 index 000000000..5f3542de8 --- /dev/null +++ b/community/tigervnc/gethomedir.patch @@ -0,0 +1,20 @@ +diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/Makefile.am tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am +--- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/Makefile.am 2011-10-31 09:14:40.000000000 +0100 ++++ tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am 2012-09-06 19:44:04.431123087 +0200 +@@ -5,6 +5,7 @@ + RDR_LIB=$(LIB_DIR)/rdr/librdr.la + NETWORK_LIB=$(LIB_DIR)/network/libnetwork.la + XREGION_LIB=$(LIB_DIR)/Xregion/libXregion.la ++OS_LIB=$(LIB_DIR)/os/libos.la + COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB) + + noinst_LTLIBRARIES = libvnccommon.la +@@ -55,7 +56,7 @@ + + libvnc_la_LDFLAGS = -module -avoid-version + +-libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) ++libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(OS_LIB) + + EXTRA_DIST = Xvnc.man + diff --git a/community/tigervnc/getmaster.patch b/community/tigervnc/getmaster.patch new file mode 100644 index 000000000..cf6ce863f --- /dev/null +++ b/community/tigervnc/getmaster.patch @@ -0,0 +1,96 @@ +diff -up tigervnc-1.3.0/unix/xserver/hw/vnc/InputXKB.cc.getmaster tigervnc-1.3.0/unix/xserver/hw/vnc/InputXKB.cc +--- tigervnc-1.3.0/unix/xserver/hw/vnc/InputXKB.cc.getmaster 2013-07-12 09:30:50.551459439 +0100 ++++ tigervnc-1.3.0/unix/xserver/hw/vnc/InputXKB.cc 2013-07-12 09:38:31.037480528 +0100 +@@ -232,10 +232,7 @@ void InputDevice::PrepareInputDevices(vo + + unsigned InputDevice::getKeyboardState(void) + { +- DeviceIntPtr master; +- +- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT); +- return XkbStateFieldFromRec(&master->key->xkbInfo->state); ++ return XkbStateFieldFromRec(&keyboardDev->master->key->xkbInfo->state); + } + + unsigned InputDevice::getLevelThreeMask(void) +@@ -256,7 +253,7 @@ unsigned InputDevice::getLevelThreeMask( + return 0; + } + +- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc; ++ xkb = keyboardDev->master->key->xkbInfo->desc; + + act = XkbKeyActionPtr(xkb, keycode, state); + if (act == NULL) +@@ -281,7 +278,7 @@ KeyCode InputDevice::pressShift(void) + if (state & ShiftMask) + return 0; + +- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc; ++ xkb = keyboardDev->master->key->xkbInfo->desc; + for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) { + XkbAction *act; + unsigned char mask; +@@ -318,7 +315,7 @@ std::list InputDevice::releaseS + if (!(state & ShiftMask)) + return keys; + +- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT); ++ master = keyboardDev->master; + xkb = master->key->xkbInfo->desc; + for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) { + XkbAction *act; +@@ -371,7 +368,7 @@ KeyCode InputDevice::pressLevelThree(voi + return 0; + } + +- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc; ++ xkb = keyboardDev->master->key->xkbInfo->desc; + + act = XkbKeyActionPtr(xkb, keycode, state); + if (act == NULL) +@@ -399,7 +396,7 @@ std::list InputDevice::releaseL + if (!(state & mask)) + return keys; + +- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT); ++ master = keyboardDev->master; + xkb = master->key->xkbInfo->desc; + for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) { + XkbAction *act; +@@ -440,7 +437,7 @@ KeyCode InputDevice::keysymToKeycode(Key + if (new_state != NULL) + *new_state = state; + +- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc; ++ xkb = keyboardDev->master->key->xkbInfo->desc; + for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) { + unsigned int state_out; + KeySym dummy; +@@ -497,7 +494,7 @@ bool InputDevice::isLockModifier(KeyCode + XkbDescPtr xkb; + XkbAction *act; + +- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc; ++ xkb = keyboardDev->master->key->xkbInfo->desc; + + act = XkbKeyActionPtr(xkb, keycode, state); + if (act == NULL) +@@ -535,7 +532,7 @@ bool InputDevice::isAffectedByNumLock(Ke + if (numlock_keycode == 0) + return false; + +- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc; ++ xkb = keyboardDev->master->key->xkbInfo->desc; + + act = XkbKeyActionPtr(xkb, numlock_keycode, state); + if (act == NULL) +@@ -569,7 +566,7 @@ KeyCode InputDevice::addKeysym(KeySym ke + KeySym *syms; + KeySym upper, lower; + +- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT); ++ master = keyboardDev->master; + xkb = master->key->xkbInfo->desc; + for (key = xkb->max_key_code; key >= xkb->min_key_code; key--) { + if (XkbKeyNumGroups(xkb, key) == 0) diff --git a/community/tigervnc/vncviewer.desktop b/community/tigervnc/vncviewer.desktop index b14e4fe2a..5f6046db2 100644 --- a/community/tigervnc/vncviewer.desktop +++ b/community/tigervnc/vncviewer.desktop @@ -4,7 +4,7 @@ Type=Application Name=TigerVNC viewer Comment=TigerVNC viewer Exec=/usr/bin/vncviewer -Icon=tigervnc_32.png +Icon=tigervnc.png Terminal=false StartupNotify=false Categories=Application; Network; diff --git a/community/tigervnc/xserver114.patch b/community/tigervnc/xserver114.patch deleted file mode 100644 index 80dd6a225..000000000 --- a/community/tigervnc/xserver114.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -up xorg-server-20130109/configure.ac.vnc xorg-server-20130109/configure.ac ---- xorg-server-20130109/configure.ac.vnc 2013-01-24 13:01:31.013267503 +0100 -+++ xorg-server-20130109/configure.ac 2013-01-24 13:08:43.283941751 +0100 -@@ -72,6 +72,7 @@ dnl forcing an entire recompile.x - AC_CONFIG_HEADERS(include/version-config.h) - - AM_PROG_AS -+AC_PROG_CXX - AC_PROG_LN_S - AC_LIBTOOL_WIN32_DLL - AC_DISABLE_STATIC -@@ -1573,6 +1574,10 @@ if test "x$XVFB" = xyes; then - AC_SUBST([XVFB_SYS_LIBS]) - fi - -+dnl Xvnc DDX -+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"]) -+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"]) -+AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"]) - - dnl Xnest DDX - -@@ -1608,6 +1613,8 @@ if test "x$XORG" = xauto; then - fi - AC_MSG_RESULT([$XORG]) - -+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) -+ - if test "x$XORG" = xyes; then - XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' - XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' -@@ -1826,7 +1833,6 @@ if test "x$XORG" = xyes; then - AC_DEFINE(XORG_SERVER, 1, [Building Xorg server]) - AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) - AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) -- AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) - AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) - AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) - AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) -@@ -2291,6 +2297,7 @@ hw/dmx/Makefile - hw/dmx/man/Makefile - hw/vfb/Makefile - hw/vfb/man/Makefile -+hw/vnc/Makefile - hw/xnest/Makefile - hw/xnest/man/Makefile - hw/xwin/Makefile -diff -up xorg-server-20130109/hw/Makefile.am.vnc xorg-server-20130109/hw/Makefile.am ---- xorg-server-20130109/hw/Makefile.am.vnc 2013-01-10 06:06:16.000000000 +0100 -+++ xorg-server-20130109/hw/Makefile.am 2013-01-24 13:08:43.283941751 +0100 -@@ -33,7 +33,8 @@ SUBDIRS = \ - $(XNEST_SUBDIRS) \ - $(DMX_SUBDIRS) \ - $(KDRIVE_SUBDIRS) \ -- $(XQUARTZ_SUBDIRS) -+ $(XQUARTZ_SUBDIRS) \ -+ vnc - - DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive - -diff -up xorg-server-20130109/mi/miinitext.c.vnc xorg-server-20130109/mi/miinitext.c ---- xorg-server-20130109/mi/miinitext.c.vnc 2013-01-10 06:06:16.000000000 +0100 -+++ xorg-server-20130109/mi/miinitext.c 2013-01-24 13:08:43.283941751 +0100 -@@ -112,6 +112,10 @@ SOFTWARE. - #include "micmap.h" - #include "globals.h" - -+#ifdef TIGERVNC -+extern void vncExtensionInit(INITARGS); -+#endif -+ - /* The following is only a small first step towards run-time - * configurable extensions. - */ -@@ -302,6 +306,9 @@ static ExtensionModule staticExtensions[ - #ifdef XSELINUX - {SELinuxExtensionInit, SELINUX_EXTENSION_NAME, &noSELinuxExtension}, - #endif -+#ifdef TIGERVNC -+ {vncExtensionInit, "VNC-EXTENSION", NULL}, -+#endif - }; - - static ExtensionModule *ExtensionModuleList = NULL; diff --git a/community/xcircuit/PKGBUILD b/community/xcircuit/PKGBUILD index 683a6c7ca..8296b7daa 100644 --- a/community/xcircuit/PKGBUILD +++ b/community/xcircuit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88341 2013-04-16 13:32:48Z spupykin $ +# $Id: PKGBUILD 94361 2013-07-22 11:21:13Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Giovanni Scafora # Contributor: simo pkgname=xcircuit -pkgver=3.7.48 +pkgver=3.7.51 pkgrel=1 pkgdesc="A program for drawing publishable-quality electrical circuit schematic diagrams" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL2') depends=('tk' 'libxpm' 'zlib') makedepends=('chrpath') source=(http://opencircuitdesign.com/xcircuit/archive/$pkgname-$pkgver.tgz) -md5sums=('efe537f908b12d30ef1aeebf77222fbf') +md5sums=('a3f5d10f6f96a6298505801f4d0f6190') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/a2ps/PKGBUILD b/extra/a2ps/PKGBUILD index ae316078b..2a1042678 100644 --- a/extra/a2ps/PKGBUILD +++ b/extra/a2ps/PKGBUILD @@ -1,50 +1,52 @@ -# $Id: PKGBUILD 123160 2011-05-09 02:11:04Z eric $ +# $Id: PKGBUILD 191229 2013-07-21 22:39:59Z eric $ # Maintainer: Eric Bélanger pkgname=a2ps pkgver=4.14 -pkgrel=2 +pkgrel=3 pkgdesc="An Any to PostScript filter" arch=('i686' 'x86_64') url="http://www.gnu.org/software/a2ps/" license=('GPL3') -depends=('ghostscript' 'psutils' 'imagemagick' 'perl') +depends=('ghostscript' 'psutils' 'imagemagick') makedepends=('gperf') backup=('etc/a2ps/a2ps.cfg' 'etc/a2ps/a2ps-site.cfg') options=('!libtool') install=a2ps.install -source=(ftp://ftp.gnu.org/gnu/a2ps/${pkgname}-${pkgver}.tar.gz \ - a2ps-4.13c-fnmatch-replacement.patch a2ps-4.13c-emacs.patch a2ps-4.13-manpage-chmod.patch \ +source=(ftp://ftp.gnu.org/gnu/a2ps/${pkgname}-${pkgver}.tar.gz{,.sig} + a2ps-4.13c-fnmatch-replacement.patch a2ps-4.13c-emacs.patch a2ps-4.13-manpage-chmod.patch a2ps-4.14-check-mempcpy.patch a2ps-4.14-fix-stpcpy-proto.patch) -md5sums=('781ac3d9b213fa3e1ed0d79f986dc8c7' - '93011b58e9f20a7fafa31287a51884a4' - '2e493d0bc00d71eb3e8a9b6febc52b69' - '09cc5ed4d3d8ff1b2103e519191e8286' - '42aa39b74f6da8cf6e94185c4fc3e601' - '066f9327fee6b6eca3a57d657d1097d1') sha1sums=('365abbbe4b7128bf70dad16d06e23c5701874852' + 'SKIP' '8783952d3410d8d59ed953e1db45e2ef1a0b8f65' '94e35a6ad9268161bec22a56d4cfb696d635994a' '2bb3d0a2ef2f3ff9262723e35c742a80ab0235ce' '6aed29c1399e79f3914b408059610f9e7c0fc38e' '58fa90134f1027e3f05aeb08212cbcc10f420738') +prepare() { + cd ${pkgname}-${pkgver} + sed -i -e '/^AM_C_PROTOTYPES/d' -e '/^AUTOMAKE_OPTIONS.*ansi2knr/d' \ + -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' -e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \ + configure.in {contrib/sample,lib,src}/Makefile.am m4/protos.m4 + sed -i "s:^countdictstack: \0:" contrib/psset.in + patch -p1 -i "${srcdir}/a2ps-4.13c-fnmatch-replacement.patch" + patch -p1 -i "${srcdir}/a2ps-4.13c-emacs.patch" + patch -p1 -i "${srcdir}/a2ps-4.13-manpage-chmod.patch" + patch -p1 -i "${srcdir}/a2ps-4.14-check-mempcpy.patch" + patch -p0 -i "${srcdir}/a2ps-4.14-fix-stpcpy-proto.patch" +} + build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < ../a2ps-4.13c-fnmatch-replacement.patch - patch -p1 < ../a2ps-4.13c-emacs.patch - patch -p1 < ../a2ps-4.13-manpage-chmod.patch - patch -p1 < ../a2ps-4.14-check-mempcpy.patch - patch -p0 < ../a2ps-4.14-fix-stpcpy-proto.patch + cd ${pkgname}-${pkgver} libtoolize --force --copy - autoreconf -I m4 + autoreconf --force --install -I m4 ./configure --prefix=/usr --sysconfdir=/etc/a2ps \ --includedir=/usr/include --enable-nls make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install - sed -i "s:^countdictstack: \0:" "${pkgdir}/usr/bin/psset" } diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD index d6d1a8004..6a15b6b8c 100644 --- a/extra/ardour/PKGBUILD +++ b/extra/ardour/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 189213 2013-06-29 15:55:30Z schiv $ +# $Id: PKGBUILD 191251 2013-07-22 09:20:17Z schiv $ # Maintainer: Ray Rashif # Contributor: SpepS # Contributor: see .contrib pkgname=ardour _pkgname=Ardour3 -pkgver=3.2 +pkgver=3.3 pkgrel=1 pkgdesc="Professional-grade digital audio workstation" arch=('i686' 'x86_64') @@ -14,10 +14,11 @@ license=('GPL') depends=('liblrdf' 'liblo' 'libsmf' 'lilv>=0.16.0' 'aubio' 'libgnomecanvasmm' 'suil>=0.6.12') makedepends=('python2' 'boost' 'cppunit' 'doxygen' 'graphviz') +optdepends=('xjadeo: video monitoring') install=$pkgname.install source=("ftp://ftp.archlinux.org/other/$pkgname/$_pkgname-$pkgver.tar.bz2" "$pkgname.desktop") -md5sums=('17028a3106f870cd62f6a60930a28590' +md5sums=('40edf6ab63488d52abf94a2a48d7ac97' '316bd21ece5e2208a104fd09cac521af') prepare() { diff --git a/extra/ardour/ardour.install b/extra/ardour/ardour.install index 78d8f7734..36da2e3ec 100644 --- a/extra/ardour/ardour.install +++ b/extra/ardour/ardour.install @@ -4,7 +4,7 @@ post_install() { > LXVST_PATH to include any custom directories of *.so VST plug-ins. > Ardour 3 also supports video (timeline and monitoring), but aside from - > xjadeo (AUR) the required external programs need to be retrieved from: + > xjadeo the required external programs need to be retrieved from: http://x42.github.io/harvid/ @@ -32,8 +32,7 @@ post_upgrade() { > Due to uncertainties with regards to program stability, 'harvid' is > currently not packaged in our repositories. - > In addition to the timeline, video can be monitored with xjadeo, which - > is presently available in the AUR. It will be in our repositories soon. + > In addition to the timeline, video can be monitored with xjadeo. MSG } diff --git a/extra/cln/PKGBUILD b/extra/cln/PKGBUILD index 30f69b7a9..fa2bd62bc 100644 --- a/extra/cln/PKGBUILD +++ b/extra/cln/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143665 2011-11-28 09:23:06Z eric $ +# $Id: PKGBUILD 191235 2013-07-22 00:17:17Z eric $ # Maintainer: Eric Bélanger pkgname=cln -pkgver=1.3.2 +pkgver=1.3.3 pkgrel=1 pkgdesc="Class library for numbers" arch=('i686' 'x86_64') @@ -13,16 +13,20 @@ makedepends=('texlive-core') options=('!libtool') install=cln.install source=(http://www.ginac.de/CLN/${pkgname}-${pkgver}.tar.bz2) -md5sums=('d897cce94d9c34d106575ed4ec865d71') -sha1sums=('c30dca80e75f45e2107f233075e6d0339ea884b0') +sha1sums=('11c56780eb83ed54f2ad1ecef7f0dc0f609c426d') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make all html pdf } +check() { + cd ${pkgname}-${pkgver} + make check +} + package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install-html install-pdf } diff --git a/extra/glib/PKGBUILD b/extra/glib/PKGBUILD index 480a521e2..57be2dc1f 100644 --- a/extra/glib/PKGBUILD +++ b/extra/glib/PKGBUILD @@ -1,37 +1,50 @@ -# $Id: PKGBUILD 135061 2011-08-10 01:01:44Z eric $ +# $Id: PKGBUILD 191242 2013-07-22 06:31:51Z eric $ # Maintainer: Eric Bélanger pkgname=glib pkgver=1.2.10 -pkgrel=9 +pkgrel=10 pkgdesc="Common C routines used by Gtk+ and other libs" arch=('i686' 'x86_64') url="http://www.gtk.org/" license=('LGPL') -depends=('glibc') -options=('!libtool') +depends=('glibc' 'sh') +options=('!libtool' '!makeflags') install=glib.install -source=(ftp://ftp.gtk.org/pub/gtk/v1.2/${pkgname}-${pkgver}.tar.gz \ - gcc340.patch aclocal-fixes.patch) -md5sums=('6fe30dad87c77b91b632def29dd69ef9' - '877b3330e822a4be69a0f8a8c268cfd7' - 'e52c4b88427b9785bb8049dbdc9ff6fb') +source=(ftp://ftp.gtk.org/pub/gtk/v1.2/${pkgname}-${pkgver}.tar.gz + gcc340.patch aclocal-fixes.patch glib1-autotools.patch) sha1sums=('e5a9361c594608d152d5d9650154c2e3260b87fa' 'a2cc224a66aeffdcac16ebd9e8af18143cf54918' - 'ae4438cf56c0c9264ee36f6973fb445f9a820be0') + 'ae4438cf56c0c9264ee36f6973fb445f9a820be0' + '8a25fde3c79567262b3024f4e74c9ca4ee8a6279') + +prepare() { + cd ${pkgname}-${pkgver} + patch -Np1 -i "${srcdir}/gcc340.patch" + patch -Np0 -i "${srcdir}/aclocal-fixes.patch" + patch -Np1 -i "${srcdir}/glib1-autotools.patch" +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ../gcc340.patch - patch -Np0 -i ../aclocal-fixes.patch + cd ${pkgname}-${pkgver} + if [[ $CARCH = "i686" ]]; then + CONFIGFLAG='--host=i686-pc-linux-gnu --target=i686-pc-linux-gnu' + elif [[ $CARCH = "x86_64" ]]; then + CONFIGFLAG='--host=x86_64-unknown-linux-gnu --target=x86_64-unknown-linux-gnu' + fi - [ "$CARCH" = 'x86_64' ] && CONFIGFLAG='--host=x86_64-unknown-linux-gnu --target=x86_64-unknown-linux-gnu' + autoreconf --force --install ./configure --prefix=/usr --mandir=/usr/share/man \ --infodir=/usr/share/info $CONFIGFLAG make } +check() { + cd ${pkgname}-${pkgver} + make check +} + package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/glib/glib1-autotools.patch b/extra/glib/glib1-autotools.patch new file mode 100644 index 000000000..1332c9639 --- /dev/null +++ b/extra/glib/glib1-autotools.patch @@ -0,0 +1,33 @@ +diff -Naur glib-1.2.10-orig/configure.in glib-1.2.10/configure.in +--- glib-1.2.10-orig/configure.in 2013-07-22 01:33:26.930091236 -0400 ++++ glib-1.2.10/configure.in 2013-07-22 01:35:19.988776415 -0400 +@@ -17,7 +17,7 @@ + + dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they + dnl are available for $ac_help expansion (don't we all *love* autoconf?) +-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl ++AC_DIVERT_PUSH()dnl + # + # The following version number definitions apply to GLib, GModule and GThread + # as a whole, so if changes occoured in any of them, they are all +@@ -81,7 +81,7 @@ + + dnl figure debugging default, prior to $ac_help setup + dnl +-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl ++AC_DIVERT_PUSH()dnl + if test `expr $GLIB_MINOR_VERSION \% 2` = 1 ; then + debug_default=yes + else +diff -Naur glib-1.2.10-orig/gmodule/Makefile.am glib-1.2.10/gmodule/Makefile.am +--- glib-1.2.10-orig/gmodule/Makefile.am 2013-07-22 01:33:26.933424531 -0400 ++++ glib-1.2.10/gmodule/Makefile.am 2013-07-22 01:38:46.553041607 -0400 +@@ -42,7 +42,7 @@ + libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) + + noinst_PROGRAMS = testgmodule +-testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@ ++testgmodule_LDFLAGS = @G_MODULE_LDFLAGS@ + testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@ + + .PHONY: files release diff --git a/extra/gnet/PKGBUILD b/extra/gnet/PKGBUILD index 60b952e00..b9b9a3647 100644 --- a/extra/gnet/PKGBUILD +++ b/extra/gnet/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122722 2011-05-06 08:12:47Z eric $ +# $Id: PKGBUILD 191233 2013-07-21 23:25:28Z eric $ # Maintainer: Eric Bélanger pkgname=gnet pkgver=2.0.8 -pkgrel=2 +pkgrel=3 pkgdesc="A simple network library" arch=('i686' 'x86_64') url="http://live.gnome.org/GNetLibrary" @@ -11,16 +11,15 @@ license=('LGPL') depends=('glib2') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/gnet/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('93327d2fca333d7e54ba2cf54e071165') sha1sums=('74a33dd25cc594b874e3a5171795efd99e567387') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + cd ${pkgname}-${pkgver} + LIBS+="-lglib-2.0" ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/gtk/PKGBUILD b/extra/gtk/PKGBUILD index 30fc520a8..c218906e7 100644 --- a/extra/gtk/PKGBUILD +++ b/extra/gtk/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 137905 2011-09-12 10:53:48Z eric $ +# $Id: PKGBUILD 191240 2013-07-22 03:45:27Z eric $ # Maintainer: Eric Bélanger pkgname=gtk pkgver=1.2.10 -pkgrel=11 -pkgdesc="The GTK+ toolkit" +pkgrel=12 +pkgdesc="GTK+ is a multi-platform toolkit (v1)" arch=('i686' 'x86_64') url="http://www.gtk.org/" license=('LGPL') @@ -12,20 +12,21 @@ depends=('libxi' 'glib' 'sh') makedepends=('libxt') options=('!libtool') install=gtk.install -source=("ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${pkgver}.tar.gz" - 'aclocal-fixes.patch') -md5sums=('4d5cb2fc7fb7830e4af9747a36bfce20' - 'c59d4906602d99a7468f7334b6fc3b4e') +source=(ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${pkgver}.tar.gz + aclocal-fixes.patch) +sha1sums=('a5adcb909257da01ae4d4761e1d41081d06e4d7c' + 'b034e33efb85d27f3f3fb082c404e3b6ea79259f') -build() { - cd "${srcdir}/gtk+-${pkgver}" - if [ "${CARCH}" = "x86_64" ]; then - rm config.guess config.sub - ln -s /usr/share/libtool/config/config.guess config.guess - ln -s /usr/share/libtool/config/config.sub config.sub - fi - patch -Np0 -i "${srcdir}/aclocal-fixes.patch" +prepare() { + cd gtk+-${pkgver} + cp /usr/share/libtool/config/config.guess . + cp /usr/share/libtool/config/config.sub . + patch -p0 -i "${srcdir}/aclocal-fixes.patch" + sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" configure +} +build() { + cd gtk+-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc \ --mandir=/usr/share/man --infodir=/usr/share/info \ --with-xinput=xfree @@ -33,6 +34,6 @@ build() { } package() { - cd "${srcdir}/gtk+-${pkgver}" + cd gtk+-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/idnkit/PKGBUILD b/extra/idnkit/PKGBUILD index 13135127c..eb42dafc1 100644 --- a/extra/idnkit/PKGBUILD +++ b/extra/idnkit/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 180328 2013-03-20 15:10:14Z bisson $ +# $Id: PKGBUILD 191237 2013-07-22 00:42:58Z eric $ # Contributor: Igor Nemilentsev # Maintainer: Gaetan Bisson pkgname=idnkit pkgver=1.0 -pkgrel=2 +pkgrel=3 pkgdesc='Provides functionalities about Internationalized Domain Name processing' url='http://www.nic.ad.jp/ja/idn/idnkit/download/' license=('custom:BSD') arch=('i686' 'x86_64') depends=('glibc') +backup=('etc/idnalias.conf' 'etc/idn.conf') options=('!makeflags' '!libtool') source=("http://www.nic.ad.jp/ja/idn/idnkit/download/sources/idnkit-${pkgver}-src.tar.gz") sha1sums=('7d843ffcf9843b7af02079e5a160520f28c75048') -backup=('etc/idnalias.conf' 'etc/idn.conf') +prepare() { + cd idnkit-${pkgver}-src + sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" configure +} build() { - cd "${srcdir}/idnkit-${pkgver}-src" + cd idnkit-${pkgver}-src ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -28,12 +32,12 @@ build() { } check() { - cd "${srcdir}/idnkit-${pkgver}-src" + cd idnkit-${pkgver}-src make check } package() { - cd "${srcdir}/idnkit-${pkgver}-src" + cd idnkit-${pkgver}-src make DESTDIR="${pkgdir}" install install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" rm "${pkgdir}"/etc/*.sample diff --git a/extra/libxfont/PKGBUILD b/extra/libxfont/PKGBUILD index 41ab3ecba..de425926b 100644 --- a/extra/libxfont/PKGBUILD +++ b/extra/libxfont/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 151781 2012-03-02 18:55:43Z andyrtr $ +# $Id: PKGBUILD 191249 2013-07-22 08:12:34Z lcarlier $ # Maintainer: Jan de Groot pkgname=libxfont -pkgver=1.4.5 +pkgver=1.4.6 pkgrel=1 pkgdesc="X11 font rasterisation library" arch=(i686 x86_64) @@ -12,7 +12,7 @@ depends=('freetype2' 'libfontenc' 'xproto' 'fontsproto') makedepends=('xorg-util-macros' 'xtrans') options=('!libtool') source=(${url}/archive/individual/lib/libXfont-${pkgver}.tar.bz2) -sha1sums=('0bf3cb8aa192ab96bbaf384d1a4a00d15a40171e') +sha256sums=('d0cbfe4554dc17ceea413cdad5601d35ed8d05d5b880e60931a8775fd1157e9f') build() { cd "${srcdir}/libXfont-${pkgver}" diff --git a/extra/loudmouth/07-glib-single-include.patch b/extra/loudmouth/07-glib-single-include.patch new file mode 100644 index 000000000..074b29526 --- /dev/null +++ b/extra/loudmouth/07-glib-single-include.patch @@ -0,0 +1,17 @@ +Description: Fix build failure with glib 2.32 + where including individual glib headers is no longer allowed. +Author: Michael Biebl +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=665576 +Index: loudmouth-1.4.3/loudmouth/lm-error.c +=================================================================== +--- loudmouth-1.4.3.orig/loudmouth/lm-error.c 2008-10-29 21:48:15.000000000 +0100 ++++ loudmouth-1.4.3/loudmouth/lm-error.c 2012-03-26 00:24:19.518939657 +0200 +@@ -19,7 +19,7 @@ + */ + + #include +-#include ++#include + #include "lm-error.h" + + /** diff --git a/extra/loudmouth/08-fix-ipv6-connect.patch b/extra/loudmouth/08-fix-ipv6-connect.patch new file mode 100644 index 000000000..b8815a7de --- /dev/null +++ b/extra/loudmouth/08-fix-ipv6-connect.patch @@ -0,0 +1,28 @@ +Description: fix crash when falling back from IPv6 to IPv4 + Previously, loudmouth would set socket->watch_connect to NULL when + encountering an error. When the connection attempt (to a different IPv6) + succeeded later on, _lm_socket_succeeded would therefore not remove the + socket_connect_cb watcher, leading to socket_connect_cb being called upon + socket activity and segfaulting the program. +Author: Michael Stapelberg +Bug-Debian: http://bugs.debian.org/631729 +Forwarded: no +Last-Update: 2013-02-03 +--- a/loudmouth/lm-socket.c ++++ b/loudmouth/lm-socket.c +@@ -529,7 +529,6 @@ + /* error condition, but might be possible to recover + * from it (by connecting to the next host) */ + if (!_lm_socket_failed_with_error (connect_data, err)) { +- socket->watch_connect = NULL; + goto out; + } + } +@@ -560,7 +559,6 @@ + _lm_sock_close (connect_data->fd); + _lm_socket_failed_with_error (connect_data, err); + +- socket->watch_connect = NULL; + goto out; + } + } diff --git a/extra/loudmouth/PKGBUILD b/extra/loudmouth/PKGBUILD index d1686df56..159f31e5e 100644 --- a/extra/loudmouth/PKGBUILD +++ b/extra/loudmouth/PKGBUILD @@ -5,7 +5,7 @@ pkgname=loudmouth pkgver=1.4.3 -pkgrel=3 +pkgrel=4 pkgdesc="A lightweight Jabber client library written in C/Glib" arch=('i686' 'x86_64') license=('LGPL') @@ -16,19 +16,30 @@ makedepends=('intltool' 'pkgconfig' 'gtk-doc') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.4/${pkgname}-${pkgver}.tar.bz2 01-fix-sasl-md5-digest-uri.patch 03-drop-stanzas-on-fail.patch - 04-use-pkg-config-for-gnutls.patch) + 04-use-pkg-config-for-gnutls.patch + 07-glib-single-include.patch + 08-fix-ipv6-connect.patch) md5sums=('55339ca42494690c3942ee1465a96937' 'dc799cea18b24847b1e008c7424010a3' 'b7b2d81b01a5eee5fd5e21cae67b4af7' - 'bffb25b9551df43255fe1706588582f3') + 'bffb25b9551df43255fe1706588582f3' + 'd1546ed54740de536f6bb79a18c5dccb' + '8e3071299776d32b9be27bba7d3f9ae0') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/01-fix-sasl-md5-digest-uri.patch" - patch -Np1 -i "${srcdir}/03-drop-stanzas-on-fail.patch" - patch -Np1 -i "${srcdir}/04-use-pkg-config-for-gnutls.patch" + patch -Np1 -i ../01-fix-sasl-md5-digest-uri.patch + patch -Np1 -i ../03-drop-stanzas-on-fail.patch + patch -Np1 -i ../04-use-pkg-config-for-gnutls.patch + patch -Np1 -i ../07-glib-single-include.patch + patch -Np1 -i ../08-fix-ipv6-connect.patch libtoolize --force - autoreconf + aclocal + autoconf + automake --add-missing +} +build() { + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --disable-static make } diff --git a/extra/nedit/PKGBUILD b/extra/nedit/PKGBUILD index 250d5e2bd..90e40764f 100644 --- a/extra/nedit/PKGBUILD +++ b/extra/nedit/PKGBUILD @@ -1,35 +1,35 @@ -# $Id: PKGBUILD 135019 2011-08-09 21:15:50Z eric $ +# $Id: PKGBUILD 191231 2013-07-21 23:04:03Z eric $ # Maintainer: Eric Bélanger pkgname=nedit pkgver=5.5 -pkgrel=6 +pkgrel=7 pkgdesc="A Unix text editor for programmers and general users" arch=('i686' 'x86_64') url="http://www.nedit.org/" license=('GPL') depends=('lesstif' 'libxpm') -source=(http://www.nedit.org/ftp/v5_5/${pkgname}-${pkgver}-src.tar.bz2 +source=(http://www.nedit.org/${pkgname}-${pkgver}-src.tar.bz2 nedit_xorg_composite_fix.patch) -md5sums=('48cb3dce52d44988f3a4d7c6f47b6bbe' - 'ae1f56ae9b23163882051720ac52412d') sha1sums=('7d3c87a793a5047cf857af1ac82e39f3b33e8a87' '1f6c75075a6bdc7b0dd8ca89d8117d68af8fc54e') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < ../nedit_xorg_composite_fix.patch +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}/nedit_xorg_composite_fix.patch" sed -i 's/-Wl,-Bstatic//' makefiles/Makefile.linux sed -i 's|fgets|//fgets|' util/check_lin_tif.c sed -i "s/CFLAGS=-O/CFLAGS=${CFLAGS} -DBUILD_UNTESTED_NEDIT/" makefiles/Makefile.linux sed -i 's|"/bin/csh"|"/bin/sh"|' source/preferences.c +} +build() { + cd ${pkgname}-${pkgver} make linux docs } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - + cd ${pkgname}-${pkgver} install -Dm755 source/nedit "${pkgdir}/usr/bin/nedit" install -Dm755 source/nc "${pkgdir}/usr/bin/nedit-client" install -Dm644 doc/nedit.man "${pkgdir}/usr/share/man/man1/nedit.1" diff --git a/extra/rosegarden/PKGBUILD b/extra/rosegarden/PKGBUILD index 219a4fff2..53feb35fb 100644 --- a/extra/rosegarden/PKGBUILD +++ b/extra/rosegarden/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 182809 2013-04-15 13:34:39Z schiv $ +# $Id: PKGBUILD 191263 2013-07-22 13:50:52Z schiv $ # Maintainer: Ray Rashif # Contributor: Giovanni Scafora # Contributor: damir # Contributor: Robert Emil Berge pkgname=rosegarden -pkgver=13.04 +pkgver=13.06 pkgrel=1 pkgdesc="MIDI/audio sequencer and notation editor" arch=('i686' 'x86_64') @@ -23,7 +23,7 @@ optdepends=('lilypond: notation display' [ "$CARCH" = "i686" ] && optdepends+=('dssi-vst: win32 VST support') install=$pkgname.install source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('bcc9be7bf8c3945e0eefdb95dc037f0b') +md5sums=('67b110277718b6ef2ec098a8fc452340') build() { cd "$srcdir/$pkgname-$pkgver" @@ -38,7 +38,6 @@ build() { export lrdf_CFLAGS LRELEASE LUPDATE ./configure --prefix=/usr - make } diff --git a/extra/scribus/PKGBUILD b/extra/scribus/PKGBUILD deleted file mode 100644 index cc72b3aef..000000000 --- a/extra/scribus/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 190048 2013-07-13 12:42:28Z svenstaro $ -# Maintainer: Gaetan Bisson -# Contributor: Daniel J Griffiths -# Contributor: Ronald van Haren -# Contributor: tobias -# Contributor: Ben - -pkgname=scribus -pkgver=1.4.2 -pkgrel=3 -pkgdesc='Desktop publishing software' -url="http://www.scribus.net/" -license=('GPL') -arch=('i686' 'x86_64') -makedepends=('cmake' 'boost' 'mesa') -depends=('qt4' 'cairo' 'lcms2' 'libcups' 'libxml2' 'hyphen' - 'ghostscript' 'python2' 'aspell' 'boost-libs' - 'desktop-file-utils' 'shared-mime-info') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz") -sha1sums=('6e67e98fa315a2890d9cbb12eed49ecebb7f11cb') - -options=('!libtool') -install=install - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' -i scribus.desktop - sed \ - -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \ - -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ - -i scribus/plugins/scriptplugin/{samples,scripts}/* - install -d ../build -} - -build() { - cd "${srcdir}/build" - cmake "../${pkgname}-${pkgver}" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DLIB_SUFFIX="" - make -} - -package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}" install - install -Dm644 "../${pkgname}-${pkgver}/scribus.desktop" "${pkgdir}/usr/share/applications/scribus.desktop" -} diff --git a/extra/scribus/install b/extra/scribus/install deleted file mode 100644 index 8040f715b..000000000 --- a/extra/scribus/install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-mime-database usr/share/mime &> /dev/null - update-desktop-database -q -} -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 26a1e3f09..55204ff79 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 190068 2013-07-14 09:54:17Z tpowa $ +# $Id: PKGBUILD 191254 2013-07-22 12:16:46Z tpowa $ # Contributor: Tobias Powalowski # Contributor: Thomas Baechler # Maintainer (Parabola): André Silva @@ -6,7 +6,7 @@ pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.10 -pkgver=${_basekernel}.1 +pkgver=${_basekernel}.2 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -22,7 +22,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' - '5561eca43f9b46ad5a341b0cf59f3226' + '3d06da86aca3af3babcb23b98eeb5442' 'ead29a0206b79cc56ab97930e5d517ae' 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index c41ade432..e78f09ee9 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 190068 2013-07-14 09:54:17Z tpowa $ +# $Id: PKGBUILD 191254 2013-07-22 12:16:46Z tpowa $ # Contributor: Tobias Powalowski # Contributor: Thomas Baechler # Maintainer (Parabola): André Silva @@ -6,7 +6,7 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.10 -pkgver=${_basekernel}.1 +pkgver=${_basekernel}.2 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -22,7 +22,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' - '5561eca43f9b46ad5a341b0cf59f3226' + '3d06da86aca3af3babcb23b98eeb5442' 'e2cb9d4092685c2a4216de9bbe8b72f1' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 9c0090083..37ec6585b 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 190068 2013-07-14 09:54:17Z tpowa $ +# $Id: PKGBUILD 191254 2013-07-22 12:16:46Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): André Silva @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.10 -_sublevel=1 +_sublevel=2 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.0 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -31,7 +31,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' - '5561eca43f9b46ad5a341b0cf59f3226' + '3d06da86aca3af3babcb23b98eeb5442' '542fc77350e62009bca7af080359b286' 'bd77b7112db61fb184139daaa1e390ac' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -39,7 +39,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - '536d322b78a2bde29c0b49b577d8a43a') + '223606d6db3504732aab7711833a30fb') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/xscreensaver-libre/PKGBUILD b/libre/xscreensaver-libre/PKGBUILD index 96c0f3537..1dc040d92 100644 --- a/libre/xscreensaver-libre/PKGBUILD +++ b/libre/xscreensaver-libre/PKGBUILD @@ -1,37 +1,38 @@ -# $Id: PKGBUILD 177534 2013-02-07 02:39:51Z eric $ +# $Id: PKGBUILD 190799 2013-07-16 22:56:09Z eric $ # Maintainer: Eric Bélanger # Maintainer (Parabola): André Silva _pkgname=xscreensaver pkgname=xscreensaver-libre -pkgver=5.21 +pkgver=5.22 pkgrel=1 pkgdesc="Screen saver and locker for the X Window System, without nonfree asm files" arch=('i686' 'x86_64' 'mips64el') url="http://www.jwz.org/xscreensaver/" license=('BSD') -depends=('libxxf86vm' 'libglade' 'glu' 'xorg-appres' 'libxmu' \ - 'perl-libwww' 'perl-http-message') -makedepends=('bc' 'libxpm' 'gdm' 'mesa') +depends=('libglade' 'xorg-appres' 'perl-libwww') +makedepends=('bc' 'libxpm' 'gdm') optdepends=('gdm: for login manager support') replaces=("${_pkgname}") conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") backup=('etc/pam.d/xscreensaver') source=(http://www.jwz.org/xscreensaver/${_pkgname}-${pkgver}.tar.gz \ - add-electricsheep.diff xscreensaver.pam LICENSE) -sha1sums=('cc44ddc538ad5b59ff851f70e8a48633763ff077' - '677496218b81a42d90bee400026e94dd87fb8ffb' - '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' + xscreensaver-add-electricsheep.diff LICENSE) +sha1sums=('b1d7f97d9b60d9c68c0f3e019cad885f5c7bd6ec' + 'e8dc57b6471fb3867ee099304ac6bf628351cb98' '4209ea586b204fd1d81c382a0522c654f9fd9134') -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" - patch -p0 -i "${srcdir}/add-electricsheep.diff" - - # Deleting dmsc.asm file due that don't have source code supplied +prepare() { + cd ${_pkgname}-${pkgver} + patch -p0 -i "${srcdir}/xscreensaver-add-electricsheep.diff" + + # Deleting dmsc.asm file due which don't have source code supplied rm -v hacks/images/m6502/dmsc.asm +} +build() { + cd ${_pkgname}-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib --with-x-app-defaults=/usr/share/X11/app-defaults \ --with-pam --with-login-manager --with-gtk --with-gl \ @@ -40,10 +41,10 @@ build() { } package() { - cd "${srcdir}/${_pkgname}-${pkgver}" + cd ${_pkgname}-${pkgver} + install -d "${pkgdir}/etc/pam.d" make install_prefix="${pkgdir}" install install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" - install -D -m644 ../xscreensaver.pam "${pkgdir}/etc/pam.d/xscreensaver" chmod 755 "${pkgdir}/usr/bin/xscreensaver" echo "NotShowIn=KDE;GNOME;" >> "${pkgdir}/usr/share/applications/xscreensaver-properties.desktop" } diff --git a/libre/xscreensaver-libre/add-electricsheep.diff b/libre/xscreensaver-libre/add-electricsheep.diff deleted file mode 100644 index 18b4dea97..000000000 --- a/libre/xscreensaver-libre/add-electricsheep.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- driver/XScreenSaver.ad.in-orig 2009-10-17 02:19:06.000000000 -0400 -+++ driver/XScreenSaver.ad.in 2009-10-17 02:21:16.000000000 -0400 -@@ -347,7 +347,8 @@ - @GL_KLUDGE@ GL: rubikblocks -root \n\ - @GL_KLUDGE@ GL: companioncube -root \n\ - @GL_KLUDGE@ GL: hilbert -root \n\ --@GL_KLUDGE@ GL: tronbit -root \n -+@GL_KLUDGE@ GL: tronbit -root \n\ -+ electricsheep --root 1 \n - - - diff --git a/libre/xscreensaver-libre/xscreensaver-add-electricsheep.diff b/libre/xscreensaver-libre/xscreensaver-add-electricsheep.diff new file mode 100644 index 000000000..0c5c3ff40 --- /dev/null +++ b/libre/xscreensaver-libre/xscreensaver-add-electricsheep.diff @@ -0,0 +1,10 @@ +--- driver/XScreenSaver.ad.in-orig 2013-07-16 16:47:10.183068023 -0400 ++++ driver/XScreenSaver.ad.in 2013-07-16 16:48:23.293473297 -0400 +@@ -157,6 +157,7 @@ + ! + *programs: \ + maze -root \n\ ++ electricsheep --root 1 \n\ + @GL_KLUDGE@ GL: superquadrics -root \n\ + attraction -root \n\ + blitspin -root \n\ diff --git a/libre/xscreensaver-libre/xscreensaver.pam b/libre/xscreensaver-libre/xscreensaver.pam deleted file mode 100644 index b4d80c21f..000000000 --- a/libre/xscreensaver-libre/xscreensaver.pam +++ /dev/null @@ -1 +0,0 @@ -auth required pam_unix_auth.so diff --git a/pcr/command-not-found/PKGBUILD b/pcr/command-not-found/PKGBUILD index d43b73c0e..e2131a3d5 100644 --- a/pcr/command-not-found/PKGBUILD +++ b/pcr/command-not-found/PKGBUILD @@ -1,47 +1,32 @@ +# Maintainer: Aurelien Desbrieres +# Contributor: Diogo Leal +# Contributor: Luke Shumaker # Contributor: Matthias Maennich -# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=command-not-found -pkgver=0.4.4 +pkgver=0.4.5 pkgrel=1 pkgdesc="In case a command could not be found this utility searches for packages containing this or a similar command (bash,zsh)." arch=('i686' 'x86_64') url="http://github.com/metti/command-not-found" -license=('GPL') +license=('GPL3') depends=('boost-libs' 'tdb' 'libarchive' 'wget') -makedepends=('boost' 'tdb' 'cmake' 'git') -source=('install') -md5sums=('2ea3c216fb0b7f8449f0225ece33210c') +makedepends=('boost' 'cmake') install='install' -_gitrepo="https://github.com/metti/$pkgname.git" +source=("libre://$pkgname-$pkgver.tar.gz") +mksource=("$pkgname-$pkgver::git+https://github.com/metti/$pkgname.git#tag=v${pkgver}") +mkmd5sums=('SKIP') build() { - cd $srcdir - msg "Connecting to the GIT server ..." - - if [[ -d $srcdir/$pkgname ]] ; then - cd $pkgname - git fetch origin - else - git clone $_gitrepo - cd $pkgname - fi - - git checkout v$pkgver - - msg "GIT checkout done" - - mkdir -p $srcdir/build - cd $srcdir/build - - cmake -D CMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="" $srcdir/$pkgname/src - make - + cd "$srcdir/$pkgname-$pkgver" + cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX="" src + make } package(){ - cd $srcdir/build - - make DESTDIR=$pkgdir install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } + +md5sums=('c055522251b2c58b9c6e0d0f0df481c0') diff --git a/pcr/command-not-found/install b/pcr/command-not-found/install index 26f49fa50..50e601258 100644 --- a/pcr/command-not-found/install +++ b/pcr/command-not-found/install @@ -7,8 +7,7 @@ post_upgrade() { } pre_remove() { - rm -rf /var/lib/cnf/*.db - rm -rf /var/lib/cnf/*.tdb + rm -f /var/lib/cnf/*.{db,tbd} } # vim:set ts=2 sw=2 et: diff --git a/pcr/etckeeper/PKGBUILD b/pcr/etckeeper/PKGBUILD index 163c320db..09a5d4d15 100644 --- a/pcr/etckeeper/PKGBUILD +++ b/pcr/etckeeper/PKGBUILD @@ -1,13 +1,12 @@ -# Maintainer (Parabola): Luke Shumaker +# Maintainer: Luke Shumaker # Maintainer (AUR): Buce # Contributor: Danie Roux - -# This requires makepkg newer than 4.0.3, which at this time means from git +# Contributor: Diogo Leal pkgname=etckeeper -pkgver=0.64 -pkgdesc="collection of tools to let /etc be stored in a git, hg, bzr or darcs repository." -url="http://kitenet.net/~joey/code/etckeeper/" +pkgver=1.4 +pkgdesc="Collection of tools to let /etc be stored in a git, hg, bzr or darcs repository." +url="http://joeyh.name/code/etckeeper/" license=('GPL2') pkgrel=1 @@ -16,28 +15,28 @@ depends=('inetutils' 'python2') makedepends=('bzr') # bzr must be there at compile time to have bzr support optdepends=('git' 'hg' 'bzr' 'darcs') backup=(etc/etckeeper/etckeeper.conf) -source=("etckeeper-$pkgver::git://git.kitenet.net/etckeeper#tag=${pkgver}" - etckeeper-pacman.patch - etckeeper-archlinux.conf) +source=("libre://$pkgname-$pkgver.tar.gz" $pkgname-pacman.patch $pkgname-archlinux.conf) + +mksource=("$pkgname-$pkgver::git://git.kitenet.net/$pkgname#tag=${pkgver}") +mkmd5sums=('SKIP') build() { - cd "$srcdir/etckeeper-$pkgver" + cd "${srcdir}/${pkgname}-${pkgver}" - # add pacman support to list-to `list-installed` - patch -p0 -i "$srcdir/etckeeper-pacman.patch" + # add pacman support to `list-installed` + patch -p0 -i "${srcdir}/${pkgname}-pacman.patch" # use python2 sed -i 's@^#!/usr/bin/python$@&2@' etckeeper-bzr/__init__.py - - make CONFFILE="$srcdir/etckeeper-archlinux.conf" build + make CONFFILE="${srcdir}/${pkgname}-archlinux.conf" build } package() { - cd "$srcdir/etckeeper-$pkgver" + cd "${srcdir}/${pkgname}-${pkgver}" - make CONFFILE="$srcdir/etckeeper-archlinux.conf" DESTDIR=$pkgdir install + make CONFFILE="${srcdir}/${pkgname}-archlinux.conf" DESTDIR="$pkgdir" install } -md5sums=('SKIP' +md5sums=('74be692fdb2d3352324e9332a270635d' 'f1f00bf9331d1ef7f29b0ac29cdfcbda' '99d8d2838f49fa0f2f21c9e37948100d') -- cgit v1.2.3-54-g00ecf From 09c5dbb237be55059b6816f81295f2f122742a0a Mon Sep 17 00:00:00 2001 From: root Date: Fri, 26 Jul 2013 01:14:24 -0700 Subject: Fri Jul 26 01:13:58 PDT 2013 --- community/activity-log-manager/PKGBUILD | 14 +- community/banner/PKGBUILD | 27 +++ community/dbmail/PKGBUILD | 9 +- community/flightgear/PKGBUILD | 4 +- community/gnubg/PKGBUILD | 38 ++++ community/gnubg/gnubg.desktop | 19 ++ community/gnubg/gnubg.install | 11 ++ community/mksh/PKGBUILD | 8 +- community/openscenegraph/PKGBUILD | 17 +- community/puzzles/PKGBUILD | 8 +- community/shhmsg/PKGBUILD | 25 +++ community/shhopt/PKGBUILD | 25 +++ community/simgear/PKGBUILD | 15 +- community/simgear/osg-3.2.patch | 22 +++ community/virtualbox-modules/PKGBUILD | 14 +- .../virtualbox-guest-modules.install | 2 +- .../virtualbox-host-modules.install | 2 +- core/nfs-utils/PKGBUILD | 4 +- core/nfs-utils/nfs-utils.install | 6 +- extra/git/PKGBUILD | 8 +- extra/gnome-control-center/PKGBUILD | 6 +- extra/harfbuzz/PKGBUILD | 6 +- extra/perl-dbi/PKGBUILD | 8 +- extra/xorg-iceauth/PKGBUILD | 6 +- libre/linux-libre/PKGBUILD | 4 +- libre/luxrender-libre/PKGBUILD | 47 +++-- pcr/gcc-lts/PKGBUILD | 28 +-- pcr/youtube-dl-current/PKGBUILD | 4 +- pcr/zoneminder/PKGBUILD | 209 +++++++++++++-------- pcr/zoneminder/sysctl-zoneminder.conf | 3 + pcr/zoneminder/zoneminder.install | 69 ++++--- 31 files changed, 458 insertions(+), 210 deletions(-) create mode 100644 community/banner/PKGBUILD create mode 100644 community/gnubg/PKGBUILD create mode 100644 community/gnubg/gnubg.desktop create mode 100644 community/gnubg/gnubg.install create mode 100644 community/shhmsg/PKGBUILD create mode 100644 community/shhopt/PKGBUILD create mode 100644 community/simgear/osg-3.2.patch create mode 100644 pcr/zoneminder/sysctl-zoneminder.conf (limited to 'libre/linux-libre/PKGBUILD') diff --git a/community/activity-log-manager/PKGBUILD b/community/activity-log-manager/PKGBUILD index e4a898185..d0334dd68 100644 --- a/community/activity-log-manager/PKGBUILD +++ b/community/activity-log-manager/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 92682 2013-06-12 04:38:43Z bgyorgy $ +# $Id: PKGBUILD 94510 2013-07-25 21:57:24Z bgyorgy $ # Maintainer: Balló György # Contributor: Ner0 pkgname=activity-log-manager -pkgver=0.9.5 +pkgver=0.9.7 pkgrel=1 pkgdesc="A graphical user interface which lets you easily control what gets logged by Zeitgeist" arch=('i686' 'x86_64') url="https://launchpad.net/activity-log-manager" license=('GPL2') -depends=('gtk3' 'libgee06' 'libzeitgeist' 'zeitgeist' 'hicolor-icon-theme' 'xdg-utils') +depends=('gtk3' 'libgee06' 'zeitgeist' 'hicolor-icon-theme' 'xdg-utils') makedepends=('vala' 'intltool') install=$pkgname.install source=(https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz - http://pkgbuild.com/~bgyorgy/sources/$pkgname-translations-20121021.tar.gz) -md5sums=('460b4439798badbf4ba4b76b31cc1d03' - '6167df74ce44659aa94a89f31ff4d351') + http://pkgbuild.com/~bgyorgy/sources/$pkgname-translations-20130725.tar.gz) +md5sums=('d886be32db0fa351aaf0eb59912ee377' + 'f7a284bca152011500cb845aebad8d14') build() { cd "$srcdir/$pkgname-$pkgver" @@ -25,6 +25,8 @@ build() { mv -f -t po ../po/* printf "%s\n" po/*.po | sed -e 's/po\///g' -e 's/\.po//g' >po/LINGUAS + rm src/activity_log_manager_vala.stamp + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var make } diff --git a/community/banner/PKGBUILD b/community/banner/PKGBUILD new file mode 100644 index 000000000..8720cb681 --- /dev/null +++ b/community/banner/PKGBUILD @@ -0,0 +1,27 @@ +# Maintainer: jsteel +# Contributor: Peter Simons + +pkgname=banner +pkgver=1.3.2 +pkgrel=4 +pkgdesc="Print large banners to ASCII terminals" +arch=('i686' 'x86_64') +url="http://shh.thathost.com/pub-unix" +license=('GPL') +depends=('glibc') +makedepends=('shhmsg' 'shhopt') +source=($url/files/$pkgname-$pkgver.tar.gz) +md5sums=('9bd1dc58d3bced525a19194b92d20217') + +build() { + cd "$srcdir"/$pkgname-$pkgver + + make OPTIM="$CFLAGS" dep + make OPTIM="$CFLAGS" +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + + make INSTBASEDIR="$pkgdir"/usr/ INSTMANDIR="$pkgdir"/usr/share/man/man1/ install +} diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD index fc653a61e..f32125942 100644 --- a/community/dbmail/PKGBUILD +++ b/community/dbmail/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 94428 2013-07-24 17:40:58Z spupykin $ +# $Id: PKGBUILD 94475 2013-07-25 13:27:16Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Sebastian Faltoni pkgname=dbmail -pkgver=3.1.0 +pkgver=3.1.1 pkgrel=1 pkgdesc="Fast and scalable sql based mail services" arch=('i686' 'x86_64') @@ -31,7 +31,7 @@ source=(http://www.dbmail.org/download/3.1/dbmail-${pkgver/_/-}.tar.gz dbmail-lmtpd.xinetd dbmail-pop3d.xinetd dbmail-timsieved.xinetd) -md5sums=('5dbf91cd8f562708fef904878a72e2fc' +md5sums=('8951dd9e055476fdf491c2dca013ede7' 'c4b5793c5422b62a675d4c66ff7e9300' '5a6297cb03c8d0b424f978ea1d7402de' '070db88538af9833f003f4cb516d337b' @@ -44,7 +44,8 @@ md5sums=('5dbf91cd8f562708fef904878a72e2fc' build() { cd $srcdir/dbmail-${pkgver/_/-}/ - [ -f Makefile ] || ./configure --prefix=/usr --sbindir=/usr/bin \ + [ -f Makefile ] || ./configure \ + --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc \ --with-ldap --with-sieve make } diff --git a/community/flightgear/PKGBUILD b/community/flightgear/PKGBUILD index 5cd15184b..61709421f 100644 --- a/community/flightgear/PKGBUILD +++ b/community/flightgear/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 92437 2013-06-05 11:05:37Z spupykin $ +# $Id: PKGBUILD 94473 2013-07-25 13:17:05Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: William Rea # Contributor: Hans Janssen pkgname=flightgear pkgver=2.10.0 -pkgrel=3 +pkgrel=4 pkgdesc="An open-source, multi-platform flight simulator" arch=(i686 x86_64) depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion' 'libxrandr' 'glu') diff --git a/community/gnubg/PKGBUILD b/community/gnubg/PKGBUILD new file mode 100644 index 000000000..5ad5b0c0b --- /dev/null +++ b/community/gnubg/PKGBUILD @@ -0,0 +1,38 @@ +# Maintainer: jsteel +# Contributor: Daniel J Griffiths +# Contributor: Stefan Clarke + +pkgname=gnubg +pkgver=1.01.003 +pkgrel=1 +pkgdesc="A world class backgammon application" +arch=('i686' 'x86_64') +url="http://www.gnubg.org" +license=('GPL') +depends=('python2' 'gtkglext' 'hicolor-icon-theme') +conflicts=('gnubg-cli' 'gnubg-cvs') +install=$pkgname.install +source=($url/media/sources/$pkgname-release-$pkgver-sources.tar.gz + $pkgname.desktop) +md5sums=('5b03cf8634abe2822eee4db1317f0754' + '965f5c7c25f60b27d06cc6fef7befd30') + +build() { + cd "$srcdir"/$pkgname-$pkgver + + ./autogen.sh + + ./configure --prefix=/usr --bindir=/usr/bin --sysconfdir=/etc \ + --mandir=/usr/share/man + + make +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + + make DESTDIR="$pkgdir"/ install + + install -Dm644 "$srcdir"/$pkgname.desktop \ + "$pkgdir"/usr/share/applications/$pkgname.desktop +} diff --git a/community/gnubg/gnubg.desktop b/community/gnubg/gnubg.desktop new file mode 100644 index 000000000..a0d3ba75d --- /dev/null +++ b/community/gnubg/gnubg.desktop @@ -0,0 +1,19 @@ +[Desktop Entry] +Name=GNU Backgammon +Name[hr]=GNU Tavla +Name[ru]=GNU Нарды +Name[sr]=ГНУ Тавла +GenericName=Backgammon +GenericName[hr]=Tavla +GenericName[ru]=Нарды +GenericName[sr]=Тавла +Comment=GNU Backgammon +Comment[hr]=GNU Tavla +Comment[ru]=GNU Короткие нарды +Comment[sr]=GNU Тавла +Exec=gnubg +Icon=gnubg +StartupNotify=true +Terminal=false +Type=Application +Categories=GTK;Game;StrategyGame; diff --git a/community/gnubg/gnubg.install b/community/gnubg/gnubg.install new file mode 100644 index 000000000..1a05f573e --- /dev/null +++ b/community/gnubg/gnubg.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/mksh/PKGBUILD b/community/mksh/PKGBUILD index 337e08c62..c2741f62f 100644 --- a/community/mksh/PKGBUILD +++ b/community/mksh/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 92251 2013-06-03 11:15:23Z allan $ +# $Id: PKGBUILD 94436 2013-07-25 05:59:37Z ttoepper $ # Maintainer: Thorsten Töpper # Contributor: Daniel Hommel pkgname=mksh -pkgver=R46 -pkgrel=3 +pkgver=R47 +pkgrel=1 pkgdesc='The MirBSD Korn Shell - an enhanced version of the public domain ksh' url='https://www.mirbsd.org/mksh.htm' license=('custom') @@ -13,7 +13,7 @@ depends=('gcc-libs') install=mksh.install source=("https://www.mirbsd.org/MirOS/dist/mir/mksh/$pkgname-$pkgver.tgz" 'https://www.mirbsd.org/TaC-mksh.txt') -md5sums=('77c108d8143a6e7670954d77517d216d' +md5sums=('71c7cbcd78306897801b8b6691091e66' 'a231b325d5f2155a6c667a9323986718') build() { diff --git a/community/openscenegraph/PKGBUILD b/community/openscenegraph/PKGBUILD index 3ef92191b..35d9de6fd 100644 --- a/community/openscenegraph/PKGBUILD +++ b/community/openscenegraph/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 90073 2013-05-06 19:38:55Z foutrelis $ +# $Id: PKGBUILD 94454 2013-07-25 10:41:28Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Hans Janssen # Contributor: my64 # Contributor: Colin Pitrat pkgname=openscenegraph -pkgver=3.0.1 -pkgrel=10 +pkgver=3.2.0 +pkgrel=1 pkgdesc="An Open Source, high performance real-time graphics toolkit" arch=('i686' 'x86_64') license=('custom:OSGPL') @@ -16,11 +16,9 @@ makedepends=('cmake' 'libvncserver' 'qt4' 'ffmpeg-compat' 'mesa') optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib' 'qt4') conflicts=('openthreads') provides=('openthreads') -source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip - osg-xine-1.2.patch) -#source=("http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-3.0/source/OpenSceneGraph-$pkgver.zip") -md5sums=('c43a25d023e635c3566b2083d8e6d956' - 'b05a486fdc2aaf06b29efb5e0714672e') +#source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip +source=(http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-$pkgver.zip) +md5sums=('4980f8692712a24d4c99f363f80c6814') build() { cd OpenSceneGraph-$pkgver @@ -42,8 +40,7 @@ build() { -DFFMPEG_LIBSWSCALE_INCLUDE_DIRS=/usr/include/ffmpeg-compat \ -DFFMPEG_LIBSWSCALE_LIBRARIES=/usr/lib/ffmpeg-compat/libswscale.so - sed -i 's|#include |//#include |' src/osgPlugins/curl/ReaderWriterCURL.cpp - patch -p1 <$srcdir/osg-xine-1.2.patch +# sed -i 's|#include |//#include |' src/osgPlugins/curl/ReaderWriterCURL.cpp make } diff --git a/community/puzzles/PKGBUILD b/community/puzzles/PKGBUILD index e40de4723..68fd24c76 100644 --- a/community/puzzles/PKGBUILD +++ b/community/puzzles/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: schuay pkgname=puzzles -pkgver=9840 +pkgver=9893 pkgrel=1 pkgdesc="Simon Tatham's Portable Puzzle Collection" arch=('i686' 'x86_64') @@ -19,9 +19,9 @@ build() { ./mkfiles.pl - sed -i 's|\$(gamesdir)|\$(bindir)|' Makefile + sed -i 's|\$(gamesdir)|\$(bindir)|' Makefile.gtk - make prefix=/usr + make -f Makefile.gtk prefix=/usr } package() { @@ -30,7 +30,7 @@ package() { install -d ${pkgdir}/usr/{bin,share/licenses/${pkgname}} install -Dm644 LICENCE ${pkgdir}/usr/share/licenses/${pkgname}/ - make prefix=/usr DESTDIR=${pkgdir} install + make -f Makefile.gtk prefix=/usr DESTDIR=${pkgdir} install #fix FS#14600 mv ${pkgdir}/usr/bin/net ${pkgdir}/usr/bin/puzzles-net diff --git a/community/shhmsg/PKGBUILD b/community/shhmsg/PKGBUILD new file mode 100644 index 000000000..f1ef76668 --- /dev/null +++ b/community/shhmsg/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: jsteel +# Contributor: Peter Simons + +pkgname=shhmsg +pkgver=1.4.1 +pkgrel=1 +pkgdesc="Library for displaying messages" +arch=('i686' 'x86_64') +url="http://shh.thathost.com/pub-unix" +license=('GPL') +source=($url/files/$pkgname-$pkgver.tar.gz) +md5sums=('de300150851786eb19cb9b9ad234d7a2') + +build() { + cd "$srcdir"/$pkgname-$pkgver + + make OPTIM="$CFLAGS" dep + make OPTIM="$CFLAGS" +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + + make OPTIM="$CFLAGS" INSTBASEDIR="$pkgdir"/usr/ install +} diff --git a/community/shhopt/PKGBUILD b/community/shhopt/PKGBUILD new file mode 100644 index 000000000..701b32fdb --- /dev/null +++ b/community/shhopt/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: jsteel +# Contributor: Peter Simons + +pkgname=shhopt +pkgver=1.1.7 +pkgrel=1 +pkgdesc="Library for parsing command line options" +arch=('i686' 'x86_64') +url="http://shh.thathost.com/pub-unix" +license=('GPL') +source=($url/files/$pkgname-$pkgver.tar.gz) +md5sums=('caf24206354296e8a48771aea1f47fbd') + +build() { + cd "$srcdir"/$pkgname-$pkgver + + make OPTIM="$CFLAGS" dep + make OPTIM="$CFLAGS" +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + + make OPTIM="$CFLAGS" INSTBASEDIR="$pkgdir"/usr/ install +} diff --git a/community/simgear/PKGBUILD b/community/simgear/PKGBUILD index 1e2c8dfc2..af8420930 100644 --- a/community/simgear/PKGBUILD +++ b/community/simgear/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 84416 2013-02-18 20:14:11Z spupykin $ +# $Id: PKGBUILD 94470 2013-07-25 12:34:11Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: William Rea # Contributor: Hans Janssen pkgname=simgear pkgver=2.10.0 -pkgrel=1 +pkgrel=2 pkgdesc="A set of open-source libraries designed to be used as building blocks for quickly assembling 3d simulations, games, and visualization applications." arch=(i686 x86_64) depends=('glut' 'freealut' 'plib' 'openscenegraph') @@ -15,8 +15,15 @@ license=("GPL") url="https://gitorious.org/fg" options=('!makeflags') #source=("SimGear-$pkgver.tar.gz::https://gitorious.org/fg/simgear/archive-tarball/release/$pkgver") -source=("http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/simgear-$pkgver.tar.bz2") -md5sums=('0ec974d3778f777d5c99c89db671fcc7') +source=("http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/simgear-$pkgver.tar.bz2" + "osg-3.2.patch") +md5sums=('0ec974d3778f777d5c99c89db671fcc7' + 'd7f35f02d88c6ef9c58e07b8431811e6') + +prepare() { + cd $srcdir/simgear-$pkgver + patch -p1 <$srcdir/osg-3.2.patch +} build() { cd $srcdir/simgear-$pkgver diff --git a/community/simgear/osg-3.2.patch b/community/simgear/osg-3.2.patch new file mode 100644 index 000000000..30d732ad6 --- /dev/null +++ b/community/simgear/osg-3.2.patch @@ -0,0 +1,22 @@ +diff -wbBur simgear-2.10.0/simgear/scene/material/EffectGeode.cxx simgear-2.10.0.q/simgear/scene/material/EffectGeode.cxx +--- simgear-2.10.0/simgear/scene/material/EffectGeode.cxx 2011-06-29 18:58:56.000000000 +0400 ++++ simgear-2.10.0.q/simgear/scene/material/EffectGeode.cxx 2013-07-25 16:14:24.268934729 +0400 +@@ -80,15 +80,15 @@ + int n = _effect->getGenerator(Effect::TANGENT); + tsg->generate(geometry, 0); // 0 is normal_unit, but I have no idea what that is! + if (n != -1 && !geometry->getVertexAttribArray(n)) +- geometry->setVertexAttribData(n, osg::Geometry::ArrayData(tsg->getTangentArray(), osg::Geometry::BIND_PER_VERTEX,GL_FALSE)); ++ geometry->setVertexAttribArray(n, tsg->getTangentArray(), osg::Array::BIND_PER_VERTEX); + + n = _effect->getGenerator(Effect::BINORMAL); + if (n != -1 && !geometry->getVertexAttribArray(n)) +- geometry->setVertexAttribData(n, osg::Geometry::ArrayData(tsg->getBinormalArray(), osg::Geometry::BIND_PER_VERTEX,GL_FALSE)); ++ geometry->setVertexAttribArray(n, tsg->getBinormalArray(), osg::Array::BIND_PER_VERTEX); + + n = _effect->getGenerator(Effect::NORMAL); + if (n != -1 && !geometry->getVertexAttribArray(n)) +- geometry->setVertexAttribData(n, osg::Geometry::ArrayData(tsg->getNormalArray(), osg::Geometry::BIND_PER_VERTEX,GL_FALSE)); ++ geometry->setVertexAttribArray(n, tsg->getNormalArray(), osg::Array::BIND_PER_VERTEX); + } + } + diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index 4d220f40b..51b0f410c 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 93524 2013-07-05 00:43:46Z seblu $ +# $Id: PKGBUILD 94462 2013-07-25 11:22:57Z tpowa $ # Maintainer: Ionut Biru # Maintainer: Sébastien Luttringer pkgbase=virtualbox-modules pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') pkgver=4.2.16 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') -makedepends=('linux>=3.9' 'linux<3.10' - 'linux-headers>=3.9' 'linux-headers<3.10' +makedepends=('linux>=3.10' 'linux<3.11' + 'linux-headers>=3.10' 'linux-headers<3.11' "virtualbox-host-dkms>=$pkgver" "virtualbox-guest-dkms>=$pkgver" 'expac' @@ -18,7 +18,7 @@ makedepends=('linux>=3.9' 'linux<3.10' 'bc') # remember to also adjust the .install files and the package deps below -_extramodules=extramodules-3.9-ARCH +_extramodules=extramodules-3.10-ARCH build() { _kernver="$(cat /usr/lib/modules/$_extramodules/version)" @@ -36,7 +36,7 @@ build() { package_virtualbox-host-modules(){ _kernver="$(cat /usr/lib/modules/$_extramodules/version)" pkgdesc='Host kernel modules for VirtualBox' - depends=('linux>=3.9' 'linux<3.10') + depends=('linux>=3.10' 'linux<3.11') replaces=('virtualbox-modules') conflicts=('virtualbox-modules') install=virtualbox-host-modules.install @@ -51,7 +51,7 @@ package_virtualbox-guest-modules(){ _kernver="$(cat /usr/lib/modules/$_extramodules/version)" pkgdesc='Guest kernel modules for VirtualBox' license=('GPL') - depends=('linux>=3.9' 'linux<3.10') + depends=('linux>=3.10' 'linux<3.11') replaces=('virtualbox-archlinux-modules') conflicts=('virtualbox-archlinux-modules') install=virtualbox-guest-modules.install diff --git a/community/virtualbox-modules/virtualbox-guest-modules.install b/community/virtualbox-modules/virtualbox-guest-modules.install index 169dd9a35..ed1762c21 100644 --- a/community/virtualbox-modules/virtualbox-guest-modules.install +++ b/community/virtualbox-modules/virtualbox-guest-modules.install @@ -1,5 +1,5 @@ _depmod() { - EXTRAMODULES='extramodules-3.9-ARCH' + EXTRAMODULES='extramodules-3.10-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/community/virtualbox-modules/virtualbox-host-modules.install b/community/virtualbox-modules/virtualbox-host-modules.install index b1c7a68c6..2f7f00d9e 100644 --- a/community/virtualbox-modules/virtualbox-host-modules.install +++ b/community/virtualbox-modules/virtualbox-host-modules.install @@ -1,5 +1,5 @@ _depmod() { - EXTRAMODULES='extramodules-3.9-ARCH' + EXTRAMODULES='extramodules-3.10-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD index 7822b0465..df05a0fac 100644 --- a/core/nfs-utils/PKGBUILD +++ b/core/nfs-utils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188861 2013-06-23 11:12:05Z tpowa $ +# $Id: PKGBUILD 191387 2013-07-25 11:24:46Z tpowa $ # Maintainer: Tobias Powalowski # Contributor: John Proctor # Contributor: dibblethewrecker @@ -7,7 +7,7 @@ pkgname=nfs-utils pkgver=1.2.8 -pkgrel=8 +pkgrel=9 pkgdesc="Support programs for Network File Systems" arch=('i686' 'x86_64') url='http://nfs.sourceforge.net' diff --git a/core/nfs-utils/nfs-utils.install b/core/nfs-utils/nfs-utils.install index 7dcdf9575..f6c72d915 100644 --- a/core/nfs-utils/nfs-utils.install +++ b/core/nfs-utils/nfs-utils.install @@ -5,9 +5,9 @@ cat << 'EOM' ==> Extended configuration options for NFS (clients & server) are available in ==> /etc/conf.d/nfs-common.conf and in /etc/conf.d/nfs-server.conf ==> - ==> Please refer to http://wiki.archlinux.org/index.php/Nfs - ==> for further information on NFS; for NFSv4, refer to - ==> http://wiki.archlinux.org/index.php/NFSv4 + ==> Please refer to http://wiki.archlinux.org/index.php/NFS + ==> for further information on NFS4; for NFSv3, refer to + ==> http://wiki.archlinux.org/index.php/NFSv3 EOM } diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index de0896e8b..dd226717f 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 190122 2013-07-15 22:43:53Z dan $ +# $Id: PKGBUILD 191563 2013-07-25 14:47:59Z dan $ # Maintainer: Dan McGee pkgname=git -pkgver=1.8.3.3 +pkgver=1.8.3.4 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) @@ -111,7 +111,7 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('63f5355259bae32858dac07326fe4e07' - '99625bedd599c5970e2e3d2d05e8cbc3' +md5sums=('80eec3201a5d012913d287b85adaee8e' + '86fd812754d25201fd72c7476045dfec' '042524f942785772d7bd52a1f02fe5ae' 'f67869315c2cc112e076f0c73f248002') diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD index 4b2129bb6..1770b3cad 100644 --- a/extra/gnome-control-center/PKGBUILD +++ b/extra/gnome-control-center/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 187908 2013-06-07 23:36:32Z heftig $ +# $Id: PKGBUILD 191381 2013-07-25 09:28:55Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot pkgname=gnome-control-center -pkgver=3.8.3 +pkgver=3.8.4.1 pkgrel=1 pkgdesc="The Control Center for GNOME" license=(GPL) @@ -23,7 +23,7 @@ url="http://www.gnome.org" install=gnome-control-center.install options=('!libtool' '!emptydirs') source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) -sha256sums=('e78a5b01692ccfe825e079d795d9e9610fcb94853c0e6d747b2d8d36dead9d84') +sha256sums=('3cfc5b93ca12f498c075f5b5356e0af4a0aaee003c0a90a4309bc12876f40c55') build() { cd $pkgname-$pkgver diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD index 6b535049b..370827844 100644 --- a/extra/harfbuzz/PKGBUILD +++ b/extra/harfbuzz/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 187876 2013-06-07 17:10:53Z heftig $ +# $Id: PKGBUILD 191565 2013-07-25 16:28:52Z heftig $ # Maintainer: Jan de Groot pkgbase=(harfbuzz) pkgname=(harfbuzz harfbuzz-icu) -pkgver=0.9.18 +pkgver=0.9.19 pkgrel=1 pkgdesc="OpenType text shaping engine" arch=(i686 x86_64) @@ -12,7 +12,7 @@ license=(MIT) makedepends=(glib2 freetype2 graphite cairo icu) options=(!libtool) source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgbase}-${pkgver}.tar.bz2) -sha256sums=('fef0fbbc6d6492cb4074a5e26a699d87d88bef8adc25dda62af6077735a7d908') +sha256sums=('d2da0f060d47f6ad9de8c8781bb21fa4b9eae8ea1cd1e956b814095baa002f35') build() { cd $pkgbase-$pkgver diff --git a/extra/perl-dbi/PKGBUILD b/extra/perl-dbi/PKGBUILD index c7a3a5a8e..b913e9959 100644 --- a/extra/perl-dbi/PKGBUILD +++ b/extra/perl-dbi/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 186584 2013-05-29 15:44:45Z eric $ +# $Id: PKGBUILD 191377 2013-07-24 22:05:06Z eric $ # Maintainer: pkgname=perl-dbi -pkgver=1.627 +pkgver=1.628 pkgrel=1 pkgdesc="Database independent interface for Perl" arch=('i686' 'x86_64') license=('GPL' 'PerlArtistic') -url="http://search.cpan.org/dist/${_realname}/" +url="http://search.cpan.org/dist/DBI/" depends=('perl') options=('!emptydirs') source=(http://www.cpan.org/authors/id/T/TI/TIMB/DBI-${pkgver}.tar.gz) -md5sums=('aab49be51b0f4867a1894145b023d2c5') +md5sums=('4273f8cc6ee3979ce448c7eb3f8a6a5a') build() { cd DBI-${pkgver} diff --git a/extra/xorg-iceauth/PKGBUILD b/extra/xorg-iceauth/PKGBUILD index 9063e3a4d..6a851a494 100644 --- a/extra/xorg-iceauth/PKGBUILD +++ b/extra/xorg-iceauth/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 125572 2011-05-26 20:17:22Z andyrtr $ +# $Id: PKGBUILD 191580 2013-07-25 21:13:50Z andyrtr $ # Maintainer: Jan de Groot pkgname=xorg-iceauth -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=1 pkgdesc="ICE authority file utility" arch=(i686 x86_64) @@ -12,7 +12,7 @@ depends=('libice') makedepends=('xorg-util-macros' 'xproto') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/iceauth-${pkgver}.tar.bz2) -sha1sums=('d996c6ecaa93dcaccee4a11991eeacd40bddc13e') +sha256sums=('bd990837353b439e6f45d478a87b8dbfa3f67d72d903e7a9ed4eb8de52f2e2f4') build() { cd "${srcdir}/iceauth-${pkgver}" diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 37ec6585b..90b6a45c5 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -13,7 +13,7 @@ _basekernel=3.10 _sublevel=2 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.2 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -39,7 +39,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - '223606d6db3504732aab7711833a30fb') + 'dd620e4cb68341f847686c000d8038e8') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD index 443f45485..0c109a5d1 100644 --- a/libre/luxrender-libre/PKGBUILD +++ b/libre/luxrender-libre/PKGBUILD @@ -1,54 +1,61 @@ -# $Id: PKGBUILD 93800 2013-07-10 11:24:05Z stativ $ +# $Id$ # Maintainer: Lukas Jirkovsky # Contributor: flixie <69one@gmx.net> # Contributor: Imanol Celaya # Maintainer (Parabola): Márcio Silva -pkgname=luxrender-libre -_pkgflag=libre +_pkgname=luxrender +pkgname=$_pkgname-libre pkgver=1.2.1 _pkgver=3066b2161439 pkgrel=5 pkgdesc="Rendering system for physically correct, unbiased image synthesis, without nonfree OpenCL recommendation" arch=('i686' 'x86_64' 'mips64el') -url="http://www.${pkgname%-$_pkgflag}.net/" +url="http://www.$_pkgname.net/" license=('GPL') -depends=('boost-libs' 'freeimage' 'openexr' 'libcl' 'libgl') +depends=('boost-libs' 'freeimage' 'openexr' 'libcl-libre' 'mesa-libgl') optdepends=('blender-addon-luxrender: Blender for renderer and exporter' 'qt4: Qt GUI' \ 'python: Python interface (pylux)') -makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=${pkgver::3}" 'python' 'opencl-headers') -provides=(${pkgname%-$_pkgflag}=$pkgver) -conflicts=${pkgname%-$_pkgflag} -replaces=${pkgname%-$_pkgflag} -source=(https://bitbucket.org/${pkgname%-$_pkgflag}/lux/get/$_pkgver.tar.bz2 +makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers') +makedepends+=('gcc-lts') +provides=($_pkgname=$pkgver) +conflicts=$_pkgname +replaces=$_pkgname +source=(https://bitbucket.org/$_pkgname/lux/get/$_pkgver.tar.bz2 boost-1.53-shared_array_constructor.diff) md5sums=( '87958798c164ad14f92fb4af2595d332' 'dd19c7ac2ba8c9b703018a176ef77f98') -build() { - cd "$srcdir"/${pkgname%-$_pkgflag}-lux-$_pkgver +prepare() { + cd "$srcdir"/$_pkgname-lux-$_pkgver # fix the installation - sed -i '/.*wxgui.*/ d' CMakeLists.txt + sed -i '/.*wxgui.*/ d + s|-ftree-vectorize || + ' CMakeLists.txt # fix for boost 1.53 patch -Np1 < "$srcdir/boost-1.53-shared_array_constructor.diff" || true export CXXFLAGS="$CXXFLAGS -lpthread" - setarch $CARCH cmake -DCMAKE_INSTALL_PREFIX=/usr \ +} + +build() { + cd "$srcdir"/$_pkgname-lux-$_pkgver + + cmake . -DCMAKE_INSTALL_PREFIX=/usr \ -DLUXRAYS_DISABLE_OPENCL=OFF \ -DPYTHON_CUSTOM=ON \ -DPYTHON_LIBRARIES=/usr/lib/libpython3.3m.so \ - -DPYTHON_INCLUDE_PATH=/usr/include/python3.3m/ \ - . - setarch $CARCH make + -DPYTHON_INCLUDE_PATH=/usr/include/python3.3m + make } package() { - cd "$srcdir"/${pkgname%-$_pkgflag}-lux-$_pkgver + cd "$srcdir"/$_pkgname-lux-$_pkgver setarch $CARCH make DESTDIR="$pkgdir" install - # fix library path on x86_64 - [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib + # fix library path on 64bit + [[ $CARCH == x86_64 ]] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib #install pylux install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.3/pylux.so diff --git a/pcr/gcc-lts/PKGBUILD b/pcr/gcc-lts/PKGBUILD index c3ab693d3..b1280fad9 100644 --- a/pcr/gcc-lts/PKGBUILD +++ b/pcr/gcc-lts/PKGBUILD @@ -8,7 +8,7 @@ #pkgname=('gcc-lts' 'gcc-lts-libs' 'gcc-lts-fortran' 'gcc-lts-objc' 'gcc-lts-ada' 'gcc-lts-go') pkgname=('gcc-lts' 'gcc-lts-libs' 'gcc-lts-fortran' 'gcc-lts-objc' 'gcc-lts-go') pkgver=4.7.3 -pkgrel=1 +pkgrel=3 pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL' 'custom') @@ -96,9 +96,9 @@ check() { package_gcc-lts-libs() { pkgdesc="Runtime libraries shipped by GCC" - groups=('base') + groups=('lts') depends=('glibc>=2.17') - provides=('gcc-libs') + provides=("gcc-libs=$pkgver") conflicts=('gcc-libs') install=gcc-libs.install @@ -134,10 +134,10 @@ package_gcc-lts-libs() package_gcc-lts() { pkgdesc="The GNU Compiler Collection - C and C++ frontends" - depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.23' 'libmpc' 'cloog' 'ppl') - provides=('gcc') + depends=("gcc-lts-libs=$pkgver" 'binutils>=2.23' 'libmpc' 'cloog' 'ppl') + provides=("gcc=$pkgver") conflicts=('gcc') - groups=('base-devel') + groups=('lts-devel') install=gcc.install cd ${srcdir}/gcc-build @@ -212,8 +212,8 @@ EOF package_gcc-lts-fortran() { pkgdesc="Fortran front-end for GCC" - depends=("gcc=$pkgver-$pkgrel") - provides=('gcc-fortran') + depends=("gcc-lts=$pkgver") + provides=("gcc-fortran=$pkgver") conflicts=('gcc-fortran') install=gcc-fortran.install @@ -241,8 +241,8 @@ package_gcc-lts-fortran() package_gcc-lts-objc() { pkgdesc="Objective-C front-end for GCC" - depends=("gcc=$pkgver-$pkgrel") - provides=('gcc-objc') + depends=("gcc-lts=$pkgver") + provides=("gcc-objc=$pkgver") conflicts=('gcc-objc') cd ${srcdir}/gcc-build @@ -264,8 +264,8 @@ package_gcc-lts-objc() package_gcc-lts-ada() { pkgdesc="Ada front-end for GCC (GNAT)" - depends=("gcc=$pkgver-$pkgrel") - provides=('gcc-ada') + depends=("gcc-lts=$pkgver") + provides=("gcc-ada=$pkgver") conflicts=('gcc-ada') install=gcc-ada.install @@ -283,8 +283,8 @@ package_gcc-lts-ada() package_gcc-lts-go() { pkgdesc="Go front-end for GCC" - depends=("gcc=$pkgver-$pkgrel") - provides=('gcc-go') + depends=("gcc-lts=$pkgver") + provides=("gcc-go=$pkgver") conflicts=('gcc-go') install=gcc-go.install diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD index 84845960e..a2d174304 100644 --- a/pcr/youtube-dl-current/PKGBUILD +++ b/pcr/youtube-dl-current/PKGBUILD @@ -5,7 +5,7 @@ pkgname=youtube-dl-current _pkgname=youtube-dl provides=(youtube-dl) -pkgver=2013.07.24.2 +pkgver=2013.07.25.2 pkgrel=1 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites" arch=('any') @@ -14,7 +14,7 @@ license=('custom') depends=('python') makedepends=('python-distribute') source=(http://youtube-dl.org/downloads/${pkgver}/${_pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('7ffcae6db1e5387a5f002e195da23cf4' +md5sums=('db09e5672c674ccadd3c9afed77189d9' 'SKIP') prepare() { diff --git a/pcr/zoneminder/PKGBUILD b/pcr/zoneminder/PKGBUILD index bf03b4133..ede03dd77 100644 --- a/pcr/zoneminder/PKGBUILD +++ b/pcr/zoneminder/PKGBUILD @@ -7,27 +7,24 @@ # based of debian squeeze package -pkgbase=zoneminder +_automake=1.14 + pkgname=zoneminder pkgver=1.25.0 -pkgrel=27 +pkgrel=28 pkgdesc='Capture, analyse, record and monitor video security cameras' arch=( - i686 - x86_64 mips64el - arm -) -backup=( - etc/zm.conf -) -url="http://www.$pkgbase.com" -license=( - GPL + x86_64 + i686 ) +backup=etc/zm.conf +url=http://www.$pkgname.com +license=GPL2 depends=( apache cambozola + ffmpeg gnutls mariadb perl-archive-zip @@ -48,108 +45,158 @@ depends=( php-gd php-mcrypt ) -makedepends=( - netpbm -) -optdepends=( - netpbm -) -install=$pkgbase.install +makedepends=netpbm +optdepends=netpbm +options=(!libtool) +install=$pkgname.install source=( - http://www.$pkgbase.com/downloads/ZoneMinder-$pkgver.tar.gz - httpd-$pkgbase.conf - $pkgbase - $pkgbase.service - zoneminder-1.25.0-kernel35.patch - zoneminder-1.25.0-gcc47.patch - zoneminder-1.25.0-ffmpeg.patch - zoneminder-1.25-text.patch - zoneminder-1.25-fixwarning.patch - zoneminder-1.25.0-gcrypt.patch + http://www.$pkgname.com/downloads/ZoneMinder-$pkgver.tar.gz + httpd-$pkgname.conf + $pkgname.service + sysctl-$pkgname.conf + $pkgname-$pkgver-ffmpeg.patch + $pkgname-$pkgver-gcrypt.patch ) sha512sums=( 3e18993b0539729491052c97d8c94227ccc089eb40277c2f07682f30049033303c7cfe9734fdac6d33ae67df29c76eb72bf7fbb5dae8227e8831fa603b61c375 4ce0d8eba9d006d258f5b8a83920fc17f1f602b96518d37b7a47cd9b6eb84ef2587641a6ba839a469c3f0e33b46475866187279ae3f8be0d4054b074ee5d6b08 - ab4e1d5ddaf4d9cd53d6ca59d7965902afd6a2dc830fbbafa270736c52c2b3563075fee860bb0276466f96e9dbfb71b259ac45a4ae2e4ead8eaec154a0159eb0 cfb0eb87a989236c72741a496ddc6a73aa2696e5beaaca4836d3c231ddb24c7ef5e9f65e7afa49674f2115cbfa4a07c75486e1947ce294c816ddbb875f3b99cf - 4fa79e49a3c04e9fdc9823792c6a28012002479c77ed41637bd2d21f089e4c15592bfcd5c24028f356c9f80d774a5080a6841e8e70a435d607e3089d0b121775 - 3da7d4d21dea166ea12b49e88a05a9f7a75790881a1f2d7588fa9e0e6ce592b4b5ee71994fa8b05236efeeb57890157a622c752c12a9059c2ee915adf3b4660d + 7330c179f1e2db815a675560d3d84648be02f7d0292f8cbe21d6033577fe688ed71ad23b5b8c9dc309395b45ebb554f9499e7a4b57091959b69679011fa59044 7fc2a4663c3103bef641be065bd7992a2b3dc0699f1b99dc2fdb34c1c48e58686e490d3ade523ef7c8e29b3f04109658eef652c26ff6ee3fb9aee65453bdb6c4 - 17b85051543c34a41c6b94ec8f46a10927aa4bc9554562650788c8257ffba8e362500cf3641708f2f9dabebc663a2d012fa9feacd7f9b33c637fbc965d405adf - 8eab0a922968465fee8537dc035ce781e51dc84cc05259a32acb5bf59c618bc1700dbf4eec90717ed5959841def119357974d109df8d7450c12ca4ea8576e55c 8c9e7debcaf60be1c2dda656f95e497f6812d704edc3ca4a1c915a3b3c9dc1749c91d96bc2d60db7d90d5edfd9e2dfc39010dfe4feabfecfffd27f1fffc3d675 ) +prepare() { + cd $srcdir/ZoneMinder-$pkgver + + # Patch for automake + sed -i "\|^am__api_version=| s|1[.]11|$_automake|; + " configure + + # Patch for GCC + sed -i 's|^#include [<]errno[.]h[>]$|#include \n#include |; + ' src/zm_logger.cpp + sed -i 's|^#include [<]pthread[.]h[>]$|#include \n#include |; + ' src/zm_thread.h + sed -i 's|^#include [<]fcntl[.]h[>]$|#include \n#include |; + ' src/zm_local_camera.cpp + + # Patch for type cast in linux-libre kernel 3.5 and for wrong type "suppported" + sed -i 's|enum v4l2_buf_type type = v4l2_data[.]fmt[.]type|enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type|; + s|suppported|supported|; + ' src/zm_local_camera.cpp + + # configure crash on i686 + [[ $CARCH != i686 ]] && { + # Patch for fixing warning + sed -i 's|pdest[+][+] = ([*]blend_ptr)\[[*]pdest]\[[*]psrc[+][+]]|pdest = (*blend_ptr)[*pdest][*psrc++];\n pdest++|; + ' src/zm_image.cpp + } + + # Patch for support ffmpeg with + #sed -i 's|^extern "C" {|extern "C" {\n#ifdef _STDINT_H\n#undef _STDINT_H\n#endif\n#include |; + # s|^#include |#include \n#include |; + # ' src/zm_ffmpeg.h + + # Patch for support C library + #sed -i 's|^AM_CONFIG_HEADER(config[.]h)|AM_CONFIG_HEADER(config.h)\n\nAC_SUBST([AM_CXXFLAGS], [-D__STDC_CONSTANT_MACROS])|; + # s|^AC_CHECK_HEADERS(mysql/mysql[.]h,,AC_MSG_ERROR(zm requires MySQL headers - check that MySQL development packages are installed),)|AC_CHECK_HEADERS(mysql/mysql.h,,AC_MSG_ERROR(zm requires MySQL headers - check that MySQL development packages are installed),)\nAC_LANG_PUSH([C])|; + # s|^AC_CHECK_HEADERS(libswscale/swscale[.]h,,,)|AC_CHECK_HEADERS(libswscale/swscale.h,,,)\nAC_LANG_POP([C])|; + # ' configure.ac + + # Patch for disable ZM_CHECK_FOR_UPDATES + sed -i '\|ZM_CHECK_FOR_UPDATES|,+1 s|yes|no|; + ' scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in + + # Patch for support html5 video and flv + sed -i '\|ZM_MPEG_LIVE_FORMAT|,+1 s|swf|webm|; + \|ZM_MPEG_REPLAY_FORMAT|,+1 s|swf|webm|; + \|ZM_FFMPEG_FORMATS|,+1 s|mpg mpeg wmv asf avi[*] mov swf 3gp[*][*]|mpg mpeg wmv asf avi* mov flv swf 3gp** webm ogg h264|; + ' scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in + + # Patch for change path run dir and for change ZM name to ZoneMinder + sed -i '\|ZM_PATH_SOCKS|,+1 s|TMP|RUN|; + \|ZM_WEB_TITLE_PREFIX|,+1 s|"ZM"|"ZoneMinder"|; + ' scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in + + # Patch for v4l2 convert support + sed -i 's|^$ENV{SHELL} = '"'/bin/sh'"' if exists $ENV{SHELL}|$ENV{SHELL} = '"'/bin/sh'"' if exists $ENV{SHELL};\n$ENV{LD_PRELOAD} = '"'/usr/lib/libv4l/v4l2convert.so'"' |; + ' scripts/zmdc.pl.in + + # Patch for add more socket tries + sed -i '\|^$max_socket_tries = | s|3|15|; + ' web/ajax/stream.php + + # Patch for text + sed -i 's|if ( fwrite( buffer, n_bytes, 1, stdout ) )|if ( fwrite( buffer, n_bytes, 1, stdout ) != 1 )|; + ' src/zm_stream.cpp + + # Patch for remove HACK in Makefile.* + sed -i '\|This is a HACK|d; + \|^install-data-hook:$|,+5 d; + s| install-data-hook||; + \|^uninstall-hook:$|,+5 d; + s| uninstall-hook||; + ' Makefile.{am,in} + + # Patch + for _patch in ffmpeg gcrypt; do + patch -Np1 -F99 -i $srcdir/$pkgname-$pkgver-$_patch.patch + done +} + build() { cd $srcdir/ZoneMinder-$pkgver - # Patch for change ZM name to ZoneMinder - sed -i -e '/ZM_WEB_TITLE_PREFIX/,+1 s/"ZM"/"ZoneMinder"/'\ - scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read - sed -i -e '/am__api_version=/ s/1.11/1.13.1/'\ - configure || read - # Patch for add more socket tries - sed -i -e '/$max_socket_tries/ s/3/15/'\ - web/ajax/stream.php || read - # Patch for support html5 video and flv - sed -i -e '/ZM_MPEG_LIVE_FORMAT/,+1 s/swf/webm/;/ZM_MPEG_REPLAY_FORMAT/,+1 s/swf/webm/; - /ZM_FFMPEG_FORMATS/,+1 s/mpg mpeg wmv asf avi\* mov swf 3gp\*\*/mpg mpeg wmv asf avi\* mov flv swf 3gp\*\* webm ogg h264/'\ - scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read - # Patch for wrong "suppported" - sed -i -e 's/suppported/supported/'\ - src/zm_local_camera.cpp || read - - - patch -Np1 -F99 -i ../zoneminder-1.25.0-kernel35.patch - patch -Np1 -F99 -i ../zoneminder-1.25.0-gcc47.patch - patch -Np1 -F99 -i ../zoneminder-1.25.0-ffmpeg.patch - patch -Np1 -F99 -i ../zoneminder-1.25-text.patch - patch -Np1 -F99 -i ../zoneminder-1.25-fixwarning.patch - patch -Np1 -F99 -i ../zoneminder-1.25.0-gcrypt.patch - -export CXXFLAGS=-D__STDC_CONSTANT_MACROS -./configure --prefix=/usr\ + + # ZM_RUNDIR need change to run dir + export CPPFLAGS="$CPPFLAGS -D__STDC_CONSTANT_MACROS"\ + OPT_FFMPEG=yes\ + PATH_FFMPEG=/usr/bin/ffmpeg\ + ZM_LOGDIR=/var/log/$pkgname\ + ZM_RUNDIR=/tmp/$pkgname\ + ZM_SSL_LIB=libgcrypt\ + ZM_TMPDIR=/tmp/$pkgname + + ./configure --prefix=/usr\ --enable-crashtrace=no\ --enable-debug=no\ --enable-mmap=yes\ --sysconfdir=/etc\ --with-cgidir=/srv/http/cgi-bin\ --with-extralibs='-L/usr/lib -L/usr/lib/mysql'\ + --with-ffmpeg=/usr\ --with-libarch=lib\ - --with-ffmpeg=/usr \ --with-mysql=/usr\ - --with-webdir=/srv/http/$pkgbase\ + --with-webdir=/srv/http/$pkgname\ --with-webgroup=http\ --with-webhost=localhost\ - --with-webuser=http \ - + --with-webuser=http make V=0 } package() { cd $srcdir/ZoneMinder-$pkgver - make DESTDIR=$pkgdir install - mkdir -p $pkgdir/{etc/{httpd/conf/extra,rc.d},srv/http/{cgi-bin,$pkgbase},usr/{lib/systemd/system,share/{license/$pkgbase,$pkgbase/db}},var/{cache/$pkgbase,log/$pkgbase}} - mkdir -p $pkgdir/srv/zoneminder/socks - chown -R http.http $pkgdir/{etc/zm.conf,var/{cache/$pkgbase,log/$pkgbase}} - chown -R http.http $pkgdir/srv/zoneminder/socks - chmod 0700 $pkgdir/etc/zm.conf + mkdir -vp $pkgdir/{etc/{httpd/conf/extra,sysctl.d},srv/http/{cgi-bin,$pkgname/socks},usr/{lib/systemd/system,share/{licenses/$pkgname,$pkgname/db}},var/{cache/$pkgname,log/$pkgname}} + chown -vR http.http $pkgdir/{etc/zm.conf,srv/http/$pkgname/socks,var/{cache/$pkgname,log/$pkgname}} + chmod -v 0700 $pkgdir/etc/zm.conf for i in events images temp; do - mv $pkgdir/srv/http/$pkgbase/$i $pkgdir/var/cache/$pkgbase/$i - ln -s /var/cache/$pkgbase/$i $pkgdir/srv/http/$pkgbase/$i - chown -h http.http $pkgdir/srv/http/$pkgbase/$i + mv -v $pkgdir/srv/http/$pkgname/$i $pkgdir/var/cache/$pkgname/$i + ln -vs /var/cache/$pkgname/$i $pkgdir/srv/http/$pkgname/$i + chown -vh http.http $pkgdir/srv/http/$pkgname/$i done - ln -s /srv/http/cgi-bin $pkgdir/srv/http/$pkgbase - chown -h http.http $pkgdir/srv/http/{cgi-bin,$pkgbase,$pkgbase/cgi-bin} + ln -vs /srv/http/cgi-bin $pkgdir/srv/http/$pkgname + chown -vh http.http $pkgdir/srv/http/{cgi-bin,$pkgname,$pkgname/cgi-bin} - ln -s /usr/share/cambozola/cambozola.jar $pkgdir/srv/http/$pkgbase + ln -vs /usr/share/cambozola/cambozola.jar $pkgdir/srv/http/$pkgname - install -D -m 644 $srcdir/httpd-$pkgbase.conf $pkgdir/etc/httpd/conf/extra - install -D -m 644 $srcdir/$pkgbase $pkgdir/etc/rc.d - install -D -m 644 $srcdir/$pkgbase.service $pkgdir/usr/lib/systemd/system - install -D -m 644 COPYING $pkgdir/usr/share/license/$pkgbase - install -D -m 644 db/zm*.sql $pkgdir/usr/share/$pkgbase/db + install -vDm644 $srcdir/httpd-$pkgname.conf $pkgdir/etc/httpd/conf/extra + install -vDm644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system + install -vDm644 $srcdir/sysctl-$pkgname.conf $pkgdir/etc/sysctl.d + install -vDm644 $srcdir/sysctl-$pkgname.conf $pkgdir/srv/http/$pkgname + install -vDm644 COPYING $pkgdir/usr/share/licenses/$pkgname + install -vDm644 db/zm*.sql $pkgdir/usr/share/$pkgname/db } diff --git a/pcr/zoneminder/sysctl-zoneminder.conf b/pcr/zoneminder/sysctl-zoneminder.conf new file mode 100644 index 000000000..ec1407dee --- /dev/null +++ b/pcr/zoneminder/sysctl-zoneminder.conf @@ -0,0 +1,3 @@ +# For Zoneminder Monitor +#kernel.shmall = 524288000 +#kernel.shmmax = 524288000 diff --git a/pcr/zoneminder/zoneminder.install b/pcr/zoneminder/zoneminder.install index 899e2a5d1..66109d5fa 100644 --- a/pcr/zoneminder/zoneminder.install +++ b/pcr/zoneminder/zoneminder.install @@ -1,3 +1,4 @@ +#!/usr/bin/bash pre_install() { set -e abort=false @@ -27,20 +28,20 @@ EOF post_install() { if [[ -d /var/log/zoneminder ]]; then - chmod 0755 /var/log/zoneminder - chown http.http /var/log/zoneminder + chmod -v 0755 /var/log/zoneminder + chown -v http.http /var/log/zoneminder else - mkdir -m 0755 /var/log/zoneminder - chown http.http /var/log/zoneminder + mkdir -vm 0755 /var/log/zoneminder + chown -v http.http /var/log/zoneminder fi if [[ -d /tmp/zoneminder ]]; then - chmod 0700 /tmp/zoneminder - chown http.http /tmp/zoneminder + chmod -v 0700 /tmp/zoneminder + chown -v http.http /tmp/zoneminder else - mkdir -m 0700 /tmp/zoneminder - chown http.http /tmp/zoneminder + mkdir -vm 0700 /tmp/zoneminder + chown -v http.http /tmp/zoneminder fi - sed -i -e ' + sed -i ' /^;extension=mysql.so/ s/^;//; /^#extension=mysql.so/ s/^#//; /^;extension=mysqli.so/ s/^;//; @@ -69,8 +70,11 @@ post_install() { /^open_basedir/ s/:\/srv\/http\/zoneminder//; /^open_basedir/ s/:\/srv\/http\/zoneminder\///; /^open_basedir/ s/$/:\/srv\/http\/zoneminder/; - ' /etc/php/php.ini || read - sed -i -e ' + /^open_basedir/ s/:\/var\/cache\/zoneminder//; + /^open_basedir/ s/:\/var\/cache\/zoneminder\///; + /^open_basedir/ s/$/:\/var\/cache\/zoneminder/; + ' /etc/php/php.ini + sed -i ' /^LoadModule php5_module modules\/libphp5.so/d; /^LoadModule rewrite_module modules\/mod_rewrite.so/ s/$/\nLoadModule php5_module modules\/libphp5.so/; /^# PHP 5/d; @@ -78,11 +82,12 @@ post_install() { /^Include \/etc\/httpd\/conf\/extra\/php5_module.conf/d; /^Include \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/d; /^Include conf\/extra\/httpd-default.conf/ s/$/\n\n# PHP 5\n\Include \/etc\/httpd\/conf\/extra\/php5_module.conf\n\n# ZoneMinder\nInclude \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/; - ' /etc/httpd/conf/httpd.conf || read + ' /etc/httpd/conf/httpd.conf + gpasswd -a http video cat << EOF Note for mysql: ==> To run Zoneminder, you must install the database running mysql service (as root): -==> "rc.d start mysqld" (in initscripts) or "systemctl start mysqld.service" (in systemd) +==> "systemctl start mysqld.service" ==> and add Zoneminder database typing (with passsword): ==> "mysqladmin --defaults-file=/etc/mysql/my.cnf -p -f reload" ==> "cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/my.cnf -p" @@ -92,6 +97,11 @@ Note for mysql: ==> "cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/my.cnf" ==> "echo 'grant lock tables, alter,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/my.cnf mysql" +Note for sysctl: +==> You must uncomment that line in /etc/sysctl.d/sysctl-zoneminder.conf: +==> "kernel.shmall = 524288000" +==> "kernel.shmmax = 524288000" + Note for php: ==> You must uncomment that line in /etc/php/php.ini: ==> "extension=mysql.so" @@ -105,11 +115,11 @@ Note for php: ==> "extension=openssl.so" ==> "extension=ftp.so" ==> "extension=zip.so" -==> check and add to open_basedir "/etc" and -==> "/srv/http/zoneminder" like so -==> "open_basedir = /home:/tmp:/usr/share/pear:/etc:/srv/http/zoneminder" +==> check and add to open_basedir "/etc", +==> "/srv/http/zoneminder" and "/var/cache/zoneminder" like so +==> "open_basedir = /home:/tmp:/usr/share/pear:/etc:/srv/http/zoneminder:/var/cache/zoneminder" ==> and set your timezone in php.ini: -==> "date.timezone = /" +==> "date.timezone = /" Note for apache: ==> You must edit /etc/httpd/conf/httpd.conf and add the line: @@ -122,21 +132,25 @@ EOF post_upgrade() { post_install + _mysqld=$(systemctl status mysqld.service | grep -o 'inactive (dead)') + [[ _mysqld == 'inactive (dead)' ]] && systemctl start mysqld.service /usr/bin/zmupdate.pl -f >/dev/null + [[ _mysqld == 'inactive (dead)' ]] && systemctl stop mysqld.service } post_remove() { - if [[ -d /tmp/zoneminder ]]; then - rm -vr /tmp/zoneminder - fi - sed -i -e ' + _zms=$(systemctl status zoneminder.service | grep -o 'active (running)') + [[ _zms == 'active (running)' ]] && systemctl stop zoneminder.service + [[ -d /tmp/zoneminder ]] && rm -vr /tmp/zoneminder + sed -i ' /^open_basedir/ s/:\/srv\/http\/zoneminder//; /^open_basedir/ s/:\/srv\/http\/zoneminder\///; - ' /etc/php/php.ini || read - sed -i -e ' + /^open_basedir/ s/:\/var\/cache\/zoneminder\/// + ' /etc/php/php.ini + sed -i ' /^# ZoneMinder/d; /Include \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/d; - ' /etc/httpd/conf/httpd.conf || read + ' /etc/httpd/conf/httpd.conf cat << EOF Note: ==> To clean Zoneminder mysql database, run as root (with password): @@ -165,9 +179,12 @@ Note: ==> "extension=mysqli.so" ==> "extension=session.so" ==> "extension=sockets.so" -==> "date.timezone = /" +==> "date.timezone = /" + +==> Drop http user on video group if it isn't needed with others servers: +==> gpasswd -d http video -==> Edit /etc/php/php.ini and remove "/etc" and "/srv/http/zoneminder" +==> Edit /etc/php/php.ini and remove "/etc", "/srv/http/zoneminder" and "/var/cache/zoneminder" ==> in the "open_basedir". ==> Remove log files and "zonemider" directory in "/var/log/zoneminder". -- cgit v1.2.3-54-g00ecf From 572a1aa9805971ecae21bd4f315b366b69e92b00 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 27 Jul 2013 01:22:45 -0700 Subject: Sat Jul 27 01:22:29 PDT 2013 --- community/converseen/PKGBUILD | 6 +-- community/nodejs/PKGBUILD | 6 +-- community/parole/PKGBUILD | 8 ++-- community/xmonad-contrib/PKGBUILD | 13 ++---- core/mkinitcpio-busybox/PKGBUILD | 23 ++++----- core/mkinitcpio-busybox/config | 30 +++++++----- extra/akonadi/PKGBUILD | 6 +-- extra/gnutls/PKGBUILD | 20 +++++--- extra/gnutls/tls_fix.diff | 32 +++++++++++++ extra/virtuoso/PKGBUILD | 15 ++---- extra/virtuoso/automake113.patch | 12 ----- kernels/linux-libre-pae/PKGBUILD | 6 +-- kernels/linux-libre-xen/PKGBUILD | 6 +-- libre/icecat-adblock-plus/PKGBUILD | 6 +-- libre/iceweasel-adblock-plus/PKGBUILD | 6 +-- libre/libretools/PKGBUILD | 6 +-- libre/linux-libre/PKGBUILD | 6 +-- libre/soundkonverter-libre/PKGBUILD | 10 ++-- pcr/libav/PKGBUILD | 88 +++++++++++++++++------------------ pcr/python-pygame-hg/PKGBUILD | 72 ++++++++++++++++++++++++++++ 20 files changed, 237 insertions(+), 140 deletions(-) create mode 100644 extra/gnutls/tls_fix.diff delete mode 100644 extra/virtuoso/automake113.patch create mode 100644 pcr/python-pygame-hg/PKGBUILD (limited to 'libre/linux-libre/PKGBUILD') diff --git a/community/converseen/PKGBUILD b/community/converseen/PKGBUILD index f7b814f97..45f2c2d8c 100644 --- a/community/converseen/PKGBUILD +++ b/community/converseen/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 94206 2013-07-16 17:32:49Z giovanni $ +# $Id: PKGBUILD 94544 2013-07-26 15:55:51Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: archtux pkgname=converseen -pkgver=0.6.3 +pkgver=0.6.4 pkgrel=1 pkgdesc="The batch image converter and resizer" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('imagemagick' 'qt4' 'libwmf' 'openexr') makedepends=('cmake') install=converseen.install source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('33b0b1e3649c075ab7ad970ee4ed465c') +md5sums=('072cb40a495e539661ea789131555f79') build() { cd "${srcdir}" diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 11d508c2d..d0f99a15e 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 93869 2013-07-11 15:37:07Z bpiotrowski $ +# $Id: PKGBUILD 94551 2013-07-26 20:25:44Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos @@ -8,7 +8,7 @@ # Contributor: TIanyi Cui pkgname=nodejs -pkgver=0.10.13 +pkgver=0.10.15 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ makedepends=('python2') checkdepends=('curl') options=('!emptydirs') source=(http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz) -sha256sums=('a102fad260d216b95611ddd57aeb6531c92ad1038508390654423feb1b51c059') +sha256sums=('87345ab3b96aa02c5250d7b5ae1d80e620e8ae2a7f509f7fa18c4aaa340953e8') prepare() { cd node-v$pkgver diff --git a/community/parole/PKGBUILD b/community/parole/PKGBUILD index e7e52123f..c90fbe8fc 100644 --- a/community/parole/PKGBUILD +++ b/community/parole/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 93130 2013-06-25 14:39:40Z spupykin $ +# $Id: PKGBUILD 94522 2013-07-26 10:51:28Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: TDY pkgname=parole -pkgver=0.5.1 -pkgrel=2 +pkgver=0.5.2 +pkgrel=1 pkgdesc="A modern media player based on the GStreamer framework" arch=('i686' 'x86_64') url="http://goodies.xfce.org/projects/applications/parole/" @@ -21,7 +21,7 @@ conflicts=('parole-media-player-git') options=('!libtool') install=parole.install source=(http://git.xfce.org/apps/parole/snapshot/parole-$pkgver.tar.bz2) -md5sums=('0236073ad67916092a75fcaa59583780') +md5sums=('ab87c3067e310cf200e26a61ed95cdf8') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/xmonad-contrib/PKGBUILD b/community/xmonad-contrib/PKGBUILD index 30b913ea4..cfd092a19 100644 --- a/community/xmonad-contrib/PKGBUILD +++ b/community/xmonad-contrib/PKGBUILD @@ -1,23 +1,22 @@ -# $Id: PKGBUILD 89335 2013-04-28 16:53:08Z td123 $ +# $Id: PKGBUILD 94529 2013-07-26 11:27:17Z jelle $ # Maintainer: Sergej Pupykin # Maintainer: Vesa Kaihlavirta # Contributor: orbisvicis pkgname=xmonad-contrib -pkgver=0.11 -pkgrel=7 +pkgver=0.11.2 +pkgrel=1 pkgdesc="Add-ons for xmonad" arch=('i686' 'x86_64') url="http://xmonad.org/" license=('BSD') depends=('ghc=7.6.3-1' 'xmonad=0.11-6' 'sh' 'haskell-x11=1.6.1.1-3' 'haskell-x11-xft=0.3.1-9' 'haskell-utf8-string=0.3.7-5' 'haskell-random=1.0.1.1-5') install='xmonad-contrib.install' -source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz xmonad-contrib-remove-getatomname.patch) +source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) +md5sums=('415a7ed9449198b0e93d49ab0a4a0f72') build() { cd $srcdir/$pkgname-$pkgver - patch -Np1 -i $srcdir/xmonad-contrib-remove-getatomname.patch - runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr -fuse_xft \ --libsubdir=\$compiler/site-local/\$pkgid runhaskell Setup build @@ -33,5 +32,3 @@ package() { runhaskell Setup.lhs copy --destdir=$pkgdir install -D LICENSE $pkgdir/usr/share/licenses/xmonad-contrib/LICENSE } -md5sums=('05fba258ac6063e49b50786a0869bd1f' - '1d1fab94ae24b2a8f6a5dcd9cd6d9548') diff --git a/core/mkinitcpio-busybox/PKGBUILD b/core/mkinitcpio-busybox/PKGBUILD index f85beb6ea..9252e16f8 100644 --- a/core/mkinitcpio-busybox/PKGBUILD +++ b/core/mkinitcpio-busybox/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 167188 2012-09-27 01:16:40Z dreisner $ +# $Id: PKGBUILD 191594 2013-07-26 14:05:32Z dreisner $ # Maintainer: Dave Reisner # Maintainer: Thomas Bächler pkgname=mkinitcpio-busybox -pkgver=1.20.2 +pkgver=1.21.1 pkgrel=1 pkgdesc="base initramfs tools" arch=('i686' 'x86_64') @@ -14,21 +14,22 @@ options=('!buildflags') source=("http://busybox.net/downloads/busybox-$pkgver.tar.bz2" 'glibc-2.16.patch' 'config') -sha256sums=('eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882' +sha256sums=('cd5be0912ec856110ae12c76c3ec9cd5cba1df45b5a9da2b095b8284d1481303' 'fb5b6e2a0de4db5401322e5c2474ad8ce6a58615dad45b7109cfe045baf2c88d' - 'd8064ed6ec21868e4afe057445e2d852b353abd595132cb1ca3ba345988772f0') + 'cad474e2131c0aa3c2f628f74389b43ca3df8818db73ba8cc18081c3531ff318') -build() { - cd "$srcdir/busybox-$pkgver" +prepare() { + cd "busybox-$pkgver" - local safeflags="${CARCH/_/-} -mtune=generic -Os -pipe -fno-strict-aliasing" + local safeflags="-march=${CARCH/_/-} -mtune=generic -Os -pipe -fno-strict-aliasing" - sed 's|^\(CONFIG_EXTRA_CFLAGS\)=.*|\1="-march='"$safeflags"'"|' \ - "$srcdir/config" > .config + sed 's|^\(CONFIG_EXTRA_CFLAGS\)=.*|\1="'"$safeflags"'"|' "$srcdir/config" >.config - patch -Np1 < "$srcdir/glibc-2.16.patch" + patch -Np1 <"$srcdir/glibc-2.16.patch" +} - make +build() { + make -C "busybox-$pkgver" } package() { diff --git a/core/mkinitcpio-busybox/config b/core/mkinitcpio-busybox/config index ed84c5383..0ffb38736 100644 --- a/core/mkinitcpio-busybox/config +++ b/core/mkinitcpio-busybox/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.20.0 -# Sun May 13 11:33:40 2012 +# Busybox version: 1.21.0 +# Tue Jan 22 09:04:09 2013 # CONFIG_HAVE_DOT_CONFIG=y @@ -42,6 +42,7 @@ CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_UTMP is not set # CONFIG_FEATURE_WTMP is not set # CONFIG_FEATURE_PIDFILE is not set +CONFIG_PID_FILE_PATH="" CONFIG_FEATURE_SUID=y # CONFIG_FEATURE_SUID_CONFIG is not set # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set @@ -96,6 +97,7 @@ CONFIG_PREFIX="./_install" # CONFIG_FEATURE_RTMINMAX is not set CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=0 +CONFIG_SHA3_SMALL=0 CONFIG_FEATURE_FAST_TOP=y # CONFIG_FEATURE_ETC_NETWORKS is not set # CONFIG_FEATURE_USE_TERMIOS is not set @@ -263,6 +265,7 @@ CONFIG_SEQ=y CONFIG_SHA1SUM=y CONFIG_SHA256SUM=y CONFIG_SHA512SUM=y +# CONFIG_SHA3SUM is not set CONFIG_SLEEP=y CONFIG_FEATURE_FANCY_SLEEP=y CONFIG_FEATURE_FLOAT_SLEEP=y @@ -310,7 +313,7 @@ CONFIG_FEATURE_AUTOWIDTH=y CONFIG_FEATURE_HUMAN_READABLE=y # -# Common options for md5sum, sha1sum, sha256sum, sha512sum +# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum # CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y @@ -375,7 +378,6 @@ CONFIG_FEATURE_VI_SETOPTS=y CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y CONFIG_FEATURE_VI_ASK_TERMINAL=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y CONFIG_AWK=y # CONFIG_FEATURE_AWK_LIBM is not set # CONFIG_CMP is not set @@ -612,9 +614,11 @@ CONFIG_FEATURE_MOUNT_LOOP_CREATE=y # CONFIG_FEATURE_VOLUMEID_BTRFS is not set # CONFIG_FEATURE_VOLUMEID_REISERFS is not set # CONFIG_FEATURE_VOLUMEID_FAT is not set +# CONFIG_FEATURE_VOLUMEID_EXFAT is not set # CONFIG_FEATURE_VOLUMEID_HFS is not set # CONFIG_FEATURE_VOLUMEID_JFS is not set # CONFIG_FEATURE_VOLUMEID_XFS is not set +# CONFIG_FEATURE_VOLUMEID_NILFS is not set # CONFIG_FEATURE_VOLUMEID_NTFS is not set # CONFIG_FEATURE_VOLUMEID_ISO9660 is not set # CONFIG_FEATURE_VOLUMEID_UDF is not set @@ -622,6 +626,7 @@ CONFIG_FEATURE_MOUNT_LOOP_CREATE=y # CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set # CONFIG_FEATURE_VOLUMEID_CRAMFS is not set # CONFIG_FEATURE_VOLUMEID_ROMFS is not set +# CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set # CONFIG_FEATURE_VOLUMEID_SYSV is not set # CONFIG_FEATURE_VOLUMEID_OCFS2 is not set # CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set @@ -701,7 +706,7 @@ CONFIG_FEATURE_CROND_DIR="" # CONFIG_FEATURE_MAKEDEVS_TABLE is not set # CONFIG_MAN is not set # CONFIG_MICROCOM is not set -# CONFIG_MOUNTPOINT is not set +CONFIG_MOUNTPOINT=y # CONFIG_MT is not set # CONFIG_RAIDAUTORUN is not set # CONFIG_READAHEAD is not set @@ -894,6 +899,13 @@ CONFIG_FEATURE_MIME_CHARSET="" # CONFIG_PSTREE is not set # CONFIG_PWDX is not set # CONFIG_SMEMCAP is not set +# CONFIG_TOP is not set +# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set +# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set +# CONFIG_FEATURE_TOP_SMP_CPU is not set +# CONFIG_FEATURE_TOP_DECIMALS is not set +# CONFIG_FEATURE_TOP_SMP_PROCESS is not set +# CONFIG_FEATURE_TOPMEM is not set CONFIG_UPTIME=y # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set CONFIG_FREE=y @@ -914,13 +926,6 @@ CONFIG_FEATURE_PS_LONG=y # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set # CONFIG_RENICE is not set # CONFIG_BB_SYSCTL is not set -# CONFIG_TOP is not set -# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set -# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set -# CONFIG_FEATURE_TOP_SMP_CPU is not set -# CONFIG_FEATURE_TOP_DECIMALS is not set -# CONFIG_FEATURE_TOP_SMP_PROCESS is not set -# CONFIG_FEATURE_TOPMEM is not set # CONFIG_FEATURE_SHOW_THREADS is not set # CONFIG_WATCH is not set @@ -1015,6 +1020,7 @@ CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0 CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 # CONFIG_LOGREAD is not set # CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set +# CONFIG_FEATURE_KMSG_SYSLOG is not set # CONFIG_KLOGD is not set # CONFIG_FEATURE_KLOGD_KLOGCTL is not set # CONFIG_LOGGER is not set diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD index 4a3b83cb6..08e717bd1 100644 --- a/extra/akonadi/PKGBUILD +++ b/extra/akonadi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 191298 2013-07-23 11:52:23Z andrea $ +# $Id: PKGBUILD 191591 2013-07-26 06:33:36Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=akonadi -pkgver=1.10.1 +pkgver=1.10.2 pkgrel=1 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'postgresql') optdepends=('postgresql: PostgreSQL backend') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('5b03c46e1e9da439e4ec63bf7b2087c2') +md5sums=('35eb8f76588b1d111f75bc46e3ac784b') prepare() { mkdir build diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index a06f9d2dc..878bf27c5 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 191197 2013-07-19 17:34:12Z andyrtr $ +# $Id: PKGBUILD 191598 2013-07-26 15:46:23Z andyrtr $ # Maintainer: Jan de Groot # Maintainer: Andreas Radke pkgname=gnutls pkgver=3.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64') license=('GPL3' 'LGPL2.1') @@ -13,12 +13,18 @@ install=gnutls.install options=('!libtool' '!zipman') depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle' 'p11-kit') makedepends=('valgrind' 'strace' 'datefudge') -source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${pkgname}-${pkgver}.tar.xz{,.sig}) +source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${pkgname}-${pkgver}.tar.xz{,.sig} + tls_fix.diff) md5sums=('9dd691ad1ccdb7386029809afef6b5ea' - 'SKIP') + 'SKIP' + '1bbf5bfb4e1420fd61c75e14347340fc') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} + + # fix broken TLS connections + patch -Np1 -i ../tls_fix.diff + ./configure --prefix=/usr \ --with-zlib \ --disable-static \ @@ -28,13 +34,13 @@ build() { } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} #make -k check make -j1 check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install # lots of .png files are put into infodir and are gzipped by makepkg! this may need to be fixed by using !zipman diff --git a/extra/gnutls/tls_fix.diff b/extra/gnutls/tls_fix.diff new file mode 100644 index 000000000..8277e2b2d --- /dev/null +++ b/extra/gnutls/tls_fix.diff @@ -0,0 +1,32 @@ +diff --git a/lib/gnutls_cipher.c b/lib/gnutls_cipher.c +index 198cb34..3caa5ac 100644 +--- a/lib/gnutls_cipher.c ++++ b/lib/gnutls_cipher.c +@@ -710,7 +710,11 @@ ciphertext_to_compressed (gnutls_session_t session, + return gnutls_assert_val(ret); + + if (unlikely((unsigned)length_to_decrypt > compressed->size)) +- return gnutls_assert_val(GNUTLS_E_DECRYPTION_FAILED); ++ { ++ _gnutls_audit_log(session, "Received %u bytes, while expecting less than %u\n", ++ (unsigned int)length_to_decrypt, (unsigned int)compressed->size); ++ return gnutls_assert_val(GNUTLS_E_DECRYPTION_FAILED); ++ } + + ret = + _gnutls_auth_cipher_decrypt2 (¶ms->read.cipher_state, +diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c +index 993ddb9..4795711 100644 +--- a/lib/gnutls_record.c ++++ b/lib/gnutls_record.c +@@ -1193,8 +1193,8 @@ begin: + /* We allocate the maximum possible to allow few compressed bytes to expand to a + * full record. + */ +- decrypted = _mbuffer_alloc(MAX_RECORD_RECV_SIZE(session), +- MAX_RECORD_RECV_SIZE(session)); ++ t.size = _gnutls_get_max_decrypted_data(session); ++ decrypted = _mbuffer_alloc(t.size, t.size); + if (decrypted == NULL) + return gnutls_assert_val(GNUTLS_E_MEMORY_ERROR); + diff --git a/extra/virtuoso/PKGBUILD b/extra/virtuoso/PKGBUILD index 19f02fa17..5568e46ff 100644 --- a/extra/virtuoso/PKGBUILD +++ b/extra/virtuoso/PKGBUILD @@ -1,33 +1,28 @@ -# $Id: PKGBUILD 184267 2013-05-05 08:27:00Z andrea $ +# $Id: PKGBUILD 191593 2013-07-26 10:24:04Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Massimiliano Torromeo pkgbase=virtuoso pkgname=('virtuoso' 'virtuoso-base') -pkgver=6.1.6 -pkgrel=2 +pkgver=6.1.7 +pkgrel=1 arch=('i686' 'x86_64') url='http://virtuoso.openlinksw.com/wiki/main/Main/' license=('GPL') makedepends=('libldap' 'bison' 'flex' 'gperf' 'net-tools' 'libxml2' 'optipng') options=('!libtool') -source=("http://downloads.sourceforge.net/${pkgbase}/${pkgbase}-opensource-${pkgver}.tar.gz" - 'automake113.patch') -md5sums=('3991149c570f3738c3e819ce603e487f' - '570043e1b5f4acd9826732f002941c12') +source=("http://downloads.sourceforge.net/${pkgbase}/${pkgbase}-opensource-${pkgver}.tar.gz") +md5sums=('88885e84e8f7b61e59516f696b1d3be5') prepare() { cd ${pkgbase}-opensource-${pkgver} optipng -quiet -force -fix appsrc/ODS-Wiki/http/images/opts_16.png - - patch -p1 -i "${srcdir}"/automake113.patch } build() { cd ${pkgbase}-opensource-${pkgver} - ./autogen.sh ./configure --with-layout=debian \ --program-transform-name='s/isql$$/isql-vt/;s/isqlw/isqlw-vt/' \ --with-readline diff --git a/extra/virtuoso/automake113.patch b/extra/virtuoso/automake113.patch deleted file mode 100644 index 5f84b49bc..000000000 --- a/extra/virtuoso/automake113.patch +++ /dev/null @@ -1,12 +0,0 @@ -+++ a/configure.in ---- b/configure.in -@@ -36,7 +36,7 @@ - AC_INIT([Virtuoso Open Source Edition], - AC_CONFIG_SRCDIR([libsrc/Dk.h]) - AC_CONFIG_AUX_DIR([binsrc/config]) - AC_CONFIG_MACRO_DIR([binsrc/config]) --AM_CONFIG_HEADER([libsrc/Dk/config.h]) -+AC_CONFIG_HEADER([libsrc/Dk/config.h]) - - dnl - dnl You may need to change the next macro for older versions of automake: diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 55204ff79..badb6d2c6 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 191254 2013-07-22 12:16:46Z tpowa $ +# $Id: PKGBUILD 191595 2013-07-26 15:20:34Z tpowa $ # Contributor: Tobias Powalowski # Contributor: Thomas Baechler # Maintainer (Parabola): André Silva @@ -6,7 +6,7 @@ pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.10 -pkgver=${_basekernel}.2 +pkgver=${_basekernel}.3 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -22,7 +22,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' - '3d06da86aca3af3babcb23b98eeb5442' + '4741e325185acae5498cfc77a5e8f55b' 'ead29a0206b79cc56ab97930e5d517ae' 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index e78f09ee9..5583ffba0 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 191254 2013-07-22 12:16:46Z tpowa $ +# $Id: PKGBUILD 191595 2013-07-26 15:20:34Z tpowa $ # Contributor: Tobias Powalowski # Contributor: Thomas Baechler # Maintainer (Parabola): André Silva @@ -6,7 +6,7 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.10 -pkgver=${_basekernel}.2 +pkgver=${_basekernel}.3 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -22,7 +22,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' - '3d06da86aca3af3babcb23b98eeb5442' + '4741e325185acae5498cfc77a5e8f55b' 'e2cb9d4092685c2a4216de9bbe8b72f1' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' diff --git a/libre/icecat-adblock-plus/PKGBUILD b/libre/icecat-adblock-plus/PKGBUILD index 9508d8e15..3c078997c 100644 --- a/libre/icecat-adblock-plus/PKGBUILD +++ b/libre/icecat-adblock-plus/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 90899 2013-05-15 12:56:13Z spupykin $ +# $Id: PKGBUILD 94536 2013-07-26 13:15:58Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer (Parabola): André Silva _pkgname=firefox-adblock-plus pkgname=icecat-adblock-plus -pkgver=2.2.4 +pkgver=2.3.1 _addons_file=206960 -pkgrel=2 +pkgrel=1 pkgdesc="plugin for icecat which block ads and banners" arch=('any') url="http://adblockplus.org/" diff --git a/libre/iceweasel-adblock-plus/PKGBUILD b/libre/iceweasel-adblock-plus/PKGBUILD index 019d1edd2..81648fbcd 100644 --- a/libre/iceweasel-adblock-plus/PKGBUILD +++ b/libre/iceweasel-adblock-plus/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 90899 2013-05-15 12:56:13Z spupykin $ +# $Id: PKGBUILD 94536 2013-07-26 13:15:58Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer (Parabola): André Silva _pkgname=firefox-adblock-plus pkgname=iceweasel-adblock-plus -pkgver=2.2.4 +pkgver=2.3.1 _addons_file=206960 -pkgrel=2 +pkgrel=1 pkgdesc="plugin for iceweasel which block ads and banners" arch=('any') url="http://adblockplus.org/" diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index 231268930..bf31c26bd 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -9,8 +9,8 @@ pkgdesc="Programs for Parabola development" url="https://projects.parabolagnulinux.org/packages/libretools.git/" license=('GPL3' 'GPL2') -pkgver=20130714 -_libretools_commit=bb42528084058af8dc42c315d5f013af05741bb1 +pkgver=20130727 +_libretools_commit=05463eaf611f4784b3693b74029c3f5a6da1d70b _devtools_commit=bf8513ae631484a0c292ad085ea7ede9859f8e0f _packages_url=https://projects.parabolagnulinux.org/packages @@ -74,5 +74,5 @@ package_libretools-mips64el() { make install-libretools-mips64el DESTDIR="$pkgdir" } -md5sums=('a8c4c3552bde5185dec637471b890256' +md5sums=('49653793e6bff294661043ed38ac6e43' 'b28b1492fda205be7c577fc03cbc3399') diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 90b6a45c5..64ac53efa 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 191254 2013-07-22 12:16:46Z tpowa $ +# $Id: PKGBUILD 191595 2013-07-26 15:20:34Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): André Silva @@ -10,7 +10,7 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.10 -_sublevel=2 +_sublevel=3 pkgver=${_basekernel}.${_sublevel} pkgrel=1 _lxopkgver=${_basekernel}.2 # nearly always the same as pkgver @@ -31,7 +31,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' - '3d06da86aca3af3babcb23b98eeb5442' + '4741e325185acae5498cfc77a5e8f55b' '542fc77350e62009bca7af080359b286' 'bd77b7112db61fb184139daaa1e390ac' 'e49ac236dfeef709f91a3d993ea7b62c' diff --git a/libre/soundkonverter-libre/PKGBUILD b/libre/soundkonverter-libre/PKGBUILD index b8872fa5d..5e87a1e8c 100644 --- a/libre/soundkonverter-libre/PKGBUILD +++ b/libre/soundkonverter-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92587 2013-06-09 14:53:02Z stativ $ +# $Id: PKGBUILD 94548 2013-07-26 17:20:11Z stativ $ # Maintainer: Lukas Jirkovsky # Contributor: Mateusz Herych # Contributor: Eric Belanger @@ -7,7 +7,7 @@ _pkgname=soundkonverter pkgname=soundkonverter-libre -pkgver=2.0.3 +pkgver=2.0.4 pkgrel=1 pkgdesc="Front-end to various audio converters, without nonfree faac and mac recommendation" arch=('i686' 'x86_64') @@ -36,7 +36,7 @@ conflicts=$_pkgname provides=$_pkgname=$pkgver install=$_pkgname.install source=("http://kde-apps.org/CONTENT/content-files/29024-${_pkgname}-${pkgver}.tar.gz") -md5sums=('1c18d9227bac57a910e2a7b2e18870d8') +md5sums=('8b6684e693bf1af604dec8fab837447b') build() { cd "$srcdir"/$_pkgname-$pkgver @@ -47,6 +47,6 @@ build() { } package() { - cd "$srcdir"/$_pkgname-$pkgver - make DESTDIR="$pkgdir" install + cd "$srcdir"/$_pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/pcr/libav/PKGBUILD b/pcr/libav/PKGBUILD index 782e12a15..c0fb9e062 100644 --- a/pcr/libav/PKGBUILD +++ b/pcr/libav/PKGBUILD @@ -1,23 +1,15 @@ # Maintainer: Márcio Silva -static=false -_pkgname=libav -if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then - pkgname=libav-static - pkgflag=-static - staticdesc=', with static library' -elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; then - pkgname=libav -fi -pkgver=9.7 -pkgrel=1 -pkgdesc="Complete and free Internet live audio and video broadcasting solution for GNU/Linux$staticdesc" +pkgname=libav +pkgver=9.8 +pkgrel=3 +pkgdesc="Complete and free Internet live audio and video broadcasting solution for GNU/Linux" arch=( - i686 - x86_64 mips64el + x86_64 + i686 ) -url=http://$_pkgname.org/ +url=http://$pkgname.org/ license=GPL3 depends=( alsa-lib @@ -45,20 +37,33 @@ makedepends=( yasm libvdpau ) -source=http://$_pkgname.org/releases/$_pkgname-$pkgver.tar.gz -sha512sums=6a446e8dceb9ee4f1fb7a7d68d254086990bbcab5b1014598b21c75e0add22dab47c30a95bc3129835cc40a8d32de9c61fb267b2fa2aa9353dbbfc4b716767e4 +source=http://$pkgname.org/releases/$pkgname-$pkgver.tar.gz +sha512sums=ef7c164fb29d365a236ead927e6355ca9191203dce86f0d0d8251f275ed5be4ab5e3f56a0c51384d7b9e83c3c3ef7ebdee95c9a7ac7b6520eaf25973a2bd20ae build() { - cd $_pkgname-$pkgver - - [[ $static == false ]] && sttcv=disable || sttcv=enable - - setarch $CARCH ./configure\ - --prefix=/opt/$pkgname\ + cd $pkgname-$pkgver + if [[ $CARCH == x86_64 ]]; then + _asm='--disable-armv5te --disable-armv6 --disable-armv6t2 --disable-neon --disable-vfp --disable-vis --disable-altivec\ + --enable-amd3dnow --enable-mmx --enable-mmxext --enable-amd3dnow --enable-amd3dnowext --enable-sse --enable-sse2 --enable-sse3\ + --enable-avx --enable-fma4 --enable-sse3 --enable-ssse3 --enable-sse4 --enable-sse42' + elif [[ $CARCH == i686 ]]; then + _asm='--disable-armv5te --disable-armv6 --disable-armv6t2 --disable-neon --disable-vfp --disable-vis --disable-altivec\ + --enable-amd3dnow --enable-mmx --enable-mmxext --enable-amd3dnow --enable-amd3dnowext --enable-sse --enable-sse2 --enable-sse3\ + --disable-avx --disable-fma4 --disable-sse3 --disable-ssse3 --disable-sse4 --disable-sse42' + else + _asm='--disable-asm' + fi + [[ $_static == false ]] && _stf='--disable-static' + ./configure\ + $_asm $_stf\ + --prefix=/usr\ + --bindir=/opt/$pkgname/bin\ + --incdir=/opt/$pkgname/include\ + --libdir=/opt/$pkgname/lib\ + --shlibdir=/opt/$pkgname/lib\ + --disable-avserver\ --disable-debug\ - --$sttcv-static\ --enable-avresample\ - --enable-avserver\ --enable-dxva2\ --enable-gpl\ --enable-libfreetype\ @@ -77,32 +82,27 @@ build() { --enable-libvpx\ --enable-libx264\ --enable-libxvid\ + --enable-pic\ --enable-runtime-cpudetect\ --enable-shared\ + --enable-vdpau\ --enable-version3\ --enable-x11grab - setarch $CARCH make - setarch $CARCH make tools/qt-faststart - setarch $CARCH make doc/av{conv,play,server}.1 + make + make tools/qt-faststart + make doc/av{conv,play}.1 # doc/avserver.1 } package() { - cd $_pkgname-$pkgver - setarch $CARCH make DESTDIR=$pkgdir install install-man - install -m755 -d $pkgdir/etc/ld.so.conf.d - install -m755 -d $pkgdir/usr/bin - install -m755 -d $pkgdir/usr/share/man/man1 - install -Dm755 tools/qt-faststart $pkgdir/opt/$pkgname/bin - ln -s /opt/$pkgname/bin/avconv $pkgdir/usr/bin/avconv$pkgflag - ln -s /opt/$pkgname/bin/avplay $pkgdir/usr/bin/avplay$pkgflag - ln -s /opt/$pkgname/bin/avprobe $pkgdir/usr/bin/avprobe$pkgflag - ln -s /opt/$pkgname/bin/avserver $pkgdir/usr/bin/avserver$pkgflag - ln -s /opt/$pkgname/bin/qt-faststart $pkgdir/usr/bin/qt-faststart-$pkgname - ln -s /opt/$pkgname/share/man/man1/avconv.1 $pkgdir/usr/share/man/man1/avconv$pkgflag.1 - ln -s /opt/$pkgname/share/man/man1/avplay.1 $pkgdir/usr/share/man/man1/avplay$pkgflag.1 - ln -s /opt/$pkgname/share/man/man1/avprobe.1 $pkgdir/usr/share/man/man1/avprobe$pkgflag.1 - ln -s /opt/$pkgname/share/man/man1/avserver.1 $pkgdir/usr/share/man/man1/avserver$pkgflag.1 - echo /opt/libav$pkgflag/lib > $pkgdir/etc/ld.so.conf.d/libav$pkgflag.conf + cd $pkgname-$pkgver + + make DESTDIR=$pkgdir install install-man + install -vD tools/qt-faststart $pkgdir/usr/bin/qt-faststart-$pkgname + + for _bin in conv play probe; do + echo -e "#!/usr/bin/env bash\nLD_LIBRARY_PATH=/opt/$pkgname/lib /opt/$pkgname/bin/av$_bin \$@" > $pkgdir/usr/bin/av$_bin + done + chmod -v +x $pkgdir/usr/bin/* } # vim:set ts=2 sw=2 et: diff --git a/pcr/python-pygame-hg/PKGBUILD b/pcr/python-pygame-hg/PKGBUILD new file mode 100644 index 000000000..c48317b19 --- /dev/null +++ b/pcr/python-pygame-hg/PKGBUILD @@ -0,0 +1,72 @@ +# Maintainer: Márcio Silva + +_pkgname=pygame +_pkgver=1.9.2 +_pyname=python +_py3ver=3.3 +_py2ver=2.7 +_pkg3name=$_pyname-$_pkgname +_pkg2name=${_pyname}2-$_pkgname +_srcver=pre.d$(LC_ALL=C date -u +%Y%m%d) + +pkgbase=$_pyname-$_pkgname +pkgname=( + $_pkg3name-hg + $_pkg2name-hg +) +pkgver=$_pkgver$_srcver +pkgrel=1 +pkgdesc="${_pyname^} game library" +arch=( + mips64el + x86_64 + i686 +) +url=http://www.$_pkgname.org/ +license=LGPL2.1 +depends=( + ffmpeg + portmidi + python + python2 + #sdl_gfx + sdl_image + sdl_mixer + sdl_ttf +) +makedepends=mercurial +source=hg+https://bitbucket.org/$_pkgname/$_pkgname +sha512sums=SKIP + +package_python-pygame-hg() { + # disabled, due which conflicts with $_pkg2name + #provides=("$_pkg3name=$_pkgver") + #conflicts=$_pkg3name + + cd $_pkgname + + msg Building + find . -type f -exec sed -i "s|/usr/bin/env ${_pyname}2|/usr/bin/env $_pyname|" {} + + $_pyname config.py -auto + $_pyname setup.py install --root=$pkgdir --prefix=/usr + + msg 'Copying the examples and tests' + cp -va examples lib/* $pkgdir/usr/lib/$_pyname$_py3ver/site-packages/$_pkgname + cp -va test/* $pkgdir/usr/lib/$_pyname$_py3ver/site-packages/$_pkgname/tests +} + +package_python2-pygame-hg() { + provides=("$_pkg2name=$_pkgver") + conflicts=$_pkg2name + + cd $_pkgname + + msg Building + find . -type f -exec sed -i "s|/usr/bin/env $_pyname|/usr/bin/env ${_pyname}2|" {} + + ${_pyname}2 config.py -auto + ${_pyname}2 setup.py install --root=$pkgdir --prefix=/usr + + msg 'Copying the examples and tests' + cp -va examples lib/* $pkgdir/usr/lib/$_pyname$_py2ver/site-packages/$_pkgname + cp -va test/* $pkgdir/usr/lib/$_pyname$_py2ver/site-packages/$_pkgname/tests +} -- cgit v1.2.3-54-g00ecf