diff options
Diffstat (limited to 'community')
95 files changed, 798 insertions, 3074 deletions
diff --git a/community/acpid/acpid b/community/acpid/acpid deleted file mode 100644 index 288ac078d..000000000 --- a/community/acpid/acpid +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -[ -f /etc/conf.d/acpid ] && . /etc/conf.d/acpid - -PID=`pidof -o %PPID /usr/sbin/acpid` -case "$1" in - start) - stat_busy "Starting acpid" - [ -z "$PID" ] && /usr/sbin/acpid $ACPID_ARGS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon acpid - stat_done - fi - ;; - stop) - stat_busy "Stopping acpid" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon acpid - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/acpid/acpid.conf.d b/community/acpid/acpid.conf.d deleted file mode 100644 index b60103a2d..000000000 --- a/community/acpid/acpid.conf.d +++ /dev/null @@ -1,5 +0,0 @@ -# -# Arguments to be passed to the acpid daemon -# - -ACPID_ARGS="" diff --git a/community/arptables/PKGBUILD b/community/arptables/PKGBUILD index ac6942bcb..40eba2685 100644 --- a/community/arptables/PKGBUILD +++ b/community/arptables/PKGBUILD @@ -1,18 +1,27 @@ -# $Id: PKGBUILD 64145 2012-02-09 09:48:15Z seblu $ +# $Id: PKGBUILD 71317 2012-05-26 14:59:39Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Daniel Micay <danielmicay@gmail.com> # Contributor: Michal Soltys <soltys@ziu.info> pkgname=arptables pkgver=0.0.3_4 -pkgrel=2 +pkgrel=3 pkgdesc='ARP filtering utility' arch=('i686' 'x86_64') url='http://ebtables.sourceforge.net/' license=('GPL') -source=("http://downloads.sourceforge.net/ebtables/$pkgname-v${pkgver//_/-}.tar.gz" 'arptables.rc') +backup=("etc/$pkgname.conf" "etc/conf.d/$pkgname") +install=$pkgname.install +source=("http://downloads.sourceforge.net/ebtables/$pkgname-v${pkgver//_/-}.tar.gz" + "$pkgname.conf" + "$pkgname.rc" + "$pkgname.systemd" + "$pkgname.service") md5sums=('1d4ab05761f063b0751645d8f2b8f8e5' - 'f8c0ecad9151a16347c133e043232d4a') + '00bfb5bd8a83a5b466c650ee5d8f86f3' + '60e0319b55b1ef9e13d9ac03dd98c8d4' + '65a9ed0b866f727184a87e4d480975bd' + 'b26771191e52905d8aea6333c26cb1c3') build() { cd $pkgname-v${pkgver//_/-} @@ -20,8 +29,7 @@ build() { } package() { - # setup arptables - cd $pkgname-v${pkgver//_/-} + pushd $pkgname-v${pkgver//_/-} make install \ DESTDIR="$pkgdir" \ PREFIX=/usr \ @@ -29,10 +37,18 @@ package() { BINDIR=/usr/sbin \ MANDIR=/usr/share/man \ INITDIR=/etc/rc.d \ - SYSCONFIGDIR=/etc/arptables - - # install rc script - install -D -m 0755 ../arptables.rc "$pkgdir/etc/rc.d/arptables" + SYSCONFIGDIR=/etc + popd + # install initscripts + install -Dm 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname" + install -Dm 644 $pkgname.conf "$pkgdir/etc/conf.d/$pkgname" + # install systemd service + install -Dm 755 $pkgname.systemd \ + "$pkgdir/usr/lib/systemd/scripts/$pkgname" + install -Dm 644 $pkgname.service \ + "$pkgdir/usr/lib/systemd/system/$pkgname.service" + # default config file + install -Dm 644 /dev/null "$pkgdir/etc/$pkgname.conf" } # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/arptables/arptables.conf b/community/arptables/arptables.conf new file mode 100644 index 000000000..8b5456788 --- /dev/null +++ b/community/arptables/arptables.conf @@ -0,0 +1,7 @@ +# Configuration file used to load/save configuration. +CONFIG_FILE='/etc/arptables.conf' + +# Save configuration on stop/restart. +#SAVE_ON_STOP=yes + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/arptables/arptables.install b/community/arptables/arptables.install new file mode 100644 index 000000000..5f03b6e24 --- /dev/null +++ b/community/arptables/arptables.install @@ -0,0 +1,10 @@ +## arg 1: the new package version +## arg 2: the old package version +post_upgrade() { + [ $(vercmp "$2" '0.0.3_4-2') -gt 0 ] || cat <<EOF +Config file have been moved from /etc/arptables/arptables to /etc/arptables.conf. +You can revert to the previous location by editing /etc/conf.d/arptables. +EOF +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/arptables/arptables.rc b/community/arptables/arptables.rc index dae90ac2a..a188c65c1 100644 --- a/community/arptables/arptables.rc +++ b/community/arptables/arptables.rc @@ -2,57 +2,33 @@ . /etc/rc.conf . /etc/rc.d/functions - -[[ -x /usr/sbin/arptables ]] || exit 1 -[[ -x /usr/sbin/arptables-save ]] || exit 1 -[[ -x /usr/sbin/arptables-restore ]] || exit 1 - -do_start() { - stat_busy "Restore arptables rules" - if [[ -r /etc/arptables/arptables ]]; then - /usr/sbin/arptables-restore </etc/arptables/arptables - (( $? == 0 )) && stat_done && add_daemon arptables && return - fi - stat_fail -} - -do_stop() { - stat_busy "Flushing arptables rules" - /usr/sbin/arptables-restore </dev/null - if (( $? == 0 )); then - stat_done - rm_daemon arptables - else - stat_fail - fi -} - -do_save() { - stat_busy "Saving arptables rules" - /usr/sbin/arptables-save >/etc/arptables/arptables - (( $? == 0 )) && stat_done || stat_fail -} +. /etc/conf.d/${0##*/} case "$1" in start) - do_start - ;; + stat_busy 'Loading arptables rules' + arptables-restore < "$CONFIG_FILE" && + add_daemon ${0##*/} && stat_done || stat_die + ;; stop) - do_stop - ;; + [[ $SAVE_ON_STOP =~ [yY][eE][sS] ]] && $0 save + stat_busy 'Clearing arptables rules' + arptables-restore < /dev/null && + rm_daemon ${0##*/} && stat_done || stat_die + ;; restart) - do_stop - do_start - ;; + $0 start + $0 stop + ;; save) - do_save - ;; - status) - /usr/sbin/arptables-save - ;; + stat_busy 'Saving arptables rules' + arptables-save > "$CONFIG_FILE" && + stat_done || stat_die + ;; *) - echo "Usage $0 {start|stop|restart|save|status}" >&2 + echo "usage: ${0##*/} {start|stop|restart|save}" >&2 exit 1 + ;; esac # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/arptables/arptables.service b/community/arptables/arptables.service new file mode 100644 index 000000000..4fc11f17d --- /dev/null +++ b/community/arptables/arptables.service @@ -0,0 +1,11 @@ +[Unit] +Description=ARP Tables + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/lib/systemd/scripts/arptables start +ExecStop=/usr/lib/systemd/scripts/arptables stop + +[Install] +WantedBy=multi-user.target diff --git a/community/arptables/arptables.systemd b/community/arptables/arptables.systemd new file mode 100644 index 000000000..bc5acdbcf --- /dev/null +++ b/community/arptables/arptables.systemd @@ -0,0 +1,22 @@ +#!/bin/bash + +. /etc/conf.d/arptables + +case $1 in + start) + arptables-restore < "$CONFIG_FILE" + ;; + stop) + [[ $SAVE_ON_STOP =~ [yY][eE][sS] ]] && $0 save + arptables-restore < /dev/null + ;; + save) + arptables-save > "$CONFIG_FILE" + ;; + *) + echo "usage: ${0##*/} {start|stop|save}" >&2 + exit 1 + ;; +esac + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/bibletime/PKGBUILD b/community/bibletime/PKGBUILD deleted file mode 100644 index 057c61125..000000000 --- a/community/bibletime/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 61169 2011-12-23 14:46:29Z arodseth $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Tobias T. <OldShatterhand at gmx-topmail dot de> -pkgname=bibletime -pkgver=2.9.1 -pkgrel=1 -pkgdesc="Bible study tool for KDE4" -arch=('x86_64' 'i686') -url="http://www.bibletime.info/" -license=('GPL2') -depends=('qt' 'sword' 'openssl' 'clucene' 'qtwebkit') -makedepends=('cmake' 'boost-libs') -install=$pkgname.install -source=("http://sourceforge.net/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2") -sha256sums=('308a86d4a1f63203e01438e75be8306377927498b5d0ae8769a4df3c828013b5') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - "$srcdir/$pkgname-$pkgver" - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/community/bibletime/bibletime.install b/community/bibletime/bibletime.install deleted file mode 100644 index ad97d7bab..000000000 --- a/community/bibletime/bibletime.install +++ /dev/null @@ -1,13 +0,0 @@ -post_upgrade() { - update-desktop-database -q -} - -post_install() { - post_upgrade -} - -post_remove() { - post_upgrade -} - -# vim:set ts=2 sw=2 et: diff --git a/community/blackbox/PKGBUILD b/community/blackbox/PKGBUILD deleted file mode 100644 index 036a2ffff..000000000 --- a/community/blackbox/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 58674 2011-11-17 13:44:24Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: durbatuluk <dvdscripter@gmail.org> -# Contributor: Steve Ponsford <sp4d@lavabit.com> - -pkgname=blackbox -pkgver=0.70.1 -pkgrel=10 -pkgdesc="A window manager for X11" -url="http://blackboxwm.sourceforge.net/" -arch=('i686' 'x86_64' 'mips64el') -depends=('gcc-libs' 'libxft' 'libxext' 'libx11' 'libxt') -license=('MIT') -options=('!libtool') -source=(http://downloads.sourceforge.net/blackboxwm/$pkgname-$pkgver.tar.gz - gcc4.3.patch - bbdock.patch - bsetbg-feh.patch - textpropertytostring-unconditional.patch) -md5sums=('2d173b95ca5e64ef478c6a5d2deee9df' - 'bc7a1335d77cdeb6f85cba4d01e68e63' - '69c5a5e981b087b2d8267cab996b48dd' - 'e7fb0d5bfd95820c0194ec73df66dadc' - '3b92ad246f07126dd55ae9634d6e875e') - -build() { - cd $srcdir/$pkgname-$pkgver - - patch -Np1 -i ../gcc4.3.patch - patch -Np0 -i ../bbdock.patch - patch -Np0 -i ../bsetbg-feh.patch - patch -Np1 -i ../textpropertytostring-unconditional.patch - - ./configure --prefix=/usr --mandir=/usr/share/man - make - make DESTDIR=$pkgdir install - - install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE -} diff --git a/community/blackbox/bbdock.patch b/community/blackbox/bbdock.patch deleted file mode 100644 index 709b6cfe1..000000000 --- a/community/blackbox/bbdock.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- src/Slit.cc 2005-01-04 05:58:33.000000000 -0700 -+++ /root/tmp/Slit.cc 2007-12-29 11:13:09.000000000 -0700 -@@ -248,6 +248,13 @@ - bt::PixmapCache::find(screen->screenNumber(), texture, - frame.rect.width(), frame.rect.height(), - frame.pixmap); -+/*** START: BBDOCK PATCH FOR DOCK APPS THAT USE ParentRelative **************/ -+ if ((texture.texture() & bt::Texture::Gradient) && frame.pixmap) -+ XSetWindowBackgroundPixmap(display, frame.window, frame.pixmap); -+ else if ((texture.texture() & bt::Texture::Solid)) -+ XSetWindowBackground(display, frame.window, -+ texture.color1().pixel(screen->screenNumber())); -+/*** STOP: BBDOCK PATCH FOR DOCK APPS THAT USE ParentRelative ***************/ - XClearArea(display, frame.window, 0, 0, - frame.rect.width(), frame.rect.height(), True); - diff --git a/community/blackbox/bsetbg-feh.patch b/community/blackbox/bsetbg-feh.patch deleted file mode 100644 index 17a612ff0..000000000 --- a/community/blackbox/bsetbg-feh.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- util/bsetbg.orig 2008-03-26 21:17:04.000000000 -0700 -+++ util/bsetbg 2008-03-26 21:21:57.000000000 -0700 -@@ -22,7 +22,7 @@ - - PATH=$PATH:/usr/bin:/usr/local/bin:/usr/X11R6/bin - --img_apps="display xli xsetbg Esetroot qiv wmsetbg xv" -+img_apps="display xli xsetbg Esetroot qiv wmsetbg xv feh" - - display_full_cmd="display -geometry 800x600 -window root" - display_tile_cmd="display -window root" -@@ -59,6 +59,11 @@ - xsetbg_center_cmd="xsetbg -center" - xsetbg_default_cmd="$xsetbg_center_cmd" - -+feh_full_cmd="feh --bg-scale" -+feh_tile_cmd="feh --bg-tile" -+feh_center_cmd="feh --bg-center" -+feh_default_cmd="$feh_center_cmd" -+ - ################################## - - me=`basename $0` diff --git a/community/blackbox/gcc4.3.patch b/community/blackbox/gcc4.3.patch deleted file mode 100644 index 40a9dcdef..000000000 --- a/community/blackbox/gcc4.3.patch +++ /dev/null @@ -1,111 +0,0 @@ -diff -Nur blackbox-0.70.1/lib/Image.cc blackbox-0.70.1-new/lib/Image.cc ---- blackbox-0.70.1/lib/Image.cc 2005-04-08 08:41:09.000000000 -0700 -+++ blackbox-0.70.1-new/lib/Image.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -45,6 +45,8 @@ - #include <stdio.h> - #include <stdlib.h> - -+#include <cstring> -+ - // #define COLORTABLE_DEBUG - // #define MITSHM_DEBUG - -diff -Nur blackbox-0.70.1/lib/Resource.cc blackbox-0.70.1-new/lib/Resource.cc ---- blackbox-0.70.1/lib/Resource.cc 2005-04-06 14:16:50.000000000 -0700 -+++ blackbox-0.70.1-new/lib/Resource.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -30,6 +30,8 @@ - - #include <stdio.h> - -+#include <cstring> -+ - - bt::Resource::Resource(void) - : db(NULL) -diff -Nur blackbox-0.70.1/lib/XDG.cc blackbox-0.70.1-new/lib/XDG.cc ---- blackbox-0.70.1/lib/XDG.cc 2005-04-06 07:04:38.000000000 -0700 -+++ blackbox-0.70.1-new/lib/XDG.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -26,7 +26,7 @@ - #include "XDG.hh" - - #include <stdlib.h> -- -+#include <algorithm> - - // make sure directory names end with a slash - static std::string terminateDir(const std::string &string) -diff -Nur blackbox-0.70.1/src/BlackboxResource.cc blackbox-0.70.1-new/src/BlackboxResource.cc ---- blackbox-0.70.1/src/BlackboxResource.cc 2005-10-18 00:34:46.000000000 -0700 -+++ blackbox-0.70.1-new/src/BlackboxResource.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -33,6 +33,8 @@ - #include <X11/Xutil.h> - #include <X11/cursorfont.h> - -+#include <cstring> -+ - - BlackboxResource::BlackboxResource(const std::string& rc): rc_file(rc) { - screen_resources = 0; -diff -Nur blackbox-0.70.1/src/Screen.cc blackbox-0.70.1-new/src/Screen.cc ---- blackbox-0.70.1/src/Screen.cc 2005-10-18 01:07:22.000000000 -0700 -+++ blackbox-0.70.1-new/src/Screen.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -48,6 +48,8 @@ - #include <ctype.h> - #include <dirent.h> - -+#include <cstring> -+ - - static bool running = true; - static int anotherWMRunning(Display *, XErrorEvent *) { -diff -Nur blackbox-0.70.1/src/ScreenResource.cc blackbox-0.70.1-new/src/ScreenResource.cc ---- blackbox-0.70.1/src/ScreenResource.cc 2005-04-12 22:54:08.000000000 -0700 -+++ blackbox-0.70.1-new/src/ScreenResource.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -33,6 +33,8 @@ - - #include <assert.h> - -+#include <cstring> -+ - - static const int iconify_width = 9; - static const int iconify_height = 9; -diff -Nur blackbox-0.70.1/src/main.cc blackbox-0.70.1-new/src/main.cc ---- blackbox-0.70.1/src/main.cc 2005-01-03 02:42:57.000000000 -0700 -+++ blackbox-0.70.1-new/src/main.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -36,6 +36,8 @@ - - #include <stdio.h> - -+#include <cstring> -+ - - static void showHelp(int exitval) { - // print version - this should not be localized! -diff -Nur blackbox-0.70.1/util/bsetbg blackbox-0.70.1-new/util/bsetbg ---- blackbox-0.70.1/util/bsetbg 2004-12-22 02:40:18.000000000 -0700 -+++ blackbox-0.70.1-new/util/bsetbg 2008-05-21 20:52:44.000000000 -0700 -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/bin/bash - - # Copyright (c) 2000-2002 Timothy M. King (tmk@lordzork.com) - # -diff -Nur blackbox-0.70.1/util/bsetroot.cc blackbox-0.70.1-new/util/bsetroot.cc ---- blackbox-0.70.1/util/bsetroot.cc 2005-03-15 00:01:37.000000000 -0700 -+++ blackbox-0.70.1-new/util/bsetroot.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -27,11 +27,14 @@ - #include <Pen.hh> - #include <Texture.hh> - -+#include <cstdlib> - #include <cctype> - - #include <X11/Xatom.h> - #include <stdio.h> - -+#include <cstring> -+ - - // ignore all X errors - static int x11_error(::Display *, XErrorEvent *) diff --git a/community/blackbox/textpropertytostring-unconditional.patch b/community/blackbox/textpropertytostring-unconditional.patch deleted file mode 100644 index ed320388a..000000000 --- a/community/blackbox/textpropertytostring-unconditional.patch +++ /dev/null @@ -1,28 +0,0 @@ -Description: Declare bt::textPropertyToString unconditionally. -Author: Jakub Wilk <jwilk@debian.org> -Forwarded: no -Bug-Debian: http://bugs.debian.org/614468 -Last-Update: 2011-03-12 - ---- a/lib/Util.hh -+++ b/lib/Util.hh -@@ -25,6 +25,8 @@ - #ifndef __Util_hh - #define __Util_hh - -+#include <X11/Xutil.h> -+ - #include <limits.h> - #include <string> - -@@ -94,10 +96,8 @@ - - std::string tolower(const std::string &string); - --#ifdef _XUTIL_H_ - std::string textPropertyToString(::Display *display, - ::XTextProperty& text_prop); --#endif - - } // namespace bt - diff --git a/community/ccrtp/PKGBUILD b/community/ccrtp/PKGBUILD deleted file mode 100644 index 311579ea4..000000000 --- a/community/ccrtp/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 70714 2012-05-15 11:37:10Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Jeff Mickey <jeff@archlinux.org> -# Contributor: John Proctor <jproctor@prium.net> -# Contributor: Alexander Rødseth <rodseth@gmail.com> - -pkgname=ccrtp -pkgver=2.0.3 -pkgrel=1 -pkgdesc="GNU ccRTP" -arch=('x86_64' 'i686' 'mips64el') -url="http://www.gnu.org/software/ccrtp/" -license=('GPL' 'custom') -depends=('zlib' 'libxml2' 'libgcrypt' 'ucommon') -options=('!libtool') -install=$pkgname.install -source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz") -sha256sums=('365feddd276c78104600204ae6db4e76c66036df1e5b905e855239daac6a2473') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --mandir=/usr/share/man - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -Dm644 COPYING.addendum "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/community/ccrtp/ccrtp.install b/community/ccrtp/ccrtp.install deleted file mode 100644 index 51b971c5c..000000000 --- a/community/ccrtp/ccrtp.install +++ /dev/null @@ -1,22 +0,0 @@ -infodir=usr/share/info -filelist=(ccrtp.info) - -post_install() { - [[ -x usr/bin/install-info ]] || return 0 - for file in "${filelist[@]}"; do - install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null - done -} - -post_upgrade() { - post_install "$1" -} - -pre_remove() { - [[ -x usr/bin/install-info ]] || return 0 - for file in "${filelist[@]}"; do - install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null - done -} - -# vim:set ts=2 sw=2 et: diff --git a/community/ccrtp/gcc46.patch b/community/ccrtp/gcc46.patch deleted file mode 100644 index a4b25b369..000000000 --- a/community/ccrtp/gcc46.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -aur ccrtp-1.8.0.old//src/ccrtp/sources.h ccrtp-1.8.0.new//src/ccrtp/sources.h ---- ccrtp-1.8.0.old//src/ccrtp/sources.h 2011-05-14 03:15:35.993564505 -0700 -+++ ccrtp-1.8.0.new//src/ccrtp/sources.h 2011-05-14 03:19:02.033569568 -0700 -@@ -46,6 +46,7 @@ - - #include <string> - #include <ccrtp/rtcppkt.h> -+#include <stddef.h> - - #ifdef CCXX_NAMESPACES - namespace ost { diff --git a/community/cgit/PKGBUILD b/community/cgit/PKGBUILD index c22d19214..2b594e3d4 100644 --- a/community/cgit/PKGBUILD +++ b/community/cgit/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 65084 2012-02-20 03:33:55Z spupykin $ +# $Id: PKGBUILD 71264 2012-05-26 07:35:52Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Current Maintainer: Patrick Palka <patrick@parcs.ath.cx> # Previous Maintainer: Loui Chang <louipc.ist at gmail com> @@ -6,9 +6,9 @@ # Development: http://closure.ath.cx/aur-dev pkgname=cgit -pkgver=0.9.0.2 +pkgver=0.9.0.3 _gitver=1.7.4 -pkgrel=4 +pkgrel=1 pkgdesc="A web interface for git written in plain C" arch=('i686' 'x86_64' 'mips64el') url="http://hjemli.net/git/cgit" @@ -20,7 +20,7 @@ install=cgit.install source=("http://hjemli.net/git/cgit/snapshot/$pkgname-$pkgver.tar.bz2" "http://arch.p5n.pp.ru/~sergej/dl/2011/git-${_gitver}.tar.bz2" "apache.example.conf") -md5sums=('5b92b07e0107ff24a783adfb8c0cd1f2' +md5sums=('3d5481bf8a507694108f0996b8bde235' 'fa24dc1ef0b663327ea0fe1981365b39' 'bd5696bea0654bfcf98f249b1a36737d') diff --git a/community/cmus/PKGBUILD b/community/cmus/PKGBUILD index 624c12429..e0ca36e41 100644 --- a/community/cmus/PKGBUILD +++ b/community/cmus/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 69234 2012-04-10 18:41:03Z tdziedzic $ -# Maintainer: Aaron Griffin <aaron@archlinux.org> +# $Id: PKGBUILD 71484 2012-05-27 10:23:34Z tomegun $ +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=cmus pkgver=2.4.3 -pkgrel=1 +pkgrel=2 pkgdesc="A very feature-rich ncurses-based music player" arch=('i686' 'x86_64') url="http://cmus.sourceforge.net/" diff --git a/community/cuda-sdk/PKGBUILD b/community/cuda-sdk/PKGBUILD deleted file mode 100644 index 152b3add9..000000000 --- a/community/cuda-sdk/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Thomas Jost <schnouki@schnouki.net> -# Contributor: Carson Reynolds <carson@k2.t.u-tokyo.ac.jp> - -pkgname=cuda-sdk -pkgver=4.2.9 -pkgrel=1 -pkgdesc="NVIDIA's GPU programming sdk" -arch=('i686' 'x86_64') -url="http://www.nvidia.com/object/cuda_home.html" -license=('custom') -depends=('cuda-toolkit' 'nvidia' 'opencl-nvidia' 'freeglut' 'libxmu') -makedepends=('perl') -source=(http://developer.download.nvidia.com/compute/cuda/4_2/rel/sdk/gpucomputingsdk_${pkgver}_linux.run) -md5sums=('693d969aca8bb06a5a1d51ef5c3ca04b') - -build() { - cd "$srcdir" - - sh gpucomputingsdk_${pkgver}_linux.run --noexec --keep --nox11 --nochown --target sdk >/dev/null - cd sdk - - find . -name *.cu | xargs sed -i "1 i #undef _GLIBCXX_ATOMIC_BUILTINS" - find . -name *.cu | xargs sed -i "1 i #undef _GLIBCXX_USE_INT128" - - #find . -name 'Makefile*' -exec sed -i 's/^\tmake /\t$(MAKE) /g; s/^\t@make /\t@$(MAKE) /g' "{}" + - - # Sadly we need to install this first and compile afterwards, this is why we only have build() - install -dm755 "$pkgdir/opt/cuda-sdk" - ./install-sdk-linux.pl --prefix="$pkgdir/opt/cuda-sdk" --cudaprefix="/opt/cuda-toolkit" >/dev/null - - cd "$pkgdir/opt/cuda-sdk" - make CUDA_INSTALL_PATH=/opt/cuda-toolkit NO_MPI=1 - # simpleMPI sometimes causes segfaults when building... - - install -Dm755 "$pkgdir/opt/cuda-sdk/License.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/community/ebtables/PKGBUILD b/community/ebtables/PKGBUILD index f3400453c..ffc3b451b 100644 --- a/community/ebtables/PKGBUILD +++ b/community/ebtables/PKGBUILD @@ -1,48 +1,56 @@ -# $Id: PKGBUILD 60674 2011-12-16 19:18:54Z seblu $ -# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net> +# $Id: PKGBUILD 71322 2012-05-26 15:04:32Z seblu $ +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Michal Soltys <soltys@ziu.info> pkgname=ebtables pkgver=2.0.10_4 -pkgrel=1 +pkgrel=2 pkgdesc='Ethernet bridge filtering utilities' arch=('i686' 'x86_64') -backup=('etc/conf.d/ebtables') url='http://ebtables.sourceforge.net/' license=('GPL2') +backup=("etc/$pkgname.conf" "etc/conf.d/$pkgname") # ebtables segfault with --as-needed options=('!buildflags') -source=( - "http://downloads.sourceforge.net/${pkgname}/${pkgname}-v${pkgver/_/-}.tar.gz" - 'ebtables.rc' - 'ebtables.conf' - ) +install=$pkgname.install +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-v${pkgver/_/-}.tar.gz" + "$pkgname.conf" + "$pkgname.rc" + "$pkgname.systemd" + "$pkgname.service") md5sums=('506742a3d44b9925955425a659c1a8d0' - '368825c83a2b1180d2223e61b9f3bd07' - '86fc3622e6fc0a7a7920c90ff576cc38') + 'c6f0838de4429af68d21b4d61f00db59' + 'd0e340f2cefe91b1569c0e87c2a1288f' + '5a49ea09af202cb438c8a1b15abf9147' + 'baf923443c3b16277e50d60d2e68f534') build() { - cd ${pkgname}-v${pkgver/_/-} + cd $pkgname-v${pkgver/_/-} make CFLAGS='-Wunused -Wall -Werror -Wno-error=unused-but-set-variable' } package() { - cd "${pkgname}-v${pkgver/_/-}" + pushd $pkgname-v${pkgver/_/-} make install \ - DESTDIR="${pkgdir}" \ + DESTDIR="$pkgdir" \ LIBDIR=/usr/lib \ MANDIR=/usr/share/man \ BINDIR=/usr/sbin \ INITDIR=/etc/rc.d \ - SYSCONFIGDIR=/etc/ebtables - + SYSCONFIGDIR=/etc + popd # rm package ebtables rc.d scripts - rm "${pkgdir}/etc/rc.d/ebtables" - rm "${pkgdir}/etc/ebtables/ebtables-config" - - # install custom ebtables rc.d scripts - install -D -m 0755 "${srcdir}/$pkgname.rc" "${pkgdir}/etc/rc.d/$pkgname" - install -D -m 0644 "${srcdir}/$pkgname.conf" "${pkgdir}/etc/conf.d/$pkgname" + rm "$pkgdir/etc/ebtables-config" + # install initscripts + install -Dm 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname" + install -Dm 644 $pkgname.conf "$pkgdir/etc/conf.d/$pkgname" + # install systemd service + install -Dm 755 $pkgname.systemd \ + "$pkgdir/usr/lib/systemd/scripts/$pkgname" + install -Dm 644 $pkgname.service \ + "$pkgdir/usr/lib/systemd/system/$pkgname.service" + # default config file + install -Dm 644 /dev/null "$pkgdir/etc/$pkgname.conf" } # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ebtables/ebtables.conf b/community/ebtables/ebtables.conf index 0005444e7..386f94249 100644 --- a/community/ebtables/ebtables.conf +++ b/community/ebtables/ebtables.conf @@ -1,37 +1,7 @@ -# Save (and possibly restore) in text format. -# Value: yes|no, default: yes -# Save the firewall rules in text format to /etc/conf.d/ebtables -# If EBTABLES_BINARY_FORMAT="no" then restoring the firewall rules -# is done using this text format. -EBTABLES_TEXT_FORMAT="yes" +# Configuration file used to load/save configuration. +CONFIG_FILE='/etc/ebtables.conf' -# Save (and restore) in binary format. -# Value: yes|no, default: yes -# Save (and restore) the firewall rules in binary format to (and from) -# /etc/ebtables/ebtables.<chain>. Enabling this option will make -# firewall initialisation a lot faster. -EBTABLES_BINARY_FORMAT="yes" +# Save configuration on stop/restart. +#SAVE_ON_STOP=yes -# Unload modules on restart and stop -# Value: yes|no, default: yes -# This option has to be 'yes' to get to a sane state for a firewall -# restart or stop. Only set to 'no' if there are problems unloading netfilter -# modules. -EBTABLES_MODULES_UNLOAD="yes" - -# Save current firewall rules on stop. -# Value: yes|no, default: no -# Saves all firewall rules if firewall gets stopped -# (e.g. on system shutdown). -EBTABLES_SAVE_ON_STOP="no" - -# Save current firewall rules on restart. -# Value: yes|no, default: no -# Saves all firewall rules if firewall gets restarted. -EBTABLES_SAVE_ON_RESTART="no" - -# Save (and restore) rule counters. -# Value: yes|no, default: no -# Save rule counters when saving a kernel table to a file. If the -# rule counters were saved, they will be restored when restoring the table. -EBTABLES_SAVE_COUNTER="no" +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ebtables/ebtables.install b/community/ebtables/ebtables.install new file mode 100644 index 000000000..7dd6921ed --- /dev/null +++ b/community/ebtables/ebtables.install @@ -0,0 +1,9 @@ +## arg 1: the new package version +## arg 2: the old package version +post_upgrade() { + [ $(vercmp "$2" '2.0.10_4-1') -gt 0 ] || cat <<EOF +Config file have been moved to /etc/ebtables.conf and only support text format. +EOF +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ebtables/ebtables.rc b/community/ebtables/ebtables.rc index 3a889b914..a845449fe 100644 --- a/community/ebtables/ebtables.rc +++ b/community/ebtables/ebtables.rc @@ -1,128 +1,31 @@ #!/bin/bash -# Credits to: -# Sebastien Luttringer <seblu+arch@seblu.net> -# Bart De Schuymer <bdschuym@pandora.be> -# Rok Papez <rok.papez@arnes.si> -# Dag Wieers <dag@wieers.com> - . /etc/rc.conf . /etc/rc.d/functions - -#default configuration: -EBTABLES_TEXT_FORMAT="yes" -EBTABLES_BINARY_FORMAT="yes" -EBTABLES_MODULES_UNLOAD="yes" -EBTABLES_SAVE_ON_STOP="no" -EBTABLES_SAVE_ON_RESTART="no" -EBTABLES_SAVE_COUNTER="no" - -[[ -r "/etc/conf.d/ebtables" ]] && . "/etc/conf.d/ebtables" - -RETVAL=0 - -start() { - stat_busy "Starting ebtables" - ! ck_daemon ebtables && stat_done && RETVAL=0 && return - if [[ "$EBTABLES_BINARY_FORMAT" = yes ]]; then - for table in $(ls /etc/ebtables/ebtables.* 2>/dev/null | sed -e 's/.*ebtables\.//' -e '/save/d' ); do - /usr/sbin/ebtables -t ${table} --atomic-file /etc/ebtables/ebtables.${table} --atomic-commit || RETVAL=1 - done - elif [[ "$EBTABLES_TEXT_FORMAT" = "yes" ]]; then - [[ ! -r /etc/ebtables/ebtables ]] && :>/etc/ebtables/ebtables - /usr/sbin/ebtables-restore </etc/ebtables/ebtables || RETVAL=1 - else - RETVAL=1 - fi - - if (( RETVAL == 0 )); then - stat_done - add_daemon ebtables - else - stat_fail - fi -} - -stop() { - stat_busy "Stopping ebtables" - ck_daemon ebtables && stat_done && RETVAL=0 && return - for table in $(grep '^ebtable_' /proc/modules | sed -e 's/ebtable_\([^ ]*\).*/\1/'); do - /usr/sbin/ebtables -t $table --init-table || RETVAL=1 - done - - if [[ "$EBTABLES_MODULES_UNLOAD" = yes ]]; then - for mod in $(grep -E '^(ebt|ebtable)_' /proc/modules | cut -f1 -d' ') ebtables; do - /sbin/rmmod $mod 2> /dev/null - done - fi - - if (( RETVAL == 0 )); then - rm_daemon ebtables - stat_done - else - stat_fail - fi -} - -restart() { - stop - sleep 1 - start -} - -save() { - stat_busy "Saving ebtables" - if [[ "$EBTABLES_TEXT_FORMAT" = yes ]]; then - if [[ -r /etc/ebtables/ebtables ]]; then - mv -f /etc/ebtables/ebtables /etc/ebtables/ebtables.save - fi - /usr/sbin/ebtables-save >/etc/ebtables/ebtables || RETVAL=1 - fi - if [[ "$EBTABLES_BINARY_FORMAT" = yes ]]; then - rm -f /etc/ebtables/ebtables.*.save - for oldtable in $(ls /etc/ebtables/ebtables.* 2>/dev/null | grep -vF 'ebtables.save'); do - mv -f $oldtable $oldtable.save - done - for table in $(grep '^ebtable_' /proc/modules | sed -e 's/ebtable_\([^ ]*\).*/\1/'); do - :> /etc/ebtables/ebtables.$table - /usr/sbin/ebtables -t $table --atomic-file /etc/ebtables/ebtables.$table --atomic-save || RETVAL=1 - if [[ "$EBTABLES_SAVE_COUNTER" = no ]]; then - /usr/sbin/ebtables -t $table --atomic-file /etc/ebtables/ebtables.$table -Z || RETVAL=1 - fi - done - fi - - (( RETVAL == 0 )) && stat_done || stat_fail -} +. /etc/conf.d/${0##*/} case "$1" in start) - start - ;; + stat_busy 'Loading ebtables rules' + ebtables-restore < "$CONFIG_FILE" && + add_daemon ${0##*/} && stat_done || stat_die + ;; stop) - [[ "$EBTABLES_SAVE_ON_STOP" = yes ]] && save - stop - ;; - restart|reload) - [[ "$EBTABLES_SAVE_ON_RESTART" = yes ]] && save - restart - ;; - condrestart) - ! ck_daemon ebtables && restart - RETVAL=$? - ;; + [[ $SAVE_ON_STOP =~ [yY][eE][sS] ]] && $0 save + status 'Clearing ebtables rules' ebtables -F && rm_daemon ${0##*/} || exit 1 + ;; + restart) + $0 stop + $0 start + ;; save) - save - ;; - status) - /usr/sbin/ebtables-save - RETVAL=$? - ;; + stat_busy 'Saving ebtables rules' + ebtables-save > "$CONFIG_FILE" && stat_done || stat_die + ;; *) - echo "Usage $0 {start|stop|restart|condrestart|save|status}" - RETVAL=1 + echo "usage: ${0##*/} {start|stop|restart|save}" >&2 + exit 1 + ;; esac -exit $RETVAL - -# vim:set ts=2 sw=2 ft=sh noet: +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ebtables/ebtables.service b/community/ebtables/ebtables.service new file mode 100644 index 000000000..25e6b76cc --- /dev/null +++ b/community/ebtables/ebtables.service @@ -0,0 +1,11 @@ +[Unit] +Description=Ethernet bridge table + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/lib/systemd/scripts/ebtables start +ExecStop=/usr/lib/systemd/scripts/ebtables stop + +[Install] +WantedBy=multi-user.target diff --git a/community/ebtables/ebtables.systemd b/community/ebtables/ebtables.systemd new file mode 100644 index 000000000..4c51e9b6f --- /dev/null +++ b/community/ebtables/ebtables.systemd @@ -0,0 +1,22 @@ +#!/bin/bash + +. /etc/conf.d/ebtables + +case $1 in + start) + ebtables-restore < "$CONFIG_FILE" + ;; + stop) + [[ $SAVE_ON_STOP =~ [yY][eE][sS] ]] && $0 save + ebtables -F + ;; + save) + ebtables-save > "$CONFIG_FILE" + ;; + *) + echo "usage: ${0##*/} {start|stop|save}" >&2 + exit 1 + ;; +esac + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD index 53693e857..7591abe02 100644 --- a/community/gambas2/PKGBUILD +++ b/community/gambas2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70013 2012-04-28 09:24:06Z allan $ +# $Id: PKGBUILD 71272 2012-05-26 07:54:42Z pschmitz $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Biru Ionut <ionut@archlinux.ro> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -19,8 +19,8 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2 'gambas2-gb-qt-kde' 'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl' 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb' 'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt') -pkgver=2.23.1 -pkgrel=10 +pkgver=2.24.0 +pkgrel=1 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net" @@ -34,13 +34,11 @@ groups=('gambas2') replaces=('gambas2') conflicts=('gambas2') source=(http://downloads.sourceforge.net/gambas/$pkgbase-$pkgver.tar.bz2 - 'fix-gbi-gba-path.patch' 'db.firebird.gcc-4.6.0-fix.patch' - 'poppler-0.18.patch' - 'gambas2-script.install' 'gambas2-runtime.install') -md5sums=('ff8d2c1f310222c150b114e7ce247dfd' + 'fix-gbi-gba-path.patch' + 'gambas2-script.install' 'gambas2-runtime.install' + 'poppler-0.20.patch') +md5sums=('b59072b6f57b681d586cc84c02333690' '9dda03a1bbfb7e7ba8b6a4ae91b6752b' - 'ac9703b390502ed3242c8d34485c9236' - 'a551b4b216bbdb3489f3c264bf73ee66' '870ff5b4b33cd75aa9c290539e6fdd5d' 'ab5667175c4945282d2f40a35d0e9e5b') _gbfiles="${srcdir}/$pkgbase-$pkgver/main/gbc" @@ -66,12 +64,14 @@ _buildgbcomp() { build() { cd "${srcdir}/$pkgbase-$pkgver" - ## workaround to allow package splitting msg "Applying patches ..." - patch -Np1 -i "${srcdir}/fix-gbi-gba-path.patch" - # merged upstream - patch -Np3 -i "${srcdir}/db.firebird.gcc-4.6.0-fix.patch" - patch -Np2 -i "${srcdir}/poppler-0.18.patch" + # workaround to allow package splitting + patch -Np1 -i ../fix-gbi-gba-path.patch + # fix building with poppler-0.20.x (merged upstream) + cd gb.pdf + patch -Np0 -i ../../poppler-0.20.patch + cd .. + ./reconf-all ## @@ -947,3 +947,8 @@ package_gambas2-gb-xml-xslt() { rm -rf ${pkgdir}/usr/bin ## } +md5sums=('b59072b6f57b681d586cc84c02333690' + '9dda03a1bbfb7e7ba8b6a4ae91b6752b' + '870ff5b4b33cd75aa9c290539e6fdd5d' + 'ab5667175c4945282d2f40a35d0e9e5b' + '5eb70afe712c0f8667a700df4d9a6735') diff --git a/community/gambas2/db.firebird.gcc-4.6.0-fix.patch b/community/gambas2/db.firebird.gcc-4.6.0-fix.patch deleted file mode 100644 index 0b6e68df3..000000000 --- a/community/gambas2/db.firebird.gcc-4.6.0-fix.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- gambas/branches/2.0/gb.db.firebird/src/main.cpp 2011/05/27 15:01:54 3864 -+++ gambas/branches/2.0/gb.db.firebird/src/main.cpp 2011/05/27 15:26:41 3865 -@@ -1216,7 +1216,8 @@ - GB.StoreVariant(&fantom, &buffer[i]); - } - else{ -- GB.StoreVariant(&res->GetData(pos,i), &buffer[i]); -+ GB_VARIANT val = res->GetData(pos,i); -+ GB.StoreVariant(&val , &buffer[i]); - } - } - } -@@ -1874,6 +1875,8 @@ - static char query[SQLMAXLEN]; - int type; - std::string str1,str2; -+ GB_VARIANT varval; -+ char* charval; - snprintf(query,SQLMAXLEN-1,"select b.RDB$field_name,a.RDB$field_type,b.rdb$null_flag,b.rdb$default_source,a.RDB$field_length from RDB$fields a,RDB$relation_fields b where a.RDB$field_name=b.RDB$field_source and b.RDB$relation_name=upper('%s') and b.rdb$field_name=upper('%s')",table,field); - if (do_query(db, query, &res, "Unable to get the field from the table")){ - delete res; -@@ -1900,9 +1903,11 @@ - str1=res->GetData(0,3).value.value._string; - if(str1!="") - str2=str1.assign(str1,8,str1.length()-8); -- GB.FreeString(&res->GetData(0,3).value.value._string); -+ charval = res->GetData(0,3).value.value._string; -+ GB.FreeString(&charval); - res->SetData(0,3,str2); -- GB.StoreVariant(&res->GetData(0,3), &info->def); -+ varval = res->GetData(0,3); -+ GB.StoreVariant(&varval, &info->def); - } - delete res; - return FALSE; diff --git a/community/gambas2/poppler-0.18.patch b/community/gambas2/poppler-0.18.patch deleted file mode 100644 index fbcc430bf..000000000 --- a/community/gambas2/poppler-0.18.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- gambas/trunk/gb.pdf/configure.ac 2010/07/14 01:50:18 3038 -+++ gambas/trunk/gb.pdf/configure.ac 2011/08/09 10:43:30 3997 -@@ -22,6 +22,8 @@ - AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_8, $((1-$?)), Poppler version >= 0.8) - pkg-config --atleast-version=0.11.3 poppler - AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_11_3, $((1-$?)), Poppler version >= 0.11.3) -+ pkg-config --atleast-version=0.17.0 poppler -+ AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_17, $((1-$?)), Poppler version >= 0.17) - fi - - AC_OUTPUT( \ - ---- gambas/trunk/gb.pdf/src/CPdfDocument.cpp 2011/06/03 00:51:09 3870 -+++ gambas/trunk/gb.pdf/src/CPdfDocument.cpp 2011/08/09 10:43:30 3997 -@@ -44,6 +44,7 @@ - #include <Outline.h> - #include <Link.h> - #include <Gfx.h> -+#include <glib/poppler-features.h> - - /***************************************************************************** - -@@ -956,12 +957,17 @@ - Bookmarks of a PDF page - - ******************************************************************************/ -+ - void aux_fill_links(void *_object) - { -+ #if POPPLER_VERSION_0_17 -+ THIS->links = new Links (THIS->page->getAnnots (THIS->doc->getCatalog())); -+ #else - Object obj; - - THIS->links = new Links (THIS->page->getAnnots (&obj),THIS->doc->getCatalog()->getBaseURI ()); - obj.free(); -+ #endif - } - - BEGIN_PROPERTY (PDFPAGELINKS_count) diff --git a/community/gambas2/poppler-0.20.patch b/community/gambas2/poppler-0.20.patch new file mode 100644 index 000000000..a73d42a7f --- /dev/null +++ b/community/gambas2/poppler-0.20.patch @@ -0,0 +1,100 @@ +Index: src/CPdfDocument.cpp +=================================================================== +--- src/CPdfDocument.cpp (révision 4732) ++++ src/CPdfDocument.cpp (copie de travail) +@@ -407,7 +407,11 @@ + white[0] = 0xFF; white[1] = 0xFF; white[2] = 0xFF; + THIS->dev=new SplashOutputDev(splashModeRGB8, 3, gFalse, white); + ++ #if POPPLER_VERSION_0_20 ++ THIS->dev->startDoc(THIS->doc); ++ #else + THIS->dev->startDoc(THIS->doc->getXRef ()); ++ #endif + + outline=THIS->doc->getOutline(); + if (outline) THIS->index=outline->getItems(); +@@ -833,13 +837,22 @@ + + if ( (w<0) || (h<0) ) return NULL; + ++ #if POPPLER_VERSION_0_20 + THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale, + rotation, + gFalse, + gTrue, + x,y,w,h, ++ gFalse); ++ #else ++ THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale, ++ rotation, + gFalse, ++ gTrue, ++ x,y,w,h, ++ gFalse, + THIS->doc->getCatalog ()); ++ #endif + + map=THIS->dev->getBitmap(); + +@@ -929,9 +942,14 @@ + w = VARGOPT(W, (int32_t)THIS->page->getMediaWidth()); + h = VARGOPT(H, (int32_t)THIS->page->getMediaHeight()); + ++ #if POPPLER_VERSION_0_20 ++ dev = new TextOutputDev (NULL, gTrue, 0, gFalse, gFalse); ++ gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, gFalse, NULL, NULL); ++ #else + dev = new TextOutputDev (NULL, gTrue, gFalse, gFalse); + gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, \ + gFalse,THIS->doc->getCatalog (),NULL, NULL, NULL, NULL); ++ #endif + + THIS->page->display(gfx); + dev->endPage(); +@@ -960,7 +978,9 @@ + + void aux_fill_links(void *_object) + { +- #if POPPLER_VERSION_0_17 ++ #if POPPLER_VERSION_0_20 ++ THIS->links = new Links (THIS->page->getAnnots ()); ++ #elif POPPLER_VERSION_0_17 + THIS->links = new Links (THIS->page->getAnnots (THIS->doc->getCatalog())); + #else + Object obj; +@@ -1200,12 +1220,21 @@ + + if (!MISSING(Sensitive)) sensitive=VARG(Sensitive); + ++ #if POPPLER_VERSION_0_20 ++ textdev = new TextOutputDev (NULL, true, 0, false, false); ++ THIS->page->display (textdev, 72, 72, 0, false, false, false); ++ #else + textdev = new TextOutputDev (NULL, true, false, false); + THIS->page->display (textdev, 72, 72, 0, false, false, false, THIS->doc->getCatalog()); ++ #endif + + if (THIS->Found) { GB.FreeArray(POINTER(&THIS->Found)); THIS->Found=NULL; } + ++ #if POPPLER_VERSION_0_20 ++ while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,gFalse,&x0,&y0,&x1,&y1)) ++ #else + while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,&x0,&y0,&x1,&y1)) ++ #endif + { + if (!THIS->Found) { + GB.NewArray(POINTER(&THIS->Found),sizeof(FoundRect),1); +Index: configure.ac +=================================================================== +--- configure.ac (révision 4732) ++++ configure.ac (copie de travail) +@@ -25,6 +25,8 @@ + AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_11_3, $((1-$?)), Poppler version >= 0.11.3) + pkg-config --atleast-version=0.17.0 poppler + AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_17, $((1-$?)), Poppler version >= 0.17) ++ pkg-config --atleast-version=0.20.0 poppler ++ AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_20, $((1-$?)), Poppler version >= 0.20) + fi + + AC_OUTPUT( \ diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index 3e0e8e0b2..bd23a6141 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70015 2012-04-28 09:24:08Z allan $ +# $Id: PKGBUILD 71274 2012-05-26 07:54:52Z pschmitz $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> pkgbase=gambas3 @@ -13,7 +13,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') pkgver=3.1.1 -pkgrel=2 +pkgrel=3 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64' 'mips64el') url="http://gambas.sourceforge.net/" @@ -27,14 +27,21 @@ makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils 'gsl') options=('!emptydirs' '!makeflags') source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" - 'gambas3-script.install' 'gambas3-runtime.install') + 'gambas3-script.install' 'gambas3-runtime.install' + 'poppler-0-20.patch') md5sums=('bdf387f435d7aeedb7efa488ea1a5d62' 'b284be39d147ec799f1116a6abc068b4' - 'b5cc403990f31b8ea1c5cf37366d3d29') + 'b5cc403990f31b8ea1c5cf37366d3d29' + '39d2ae1e2096a29df7857fce083eafaf') build() { cd ${srcdir}/${pkgbase}-${pkgver} + # fix building with poppler-0.20.x (merged upstream) + cd gb.pdf + patch -Np1 -i ../../poppler-0-20.patch + cd .. + ./reconf-all ./configure --prefix=/usr -C diff --git a/community/gambas3/poppler-0-20.patch b/community/gambas3/poppler-0-20.patch new file mode 100644 index 000000000..3b0e4612a --- /dev/null +++ b/community/gambas3/poppler-0-20.patch @@ -0,0 +1,106 @@ +diff -ur gb.pdf/configure.ac gb.pdf.fixed/configure.ac +--- gb.pdf/configure.ac 2012-05-14 08:55:02.448921378 +0200 ++++ gb.pdf.fixed/configure.ac 2012-05-14 08:52:19.098596499 +0200 +@@ -24,6 +24,8 @@ + AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_11_3, $((1-$?)), Poppler version >= 0.11.3) + pkg-config --atleast-version=0.17.0 poppler + AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_17, $((1-$?)), Poppler version >= 0.17) ++ pkg-config --atleast-version=0.20.0 poppler ++ AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_20, $((1-$?)), Poppler version >= 0.20) + fi + + AC_OUTPUT( \ +diff -ur gb.pdf/src/CPdfDocument.cpp gb.pdf.fixed/src/CPdfDocument.cpp +--- gb.pdf/src/CPdfDocument.cpp 2012-05-14 08:55:02.388922483 +0200 ++++ gb.pdf.fixed/src/CPdfDocument.cpp 2012-05-15 09:25:45.168457227 +0200 +@@ -449,9 +449,13 @@ + + white[0] = 0xFF; white[1] = 0xFF; white[2] = 0xFF; + THIS->dev=new SplashOutputDev(splashModeRGB8, 3, gFalse, white); +- +- THIS->dev->startDoc(THIS->doc->getXRef ()); + ++ #if POPPLER_VERSION_0_20 ++ THIS->dev->startDoc(THIS->doc); ++ #else ++ THIS->dev->startDoc(THIS->doc->getXRef ()); ++ #endif ++ + outline=THIS->doc->getOutline(); + if (outline) THIS->index=outline->getItems(); + +@@ -875,6 +879,14 @@ + + if ( (w<0) || (h<0) ) return NULL; + ++ #if POPPLER_VERSION_0_20 ++ THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale, ++ rotation, ++ gFalse, ++ gTrue, ++ x,y,w,h, ++ gFalse); ++ #else + THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale, + rotation, + gFalse, +@@ -882,7 +894,8 @@ + x,y,w,h, + gFalse, + THIS->doc->getCatalog ()); +- ++ #endif ++ + map=THIS->dev->getBitmap(); + + data=(uint32_t*)map->getDataPtr(); +@@ -940,9 +953,14 @@ + w = VARGOPT(W, (int32_t)THIS->page->getMediaWidth()); + h = VARGOPT(H, (int32_t)THIS->page->getMediaHeight()); + ++ #if POPPLER_VERSION_0_20 ++ dev = new TextOutputDev (NULL, gTrue, 0, gFalse, gFalse); ++ gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, gFalse, NULL, NULL); ++ #else + dev = new TextOutputDev (NULL, gTrue, gFalse, gFalse); + gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, gFalse,THIS->doc->getCatalog (),NULL, NULL, NULL, NULL); +- ++ #endif ++ + THIS->page->display(gfx); + dev->endPage(); + +@@ -970,7 +988,9 @@ + + void aux_fill_links(void *_object) + { +- #if POPPLER_VERSION_0_17 ++ #if POPPLER_VERSION_0_20 ++ THIS->links = new Links (THIS->page->getAnnots ()); ++ #elif POPPLER_VERSION_0_17 + THIS->links = new Links (THIS->page->getAnnots (THIS->doc->getCatalog())); + #else + Object obj; +@@ -1152,13 +1172,22 @@ + + if (!MISSING(Sensitive)) sensitive=VARG(Sensitive); + ++ #if POPPLER_VERSION_0_20 ++ textdev = new TextOutputDev (NULL, true, 0, false, false); ++ THIS->page->display (textdev, 72, 72, 0, false, false, false); ++ #else + textdev = new TextOutputDev (NULL, true, false, false); + THIS->page->display (textdev, 72, 72, 0, false, false, false, THIS->doc->getCatalog()); ++ #endif + + if (THIS->Found) { GB.FreeArray(POINTER(&THIS->Found)); THIS->Found=NULL; } + + count = 0; ++ #if POPPLER_VERSION_0_20 ++ while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,gFalse,&x0,&y0,&x1,&y1)) ++ #else + while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,&x0,&y0,&x1,&y1)) ++ #endif + { + if (!THIS->Found) + GB.NewArray(POINTER(&THIS->Found),sizeof(CPDFFIND),1); diff --git a/community/gnac/PKGBUILD b/community/gnac/PKGBUILD index 9abd3206f..42cb76b7f 100644 --- a/community/gnac/PKGBUILD +++ b/community/gnac/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68399 2012-03-24 07:12:29Z bgyorgy $ +# $Id: PKGBUILD 71475 2012-05-27 08:59:40Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=gnac -pkgver=0.2.4 -pkgrel=2 +pkgver=0.2.4.1 +pkgrel=1 pkgdesc="Audio converter for GNOME" arch=('i686' 'x86_64') url="http://gnac.sourceforge.net/" @@ -16,7 +16,7 @@ optdepends=('gstreamer0.10-good-plugins: Extra media codecs' 'gstreamer0.10-ffmpeg: Extra media codecs') install=$pkgname.install source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('8794871d1abd8c186dd5b01d53f1e62e') +md5sums=('14d86536a75bde9cbf4c5eaede8c4b2a') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/go/go b/community/go/go deleted file mode 100644 index 2f68ce8ff..000000000 --- a/community/go/go +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -if [[ -z $GOROOT ]]; then - export GOROOT=/usr/lib/go -fi -if [[ -z $GOROOT_FINAL ]]; then - export GOROOT_FINAL=$GOROOT -fi -/usr/bin/go.elf "$@" diff --git a/community/go/go.run b/community/go/go.run deleted file mode 100644 index 2f68ce8ff..000000000 --- a/community/go/go.run +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -if [[ -z $GOROOT ]]; then - export GOROOT=/usr/lib/go -fi -if [[ -z $GOROOT_FINAL ]]; then - export GOROOT_FINAL=$GOROOT -fi -/usr/bin/go.elf "$@" diff --git a/community/ipset/PKGBUILD b/community/ipset/PKGBUILD index 76c732531..9a7ebc1e5 100644 --- a/community/ipset/PKGBUILD +++ b/community/ipset/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 70556 2012-05-11 12:51:57Z seblu $ +# $Id: PKGBUILD 71313 2012-05-26 14:56:36Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgname=ipset pkgver=6.12.1 -pkgrel=1 +pkgrel=2 pkgdesc='Administration tool for IP sets' arch=('i686' 'x86_64') url='http://ipset.netfilter.org' license=('GPL2') depends=('libmnl') -backup=('etc/ipset.conf' "etc/conf.d/$pkgname") +backup=("etc/$pkgname.conf" "etc/conf.d/$pkgname") options=('!libtool') source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2" "$pkgname.conf" @@ -17,10 +17,10 @@ source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2" "$pkgname.systemd" "$pkgname.service") md5sums=('80df500a4d93cb14e1373ae290716cda' - '61963bda45c002fb37977e58bb5b829c' - '888bf1eadffcc076b9e97de02e2147c8' - 'c5f38e5f3027066c1491a563e734796e' - 'b9ff3bd7b959cb1b97b8c492b52b8377') + '3e606a2823a700b4e9c5f17511a6f6a5' + 'de89b054d967036e08b13bc6a7235286' + 'dfc3105b89ed41fc4a1feb4f4f13f2a3' + 'b032241b96b5802975fe4321cc511c6b') build() { cd $pkgname-$pkgver @@ -29,13 +29,13 @@ build() { } package() { - cd $pkgname-$pkgver + pushd $pkgname-$pkgver make DESTDIR="$pkgdir" install # install doc install -dm755 "$pkgdir/usr/share/doc/$pkgname" install -m644 README UPGRADE ChangeLog "$pkgdir/usr/share/doc/$pkgname" + popd # install initscripts - cd .. install -Dm 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname" install -Dm 644 $pkgname.conf "$pkgdir/etc/conf.d/$pkgname" # install systemd service diff --git a/community/ipset/ipset.conf b/community/ipset/ipset.conf index 686931f4c..d5d3cb699 100644 --- a/community/ipset/ipset.conf +++ b/community/ipset/ipset.conf @@ -1,3 +1,7 @@ -# vim:set ts=2 sw=2 ft=sh et: +# Configuration file used to load/save configuration. +CONFIG_FILE='/etc/ipset.conf' + +# Save configuration on stop/restart. +#SAVE_ON_STOP=yes -IPSET_CONF='/etc/ipset.conf' +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ipset/ipset.rc b/community/ipset/ipset.rc index 1d5f7df8b..517eff1ea 100644 --- a/community/ipset/ipset.rc +++ b/community/ipset/ipset.rc @@ -2,38 +2,32 @@ . /etc/rc.conf . /etc/rc.d/functions -. /etc/conf.d/ipset +. /etc/conf.d/${0##*/} case "$1" in start) - stat_busy 'Loading IP Sets' - if [[ -f $IPSET_CONF ]] && ipset restore < "$IPSET_CONF"; then - add_daemon ipset - stat_done - else - stat_fail - fi + stat_busy 'Loading IP sets' + ipset restore < "$CONFIG_FILE" && add_daemon ${0##*/} && stat_done || stat_die ;; stop) - status 'Clearing IP Sets' ipset destroy - rm_daemon ipset + [[ $SAVE_ON_STOP =~ [yY][eE][sS] ]] && $0 save + stat_busy 'Clearing IP sets' + ipset destroy && + rm_daemon ${0##*/} && stat_done || stat_die ;; restart) $0 stop - sleep 1 $0 start ;; save) - stat_busy 'Saving IP Sets' - if ipset save > "$IPSET_CONF" 2>/dev/null; then - stat_done - else - stat_fail - fi + stat_busy 'Saving IP sets' + ipset save > "$CONFIG_FILE" && + stat_done || stat_die ;; *) - echo "usage: ${0##*/} {start|stop|restart|save}" + echo "usage: ${0##*/} {start|stop|restart|save}" >&2 + exit 1 + ;; esac -exit 0 # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ipset/ipset.service b/community/ipset/ipset.service index 0e0dd4ff7..8c4889d3c 100644 --- a/community/ipset/ipset.service +++ b/community/ipset/ipset.service @@ -1,12 +1,12 @@ [Unit] Description=IP Sets +Before=iptables.service [Service] Type=oneshot -ExecStart=/usr/lib/systemd/scripts/ipset start -ExecStop=/usr/sbin/ipset destroy RemainAfterExit=yes +ExecStart=/usr/lib/systemd/scripts/ipset start +ExecStop=/usr/lib/systemd/scripts/ipset stop [Install] WantedBy=multi-user.target -Before=iptables.service diff --git a/community/ipset/ipset.systemd b/community/ipset/ipset.systemd index 36df5124a..92397f3a7 100644 --- a/community/ipset/ipset.systemd +++ b/community/ipset/ipset.systemd @@ -2,7 +2,21 @@ . /etc/conf.d/ipset -[[ -f $IPSET_CONF ]] || exit 1 -ipset restore < "$IPSET_CONF" +case $1 in + start) + ipset restore < "$CONFIG_FILE" + ;; + stop) + [[ $SAVE_ON_STOP =~ [yY][eE][sS] ]] && $0 save + ipset destroy + ;; + save) + ipset save > "$CONFIG_FILE" + ;; + *) + echo "usage: ${0##*/} {start|stop|save}" >&2 + exit 1 + ;; +esac # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ipvsadm/PKGBUILD b/community/ipvsadm/PKGBUILD index a8126aca1..42132b7b6 100644 --- a/community/ipvsadm/PKGBUILD +++ b/community/ipvsadm/PKGBUILD @@ -1,47 +1,56 @@ -# $Id: PKGBUILD 69082 2012-04-09 02:20:59Z seblu $ +# $Id: PKGBUILD 71320 2012-05-26 15:01:34Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=ipvsadm pkgver=1.26 -pkgrel=4 +pkgrel=5 pkgdesc='The IP Virtual Server administration utility' arch=('i686' 'x86_64') url='http://www.linuxvirtualserver.org/software/ipvs.html' license=('GPL2') depends=('libnl1' 'popt') -backup=('etc/conf.d/ipvsadm') +backup=("etc/$pkgname.conf" "etc/conf.d/$pkgname") +options=('!makeflags') +install=$pkgname.install source=("http://www.linuxvirtualserver.org/software/kernel-2.6/$pkgname-$pkgver.tar.gz" - 'ipvsadm.rc' - 'ipvsadm.conf' - 'ipvsadm.rules' + "$pkgname.conf" + "$pkgname.rc" + "$pkgname.systemd" + "$pkgname.service" '01-fix-not-showing-all-server.patch') md5sums=('eac3ba3f62cd4dea2da353aeddd353a8' - '89b15096bb243dc694b6c5d4200561fd' - 'cd358130967a9cc0d31fc61282df43e7' - 'cd6649c647e495d4d6f981542ce5a93b' + 'b6cb7724aa6c61c3a9cdd40e8eaa973e' + 'f2f4a7c6d57c5301c5f12f9b323fdea8' + 'df28308873b437eeb55657f6aa438ecd' + 'dc87684064f85b64c1e79c1eac336303' 'e9fb77d2fbe2d3f41d60257316338543') build() { cd $pkgname-$pkgver patch -p1 -i ../01-fix-not-showing-all-server.patch - make INCLUDE="-I/usr/src/linux-$(uname -r)/include -I.. -I." + make #INCLUDE="-I/usr/src/linux-$(uname -r)/include -I.. -I." } package() { - cd $pkgname-$pkgver + pushd $pkgname-$pkgver make \ BUILD_ROOT="$pkgdir" \ MANDIR=usr/share/man \ SBIN="$pkgdir/usr/sbin" \ INIT="$pkgdir/etc/rc.d" \ install - cd "$srcdir" - # add initscripts - install -D -m 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname" - install -D -m 644 $pkgname.conf "$pkgdir/etc/conf.d/$pkgname" - # add ipvsadm rules - install -D -m 644 $pkgname.rules "$pkgdir/etc/$pkgname.rules" + popd + # install initscripts + install -Dm 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname" + install -Dm 644 $pkgname.conf "$pkgdir/etc/conf.d/$pkgname" + # install systemd service + install -Dm 755 $pkgname.systemd \ + "$pkgdir/usr/lib/systemd/scripts/$pkgname" + install -Dm 644 $pkgname.service \ + "$pkgdir/usr/lib/systemd/system/$pkgname.service" + # default config file + install -Dm 644 /dev/null "$pkgdir/etc/$pkgname.conf" } # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ipvsadm/ipvsadm.conf b/community/ipvsadm/ipvsadm.conf index aac7ba729..b9a98a36e 100644 --- a/community/ipvsadm/ipvsadm.conf +++ b/community/ipvsadm/ipvsadm.conf @@ -1,3 +1,7 @@ -# vim:set ts=2 sw=2 ft=sh et: +# Configuration file used to load/save configuration. +CONFIG_FILE='/etc/ipvsadm.conf' + +# Save configuration on stop/restart. +#SAVE_ON_STOP=yes -IPVSADM_CONF='/etc/ipvsadm.rules' +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ipvsadm/ipvsadm.install b/community/ipvsadm/ipvsadm.install new file mode 100644 index 000000000..d235b560a --- /dev/null +++ b/community/ipvsadm/ipvsadm.install @@ -0,0 +1,10 @@ +## arg 1: the new package version +## arg 2: the old package version +post_upgrade() { + [ $(vercmp "$2" '1.26-4') -gt 0 ] || cat <<EOF +Config file have been moved from /etc/ipvsadm.rules to /etc/ipvsadm.conf. +You can revert to the previous location by editing /etc/conf.d/ipvsadm. +EOF +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ipvsadm/ipvsadm.rc b/community/ipvsadm/ipvsadm.rc index 5a9614106..b810dcd62 100644 --- a/community/ipvsadm/ipvsadm.rc +++ b/community/ipvsadm/ipvsadm.rc @@ -2,38 +2,30 @@ . /etc/rc.conf . /etc/rc.d/functions -. /etc/conf.d/ipvsadm +. /etc/conf.d/${0##*/} case "$1" in - start) + start) stat_busy 'Loading IPVS table' - if [[ -f $IPVSADM_CONF ]] && ipvsadm-restore < "$IPVSADM_CONF"; then - add_daemon ipvsadm - stat_done - else - stat_fail - fi - ;; - stop) - status 'Clearing IPVS table' ipvsadm -C - rm_daemon ipvsadm - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - save) - stat_busy 'Saving IPVS table' - if ipvsadm-save -n > "$IPVSADM_CONF" 2>/dev/null; then - stat_done - else - stat_fail - fi - ;; - *) - echo "usage: ${0##*/} {start|stop|restart|save}" + ipvsadm-restore < "$CONFIG_FILE" && + add_daemon ${0##*/} && stat_done || stat_die + ;; + stop) + [[ $SAVE_ON_STOP =~ [yY][eE][sS] ]] && $0 save + stat_busy 'Clearing IPVS table' + ipvsadm -C && rm_daemon ${0##*/} && stat_done || stat_die + ;; + restart) + $0 stop + $0 start + ;; + save) + stat_busy 'Saving IPVS table' + ipvsadm-save -n > "$CONFIG_FILE" && stat_done || stat_die + ;; + *) + echo "usage: ${0##*/} {start|stop|restart|save}" >&2 + exit 1 esac -exit 0 # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ipvsadm/ipvsadm.rules b/community/ipvsadm/ipvsadm.rules deleted file mode 100644 index 6740463a1..000000000 --- a/community/ipvsadm/ipvsadm.rules +++ /dev/null @@ -1 +0,0 @@ -# emtpy rules file for ipvsadm diff --git a/community/ipvsadm/ipvsadm.service b/community/ipvsadm/ipvsadm.service new file mode 100644 index 000000000..bb6b01c3f --- /dev/null +++ b/community/ipvsadm/ipvsadm.service @@ -0,0 +1,11 @@ +[Unit] +Description=IP Virtual Server + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/lib/systemd/scripts/ipvsadm start +ExecStop=/usr/lib/systemd/scripts/ipvsadm stop + +[Install] +WantedBy=multi-user.target diff --git a/community/ipvsadm/ipvsadm.systemd b/community/ipvsadm/ipvsadm.systemd new file mode 100644 index 000000000..3b72bd3ef --- /dev/null +++ b/community/ipvsadm/ipvsadm.systemd @@ -0,0 +1,22 @@ +#!/bin/bash + +. /etc/conf.d/ipvsadm + +case $1 in + start) + ipvsadm-restore < "$CONFIG_FILE" + ;; + stop) + [[ $SAVE_ON_STOP =~ [yY][eE][sS] ]] && $0 save + ipvsadm -C + ;; + save) + ipvsadm-save -n > "$CONFIG_FILE" + ;; + *) + echo "usage: ${0##*/} {start|stop|save}" >&2 + exit 1 + ;; +esac + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ktikz/PKGBUILD b/community/ktikz/PKGBUILD index 078fa347f..b28b2e0ec 100644 --- a/community/ktikz/PKGBUILD +++ b/community/ktikz/PKGBUILD @@ -4,7 +4,7 @@ pkgname=ktikz pkgver=0.10 -pkgrel=3 +pkgrel=4 pkgdesc="A small application helping you to create TikZ diagrams (from the LaTeX pgf package)" arch=('i686' 'x86_64' 'mips64el') url="http://www.hackenberger.at/blog/ktikz-editor-for-the-tikz-language/" @@ -13,7 +13,6 @@ depends=('poppler-qt' 'kdelibs') makedepends=('automoc4' 'cmake' 'docbook-xml') source=("http://www.hackenberger.at/ktikz/"$pkgname"_"$pkgver".tar.gz") md5sums=('e8f0826cba2447250bcdcd389a71a2ac') -install=ktikz.install build() { cd "$srcdir"/"$pkgname" diff --git a/community/libextractor/PKGBUILD b/community/libextractor/PKGBUILD index cbd752233..bc99009fa 100644 --- a/community/libextractor/PKGBUILD +++ b/community/libextractor/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70977 2012-05-21 07:59:49Z spupykin $ +# $Id: PKGBUILD 71278 2012-05-26 07:55:04Z pschmitz $ # Maintainer: Sergej Pupykin <pupykin.s@gmail.com> # Contributor: damir <damir@archlinux.org> pkgname=libextractor pkgver=0.6.3 -pkgrel=3 +pkgrel=4 pkgdesc="A library used to extract meta-data from files of arbitrary type" arch=("i686" "x86_64" 'mips64el') license=('GPL') diff --git a/community/libmnl/PKGBUILD b/community/libmnl/PKGBUILD index 8a00d0a65..bc4e355c2 100644 --- a/community/libmnl/PKGBUILD +++ b/community/libmnl/PKGBUILD @@ -1,16 +1,18 @@ -# $Id: PKGBUILD 61555 2012-01-02 21:43:24Z seblu $ -# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net +# $Id: PKGBUILD 71327 2012-05-26 23:26:09Z seblu $ +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Christian Hesse <mail@earthworm.de> pkgname=libmnl -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=1 pkgdesc='Minimalistic user-space library oriented to Netlink developers.' arch=('i686' 'x86_64') url='http://www.netfilter.org/projects/libmnl/' license=('LGPL2.1') +depends=('glibc') +options=('!libtool') source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2") -sha1sums=('62440193d128adc0946a8737e86dc0068424eedb') +sha1sums=('c27e25f67c6422ebf893fc3a844af8085a1c5b63') build() { cd $pkgname-$pkgver diff --git a/community/libunistring/PKGBUILD b/community/libunistring/PKGBUILD deleted file mode 100644 index 333c57ad9..000000000 --- a/community/libunistring/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 67762 2012-03-14 10:42:36Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Former Maintainer: Emmanuel 'guinness' Boudreault -# Current Maintainer: Patrick McCarty <pnorcks at gmail dot com> - -pkgname=libunistring -pkgver=0.9.3 -pkgrel=4 -pkgdesc="Library for manipulating Unicode strings and C strings." -url="http://www.gnu.org/software/libunistring/" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -depends=('glibc') -install=${pkgname}.install -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('db8eca3b64163abadf8c40e5cecc261f') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/community/libunistring/libunistring.install b/community/libunistring/libunistring.install deleted file mode 100644 index 58dd2ef8e..000000000 --- a/community/libunistring/libunistring.install +++ /dev/null @@ -1,22 +0,0 @@ -infodir=usr/share/info -filelist=(libunistring.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -# vim:set ts=2 sw=2 et: diff --git a/community/libvirt/unixperms.patch b/community/libvirt/unixperms.patch deleted file mode 100644 index b3fb86cf5..000000000 --- a/community/libvirt/unixperms.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -ur libvirt-0.7.4-orig/daemon/libvirtd.conf libvirt-0.7.4-patched/daemon/libvirtd.conf ---- libvirt-0.7.4-orig/daemon/libvirtd.conf 2009-11-23 03:10:33.398655655 -0800 -+++ libvirt-0.7.4-patched/daemon/libvirtd.conf 2009-11-23 03:09:37.831189671 -0800 -@@ -78,14 +78,14 @@ - # without becoming root. - # - # This is restricted to 'root' by default. --#unix_sock_group = "libvirt" -+unix_sock_group = "libvirt" - - # Set the UNIX socket permissions for the R/O socket. This is used - # for monitoring VM status only - # - # Default allows any user. If setting group ownership may want to - # restrict this to: --#unix_sock_ro_perms = "0777" -+unix_sock_ro_perms = "0770" - - # Set the UNIX socket permissions for the R/W socket. This is used - # for full management of VMs -@@ -95,7 +95,7 @@ - # - # If not using PolicyKit and setting group ownership for access - # control then you may want to relax this to: --#unix_sock_rw_perms = "0770" -+unix_sock_rw_perms = "0770" - - # Set the name of the directory in which sockets will be found/created. - #unix_sock_dir = "/var/run/libvirt" -@@ -126,7 +126,7 @@ - # - # To restrict monitoring of domains you may wish to enable - # an authentication mechanism here --#auth_unix_ro = "none" -+auth_unix_ro = "none" - - # Set an authentication scheme for UNIX read-write sockets - # By default socket permissions only allow root. If PolicyKit -@@ -135,7 +135,7 @@ - # - # If the unix_sock_rw_perms are changed you may wish to enable - # an authentication mechanism here --#auth_unix_rw = "none" -+auth_unix_rw = "none" - - # Change the authentication scheme for TCP sockets. - # diff --git a/community/libvirt/yajl-2.x.patch b/community/libvirt/yajl-2.x.patch deleted file mode 100644 index 80d3edce0..000000000 --- a/community/libvirt/yajl-2.x.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- a/src/util/json.c 2011-03-24 03:10:26.000000000 -0400 -+++ b/src/util/json.c 2011-04-25 20:01:29.354939116 -0400 -@@ -709,7 +709,7 @@ - - static int virJSONParserHandleNumber(void * ctx, - const char * s, -- unsigned int l) -+ size_t l) - { - virJSONParserPtr parser = ctx; - char *str = strndup(s, l); -@@ -735,7 +735,7 @@ - - static int virJSONParserHandleString(void * ctx, - const unsigned char * stringVal, -- unsigned int stringLen) -+ size_t stringLen) - { - virJSONParserPtr parser = ctx; - virJSONValuePtr value = virJSONValueNewStringLen((const char *)stringVal, -@@ -756,7 +756,7 @@ - - static int virJSONParserHandleMapKey(void * ctx, - const unsigned char * stringVal, -- unsigned int stringLen) -+ size_t stringLen) - { - virJSONParserPtr parser = ctx; - virJSONParserStatePtr state; -@@ -894,14 +894,14 @@ - /* XXX add an incremental streaming parser - yajl trivially supports it */ - virJSONValuePtr virJSONValueFromString(const char *jsonstring) - { -- yajl_parser_config cfg = { 1, 1 }; - yajl_handle hand; - virJSONParser parser = { NULL, NULL, 0 }; - virJSONValuePtr ret = NULL; - - VIR_DEBUG("string=%s", jsonstring); - -- hand = yajl_alloc(&parserCallbacks, &cfg, NULL, &parser); -+ hand = yajl_alloc(&parserCallbacks, NULL, &parser); -+ yajl_config(hand, yajl_allow_comments, 1); - - if (yajl_parse(hand, - (const unsigned char *)jsonstring, -@@ -1002,15 +1002,16 @@ - - char *virJSONValueToString(virJSONValuePtr object) - { -- yajl_gen_config conf = { 0, " " }; /* Turns off pretty printing since QEMU can't cope */ - yajl_gen g; - const unsigned char *str; - char *ret = NULL; -- unsigned int len; -+ size_t len; - - VIR_DEBUG("object=%p", object); - -- g = yajl_gen_alloc(&conf, NULL); -+ g = yajl_gen_alloc(NULL); -+ yajl_gen_config(g, yajl_gen_beautify, 0); -+ yajl_gen_config(g, yajl_gen_indent_string, " "); - - if (virJSONValueToStringOne(object, g) < 0) { - virReportOOMError(); diff --git a/community/libzrtpcpp/PKGBUILD b/community/libzrtpcpp/PKGBUILD deleted file mode 100644 index 4750b60b1..000000000 --- a/community/libzrtpcpp/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 70716 2012-05-15 11:42:17Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Jeff Mickey <jeff@archlinux.org> -# Contributor: Michel Brabants <michel.brabants@euphonynet.be> - -pkgname=libzrtpcpp -pkgver=2.0.0 -pkgrel=1 -pkgdesc="An extension to Real-time Transport Protocol (RTP) which describes a method of Diffie-Hellman key agreement for Secure Real-time Transport Protocol (SRTP)" -arch=('i686' 'x86_64' 'mips64el') -url="http://zfoneproject.com" -license=('GPL') -depends=('ccrtp' 'ucommon') -makedepends=('pkgconfig' 'cmake') -options=('!libtool') -source=(ftp://ftp.gnu.org/gnu/ccrtp/$pkgname-$pkgver.tar.gz) -md5sums=('dc1501e7e8a46a1608fc3820c7476727') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - sed -i 's|lib64|lib|g' CMakeLists.txt - cmake -DCMAKE_INSTALL_PREFIX=/usr . - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/community/milkytracker/PKGBUILD b/community/milkytracker/PKGBUILD index ecee22ddf..e8e54ee08 100644 --- a/community/milkytracker/PKGBUILD +++ b/community/milkytracker/PKGBUILD @@ -4,7 +4,7 @@ pkgname=milkytracker pkgver=0.90.85 -pkgrel=4 +pkgrel=5 pkgdesc="Fast Tracker II inspired music tracker" arch=('x86_64' 'i686') url="http://www.milkytracker.org/" @@ -12,7 +12,7 @@ license=('GPL3') depends=('sdl>=1.2.0' 'alsa-lib' 'zlib' 'gcc-libs') makedepends=('jack-audio-connection-kit') optdepends=('jack-audio-connection-kit: JACK audio support') -options=('docs') +options=('docs' '!strip') install=$pkgname.install source=("http://milkytracker.org/files/$pkgname-$pkgver.tar.bz2" 'arch.patch' diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD index 824fdd478..a90b3a040 100644 --- a/community/mplayer2/PKGBUILD +++ b/community/mplayer2/PKGBUILD @@ -1,10 +1,11 @@ -# $Id$ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: Bartek Piotrowski <barthalion@gmail.com> +# $Id: PKGBUILD 71255 2012-05-26 06:36:27Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor: Martin Panter <vadmium+aur@gmail.com> +# Contributor: Stéphane Gaudreault <stephane@archlinux.org> pkgname=mplayer2 -pkgver=20120414 -pkgrel=4 +pkgver=20120517 +pkgrel=1 pkgdesc="An advanced general-purpose media player. A fork of the original MPlayer project" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -18,20 +19,19 @@ makedepends=('mesa' 'unzip' 'yasm') backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') provides=('mplayer') conflicts=('mplayer') -source=("http://git.${pkgname}.org/${pkgname}/snapshot/${_snapshot}.tar.xz") -sha1sums=('ae4542ae6bbe00110aed32708d097ec5f611f0de') -options=('!emptydirs') +options=(!emptydirs) +source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz) +md5sums=('814cc9545937e13796df1d4747c3c5d0') build() { cd "${srcdir}/${_snapshot}" ./configure --prefix=/usr \ - --disable-arts \ + --enable-runtime-cpudetection \ --disable-speex \ --disable-openal \ --disable-libdv \ --disable-musepack \ - --disable-esd \ --disable-mga \ --language=all \ --enable-translation \ diff --git a/community/myodbc/myconf.h.in b/community/myodbc/myconf.h.in deleted file mode 100644 index 2a04eebba..000000000 --- a/community/myodbc/myconf.h.in +++ /dev/null @@ -1,165 +0,0 @@ -/* driver/myconf.h.in. Generated from configure.in by autoheader. */ - -/* Define to 1 if you have the <dlfcn.h> header file. */ -#undef HAVE_DLFCN_H - -/* Define to 1 if you have the <inttypes.h> header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the <iodbcinst.h> header file. */ -#undef HAVE_IODBCINST_H - -/* Define to 1 if you have the <isqlext.h> header file. */ -#undef HAVE_ISQLEXT_H - -/* Define to 1 if you have the <isqltypes.h> header file. */ -#undef HAVE_ISQLTYPES_H - -/* Define to 1 if you have the <isql.h> header file. */ -#undef HAVE_ISQL_H - -/* Define to 1 if you have the `z' library (-lz). */ -#undef HAVE_LIBZ - -/* Define to 1 if you have the `localtime_r' function. */ -#undef HAVE_LOCALTIME_R - -/* Define to 1 if you have the <memory.h> header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the <odbcinst.h> header file. */ -#undef HAVE_ODBCINST_H - -/* Define to 1 if you have the <sqlext.h> header file. */ -#undef HAVE_SQLEXT_H - -/* Define if SQLGetPrivateProfileString is defined */ -#undef HAVE_SQLGETPRIVATEPROFILESTRING - -/* Define to 1 if you have the `SQLGetPrivateProfileStringW' function. */ -#undef HAVE_SQLGETPRIVATEPROFILESTRINGW - -/* Define to 1 if you have the <sqltypes.h> header file. */ -#undef HAVE_SQLTYPES_H - -/* Define to 1 if you have the <sql.h> header file. */ -#undef HAVE_SQL_H - -/* Define to 1 if you have the <stdint.h> header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the <stdlib.h> header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the <strings.h> header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the <string.h> header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the `strndup' function. */ -#undef HAVE_STRNDUP - -/* Define to 1 if you have the <sys/stat.h> header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the <sys/types.h> header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the <unistd.h> header file. */ -#undef HAVE_UNISTD_H - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - -/* Name of package */ -#undef PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Define if SQLCHAR is undefined */ -#undef SQLCHAR - -/* Define if SQLHDBC is undefined */ -#undef SQLHDBC - -/* Define if SQLHENV is undefined */ -#undef SQLHENV - -/* Define if SQLHSTMT is undefined */ -#undef SQLHSTMT - -/* Define if SQLHWND is undefined */ -#undef SQLHWND - -/* Define if SQLINTEGER is undefined */ -#undef SQLINTEGER - -/* Define if SQLPOINTER is undefined */ -#undef SQLPOINTER - -/* Define if SQLRETURN is undefined */ -#undef SQLRETURN - -/* Define if SQLSMALLINT is undefined */ -#undef SQLSMALLINT - -/* Define if SQLUINTEGER is undefined */ -#undef SQLUINTEGER - -/* Define if SQLUSMALLINT is undefined */ -#undef SQLUSMALLINT - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Define path to system ODBC.INI file */ -#undef SYSTEM_ODBC_INI - -/* Define if compiler defines C99 __func__ macro */ -#undef USE_C99_FUNC_MACRO - -/* Define if compiler defines __FUNCTION__ */ -#undef USE_GNU_FUNC_MACRO - -/* use iODBC */ -#undef USE_IODBC - -/* Define if SQLColAttribute() last arg is compatible with SQLLEN* */ -#undef USE_SQLCOLATTRIBUTE_SQLLEN_PTR - -/* Define if SQLColAttribute() last arg is compatible with SQLPOINTER */ -#undef USE_SQLCOLATTRIBUTE_SQLPOINTER - -/* Define if SQLParamOptions() 2nd and 3rd arg is compatible with SQLUINTEGER - */ -#undef USE_SQLPARAMOPTIONS_SQLUINTEGER_PTR - -/* Define if SQLParamOptions() 2nd and 3rd arg is compatible with SQLULEN */ -#undef USE_SQLPARAMOPTIONS_SQLULEN_PTR - -/* use unixODBC */ -#undef USE_UNIXODBC - -/* Version number of package */ -#undef VERSION - -/* Define to 1 if the X Window System is missing or not being used. */ -#undef X_DISPLAY_MISSING - -/* Define if we are using unix build environment */ -#undef _UNIX_ diff --git a/community/myodbc/myodbc-64bit.patch b/community/myodbc/myodbc-64bit.patch deleted file mode 100644 index ac62d816a..000000000 --- a/community/myodbc/myodbc-64bit.patch +++ /dev/null @@ -1,85 +0,0 @@ -Fix some 64-bitness issues arising from unixODBC 2.2.14 changes. - - -diff -Naur mysql-connector-odbc-5.1.8.orig/driver/utility.c mysql-connector-odbc-5.1.8/driver/utility.c ---- mysql-connector-odbc-5.1.8.orig/driver/utility.c 2010-10-28 14:33:18.000000000 -0400 -+++ mysql-connector-odbc-5.1.8/driver/utility.c 2010-12-23 17:15:37.516602586 -0500 -@@ -1205,7 +1205,7 @@ - { - /* See comment for fill_transfer_oct_len_buff()*/ - SQLLEN size= get_display_size(stmt, field); -- sprintf(buff,size == SQL_NO_TOTAL ? "%d" : (sizeof(SQLLEN) == 4 ? "%lu" : "%lld"), size); -+ sprintf(buff, (size == SQL_NO_TOTAL ? "%ld" : "%lu"), size); - - return size; - } -@@ -1228,7 +1228,7 @@ - */ - SQLLEN len= get_transfer_octet_length(stmt, field); - -- sprintf(buff, len == SQL_NO_TOTAL ? "%d" : (sizeof(SQLLEN) == 4 ? "%lu" : "%lld"), len ); -+ sprintf(buff, (len == SQL_NO_TOTAL ? "%ld" : "%lu"), len ); - - return len; - } -@@ -1245,8 +1245,7 @@ - SQLULEN fill_column_size_buff(char *buff, STMT *stmt, MYSQL_FIELD *field) - { - SQLULEN size= get_column_size(stmt, field); -- sprintf(buff, (size== SQL_NO_TOTAL ? "%d" : -- (sizeof(SQLULEN) == 4 ? "%lu" : "%llu")), size); -+ sprintf(buff, (size== SQL_NO_TOTAL ? "%ld" : "%lu"), size); - return size; - } - -diff -Naur mysql-connector-odbc-5.1.8.orig/test/my_catalog.c mysql-connector-odbc-5.1.8/test/my_catalog.c ---- mysql-connector-odbc-5.1.8.orig/test/my_catalog.c 2010-10-28 14:33:18.000000000 -0400 -+++ mysql-connector-odbc-5.1.8/test/my_catalog.c 2010-12-23 17:16:26.284605944 -0500 -@@ -599,7 +599,7 @@ - fprintf(stdout, "# Column Name : %s\n", szColName); - fprintf(stdout, "# NameLengh : %d\n", pcbColName); - fprintf(stdout, "# DataType : %d\n", pfSqlType); -- fprintf(stdout, "# ColumnSize : %d\n", pcbColDef); -+ fprintf(stdout, "# ColumnSize : %ld\n", pcbColDef); - fprintf(stdout, "# DecimalDigits : %d\n", pibScale); - fprintf(stdout, "# Nullable : %d\n", pfNullable); - -@@ -632,7 +632,7 @@ - - rc = SQLGetConnectAttr(hdbc, SQL_ATTR_CURRENT_CATALOG, db, sizeof(db), &len); - mycon(hdbc,rc); -- fprintf(stdout,"current_catalog: %s (%ld)\n", db, len); -+ fprintf(stdout,"current_catalog: %s (%d)\n", db, len); - is_num(len, 4); - is_str(db, "test", 5); - -@@ -653,7 +653,7 @@ - - rc = SQLGetConnectAttr(hdbc, SQL_ATTR_CURRENT_CATALOG, db, 255, &len); - mycon(hdbc,rc); -- fprintf(stdout,"current_catalog: %s (%ld)\n", db, len); -+ fprintf(stdout,"current_catalog: %s (%d)\n", db, len); - is_num(len, 17); - is_str(db, cur_db, 18); - -diff -Naur mysql-connector-odbc-5.1.8.orig/test/my_cursor.c mysql-connector-odbc-5.1.8/test/my_cursor.c ---- mysql-connector-odbc-5.1.8.orig/test/my_cursor.c 2010-10-28 14:33:18.000000000 -0400 -+++ mysql-connector-odbc-5.1.8/test/my_cursor.c 2010-12-23 17:12:16.632676933 -0500 -@@ -711,7 +711,7 @@ - - rc = SQLRowCount(hstmt1,&row_count); - mystmt(hstmt1,rc); -- fprintf(stdout, "rows affected: %d\n", row_count); -+ fprintf(stdout, "rows affected: %ld\n", row_count); - myassert(row_count == 1); - - rc = SQLExtendedFetch(hstmt,SQL_FETCH_NEXT,1,NULL,&rgfRowStatus); -@@ -732,7 +732,7 @@ - - rc = SQLRowCount(hstmt1,&row_count); - mystmt(hstmt1,rc); -- fprintf(stdout, "rows affected: %d\n", row_count); -+ fprintf(stdout, "rows affected: %ld\n", row_count); - myassert(row_count == 1); - - SQLFreeStmt(hstmt,SQL_UNBIND); diff --git a/community/myodbc/myodbc-add-mysys.patch b/community/myodbc/myodbc-add-mysys.patch deleted file mode 100644 index a30466114..000000000 --- a/community/myodbc/myodbc-add-mysys.patch +++ /dev/null @@ -1,29 +0,0 @@ -Add files extracted from mysql into the driver build script. - - -diff -Naur mysql-connector-odbc-5.1.8.orig/util/Makefile.am mysql-connector-odbc-5.1.8/util/Makefile.am ---- mysql-connector-odbc-5.1.8.orig/util/Makefile.am 2010-10-28 14:33:17.000000000 -0400 -+++ mysql-connector-odbc-5.1.8/util/Makefile.am 2010-12-23 18:09:00.359695597 -0500 -@@ -10,6 +10,22 @@ - installer.c \ - odbcinstw.c \ - unicode_transcode.c \ -+ array.c \ -+ list.c \ -+ my_alloc.c \ -+ my_malloc.c \ -+ string.c \ -+ int2str.c \ -+ is_prefix.c \ -+ longlong2str.c \ -+ strcend.c \ -+ strend.c \ -+ strfill.c \ -+ strmake.c \ -+ strmov.c \ -+ strxmov.c \ -+ mysys_err.h \ -+ mysys_priv.h \ - MYODBCUtil.h \ - MYODBCUtilAllocDataSource.c \ - MYODBCUtilAllocDriver.c \ diff --git a/community/myodbc/myodbc-my-free.patch b/community/myodbc/myodbc-my-free.patch deleted file mode 100644 index cf7730a59..000000000 --- a/community/myodbc/myodbc-my-free.patch +++ /dev/null @@ -1,253 +0,0 @@ -Once again, mysql can't manage to ship a mysql-connector-odbc release -on time ... mysql 5.5 changed the my_free() function and the released -connector version is not up to speed. Can't use NEAR anymore, either. - - -diff -Naur mysql-connector-odbc-5.1.8.orig/driver/catalog.c mysql-connector-odbc-5.1.8/driver/catalog.c ---- mysql-connector-odbc-5.1.8.orig/driver/catalog.c 2010-10-28 14:33:18.000000000 -0400 -+++ mysql-connector-odbc-5.1.8/driver/catalog.c 2010-12-23 17:50:52.916552525 -0500 -@@ -94,11 +94,11 @@ - { - if (stmt->result) - { -- my_free((char *)stmt->result, MYF(0)); -+ my_free((char *)stmt->result); - } - if (stmt->result_array) - { -- my_free((char *)stmt->result_array, MYF(0)); -+ my_free((char *)stmt->result_array); - } - set_mem_error(&stmt->dbc->mysql); - return handle_connection_error(stmt); -diff -Naur mysql-connector-odbc-5.1.8.orig/driver/catalog_no_i_s.c mysql-connector-odbc-5.1.8/driver/catalog_no_i_s.c ---- mysql-connector-odbc-5.1.8.orig/driver/catalog_no_i_s.c 2010-10-28 14:33:18.000000000 -0400 -+++ mysql-connector-odbc-5.1.8/driver/catalog_no_i_s.c 2010-12-23 17:51:41.493551970 -0500 -@@ -269,13 +269,13 @@ - pthread_mutex_lock(&dbc->lock); - if (mysql_query(mysql, select)) - { -- my_free(select, MYF(0)); -+ my_free(select); - pthread_mutex_unlock(&dbc->lock); - return NULL; - } - result= mysql_store_result(&dbc->mysql); - pthread_mutex_unlock(&dbc->lock); -- my_free(select, MYF(0)); -+ my_free(select); - - return result; - } -@@ -1094,7 +1094,7 @@ - SQLFORE_KEYS_FIELDS * - row_count, - MYF(0)); -- my_free((char *)tempdata, MYF(0)); -+ my_free((char *)tempdata); - - if (!stmt->result_array) - { -@@ -1323,12 +1323,12 @@ - && (j != mypcREMARKS) - && (j != mypcCOLUMN_DEF) - && (j != mypcIS_NULLABLE)) -- my_free(((char**)cur_params->data)[j], MYF(0)); -+ my_free(((char**)cur_params->data)[j]); - } - /* cleanup the list */ - params= list_delete_forward(params); -- my_free(cur_params->data, MYF(0)); -- my_free(cur_params, MYF(0)); -+ my_free(cur_params->data); -+ my_free(cur_params); - } - } - } -@@ -1675,7 +1675,7 @@ - } - - dynstr_free(&dynQuery); -- my_free(params_r, MYF(0)); -+ my_free(params_r); - - return nReturn; - } -diff -Naur mysql-connector-odbc-5.1.8.orig/driver/desc.c mysql-connector-odbc-5.1.8/driver/desc.c ---- mysql-connector-odbc-5.1.8.orig/driver/desc.c 2010-10-28 14:33:18.000000000 -0400 -+++ mysql-connector-odbc-5.1.8/driver/desc.c 2010-12-23 17:51:06.532607921 -0500 -@@ -65,7 +65,7 @@ - */ - if (my_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0)) - { -- my_free((char *)desc, MYF(0)); -+ my_free((char *)desc); - return NULL; - } - desc->desc_type= desc_type; -@@ -111,7 +111,7 @@ - if (aprec->par.alloced) - { - aprec->par.alloced= FALSE; -- my_free(aprec->par.value, MYF(0)); -+ my_free(aprec->par.value); - } - } - } -diff -Naur mysql-connector-odbc-5.1.8.orig/driver/driver.h mysql-connector-odbc-5.1.8/driver/driver.h ---- mysql-connector-odbc-5.1.8.orig/driver/driver.h 2010-10-28 14:33:18.000000000 -0400 -+++ mysql-connector-odbc-5.1.8/driver/driver.h 2010-12-23 17:50:43.017608761 -0500 -@@ -113,7 +113,7 @@ - /* Max Primary keys in a cursor * WHERE clause */ - #define MY_MAX_PK_PARTS 32 - --#define x_free(A) { void *tmp= (A); if (tmp) my_free((char *) tmp,MYF(MY_WME+MY_FAE)); } -+#define x_free(A) { void *tmp= (A); if (tmp) my_free((char *) tmp); } - - - /* We don't make any assumption about what the default may be. */ -diff -Naur mysql-connector-odbc-5.1.8.orig/driver/execute.c mysql-connector-odbc-5.1.8/driver/execute.c ---- mysql-connector-odbc-5.1.8.orig/driver/execute.c 2010-10-28 14:33:18.000000000 -0400 -+++ mysql-connector-odbc-5.1.8/driver/execute.c 2010-12-23 17:49:52.799552481 -0500 -@@ -96,7 +96,7 @@ - exit: - pthread_mutex_unlock(&stmt->dbc->lock); - if ( query != stmt->query ) -- my_free(query,MYF(0)); -+ my_free(query); - - /* - If the original query was modified, we reset stmt->query so that the -@@ -104,7 +104,7 @@ - */ - if (stmt->orig_query) - { -- my_free(stmt->query,MYF(0)); -+ my_free(stmt->query); - stmt->query= stmt->orig_query; - stmt->query_end= stmt->orig_query_end; - stmt->orig_query= NULL; -@@ -625,7 +625,7 @@ - - out: - if (free_data) -- my_free(data, MYF(0)); -+ my_free(data); - - *toptr= to; - return SQL_SUCCESS; -@@ -1060,7 +1060,7 @@ - if ( cbValue == SQL_NULL_DATA ) - { - if ( aprec->par.alloced ) -- my_free(aprec->par.value,MYF(0)); -+ my_free(aprec->par.value); - aprec->par.alloced= FALSE; - aprec->par.value= NULL; - return SQL_SUCCESS; -diff -Naur mysql-connector-odbc-5.1.8.orig/driver/handle.c mysql-connector-odbc-5.1.8/driver/handle.c ---- mysql-connector-odbc-5.1.8.orig/driver/handle.c 2010-10-28 14:33:18.000000000 -0400 -+++ mysql-connector-odbc-5.1.8/driver/handle.c 2010-12-23 17:50:17.425586339 -0500 -@@ -112,7 +112,7 @@ - GlobalUnlock(GlobalHandle((HGLOBAL) henv)); - GlobalFree(GlobalHandle((HGLOBAL) henv)); - #else -- if (henv) my_free((char*) henv,MYF(0)); -+ if (henv) my_free((char*) henv); - myodbc_end(); - #endif /* _UNIX_ */ - return(SQL_SUCCESS); -@@ -251,7 +251,8 @@ - LIST *next; - - dbc->env->connections= list_delete(dbc->env->connections,&dbc->list); -- my_free(dbc->database,MYF(MY_ALLOW_ZERO_PTR)); -+ if (dbc->database) -+ my_free(dbc->database); - if (dbc->ds) - ds_delete(dbc->ds); - pthread_mutex_destroy(&dbc->lock); -@@ -268,7 +269,7 @@ - GlobalUnlock(GlobalHandle((HGLOBAL) hdbc)); - GlobalFree(GlobalHandle((HGLOBAL) hdbc)); - #else -- my_free((char*) hdbc,MYF(0)); -+ my_free((char*) hdbc); - #endif - return SQL_SUCCESS; - } -@@ -513,7 +514,7 @@ - GlobalUnlock(GlobalHandle ((HGLOBAL) hstmt)); - GlobalFree(GlobalHandle((HGLOBAL) hstmt)); - #else -- my_free((char*) hstmt,MYF(0)); -+ my_free((char*) hstmt); - #endif /* _UNIX_*/ - return SQL_SUCCESS; - } -diff -Naur mysql-connector-odbc-5.1.8.orig/driver/options.c mysql-connector-odbc-5.1.8/driver/options.c ---- mysql-connector-odbc-5.1.8.orig/driver/options.c 2010-10-28 14:33:18.000000000 -0400 -+++ mysql-connector-odbc-5.1.8/driver/options.c 2010-12-23 17:50:28.864604596 -0500 -@@ -301,7 +301,7 @@ - return SQL_ERROR; - } - } -- my_free(dbc->database,MYF(0)); -+ my_free(dbc->database); - dbc->database= my_strdup(db,MYF(MY_WME)); - pthread_mutex_unlock(&dbc->lock); - } -diff -Naur mysql-connector-odbc-5.1.8.orig/driver/prepare.c mysql-connector-odbc-5.1.8/driver/prepare.c ---- mysql-connector-odbc-5.1.8.orig/driver/prepare.c 2010-10-28 14:33:18.000000000 -0400 -+++ mysql-connector-odbc-5.1.8/driver/prepare.c 2010-12-23 17:51:17.175676805 -0500 -@@ -93,7 +93,7 @@ - CLEAR_STMT_ERROR(stmt); - - if (stmt->query) -- my_free(stmt->query, MYF(0)); -+ my_free(stmt->query); - - if (dupe && szSqlStr) - stmt->query= (char *)szSqlStr; -@@ -223,7 +223,7 @@ - { - aprec->par.alloced= FALSE; - assert(aprec->par.value); -- my_free(aprec->par.value,MYF(0)); -+ my_free(aprec->par.value); - aprec->par.value = NULL; - } - -diff -Naur mysql-connector-odbc-5.1.8.orig/driver/utility.c mysql-connector-odbc-5.1.8/driver/utility.c ---- mysql-connector-odbc-5.1.8.orig/driver/utility.c 2010-10-28 14:33:18.000000000 -0400 -+++ mysql-connector-odbc-5.1.8/driver/utility.c 2010-12-23 17:49:05.498552376 -0500 -@@ -930,7 +930,7 @@ - ulong max_length= stmt->stmt_options.max_length; - ulong *offset= &stmt->getdata.src_offset; - #if MYSQL_VERSION_ID >= 40100 -- char NEAR _dig_vec[] = -+ char _dig_vec[] = - "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - #endif - -@@ -2154,7 +2154,7 @@ - - my_bool reget_current_catalog(DBC FAR *dbc) - { -- my_free(dbc->database,MYF(0)); -+ my_free(dbc->database); - dbc->database= NULL; - - if ( odbc_stmt(dbc, "select database()") ) -diff -Naur mysql-connector-odbc-5.1.8.orig/util/stringutil.h mysql-connector-odbc-5.1.8/util/stringutil.h ---- mysql-connector-odbc-5.1.8.orig/util/stringutil.h 2010-10-28 14:33:17.000000000 -0400 -+++ mysql-connector-odbc-5.1.8/util/stringutil.h 2010-12-23 17:51:51.848676475 -0500 -@@ -41,7 +41,7 @@ - #include <sqlext.h> - - #ifndef x_free --#define x_free(A) { void *tmp= (A); if (tmp) my_free((char *) tmp,MYF(MY_WME+MY_FAE)); } -+#define x_free(A) { void *tmp= (A); if (tmp) my_free((char *) tmp); } - #endif - - #define myodbc_min(a, b) ((a) < (b) ? (a) : (b)) diff --git a/community/myodbc/myodbc-shutdown.patch b/community/myodbc/myodbc-shutdown.patch deleted file mode 100644 index ec0cf3d36..000000000 --- a/community/myodbc/myodbc-shutdown.patch +++ /dev/null @@ -1,27 +0,0 @@ -myodbc_end is really only usable during Windows DLL unload, since it's not -connection-specific and not thread-safe either. This bit of brain fade -accounts for our bug #185343 and several bugs filed at mysql.com. - -Furthermore, my_end() isn't exported from libmysqlclient anymore. -Hence, best fix is to turn the function into a no-op. - - -diff -Naur mysql-connector-odbc-5.1.8.orig/driver/dll.c mysql-connector-odbc-5.1.8/driver/dll.c ---- mysql-connector-odbc-5.1.8.orig/driver/dll.c 2010-10-28 14:33:18.000000000 -0400 -+++ mysql-connector-odbc-5.1.8/driver/dll.c 2010-12-23 15:05:49.394608226 -0500 -@@ -94,6 +94,7 @@ - */ - void myodbc_end() - { -+#if 0 - if (!--myodbc_inited) - { - my_free(decimal_point,MYF(0)); -@@ -121,6 +122,7 @@ - my_end(0); - #endif - } -+#endif - } - - diff --git a/community/netcf/netcf-0.1.7.patch b/community/netcf/netcf-0.1.7.patch deleted file mode 100644 index d4a4d31b7..000000000 --- a/community/netcf/netcf-0.1.7.patch +++ /dev/null @@ -1,426 +0,0 @@ -diff -ur netcf-0.1.7.ori//data/xml/initscripts-get.xsl netcf-0.1.7/data/xml/initscripts-get.xsl ---- netcf-0.1.7.ori//data/xml/initscripts-get.xsl 2009-10-04 08:18:41.000000000 +0200 -+++ netcf-0.1.7/data/xml/initscripts-get.xsl 2010-12-08 14:54:28.891813397 +0100 -@@ -47,9 +47,12 @@ - <xsl:template name="vlan-interface-common"> - <xsl:variable name="iface" select="concat(vlan/interface/@name, '.', vlan/@tag)"/> - -- <xsl:attribute name="path">/files/etc/sysconfig/network-scripts/ifcfg-<xsl:value-of select="$iface"/></xsl:attribute> -- <node label="DEVICE" value="{$iface}"/> -- <node label="VLAN" value="yes"/> -+ <xsl:attribute name="path">/files/etc/network.d/ifcfg-<xsl:value-of select="$iface"/></xsl:attribute> -+ <node label="INTERFACE" value="{$iface}"/> -+ <node label="PHYS_INTERFACE" value="{vlan/interface/@name}"/> -+ <node label="VLAN" value="{vlan/@tag}"/> -+ <node label="CONNECTION" value="ethernet-iproute-vlan"/> -+ <node label="FLAG" value="false"/> - </xsl:template> - - <xsl:template name='bare-vlan-interface'> -@@ -68,6 +71,7 @@ - <xsl:call-template name="startmode"/> - <xsl:call-template name="mtu"/> - <node label="TYPE" value="Bridge"/> -+ <node label="CONNECTION" value="bridge"/> - <xsl:call-template name="interface-addressing"/> - <xsl:if test="bridge/@stp"> - <node label="STP" value="{bridge/@stp}"/> -@@ -75,7 +79,11 @@ - <xsl:if test="bridge/@delay"> - <node label="DELAY" value="{bridge/@delay}"/> - </xsl:if> -+ <node label="DHCP_TIMEOUT" value="0"/> -+ <!-- -+ We don't have to define interfaces separately - </tree> -+ - <xsl:for-each select='bridge/interface'> - <tree> - <xsl:if test="@type = 'ethernet'"> -@@ -87,12 +95,29 @@ - <xsl:if test="@type = 'bond'"> - <xsl:call-template name="bare-bond-interface"/> - </xsl:if> -+ -+ BRIDGE_INTERFACES= is defined with all interfaces - <node label="BRIDGE" value="{../../@name}"/> -+ -+ <xsl:variable name="bridgeifaces" select="concat($bridgeifaces, '.', @name)"/> - </tree> - <xsl:if test="@type = 'bond'"> - <xsl:call-template name="bond-slaves"/> - </xsl:if> - </xsl:for-each> -+ --> -+ <!-- <xsl:if test="count(ip) > 1"> --> -+ <node label="BRIDGE_INTERFACES"> -+ <xsl:attribute name="value"> -+ <xsl:text></xsl:text> -+ <xsl:for-each select="bridge/interface"> -+ <xsl:value-of select="@name"/><xsl:value-of select="string(' ')"/> -+ </xsl:for-each> -+ <xsl:text></xsl:text> -+ </xsl:attribute> -+ </node> -+ <!-- </xsl:if> --> -+ </tree> - </xsl:template> - - <!-- -@@ -138,8 +163,8 @@ - Named templates, following the Relax NG syntax - --> - <xsl:template name="name-attr"> -- <xsl:attribute name="path">/files/etc/sysconfig/network-scripts/ifcfg-<xsl:value-of select="@name"/></xsl:attribute> -- <node label="DEVICE" value="{@name}"/> -+ <xsl:attribute name="path">/files/etc/network.d/ifcfg-<xsl:value-of select="@name"/></xsl:attribute> -+ <node label="INTERFACE" value="{@name}"/> - </xsl:template> - - <xsl:template name="mtu"> -@@ -153,6 +178,7 @@ - <xsl:if test="mac"> - <node label="HWADDR" value="{mac/@address}"/> - </xsl:if> -+ <node label="CONNECTION" value="{@type}"/> - <xsl:call-template name="startmode"/> - <xsl:call-template name="mtu"/> - </xsl:template> -@@ -184,14 +210,14 @@ - <xsl:template name="protocol-ipv4"> - <xsl:choose> - <xsl:when test="dhcp"> -- <node label="BOOTPROTO" value="dhcp"/> -+ <node label="IP" value="dhcp"/> - <xsl:if test="dhcp/@peerdns"> - <node label="PEERDNS" value="{dhcp/@peerdns}"/> - </xsl:if> - </xsl:when> - <xsl:when test="ip"> -- <node label="BOOTPROTO" value="none"/> -- <node label="IPADDR" value="{ip/@address}"/> -+ <node label="IP" value="static"/> -+ <node label="ADDR" value="{ip/@address}"/> - <xsl:if test="ip/@prefix"> - <node label="NETMASK" value="{ipcalc:netmask(ip/@prefix)}"/> - </xsl:if> -diff -ur netcf-0.1.7.ori//data/xml/initscripts-put.xsl netcf-0.1.7/data/xml/initscripts-put.xsl ---- netcf-0.1.7.ori//data/xml/initscripts-put.xsl 2009-10-04 08:18:41.000000000 +0200 -+++ netcf-0.1.7/data/xml/initscripts-put.xsl 2010-11-26 10:44:46.133757628 +0100 -@@ -47,7 +47,7 @@ - </xsl:template> - - <xsl:template name="bare-vlan-interface"> -- <xsl:variable name="name" select="node[@label = 'DEVICE']/@value"/> -+ <xsl:variable name="name" select="node[@label = 'INTERFACE']/@value"/> - <interface type="vlan"> - <xsl:call-template name="name-attr"/> - <xsl:call-template name="vlan-device"/> -@@ -55,7 +55,7 @@ - </xsl:template> - - <xsl:template name="vlan-device"> -- <xsl:variable name="name" select="node[@label = 'DEVICE']/@value"/> -+ <xsl:variable name="name" select="node[@label = 'INTERFACE']/@value"/> - <xsl:variable name="device" select="substring-before($name, '.')"/> - <xsl:variable name="tag" select="substring-after($name, '.')"/> - <vlan tag="{$tag}"> -@@ -70,7 +70,7 @@ - match="tree[node[@label = 'TYPE' and @value = 'Bridge']]"> - <interface type="bridge"> - <!-- the bridge node itself --> -- <xsl:variable name="iface" select="node[@label= 'DEVICE']/@value"/> -+ <xsl:variable name="iface" select="node[@label= 'INTERFACE']/@value"/> - <xsl:call-template name="name-attr"/> - <xsl:call-template name="startmode"/> - <xsl:call-template name="mtu"/> -@@ -101,17 +101,17 @@ - Bond - --> - <xsl:template name="bond-element"> -- <xsl:variable name="iface" select="node[@label= 'DEVICE']/@value"/> -+ <xsl:variable name="iface" select="node[@label= 'INTERFACE']/@value"/> - <bond> - <xsl:variable name="opts" select="node[@label = 'BONDING_OPTS']/@value"/> - <xsl:call-template name="bonding-opts"> - <xsl:with-param name="opts" select="$opts"/> - </xsl:call-template> - <xsl:variable name="primary" select="bond:option($opts, 'primary')"/> -- <xsl:for-each select="/descendant-or-self::*[node[@label = 'MASTER' and @value = $iface]][node[@label = 'DEVICE' and @value = $primary]]"> -+ <xsl:for-each select="/descendant-or-self::*[node[@label = 'MASTER' and @value = $iface]][node[@label = 'INTERFACE' and @value = $primary]]"> - <xsl:call-template name='bare-ethernet-interface'/> - </xsl:for-each> -- <xsl:for-each select="/descendant-or-self::*[node[@label = 'MASTER' and @value = $iface]][node[@label = 'DEVICE' and @value != $primary]]"> -+ <xsl:for-each select="/descendant-or-self::*[node[@label = 'MASTER' and @value = $iface]][node[@label = 'INTERFACE' and @value != $primary]]"> - <xsl:call-template name='bare-ethernet-interface'/> - </xsl:for-each> - </bond> -@@ -125,7 +125,7 @@ - </xsl:template> - - <xsl:template name="bond-interface" -- match="tree[node[@label = 'DEVICE'][@value = //tree/node[@label = 'MASTER']/@value]][count(node[@label = 'BRIDGE']) = 0]"> -+ match="tree[node[@label = 'INTERFACE'][@value = //tree/node[@label = 'MASTER']/@value]][count(node[@label = 'BRIDGE']) = 0]"> - <interface type="bond"> - <xsl:call-template name="name-attr"/> - <xsl:call-template name="startmode"/> -@@ -154,7 +154,7 @@ - - <xsl:template name="name-attr"> - <xsl:attribute name="name"> -- <xsl:value-of select="node[@label= 'DEVICE']/@value"/> -+ <xsl:value-of select="node[@label= 'INTERFACE']/@value"/> - </xsl:attribute> - </xsl:template> - -@@ -173,7 +173,7 @@ - <xsl:variable name="uses_dhcp" - select="node[@label = 'BOOTPROTO']/@value = 'dhcp'"/> - <xsl:variable name="uses_static" -- select="count(node[@label = 'IPADDR']) > 0"/> -+ select="count(node[@label = 'ADDR']) > 0"/> - <xsl:variable name="uses_ipv4" select="$uses_dhcp or $uses_static"/> - <xsl:if test="$uses_ipv4"> - <protocol family="ipv4"> -@@ -186,7 +186,7 @@ - </dhcp> - </xsl:when> - <xsl:when test="$uses_static"> -- <ip address="{node[@label = 'IPADDR']/@value}"> -+ <ip address="{node[@label = 'ADDR']/@value}"> - <xsl:choose> - <xsl:when test="node[@label = 'PREFIX']"> - <xsl:attribute name="prefix"><xsl:value-of select="node[@label = 'PREFIX']/@value"/></xsl:attribute> -diff -ur netcf-0.1.7.ori//src/drv_initscripts.c netcf-0.1.7/src/drv_initscripts.c ---- netcf-0.1.7.ori//src/drv_initscripts.c 2010-09-23 14:13:13.000000000 +0200 -+++ netcf-0.1.7/src/drv_initscripts.c 2010-12-08 13:57:02.027361706 +0100 -@@ -49,17 +49,20 @@ - #include <libexslt/exslt.h> - - static const char *const network_scripts_path = -- "/files/etc/sysconfig/network-scripts"; -+ //"/files/etc/sysconfig/network-scripts"; -+ "/files/etc/network.d/*"; - - static const char *const ifcfg_path = -- "/files/etc/sysconfig/network-scripts/*"; -+ //"/files/etc/sysconfig/network-scripts/*"; -+ "/files/etc/network.d/*"; - - /* Augeas should only load the files we are interested in */ - static const struct augeas_pv augeas_xfm_common_pv[] = { - /* Ifcfg files */ - { "/augeas/load/Ifcfg/lens", "Sysconfig.lns" }, - { "/augeas/load/Ifcfg/incl", -- "/etc/sysconfig/network-scripts/ifcfg-*" }, -+ "/etc/network.d/ifcfg-*" }, -+ //"/etc/sysconfig/network-scripts/ifcfg-*" }, - { "/augeas/load/Ifcfg/excl[1]", "*~" }, - { "/augeas/load/Ifcfg/excl[2]", "*.bak" }, - { "/augeas/load/Ifcfg/excl[3]", "*.orig" }, -@@ -107,10 +110,10 @@ - int nmatches; - - nmatches = aug_fmt_match(ncf, NULL, -- "%s[ DEVICE = '%s'" -+ "%s[ INTERFACE = '%s'" - " or BRIDGE = '%s'" - " or MASTER = '%s'" -- " or MASTER = ../*[BRIDGE = '%s']/DEVICE ]/DEVICE", -+ " or MASTER = ../*[BRIDGE = '%s']/INTERFACE ]/INTERFACE", - ifcfg_path, name, name, name, name); - return nmatches > 0; - } -@@ -173,7 +176,7 @@ - aug = get_augeas(ncf); - ERR_BAIL(ncf); - -- ndevs = aug_fmt_match(ncf, &devs, "%s[DEVICE = '%s']", -+ ndevs = aug_fmt_match(ncf, &devs, "%s[INTERFACE = '%s']", - ifcfg_path, name); - ERR_COND_BAIL(ndevs < 0, ncf, EOTHER); - -@@ -296,7 +299,8 @@ - int result = 0, ndevs; - char **devs = NULL; - -- ndevs = aug_fmt_match(ncf, &devs, "%s/DEVICE", ifcfg_path); -+ ndevs = aug_fmt_match(ncf, &devs, "%s/INTERFACE", ifcfg_path); -+ printf("%i\n", ndevs); - ERR_COND_BAIL(ndevs < 0, ncf, EOTHER); - - result = uniq_ifcfg_paths(ncf, ndevs, devs, intf); -@@ -453,11 +457,11 @@ - - int drv_list_interfaces(struct netcf *ncf, int maxnames, char **names, - unsigned int flags) { -- return list_interface_ids(ncf, maxnames, names, flags, "DEVICE"); -+ return list_interface_ids(ncf, maxnames, names, flags, "INTERFACE"); - } - - int drv_num_of_interfaces(struct netcf *ncf, unsigned int flags) { -- return list_interface_ids(ncf, 0, NULL, flags, "DEVICE"); -+ return list_interface_ids(ncf, 0, NULL, flags, "INTERFACE"); - } - - struct netcf_if *drv_lookup_by_name(struct netcf *ncf, const char *name) { -@@ -599,8 +603,8 @@ - - ncf = nif->ncf; - ndevs = aug_fmt_match(ncf, &devs, -- "%s[ DEVICE = '%s' or BRIDGE = '%s' or MASTER = '%s'" -- " or MASTER = ../*[BRIDGE = '%s']/DEVICE ]/DEVICE", -+ "%s[ INTERFACE = '%s' or BRIDGE = '%s' or MASTER = '%s'" -+ " or MASTER = ../*[BRIDGE = '%s']/INTERFACE ]/INTERFACE", - ifcfg_path, nif->name, nif->name, nif->name, nif->name); - ERR_BAIL(ncf); - -@@ -745,7 +749,7 @@ - int nmatches = 0; - - nmatches = aug_fmt_match(ncf, NULL, -- "%s[ DEVICE = '%s' and TYPE = 'Bridge']", -+ "%s[ INTERFACE = '%s' and TYPE = 'Bridge']", - ifcfg_path, name); - return nmatches > 0; - } -@@ -758,7 +762,7 @@ - ERR_BAIL(ncf); - - nslaves = aug_fmt_match(ncf, slaves, -- "%s[ BRIDGE = '%s' ]/DEVICE", ifcfg_path, name); -+ "%s[ BRIDGE = '%s' ]/INTERFACE", ifcfg_path, name); - ERR_BAIL(ncf); - for (int i=0; i < nslaves; i++) { - char *p = (*slaves)[i]; -@@ -790,8 +794,8 @@ - /* The last or clause catches slaves of a bond that are enslaved to - * a bridge NAME */ - r = xasprintf(&path, -- "%s[ DEVICE = '%s' or BRIDGE = '%s' or MASTER = '%s' " -- " or MASTER = ../*[BRIDGE = '%s']/DEVICE ]", -+ "%s[ INTERFACE = '%s' or BRIDGE = '%s' or MASTER = '%s' " -+ " or MASTER = ../*[BRIDGE = '%s']/INTERFACE ]", - ifcfg_path, name, name, name, name); - ERR_NOMEM(r < 0, ncf); - -@@ -967,7 +971,7 @@ - for (int i = 0; i < nmatches; i++) { - if (!has_ifcfg_file(ncf, matches[i])) - continue; -- r = xasprintf(&ifcfg, "%s[DEVICE = '%s']", ifcfg_path, matches[i]); -+ r = xasprintf(&ifcfg, "%s[INTERFACE = '%s']", ifcfg_path, matches[i]); - ERR_NOMEM(r < 0, ncf); - - if (! is_slave(ncf, ifcfg)) -@@ -1023,7 +1027,10 @@ - */ - - int drv_if_up(struct netcf_if *nif) { -- static const char *const ifup = "ifup"; -+ //static const char *const ifup = "ifup"; -+ static const char *const ifup = "netcfg"; -+ static const char *const ifprefix = "ifcfg-"; -+ char ifname[strlen(nif->name) + sizeof(ifprefix)]; - struct netcf *ncf = nif->ncf; - char **slaves = NULL; - int nslaves = 0; -@@ -1035,11 +1042,24 @@ - ERR_BAIL(ncf); - - for (int i=0; i < nslaves; i++) { -- run1(ncf, ifup, slaves[i]); -+ //run1(ncf, ifup, slaves[i]); -+ const char *const argv[] = { -+ ifup, "-u", slaves[i], NULL -+ }; -+ -+ run_program(ncf, argv); - ERR_BAIL(ncf); - } - } -- run1(ncf, ifup, nif->name); -+ //run1(ncf, ifup, nif->name); -+ /* Interfaces name have to be equal to script under /etc/network.d */ -+ strcpy(ifname, ifprefix); -+ strcat(ifname, nif->name); -+ const char *const argv[] = { -+ ifup, "-u", ifname, NULL -+ }; -+ -+ run_program(ncf, argv); - ERR_BAIL(ncf); - result = 0; - error: -@@ -1048,13 +1068,23 @@ - } - - int drv_if_down(struct netcf_if *nif) { -- static const char *const ifdown = "ifdown"; -+ //static const char *const ifdown = "ifdown"; -+ static const char *const ifdown = "netcfg"; -+ static const char *const ifprefix = "ifcfg-"; -+ char ifname[strlen(nif->name) + sizeof(ifprefix)]; - struct netcf *ncf = nif->ncf; - char **slaves = NULL; - int nslaves = 0; - int result = -1; - -- run1(ncf, ifdown, nif->name); -+ //run1(ncf, ifdown, nif->name); -+ strcpy(ifname, ifprefix); -+ strcat(ifname, nif->name); -+ const char *const argv[] = { -+ ifdown, "-d", ifname, NULL -+ }; -+ -+ run_program(ncf, argv); - ERR_BAIL(ncf); - if (is_bridge(ncf, nif->name)) { - /* Bring up bridge slaves after the bridge */ -@@ -1062,7 +1092,12 @@ - ERR_BAIL(ncf); - - for (int i=0; i < nslaves; i++) { -- run1(ncf, ifdown, slaves[i]); -+ //run1(ncf, ifdown, slaves[i]); -+ const char *const argvs[] = { -+ ifdown, "-d", slaves[i], NULL -+ }; -+ -+ run_program(ncf, argvs); - ERR_BAIL(ncf); - } - } -diff -ur netcf-0.1.7.ori//tests/interface/bridge.xml~ netcf-0.1.7/tests/interface/bridge.xml~ ---- netcf-0.1.7.ori//tests/interface/bridge.xml~ 2009-10-13 19:14:53.000000000 +0200 -+++ netcf-0.1.7/tests/interface/bridge.xml~ 2009-10-14 05:09:05.000000000 +0200 -@@ -2,10 +2,12 @@ - <start mode="onboot"/> - <mtu size="1500"/> - <protocol family="ipv4"> -- <ip address="192.168.80.5" prefix="24"/> -+ <dhcp/> - </protocol> - <bridge stp="off" delay="0.01"> - <interface type="ethernet" name="eth0"> -+ <mac address="ab:bb:cc:dd:ee:ff"/> - </interface> -+ <interface type="ethernet" name="eth1"/> - </bridge> - </interface> -diff -ur netcf-0.1.7.ori//tests/interface/vlan.xml~ netcf-0.1.7/tests/interface/vlan.xml~ ---- netcf-0.1.7.ori//tests/interface/vlan.xml~ 2010-07-30 06:02:39.000000000 +0200 -+++ netcf-0.1.7/tests/interface/vlan.xml~ 2010-09-07 18:26:22.000000000 +0200 -@@ -1,9 +1,9 @@ --<interface type="vlan" name="eth1.42"> -+<interface type="vlan" name="eth0.42"> - <start mode="onboot"/> - <protocol family="ipv4"> - <dhcp peerdns="no"/> - </protocol> - <vlan tag="42"> -- <interface name="eth1"/> -+ <interface name="eth0"/> - </vlan> - </interface> diff --git a/community/netsurf/netsurf.desktop b/community/netsurf/netsurf.desktop deleted file mode 100644 index aca4deefc..000000000 --- a/community/netsurf/netsurf.desktop +++ /dev/null @@ -1,127 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=Netsurf -Name[ar]=صافي تصفح -Name[ast]=Netsurf -Name[ca]=Netsurf -Name[cs]=Netsurf -Name[da]=Netsurf -Name[de]=Netsurf -Name[el]=καθαρού σερφ -Name[en_GB]=Netsurf -Name[es]=Netsurf -Name[et]=Netsurf -Name[fi]=Netsurf -Name[fr]=Netsurf -Name[gl]=Netsurf -Name[he]=Netsurf -Name[hr]=Netsurf -Name[hu]=Netsurf -Name[id]=Netsurf -Name[it]=Netsurf -Name[ja]=Netsurf -Name[ko]=인터넷 서핑 -Name[lt]=Netsurf -Name[nl]=Netsurf -Name[no]=Netsurf -Name[pl]=Netsurf -Name[pt]=Netsurf -Name[pt_BR]=Netsurf -Name[ro]=Netsurf -Name[ru]=Netsurf -Name[sk]=Netsurf -Name[sr]=нетсурф -Name[sr@latin]=Netsurf -Name[sv]=Netsurf -Name[tr]=Netsurf -Name[ug]=Netsurf -Name[uk]=Інтернет серфінгу -Name[zh_CN]=Netsurf 网冲浪 -Name[zh_TW]=Netsurf 網衝浪 -GenericName=Web Browser -GenericName[ar]=متصفح الوب -GenericName[ast]=Restolador -GenericName[ca]=Navegador web -GenericName[cs]=Internetový prohlížeč -GenericName[da]=Webbrowser -GenericName[de]=Internetbetrachter -GenericName[el]=Περιηγητής Ιστού -GenericName[en_GB]=Web Browser -GenericName[es]=Navegador web -GenericName[et]=Veebibrauser -GenericName[fi]=Verkkoselain -GenericName[fr]=Navigateur Internet -GenericName[gl]=Navegador web -GenericName[he]=דפדפן -GenericName[hr]=Web preglednik -GenericName[hu]=Webböngésző -GenericName[id]=Peramban Web -GenericName[it]=Browser web -GenericName[ja]=ウェブブラウザ -GenericName[ko]=웹 브라우저 -GenericName[lt]=Interneto naršyklė -GenericName[nl]=Webbrowser -GenericName[no]=Nettleser -GenericName[pa]=ਵੈੱਬ ਬਰਾਊਜ਼ਰ -GenericName[pl]=Przeglądarka internetowa -GenericName[pt]=Navegador Web -GenericName[pt_BR]=Navegador web -GenericName[ro]=Navigator web -GenericName[ru]=Интернет-обозреватель -GenericName[sk]=Internetový prehliadač -GenericName[sr]=Интернет прегледник -GenericName[sr@latin]=Internet preglednik -GenericName[sv]=Webbläsare -GenericName[tr]=Web Tarayıcı -GenericName[ug]=توركۆرگۈ -GenericName[uk]=Переглядач Веб -GenericName[zh_CN]=网页浏览器 -GenericName[zh_TW]=網頁瀏覽器 -Comment=Lightweight web browser -Comment[ar]=منصفح الوب الخفيف -Comment[ast]=Restolador llixeru -Comment[ca]=Navegador web lleuger -Comment[cs]=Odlehčený prohlížeč -Comment[da]=Letvægtig webbrowser -Comment[de]=Schlanker Internetbetrachter -Comment[el]=Ελαφρύς περιηγητής ιστού -Comment[en_GB]=Lightweight web browser -Comment[es]=Navegador web ligero -Comment[et]=Kergekaaluline veebibrauser -Comment[fi]=Kevyt verkkoselain -Comment[fr]=Navigateur Internet léger -Comment[gl]=Navegador web lixeiro -Comment[he]=דפדפן קל משקל -Comment[hr]=Lagani web preglednik -Comment[hu]=Könnyűsúlyú webböngésző -Comment[id]=Peramban web ringan -Comment[it]=Browser web leggero -Comment[ja]=軽量級ウェブブラウザ -Comment[ko]=가벼운 웹 브라우저 -Comment[lt]=Paprasta interneto naršyklė -Comment[nl]=Lichtgewicht webbrowser -Comment[no]=Lettvektig nettleser -Comment[pa]=ਲਾਈਟਵੇਟ ਵੈੱਬ ਬਰਾਊਜ਼ਰ -Comment[pl]=Umożliwia przeglądanie zawartości sieci internetowej -Comment[pt]=Navegador Web rápido -Comment[pt_BR]=Navegador web leve -Comment[ro]=Mic navigator web -Comment[ru]=Легковесный Интернет-обозреватель -Comment[sk]=Ľahký internetový prehliadač -Comment[sr]=Једноставан Интернет прегледник -Comment[sr@latin]=Jednostavan Internet preglednik -Comment[sv]=Resurssnål webbläsare -Comment[tr]=Hafif web tarayıcı -Comment[ug]=يېنىك توركۆرگۈ -Comment[uk]=Легкий переглядач Веб -Comment[zh_CN]=轻量级网页浏览器 -Comment[zh_TW]=輕量級網頁瀏覽器 -Categories=GTK;Network;WebBrowser; -MimeType=text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/geo; -Exec=netsurf %U -Icon=netsurf -Terminal=false -StartupNotify=true -X-Osso-Type=application/x-executable -X-Osso-Service=netsurf diff --git a/community/ngircd/PKGBUILD b/community/ngircd/PKGBUILD index 3a18e5fdc..88158a1e2 100644 --- a/community/ngircd/PKGBUILD +++ b/community/ngircd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 67247 2012-03-05 20:22:45Z kkeen $ +# $Id: PKGBUILD 71251 2012-05-26 05:48:55Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=ngircd -pkgver=19 +pkgver=19.1 pkgrel=1 pkgdesc="Next Generation IRC Daemon" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ license=('GPL') depends=('openssl' 'libident') source=("http://ngircd.barton.de/pub/ngircd/ngircd-$pkgver.tar.gz" ngircd.sh) -sha256sums=('10d153ea88f5108aedf49e044b5daf8f19ad8053b7721e72408aabe77505388b' +sha256sums=('3e5cf62ab5164a310aa47f384387803a4c2b5221005ad1eb648ae2c5f0796f60' 'f8c28546090af8ce67471b9b4d577f6926007615356dd11afd2bc16f61d698d5') build() { diff --git a/community/onboard/fix_encoding_mismatch.patch b/community/onboard/fix_encoding_mismatch.patch deleted file mode 100644 index 01750598c..000000000 --- a/community/onboard/fix_encoding_mismatch.patch +++ /dev/null @@ -1,187 +0,0 @@ -Subject: Fix string encodings so as to not have a mismatch without mousetweaks -Author: marmuta -Origin: upstream, http://bazaar.launchpad.net/~onboard/onboard/0.91/revision/764 -Bug-Ubuntu: https://bugs.launchpad.net/bugs/958385 - ---- - Onboard/Config.py | 9 +++++---- - Onboard/ConfigUtils.py | 9 ++++++--- - Onboard/Exceptions.py | 5 +++-- - Onboard/OnboardGtk.py | 5 +++-- - Onboard/settings.py | 7 ++++--- - Onboard/utils.py | 16 ++++++++++++++++ - 6 files changed, 37 insertions(+), 14 deletions(-) - -Index: onboard-0.97.0/Onboard/Config.py -=================================================================== ---- onboard-0.97.0.orig/Onboard/Config.py -+++ onboard-0.97.0/Onboard/Config.py -@@ -12,7 +12,7 @@ - - from gi.repository import GLib, Gtk - --from Onboard.utils import show_confirmation_dialog, Version -+from Onboard.utils import show_confirmation_dialog, Version, unicode_str - from Onboard.WindowUtils import Handle - from Onboard.ConfigUtils import ConfigObject - from Onboard.MouseControl import Mousetweaks, ClickMapper -@@ -209,7 +209,7 @@ - try: - ConfigObject.__init__(self) - except SchemaError as e: -- _logger.error(str(e)) -+ _logger.error(unicode_str(e)) - sys.exit() - - # init paths -@@ -225,7 +225,8 @@ - try: - copytree(old_user_dir, user_dir) - except OSError as ex: # python >2.5 -- _logger.error(_("Failed to migrate user directory. ") + str(ex)) -+ _logger.error(_("Failed to migrate user directory. ") + \ -+ unicode_str(ex)) - - # Load system defaults (if there are any, not required). - # Used for distribution specific settings, aka branding. -@@ -347,7 +348,7 @@ - self.mousetweaks = Mousetweaks() - self.children.append(self.mousetweaks) - except (SchemaError, ImportError) as e: -- _logger.warning(str(e)) -+ _logger.warning(unicode_str(e)) - self.mousetweaks = None - - self.clickmapper = ClickMapper() -Index: onboard-0.97.0/Onboard/ConfigUtils.py -=================================================================== ---- onboard-0.97.0.orig/Onboard/ConfigUtils.py -+++ onboard-0.97.0/Onboard/ConfigUtils.py -@@ -22,7 +22,8 @@ - from gi.repository import Gio - - from Onboard.Exceptions import SchemaError --from Onboard.utils import pack_name_value_list, unpack_name_value_list -+from Onboard.utils import pack_name_value_list, unpack_name_value_list, \ -+ unicode_str - - _CAN_SET_HOOK = "_can_set_" # return true if value is valid - _GSETTINGS_GET_HOOK = "_gsettings_get_" # retrieve from gsettings -@@ -388,7 +389,8 @@ - try: - filename = parser.read(paths) - except configparser.ParsingError as ex: -- _logger.error(_("Failed to read system defaults. " + str(ex))) -+ _logger.error(_("Failed to read system defaults. " + \ -+ unicode_str(ex))) - - if not filename: - _logger.info(_("No system defaults found.")) -@@ -501,7 +503,8 @@ - value = self.settings[self.key] - - except KeyError as ex: -- _logger.error(_("Failed to get gsettings value. ") + str(ex)) -+ _logger.error(_("Failed to get gsettings value. ") + \ -+ unicode_str(ex)) - - return value - -Index: onboard-0.97.0/Onboard/Exceptions.py -=================================================================== ---- onboard-0.97.0.orig/Onboard/Exceptions.py -+++ onboard-0.97.0/Onboard/Exceptions.py -@@ -4,6 +4,7 @@ - - from traceback import format_tb - import sys -+from Onboard.utils import unicode_str - - class ChainableError(Exception): - """ -@@ -40,10 +41,10 @@ - traceback = property(_get_traceback) - - def __str__(self): -- message = self._message + "\n" -+ message = unicode_str(self._message) + "\n" - if self.chained_exception: - message += "%s: %s" % (type(self.chained_exception).__name__, -- str(self.chained_exception)) -+ unicode_str(self.chained_exception)) - return message - - class SVGSyntaxError(ChainableError): -Index: onboard-0.97.0/Onboard/OnboardGtk.py -=================================================================== ---- onboard-0.97.0.orig/Onboard/OnboardGtk.py -+++ onboard-0.97.0/Onboard/OnboardGtk.py -@@ -26,7 +26,8 @@ - from Onboard.KeyGtk import * - from Onboard.KbdWindow import KbdWindow, KbdPlugWindow - from Onboard.KeyboardSVG import KeyboardSVG --from Onboard.utils import show_confirmation_dialog, CallOnce, timeit -+from Onboard.utils import show_confirmation_dialog, CallOnce, timeit, \ -+ unicode_str - from Onboard.Appearance import Theme - - ### Config Singleton ### -@@ -485,7 +486,7 @@ - except virtkey.error as e: - t = time.time() - if t > self._vk_error_time + .2: # rate limit to once per 200ms -- _logger.warning("vk: "+str(e)) -+ _logger.warning("vk: " + unicode_str(e)) - self._vk_error_time = t - - return self._vk -Index: onboard-0.97.0/Onboard/settings.py -=================================================================== ---- onboard-0.97.0.orig/Onboard/settings.py -+++ onboard-0.97.0/Onboard/settings.py -@@ -24,7 +24,8 @@ - from Onboard.Appearance import Theme, ColorScheme - from Onboard.Scanner import ScanMode, ScanDevice - from Onboard.utils import show_ask_string_dialog, \ -- show_confirmation_dialog -+ show_confirmation_dialog, \ -+ unicode_str - - from virtkey import virtkey - from osk import Devices -@@ -400,8 +401,8 @@ - try: - Popen([filename, "universal-access"]) - except OSError as e: -- _logger.warning(_("System settings not found" -- " ({}): {}").format(filename, str(e))) -+ _logger.warning(_("System settings not found ({}): {}") \ -+ .format(filename, unicode_str(e))) - - def update_num_resize_handles_combobox(self): - self.num_resize_handles_list = Gtk.ListStore(str, int) -Index: onboard-0.97.0/Onboard/utils.py -=================================================================== ---- onboard-0.97.0.orig/Onboard/utils.py -+++ onboard-0.97.0/Onboard/utils.py -@@ -961,4 +961,20 @@ - return 1 - return 0 - -+def unicode_str(obj, encoding = "utf-8"): -+ """ -+ Safe str() function that always returns an unicode string. -+ Do nothing if the string was already unicode. -+ """ -+ if sys.version_info.major >= 3: # python 3? -+ return str(obj) -+ -+ if type(obj) == unicode: # unicode string? -+ return obj -+ -+ if hasattr(obj, "__unicode__"): # Exception object? -+ return unicode(obj) -+ -+ return str(obj).decode("utf-8") # strings, numbers, ... -+ - diff --git a/community/onboard/fix_unicode_translations.patch b/community/onboard/fix_unicode_translations.patch deleted file mode 100644 index 1eaf663cc..000000000 --- a/community/onboard/fix_unicode_translations.patch +++ /dev/null @@ -1,247 +0,0 @@ -=== modified file 'Onboard/Appearance.py' ---- Onboard/Appearance.py 2012-02-14 08:16:34 +0000 -+++ Onboard/Appearance.py 2012-02-15 23:27:20 +0000 -@@ -11,7 +11,6 @@ - _logger = logging.getLogger("Appearance") - ############### - --from gettext import gettext as _ - from xml.dom import minidom - import os - import re - -=== modified file 'Onboard/Config.py' ---- Onboard/Config.py 2012-02-15 10:58:02 +0000 -+++ Onboard/Config.py 2012-02-15 23:27:20 +0000 -@@ -9,7 +9,6 @@ - import sys - from shutil import copytree - from optparse import OptionParser --from gettext import gettext as _ - - from gi.repository import GLib, Gtk - - -=== modified file 'Onboard/ConfigUtils.py' ---- Onboard/ConfigUtils.py 2012-02-08 14:56:38 +0000 -+++ Onboard/ConfigUtils.py 2012-02-15 23:27:20 +0000 -@@ -13,7 +13,6 @@ - import os - import sys - from ast import literal_eval --from gettext import gettext as _ - try: - import configparser - except ImportError: -@@ -418,8 +417,8 @@ - # convert ini file strings to property values - sysdef_gskeys = dict((k.sysdef, k) for k in list(self.gskeys.values())) - for sysdef, value in items: -- _logger.info(_("Found system default '{}={}'") \ -- .format(sysdef, value)) -+ _logger.info(_("Found system default '[{}] {}={}'") \ -+ .format(self.sysdef_section, sysdef, value)) - - gskey = sysdef_gskeys.get(sysdef, None) - value = self._convert_sysdef_key(gskey, sysdef, value) - -=== modified file 'Onboard/IconPalette.py' ---- Onboard/IconPalette.py 2012-02-15 01:34:13 +0000 -+++ Onboard/IconPalette.py 2012-02-15 23:27:20 +0000 -@@ -43,7 +43,6 @@ - config = Config() - ######################## - --from gettext import gettext as _ - - class IconPalette(Gtk.Window, WindowRectTracker, WindowManipulator): - """ - -=== modified file 'Onboard/Indicator.py' ---- Onboard/Indicator.py 2012-02-11 14:07:56 +0000 -+++ Onboard/Indicator.py 2012-02-15 23:27:20 +0000 -@@ -18,7 +18,6 @@ - config = Config() - ######################## - --from gettext import gettext as _ - - class Indicator(GObject.GObject): - - -=== modified file 'Onboard/KbdWindow.py' ---- Onboard/KbdWindow.py 2012-02-15 10:18:48 +0000 -+++ Onboard/KbdWindow.py 2012-02-15 23:27:20 +0000 -@@ -11,7 +11,6 @@ - from Onboard.WindowUtils import Orientation, WindowRectTracker - from Onboard.IconPalette import IconPalette - --from gettext import gettext as _ - - ### Logging ### - import logging - -=== modified file 'Onboard/Keyboard.py' ---- Onboard/Keyboard.py 2012-02-14 20:21:02 +0000 -+++ Onboard/Keyboard.py 2012-02-15 23:27:20 +0000 -@@ -3,7 +3,6 @@ - from __future__ import division, print_function, unicode_literals - - import sys --from gettext import gettext as _ - - from gi.repository import GObject, Gtk, Gdk - - -=== modified file 'Onboard/KeyboardGTK.py' ---- Onboard/KeyboardGTK.py 2012-02-15 01:33:34 +0000 -+++ Onboard/KeyboardGTK.py 2012-02-15 23:27:20 +0000 -@@ -5,7 +5,6 @@ - - import os - import time --from gettext import gettext as _ - - import cairo - from gi.repository import GObject, Gdk, Gtk - -=== modified file 'Onboard/KeyboardSVG.py' ---- Onboard/KeyboardSVG.py 2012-02-09 19:18:36 +0000 -+++ Onboard/KeyboardSVG.py 2012-02-15 23:27:20 +0000 -@@ -11,7 +11,6 @@ - import re - import sys - import shutil --from gettext import gettext as _ - from xml.dom import minidom - - from Onboard import Exceptions - -=== modified file 'Onboard/MouseControl.py' ---- Onboard/MouseControl.py 2012-01-19 08:50:34 +0000 -+++ Onboard/MouseControl.py 2012-02-15 23:27:20 +0000 -@@ -5,7 +5,6 @@ - - from __future__ import division, print_function, unicode_literals - --from gettext import gettext as _ - try: - import dbus - from dbus.mainloop.glib import DBusGMainLoop - -=== modified file 'Onboard/OnboardGtk.py' ---- Onboard/OnboardGtk.py 2012-02-15 10:58:02 +0000 -+++ Onboard/OnboardGtk.py 2012-02-15 23:27:20 +0000 -@@ -13,14 +13,14 @@ - import signal - import gettext - import os.path --from gettext import gettext as _ - import virtkey -- - from gi.repository import GObject, Gio, Gdk, Gtk - -+# setup gettext, install _() function for all modules -+app = "onboard" -+gettext.install(app, unicode=True) - - from Onboard.Indicator import Indicator -- - from Onboard.Keyboard import Keyboard - from Onboard.Scanner import Scanner - from Onboard.KeyGtk import * -@@ -37,11 +37,6 @@ - import Onboard.KeyCommon - import Onboard.utils as utils - --#setup gettext --app="onboard" --gettext.textdomain(app) --gettext.bindtextdomain(app) -- - DEFAULT_FONTSIZE = 10 - - class OnboardGtk(Gtk.Application): - -=== modified file 'Onboard/SnippetView.py' ---- Onboard/SnippetView.py 2012-01-09 22:25:10 +0000 -+++ Onboard/SnippetView.py 2012-02-15 23:27:20 +0000 -@@ -4,7 +4,6 @@ - - from gi.repository import GObject, Gtk - --from gettext import gettext as _ - - from Onboard.utils import show_error_dialog - - -=== modified file 'Onboard/TouchHandles.py' ---- Onboard/TouchHandles.py 2012-02-14 08:32:08 +0000 -+++ Onboard/TouchHandles.py 2012-02-15 23:27:20 +0000 -@@ -5,7 +5,6 @@ - - from math import pi, sqrt, sin, log - import cairo --from gettext import gettext as _ - - from Onboard.utils import Rect - from Onboard.WindowUtils import Handle - -=== modified file 'Onboard/WindowUtils.py' ---- Onboard/WindowUtils.py 2012-02-15 10:23:36 +0000 -+++ Onboard/WindowUtils.py 2012-02-15 23:27:20 +0000 -@@ -5,7 +5,6 @@ - - import time - from math import sqrt --from gettext import gettext as _ - - from gi.repository import GObject, Gtk, Gdk - - -=== modified file 'Onboard/settings.py' ---- Onboard/settings.py 2012-02-15 10:58:02 +0000 -+++ Onboard/settings.py 2012-02-15 23:27:20 +0000 -@@ -11,9 +11,14 @@ - from subprocess import Popen - from xml.parsers.expat import ExpatError - from xml.dom import minidom -+import gettext - - from gi.repository import GObject, Pango, Gdk, Gtk - -+# setup gettext, install _() function for all modules -+app = "onboard" -+gettext.install(app, unicode=True) -+ - from Onboard.KeyboardSVG import KeyboardSVG - from Onboard.SnippetView import SnippetView - from Onboard.Appearance import Theme, ColorScheme -@@ -36,14 +41,6 @@ - config = Config() - ######################## - --#setup gettext --import gettext --from gettext import gettext as _ --app = "onboard" --gettext.textdomain(app) --gettext.bindtextdomain(app) -- -- - - def LoadUI(filebase): - builder = Gtk.Builder() - -=== modified file 'Onboard/utils.py' ---- Onboard/utils.py 2012-02-15 01:33:34 +0000 -+++ Onboard/utils.py 2012-02-15 23:27:20 +0000 -@@ -11,7 +11,6 @@ - from subprocess import Popen - from math import pi, sqrt, sin - from contextlib import contextmanager --from gettext import gettext as _ - - from gi.repository import GObject, Gtk - - diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD index e26e18a67..0e4a3927c 100644 --- a/community/parrot/PKGBUILD +++ b/community/parrot/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 70027 2012-04-28 09:24:17Z allan $ +# $Id: PKGBUILD 71230 2012-05-25 11:31:06Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: mpie <michael.kyne-phillips1@ntlworld.com> pkgname=parrot -pkgver=4.3.0 -_rel=stable -#_rel=devel +pkgver=4.4.0 +#_rel=stable +_rel=devel pkgrel=1 pkgdesc="Standalone VM that can execute bytecode compiled dynamic languages" arch=('x86_64' 'i686' 'mips64el') @@ -17,6 +17,8 @@ optdepends=('freeglut') options=('!makeflags') source=(ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/$pkgname-$pkgver.tar.bz2) sha256sums=('5c3f5ba2de06f6adb53b7835374a4f3e0601ec63e8a1d1dba6c6a07e12cc2990') +sha256sums=('348ce13fc136afc74a7b50b094f64d8cb00f83f0cd3d59acc6fa4e63c824fa4d') +sha256sums=('348ce13fc136afc74a7b50b094f64d8cb00f83f0cd3d59acc6fa4e63c824fa4d') build() { cd "$srcdir/$pkgname-$pkgver" @@ -26,14 +28,14 @@ build() { 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 + --disable-rpath || true + +# 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 diff --git a/community/pdf2djvu/PKGBUILD b/community/pdf2djvu/PKGBUILD index 7e30d453c..19d6269fa 100644 --- a/community/pdf2djvu/PKGBUILD +++ b/community/pdf2djvu/PKGBUILD @@ -1,21 +1,24 @@ -# $Id: PKGBUILD 58479 2011-11-13 13:51:40Z jelle $ +# $Id: PKGBUILD 71280 2012-05-26 07:55:10Z pschmitz $ # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Maintainer: Jelle van der Waa <jelle@vdwaa.nl> pkgname=pdf2djvu -pkgver=0.7.11 -pkgrel=3 +pkgver=0.7.12 +pkgrel=1 pkgdesc="Creates DjVu files from PDF files" arch=('i686' 'x86_64' 'mips64el') url="http://pdf2djvu.googlecode.com" license=('GPL') depends=('poppler' 'djvulibre' 'libxslt' 'gcc-libs') makedepends=('pstreams') -source=("http://pdf2djvu.googlecode.com/files/${pkgname}_${pkgver}.tar.gz") -md5sums=('cdc0cbb46512aaf7109d6ebc7aef1a7a') +source=("http://pdf2djvu.googlecode.com/files/${pkgname}_${pkgver}.tar.gz" + "poppler-0.20.patch") +md5sums=('4fd56c0763b56b4081fc9c85be16d9d7' + '9f9c5b098a3a13256beac04553ee67c3') build() { cd ${srcdir}/${pkgname}-${pkgver} + patch -p1 <$srcdir/poppler-0.20.patch ./configure --prefix=/usr make } @@ -25,4 +28,3 @@ package() { make install DESTDIR=${pkgdir} install -Dm644 doc/${pkgname}.1 ${pkgdir}/usr/share/man/man1/${pkgname}.1 } -md5sums=('37c3d5a31c155bc65a39912da4c6bce1') diff --git a/community/pdf2djvu/poppler-0.20.patch b/community/pdf2djvu/poppler-0.20.patch new file mode 100644 index 000000000..36d23f73a --- /dev/null +++ b/community/pdf2djvu/poppler-0.20.patch @@ -0,0 +1,69 @@ +diff -wbBur pdf2djvu-0.7.12/configure pdf2djvu-0.7.12.my/configure +--- pdf2djvu-0.7.12/configure 2012-01-22 03:17:01.000000000 +0400 ++++ pdf2djvu-0.7.12.my/configure 2012-05-17 20:44:06.000000000 +0400 +@@ -6653,7 +6653,7 @@ + + if test "$GXX" = yes + then +- CXXFLAGS="$CXXFLAGS -Werror=overloaded-virtual" ++ CXXFLAGS="$CXXFLAGS " + fi + + # Output files +diff -wbBur pdf2djvu-0.7.12/configure.ac pdf2djvu-0.7.12.my/configure.ac +--- pdf2djvu-0.7.12/configure.ac 2012-01-22 03:16:50.000000000 +0400 ++++ pdf2djvu-0.7.12.my/configure.ac 2012-05-17 20:43:37.000000000 +0400 +@@ -225,7 +225,7 @@ + AX_CXXFLAGS_WARN_ALL(CXXFLAGS) + if test "$GXX" = yes + then +- CXXFLAGS="$CXXFLAGS -Werror=overloaded-virtual" ++ CXXFLAGS="$CXXFLAGS " + fi + + # Output files +diff -wbBur pdf2djvu-0.7.12/pdf-backend.cc pdf2djvu-0.7.12.my/pdf-backend.cc +--- pdf2djvu-0.7.12/pdf-backend.cc 2012-01-22 03:16:50.000000000 +0400 ++++ pdf2djvu-0.7.12.my/pdf-backend.cc 2012-05-17 20:47:24.000000000 +0400 +@@ -32,10 +32,10 @@ + * ====================== + */ + +-static void poppler_error_handler(int pos, char *message, va_list args) ++static void poppler_error_handler(void *data, ErrorCategory ec, int pos, char *message) + { + std::string format; +- std::string expanded_message = string_vprintf(message, args); ++ std::string expanded_message = message; + const char *c_message = expanded_message.c_str(); + if (pos >= 0) + { +@@ -61,7 +61,7 @@ + Cwd cwd(argv0_dir_name); + #endif + globalParams = new GlobalParams(); +- setErrorFunction(poppler_error_handler); ++ setErrorCallback(poppler_error_handler, 0); + } + + void pdf::Environment::set_antialias(bool value) +diff -wbBur pdf2djvu-0.7.12/pdf2djvu.cc pdf2djvu-0.7.12.my/pdf2djvu.cc +--- pdf2djvu-0.7.12/pdf2djvu.cc 2012-01-22 03:16:50.000000000 +0400 ++++ pdf2djvu-0.7.12.my/pdf2djvu.cc 2012-05-17 20:55:07.000000000 +0400 +@@ -1387,13 +1387,13 @@ + debug(0)++; + } + out1.reset(new pdf::Renderer(paper_color, config.monochrome)); +- out1->startDoc(doc->getXRef()); ++ out1->startDoc((PDFDoc*)doc->getXRef()); + outm.reset(new MutedRenderer(paper_color, config.monochrome, *page_files)); +- outm->startDoc(doc->getXRef()); ++ outm->startDoc((PDFDoc*)doc->getXRef()); + if (!config.monochrome) + { + outs.reset(new MutedRenderer(paper_color, config.monochrome, *page_files)); +- outs->startDoc(doc->getXRef()); ++ outs->startDoc((PDFDoc*)doc->getXRef()); + } + } + assert(doc.get() != NULL); diff --git a/community/powertop/powertop-1.13-with-3.0.6.patch b/community/powertop/powertop-1.13-with-3.0.6.patch deleted file mode 100644 index fc61913a8..000000000 --- a/community/powertop/powertop-1.13-with-3.0.6.patch +++ /dev/null @@ -1,142 +0,0 @@ -Common subdirectories: powertop-1.13/kernel-patches and powertop-patched/kernel-patches -Common subdirectories: powertop-1.13/po and powertop-patched/po -diff -u powertop-1.13/powertop.c powertop-patched/powertop.c ---- powertop-1.13/powertop.c 2010-07-20 01:08:21.000000000 +0200 -+++ powertop-patched/powertop.c 2011-10-20 14:34:41.163951192 +0200 -@@ -547,95 +547,6 @@ - qsort (lines, linehead, sizeof (struct line), line_compare); - } - -- -- --int print_battery_proc_acpi(void) --{ -- DIR *dir; -- struct dirent *dirent; -- FILE *file; -- double rate = 0; -- double cap = 0; -- -- char filename[256]; -- -- dir = opendir("/proc/acpi/battery"); -- if (!dir) -- return 0; -- -- while ((dirent = readdir(dir))) { -- int dontcount = 0; -- double voltage = 0.0; -- double amperes_drawn = 0.0; -- double watts_drawn = 0.0; -- double amperes_left = 0.0; -- double watts_left = 0.0; -- char line[1024]; -- -- if (strlen(dirent->d_name) < 3) -- continue; -- -- sprintf(filename, "/proc/acpi/battery/%s/state", dirent->d_name); -- file = fopen(filename, "r"); -- if (!file) -- continue; -- memset(line, 0, 1024); -- while (fgets(line, 1024, file) != NULL) { -- char *c; -- if (strstr(line, "present:") && strstr(line, "no")) -- break; -- -- if (strstr(line, "charging state:") -- && !strstr(line, "discharging")) -- dontcount = 1; -- c = strchr(line, ':'); -- if (!c) -- continue; -- c++; -- -- if (strstr(line, "present voltage")) -- voltage = strtoull(c, NULL, 10) / 1000.0; -- -- if (strstr(line, "remaining capacity") && strstr(c, "mW")) -- watts_left = strtoull(c, NULL, 10) / 1000.0; -- -- if (strstr(line, "remaining capacity") && strstr(c, "mAh")) -- amperes_left = strtoull(c, NULL, 10) / 1000.0; -- -- if (strstr(line, "present rate") && strstr(c, "mW")) -- watts_drawn = strtoull(c, NULL, 10) / 1000.0 ; -- -- if (strstr(line, "present rate") && strstr(c, "mA")) -- amperes_drawn = strtoull(c, NULL, 10) / 1000.0; -- -- } -- fclose(file); -- -- if (!dontcount) { -- rate += watts_drawn + voltage * amperes_drawn; -- } -- cap += watts_left + voltage * amperes_left; -- -- -- } -- closedir(dir); -- if (prev_bat_cap - cap < 0.001 && rate < 0.001) -- last_bat_time = 0; -- if (!last_bat_time) { -- last_bat_time = prev_bat_time = time(NULL); -- last_bat_cap = prev_bat_cap = cap; -- } -- if (time(NULL) - last_bat_time >= 400) { -- prev_bat_cap = last_bat_cap; -- prev_bat_time = last_bat_time; -- last_bat_time = time(NULL); -- last_bat_cap = cap; -- } -- -- show_acpi_power_line(rate, cap, prev_bat_cap - cap, time(NULL) - prev_bat_time); -- return 1; --} -- - int print_battery_proc_pmu(void) - { - char line[80]; -@@ -719,9 +630,6 @@ - - char filename[256]; - -- if (print_battery_proc_acpi()) -- return; -- - if (print_battery_proc_pmu()) - return; - -@@ -733,7 +641,6 @@ - while ((dirent = readdir(dir))) { - int dontcount = 0; - double voltage = 0.0; -- double amperes_drawn = 0.0; - double watts_drawn = 0.0; - double watts_left = 0.0; - char line[1024]; -@@ -790,8 +697,12 @@ - watts_left *= strtoull(line, NULL, 10) / 1000000.0; - fclose(file); - -- sprintf(filename, "/sys/class/power_supply/%s/current_now", dirent->d_name); -+ sprintf(filename, "/sys/class/power_supply/%s/power_now", dirent->d_name); - file = fopen(filename, "r"); -+ if (!file) { -+ sprintf(filename, "/sys/class/power_supply/%s/current_now", dirent->d_name); -+ file = fopen(filename, "r"); -+ } - if (!file) - continue; - memset(line, 0, 1024); -@@ -801,7 +712,7 @@ - fclose(file); - - if (!dontcount) { -- rate += watts_drawn + voltage * amperes_drawn; -+ rate += watts_drawn; - } - cap += watts_left; - diff --git a/community/python-pyproj/PKGBUILD b/community/python-pyproj/PKGBUILD new file mode 100644 index 000000000..c066a372d --- /dev/null +++ b/community/python-pyproj/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 71233 2012-05-25 14:39:53Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> + +pkgbase=python-pyproj +pkgname=('python-pyproj' 'python2-pyproj') +pkgver=1.9.0 +pkgrel=1 +pkgdesc="Python interfaces to PROJ.4 library" +arch=('i686' 'x86_64') +url="http://code.google.com/p/pyproj" +license=('custom') +source=(http://pyproj.googlecode.com/files/pyproj-${pkgver}.tar.gz) +makedepends=('python' 'python2') +sha1sums=('9a49ff24dbf88d725adddd1ba255609b558e6b03') + +build() { + cd "${srcdir}" + + cp -a pyproj-${pkgver}{,-python2} + + # Build python 3 module + cd pyproj-${pkgver} + python setup.py build + + # Build python 2 module + cd ../pyproj-${pkgver}-python2 + python2 setup.py build +} + +package_python-pyproj() { + depends=('proj' 'python>=3.2') + + cd "${srcdir}"/pyproj-${pkgver} + python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build + + install -dm755 "${pkgdir}"/usr/share/licenses/${pkgname} + install -m644 LICENSE_proj4 "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} + +package_python2-pyproj() { + depends=('proj' 'python2>=2.7') + replaces=('pyproj') + + cd "${srcdir}"/pyproj-${pkgver}-python2 + python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build + + install -dm755 "${pkgdir}"/usr/share/licenses/${pkgname} + install -m644 LICENSE_proj4 "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/community/python-pyzmq/PKGBUILD b/community/python-pyzmq/PKGBUILD index d957ed58f..78ff87669 100644 --- a/community/python-pyzmq/PKGBUILD +++ b/community/python-pyzmq/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 61127 2011-12-22 03:57:10Z kkeen $ +# $Id: PKGBUILD 71478 2012-05-27 09:02:29Z kkeen $ # Maintainer: Kyle Keen <keenerd at gmail dot com> pkgname=python-pyzmq -pkgver=2.1.11 +pkgver=2.2.0 pkgrel=1 pkgdesc="Python3 bindings for zeromq, written in Cython" arch=(i686 x86_64) @@ -9,9 +9,9 @@ url="http://www.zeromq.org/bindings:python" license=('LGPL') depends=(zeromq python) source=(https://github.com/zeromq/pyzmq/downloads/pyzmq-$pkgver.tar.gz) -md5sums=('8ce303d022a1043669d4f239cddca746') +md5sums=('100b73973d6fb235b8da6adea403566e') build() { cd "$srcdir/pyzmq-$pkgver" - python3 setup.py install --root="$pkgdir" --optimize=1 + python3 setup.py install --root="$pkgdir" --optimize=0 } diff --git a/community/python2-ldap/setup.cfg.patch b/community/python2-ldap/setup.cfg.patch deleted file mode 100644 index 77444c04a..000000000 --- a/community/python2-ldap/setup.cfg.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- setup.cfg 2006-11-15 20:26:26.000000000 +0300 -+++ setup.cfg.my 2007-06-25 16:19:24.000000000 +0400 -@@ -7,14 +7,14 @@ - # for wrapping OpenLDAP 2 libs - [_ldap] - --library_dirs = /usr/local/openldap-2.3/lib --include_dirs = /usr/local/openldap-2.3/include /usr/include/sasl -+library_dirs = /usr/lib -+include_dirs = /usr/include /usr/include/sasl - - extra_compile_args = - extra_objects = - - # Example for sparse build: basic functionality --#libs = ldap lber -+libs = ldap lber - - # Some Linux systems might need explicitly linking with -lresolv - #libs = ldap lber resolv -@@ -31,10 +31,10 @@ - optimize = 1 - - # Linux distributors/packagers should adjust these settings --[bdist_rpm] --provides = python-ldap --requires = python libldap.so.2 -+#[bdist_rpm] -+#provides = python-ldap -+#requires = python libldap.so.2 - # distribution_name = --release = 0 --packager = Michael Stroeder <michael@stroeder.com> --doc_files = CHANGES README INSTALL TODO Demo/ -+#release = 0 -+#packager = Michael Stroeder <michael@stroeder.com> -+#doc_files = CHANGES README INSTALL TODO Demo/ diff --git a/community/python2-pyzmq/PKGBUILD b/community/python2-pyzmq/PKGBUILD index 8ac19b91b..32fd23136 100644 --- a/community/python2-pyzmq/PKGBUILD +++ b/community/python2-pyzmq/PKGBUILD @@ -1,6 +1,7 @@ +# $Id: PKGBUILD 71479 2012-05-27 09:07:00Z kkeen $ # Maintainer: Kyle Keen <keenerd at gmail dot com> pkgname=python2-pyzmq -pkgver=2.1.11 +pkgver=2.2.0 pkgrel=1 pkgdesc="Python2 bindings for zeromq, written in Cython" arch=(i686 x86_64) @@ -8,10 +9,10 @@ url="http://www.zeromq.org/bindings:python" license=('LGPL') depends=(zeromq python2) source=(https://github.com/zeromq/pyzmq/downloads/pyzmq-$pkgver.tar.gz) -md5sums=('8ce303d022a1043669d4f239cddca746') +md5sums=('100b73973d6fb235b8da6adea403566e') build() { cd "$srcdir/pyzmq-$pkgver" sed -i 's|^#!/usr/bin/env python$|&2|' $(find ./ -name '*.py') - python2 setup.py install --root="$pkgdir" --optimize=1 + python2 setup.py install --root="$pkgdir" --optimize=0 } diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD index 6bd216ba3..b7d8b4540 100644 --- a/community/qmmp/PKGBUILD +++ b/community/qmmp/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 68175 2012-03-18 20:53:22Z jlichtblau $ +#$Id: PKGBUILD 71311 2012-05-26 14:22:36Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=qmmp -pkgver=0.5.4 +pkgver=0.5.5 pkgrel=1 pkgdesc="Qt4 based audio-player" arch=('i686' 'x86_64' 'mips64el') @@ -22,7 +22,7 @@ optdepends=('flac: native FLAC support' 'ffmpeg' 'libsamplerate' 'wavpack') install=$pkgname.install source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2) -sha256sums=('6f95d1bb97cb1ef91b9d664f4d5ce013c6cc93f3aefb24cd64cf2500a525be0f') +sha256sums=('525d7528c58c885e45149f698125dfff6bedca0e9af979b2490e3f0b902943a6') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/qmmp/qmmp.changelog b/community/qmmp/qmmp.changelog index a69c0df58..04be7b9e8 100644 --- a/community/qmmp/qmmp.changelog +++ b/community/qmmp/qmmp.changelog @@ -1,3 +1,6 @@ +2012-05-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qmmp 0.5.5-1 + 2012-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qmmp 0.5.4-1 diff --git a/community/sakura/linker.patch b/community/sakura/linker.patch deleted file mode 100644 index 9277461d9..000000000 --- a/community/sakura/linker.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- sakura-3.0.0/CMakeLists.txt.bak 2012-02-29 22:50:16.786701967 +0100 -+++ sakura-3.0.0/CMakeLists.txt 2012-02-29 22:50:26.323368673 +0100 -@@ -43,7 +43,7 @@ - - INCLUDE_DIRECTORIES (. ${GTK_INCLUDE_DIRS} ${VTE_INCLUDE_DIRS}) - LINK_DIRECTORIES (${GTK_LIBRARY_DIRS} ${VTE_LIBRARY_DIRS}) --LINK_LIBRARIES (${GTK_LIBRARIES} ${VTE_LIBRARIES}) -+LINK_LIBRARIES (${GTK_LIBRARIES} ${VTE_LIBRARIES} -lm) - ADD_EXECUTABLE (sakura src/sakura.c) - ADD_DEPENDENCIES (sakura src/sakura.c src/sakura.h) - diff --git a/community/springlobby/PKGBUILD b/community/springlobby/PKGBUILD index 7414ae8d3..020f8a798 100644 --- a/community/springlobby/PKGBUILD +++ b/community/springlobby/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68098 2012-03-18 05:46:56Z svenstaro $ +# $Id: PKGBUILD 71324 2012-05-26 15:26:22Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: DuGi <dugi@irc.pl> pkgname=springlobby -pkgver=0.144 +pkgver=0.147 pkgrel=1 pkgdesc="A free cross-platform lobby client for the Spring RTS project." arch=('i686' 'x86_64' 'mips64el') @@ -14,12 +14,12 @@ optdepends=('sdl' 'sdl_sound' 'sdl_mixer') makedepends=('boost' 'asio' 'cmake') install=springlobby.install source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2) -md5sums=('facde8ab25100e50be5fc9b33deceb5c') +md5sums=('1dd17f3f573d40b10b66bdbdc77181f0') build() { cd $srcdir/${pkgname}-$pkgver - export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" + #export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" sed -i 's/boost_system-mt/boost_system/g' $srcdir/$pkgname-$pkgver/CMakeLists.txt diff --git a/community/sslh/sslh.service b/community/sslh/sslh.service deleted file mode 100644 index 7ccad70e9..000000000 --- a/community/sslh/sslh.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=SSL/SSH multiplexer - -[Service] -EnvironmentFile=/etc/conf.d/sslh -ExecStart=/usr/bin/sslh --foreground $DAEMON_OPTS - -[Install] -WantedBy=multi-user.target diff --git a/community/sword/PKGBUILD b/community/sword/PKGBUILD deleted file mode 100644 index 7ddc1d49a..000000000 --- a/community/sword/PKGBUILD +++ /dev/null @@ -1,63 +0,0 @@ -# $Id: PKGBUILD 69772 2012-04-23 09:16:25Z ibiru $ -# Maintainer: Alexander Rødseth -# Contributor: Andrea Scarpino -# Contributor: Stefan Husmann <stefan-husmann@t-online.de> -# Contributor: TripleE <eric1548@yahoo.com> - -pkgname=sword -pkgver=1.6.2 -pkgrel=7 -pkgdesc="Library for Bible study programs" -arch=('x86_64' 'i686' 'mips64el') -url="http://www.crosswire.org/sword/" -license=('GPL') -depends=('curl' 'clucene' 'swig') -makedepends=('cmake') -backup=('etc/sword.conf') -source=("http://www.crosswire.org/ftpmirror/pub/$pkgname/source/v1.6/$pkgname-$pkgver.tar.gz" - "curl.patch") -sha256sums=('af76c7d54135c444b09eeaafb49229ef5201a4e1d44539d9341dceaeb60a87b9' - '3c2676b6dc1d56b08b2532f46af32c54e91ea71ed92a5d7a30ee29ed7ff09124') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - patch -p1 -i ../curl.patch - - mkdir ../build - cd ../build - - CXXFLAGS=-fpermissive cmake "../$pkgname-$pkgver" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release - make -} - -package() { - cd "$srcdir/build" - - make DESTDIR="$pkgdir" install - - install -d "$pkgdir/usr/lib/sword" - mv "$pkgdir"/usr/lib/${pkgver}_icu_* \ - "$pkgdir/usr/lib/sword/" - - cd "$srcdir/$pkgname-$pkgver/locales.d/" - for file in *.conf; do - install -Dm644 "$file" \ - "$pkgdir/usr/share/sword/locales.d/$file" - done - - cd ../include - install -d "$pkgdir/usr/include/sword" - install -Dm644 canon_{catholic{,2},synodalp}.h \ - "$pkgdir/usr/include/sword" - - cd ../samples - install -Dm644 mods.d/globals.conf \ - "$pkgdir/usr/share/sword/mods.d/globals.conf" - install -Dm644 recommended/sword.conf \ - "$pkgdir/etc/sword.conf" -} - -# vim:set ts=2 sw=2 et: diff --git a/community/sword/curl.patch b/community/sword/curl.patch deleted file mode 100644 index 63fd4433c..000000000 --- a/community/sword/curl.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur sword-1.6.2.orig/src/mgr/curlftpt.cpp sword-1.6.2.new/src/mgr/curlftpt.cpp ---- sword-1.6.2.orig/src/mgr/curlftpt.cpp 2011-07-27 00:41:40.000000000 +0200 -+++ sword-1.6.2.new/src/mgr/curlftpt.cpp 2011-07-27 00:42:05.000000000 +0200 -@@ -26,7 +26,6 @@ - #include <fcntl.h> - - #include <curl/curl.h> --#include <curl/types.h> - #include <curl/easy.h> - - #include <swlog.h> -diff -Naur sword-1.6.2.orig/src/mgr/curlhttpt.cpp sword-1.6.2.new/src/mgr/curlhttpt.cpp ---- sword-1.6.2.orig/src/mgr/curlhttpt.cpp 2011-07-27 00:41:40.000000000 +0200 -+++ sword-1.6.2.new/src/mgr/curlhttpt.cpp 2011-07-27 00:42:45.000000000 +0200 -@@ -25,7 +25,6 @@ - #include <cctype> - - #include <curl/curl.h> --#include <curl/types.h> - #include <curl/easy.h> - - #include <swlog.h> diff --git a/community/tellico/PKGBUILD b/community/tellico/PKGBUILD index 186518a6f..d4725a53a 100644 --- a/community/tellico/PKGBUILD +++ b/community/tellico/PKGBUILD @@ -1,37 +1,38 @@ -# $Id: PKGBUILD 62153 2012-01-16 21:08:22Z andrea $ -# Maintainer: Ray Rashif <schiv@archlinux.org +# $Id: PKGBUILD 71282 2012-05-26 07:55:16Z pschmitz $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Maintainer: Ray Rashif <schiv@archlinux.org # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> pkgname=tellico pkgver=2.3.5 -pkgrel=1 +pkgrel=2 pkgdesc="A collection manager for KDE" arch=('i686' 'x86_64' 'mips64el') url="http://tellico-project.org/" license=('GPL') -depends=('kdebase-workspace' 'yaz' 'exempi' 'libksane' 'taglib' - 'kdemultimedia-kioslave' 'poppler-qt' 'qjson') +depends=('kdebase-workspace' 'yaz' 'exempi' 'libksane' 'taglib' 'kdemultimedia-kioslave' 'poppler-qt' 'qjson') makedepends=('automoc4' 'cmake') install=$pkgname.install -source=("http://tellico-project.org/files/${pkgname}-${pkgver}.tar.bz2") -md5sums=('e6a1835d2622b79c4bfd95271bce858e') +source=(http://tellico-project.org/files/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('b31db35589cae7f9af56a17e6589f8c5de68e36d9fc5fbaea4154e8238bf041c') build() { - cd "${srcdir}" + cd ${srcdir} + mkdir build cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr - make } package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install + cd ${srcdir}/build + + make DESTDIR=${pkgdir} install - # fix python 2.7 path - find "$pkgdir" -iname "*.py" | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' +# fix python 2.7 path + find ${pkgdir} -iname "*.py" | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' } diff --git a/community/tellico/tellico.install b/community/tellico/tellico.install index 3f06b8deb..3b3aff7d9 100644 --- a/community/tellico/tellico.install +++ b/community/tellico/tellico.install @@ -1,12 +1,13 @@ post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-mime-database usr/share/mime &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q } post_upgrade() { - post_install + post_install } post_remove() { - post_install + post_install } diff --git a/community/tnef/PKGBUILD b/community/tnef/PKGBUILD index e1e521a55..781f88de4 100644 --- a/community/tnef/PKGBUILD +++ b/community/tnef/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 55067 2011-09-01 21:53:31Z spupykin $ +# $Id: PKGBUILD 71507 2012-05-27 19:58:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jeffrey 'jf' Lim <jfs.world@gmail.com> pkgname=tnef -pkgver=1.4.8 +pkgver=1.4.9 pkgrel=1 arch=(i686 x86_64 'mips64el') pkgdesc="Program which operates like tar to unpack the files inside an ms-tnef MIME attachment" @@ -11,7 +11,7 @@ url="http://sourceforge.net/projects/tnef/" license=('GPL') depends=() source=(http://downloads.sourceforge.net/project/tnef/tnef/tnef-$pkgver.tar.gz) -md5sums=('cc6443ac5f30913394c0c16ae7941e4f') +md5sums=('83a3a8fe0c15c9bbe2a8dae74c46b761') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/tor/PKGBUILD b/community/tor/PKGBUILD index ab0cdf7ca..680ef00a1 100644 --- a/community/tor/PKGBUILD +++ b/community/tor/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 60672 2011-12-16 19:10:49Z lfleischer $ +# $Id: PKGBUILD 71511 2012-05-27 21:52:24Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: simo <simo@archlinux.org> pkgname=tor -pkgver=0.2.2.35 +pkgver=0.2.2.36 pkgrel=1 pkgdesc='Anonymizing overlay network.' arch=('i686' 'x86_64' 'mips64el') @@ -20,8 +20,8 @@ source=("http://www.torproject.org/dist/${pkgname}-${pkgver}.tar.gz"{,.asc} 'torrc' 'tor' 'tor.conf.d') -md5sums=('dcecf699c4b929319d5f1ce0358d4835' - '73472ede84e22f8e3589baf47b0f4427' +md5sums=('620b2110086aba01236b57f1d5aba416' + '0401cf01ad0bcc9aba4f9c1bb5e8e810' '56c75d4e8a66f34167d31e38c43793dd' 'f8e6868a389877346e7eebaacd1078bb' '5c7c6834064b3530c442def6079ac3aa') diff --git a/community/twinkle/PKGBUILD b/community/twinkle/PKGBUILD deleted file mode 100644 index 95160b25e..000000000 --- a/community/twinkle/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 67220 2012-03-05 09:00:06Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Jeff Mickey <jeff@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> -# Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> -# Contributor: Alexander Rødseth <rodseth@gmail.com> - -pkgname=twinkle -pkgver=1.4.2 -pkgrel=15 -pkgdesc="Softphone for voice over IP and IM communication using SIP" -arch=('x86_64' 'i686') -url="http://www.twinklephone.com/" -license=('GPL') -depends=('file' 'speex' 'boost-libs' 'libsndfile' 'qt3' 'libzrtpcpp') -makedepends=('pkg-config' 'boost') -source=("http://www.xs4all.nl/~mfnboer/$pkgname/download/$pkgname-$pkgver.tar.gz" - "twinkle.desktop") -sha256sums=('807686c7ac1b54bb0ea27ff4be362db6926d1d3d6f1802f6d359a353157e89a5' - '88578b314f434d88ef387ee8bf541dcdd4dfeffba161c1c66e43ac54103b3862') -sha256sums=('807686c7ac1b54bb0ea27ff4be362db6926d1d3d6f1802f6d359a353157e89a5' - '88578b314f434d88ef387ee8bf541dcdd4dfeffba161c1c66e43ac54103b3862') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - . /etc/profile.d/qt3.sh - ./configure --prefix=/usr \ - --without-kde \ - --with-speex \ - --without-ilbc \ - --mandir=/usr/share/man - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - install -Dm644 "$pkgdir/usr/share/twinkle/twinkle48.png" \ - "$pkgdir/usr/share/pixmaps/twinkle.png" - install -Dm644 twinkle.desktop \ - "$pkgdir/usr/share/applications/twinkle.desktop" -} - -# vim:set ts=2 sw=2 et: diff --git a/community/twinkle/twinkle.desktop b/community/twinkle/twinkle.desktop deleted file mode 100644 index 60688b5fe..000000000 --- a/community/twinkle/twinkle.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Twinkle -Comment=SIP softphone for Qt -Icon=twinkle.png -Exec=twinkle -Terminal=false -Type=Application -Categories=Network; -StartupNotify=false diff --git a/community/ubuntuone-client/PKGBUILD b/community/ubuntuone-client/PKGBUILD index a3ed20691..6f849987f 100644 --- a/community/ubuntuone-client/PKGBUILD +++ b/community/ubuntuone-client/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 71102 2012-05-24 05:37:26Z bgyorgy $ +# $Id: PKGBUILD 71472 2012-05-27 08:35:40Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=ubuntuone-client pkgver=3.0.1 -pkgrel=1 +pkgrel=3 pkgdesc="Ubuntu One helps you store, sync and share files between your computers" arch=('i686' 'x86_64') url="https://launchpad.net/ubuntuone-client" license=('GPL') -depends=('dbus-glib' 'python2-distribute' 'python2-pyinotify' 'python2-ubuntuone-storageprotocol' 'python2-gobject' 'libnotify' 'python2-configglue' 'ubuntu-sso-client' 'hicolor-icon-theme' 'xdg-utils') +depends=('dbus-glib' 'python2-configglue' 'python2-distribute' 'python2-gobject' 'libnotify' 'python2-gobject2' 'python2-pyinotify' 'python-simplejson' 'ubuntu-sso-client' 'python2-ubuntuone-storageprotocol' 'hicolor-icon-theme' 'xdg-utils') makedepends=('intltool' 'imake' 'gobject-introspection' 'vala') -optdepends=('ubuntu-sso-client-qt: required for first-time log in') +optdepends=('ubuntu-sso-client-qt: required for first-time log in' + 'python2-pyqt: proxy support') options=('!libtool') install=$pkgname.install source=(http://launchpad.net/ubuntuone-client/stable-3-0/$pkgver/+download/$pkgname-$pkgver.tar.gz diff --git a/community/ucommon/PKGBUILD b/community/ucommon/PKGBUILD deleted file mode 100644 index bb002c30a..000000000 --- a/community/ucommon/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 70712 2012-05-15 11:28:13Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Dan Serban -# Contributors: David Zaragoza, Andrea Scarpino - -pkgname=ucommon -pkgver=5.2.2 -pkgrel=1 -pkgdesc="A light-weight C++ library to facilitate using C++ design patterns" -arch=(i686 x86_64) -url=http://ftp.gnu.org/gnu/commoncpp/ -license=(GPL) -depends=(openssl) -makedepends=(lynx) -options=('!libtool') -source=("http://ftp.gnu.org/pub/gnu/commoncpp/ucommon-$pkgver.tar.gz") -md5sums=('4739fcd9db006432f1b8e2ea226e414a') - -build() { - cd $(ls -1d ucommon-*/ | tail -1) - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install -} diff --git a/community/wesnoth/PKGBUILD b/community/wesnoth/PKGBUILD index 1eb194e74..2ff3f497d 100644 --- a/community/wesnoth/PKGBUILD +++ b/community/wesnoth/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 69014 2012-04-08 01:45:27Z svenstaro $ +# $Id: PKGBUILD 71216 2012-05-25 05:03:12Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=wesnoth -pkgver=1.10.2 +pkgver=1.10.3 pkgrel=1 pkgdesc="A turn-based strategy game on a fantasy world" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ options=(!emptydirs) source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 wesnoth.tmpfiles.conf wesnothd.rc.d) -md5sums=('61f93437ba13a27a048e5ee2ee63736a' +md5sums=('b25354c71d58f82c2c60cc12c6f09c36' 'b8122f5054e3895c9c054e87460869dc' '85659b47d22dfdf4e4d046556973fc3e') diff --git a/community/wings3d/wings3d b/community/wings3d/wings3d deleted file mode 100644 index c0fd3b2fb..000000000 --- a/community/wings3d/wings3d +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -erl -noinput -smp disable -pa /usr/lib/erlang/lib/esdl-*/ebin /usr/lib/wings3d/ebin -run wings_start start_halt ${1+"$@"} diff --git a/community/xiphos/PKGBUILD b/community/xiphos/PKGBUILD deleted file mode 100755 index 66db90eaf..000000000 --- a/community/xiphos/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 66596 2012-02-26 13:44:26Z arodseth $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Andrea Scarpino -# Contributor: Stefan Husmann <stefan-husmann@t-online.de> -# Contributor: TripleE <eric1548@yahoo.com> - -pkgname=xiphos -pkgver=3.1.5 -pkgrel=2 -pkgdesc="Bible study tool for GTK+" -arch=('x86_64' 'i686' 'mips64el') -url="http://xiphos.org/" -license=('GPL') -depends=('libgsf' 'libglade' 'gtkhtml' 'sword') -makedepends=('gnome-doc-utils' 'intltool' 'python2') -conflicts=('gnomesword') -provides=('gnomesword') -replaces=('gnomesword') -install=xiphos.install -source=("http://downloads.sourceforge.net/gnomesword/$pkgname-$pkgver.tar.gz") -sha256sums=('2887426908e269f25d2d191be445112027b2b7e80356823d4942b1803a359d8c') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - sed -i '0,/on/s//on2/' waf - CXXFLAGS+=" -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1" ./waf configure --prefix=/usr --enable-gtkhtml - ./waf build --prefix=/usr -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 ./waf install --destdir="$pkgdir" -} - -# vim:set ts=2 sw=2 et: diff --git a/community/xiphos/xiphos.install b/community/xiphos/xiphos.install deleted file mode 100644 index 048e77780..000000000 --- a/community/xiphos/xiphos.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - -# vim:set ts=2 sw=2 et: |