summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorajs1242015-09-28 19:04:01 +0200
committerajs1242015-09-28 19:04:01 +0200
commit3b4e25247fd7ec37233ccf13bec0cfa26a95dfcf (patch)
tree2b33ec7e1391a199fb2747de4879351385332a37
parent74bd9720881898f3895a677bc1b97a03559c2d39 (diff)
downloadaur-3b4e25247fd7ec37233ccf13bec0cfa26a95dfcf.tar.gz
remove libcaca, because it was apparently removed upstream
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD30
2 files changed, 4 insertions, 36 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f3c15e42ecf..539ba261d07 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = qemu-git
- pkgver = 2.5.r40527.g7df9671
+ pkgver = 2.5.r41275.g9e07142
pkgrel = 1
url = http://wiki.qemu.org/
arch = i686
@@ -59,7 +59,6 @@ pkgname = qemu-git
depends = libgl
depends = gnutls
depends = bluez-libs
- depends = libcacard
depends = usbredir
depends = lzo
depends = snappy
@@ -122,10 +121,3 @@ pkgname = qemu-guest-agent-git
provides = qemu-guest-agent
conflicts = qemu-guest-agent
-pkgname = libcacard-git
- pkgdesc = Common Access Card (CAC) Emulation. Git version.
- depends = nss
- depends = nspr
- provides = libcacard
- conflicts = libcacard
-
diff --git a/PKGBUILD b/PKGBUILD
index 2bb0906c89b..3fa0a9355e9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,9 +11,8 @@ pkgname=('qemu-git'
'qemu-block-iscsi-git'
'qemu-block-rbd-git'
'qemu-block-gluster-git'
- 'qemu-guest-agent-git'
- 'libcacard-git')
-pkgver=2.5.r40527.g7df9671
+ 'qemu-guest-agent-git')
+pkgver=2.5.r41275.g9e07142
pkgrel=1
arch=('i686' 'x86_64')
license=('GPL2' 'LGPL2.1')
@@ -68,7 +67,7 @@ build() {
package_qemu-git() {
pkgdesc='A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation. Git version.'
depends=('pixman' 'libjpeg' 'libpng' 'sdl' 'libgl'
- 'gnutls' 'bluez-libs' 'libcacard'
+ 'gnutls' 'bluez-libs'
'usbredir' 'lzo' 'snappy' 'libpulse'
'dtc' 'numactl' 'libnfs' 'libepoxy')
optdepends=('ovmf: Tianocore UEFI firmware for qemu'
@@ -97,14 +96,6 @@ package_qemu-git() {
# https://bugs.archlinux.org/task/32565
chmod u+s usr/lib/qemu/qemu-bridge-helper
- # remove libcacard files
- rm -r usr/include/cacard
- rmdir usr/include
- rm usr/lib/libcacard*
- rm usr/lib/pkgconfig/libcacard.pc
- rmdir usr/lib/pkgconfig/
- rm usr/bin/vscclient
-
# remove splitted block modules
rm usr/lib/qemu/block-{iscsi,rbd,gluster}.so
@@ -179,19 +170,4 @@ package_qemu-guest-agent-git() {
install -D qemu-ga.service "${pkgdir}"/usr/lib/systemd/system/qemu-ga.service
}
-package_libcacard-git() {
- pkgdesc='Common Access Card (CAC) Emulation. Git version.'
- depends=('nss' 'nspr')
- conflicts=(libcacard)
- provides=(libcacard)
-
- cd "${pkgdir}"
- install -d usr/{bin,lib/pkgconfig,include/cacard}
- cp -a "${srcdir}"/$_gitname/libcacard/*.h usr/include/cacard/
- cp -a "${srcdir}"/$_gitname/libcacard.pc usr/lib/pkgconfig/
- cp -a "${srcdir}"/$_gitname/.libs/vscclient usr/bin/
- cp -a "${srcdir}"/$_gitname/.libs/libcacard.so* usr/lib/
-}
-
-
# vim:set ts=2 sw=2 et: