diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-09 09:50:29 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-09 09:50:29 +0200 |
commit | 4d0f0293b0108f751d79e5a060534fbc9575f7bb (patch) | |
tree | 93c28176dfd2491e899d2ffb967c671abddc8ab8 /community-staging | |
parent | 2cf785af142618fb225778622b1d94a016c18462 (diff) | |
parent | 1fed401c439c264bd92a4c13af1bea0bea458cb4 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
core/gawk/PKGBUILD
libre/linux-libre/PKGBUILD
staging/icu/PKGBUILD
testing/cairo/PKGBUILD
Diffstat (limited to 'community-staging')
-rw-r--r-- | community-staging/dwdiff/PKGBUILD | 24 | ||||
-rw-r--r-- | community-staging/mapnik/PKGBUILD | 54 | ||||
-rw-r--r-- | community-staging/mapnik/gcc47.patch | 11 | ||||
-rw-r--r-- | community-staging/mapnik/mapnik.install | 11 | ||||
-rw-r--r-- | community-staging/open-vm-tools/PKGBUILD | 65 | ||||
-rw-r--r-- | community-staging/open-vm-tools/open-vm-tools-X11Bool.patch | 15 | ||||
-rw-r--r-- | community-staging/open-vm-tools/open-vm-tools.conf.d | 6 | ||||
-rw-r--r-- | community-staging/open-vm-tools/open-vm-tools.install | 10 | ||||
-rw-r--r-- | community-staging/open-vm-tools/open-vm-tools.rc.d | 101 | ||||
-rw-r--r-- | community-staging/open-vm-tools/scripts-network-FS19541.patch | 38 | ||||
-rw-r--r-- | community-staging/open-vm-tools/scripts-network.patch | 73 | ||||
-rw-r--r-- | community-staging/open-vm-tools/tools.conf | 1 | ||||
-rw-r--r-- | community-staging/open-vm-tools/vmware-guestd | 6 | ||||
-rw-r--r-- | community-staging/open-vm-tools/xautostart.conf | 6 | ||||
-rw-r--r-- | community-staging/parrot/PKGBUILD | 49 |
15 files changed, 0 insertions, 470 deletions
diff --git a/community-staging/dwdiff/PKGBUILD b/community-staging/dwdiff/PKGBUILD deleted file mode 100644 index 96d5085a3..000000000 --- a/community-staging/dwdiff/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 68914 2012-04-05 16:04:54Z andrea $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=dwdiff -pkgver=2.0 -pkgrel=2 -pkgdesc="A front-end for the diff program that operates at the word level instead of the line level" -arch=('i686' 'x86_64') -url="http://os.ghalkes.nl/dwdiff.html" -depends=('diffutils' 'icu') -license=('GPL') -source=("http://os.ghalkes.nl/dist/$pkgname-$pkgver.tgz") -md5sums=('98dd16b58a1f136a2cd49f7dd88c5313') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make prefix="$pkgdir"/usr install -} diff --git a/community-staging/mapnik/PKGBUILD b/community-staging/mapnik/PKGBUILD deleted file mode 100644 index 0ebd2aea7..000000000 --- a/community-staging/mapnik/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# $Id: PKGBUILD 68916 2012-04-05 16:13:23Z andrea $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: David Dent <thewinch@gmail.com> -# Contributor: orbisvicis <orbisvicis@gmail.com> - -pkgname=mapnik -pkgver=0.7.1 -pkgrel=16 -pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps" -arch=('i686' 'x86_64') -url="http://mapnik.org/" -license=('LGPL') -depends=('boost-libs' 'icu' 'libpng' 'libjpeg' 'libtiff' 'freetype2' - 'libxml2' 'python2' 'proj' 'cairo' 'cairomm' 'pycairo' - 'postgresql-libs' 'postgis' 'gdal' 'curl' 'libtool') - # already in core ('zlib' 'sqlite3') -optdepends=('libxslt: Web Map Service' - 'python2-lxml: Web Map Service' - 'python-imaging: Web Map Service' - 'python-nose: Web Map Service' - 'apache: Web Map Service' - 'mod_fastcgi: Web Map Service - or:' - 'mod_fcgid: Web Map Service - or:' - 'mod_wsgi: Web Map Service' - ) -makedepends=('scons' 'boost') # already in core ('pkg-config') -install="mapnik.install" -source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - 'gcc47.patch') -md5sums=('8f65fda2a792518d6f6be8a85f62fc73' - 'ce7933dc20de7e07427a6a6b5d4fd002') - -build() { - cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i "${srcdir}"/gcc47.patch - - #patch SConstruct so libs end up in /usr/lib not /usr/lib64 on X86_64 - sed -i -e "/LIBDIR_SCHEMA=/s/lib64/lib/" SConstruct - sed -i 's|png_ptr->io_ptr|png_get_io_ptr(png_ptr)|g' src/png_reader.cpp - sed -i 's/-ansi -Wall/-ansi -DBOOST_FILESYSTEM_VERSION=2 -Wall/' SConstruct - - scons configure \ - PREFIX="/usr" \ - INPUT_PLUGINS=all \ - DESTDIR="$pkgdir" - scons -} - -package(){ - cd "$srcdir/$pkgname-$pkgver" - scons install - # fix permissions on SCons-autogenerated files - chmod 644 "${pkgdir}/usr/lib/python2.7/site-packages/mapnik/paths.py" -} diff --git a/community-staging/mapnik/gcc47.patch b/community-staging/mapnik/gcc47.patch deleted file mode 100644 index 0532e0c21..000000000 --- a/community-staging/mapnik/gcc47.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mapnik-0.7.1/include/mapnik/factory.hpp~ 2010-03-22 16:40:04.000000000 +0000 -+++ mapnik-0.7.1/include/mapnik/factory.hpp 2012-04-05 15:55:13.460191219 +0000 -@@ -84,7 +84,7 @@ - { - return (pos->second)(file); - } -- return on_unknown_type(key); -+ return this->on_unknown_type(key); - } - }; - } diff --git a/community-staging/mapnik/mapnik.install b/community-staging/mapnik/mapnik.install deleted file mode 100644 index 46f265d5b..000000000 --- a/community-staging/mapnik/mapnik.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - /sbin/ldconfig -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-staging/open-vm-tools/PKGBUILD b/community-staging/open-vm-tools/PKGBUILD deleted file mode 100644 index f7415a255..000000000 --- a/community-staging/open-vm-tools/PKGBUILD +++ /dev/null @@ -1,65 +0,0 @@ -# $Id: PKGBUILD 68912 2012-04-05 15:58:59Z andrea $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Krzysztof Raczkowski <raczkow@gmail.com> - -pkgname=open-vm-tools -pkgver=2012.03.13 -_pkgsubver=651368 -pkgrel=2 -pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools" -arch=('i686' 'x86_64') -url="http://open-vm-tools.sourceforge.net/" -license=('LGPL') -depends=('open-vm-tools-modules' 'libdnet' 'icu' 'procps' 'uriparser' 'libsigc++' 'libxss') -makedepends=('chrpath' 'doxygen' 'gtkmm' 'fuse' 'libxtst') -optdepends=('gtkmm' 'libnotify' 'libxtst' 'fuse' 'libsm') -options=('docs' '!libtool') -install=$pkgname.install -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-${_pkgsubver}.tar.gz - scripts-network.patch - scripts-network-FS19541.patch - open-vm-tools-X11Bool.patch - open-vm-tools.conf.d - open-vm-tools.rc.d - tools.conf - vmware-guestd - xautostart.conf) -md5sums=('a664206443d5de53f5f8ee8d5fe6c2d7' - 'b8f68fef3d388489e40dba581b6da18a' - '199508b0d3fe6fa9b726d09170bf51f1' - '8c333a979578bdc0c3134c1dd6bb7353' - '79b0a14d86191fee70a4639da8bd7785' - '67cb83a9e5a4dd016c1a1da2863ca36d' - 'b55d15e2c4be396aad709aeca91033d3' - '73cc1a2665b0dd62427733d62ead8b9a' - '75a25d83417e683957321f97a00f8465') - -build() { - cd "$srcdir/$pkgname-${pkgver}-${_pkgsubver}" - - [ -f Makefile ] || ./configure --prefix=/usr --without-kernel-modules - make -} - -package() { - cd "$srcdir/$pkgname-${pkgver}-${_pkgsubver}" - - make install DESTDIR=$pkgdir - install -D -m 755 scripts/common/vmware-xdg-detect-de $pkgdir/usr/bin/vmware-xdg-detect-de - chmod 07755 $pkgdir/usr/bin/vmware-user-suid-wrapper - - cd $pkgdir - patch -p1 -i $srcdir/scripts-network.patch etc/vmware-tools/scripts/vmware/network - patch -p1 -i $srcdir/scripts-network-FS19541.patch etc/vmware-tools/scripts/vmware/network - - install -D -m 755 $srcdir/open-vm-tools.rc.d $pkgdir/etc/rc.d/open-vm-tools - install -D -m 644 $srcdir/open-vm-tools.conf.d $pkgdir/etc/conf.d/open-vm-tools - install -D -m 644 $srcdir/tools.conf $pkgdir/etc/vmware-tools/tools.conf - install -D -m 644 $srcdir/xautostart.conf $pkgdir/etc/vmware-tools/xautostart.conf - install -D -m 644 $srcdir/vmware-guestd $pkgdir/etc/pam.d/vmware-guestd - rm -rf $pkgdir/usr/etc - - ln -fs /usr/sbin/mount.vmhgfs $pkgdir/sbin/mount.vmhgfs - - cd $pkgdir && find -type f -exec sh -c "file {} | grep ELF >/dev/null && echo {} && chrpath -d {}" \; -} diff --git a/community-staging/open-vm-tools/open-vm-tools-X11Bool.patch b/community-staging/open-vm-tools/open-vm-tools-X11Bool.patch deleted file mode 100644 index f12581807..000000000 --- a/community-staging/open-vm-tools/open-vm-tools-X11Bool.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -wbBur open-vm-tools-2010.08.24-292196.org/lib/include/vm_basic_types.h open-vm-tools-2010.08.24-292196/lib/include/vm_basic_types.h ---- open-vm-tools-2010.08.24-292196.org/lib/include/vm_basic_types.h 2010-08-24 19:59:22.000000000 +0000 -+++ open-vm-tools-2010.08.24-292196/lib/include/vm_basic_types.h 2010-08-30 09:38:48.000000000 +0000 -@@ -83,8 +83,11 @@ - - /* STRICT ANSI means the Xserver build and X defines Bool differently. */ - #if !defined(__STRICT_ANSI__) || defined(__FreeBSD__) || defined(__MINGW32__) -+# ifndef _XTYPEDEF_BOOL -+# define _XTYPEDEF_BOOL - typedef char Bool; - #endif -+#endif - - #ifndef FALSE - #define FALSE 0 diff --git a/community-staging/open-vm-tools/open-vm-tools.conf.d b/community-staging/open-vm-tools/open-vm-tools.conf.d deleted file mode 100644 index 83f7864e8..000000000 --- a/community-staging/open-vm-tools/open-vm-tools.conf.d +++ /dev/null @@ -1,6 +0,0 @@ -# Enable support for Drag'n'Drop -VM_DRAG_AND_DROP="yes" - -# vmware-guestd settings -GUESTD_BIN="/usr/sbin/vmware-guestd" -PIDFILE="/var/run/vmware-guestd.pid" diff --git a/community-staging/open-vm-tools/open-vm-tools.install b/community-staging/open-vm-tools/open-vm-tools.install deleted file mode 100644 index 88d9b88e6..000000000 --- a/community-staging/open-vm-tools/open-vm-tools.install +++ /dev/null @@ -1,10 +0,0 @@ -post_install() { - [ ! -d "/mnt/hgfs" ] && mkdir /mnt/hgfs - echo ">>>" - echo ">>> You can mount VMware Shared Folders via:" - echo ">>> mount -t vmhgfs .host:/ /mnt/hgfs" - echo ">>>" - echo ">>> or by adding this line to /etc/fstab:" - echo ">>> .host:/ /mnt/hgfs vmhgfs defaults 0 0" - echo ">>>" -} diff --git a/community-staging/open-vm-tools/open-vm-tools.rc.d b/community-staging/open-vm-tools/open-vm-tools.rc.d deleted file mode 100644 index 0c9221489..000000000 --- a/community-staging/open-vm-tools/open-vm-tools.rc.d +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -# source application-specific settings -[ -f /etc/conf.d/open-vm-tools ] && . /etc/conf.d/open-vm-tools - -PID=`pidof -o %PPID /usr/bin/vmtoolsd` -case "$1" in - start) - stat_busy "Starting Open Virtual Machine Tools" - - if [ "$VM_DRAG_AND_DROP" == "yes" ]; then - VMBLOCK=`grep -w vmblock /proc/modules` - [ -z "$VMBLOCK" ] && modprobe vmblock - if [ $? -gt 0 ]; then - stat_fail - exit 1 - fi - - DND_TMPDIR="/tmp/VMwareDnD" - if [ ! -d "$DND_TMPDIR" ]; then - mkdir $DND_TMPDIR - chmod 1777 $DND_TMPDIR - fi - - mount -t vmblock none /proc/fs/vmblock/mountPoint - if [ $? -gt 0 ]; then - stat_fail - exit 1 - fi - fi - - - for m in vmhgfs vmsync; do - VMMOD=`grep -w $m /proc/modules` - [ -z "$VMMOD" ] && \ - { modprobe $m - if [ $? -gt 0 ]; then - stat_fail - exit 1 - fi; } - done - - - [ -z "$PID" ] && /usr/bin/vmtoolsd --background $PIDFILE - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon open-vm-tools - stat_done - fi - ;; - stop) - stat_busy "Stopping Open Virtual Machine Tools" - [ ! -z "$PID" ] && kill $PID &>/dev/null -# if [ $? -gt 0 ]; then -# stat_fail -# exit 1 -# fi - - for m in vmhgfs vmsync vmci; do - VMMOD=`grep -w $m /proc/modules` - [ ! -z "$VMMOD" ] && rmmod $m - if [ $? -gt 0 ]; then - stat_fail - exit 4 - fi - done - - if [ "$VM_DRAG_AND_DROP" == "yes" ]; then - MOUNTPOINT=`grep -w "none /proc/fs/vmblock/mountPoint vmblock" /proc/modules` - [ -z "$MOUNTPOINT" ] && umount /proc/fs/vmblock/mountPoint - if [ $? -gt 0 ]; then - stat_fail - exit 5 - fi - - DND_TMPDIR="/tmp/VMwareDnD" - rm -r $DND_TMPDIR - - VMBLOCK=`grep -w vmblock /proc/modules` - [ ! -z "$VMBLOCK" ] && rmmod vmblock - if [ $? -gt 0 ]; then - stat_fail - exit 6 - fi - fi - - rm_daemon open-vm-tools - stat_done - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-staging/open-vm-tools/scripts-network-FS19541.patch b/community-staging/open-vm-tools/scripts-network-FS19541.patch deleted file mode 100644 index 5fcb33ba8..000000000 --- a/community-staging/open-vm-tools/scripts-network-FS19541.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- network.orig 2011-11-09 18:42:28.000000000 +0400 -+++ network 2011-11-09 18:46:22.000000000 +0400 -@@ -76,7 +76,7 @@ - else - echo `date` "[rescue_nic] activating $nic ..." - -- ifup $nic -+ ifconfig $nic up - exitCode=`expr $exitCode \| $?` - fi - done < $activeList -@@ -105,7 +105,7 @@ - # `which' may be a bit noisy, so we'll shush it. - dbusSend=`which dbus-send 2>/dev/null` - rc=$? -- if [ $rc = 0 ]; then -+ if [ $rc = 0 ] && [ `pidof dbus-daemon` ]; then - # NetworkManager 0.8.0 - $dbusSend --system --print-reply \ - --dest=org.freedesktop.NetworkManager \ -@@ -154,7 +154,7 @@ - # `which' may be a bit noisy, so we'll shush it. - dbusSend=`which dbus-send 2>/dev/null` - rc=$? -- if [ $rc = 0 ]; then -+ if [ $rc = 0 ] && [ `pidof dbus-daemon` ]; then - # NetworkManager 0.8.0 - $dbusSend --system --print-reply \ - --dest=org.freedesktop.NetworkManager \ -@@ -203,7 +203,7 @@ - - # XXX Are these really necessary? If so, we should have seen customer - # complaints by now. -- which ifup >/dev/null 2>&1 || Panic "ifup not in search path." -+# which ifup >/dev/null 2>&1 || Panic "ifup not in search path." - which ifconfig >/dev/null 2>&1 || Panic "ifconfig not in search path." - - case "$1" in diff --git a/community-staging/open-vm-tools/scripts-network.patch b/community-staging/open-vm-tools/scripts-network.patch deleted file mode 100644 index 44c7e6dcb..000000000 --- a/community-staging/open-vm-tools/scripts-network.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- network.org 2012-03-17 22:20:11.000000000 +0400 -+++ network 2012-03-17 22:18:47.000000000 +0400 -@@ -34,51 +34,6 @@ - - - # --# find_networking_script -- --# --# Searches common Linux distro init/rc paths to find a singular network --# services script. --# --# Result: --# Returns a valid networking script path on success or "error" on failure. --# --# Side effects: --# None. --# -- --find_networking_script() { -- local script="error" -- for dir in "/etc/init.d" "/sbin/init.d" "/etc" "/etc/rc.d" ; do -- if [ -d "$dir/rc0.d" ] && -- [ -d "$dir/rc1.d" ] && -- [ -d "$dir/rc2.d" ] && -- [ -d "$dir/rc3.d" ] && -- [ -d "$dir/rc4.d" ] && -- [ -d "$dir/rc5.d" ] && -- [ -d "$dir/rc6.d" ]; then -- -- # Now find the appropriate networking script. -- if [ -d "$dir/init.d" ]; then -- if [ -x "$dir/init.d/network" ]; then -- script="$dir/init.d/network" -- elif [ -x "$dir/init.d/networking" ]; then -- script="$dir/init.d/networking" -- fi -- else -- if [ -x "$dir/network" ]; then -- script="$dir/network" -- elif [ -x "$dir/networking" ]; then -- script="$dir/networking" -- fi -- fi -- fi -- done -- -- echo "$script" --} -- -- --# - # run_network_script -- - # - # Finds out how to run the system's script used to control networking, and -@@ -87,17 +42,7 @@ - # - run_network_script() - { -- script=`find_networking_script` -- [ "$script" != "error" ] || Panic "Cannot find system networking script." -- -- # Using SysV "service" if it exists, otherwise fall back to run the script directly -- service=`which service 2>/dev/null` -- if [ $? = 0 -a -n "$service" ]; then -- serviceName=`basename "$script"` -- "$service" "$serviceName" "$1" -- else -- "$script" "$1" -- fi -+ /etc/rc.d/network "$1" - } - - diff --git a/community-staging/open-vm-tools/tools.conf b/community-staging/open-vm-tools/tools.conf deleted file mode 100644 index 0bb2681b1..000000000 --- a/community-staging/open-vm-tools/tools.conf +++ /dev/null @@ -1 +0,0 @@ -bindir = "/usr/bin" diff --git a/community-staging/open-vm-tools/vmware-guestd b/community-staging/open-vm-tools/vmware-guestd deleted file mode 100644 index ac80c0385..000000000 --- a/community-staging/open-vm-tools/vmware-guestd +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 - -auth sufficient /lib/security/pam_unix2.so shadow nullok -auth required /lib/security/pam_unix_auth.so shadow nullok -account sufficient /lib/security/pam_unix2.so -account required /lib/security/pam_unix_acct.so diff --git a/community-staging/open-vm-tools/xautostart.conf b/community-staging/open-vm-tools/xautostart.conf deleted file mode 100644 index 829f379ce..000000000 --- a/community-staging/open-vm-tools/xautostart.conf +++ /dev/null @@ -1,6 +0,0 @@ -gnome-panel -ksmserver -startkde -kwrapper -panel -xfce4-panel diff --git a/community-staging/parrot/PKGBUILD b/community-staging/parrot/PKGBUILD deleted file mode 100644 index 257e5b8e3..000000000 --- a/community-staging/parrot/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 68910 2012-04-05 15:46:23Z andrea $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: mpie <michael.kyne-phillips1@ntlworld.com> - -pkgname=parrot -pkgver=4.2.0 -#_rel=stable -_rel=devel -pkgrel=1 -pkgdesc="Standalone VM that can execute bytecode compiled dynamic languages" -arch=('x86_64' 'i686') -url="http://www.parrotcode.org/" -license=('GPL') -depends=('icu' 'openssl' 'libffi') -makedepends=('perl-json') -optdepends=('freeglut') -options=(!makeflags) -source=("ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/$pkgname-$pkgver.tar.gz") -sha256sums=('69ee93d9f81babcff67b747cc614358958a32f274e407b65771ca5a056d4c3d4') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - sed -i 's#auto::sha1##' lib/Parrot/Configure/Step/List.pm - sed -i 's#auto::git_describe##' lib/Parrot/Configure/Step/List.pm - - perl Configure.pl --prefix=/usr \ - --parrot_is_shared \ - --disable-rpath - - find -type f -name Makefile | while read F; do - grep "$srcdir" $F && sed -i \ - "s#-Wl,-rpath=$srcdir/$pkgname-$pkgver/blib/lib##" $F - grep "$srcdir" $F && sed -i \ - "s#-rpath=$srcdir/$pkgname-$pkgver/blib/lib##" $F - done - - export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:$(pwd)/blib/lib" - make all parrot_utils docs html -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install-dev - - sed -i "s#$srcdir#/usr/src#" \ - $pkgdir/usr/lib/parrot/$pkgver/tools/lib/Parrot/Config/Generated.pm -} |