From aa8cb25b87f671ceccab8b59765b17d31ddc5cd6 Mon Sep 17 00:00:00 2001 From: moparisthebest Date: Tue, 19 Jun 2018 16:31:21 -0400 Subject: [PATCH] Update packages --- src/biboumi-git/PKGBUILD | 4 +- src/bluez-utils-compat/PKGBUILD | 17 +++++-- src/dino-git/PKGBUILD | 15 ++++-- src/intellij-idea-ultimate-edition/PKGBUILD | 6 +-- src/libjson-rpc-cpp-git/PKGBUILD | 49 ------------------- .../libjson-rpc-cpp.install | 11 ----- src/qemu-user-static/PKGBUILD | 8 +-- 7 files changed, 32 insertions(+), 78 deletions(-) delete mode 100644 src/libjson-rpc-cpp-git/PKGBUILD delete mode 100644 src/libjson-rpc-cpp-git/libjson-rpc-cpp.install diff --git a/src/biboumi-git/PKGBUILD b/src/biboumi-git/PKGBUILD index 0a00684..c7319ea 100644 --- a/src/biboumi-git/PKGBUILD +++ b/src/biboumi-git/PKGBUILD @@ -2,7 +2,7 @@ _pkgname=biboumi pkgname="$_pkgname-git" -pkgver=r1346.5ff3696 +pkgver=8.2.r18.g21a79b7 pkgrel=1 pkgdesc="XMPP gateway to IRC" arch=('i686' 'x86_64' 'armv7h' 'aarch64') @@ -24,7 +24,7 @@ conflicts=("$_pkgname") pkgver() { cd "$srcdir/$_pkgname" - echo "r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)" + git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' } prepare() { diff --git a/src/bluez-utils-compat/PKGBUILD b/src/bluez-utils-compat/PKGBUILD index 4156ed0..c1efa94 100644 --- a/src/bluez-utils-compat/PKGBUILD +++ b/src/bluez-utils-compat/PKGBUILD @@ -6,10 +6,10 @@ pkgname='bluez-utils-compat' _pkgbase='bluez' -pkgver=5.49 +pkgver=5.50 pkgrel=1 url="http://www.bluez.org/" -arch=('i686' 'x86_64' 'armv7h') +arch=('i686' 'x86_64' 'mips64el' 'armv6h' 'armv7h' 'arm' 'aarch64') license=('GPL2') pkgdesc="Development and debugging utilities for the bluetooth protocol stack. Includes deprecated tools." depends=('dbus' 'systemd' 'glib2') @@ -17,12 +17,19 @@ conflicts=('bluez-hcidump' 'bluez-utils') provides=('bluez-hcidump' 'bluez-utils') replaces=('bluez-hcidump' 'bluez<=4.101') makedepends=('dbus' 'libical' 'systemd') -source=(https://www.kernel.org/pub/linux/bluetooth/${_pkgbase}-${pkgver}.tar.{xz,sign}) +source=("https://www.kernel.org/pub/linux/bluetooth/${_pkgbase}-${pkgver}.tar."{xz,sign} + 'refresh_adv_manager_for_non-LE_devices.diff::https://git.archlinux.org/svntogit/packages.git/tree/trunk/refresh_adv_manager_for_non-LE_devices.diff?h=packages/bluez') # see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc -sha256sums=('33301d7a514c73d535ee1f91c2aed1af1f2e53efe11d3ac06bcf0d7abed2ce95' - 'SKIP') +sha256sums=('5ffcaae18bbb6155f1591be8c24898dc12f062075a40b538b745bfd477481911' + 'SKIP' + 'fa391d4a5a3946413aae99dd196a58db9de75f07526915b70e67f915af3cd268') validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # Marcel Holtmann +prepare() { + cd "${_pkgbase}-${pkgver}" + patch -Np1 -i ../refresh_adv_manager_for_non-LE_devices.diff +} + build() { cd "${_pkgbase}-${pkgver}" ./configure \ diff --git a/src/dino-git/PKGBUILD b/src/dino-git/PKGBUILD index 80a2383..a7d191a 100644 --- a/src/dino-git/PKGBUILD +++ b/src/dino-git/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: svalo pkgname=dino-git -pkgver=r225.2e041e2 +pkgver=r268.df8b5fc pkgrel=1 pkgdesc="Simple and modern Jabber/XMPP client written in vala" arch=('i686' 'x86_64' 'aarch64') @@ -10,13 +10,20 @@ url="https://github.com/dino/dino" license=('GPL3') depends=('glib2>=2.38' 'glib-networking' 'gtk3>=3.22' 'gpgme' 'libgee>=0.10' 'libgcrypt' 'libsoup' 'sqlite') makedepends=('git' 'cmake' 'vala>=0.34' 'ninja') +optdepends=('libcanberra: audio notification support') provides=("${pkgname%-git}") conflicts=("${pkgname%-git}") source=('dino::git+https://github.com/dino/dino') sha512sums=('SKIP') -# Any or all of the following plugin can be disabled: omemo, openpgp, http-files. Populate following string as per your needs and uncomment it -#_DISABLE_PLUGINS="--disable-plugin='omemo;openpgp;http-files'" +### Any or all of the following plugin can be disabled: omemo, openpgp, http-files. Populate following string as per your needs and uncomment it. + +# _DISABLE_PLUGINS="--disable-plugin='omemo;openpgp;http-files'" + +### Any or all of the following plugin can be enabled: notification-sound. Populate the following string as per you needs and uncomment it. +### Install any needed optional dependency before + +#_ENABLE_PLUGINS="--enable-plugin='notification-sound'" pkgver() { cd "${srcdir}/${pkgname%-git}" @@ -25,7 +32,7 @@ pkgver() { build() { cd "${srcdir}/${pkgname%-git}" - ./configure $_DISABLE_PLUGINS --prefix="/usr" --with-tests CC="$CC" CFLAGS="$CFLAGS" VALACFLAGS="$VALACFLAGS" + ./configure $_DISABLE_PLUGINS $_ENABLE_PLUGINS --prefix="/usr" --with-tests CC="$CC" CFLAGS="$CFLAGS" VALACFLAGS="$VALACFLAGS" sed -i '/SrvRecordsTls/d' libdino/src/service/module_manager.vala make } diff --git a/src/intellij-idea-ultimate-edition/PKGBUILD b/src/intellij-idea-ultimate-edition/PKGBUILD index 993d524..c7cbc79 100644 --- a/src/intellij-idea-ultimate-edition/PKGBUILD +++ b/src/intellij-idea-ultimate-edition/PKGBUILD @@ -2,8 +2,8 @@ pkgbase=intellij-idea-ultimate-edition pkgname=intellij-idea-ultimate-edition -pkgver=2018.1.4 -_buildver=181.5087.20 +pkgver=2018.1.5 +_buildver=181.5281.24 pkgrel=1 arch=('any') pkgdesc="An intelligent IDE for Java, Groovy and other programming languages with advanced refactoring features intensely focused on developer productivity." @@ -12,7 +12,7 @@ license=('Commercial') options=(!strip) source=("https://download.jetbrains.com/idea/ideaIU-$pkgver.tar.gz" "jetbrains-idea.desktop") -sha256sums=('fb16e1533902823e1a9c5eccd5193cc548c9ce9ba5687778446a3475266c4284' +sha256sums=('010cec3753ec3ea9ad5fb96fa584a04a2682896291c21b2d9f575d8f473dc5d5' '83af2ba8f9f14275a6684e79d6d4bd9b48cd852c047dacfc81324588fa2ff92b') prepare() { diff --git a/src/libjson-rpc-cpp-git/PKGBUILD b/src/libjson-rpc-cpp-git/PKGBUILD deleted file mode 100644 index 2da2f80..0000000 --- a/src/libjson-rpc-cpp-git/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# Maintainer: Andy Weidenbaum -# Contributor: Peter Spiess-Knafl -# Contributor: Daniel Bomar - -pkgname=libjson-rpc-cpp-git -pkgver=1.1.0.r0.gc5387ba -pkgrel=1 -pkgdesc="C++ framework for json-rpc 1.0 and 2.0" -arch=('i686' 'x86_64') -depends=('argtable' 'curl' 'jsoncpp' 'libmicrohttpd' 'hiredis') -makedepends=('cmake' 'git') -url="https://github.com/cinemast/libjson-rpc-cpp" -license=('MIT') -source=(git+https://github.com/cinemast/libjson-rpc-cpp) -sha256sums=('SKIP') -provides=('libjson-rpc-cpp') -conflicts=('libjson-rpc-cpp') -install=libjson-rpc-cpp.install - -pkgver() { - cd ${pkgname%-git} - ( set -o pipefail - git describe --long --tags 2>/dev/null | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' || - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" - ) -} -prepare() { - cd "${srcdir}"/${pkgname%-git} -} - -build() { - msg2 "Creating build directories" - mkdir -p ${pkgname%-git}/build - cd ${pkgname%-git}/build - msg2 "Invoking cmake" - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib -DCOMPILE_TESTS=FALSE -DCOMPILE_EXAMPLES=FALSE .. - msg2 "Building the framework" - make -} - -package() { - cd ${pkgname%-git}/build - msg2 "Packing all together" - make DESTDIR="${pkgdir}" install - msg2 "Add MIT License to package" - install -D -m644 "${srcdir}/${pkgname%-git}/LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - msg 'Cleaning up pkgdir...' - find "$pkgdir" -type d -name .git -exec rm -r '{}' + -} diff --git a/src/libjson-rpc-cpp-git/libjson-rpc-cpp.install b/src/libjson-rpc-cpp-git/libjson-rpc-cpp.install deleted file mode 100644 index aedb215..0000000 --- a/src/libjson-rpc-cpp-git/libjson-rpc-cpp.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install () { - ldconfig -} - -post_upgrade () { - ldconfig -} - -post_remove () { - ldconfig -} diff --git a/src/qemu-user-static/PKGBUILD b/src/qemu-user-static/PKGBUILD index 794bdb2..19cf3a1 100644 --- a/src/qemu-user-static/PKGBUILD +++ b/src/qemu-user-static/PKGBUILD @@ -3,7 +3,7 @@ pkgname=qemu-user-static pkgver=2.12 -pkgrel=3 +pkgrel=4 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation, statically linked." arch=('i686' 'x86_64') license=('GPL2' 'LGPL2.1') @@ -13,10 +13,10 @@ optdepends=('binfmt-qemu-static: to allow handling foreign ELF binaries and exec conflicts=() _arch=amd64 [ "$CARCH" = 'i686' ] && _arch=i386 -_debsrc=${pkgname}_${pkgver}+dfsg-1+b1_${_arch}.deb +_debsrc=${pkgname}_${pkgver}+dfsg-3_${_arch}.deb source=(http://ftp.debian.org/debian/pool/main/q/qemu/${_debsrc}) -sha1sums=('3a3e68ab33df91bf96451d5e529a288608a15020') -[ "$CARCH" = 'i686' ] && sha1sums=('35ba56530f4337382ed064be4a5bf5ba24233753') +sha1sums=('ac8defaa5b8624bc0585877f6272e23be921a70a') +[ "$CARCH" = 'i686' ] && sha1sums=('b67bd47793047ddcbd79822bdaf297d0f3e99384') prepare() { cd "$srcdir"