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 --- 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 ++-- 12 files changed, 107 insertions(+), 67 deletions(-) create mode 100644 extra/obex-data-server/obex-data-server-openobex17.patch (limited to 'extra') 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') -- cgit v1.2.3-54-g00ecf