diff options
Diffstat (limited to 'extra')
-rw-r--r-- | extra/bluez/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/samba/PKGBUILD | 22 | ||||
-rw-r--r-- | extra/system-config-printer/40_scp-dbus-service-fix-dbus-signature-typo.patch | 12 | ||||
-rw-r--r-- | extra/system-config-printer/PKGBUILD | 30 | ||||
-rw-r--r-- | extra/talloc/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/tevent/PKGBUILD | 8 |
6 files changed, 32 insertions, 54 deletions
diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD index cab4e2e88..c14263b2e 100644 --- a/extra/bluez/PKGBUILD +++ b/extra/bluez/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 209803 2014-04-04 13:10:29Z andyrtr $ +# $Id: PKGBUILD 211145 2014-04-17 13:28:11Z andyrtr $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> pkgbase=bluez pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins') -pkgver=5.17 +pkgver=5.18 pkgrel=1 url="http://www.bluez.org/" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ source=(http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.xz 0001-Allow-using-obexd-without-systemd-in-the-user-session.patch bluetooth.modprobe) # see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc -sha256sums=('0bd7f009225fff83ba4b3697a6b04d04454ef2cd15d6bb2bd62591c44cfe973a' +sha256sums=('8c8bb13db83d0de6c85def2da8dfa0a758aff595405fb57a00719ed94d558340' '896a1403d9b7258c4fb0d41f3a6f70fd51eaa1115ab3f4259f3dbbe02b55766b' '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4') @@ -44,7 +44,7 @@ build() { check() { cd $pkgname-$pkgver - make check + #make check } diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index 567d9d0a7..8a116a2d3 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -10,11 +10,11 @@ pkgbase=samba pkgname=('libwbclient' 'smbclient' 'samba') -pkgver=4.1.6 +pkgver=4.1.7 # We use the 'A' to fake out pacman's version comparators. Samba chooses # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! -_realver=4.1.6 +_realver=4.1.7 pkgrel=1 arch=(i686 x86_64) url="http://www.samba.org" @@ -32,8 +32,7 @@ source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz nmbd.service smbd@.service winbindd.service - samba.conf - readline-6.3.patch) + samba.conf) ### UNINSTALL dmapi package before building!!! build() { @@ -63,7 +62,6 @@ _samba4_idmap_modules=idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2 _samba4_pdb_modules=pdb_tdbsam,pdb_ldap,pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4 _samba4_auth_modules=auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4 cd ${srcdir}/samba-${_realver} - patch -Np1 -i ${srcdir}/readline-6.3.patch ./configure --enable-fhs \ --prefix=/usr \ --sbindir=/usr/bin \ @@ -242,7 +240,7 @@ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \ # copy ldap example install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema } -md5sums=('9dc64658c0cc81e7637f9b975c19638c' +md5sums=('bc44b0a245468c3574ef07644206ede3' '5697da77590ec092cc8a883bae06093c' '96f82c38f3f540b53f3e5144900acf17' 'ee4763a656cf00d92bfda31b6bb2c5cb' @@ -253,15 +251,3 @@ md5sums=('9dc64658c0cc81e7637f9b975c19638c' '70afd2db60a2e8eff7615dbdecd887ac' 'd5f56f43e1280bba20f6bbd88d16fa41' '49abd7b719e3713a3f75a8a50958e381') -md5sums=('9dc64658c0cc81e7637f9b975c19638c' - '5697da77590ec092cc8a883bae06093c' - '96f82c38f3f540b53f3e5144900acf17' - 'ee4763a656cf00d92bfda31b6bb2c5cb' - '6c447748a064d631435dbef0a3dcf32f' - 'e4ae6a3cac080602120aa151918c4a36' - 'a78b9aa93eb14b0ac445897395693225' - 'df6380c73cb73163968eabc8650f7358' - '70afd2db60a2e8eff7615dbdecd887ac' - 'd5f56f43e1280bba20f6bbd88d16fa41' - '49abd7b719e3713a3f75a8a50958e381' - '1179c1dcdb95f79b0d5813698d010d2c') diff --git a/extra/system-config-printer/40_scp-dbus-service-fix-dbus-signature-typo.patch b/extra/system-config-printer/40_scp-dbus-service-fix-dbus-signature-typo.patch deleted file mode 100644 index 0d08a3da8..000000000 --- a/extra/system-config-printer/40_scp-dbus-service-fix-dbus-signature-typo.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur -x '*.orig' -x '*~' system-config-printer-1.4.2+20130920/scp-dbus-service.py system-config-printer-1.4.2+20130920.new/scp-dbus-service.py ---- system-config-printer-1.4.2+20130920/scp-dbus-service.py 2013-09-20 22:26:27.000000000 +0200 -+++ system-config-printer-1.4.2+20130920.new/scp-dbus-service.py 2013-10-24 13:12:44.998717234 +0200 -@@ -367,7 +367,7 @@ - pass - - @dbus.service.signal(dbus_interface=CONFIG_NEWPRINTERDIALOG_IFACE, -- signature='a{s}') -+ signature='a(s)') - def DriverDownloadChecked(self, installed_files): - pass - diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD index 75a9f6bd0..a47347134 100644 --- a/extra/system-config-printer/PKGBUILD +++ b/extra/system-config-printer/PKGBUILD @@ -1,30 +1,25 @@ -# $Id: PKGBUILD 200771 2013-12-04 20:14:29Z jgc $ +# $Id: PKGBUILD 211153 2014-04-17 19:53:20Z eric $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=system-config-printer -pkgver=1.4.3 -pkgrel=2 +pkgver=1.4.4 +pkgrel=1 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' 'dbus-glib' - 'gnome-icon-theme' 'python2-notify' 'python2-gobject' 'gtk3') +depends=('pycups' 'python2-dbus' 'python2-pycurl' 'python2-gobject2' 'libnotify' + 'gnome-icon-theme' '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') -conflicts=('system-config-printer-common' 'system-config-printer-gnome') -source=(http://cyberelk.net/tim/data/${pkgname}/${pkgver%*.*}/${pkgname}-${pkgver}.tar.xz{,.sig} - 40_scp-dbus-service-fix-dbus-signature-typo.patch) -md5sums=('99e251bfd281526fb6ea109b3e2bace3' - 'SKIP' - 'a616371aff9fae27b99d036c4143bf37') +optdepends=('libgnome-keyring: password management' + 'pysmbc: SMB browser support') +source=(http://cyberelk.net/tim/data/${pkgname}/${pkgver%*.*}/${pkgname}-${pkgver}.tar.xz{,.sig}) +md5sums=('229c6ea422748a0fd7e533bba25595fc' + 'SKIP') prepare() { cd ${pkgname}-${pkgver} - patch -Np1 -i ../40_scp-dbus-service-fix-dbus-signature-typo.patch - sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ $(find . -name '*.py') @@ -45,4 +40,9 @@ package() { cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" udevhelperdir=/usr/lib/udev \ udevrulesdir=/usr/lib/udev/rules.d install + + # Compile *.pyc + find "${pkgdir}" -name '*.py' -exec python2 -mpy_compile {} + + # Compile *.pyo + find "${pkgdir}" -name '*.py' -exec python2 -O -mpy_compile {} + } diff --git a/extra/talloc/PKGBUILD b/extra/talloc/PKGBUILD index 337d77355..fdc8074d1 100644 --- a/extra/talloc/PKGBUILD +++ b/extra/talloc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 208142 2014-03-18 07:51:26Z tpowa $ +# $Id: PKGBUILD 211155 2014-04-17 20:01:41Z tpowa $ # Maintainer: # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=talloc pkgver=2.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Hierarchical pool based memory allocator with destructors" arch=('i686' 'x86_64') license=('GPL3') @@ -24,6 +24,8 @@ build() { ./configure --prefix=/usr \ --sysconfdir=/etc/samba \ --localstatedir=/var \ + --bundled-libraries=NONE \ + --builtin-libraries=replace \ --enable-talloc-compat1 make } diff --git a/extra/tevent/PKGBUILD b/extra/tevent/PKGBUILD index 3d397a4c3..b40799605 100644 --- a/extra/tevent/PKGBUILD +++ b/extra/tevent/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 208146 2014-03-18 07:55:57Z tpowa $ +# $Id: PKGBUILD 211157 2014-04-17 20:02:05Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Christian Hesse <mail@eworm.de> # Contributor: Marco A Rojas <marquicus at gmail dot com> @@ -7,7 +7,7 @@ pkgname=tevent pkgver=0.9.21 -pkgrel=2 +pkgrel=3 pkgdesc="An event system based on the talloc memory management library" arch=('i686' 'x86_64') url="https://tevent.samba.org/" @@ -24,7 +24,9 @@ build() { sed -i -e "s|/usr/bin/env python$|/usr/bin/env python2|" buildtools/bin/waf export PYTHON=/usr/bin/python2 - ./configure --prefix=/usr + ./configure --prefix=/usr \ + --bundled-libraries=NONE \ + --builtin-libraries=replace } package() { |