From 8831500349d38b0b1afcb74ada3f6878c31fb6ef Mon Sep 17 00:00:00 2001 From: root Date: Sun, 2 Jun 2013 00:52:43 -0700 Subject: Sun Jun 2 00:52:37 PDT 2013 --- community/avrdude/PKGBUILD | 6 +- community/go/PKGBUILD | 8 ++- community/jack2/PKGBUILD | 30 +++++----- community/openttd/PKGBUILD | 8 +-- community/pekwm/PKGBUILD | 10 ++-- community/scummvm/PKGBUILD | 4 +- community/ussp-push/PKGBUILD | 19 +++++-- community/ussp-push/build-fix.patch | 66 ++++++++++++++++++++++ community/ussp-push/ussp-push-remote-name.patch | 12 ---- extra/five-or-more/PKGBUILD | 6 +- extra/libburn/PKGBUILD | 10 ++-- extra/libkgapi/PKGBUILD | 6 +- extra/libxext/PKGBUILD | 7 ++- extra/libxrandr/PKGBUILD | 6 +- extra/libxv/PKGBUILD | 7 ++- extra/live-media/PKGBUILD | 6 +- extra/obex-data-server/PKGBUILD | 15 +++-- .../obex-data-server-openobex17.patch | 12 ++++ extra/obexftp/PKGBUILD | 43 ++++++++------ extra/openobex/PKGBUILD | 48 ++++++++++------ extra/system-config-printer/PKGBUILD | 8 +-- pcr/heartbeat/PKGBUILD | 10 ++-- pcr/pacemaker/PKGBUILD | 15 ++--- 23 files changed, 235 insertions(+), 127 deletions(-) create mode 100644 community/ussp-push/build-fix.patch delete mode 100644 community/ussp-push/ussp-push-remote-name.patch create mode 100644 extra/obex-data-server/obex-data-server-openobex17.patch diff --git a/community/avrdude/PKGBUILD b/community/avrdude/PKGBUILD index 7925992d9..9262a5e85 100644 --- a/community/avrdude/PKGBUILD +++ b/community/avrdude/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 87805 2013-04-06 19:56:39Z jelle $ +# $Id: PKGBUILD 92157 2013-06-01 20:12:04Z jelle $ # Contributor: Corrado Primier # Maintainer: Brad Fanella pkgname=avrdude pkgver=5.11.1 -pkgrel=3 +pkgrel=4 pkgdesc="Download/upload/manipulate the ROM and EEPROM contents of AVR microcontrollers" arch=('i686' 'x86_64') url="http://www.nongnu.org/avrdude/" license=('GPL') -depends=('libusb-compat' 'readline' 'libftdi') +depends=('libusbx' 'readline' 'libftdi') source=(http://download.savannah.gnu.org/releases/avrdude/${pkgname}-${pkgver}.tar.gz{,.sig}) md5sums=('3a43e288cb32916703b6945e3f260df9' '0c23b005d4090aef4e081476aabc1958') diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index 83d3d3ca6..893980c5e 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91709 2013-05-26 13:26:56Z arodseth $ +# $Id: PKGBUILD 92140 2013-06-01 11:07:18Z arodseth $ # Maintainer: Vesa Kaihlavirta # Maintainer: Alexander Rødseth # Contributor: Rémy Oudompheng @@ -8,11 +8,11 @@ # Contributor: Mike Rosset # Contributor: Daniel YC Lin -# TODO: Create split packages for the crosscompilation versions as well? +# TODO: Create split packages for the crosscompilation versions as well? (just maybe) pkgname=go pkgver=1.1 -pkgrel=2 +pkgrel=3 epoch=2 pkgdesc='Google Go compiler and tools' arch=('x86_64' 'i686') @@ -137,6 +137,8 @@ package() { rm -f $pkgdir/usr/share/go/doc/articles/wiki/get.bin install -Dm644 VERSION $pkgdir/usr/lib/go/VERSION + + find "$pkgdir/usr/lib/go/pkg" -type f -exec touch '{}' + } # vim:set ts=2 sw=2 et: diff --git a/community/jack2/PKGBUILD b/community/jack2/PKGBUILD index 0546e39df..d8ad4d636 100644 --- a/community/jack2/PKGBUILD +++ b/community/jack2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84828 2013-02-25 06:15:43Z schiv $ +# $Id: PKGBUILD 92144 2013-06-01 12:22:16Z schiv $ # Maintainer: Ray Rashif # Contributor: Daniele Paolella # Contributor: Philipp Überbacher @@ -9,12 +9,12 @@ pkgname=('jack2' 'jack2-dbus') #pkgname= # single build (overrides split) _tarname=jack pkgver=1.9.9.5 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://jackaudio.org/" backup=(etc/security/limits.d/99-audio.conf) license=('GPL') -makedepends=('python2' 'libffado' 'celt' 'libsamplerate') +makedepends=('python2' 'libffado' 'celt' 'opus' 'libsamplerate') source=("https://dl.dropbox.com/u/28869550/jack-1.9.9.5.tar.bz2" '99-audio.conf' '40-hpet-permissions.rules') @@ -22,6 +22,10 @@ md5sums=('6c9de6b89db9d7076fa2ce222816cf4c' 'ae65b7c9ebe0fff6c918ba9d97ae342d' '471aad533ff56c5d3cbbf65ce32cadef') +_isbuild() { + printf "%s\n" ${pkgname[@]} | grep -qx $1 +} + _pyfix() { sed -i 's:bin/env python:bin/env python2:' \ "$pkgdir/usr/bin/jack_control" @@ -36,24 +40,24 @@ _wafconf() { # see https://github.com/jackaudio/jack2/issues/22 } -_isbuild() { - printf "%s\n" ${pkgname[@]} | grep -qx $1 -} - -build() { +prepare() { cd "$srcdir" # Some optimisation bug exists for current GCC # see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53663 - export CFLAGS="${CFLAGS/-O[0-9]/-O0}" - export CXXFLAGS="$CFLAGS" + #export CFLAGS="${CFLAGS/-O[0-9]/-O0}" + #export CXXFLAGS="$CFLAGS" # fix doxygen building - # TODO: report upstream, but redundant until gihub issue 22 resolves + # TODO: report upstream, but redundant until github issue 22 resolves #sed -i 's:build/default/html:html:' $_tarname-$pkgver/wscript # we may do 2 different builds cp -r $_tarname-$pkgver $_tarname-dbus-$pkgver +} + +build() { + cd "$srcdir" # mixed dbus/classic build if _isbuild jack2; then @@ -78,7 +82,7 @@ package_jack2() { ! _isbuild jack2 && return 0 pkgdesc="The next-generation JACK with SMP support" - depends=('libsamplerate' 'celt' 'libffado') + depends=('libsamplerate' 'celt' 'opus' 'libffado') optdepends=('python2: jack_control') conflicts=('jack') provides=('jack' 'jackmp' 'jackdmp' 'jackdbus') @@ -103,7 +107,7 @@ package_jack2-dbus() { ! _isbuild jack2-dbus && return 0 pkgdesc="The next-generation JACK with SMP support (for D-BUS interaction only)" - depends=('libsamplerate' 'celt' 'libffado') + depends=('libsamplerate' 'celt' 'opus' 'libffado') optdepends=('python2: jack_control') conflicts=('jack' 'jack2') provides=('jack' 'jack2' 'jackmp' 'jackdmp' 'jackdbus') diff --git a/community/openttd/PKGBUILD b/community/openttd/PKGBUILD index a35b1eca5..42eb89827 100644 --- a/community/openttd/PKGBUILD +++ b/community/openttd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90074 2013-05-06 19:38:57Z foutrelis $ +# $Id: PKGBUILD 92128 2013-06-01 08:22:38Z lcarlier $ # Maintainer: Vesa Kaihlavirta pkgname=openttd -pkgver=1.3.0 -pkgrel=2 +pkgver=1.3.1 +pkgrel=1 pkgdesc='An engine for running Transport Tycoon Deluxe.' arch=('i686' 'x86_64') url='http://www.openttd.org' @@ -13,7 +13,7 @@ install=openttd.install optdepends=('openttd-opengfx: free graphics' 'openttd-opensfx: free soundset') source=("http://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz") -sha256sums=('1a3525186f4486de8193992426690a1fd8c7e4d376a328056b0464a1a5d32080') +sha256sums=('f6cb90e0773dc7bdf01161ded03e48661a65c3f1412b192ae954215aaf26eca2') package() { cd ${pkgname}-${pkgver} diff --git a/community/pekwm/PKGBUILD b/community/pekwm/PKGBUILD index e3f0f0732..478186965 100644 --- a/community/pekwm/PKGBUILD +++ b/community/pekwm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90217 2013-05-09 09:13:19Z foutrelis $ +# $Id: PKGBUILD 92159 2013-06-01 21:53:18Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Kevin Piche # Contributor: Eddie Lozon pkgname=pekwm -pkgver=0.1.16 -pkgrel=5 +pkgver=0.1.17 +pkgrel=1 pkgdesc='Small, fast, functional, and flexible window manager' arch=('x86_64' 'i686') license=('GPL') @@ -29,13 +29,13 @@ backup=(etc/pekwm/autoproperties etc/pekwm/vars) source=("http://www.pekwm.org/projects/pekwm/files/$pkgname-$pkgver.tar.bz2" "${pkgname}_kdm.desktop") -sha256sums=('899eef35d5d1f472dd65a08c180b9719935cb1f42eda7fada6f9b8b551c79c96' +sha256sums=('8a1fd3bf9f38e8c7bb2b2864c090f986b60cec2281ecf1bba462d120fb327d00' '4c1817d328dad84407c9ba7219015eb3be0345be9e98fc03fa693b6b443a8dc6') prepare() { cd "$srcdir" - gendesk + gendesk --pkgname "$pkgname" --pkgdesc "$pkgdesc" } build() { diff --git a/community/scummvm/PKGBUILD b/community/scummvm/PKGBUILD index 7ac13cb3a..edf6e859b 100644 --- a/community/scummvm/PKGBUILD +++ b/community/scummvm/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Manolis Tzanidakis, Petter Gundersen pkgname=scummvm -pkgver=1.5.0 +pkgver=1.6.0 pkgrel=1 pkgdesc="A 'virtual machine' for several classic graphical point-and-click adventure games." arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('GPL') url="http://www.scummvm.org/" depends=('libmad' 'sdl' 'fluidsynth' 'flac' 'faad2' 'libvorbis' 'libmad') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('d71d1df5c8262556fedbe885972fbf6e') +md5sums=('473c151ff44e3db7b603ecacd800a0d2') build() { cd "${srcdir}"/${pkgname}-${pkgver} diff --git a/community/ussp-push/PKGBUILD b/community/ussp-push/PKGBUILD index 5a8f1e3a7..1c4fc9c5d 100644 --- a/community/ussp-push/PKGBUILD +++ b/community/ussp-push/PKGBUILD @@ -1,25 +1,34 @@ -# $Id: PKGBUILD 65357 2012-02-21 02:19:32Z spupykin $ +# $Id: PKGBUILD 92147 2013-06-01 15:32:36Z eric $ # Maintainer: Sergej Pupykin # Maintainer: Giovanni Scafora # Contributor: Alessio 'mOLOk' Bolognino pkgname=ussp-push pkgver=0.11 -pkgrel=4 +pkgrel=6 pkgdesc="OBEX object pusher for Linux" arch=('i686' 'x86_64') license=('GPL2') url="http://xmailserver.org/ussp-push.html" depends=('openobex') source=(http://xmailserver.org/$pkgname-$pkgver.tar.gz - ussp-push-remote-name.patch) + build-fix.patch) md5sums=('5c44983ee27809867041feff6bb4423a' - '3c58795be3a977a5bf7b267f00dde660') + 'b9020ea9bb34b811206366b407f5e3cd') + +prepare() { + cd $srcdir/$pkgname-$pkgver + patch -p1 <$srcdir/build-fix.patch +} build() { cd $srcdir/$pkgname-$pkgver - patch -p1 <$srcdir/ussp-push-remote-name.patch + export LDFLAGS="$LDFLAGS -lopenobex-apps-common" ./configure --prefix=/usr make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } diff --git a/community/ussp-push/build-fix.patch b/community/ussp-push/build-fix.patch new file mode 100644 index 000000000..ae57ca00f --- /dev/null +++ b/community/ussp-push/build-fix.patch @@ -0,0 +1,66 @@ +diff -dupr ussp-push-0.11.old/src/obex_socket.c ussp-push-0.11/src/obex_socket.c +--- ussp-push-0.11.old/src/obex_socket.c 2009-05-15 11:03:34.904797689 +0200 ++++ ussp-push-0.11/src/obex_socket.c 2009-05-15 11:03:45.599797286 +0200 +@@ -197,7 +197,7 @@ static int bt_sock_name2bth(int devid, c + for (i = 0; i < niinf; i++) { + char devname[128]; + +- if (hci_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1, ++ if (hci_read_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1, + devname, 100000) >= 0) { + if (strcasecmp(devname, btname) == 0) { + *btaddr = piinf[i].bdaddr; +diff -wbBur ussp-push-0.11/src/obex_main.c ussp-push-0.11.q/src/obex_main.c +--- ussp-push-0.11/src/obex_main.c 2008-08-25 00:48:53.000000000 +0400 ++++ ussp-push-0.11.q/src/obex_main.c 2013-05-27 14:13:06.533474671 +0400 +@@ -85,41 +85,6 @@ + int bt_debug; + + +- +-/* +- * These two functions are from affix/profiles/obex/obex_io.c +- */ +-int get_filesize(const char *filename) +-{ +- struct stat stats; +- +- stat(filename, &stats); +- return (int) stats.st_size; +-} +- +-uint8_t *easy_readfile(const char *filename, int *file_size) +-{ +- int actual; +- int fd; +- uint8_t *buf; +- +- fd = open(filename, O_RDONLY, 0); +- if (fd == -1) { +- return NULL; +- } +- *file_size = get_filesize(filename); +- printf("name=%s, size=%d\n", filename, *file_size); +- if (!(buf = malloc(*file_size))) { +- return NULL; +- } +- +- actual = read(fd, buf, *file_size); +- close(fd); +- +- *file_size = actual; +- return buf; +-} +- + /* + * This function comes from affix/profiles/obex/obex_client.c .. All I changed + * was a BTERROR() macro. The OBEX_HandleInput() calls inside the loop should +@@ -197,7 +197,7 @@ + *err = -1; + return NULL; + } +- if (!(handle = OBEX_Init(OBEX_TRANS_CUST, obex_event, 0))) { ++ if (!(handle = OBEX_Init(OBEX_TRANS_CUSTOM, obex_event, 0))) { + BTERROR("OBEX_Init failed: %s\n", strerror(errno)); + obex_free(gt); + *err = -1; diff --git a/community/ussp-push/ussp-push-remote-name.patch b/community/ussp-push/ussp-push-remote-name.patch deleted file mode 100644 index 6cc6b7e9b..000000000 --- a/community/ussp-push/ussp-push-remote-name.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -dupr ussp-push-0.11.old/src/obex_socket.c ussp-push-0.11/src/obex_socket.c ---- ussp-push-0.11.old/src/obex_socket.c 2009-05-15 11:03:34.904797689 +0200 -+++ ussp-push-0.11/src/obex_socket.c 2009-05-15 11:03:45.599797286 +0200 -@@ -197,7 +197,7 @@ static int bt_sock_name2bth(int devid, c - for (i = 0; i < niinf; i++) { - char devname[128]; - -- if (hci_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1, -+ if (hci_read_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1, - devname, 100000) >= 0) { - if (strcasecmp(devname, btname) == 0) { - *btaddr = piinf[i].bdaddr; diff --git a/extra/five-or-more/PKGBUILD b/extra/five-or-more/PKGBUILD index 47eefa009..2f1fed450 100644 --- a/extra/five-or-more/PKGBUILD +++ b/extra/five-or-more/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183355 2013-04-21 22:09:04Z heftig $ +# $Id: PKGBUILD 186970 2013-06-01 21:56:36Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot pkgname=five-or-more -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="Remove colored balls from the board by forming lines" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ install=five-or-more.install url="https://live.gnome.org/Five%20or%20more" groups=('gnome-extra') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('a050f472dadbb3f44e5cd5e4ab31058a6058f4ccaa03558311706ec0c052b056') +sha256sums=('d63055c296a73762f68d900c753c5ecbec9b20cc1ed4595feb0b7bee9900c311') build() { cd $pkgname-$pkgver diff --git a/extra/libburn/PKGBUILD b/extra/libburn/PKGBUILD index fdc5df0ac..56ed59f83 100644 --- a/extra/libburn/PKGBUILD +++ b/extra/libburn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185766 2013-05-18 14:53:27Z andyrtr $ +# $Id: PKGBUILD 186945 2013-06-01 10:04:29Z andyrtr $ # Maintainer: Andreas Radke # Contributor: William Rea pkgname=libburn -pkgver=1.3.0 +pkgver=1.3.0.pl01 pkgrel=1 pkgdesc="Library for reading, mastering and writing optical discs" arch=('i686' 'x86_64') @@ -12,17 +12,17 @@ license=('GPL') depends=('glibc') source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig}) options=('!libtool' '!emptydirs') -md5sums=('c06bfec410ef461a994b9a75b2620561' +md5sums=('1ccbb8624b8c2b9937727000e46b52cf' 'SKIP') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgname}-${pkgver/.pl01/} ./configure --prefix=/usr --disable-static make } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgname}-${pkgver/.pl01/} make DESTDIR=${pkgdir} install } diff --git a/extra/libkgapi/PKGBUILD b/extra/libkgapi/PKGBUILD index 5b2339402..0c17f5369 100644 --- a/extra/libkgapi/PKGBUILD +++ b/extra/libkgapi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 186220 2013-05-22 07:15:10Z andrea $ +# $Id: PKGBUILD 186926 2013-06-01 08:09:09Z andrea $ # Maintainer: Andrea Scarpino pkgname=libkgapi -pkgver=2.0.0 +pkgver=2.0.1 pkgrel=1 pkgdesc="A KDE-based library for accessing various Google services via their public API" url='https://projects.kde.org/projects/extragear/libs/libkgapi' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4' 'boost') replaces=('akonadi-google' 'libkgoogle') conflicts=('akonadi-google' 'libkgoogle') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('e7938dcec05b0f73e6a0b24c1674378d') +md5sums=('a421c6b5e0b262136121e3734b29fcce') build() { mkdir build diff --git a/extra/libxext/PKGBUILD b/extra/libxext/PKGBUILD index cfc998d9a..1af3abeda 100644 --- a/extra/libxext/PKGBUILD +++ b/extra/libxext/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 152773 2012-03-09 16:10:15Z andyrtr $ +# $Id: PKGBUILD 186939 2013-06-01 09:47:26Z andyrtr $ +# Maintainer: Andreas Radke # Maintainer: Jan de Groot pkgname=libxext -pkgver=1.3.1 +pkgver=1.3.2 pkgrel=1 pkgdesc="X11 miscellaneous extensions library" arch=('i686' 'x86_64') @@ -12,7 +13,7 @@ depends=('libx11' 'xextproto') makedepends=('xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/libXext-${pkgver}.tar.bz2") -sha1sums=('764ac472ae19a0faade193717a9e0938d3430aaa') +sha256sums=('f829075bc646cdc085fa25d98d5885d83b1759ceb355933127c257e8e50432e0') build() { cd "${srcdir}/libXext-${pkgver}" diff --git a/extra/libxrandr/PKGBUILD b/extra/libxrandr/PKGBUILD index f7fa2718f..1ecec021f 100644 --- a/extra/libxrandr/PKGBUILD +++ b/extra/libxrandr/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165113 2012-08-11 08:21:35Z andyrtr $ +# $Id: PKGBUILD 186941 2013-06-01 09:48:56Z andyrtr $ # Maintainer: Jan de Groot # Maintainer: Andreas Radke # Contributor: Alexander Baldeck pkgname=libxrandr -pkgver=1.4.0 +pkgver=1.4.1 pkgrel=1 pkgdesc="X11 RandR extension library" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('libxext' 'libxrender' 'randrproto>=1.4.0') makedepends=('xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/libXrandr-${pkgver}.tar.bz2) -sha256sums=('033ad0ac2f012afb05268660f6d78705c85f84689f92fa7b47ce12959b15f5c3') +sha256sums=('d914a0490fd0a2ea6c3194505b5b28c56e2a277d8f4648b0275ee0ee370fb905') build() { cd "${srcdir}/libXrandr-${pkgver}" diff --git a/extra/libxv/PKGBUILD b/extra/libxv/PKGBUILD index 4484ad5e2..39d7808fd 100644 --- a/extra/libxv/PKGBUILD +++ b/extra/libxv/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 152795 2012-03-09 16:32:25Z andyrtr $ +# $Id: PKGBUILD 186943 2013-06-01 09:51:55Z andyrtr $ +# Maintainer: Andreas Radke # Maintainer: Jan de Groot pkgname=libxv -pkgver=1.0.7 +pkgver=1.0.8 pkgrel=1 pkgdesc="X11 Video extension library" arch=('i686' 'x86_64') @@ -12,7 +13,7 @@ depends=('libxext' 'videoproto') makedepends=('pkgconfig') options=('!libtool') source=("${url}/releases/individual/lib/libXv-${pkgver}.tar.bz2") -sha1sums=('49c87e0ccb999966b7b1b4e72cb927f05e0835bd') +sha256sums=('4f00eb5347390909cea4e53a69425839d2a6a44e0e0613321d59e7e4aeaf73d7') build() { cd "${srcdir}/libXv-${pkgver}" diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 4b2ea1aff..5fa762982 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184020 2013-05-01 05:23:57Z giovanni $ +# $Id: PKGBUILD 186968 2013-06-01 19:28:52Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Gilles CHAUVIN pkgname=live-media -pkgver=2013.04.30 +pkgver=2013.05.30 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('95533d91bd196e42fd748076dc244b09') +md5sums=('c3f776e18b3aa5f1cafc7a551fcf8059') build() { cd ${srcdir}/live diff --git a/extra/obex-data-server/PKGBUILD b/extra/obex-data-server/PKGBUILD index 409d6ad3f..48aa64667 100644 --- a/extra/obex-data-server/PKGBUILD +++ b/extra/obex-data-server/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180312 2013-03-20 02:35:33Z eric $ +# $Id: PKGBUILD 186962 2013-06-01 15:32:06Z eric $ # Maintainer: Andrea Scarpino # Contributor: Geoffroy Carrier # Contributor: Roman Kyrylych @@ -6,14 +6,21 @@ pkgname=obex-data-server pkgver=0.4.6 -pkgrel=5 +pkgrel=6 pkgdesc="A D-Bus service providing high-level OBEX client and server side functionality" arch=('i686' 'x86_64') url="http://wiki.muiline.com/obex-data-server" license=('GPL') depends=('dbus-glib' 'openobex' 'imagemagick') -source=("http://tadas.dailyda.com/software/${pkgname}-${pkgver}.tar.gz") -md5sums=('961ca5db6fe9c97024e133cc6203cc4d') +source=("http://tadas.dailyda.com/software/${pkgname}-${pkgver}.tar.gz" + "obex-data-server-openobex17.patch") +md5sums=('961ca5db6fe9c97024e133cc6203cc4d' + '4199b3f0178d2b58eb36ee36ed1d07d5') + +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}/obex-data-server-openobex17.patch" +} build() { cd ${pkgname}-${pkgver} diff --git a/extra/obex-data-server/obex-data-server-openobex17.patch b/extra/obex-data-server/obex-data-server-openobex17.patch new file mode 100644 index 000000000..047c46c50 --- /dev/null +++ b/extra/obex-data-server/obex-data-server-openobex17.patch @@ -0,0 +1,12 @@ +diff -Naur obex-data-server-0.4.6-orig/src/ods-obex.c obex-data-server-0.4.6/src/ods-obex.c +--- obex-data-server-0.4.6-orig/src/ods-obex.c 2013-05-29 16:01:54.051692334 -0400 ++++ obex-data-server-0.4.6/src/ods-obex.c 2013-05-29 16:03:23.200697099 -0400 +@@ -412,7 +412,7 @@ + goto err; + } + +- interfaces_num = OBEX_FindInterfaces(obex_context->obex_handle, &obex_intf); ++ interfaces_num = OBEX_EnumerateInterfaces(obex_context->obex_handle); + if (intf_num >= interfaces_num) { + g_set_error (error, ODS_ERROR, ODS_ERROR_FAILED, "Invalid interface number"); + goto err; diff --git a/extra/obexftp/PKGBUILD b/extra/obexftp/PKGBUILD index 806d1a3f2..6d7dfbf7b 100644 --- a/extra/obexftp/PKGBUILD +++ b/extra/obexftp/PKGBUILD @@ -1,35 +1,42 @@ -# $Id: PKGBUILD 143919 2011-11-30 20:53:04Z giovanni $ +# $Id: PKGBUILD 186963 2013-06-01 15:32:07Z eric $ # Maintainer: Giovanni Scafora # Contributor: Alessio 'mOLOk' Bolognino pkgname=obexftp -pkgver=0.23 -pkgrel=5 +pkgver=0.24 +pkgrel=1 pkgdesc="A tool for transfer files to/from any OBEX enabled device" arch=('i686' 'x86_64') url="http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp" license=('GPL') -depends=('openobex' 'python2') -makedepends=('pkg-config') -options=('!libtool') -source=("http://downloads.sourceforge.net/openobex/${pkgname}-${pkgver}.tar.bz2") -md5sums=('f20762061b68bc921e80be4aebc349eb') +depends=('openobex') +makedepends=('cmake' 'asciidoc' 'xmlto' 'fuse' 'swig' 'ruby' 'tk') +optdepends=('ruby: ruby bindings' + 'tk: TCL/Tk bindings') +options=('!makeflags' '!libtool' '!docs') +source=("http://downloads.sourceforge.net/openobex/${pkgname}-${pkgver}-Source.tar.gz") +md5sums=('31a50dbbd09c63cbb5399772aaff7936') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/" - ./configure --prefix=/usr \ - --disable-ruby \ - --enable-python - make + mkdir build + cd build + cmake ../${pkgname}-${pkgver}-Source \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DCMAKE_INSTALL_SBINDIR=bin \ + -DENABLE_PERL=YES \ + -DENABLE_PYTHON=YES \ + -DENABLE_RUBY=YES \ + -DENABLE_TCL=YES + make doc } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/build" make DESTDIR="${pkgdir}" install - - # remove nasty files - # mv ${pkgdir}/usr/lib/perl5/site_perl/5.10.0 ${pkgdir}/usr/lib/perl5/site_perl/current - rm -f ${pkgdir}/usr/lib/perl5/core_perl/perllocal.pod } diff --git a/extra/openobex/PKGBUILD b/extra/openobex/PKGBUILD index e5405c905..d0cb60d64 100644 --- a/extra/openobex/PKGBUILD +++ b/extra/openobex/PKGBUILD @@ -1,34 +1,46 @@ -# $Id: PKGBUILD 150568 2012-02-18 15:04:06Z pierre $ -# Maintainer: Geoffroy Carrier +# $Id: PKGBUILD 186964 2013-06-01 15:32:09Z eric $ +# Maintainer: +# Contributor: Geoffroy Carrier # Contributor: Andrea Scarpino # Contributor: damir pkgname=openobex -pkgver=1.5 -pkgrel=3 +pkgver=1.7 +pkgrel=5 pkgdesc="Implementation of the OBject EXchange (OBEX) protocol" url="http://dev.zuckschwerdt.org/openobex/" arch=('i686' 'x86_64') license=('GPL' 'LGPL') -depends=('bluez' 'libusb-compat') -options=('!libtool') -source=("http://mirror.anl.gov/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2") -md5sums=('fce1b82eafb74bde54fe117372393ba8') +depends=('bluez' 'libusbx') +makedepends=('cmake') +options=('!makeflags') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}-Source.tar.gz) +md5sums=('11031f6f0b876bb6259bd27106491528') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + mkdir build + + cd ${pkgname}-${pkgver}-Source - [ "${CARCH}" = "x86_64" ] && export CFLAGS="${CFLAGS} -fPIC" + # Fix path to obex-check-device in udev rule + # https://bugs.archlinux.org/task/35547 + sed -i 's:/sbin/:/bin/:' udev/openobex.rules.in +} - ./configure --prefix=/usr \ - --enable-apps \ - --enable-irda \ - --enable-bluetooth \ - --enable-usb - make +build() { + cd build + cmake ../${pkgname}-${pkgver}-Source \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DCMAKE_INSTALL_SBINDIR=bin + make all openobex-apps } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd build make DESTDIR="${pkgdir}" install + cp ../${pkgname}-${pkgver}-Source/apps/lib/*.h "${pkgdir}/usr/include/openobex/" + install -m644 apps/lib/libopenobex-apps-common.a "${pkgdir}/usr/lib/libopenobex-apps-common.a" } diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD index f9b67dff1..c2f2c9b30 100644 --- a/extra/system-config-printer/PKGBUILD +++ b/extra/system-config-printer/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 186486 2013-05-27 16:33:02Z eric $ +# $Id: PKGBUILD 186929 2013-06-01 08:46:45Z andrea $ # Maintainer: # Contributor: Andrea Scarpino pkgname=system-config-printer pkgver=1.4.1 -pkgrel=2 +pkgrel=3 pkgdesc="A CUPS printer configuration tool and status applet" url="http://cyberelk.net/tim/software/system-config-printer/" arch=('i686' 'x86_64') license=('GPL') -depends=('pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'libusb-compat' - 'gnome-icon-theme' 'python2-notify' 'python2-gobject' 'dbus-glib' 'gtk3') +depends=('pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'dbus-glib' + 'gnome-icon-theme' 'python2-notify' 'python2-gobject' 'gtk3') makedepends=('intltool' 'xmlto' 'docbook-xsl' 'desktop-file-utils') optdepends=('gnome-keyring: password management') replaces=('system-config-printer-common' 'system-config-printer-gnome') diff --git a/pcr/heartbeat/PKGBUILD b/pcr/heartbeat/PKGBUILD index cf2269d70..f9ee9254b 100644 --- a/pcr/heartbeat/PKGBUILD +++ b/pcr/heartbeat/PKGBUILD @@ -3,7 +3,7 @@ pkgname=heartbeat pkgver=3.0.5 _pkgver=${pkgver::1}_${pkgver:2:1} -pkgrel=9 +pkgrel=10 pkgdesc='Daemon that provides cluster infrastructure services to its clients (Linux-HA)' arch=( i686 @@ -20,10 +20,7 @@ depends=( gnutls cluster-glue ) -optdepends=( - net-tools - openssh -) +optdepends=net-tools makedepends=( docbook-xsl libxslt @@ -186,7 +183,8 @@ package() { cd $srcdir/${pkgname^}-3-0-STABLE-$pkgver setarch $CARCH make DESTDIR=$pkgdir install - rm $pkgdir/etc/rc.d/$pkgname && rmdir $pkgdir/etc/rc.d + mv $pkgdir/{var/,}run + rm $pkgdir/etc/{ha.d/,}rc.d/* && rmdir $pkgdir/etc/{ha.d/,}rc.d install -d $pkgdir/usr/lib/systemd/system echo '[Unit]' > $pkgdir/usr/lib/systemd/system/$pkgname.service diff --git a/pcr/pacemaker/PKGBUILD b/pcr/pacemaker/PKGBUILD index 10d32ad33..7ee8209ad 100644 --- a/pcr/pacemaker/PKGBUILD +++ b/pcr/pacemaker/PKGBUILD @@ -2,7 +2,7 @@ pkgname=pacemaker pkgver=1.1.9 -pkgrel=4 +pkgrel=5 pkgdesc='Cluster resource manager (Linux-HA)' arch=( i686 @@ -15,17 +15,15 @@ license=GPL2 depends=( corosync heartbeat - jre7-openjdk - resource-agent libqb libxslt - #saxon.jar? + resource-agent + #saxon-he ) -optdepens=openssh makedepends=( + asciidoc help2man inkscape - libxslt lynx openssh valgrind @@ -194,6 +192,7 @@ build() { --libdir=/usr/lib\ --libexecdir=/usr/lib\ --localstatedir=/var\ + --sbindir=/usr/bin\ --sysconfdir=/etc\ --with-acl\ --with-ais\ @@ -215,7 +214,9 @@ package() { cd $srcdir/$pkgname-${pkgname^}-$pkgver setarch $CARCH make DESTDIR=$pkgdir install - mv $pkgdir/usr/sbin/cibsecret{,-$pkgname} + rm $pkgdir/etc/rc.d/pacemaker{_remote,} && rmdir $pkgdir/etc{/rc.d,} + mv $pkgdir/{var/,}run + mv $pkgdir/usr/bin/cibsecret{,-$pkgname} } # vim:set ts=2 sw=2 et: -- cgit v1.2.3-54-g00ecf