From 431023a318e680258f02c1fb5fdca176c68e5cb7 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Thu, 24 Apr 2014 03:30:57 +0000 Subject: Thu Apr 24 03:25:33 UTC 2014 --- community/arm-none-eabi-gcc/PKGBUILD | 27 +++--- .../arm-none-eabi-gcc/gcc-4.8.2-multilib.patch | 95 ---------------------- .../gcc-4.8.2-no-exceptions.patch | 20 ----- community/arm-none-eabi-gcc/gcc-multilib.patch | 95 ++++++++++++++++++++++ .../arm-none-eabi-gcc/gcc-no-exceptions.patch | 20 +++++ community/bbrun/PKGBUILD | 14 +++- community/catdvi/PKGBUILD | 20 ++--- community/clipit/PKGBUILD | 21 +++-- community/cmocka/PKGBUILD | 31 +++++++ community/cmus/PKGBUILD | 11 ++- community/darktable/PKGBUILD | 6 +- community/dispcalgui/PKGBUILD | 12 ++- .../dispcalgui/dispcalGUI-1.5.3.1-wxgtk3.patch | 16 ---- community/enter/PKGBUILD | 10 ++- community/fldiff/PKGBUILD | 10 +-- community/fldiff/build-fix.patch | 13 --- community/gnuradio/PKGBUILD | 7 +- community/gummi/PKGBUILD | 17 ++-- community/miniupnpd/PKGBUILD | 40 +++++---- .../miniupnpd-1.8.20140401-foreground.patch | 40 +++++++++ community/miniupnpd/miniupnpd.systemd | 3 +- community/opendkim/PKGBUILD | 4 +- community/opendkim/opendkim.install | 2 +- community/python-matplotlib/PKGBUILD | 18 ++-- community/qps/PKGBUILD | 6 +- community/rethinkdb/PKGBUILD | 6 +- community/ruby-cairo/PKGBUILD | 8 +- community/slrn/PKGBUILD | 11 +-- community/splint/PKGBUILD | 8 +- community/vyqchat/PKGBUILD | 6 +- community/xdiskusage/PKGBUILD | 32 +++----- community/xdiskusage/build-fix.patch | 71 ++++++++++++++++ community/xdiskusage/stdin-is-null.patch | 31 ------- community/xmms-imms/PKGBUILD | 26 +++--- 34 files changed, 426 insertions(+), 331 deletions(-) delete mode 100644 community/arm-none-eabi-gcc/gcc-4.8.2-multilib.patch delete mode 100644 community/arm-none-eabi-gcc/gcc-4.8.2-no-exceptions.patch create mode 100644 community/arm-none-eabi-gcc/gcc-multilib.patch create mode 100644 community/arm-none-eabi-gcc/gcc-no-exceptions.patch create mode 100644 community/cmocka/PKGBUILD delete mode 100644 community/dispcalgui/dispcalGUI-1.5.3.1-wxgtk3.patch create mode 100644 community/miniupnpd/miniupnpd-1.8.20140401-foreground.patch create mode 100644 community/xdiskusage/build-fix.patch delete mode 100644 community/xdiskusage/stdin-is-null.patch (limited to 'community') diff --git a/community/arm-none-eabi-gcc/PKGBUILD b/community/arm-none-eabi-gcc/PKGBUILD index 87c353a77..07e167695 100644 --- a/community/arm-none-eabi-gcc/PKGBUILD +++ b/community/arm-none-eabi-gcc/PKGBUILD @@ -2,8 +2,8 @@ _target=arm-none-eabi pkgname=$_target-gcc -pkgver=4.8.2 -pkgrel=8 +pkgver=4.9.0 +pkgrel=1 _newlibver=2.1.0 pkgdesc='The GNU Compiler Collection - cross compiler for ARM EABI (bare-metal) target' arch=(i686 x86_64) @@ -15,13 +15,13 @@ makedepends=($_target-binutils gmp mpfr) options=(!emptydirs !strip staticlibs) source=(ftp://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.bz2 ftp://sourceware.org/pub/newlib/newlib-$_newlibver.tar.gz - gcc-$pkgver-multilib.patch - gcc-$pkgver-no-exceptions.patch + gcc-multilib.patch + gcc-no-exceptions.patch libgloss-configure-fix.patch) -sha256sums=('09dc2276c73424bbbfda1dbddc62bbbf900c9f185acf7f3e1d773ce2d7e3cdc8' +sha256sums=('b9b047a97bade9c1c89970bc8e211ff57b7b8998a1730a80a653d329f8ed1257' '3e4d5ab9f0508942b6231b8ade4f8e5048cf92c96ed574c2bd6bd3320a599a48' - '4edd875c89391cbf5c2b57587a51da0dfda54ca0c711a85e9c301f03083e4189' - '649eb3b443e975d40ca61128ba715d1e3a29716e1e45a52c661ac0dba3c2099d' + '998d1face674cc8d1af5bf28ded15caaaa18936a28f278123448f29555a07775' + '7f59b28475aa2018a7edfb81ea81444a6eb098fd3847d8e605809ae6fbeabde5' 'eac96c034d3d7d16080d9aef4749e4eda493563a3348e6a06f08e8a330b027ba') prepare() { @@ -30,16 +30,16 @@ prepare() { patch -Np0 -i "$srcdir/libgloss-configure-fix.patch" autoreconf - cd "$srcdir" - patch -Np0 -i gcc-$pkgver-multilib.patch - patch -Np0 -i gcc-$pkgver-no-exceptions.patch + cd "$srcdir/gcc-$pkgver" + patch -Np0 -i "$srcdir"/gcc-multilib.patch + patch -Np0 -i "$srcdir"/gcc-no-exceptions.patch # Move newlib and libgloss to gcc source directory - mv newlib-$_newlibver/newlib gcc-$pkgver - mv newlib-$_newlibver/libgloss gcc-$pkgver + mv "$srcdir"/newlib-$_newlibver/newlib "$srcdir/gcc-$pkgver" + mv "$srcdir"/newlib-$_newlibver/libgloss "$srcdir/gcc-$pkgver" # hack! - some configure tests for header files using "$CPP $CPPFLAGS" - sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" gcc-$pkgver/{libiberty,gcc}/configure + sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" "$srcdir"/gcc-$pkgver/{libiberty,gcc}/configure } build() { @@ -91,7 +91,6 @@ package() { find "$pkgdir" -executable -type f -exec /usr/bin/strip --strip-debug '{}' \; # Remove files that conflict with host gcc package - rm "$pkgdir"/usr/lib/libiberty.a rm -r "$pkgdir"/usr/share/man/man7 rm -r "$pkgdir"/usr/share/info rm -r "$pkgdir"/usr/share/gcc-$pkgver diff --git a/community/arm-none-eabi-gcc/gcc-4.8.2-multilib.patch b/community/arm-none-eabi-gcc/gcc-4.8.2-multilib.patch deleted file mode 100644 index c75aa158b..000000000 --- a/community/arm-none-eabi-gcc/gcc-4.8.2-multilib.patch +++ /dev/null @@ -1,95 +0,0 @@ ---- gcc-4.8.2/gcc/config/arm/t-arm-elf.orig 2013-01-10 21:38:27.000000000 +0100 -+++ gcc-4.8.2/gcc/config/arm/t-arm-elf 2013-10-17 08:14:29.237001796 +0200 -@@ -18,73 +18,26 @@ - - MULTILIB_OPTIONS = marm/mthumb - MULTILIB_DIRNAMES = arm thumb --MULTILIB_EXCEPTIONS = --MULTILIB_MATCHES = - --#MULTILIB_OPTIONS += mcpu=fa526/mcpu=fa626/mcpu=fa606te/mcpu=fa626te/mcpu=fmp626/mcpu=fa726te --#MULTILIB_DIRNAMES += fa526 fa626 fa606te fa626te fmp626 fa726te --#MULTILIB_EXCEPTIONS += *mthumb*/*mcpu=fa526 *mthumb*/*mcpu=fa626 -+# We do not want any ARM or Thumb libraries -+MULTILIB_EXCEPTIONS = marm* mthumb - --#MULTILIB_OPTIONS += march=armv7 --#MULTILIB_DIRNAMES += thumb2 --#MULTILIB_EXCEPTIONS += march=armv7* marm/*march=armv7* --#MULTILIB_MATCHES += march?armv7=march?armv7-a --#MULTILIB_MATCHES += march?armv7=march?armv7-r --#MULTILIB_MATCHES += march?armv7=march?armv7-m --#MULTILIB_MATCHES += march?armv7=mcpu?cortex-a8 --#MULTILIB_MATCHES += march?armv7=mcpu?cortex-r4 --#MULTILIB_MATCHES += march?armv7=mcpu?cortex-m3 -+# Build with any one of arm7tdmi, M0, M3 or M4 support -+MULTILIB_OPTIONS += mcpu=arm7tdmi-s/mcpu=cortex-m0/mcpu=cortex-m3/mcpu=cortex-m4 -+MULTILIB_DIRNAMES += arm7tdmi-s cortex-m0 cortex-m3 cortex-m4 - --# Not quite true. We can support hard-vfp calling in Thumb2, but how do we --# express that here? Also, we really need architecture v5e or later --# (mcrr etc). --MULTILIB_OPTIONS += mfloat-abi=hard --MULTILIB_DIRNAMES += fpu --MULTILIB_EXCEPTIONS += *mthumb/*mfloat-abi=hard* --#MULTILIB_EXCEPTIONS += *mcpu=fa526/*mfloat-abi=hard* --#MULTILIB_EXCEPTIONS += *mcpu=fa626/*mfloat-abi=hard* -+# These don't make any sense without thumb, because GCC likes to -+# tell you that you have to supply another commandline argument -+# rather than just setting it itself. -+MULTILIB_EXCEPTIONS += mcpu=arm7tdmi-s* mcpu=cortex-m0* mcpu=cortex-m3* mcpu=cortex-m4* - --# MULTILIB_OPTIONS += mcpu=ep9312 --# MULTILIB_DIRNAMES += ep9312 --# MULTILIB_EXCEPTIONS += *mthumb/*mcpu=ep9312* --# --# MULTILIB_OPTIONS += mlittle-endian/mbig-endian --# MULTILIB_DIRNAMES += le be --# MULTILIB_MATCHES += mbig-endian=mbe mlittle-endian=mle --# --# MULTILIB_OPTIONS += mfloat-abi=hard/mfloat-abi=soft --# MULTILIB_DIRNAMES += fpu soft --# MULTILIB_EXCEPTIONS += *mthumb/*mfloat-abi=hard* --# --# MULTILIB_OPTIONS += mno-thumb-interwork/mthumb-interwork --# MULTILIB_DIRNAMES += normal interwork --# --# MULTILIB_OPTIONS += fno-leading-underscore/fleading-underscore --# MULTILIB_DIRNAMES += elf under --# --# MULTILIB_OPTIONS += mcpu=arm7 --# MULTILIB_DIRNAMES += nofmult --# MULTILIB_EXCEPTIONS += *mthumb*/*mcpu=arm7* --# # Note: the multilib_exceptions matches both -mthumb and --# # -mthumb-interwork --# # --# # We have to match all the arm cpu variants which do not have the --# # multiply instruction and treat them as if the user had specified --# # -mcpu=arm7. Note that in the following the ? is interpreted as --# # an = for the purposes of matching command line options. --# # FIXME: There ought to be a better way to do this. --# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm7d --# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm7di --# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm70 --# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm700 --# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm700i --# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm710 --# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm710c --# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm7100 --# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm7500 --# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm7500fe --# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm6 --# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm60 --# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm600 --# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm610 --# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm620 -+# Specify mfloat-abi=hard mfpu=fpv4-sp-d16 only for Cortex-M4 -+MULTILIB_OPTIONS += mfloat-abi=hard mfpu=fpv4-sp-d16 -+MULTILIB_DIRNAMES += float-abi-hard fpuv4-sp-d16 -+MULTILIB_EXCEPTIONS += mfloat* mthumb/mfloat* -+MULTILIB_EXCEPTIONS += mfpu* mthumb/mfpu* -+MULTILIB_EXCEPTIONS += mthumb/mcpu=cortex-m4/mfloat-abi=hard -+MULTILIB_EXCEPTIONS += mthumb/mcpu=cortex-m4/mfpu=fpv4-sp-d16 -+MULTILIB_EXCEPTIONS += *arm7tdmi-s*mfloat-abi* *arm7tdmi-s*mfpu* -+MULTILIB_EXCEPTIONS += *cortex-m3*mfloat-abi* *cortex-m3*mfpu* -+MULTILIB_EXCEPTIONS += *cortex-m0*mfloat-abi* *cortex-m0*mfpu* diff --git a/community/arm-none-eabi-gcc/gcc-4.8.2-no-exceptions.patch b/community/arm-none-eabi-gcc/gcc-4.8.2-no-exceptions.patch deleted file mode 100644 index 6291ee43b..000000000 --- a/community/arm-none-eabi-gcc/gcc-4.8.2-no-exceptions.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- gcc-4.8.2/libgcc/Makefile.in.orig 2013-02-04 20:06:20.000000000 +0100 -+++ gcc-4.8.2/libgcc/Makefile.in 2013-10-17 08:05:38.314091932 +0200 -@@ -492,7 +492,7 @@ - ifeq ($(LIB2_DIVMOD_EXCEPTION_FLAGS),) - # Provide default flags for compiling divmod functions, if they haven't been - # set already by a target-specific Makefile fragment. --LIB2_DIVMOD_EXCEPTION_FLAGS := -fexceptions -fnon-call-exceptions -+LIB2_DIVMOD_EXCEPTION_FLAGS := -fno-exceptions -fnon-call-exceptions - endif - - # Build LIB2_DIVMOD_FUNCS. -@@ -813,7 +813,7 @@ - # libgcc_eh.a, only LIB2ADDEH matters. If we do, only LIB2ADDEHSTATIC and - # LIB2ADDEHSHARED matter. (Usually all three are identical.) - --c_flags := -fexceptions -+c_flags := -fno-exceptions - - ifeq ($(enable_shared),yes) - diff --git a/community/arm-none-eabi-gcc/gcc-multilib.patch b/community/arm-none-eabi-gcc/gcc-multilib.patch new file mode 100644 index 000000000..026a87ff9 --- /dev/null +++ b/community/arm-none-eabi-gcc/gcc-multilib.patch @@ -0,0 +1,95 @@ +--- gcc/config/arm/t-arm-elf.orig 2013-01-10 21:38:27.000000000 +0100 ++++ gcc/config/arm/t-arm-elf 2013-10-17 08:14:29.237001796 +0200 +@@ -18,73 +18,26 @@ + + MULTILIB_OPTIONS = marm/mthumb + MULTILIB_DIRNAMES = arm thumb +-MULTILIB_EXCEPTIONS = +-MULTILIB_MATCHES = + +-#MULTILIB_OPTIONS += mcpu=fa526/mcpu=fa626/mcpu=fa606te/mcpu=fa626te/mcpu=fmp626/mcpu=fa726te +-#MULTILIB_DIRNAMES += fa526 fa626 fa606te fa626te fmp626 fa726te +-#MULTILIB_EXCEPTIONS += *mthumb*/*mcpu=fa526 *mthumb*/*mcpu=fa626 ++# We do not want any ARM or Thumb libraries ++MULTILIB_EXCEPTIONS = marm* mthumb + +-#MULTILIB_OPTIONS += march=armv7 +-#MULTILIB_DIRNAMES += thumb2 +-#MULTILIB_EXCEPTIONS += march=armv7* marm/*march=armv7* +-#MULTILIB_MATCHES += march?armv7=march?armv7-a +-#MULTILIB_MATCHES += march?armv7=march?armv7-r +-#MULTILIB_MATCHES += march?armv7=march?armv7-m +-#MULTILIB_MATCHES += march?armv7=mcpu?cortex-a8 +-#MULTILIB_MATCHES += march?armv7=mcpu?cortex-r4 +-#MULTILIB_MATCHES += march?armv7=mcpu?cortex-m3 ++# Build with any one of arm7tdmi, M0, M3 or M4 support ++MULTILIB_OPTIONS += mcpu=arm7tdmi-s/mcpu=cortex-m0/mcpu=cortex-m3/mcpu=cortex-m4 ++MULTILIB_DIRNAMES += arm7tdmi-s cortex-m0 cortex-m3 cortex-m4 + +-# Not quite true. We can support hard-vfp calling in Thumb2, but how do we +-# express that here? Also, we really need architecture v5e or later +-# (mcrr etc). +-MULTILIB_OPTIONS += mfloat-abi=hard +-MULTILIB_DIRNAMES += fpu +-MULTILIB_EXCEPTIONS += *mthumb/*mfloat-abi=hard* +-#MULTILIB_EXCEPTIONS += *mcpu=fa526/*mfloat-abi=hard* +-#MULTILIB_EXCEPTIONS += *mcpu=fa626/*mfloat-abi=hard* ++# These don't make any sense without thumb, because GCC likes to ++# tell you that you have to supply another commandline argument ++# rather than just setting it itself. ++MULTILIB_EXCEPTIONS += mcpu=arm7tdmi-s* mcpu=cortex-m0* mcpu=cortex-m3* mcpu=cortex-m4* + +-# MULTILIB_OPTIONS += mcpu=ep9312 +-# MULTILIB_DIRNAMES += ep9312 +-# MULTILIB_EXCEPTIONS += *mthumb/*mcpu=ep9312* +-# +-# MULTILIB_OPTIONS += mlittle-endian/mbig-endian +-# MULTILIB_DIRNAMES += le be +-# MULTILIB_MATCHES += mbig-endian=mbe mlittle-endian=mle +-# +-# MULTILIB_OPTIONS += mfloat-abi=hard/mfloat-abi=soft +-# MULTILIB_DIRNAMES += fpu soft +-# MULTILIB_EXCEPTIONS += *mthumb/*mfloat-abi=hard* +-# +-# MULTILIB_OPTIONS += mno-thumb-interwork/mthumb-interwork +-# MULTILIB_DIRNAMES += normal interwork +-# +-# MULTILIB_OPTIONS += fno-leading-underscore/fleading-underscore +-# MULTILIB_DIRNAMES += elf under +-# +-# MULTILIB_OPTIONS += mcpu=arm7 +-# MULTILIB_DIRNAMES += nofmult +-# MULTILIB_EXCEPTIONS += *mthumb*/*mcpu=arm7* +-# # Note: the multilib_exceptions matches both -mthumb and +-# # -mthumb-interwork +-# # +-# # We have to match all the arm cpu variants which do not have the +-# # multiply instruction and treat them as if the user had specified +-# # -mcpu=arm7. Note that in the following the ? is interpreted as +-# # an = for the purposes of matching command line options. +-# # FIXME: There ought to be a better way to do this. +-# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm7d +-# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm7di +-# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm70 +-# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm700 +-# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm700i +-# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm710 +-# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm710c +-# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm7100 +-# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm7500 +-# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm7500fe +-# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm6 +-# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm60 +-# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm600 +-# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm610 +-# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm620 ++# Specify mfloat-abi=hard mfpu=fpv4-sp-d16 only for Cortex-M4 ++MULTILIB_OPTIONS += mfloat-abi=hard mfpu=fpv4-sp-d16 ++MULTILIB_DIRNAMES += float-abi-hard fpuv4-sp-d16 ++MULTILIB_EXCEPTIONS += mfloat* mthumb/mfloat* ++MULTILIB_EXCEPTIONS += mfpu* mthumb/mfpu* ++MULTILIB_EXCEPTIONS += mthumb/mcpu=cortex-m4/mfloat-abi=hard ++MULTILIB_EXCEPTIONS += mthumb/mcpu=cortex-m4/mfpu=fpv4-sp-d16 ++MULTILIB_EXCEPTIONS += *arm7tdmi-s*mfloat-abi* *arm7tdmi-s*mfpu* ++MULTILIB_EXCEPTIONS += *cortex-m3*mfloat-abi* *cortex-m3*mfpu* ++MULTILIB_EXCEPTIONS += *cortex-m0*mfloat-abi* *cortex-m0*mfpu* diff --git a/community/arm-none-eabi-gcc/gcc-no-exceptions.patch b/community/arm-none-eabi-gcc/gcc-no-exceptions.patch new file mode 100644 index 000000000..2abb0ce92 --- /dev/null +++ b/community/arm-none-eabi-gcc/gcc-no-exceptions.patch @@ -0,0 +1,20 @@ +--- libgcc/Makefile.in.orig 2013-02-04 20:06:20.000000000 +0100 ++++ libgcc/Makefile.in 2013-10-17 08:05:38.314091932 +0200 +@@ -492,7 +492,7 @@ + ifeq ($(LIB2_DIVMOD_EXCEPTION_FLAGS),) + # Provide default flags for compiling divmod functions, if they haven't been + # set already by a target-specific Makefile fragment. +-LIB2_DIVMOD_EXCEPTION_FLAGS := -fexceptions -fnon-call-exceptions ++LIB2_DIVMOD_EXCEPTION_FLAGS := -fno-exceptions -fnon-call-exceptions + endif + + # Build LIB2_DIVMOD_FUNCS. +@@ -813,7 +813,7 @@ + # libgcc_eh.a, only LIB2ADDEH matters. If we do, only LIB2ADDEHSTATIC and + # LIB2ADDEHSHARED matter. (Usually all three are identical.) + +-c_flags := -fexceptions ++c_flags := -fno-exceptions + + ifeq ($(enable_shared),yes) + diff --git a/community/bbrun/PKGBUILD b/community/bbrun/PKGBUILD index 807d3b561..92b824f3c 100644 --- a/community/bbrun/PKGBUILD +++ b/community/bbrun/PKGBUILD @@ -1,20 +1,26 @@ -# $Id: PKGBUILD 65065 2012-02-20 02:40:27Z spupykin $ +# $Id: PKGBUILD 110058 2014-04-23 16:47:50Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Sven Kauber pkgname=bbrun pkgver=1.6 -pkgrel=4 +pkgrel=5 pkgdesc="A run - component for blackbox window manager" arch=(i686 x86_64) -url="http://www.darkops.net/bbrun/" +#url="http://www.darkops.net/bbrun/" +url="https://packages.debian.org/unstable/x11/bbrun" license=('GPL') depends=('gtk2' 'libxpm') -source=(http://www.darkops.net/bbrun/$pkgname-$pkgver.tar.gz) +#source=(http://www.darkops.net/bbrun/$pkgname-$pkgver.tar.gz) +source=("http://ftp.de.debian.org/debian/pool/main/b/bbrun/bbrun_$pkgver.orig.tar.gz") md5sums=('820960e3d52ddf2d5cf7e4ba51821bfd') build() { cd $srcdir/$pkgname-$pkgver/$pkgname make LIBS="-lXpm `pkg-config --libs gtk+-2.0` -lX11 -lXext" +} + +package() { + cd $srcdir/$pkgname-$pkgver/$pkgname install -Dm755 bbrun $pkgdir/usr/bin/bbrun } diff --git a/community/catdvi/PKGBUILD b/community/catdvi/PKGBUILD index cb8321332..855d8bb08 100644 --- a/community/catdvi/PKGBUILD +++ b/community/catdvi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65072 2012-02-20 03:29:57Z spupykin $ +# $Id: PKGBUILD 110060 2014-04-23 16:48:04Z spupykin $ # Maintainer: Stefan Husmann # Contributor: Xilon pkgname=catdvi pkgver=0.14 -pkgrel=5 +pkgrel=6 pkgdesc="A DVI to plain text translator" arch=('i686' 'x86_64') url="http://catdvi.sourceforge.net" @@ -16,22 +16,20 @@ source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2" md5sums=('b18eac65baf522c1e37bb3dc37ab42c3' '509f61a30d3758e5d102c124bc5fa9a0') -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i "${srcdir}"/texlive2008.patch - autoconf +} +build() { + cd "$srcdir/$pkgname-$pkgver" + autoconf ./configure --prefix=/usr --mandir=/usr/share/man - - install -d $pkgdir/usr/bin $pkgdir/usr/share/man/man1 - sed -i "s#\(bindir = \)\(.*\)#\1$pkgdir\2#" config.mk - sed -i "s#\(mandir = \)\(.*\)#\1$pkgdir\2#" config.mk - make } package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + install -d $pkgdir/usr/bin $pkgdir/usr/share/man/man1 + make DESTDIR="$pkgdir" install bindir=$pkgdir/usr/bin mandir=$pkgdir/usr/share/man } diff --git a/community/clipit/PKGBUILD b/community/clipit/PKGBUILD index bd39684a2..35be1a962 100644 --- a/community/clipit/PKGBUILD +++ b/community/clipit/PKGBUILD @@ -1,28 +1,31 @@ -# $Id: PKGBUILD 76710 2012-09-27 13:37:18Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski +# $Id: PKGBUILD 110048 2014-04-23 16:06:57Z flexiondotorg $ +# Maintainer : Martin Wimpress +# Contributor: Bartłomiej Piotrowski # Contributor: Mihai Militaru pkgname=clipit pkgver=1.4.2 -pkgrel=4 +pkgrel=5 pkgdesc="Lightweight GTK+ clipboard manager (fork of Parcellite)" arch=('i686' 'x86_64') url="http://gtkclipit.sourceforge.net/" license=('GPL3') -depends=('gtk2' 'gtk-update-icon-cache' 'hicolor-icon-theme' 'librsvg') +depends=('gtk2' 'librsvg') makedepends=('intltool') optdepends=('xdotool: for automatic paste') -install=$pkgname.install -source=(https://github.com/downloads/shantzu/ClipIt/${pkgname}-${pkgver}.tar.gz) +source=("https://github.com/downloads/shantzu/ClipIt/${pkgname}-${pkgver}.tar.gz") md5sums=('118175f26869adcf04909fdbb5021eff') +install=${pkgname}.install build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc make } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR=${pkgdir} install } diff --git a/community/cmocka/PKGBUILD b/community/cmocka/PKGBUILD new file mode 100644 index 000000000..2c11615e8 --- /dev/null +++ b/community/cmocka/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 110062 2014-04-23 16:53:25Z anatolik $ +# Maintainer: Anatol Pomozov + +pkgname=cmocka +url='http://cmocka.org/' +pkgver=0.4.0 +pkgrel=1 +pkgdesc='an elegant unit testing framework for C with support for mock objects' +arch=(i686 x86_64) +license=(GPL) +depends=(glibc) +makedepends=(cmake) +source=(https://open.cryptomilk.org/attachments/download/37/cmocka-$pkgver.tar.xz) +sha1sums=('7fe27a6fdcf60222cf15ae67aeee83139180a759') + +build() { + rm -rf build; mkdir build + cd build + cmake ../$pkgname-$pkgver -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DUNIT_TESTING=ON + make +} + +check() { + cd build + make test +} + +package() { + cd build + make install DESTDIR="$pkgdir" +} diff --git a/community/cmus/PKGBUILD b/community/cmus/PKGBUILD index cd113b131..5eb58b8df 100644 --- a/community/cmus/PKGBUILD +++ b/community/cmus/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 104366 2014-01-19 16:29:30Z bpiotrowski $ +# $Id: PKGBUILD 110084 2014-04-23 20:55:16Z xyne $ # Maintainer: Xyne # Contributor: Bartłomiej Piotrowski # Contributor: Aaron Griffin @@ -6,10 +6,10 @@ pkgname=cmus pkgver=2.5.0 -pkgrel=5 +pkgrel=7 pkgdesc='Very feature-rich ncurses-based music player' arch=('i686' 'x86_64') -url="http://cmus.sourceforge.net/" +url="https://cmus.github.io/" license=('GPL') depends=('ncurses') makedepends=( @@ -30,7 +30,7 @@ optdepends=('alsa-lib: for ALSA output plugin support' 'libcdio-paranoia: for cdio support' 'opusfile: for opus input plugin support' 'wavpack: for wavpack input plugin support') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2 +source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname-v$pkgver.tar.bz2 cmus-2.5.0-opus-support.patch cdio-git.patch) sha1sums=('244975a5ff642567acb047f6bd518e4a3271c25b' @@ -43,6 +43,9 @@ prepare() { patch -Np1 -i "$srcdir/cmus-2.5.0-opus-support.patch" # Include changes from git for compatibility with new cdio. patch -N -i "$srcdir/cdio-git.patch" + + # Quick fix for modplug header. + sed -i 's@@@' "$srcdir/$pkgname-v$pkgver/modplug.c" } build() { diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index 89c6f85c7..4958e4e5d 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 105573 2014-02-10 13:31:16Z spupykin $ +# $Id: PKGBUILD 110041 2014-04-23 14:51:15Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Christian Himpel # Contributor: Johannes Hanika pkgname=darktable -pkgver=1.4.1 +pkgver=1.4.2 _pkgver=1.4 pkgrel=1 pkgdesc="Utility to organize and develop raw images" @@ -18,7 +18,7 @@ makedepends=('intltool>=0.40' 'cmake' 'librsvg') optdepends=('librsvg') install=darktable.install source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.xz) -md5sums=('78252618bb7b1df30109ef5484d46f3c') +md5sums=('f86554329c2c809ffb009244a6f1d643') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/dispcalgui/PKGBUILD b/community/dispcalgui/PKGBUILD index 575707a27..fbcda9c93 100644 --- a/community/dispcalgui/PKGBUILD +++ b/community/dispcalgui/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 105728 2014-02-14 14:41:06Z tredaelli $ +# $Id: PKGBUILD 110033 2014-04-23 13:36:22Z tredaelli $ # Maintainer: Timothy Redaelli # Contributor: Cedric Girard # Contributor: foxbunny pkgname=dispcalgui -pkgver=1.7.5.7 +pkgver=2.0.0.0 pkgrel=1 pkgdesc="A GUI frontend for several utilities from the open source color management system Argyll CMS" arch=('i686' 'x86_64') @@ -14,14 +14,12 @@ makedepends=('libx11' 'libxrandr' 'libxinerama' 'libxxf86vm' 'python2-setuptools depends=('argyllcms' 'wxpython' 'hicolor-icon-theme' 'desktop-file-utils' 'python2-numpy') optdepends=('gksu: For running as root') install=${pkgname}.install -source=("http://downloads.sourceforge.net/project/dispcalgui/release/${pkgver}/dispcalGUI-${pkgver}.tar.gz" - dispcalGUI-1.5.3.1-wxgtk3.patch) -md5sums=('7a66051d244f1b734448a865b50fae01' - 'b8001e5cbbb849f9ba95e0ef9fb1d073') +source=("http://downloads.sourceforge.net/project/dispcalgui/release/${pkgver}/dispcalGUI-${pkgver}.tar.gz") +md5sums=('5740301fb4f7e72a57b4eab6a4ee405a') prepare() { cd "${srcdir}"/dispcalGUI-${pkgver} - patch -p1 -i "$srcdir"/dispcalGUI-1.5.3.1-wxgtk3.patch +# patch -p1 -i "$srcdir"/dispcalGUI-1.5.3.1-wxgtk3.patch find . -name "*.py" -exec sed -i 's!/usr/bin/env python!/usr/bin/env python2!g' {} + } diff --git a/community/dispcalgui/dispcalGUI-1.5.3.1-wxgtk3.patch b/community/dispcalgui/dispcalGUI-1.5.3.1-wxgtk3.patch deleted file mode 100644 index e5c556031..000000000 --- a/community/dispcalgui/dispcalGUI-1.5.3.1-wxgtk3.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/dispcalGUI/dispcalGUI.py -+++ b/dispcalGUI/dispcalGUI.py -@@ -1544,9 +1544,10 @@ - for lstr, lcode in llist: - menuitem = languages.Append(-1, "&" + lstr, kind=wx.ITEM_RADIO) - if (lcode.upper().replace("EN", "US") in flagart.catalog): -- menuitem.SetBitmap( -- flagart.catalog[lcode.upper().replace("EN", -- "US")].getBitmap()) -+ bitmap = flagart.catalog[lcode.upper().replace("EN", -+ "US")].getBitmap() -+ if menuitem.GetKind() == wx.ITEM_NORMAL: -+ menuitem.SetBitmap(bitmap) - if lang.getcode() == lcode: - menuitem.Check() - font = menuitem.Font diff --git a/community/enter/PKGBUILD b/community/enter/PKGBUILD index 9ce24fd0f..2a3f81346 100644 --- a/community/enter/PKGBUILD +++ b/community/enter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 59871 2011-12-01 13:33:05Z spupykin $ +# $Id: PKGBUILD 110052 2014-04-23 16:25:10Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Vesa Kaihlavirta pkgname=enter pkgver=0.0.9 -pkgrel=3 +pkgrel=4 pkgdesc="Enter is a lightweight graphical login manager for X." arch=('i686' 'x86_64') url="http://enter.sf.net" @@ -17,7 +17,11 @@ build() { cd $srcdir/$pkgname-$pkgver sed -i 's|\[xft-config\]|\[pkg-config\]|' configure.ac autoreconf - ./configure --prefix=/usr --sysconfdir=/etc CFLAGS="$CFLAGS -lcrypt" + ./configure --prefix=/usr --sysconfdir=/etc CFLAGS="$CFLAGS -lcrypt -lXext -lX11" make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } diff --git a/community/fldiff/PKGBUILD b/community/fldiff/PKGBUILD index e528e4221..eebbfaafb 100644 --- a/community/fldiff/PKGBUILD +++ b/community/fldiff/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 83678 2013-02-04 11:05:24Z spupykin $ +# $Id: PKGBUILD 110054 2014-04-23 16:25:28Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: kevin # Contributor: iztok pizorn pkgname=fldiff pkgver=1.1 -pkgrel=7 +pkgrel=8 pkgdesc="graphical diff program" arch=(i686 x86_64) -url="http://www.easysw.com/~mike/fldiff/" +url="http://directory.fsf.org/wiki/Fldiff" license=('GPL') install=fldiff.install depends=('diffutils' 'fltk' 'xdg-utils') -source=(http://www.easysw.com/~mike/fldiff/$pkgname-$pkgver-source.tar.gz +source=("http://ftp.de.debian.org/debian/pool/main/f/fldiff/fldiff_$pkgver+0.orig.tar.gz" build-fix.patch) md5sums=('12897c92106fb5d665210a2e82f5cf25' - 'ea7258e07544b81561c6d76a41c184e7') + '4f6418cb0cbc33aca28a760738ea6f18') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/fldiff/build-fix.patch b/community/fldiff/build-fix.patch index bb3e0245e..bbc6c7615 100644 --- a/community/fldiff/build-fix.patch +++ b/community/fldiff/build-fix.patch @@ -1,8 +1,3 @@ -Only in fldiff-1.1.my: config.log -Only in fldiff-1.1.my: config.status -Only in fldiff-1.1.my: DiffChooser.o -Only in fldiff-1.1.my: DiffOpenWindow.o -Only in fldiff-1.1.my: DiffView.o diff -wbBur fldiff-1.1/DiffWindow.cxx fldiff-1.1.my/DiffWindow.cxx --- fldiff-1.1/DiffWindow.cxx 2006-11-13 21:54:02.000000000 +0300 +++ fldiff-1.1.my/DiffWindow.cxx 2011-07-05 12:58:38.000000000 +0400 @@ -21,11 +16,3 @@ diff -wbBur fldiff-1.1/DiffWindow.cxx fldiff-1.1.my/DiffWindow.cxx prefs_.set("textsize", textsize()); prefs_.set("ignoreblanks", ignoreblanks()); } -Only in fldiff-1.1.my: DiffWindow.o -Only in fldiff-1.1.my: FavoritesMenu.o -Only in fldiff-1.1.my: FavoritesWindow.o -Only in fldiff-1.1.my: fldiff -Only in fldiff-1.1.my: fldiff.list -Only in fldiff-1.1.my: fldiff.o -Only in fldiff-1.1.my: Makefile -Only in fldiff-1.1.my: PtProcess.o diff --git a/community/gnuradio/PKGBUILD b/community/gnuradio/PKGBUILD index 0ff6ced9e..d466baf48 100644 --- a/community/gnuradio/PKGBUILD +++ b/community/gnuradio/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 110002 2014-04-22 21:44:23Z kkeen $ +# $Id: PKGBUILD 110006 2014-04-22 23:18:22Z kkeen $ # Maintainer: Kyle Keen # Contributor: Dominik Heidler # Contributor: Jonatan Sastre pkgname=gnuradio pkgver=3.7.3 -pkgrel=1 +pkgrel=2 pkgdesc="General purpose DSP and SDR toolkit. With drivers for usrp and fcd." arch=('i686' 'x86_64') url="http://gnuradio.org" license=('GPL') -depends=('fftw' 'python2-numpy' 'cppunit' 'swig' 'gsl' 'blas' 'guile' 'boost-libs>=1.53' 'libusbx' 'portaudio' 'libuhd') +depends=('fftw' 'python2-numpy' 'cppunit' 'swig' 'gsl' 'blas' 'guile' 'boost-libs>=1.53' 'libusbx' 'portaudio' 'libuhd' 'libsm') makedepends=('boost' 'cmake' 'python2-lxml' 'pygtk' 'wxpython' 'python2-cheetah' 'glu') optdepends=('python2-cheetah: gnuradio-companion' 'python2-lxml: gnuradio-companion' @@ -34,6 +34,7 @@ install=gnuradio.install # split the gui components? # build doxygen docs? # icons +# remove libsm dep when FS#40047 is fixed # comedilib: gr-comedi # zeroc-ice: gr-ctrlport diff --git a/community/gummi/PKGBUILD b/community/gummi/PKGBUILD index 69a8ac95c..5cd40a7ec 100644 --- a/community/gummi/PKGBUILD +++ b/community/gummi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 78640 2012-10-22 12:45:21Z arodseth $ +# $Id: PKGBUILD 110043 2014-04-23 15:23:03Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Sergio A. Morales @@ -6,30 +6,29 @@ pkgname=gummi pkgver=0.6.5 -pkgrel=1 +pkgrel=2 pkgdesc='Simple LaTex editor for GTK users' arch=('x86_64' 'i686') url='http://gummi.midnightcoding.org/' license=('MIT') depends=('texlive-core' 'gtkspell' 'gtksourceview2' 'poppler-glib' 'desktop-file-utils') makedepends=('glib2' 'gtk2' 'pango' 'poppler' 'intltool') -install=$pkgname.install -source=("$pkgname-$pkgver.tar.gz::http://dev.midnightcoding.org/projects/$pkgname/latest.tar.gz") +install="$pkgname.install" +source=("http://dev.midnightcoding.org/attachments/download/301/$pkgname-$pkgver.tar.gz") sha256sums=('b23c2958376ea43c701a276ad19ceac5b50d9cb32a489a10897b25aa5004fffb') build() { - cd $pkgname-$pkgver + cd "$pkgname-$pkgver" - find . -type f -exec touch {} \; ./configure --prefix=/usr make } package() { - cd $pkgname-$pkgver + cd "$pkgname-$pkgver" - make prefix=$pkgdir/usr install - install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } # vim:set ts=2 sw=2 et: diff --git a/community/miniupnpd/PKGBUILD b/community/miniupnpd/PKGBUILD index 4cfee322b..559f9443f 100644 --- a/community/miniupnpd/PKGBUILD +++ b/community/miniupnpd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 109008 2014-04-09 11:00:33Z tredaelli $ +# $Id: PKGBUILD 110046 2014-04-23 15:59:45Z tredaelli $ # Maintainer: Timothy Redaelli # Contributor: fauno pkgname=miniupnpd pkgver=1.8.20140401 -pkgrel=1 +pkgrel=2 pkgdesc="Lightweight UPnP IGD daemon" arch=('i686' 'x86_64') url="http://miniupnp.free.fr" @@ -12,30 +12,38 @@ backup=(etc/miniupnpd/miniupnpd.conf) depends=('libnfnetlink' 'iptables' 'net-tools' 'util-linux') makedepends=('lsb-release') source=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz" + miniupnpd-1.8.20140401-foreground.patch miniupnpd.systemd) sha256sums=('086dfffa59e8e86e792b73a71d275fec55ef17fe3e94a8c140301aceb05bcdbd' - '2707d028f28fbb28c3a9d13605c9c738e9628f828e22288a8a1492ac93f9ad7c') + '79350f2dbb695b58744aa9036d34a7dfdcfc97cf0f5f3419b86bd9ca58482f8e' + 'baac6223eb35729ea301bd658dc2df6aad5396c7c0b1ec15c8aac1803ef37f6a') + +prepare() { + cd "$pkgname-$pkgver" + + patch -p0 -i "$srcdir"/miniupnpd-1.8.20140401-foreground.patch +} build() { - cd "$pkgname-$pkgver" + cd "$pkgname-$pkgver" - CONFIG_OPTIONS="--strict --ipv6 --leasefile" make -f Makefile.linux config.h - make -f Makefile.linux + CONFIG_OPTIONS="--strict --ipv6 --leasefile" make -f Makefile.linux config.h + make -f Makefile.linux } package() { - cd "$pkgname-$pkgver" - mkdir -p "$pkgdir/usr/share/man/man8" + cd "$pkgname-$pkgver" + mkdir -p "$pkgdir/usr/share/man/man8" - make PREFIX="$pkgdir/" SBININSTALLDIR="$pkgdir/usr/bin" -f Makefile.linux install + make PREFIX="$pkgdir/" SBININSTALLDIR="$pkgdir/usr/bin" -f Makefile.linux install - rm -r "${pkgdir}/etc/init.d" + rm -r "${pkgdir}/etc/init.d" - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -Dm644 "${srcdir}/miniupnpd.systemd" "${pkgdir}/usr/lib/systemd/system/miniupnpd.service" + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 "${srcdir}/miniupnpd.systemd" "${pkgdir}/usr/lib/systemd/system/miniupnpd.service" - sed -i 's:/s\?bin/iptables:/usr/bin/iptables: - s:eth0:"`cat /etc/miniupnpd/miniupnpd.conf | '"awk -F= '/^ext_ifname/ { print \$2 }'"'`":' "${pkgdir}"/etc/miniupnpd/*.sh - sed -i -e "s/^uuid=[-0-9a-f]*/uuid=00000000-0000-0000-0000-000000000000/ - s/make genuuid/uuidgen/" "${pkgdir}/etc/miniupnpd/miniupnpd.conf" + sed -i 's:/s\?bin/iptables:/usr/bin/iptables: + s:eth0:"`cat /etc/miniupnpd/miniupnpd.conf | '"awk -F= '/^ext_ifname/ { print \$2 }'"'`":' "${pkgdir}"/etc/miniupnpd/*.sh + sed -i -e "s/^uuid=[-0-9a-f]*/uuid=00000000-0000-0000-0000-000000000000/ + s/make genuuid/uuidgen/" "${pkgdir}/etc/miniupnpd/miniupnpd.conf" } diff --git a/community/miniupnpd/miniupnpd-1.8.20140401-foreground.patch b/community/miniupnpd/miniupnpd-1.8.20140401-foreground.patch new file mode 100644 index 000000000..7d40fadc7 --- /dev/null +++ b/community/miniupnpd/miniupnpd-1.8.20140401-foreground.patch @@ -0,0 +1,40 @@ +--- ./miniupnpd.c.orig 2014-04-23 15:41:11.783562093 +0000 ++++ ./miniupnpd.c 2014-04-23 15:43:19.672842038 +0000 +@@ -797,7 +797,7 @@ + { + int i; + int pid; +- int debug_flag = 0; ++ int debug_flag = 0, foreground_flag = 0; + int openlog_option; + struct sigaction sa; + /*const char * logfilename = 0;*/ +@@ -1159,6 +1159,9 @@ + case 'd': + debug_flag = 1; + break; ++ case 'D': ++ foreground_flag = 1; ++ break; + case 'w': + if(i+1 < argc) + presurl = argv[++i]; +@@ -1273,7 +1276,7 @@ + goto print_usage; + } + +- if(debug_flag) ++ if(debug_flag || foreground_flag) + { + pid = getpid(); + } +@@ -1413,7 +1416,8 @@ + "\tNotify interval is in seconds. Default is 30 seconds.\n" + "\tDefault pid file is '%s'.\n" + "\tDefault config file is '%s'.\n" +- "\tWith -d miniupnpd will run as a standard program.\n" ++ "\tWith -D miniupnpd will run as a standard program.\n" ++ "\tWith -d miniupnpd will run as a standard program in debug mode.\n" + #if defined(USE_PF) || defined(USE_IPF) + "\t-L sets packet log in pf and ipf on.\n" + #endif diff --git a/community/miniupnpd/miniupnpd.systemd b/community/miniupnpd/miniupnpd.systemd index 88973535c..304c4fe8e 100644 --- a/community/miniupnpd/miniupnpd.systemd +++ b/community/miniupnpd/miniupnpd.systemd @@ -3,10 +3,9 @@ Description=Lightweight UPnP IGD daemon [Service] ExecStartPre=/etc/miniupnpd/iptables_init.sh -ExecStart=/usr/bin/miniupnpd -f /etc/miniupnpd/miniupnpd.conf -d +ExecStart=/usr/bin/miniupnpd -f /etc/miniupnpd/miniupnpd.conf -D ExecStopPost=/etc/miniupnpd/iptables_removeall.sh PIDFile=/run/miniupnpd.pid -StandardOutput=null [Install] WantedBy=network.target diff --git a/community/opendkim/PKGBUILD b/community/opendkim/PKGBUILD index ac943c80e..149162bdf 100644 --- a/community/opendkim/PKGBUILD +++ b/community/opendkim/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 109574 2014-04-16 10:04:50Z spupykin $ +# $Id: PKGBUILD 110064 2014-04-23 17:09:44Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Thomas Jost pkgname=opendkim pkgver=2.9.2 -pkgrel=1 +pkgrel=2 pkgdesc="An open source implementation of the DKIM sender authentication system. Based on a fork of dkim-milter." arch=(i686 x86_64) url="http://www.opendkim.org/" diff --git a/community/opendkim/opendkim.install b/community/opendkim/opendkim.install index a1f16f6ca..c7b8e519d 100644 --- a/community/opendkim/opendkim.install +++ b/community/opendkim/opendkim.install @@ -1,5 +1,5 @@ post_install() { - useradd -r -g mail -d / opendkim + useradd -r -g mail -d / -s /sbin/nologin opendkim chown -R opendkim:mail etc/opendkim cat <>> Check and modify /etc/opendkim/opendkim.conf before starting diff --git a/community/python-matplotlib/PKGBUILD b/community/python-matplotlib/PKGBUILD index f5a9d6231..5f7dd0c6e 100644 --- a/community/python-matplotlib/PKGBUILD +++ b/community/python-matplotlib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 108455 2014-03-27 14:47:53Z fyan $ +# $Id: PKGBUILD 110018 2014-04-23 05:25:45Z fyan $ # Maintainer: Stéphane Gaudreault # Contributor: Stefan Husmann # Contributor: Angel 'angvp' Velasquez @@ -7,7 +7,7 @@ pkgbase=python-matplotlib pkgname=('python2-matplotlib' 'python-matplotlib') pkgver=1.3.1 -pkgrel=3 +pkgrel=4 pkgdesc="A python plotting library, making publication quality plots" arch=('i686' 'x86_64') url='http://matplotlib.org' @@ -16,8 +16,8 @@ checkdepends=('python-nose' 'python2-nose') makedepends=('python2-pytz' 'python2-numpy' 'python2-pyqt4' 'python-pytz' 'python-numpy' 'python-pyqt4' 'tk' 'python-cairo' 'python2-cairo' 'python-dateutil' 'python2-dateutil' 'python-gobject' 'python2-gobject' 'python-pyparsing' - 'python2-pyparsing' 'pygtk' 'python-six' 'ghostscript' 'texlive-bin' 'agg' - 'python-tornado' 'python2-tornado' 'gtk3') + 'python2-pyparsing' 'pygtk' 'python-six' 'ghostscript' 'texlive-bin' + 'python-tornado' 'python2-tornado' 'gtk3' 'wxpython') source=("http://sourceforge.net/projects/matplotlib/files/matplotlib/matplotlib-${pkgver}/matplotlib-${pkgver}.tar.gz" "ffmpeg-2.0.patch") sha512sums=('04877aa15b6d52a6f813e8377098d13c432f66ae2522c544575440180944c9b73a2164ae63edd3a0eff807883bf7b39cd55f28454ccee8c76146567ff4a6fd40' @@ -51,11 +51,14 @@ build() { package_python2-matplotlib() { depends=('python2-pytz' 'python2-numpy' 'python2-cairo' 'python2-pyqt4' 'python2-dateutil' 'python2-pyparsing') - optdepends=('pygtk: for use with the GTK or GTKAgg backend' + optdepends=('pygtk: for GTK/GTKAgg/GTKCairo backend' + 'python2-cairo: for GTKCairo/GTK3Cairo backend' 'tk: used by the TkAgg backend' 'ghostscript: usetex dependencies' 'texlive-bin: usetex dependencies' - 'python2-tornado: for webagg backend') + 'python2-tornado: for webagg backend' + 'python2-gobject: for GTK3Agg/GTK3Cairo backend' + 'wxpython: for WX/WXAgg backend') cd matplotlib-${pkgver} python2 setup.py install -O1 --skip-build --root "${pkgdir}" --prefix=/usr @@ -66,7 +69,8 @@ package_python2-matplotlib() { package_python-matplotlib() { depends=('python-pytz' 'python-numpy' 'python-cairo' 'python-pyqt4' 'python-dateutil' 'python-pyparsing') - optdepends=('pygtk: for use with the GTK or GTKAgg backend' + optdepends=('python-gobject: for GTK3Agg/GTK3Cairo backend' + 'python-cairo: for GTK3Cairo backend' 'tk: used by the TkAgg backend' 'ghostscript: usetex dependencies' 'texlive-bin: usetex dependencies' diff --git a/community/qps/PKGBUILD b/community/qps/PKGBUILD index 7a634e977..e31a0a466 100644 --- a/community/qps/PKGBUILD +++ b/community/qps/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 85392 2013-03-01 10:38:18Z andrea $ +# $Id: PKGBUILD 110074 2014-04-23 17:29:34Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: David Rosenstrauch pkgname=qps pkgver=1.10.16 _dlpkgver=5963 -pkgrel=2 +pkgrel=3 pkgdesc="a visual process manager, an X11 version of 'top' or 'ps'." url="http://qps.kldp.net/projects/qps" depends=('qt4') @@ -16,7 +16,7 @@ md5sums=('dc3396749ad9254fd60ca84b5c0b16b9') build() { cd $srcdir/$pkgname-$pkgver - qmake + qmake-qt4 make } diff --git a/community/rethinkdb/PKGBUILD b/community/rethinkdb/PKGBUILD index 92030aeba..8344f836a 100644 --- a/community/rethinkdb/PKGBUILD +++ b/community/rethinkdb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 109136 2014-04-10 17:21:08Z anatolik $ +# $Id: PKGBUILD 110011 2014-04-23 03:13:26Z anatolik $ # Maintainer: Anatol Pomozov # Contributor: Massimiliano Torromeo # Contributor: Sigmund Lahn pkgname=rethinkdb -pkgver=1.12.2 +pkgver=1.12.3 pkgrel=1 pkgdesc='An open-source distributed database built with love.' arch=(i686 x86_64) @@ -20,7 +20,7 @@ source=( rethinkdb-tmpfile.conf rethinkdb.service ) -sha256sums=('bf6f69ab963e8eb60301dde203f33ae112c7f005e19697be073369b2d4aef492' +sha256sums=('545319fedf65fce26fa83d46bf3a7884ed6b8b085bc712314c458b387c6058d5' '656d3a42e75d087e723f71aa320fdd91cbbb82071ef72eb11fd3e4a619b429a4' 'e56bffa2b9ebc3a00ef566ab2be0719a633c89d961a2461dfa2d9ffdb258c1a2') diff --git a/community/ruby-cairo/PKGBUILD b/community/ruby-cairo/PKGBUILD index 4687d69cb..f5ea210f1 100644 --- a/community/ruby-cairo/PKGBUILD +++ b/community/ruby-cairo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 104887 2014-01-28 03:34:18Z td123 $ +# $Id: PKGBUILD 110020 2014-04-23 06:48:38Z fyan $ # Maintainer: Alexander Rødseth # Contributor: Brad Fanella # Contributor: Jeremy pkgname=ruby-cairo -pkgver=1.12.8 +pkgver=1.12.9 pkgrel=1 pkgdesc='Ruby bindings for cairo' arch=('x86_64' 'i686') @@ -13,7 +13,7 @@ license=('GPL') depends=('ruby' 'cairo') makedepends=('ruby-pkgconfig') source=("http://cairographics.org/releases/rcairo-$pkgver.tar.gz") -sha256sums=('8a6a73c9c67eb0a5b6502483c8c39ffb6acbcadd2574123a6597271c2c25736d') +sha256sums=('ef894e2a52926c1c9d6d7f32cc1899fa21de90787a4a98493e4a004ecdb90b6e') build() { cd "$srcdir/rcairo-$pkgver" @@ -25,7 +25,7 @@ build() { package() { cd "$srcdir/rcairo-$pkgver" - make DESTDIR="$pkgdir" install + make -j1 DESTDIR="$pkgdir" install # Workaround installation failure with -j1 install -Dm644 ext/cairo/cairo.so \ "$pkgdir/usr/lib/ruby/vendor_ruby/2.1.0/$CARCH-linux/cairo.so" } diff --git a/community/slrn/PKGBUILD b/community/slrn/PKGBUILD index 598c62561..c98e55c78 100644 --- a/community/slrn/PKGBUILD +++ b/community/slrn/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 81585 2012-12-24 15:02:37Z spupykin $ +# $Id: PKGBUILD 110066 2014-04-23 17:10:06Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Grigorios Bouzakis pkgname=slrn pkgver=1.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="An open source text-based news client" arch=('i686' 'x86_64') url="http://www.slrn.org/" @@ -19,16 +19,17 @@ md5sums=('232670ab76a045967b137e5124b3d681') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc \ --enable-setgid-code \ --with-slrnpull --with-ssl --with-uu \ --with-uulib=/usr/lib/uudeview \ --with-uuinc=/usr/include/uudeview \ --enable-spoilers + make UUDEVIEW_LIB="/usr/lib/uudeview/*.o" +} - make +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install - install -D -m644 doc/slrn.rc $pkgdir/etc/slrnrc } diff --git a/community/splint/PKGBUILD b/community/splint/PKGBUILD index f6559ab07..c3eaf18c6 100644 --- a/community/splint/PKGBUILD +++ b/community/splint/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 55573 2011-09-14 10:41:16Z andrea $ +# $Id: PKGBUILD 110068 2014-04-23 17:10:21Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: William Rea pkgname=splint pkgver=3.1.2 -pkgrel=3 +pkgrel=4 pkgdesc="A tool for statically checking C programs for security vulnerabilities and coding mistakes" arch=('i686' 'x86_64') url="http://www.splint.org/" license=('GPL') -depends=('glibc') +depends=('flex') source=("http://www.splint.org/downloads/${pkgname}-${pkgver}.src.tgz" 'splint.sh') md5sums=('25f47d70bd9c8bdddf6b03de5949c4fd' @@ -19,7 +19,7 @@ options=('!makeflags') build() { cd "${srcdir}"/$pkgname-$pkgver ./configure --prefix=/usr --mandir=/usr/share/man - make + make LDFLAGS="$LDFLAGS -lfl" } package() { diff --git a/community/vyqchat/PKGBUILD b/community/vyqchat/PKGBUILD index 135ff8e63..c7a4ddebd 100644 --- a/community/vyqchat/PKGBUILD +++ b/community/vyqchat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88015 2013-04-09 21:51:55Z eric $ +# $Id: PKGBUILD 110076 2014-04-23 17:29:50Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Sergej Pupykin pkgname=vyqchat pkgver=0.2.8 -pkgrel=4 +pkgrel=5 pkgdesc="vypress compatible qt chat (can work without server)" arch=('i686' 'x86_64') url="http://linux.bydg.org/~yogin/" @@ -22,7 +22,7 @@ build() { sed -i 's/vyqchat_LDFLAGS/vyqchat_LDADD/' src/Makefile.am # Correct acinclude.m4 to avoid empty else block sed -i 's:# Leave bnv_qt_lib_dir defined:/bin/true:' acinclude.m4 - autoreconf -v + autoreconf -fiv ./configure --prefix=/usr --with-Qt-bin-dir=/usr/lib/qt3/bin --with-Qt-include-dir=/usr/include/qt3 --with-Qt-lib-dir=/usr/lib make } diff --git a/community/xdiskusage/PKGBUILD b/community/xdiskusage/PKGBUILD index 71491ef78..8d946eab7 100644 --- a/community/xdiskusage/PKGBUILD +++ b/community/xdiskusage/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 65246 2012-02-20 12:32:09Z spupykin $ +# $Id: PKGBUILD 110070 2014-04-23 17:10:36Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Tom Newsom # Contributor: Jason Chu pkgname=xdiskusage pkgver=1.48 -pkgrel=7 +pkgrel=8 pkgdesc="xdiskusage is a user-friendly program to show you what is using up all your disk space" arch=('i686' 'x86_64') depends=('fltk') @@ -14,34 +14,24 @@ license=('GPL') url="http://xdiskusage.sourceforge.net" options=(!emptydirs) source=(http://xdiskusage.sourceforge.net/$pkgname-$pkgver.tgz - 'stdin-is-null.patch') + 'build-fix.patch') md5sums=('a902aa9d73761ade98256c3cd5c1f533' - '0181b66b44e382e44c91602d8de9a7b6') + '570eb00cb0999231620b67889325a81f') -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" - sed -i 's/-lGL -lGLU/-lXft/' makeinclude.in - - patch -Np1 -i "$srcdir/stdin-is-null.patch" - - [ $CARCH == "x86_64" ] && patch xdiskusage.C < switch ((long long)v) { -1004c1004 -< int n = (int)v; ---- -> int n = (long long)v; -EOF + patch -Np1 -i "$srcdir/build-fix.patch" +} +build() { + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr - install -d "$pkgdir/usr/bin" "$pkgdir/usr/share/man/man1" - LDFLAGS=-lXi make + make } package() { cd "$srcdir/$pkgname-$pkgver" + install -d "$pkgdir/usr/bin" "$pkgdir/usr/share/man/man1" make prefix="$pkgdir/usr" mandir="$pkgdir/usr/share/man" install chmod 0644 $pkgdir/usr/share/man/man1/* } diff --git a/community/xdiskusage/build-fix.patch b/community/xdiskusage/build-fix.patch new file mode 100644 index 000000000..38a675609 --- /dev/null +++ b/community/xdiskusage/build-fix.patch @@ -0,0 +1,71 @@ +diff -wbBur xdiskusage-1.48/makeinclude.in xdiskusage-1.48.my/makeinclude.in +--- xdiskusage-1.48/makeinclude.in 2004-05-05 10:07:57.000000000 +0400 ++++ xdiskusage-1.48.my/makeinclude.in 2014-04-23 20:58:15.136751299 +0400 +@@ -21,6 +21,6 @@ + CXXFLAGS_D =@CXXFLAGS_D@ + + # libraries to link with: +-LDLIBS =@LIBS@ -lfltk -lXinerama -lGL -lGLU -lX11 -lXext @X_EXTRA_LIBS@ -lm ++LDLIBS =@LIBS@ -lfltk -lXinerama -lXft -lX11 -lXext -lXi @X_EXTRA_LIBS@ -lm + + INSTALL =@INSTALL@ +diff -wbBur xdiskusage-1.48/xdiskusage.C xdiskusage-1.48.my/xdiskusage.C +--- xdiskusage-1.48/xdiskusage.C 2004-09-21 09:23:14.000000000 +0400 ++++ xdiskusage-1.48.my/xdiskusage.C 2014-04-23 21:00:50.696749510 +0400 +@@ -223,6 +223,19 @@ + return 1; + } + ++// returns true if stdin is /dev/null ++// To fix Debian bug #276193 ++// Technically could be possible that returns "true" and is not "true", ++// because same device ID is used across file systems. But is the best ++// solutions that I have ++int isstdinnull() { ++ struct stat ststdin,stnull; ++ stat("/dev/null",&stnull); ++ fstat(0,&ststdin); ++ ++ return (ststdin.st_rdev==stnull.st_rdev); ++} ++ + int main(int argc, char**argv) { + #if FL_MAJOR_VERSION < 2 + // Make fltk look more like KDE/Windoze: +@@ -253,7 +266,7 @@ + OutputWindow* d = OutputWindow::make(argv[n++]); + if (d) d->show(argc,argv); + } +- } else if (!isatty(0)) { ++ } else if (!isatty(0) && !isstdinnull()) { + // test for pipe, if so read stdin: + OutputWindow* d = OutputWindow::make(0); + if (d) d->show(argc,argv); +@@ -392,8 +405,7 @@ + strncpy(pathbuf, path, 1024); + for (int i=0; i<10; i++) { + char *p = (char*)fl_filename_name(pathbuf); +- int i = readlink(pathbuf, p, 1024-(p-pathbuf)); +- if (i < 0) { ++ if (readlink(pathbuf, p, 1024-(p-pathbuf)) < 0) { + if (errno != EINVAL) { + strcat(pathbuf, ": no such file"); + fl_alert(pathbuf); +@@ -988,7 +1000,7 @@ + void OutputWindow::sort_cb(Fl_Widget* o, void*v) { + OutputWindow* d = (OutputWindow*)(o->window()); + int (*compare)(const Node*, const Node*); +- switch ((int)v) { ++ switch ((long long)v) { + case 's': compare = largestfirst; break; + case 'r': compare = smallestfirst; break; + case 'a': compare = alphabetical; break; +@@ -1001,7 +1013,7 @@ + + void OutputWindow::columns_cb(Fl_Widget* o, void*v) { + OutputWindow* d = (OutputWindow*)(o->window()); +- int n = (int)v; ++ int n = (long long)v; + ::ncols = n; + if (n == d->ncols) return; + if (d->current_depth > d->root_depth+n-1) { diff --git a/community/xdiskusage/stdin-is-null.patch b/community/xdiskusage/stdin-is-null.patch deleted file mode 100644 index e70789c13..000000000 --- a/community/xdiskusage/stdin-is-null.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- xdiskusage-1.48/xdiskusage.C 2004-09-21 07:23:14.000000000 +0200 -+++ xdiskusage-1.48.carles/xdiskusage.C 2007-07-30 23:42:05.000000000 +0200 -@@ -223,6 +223,19 @@ - return 1; - } - -+// returns true if stdin is /dev/null -+// To fix Debian bug #276193 -+// Technically could be possible that returns "true" and is not "true", -+// because same device ID is used across file systems. But is the best -+// solutions that I have -+int isstdinnull() { -+ struct stat ststdin,stnull; -+ stat("/dev/null",&stnull); -+ fstat(0,&ststdin); -+ -+ return (ststdin.st_rdev==stnull.st_rdev); -+} -+ - int main(int argc, char**argv) { - #if FL_MAJOR_VERSION < 2 - // Make fltk look more like KDE/Windoze: -@@ -253,7 +266,7 @@ - OutputWindow* d = OutputWindow::make(argv[n++]); - if (d) d->show(argc,argv); - } -- } else if (!isatty(0)) { -+ } else if (!isatty(0) && !isstdinnull()) { - // test for pipe, if so read stdin: - OutputWindow* d = OutputWindow::make(0); - if (d) d->show(argc,argv); diff --git a/community/xmms-imms/PKGBUILD b/community/xmms-imms/PKGBUILD index fd6a5cb94..842b6b78e 100644 --- a/community/xmms-imms/PKGBUILD +++ b/community/xmms-imms/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 83686 2013-02-04 11:06:53Z spupykin $ +# $Id: PKGBUILD 110078 2014-04-23 17:30:12Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Kritoke # Contributor: Kritoke pkgname=xmms-imms -pkgver=3.1.0_rc10 +pkgver=301 pkgrel=1 pkgdesc="An intelligent playlist plug-in for XMMS that tracks your listening patterns and dynamically adapts to your taste." arch=(i686 x86_64) @@ -12,20 +12,20 @@ license=("GPL") url="http://imms.luminal.org/" depends=('xmms' 'pcre' 'sqlite' 'taglib' 'glib2' 'sox' 'torch' 'libxss' 'fftw') replaces=('imms') -source=(http://imms.googlecode.com/files/imms-${pkgver/_/-}.tar.bz2) -md5sums=('61302249e9638779b3241987ab62676d') +source=(http://imms.googlecode.com/files/imms-r${pkgver/_/-}.tar.bz2) +md5sums=('8b3dfac2ce1ae988a7c2fbc47026cc73') build() { - cd $srcdir/imms-${pkgver/_/-} - - if [ $NOEXTRACT -ne 1 ]; then - autoheader - aclocal - autoconf - CXXFLAGS="$CXXFLAGS -DDEBUG=0" ./configure --prefix=/usr --disable-immsremote - fi + cd $srcdir/imms-r${pkgver/_/-} + autoheader + aclocal + autoconf + ./configure --prefix=/usr --disable-immsremote + make LDFLAGS="-L. -lXss -lXext -lX11 -lsqlite3 -lz -lpcre -ltag -L/usr/X11R6/lib /usr/lib/libtorch.so.3" +} - make +package() { + cd $srcdir/imms-r${pkgver/_/-} mkdir -p $pkgdir/usr/bin make prefix=$pkgdir/usr DESTDIR=$pkgdir/usr/lib/xmms/General \ BMPDESTDIR=$pkgdir/usr/lib/bmp/General install -- cgit v1.2.3-54-g00ecf