From f7bced98bbdbc94b949692df66a8630484e714b9 Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Sat, 14 Jan 2012 12:12:45 +0000 Subject: [PATCH] updated on Sat Jan 14 12:12:45 UTC 2012 --- activdriver-i686/10-promethean.conf | 12 ++++ activdriver-i686/PKGBUILD | 36 ++++++++++ activdriver-i686/activdriver.install | 3 + clarity-icon-theme/PKGBUILD | 113 ++++++++++++++---------------- gnustep-theme-gnome-svn/PKGBUILD | 4 +- gtk-theme-adwaita-cupertino/PKGBUILD | 4 +- minecraft-server/PKGBUILD | 6 +- minecraft-server/minecraft-server.install | 3 +- nux/PKGBUILD | 1 + onscripter/PKGBUILD | 4 +- openfire/PKGBUILD | 4 +- pan-dev/PKGBUILD | 6 +- pan-dev/build-with-gtkspell3.patch | 12 ++-- pidgin-gfire-svn/PKGBUILD | 2 +- python2-pjproject/PKGBUILD | 9 ++- sacks/PKGBUILD | 4 +- sonata-bzr/PKGBUILD | 2 +- theide-nogtk-svn/PKGBUILD | 2 +- theide-svn/PKGBUILD | 2 +- tpm-tools/PKGBUILD | 23 +++--- tpm-tools/add-libdl.patch | 11 +++ tpm-tools/add-nvcommon.patch | 70 ++++++++++++++++++ tpm-tools/no-werror.patch | 4 +- traverso-git/PKGBUILD | 4 +- trayer-dwm/PKGBUILD | 1 + trousers/PKGBUILD | 17 ++--- trousers/no-werror.patch | 6 +- trousers/tss-user.patch | 27 ++++--- upp-svn/PKGBUILD | 2 +- 29 files changed, 267 insertions(+), 127 deletions(-) create mode 100644 activdriver-i686/10-promethean.conf create mode 100644 activdriver-i686/PKGBUILD create mode 100644 activdriver-i686/activdriver.install rewrite clarity-icon-theme/PKGBUILD (63%) create mode 100644 tpm-tools/add-libdl.patch create mode 100644 tpm-tools/add-nvcommon.patch diff --git a/activdriver-i686/10-promethean.conf b/activdriver-i686/10-promethean.conf new file mode 100644 index 000000000..941844302 --- /dev/null +++ b/activdriver-i686/10-promethean.conf @@ -0,0 +1,12 @@ +Section "InputDevice" + Identifier "activpen" + Driver "promethean" + Option "Device" "/dev/input/activdevices" + Option "Type" "stylus" + Option "Mode" "Absolute" + Option "Cursor" "stylus" + Option "USB" "on" + Option "debuglevel" "5" + Option "Vendor" "promethean" + Option "SendCoreEvents" "true" +EndSection diff --git a/activdriver-i686/PKGBUILD b/activdriver-i686/PKGBUILD new file mode 100644 index 000000000..cb3b274b4 --- /dev/null +++ b/activdriver-i686/PKGBUILD @@ -0,0 +1,36 @@ +# Contributor: Zsolt Udvari +# Based on activdriver package made by cbuehler +pkgname=activdriver-i686 +_pkgname=activdriver +pkgver=5.7.22 +pkgrel=1 +pkgdesc="The kernel mode and X11 drivers for Promethean ActivBoard and ActivHub - i686 version." +arch=('i686') +url="http://www.prometheanworld.com/" +license=('unknown') +depends=(bash) +makedepends=(kernel26-headers) +provides=("activdriver") +install=$_pkgname.install +source=(http://activsoftware.co.uk/linux/repos/ubuntu/pool/oss/a/$_pkgname/${_pkgname}_$pkgver-12~ubuntu~1010_i386.deb + 10-promethean.conf) +md5sums=('18716673e50014616feca6b8447c0b01' + '11effc25fd592acacb9f9f3108618963') + +build() { + tar xf data.tar.gz + make -C /lib/modules/$(uname -r)/build SUBDIRS="$srcdir/usr/src/promethean/kernel" modules + sed -i "s%KERN_INC = /usr/src/promethean%KERN_INC = ..%" usr/src/promethean/activlc/Makefile + BUILD=release make -C usr/src/promethean/activlc + sed -i s%/usr/local/bin/%%g usr/bin/promethean.sh +} + +package() { + mkdir -p $pkgdir/usr + cp -r etc lib $pkgdir + cp -r usr/bin usr/lib usr/share $pkgdir/usr + install -D usr/src/promethean/activlc/release/activlc $pkgdir/usr/bin/activlc + install -D usr/src/promethean/kernel/promethean.ko \ + $pkgdir/lib/modules/$(uname -r)/kernel/drivers/input/tablet/promethean.ko + install -D 10-promethean.conf $pkgdir/etc/X11/xorg.conf.d/10-promethean.conf +} diff --git a/activdriver-i686/activdriver.install b/activdriver-i686/activdriver.install new file mode 100644 index 000000000..937099168 --- /dev/null +++ b/activdriver-i686/activdriver.install @@ -0,0 +1,3 @@ +post_install() { + depmod +} diff --git a/clarity-icon-theme/PKGBUILD b/clarity-icon-theme/PKGBUILD dissimilarity index 63% index a63f47616..3ec2a3897 100644 --- a/clarity-icon-theme/PKGBUILD +++ b/clarity-icon-theme/PKGBUILD @@ -1,61 +1,52 @@ -# Maintainer: boenki -# Contributor: Anonymo - -pkgname=clarity-icon-theme -pkgver=0.3.2 -pkgrel=1 -pkgdesc="Vector icons in 7 colourthemes for GTK." -arch=('any') -makedepends=('imagemagick') -url="http://gnome-look.org/content/show.php/Clarity?content=135654" -license=('GPL3') -options=(!strip) -source=(http://www.fileden.com/files/2011/2/28/3088999/${pkgname}_${pkgver}.tar.gz) -md5sums=('e0f25fe13e1108a73bb2b6605d0749e3') - - ################################################################# - # Put the themes you want to build in _buildtheme array below # - # # - # Available themes: # - # violaceus - violet/pink gradient # - # lux_violaceus - glossy variant # - # canus - grey gradient # - # dark_canus - dark grey gradient # - # caeruleus - blue gradient # - # lux_caeruleus - glossy variant # - # viridis - green gradient # - # luteus - orange gradient # - ################################################################# - # - # -##### - ### - # -_buildtheme=(violaceus lux_violaceus canus dark_canus caeruleus lux_caeruleus viridis luteus) - -build() { -for _theme in ${_buildtheme[*]}; do - cd "${srcdir}/${pkgname}_${pkgver}" - make ${_theme} - install -d themes/${_theme} - cp -r {scalable,16x16,index.theme} themes/${_theme} - sed -i s/Name=Clarity/Name=Clarity-${_theme}/ themes/${_theme}/index.theme -done -} - -package() { -for _theme in ${_buildtheme[*]}; do - cd "${srcdir}/${pkgname}_${pkgver}/themes/${_theme}" - install -d "${pkgdir}/usr/share/icons/clarity-${_theme}" - cp -r {scalable,16x16,index.theme} "${pkgdir}/usr/share/icons/clarity-${_theme}" - - #install archlinux icons - cd "${pkgdir}/usr/share/icons/clarity-${_theme}" - ln -sf ../distributor-logos/arch.svg scalable/places/start-here.svg - ln -sf ../distributor-logos/arch.svg scalable/places/gnome-main-menu.svg - ln -sf ../distributor-logos/arch.svg scalable/places/distributor-logo.svg - ln -sf ../distributor-logos/arch.png 16x16/places/start-here.png - ln -sf ../distributor-logos/arch.png 16x16/places/gnome-main-menu.png - ln -sf ../distributor-logos/arch.png 16x16/places/distributor-logo.png -done -} \ No newline at end of file +# Maintainer: boenki +# Contributor: Anonymo + +pkgname=clarity-icon-theme +pkgver=0.3.2 +pkgrel=2 +pkgdesc="Vector icons in 7 colourthemes for GTK." +arch=('any') +makedepends=('imagemagick') +url="http://gnome-look.org/content/show.php/Clarity?content=135654" +license=('GPL3') +options=(!strip !zipman) +source=(http://www.fileden.com/files/2011/2/28/3088999/${pkgname}_${pkgver}.tar.gz) +md5sums=('e0f25fe13e1108a73bb2b6605d0749e3') + + ################################################################# + # Put the themes you want to build in _buildtheme array below # + # # + # Available themes: # + # violaceus - violet/pink gradient # + # lux_violaceus - glossy variant # + # canus - grey gradient # + # dark_canus - dark grey gradient # + # caeruleus - blue gradient # + # lux_caeruleus - glossy variant # + # viridis - green gradient # + # luteus - orange gradient # + ################################################################# + # + ##### + ### + # +_buildtheme=(violaceus lux_violaceus canus dark_canus caeruleus lux_caeruleus viridis luteus) + +build() { +for _theme in ${_buildtheme[*]}; do + cd "${srcdir}/${pkgname}_${pkgver}" + make ${_theme} + make arch + install -d themes/${_theme} + cp -r {scalable,16x16,index.theme} themes/${_theme} + sed -i s/Name=Clarity/Name=Clarity-${_theme}/ themes/${_theme}/index.theme +done +} + +package() { +for _theme in ${_buildtheme[*]}; do + install -d "${pkgdir}/usr/share/icons/clarity-${_theme}" + cp -r ${srcdir}/${pkgname}_${pkgver}/themes/${_theme}/{scalable,16x16,index.theme} \ + "${pkgdir}/usr/share/icons/clarity-${_theme}" +done +} \ No newline at end of file diff --git a/gnustep-theme-gnome-svn/PKGBUILD b/gnustep-theme-gnome-svn/PKGBUILD index 9c47afe1b..744e688f1 100644 --- a/gnustep-theme-gnome-svn/PKGBUILD +++ b/gnustep-theme-gnome-svn/PKGBUILD @@ -1,11 +1,11 @@ # Maintainer: spider-mario pkgname=gnustep-theme-gnome-svn pkgver=28908 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME theme for GNUstep" arch=(i686 x86_64) url="http://www.gnustep.org/" -license=('GPL') +license=('LGPL') depends=('gnustep-gui' 'gtk2' 'gdk-pixbuf2' 'gconf') makedepends=('subversion') install=gnustep-theme-gnome.install diff --git a/gtk-theme-adwaita-cupertino/PKGBUILD b/gtk-theme-adwaita-cupertino/PKGBUILD index e040326a3..7e3f29c8c 100644 --- a/gtk-theme-adwaita-cupertino/PKGBUILD +++ b/gtk-theme-adwaita-cupertino/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: qwer1234 pkgname=gtk-theme-adwaita-cupertino pkgver=1.3.1 -pkgrel=7 +pkgrel=8 pkgdesc="Adwaita Cupertino GTK3 theme" arch=(any) url="http://gnome-look.org/content/show.php?content=147061" @@ -9,7 +9,7 @@ license=('GPL') makedepends=('') depends=('gtk3' 'gtk-engine-unico' 'gtk-engine-murrine') source=('http://gnome-look.org/CONTENT/content-files/147061-Adwaita-Cupertino.tar.gz') -md5sums=('54a4e2bd49f807078a6942e5735203fe') +md5sums=('ba41aecc34afb253cbc0a4bd87fab353') build() { diff --git a/minecraft-server/PKGBUILD b/minecraft-server/PKGBUILD index 5e60ca4f1..eeaf97d71 100644 --- a/minecraft-server/PKGBUILD +++ b/minecraft-server/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Vic Demuzere pkgname=minecraft-server -pkgver=1.0.1 -pkgrel=2 +pkgver=1.1 +pkgrel=1 epoch=1 pkgdesc="Server for Minecraft" arch=(any) @@ -13,7 +13,7 @@ depends=('java-runtime' 'expect' 'detachtty') source=("http://www.minecraft.net/download/minecraft_server.jar" "minecraft-server" "minecraft-server-rc") -md5sums=('934b6010999daa1f1b1ccdf4cb77e052' +md5sums=('b0f4fb91f9723104adf35944bbf3d3cf' '40194f9c13854a803fe318b97b4f82bb' 'ab422e9c34edb7c4e24ef3d16fd35df9') options=(emptydirs) diff --git a/minecraft-server/minecraft-server.install b/minecraft-server/minecraft-server.install index 56eb75d03..cc536aa5d 100644 --- a/minecraft-server/minecraft-server.install +++ b/minecraft-server/minecraft-server.install @@ -13,7 +13,8 @@ post_upgrade() { chmod 750 "/var/log/minecraft-server" cat << EOF ==> When running as a daemon, world data are stored in /srv/minecraft, -==> and you can access the server console by running as root: +==> and you can access the server console by adding your user to the +==> 'minecraft' group and running: $ attachtty /var/run/minecraft-server/socket ==> Press CTRL+\ to close the access to the server console. EOF diff --git a/nux/PKGBUILD b/nux/PKGBUILD index 4638a647c..05dc0eb0c 100644 --- a/nux/PKGBUILD +++ b/nux/PKGBUILD @@ -14,6 +14,7 @@ md5sums=('87dd2741cc6e90fa45288cd777b91d6c') build() { cd "$srcdir/$pkgname-$pkgver" + sed -i 's/libutouch-geis//' configure NuxGraphics/nux-graphics.pc.in ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ --disable-static --disable-tests --disable-examples --disable-gputests diff --git a/onscripter/PKGBUILD b/onscripter/PKGBUILD index 452ec2393..15edcb520 100755 --- a/onscripter/PKGBUILD +++ b/onscripter/PKGBUILD @@ -1,5 +1,5 @@ pkgname=onscripter -pkgver=20120111 +pkgver=20120112 pkgrel=1 pkgdesc="A game engine compatible to NScripter, which is used to create and perform visual novel games" arch=('i686' 'x86_64') @@ -7,7 +7,7 @@ url="http://onscripter.sourceforge.jp/onscripter.html" license=('GPL') depends=('bzip2' 'sdl_image' 'sdl_mixer' 'sdl_ttf') source=(http://onscripter.sourceforge.jp/$pkgname-$pkgver.tar.gz) -md5sums=('3228fc7266417aa25bbfb30e0db946cb') +md5sums=('06e5b1fc7bfc9e452375fc5a15de38ad') build() { cd $pkgname-$pkgver diff --git a/openfire/PKGBUILD b/openfire/PKGBUILD index ecef1e67b..e4a7ddddb 100644 --- a/openfire/PKGBUILD +++ b/openfire/PKGBUILD @@ -2,12 +2,12 @@ pkgname=openfire pkgver=3.7.1 -pkgrel=2 +pkgrel=3 pkgdesc="A high performance XMPP (Jabber) server" arch=('any') url='http://www.igniterealtime.org/projects/openfire/' license=('GPL') -depends=('jre7-openjdk' 'bash') +depends=('jre7-openjdk-headless' 'bash') makedepends=('jdk7-openjdk' 'apache-ant') install='openfire.install' backup=('opt/openfire/conf/openfire.xml' 'etc/conf.d/openfire' 'opt/openfire/resources/security/keystore') diff --git a/pan-dev/PKGBUILD b/pan-dev/PKGBUILD index 64ec07d1e..e7fd4c825 100644 --- a/pan-dev/PKGBUILD +++ b/pan-dev/PKGBUILD @@ -1,7 +1,7 @@ # Contributor: Bernard Baeyens (berbae) pkgname=pan-dev -pkgver=20120111 +pkgver=20120114 pkgrel=1 pkgdesc="A powerful Newsgroup Article reader for GTK+" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ makedepends=('gnome-common' 'intltool' 'git') conflicts=('pan' 'pan-git' 'pan-gtk3') options=('!makeflags') source=('build-with-gtkspell3.patch') -sha1sums=('c832d9bbbf11796e546b02ce9e5335d756b6f143') +sha1sums=('93ea7dbc48bdf020b797b02c85e3f23f4ad5d5be') _gitroot="git://git.gnome.org/pan2" _gitname="pan2" @@ -39,7 +39,7 @@ build() { patch -Np1 -i $srcdir/build-with-gtkspell3.patch - ./autogen.sh --prefix=/usr --with-gtk3 + ./autogen.sh --prefix=/usr --with-gtk3 --disable-gkr --without-gmime-crypto make } diff --git a/pan-dev/build-with-gtkspell3.patch b/pan-dev/build-with-gtkspell3.patch index d810dc90e..6a92d883a 100644 --- a/pan-dev/build-with-gtkspell3.patch +++ b/pan-dev/build-with-gtkspell3.patch @@ -9,23 +9,23 @@ The following libraries, which enhance Pan's functionality, are optional: * libnotify 0.4.1 or higher ---- a/configure.in 2012-01-11 14:21:04.000000000 +0100 -+++ b/configure.in 2012-01-11 14:25:20.000000000 +0100 +--- a/configure.in 2012-01-13 23:38:38.000000000 +0100 ++++ b/configure.in 2012-01-13 23:41:14.000000000 +0100 @@ -52,7 +52,7 @@ GMIME26_REQUIRED=2.5.5 GTK_REQUIRED=2.16.0 GTK3_REQUIRED=3.0.0 -GTKSPELL_REQUIRED=2.0.7 +GTKSPELL_REQUIRED=3.0.0 - ENCHANT_REQUIRED=1.0.6 + ENCHANT_REQUIRED=1.6.0 GNUTLS_REQUIRED=2.12.10 LIBNOTIFY_REQUIRED=0.4.1 -@@ -102,7 +102,7 @@ +@@ -115,7 +115,7 @@ gtkspell_msg=no AC_ARG_WITH(gtkspell, AC_HELP_STRING([--with-gtkspell], [Enable GtkSpell support]), [want_gtkspell=$withval], [want_gtkspell=yes]) if test "x$want_gtkspell" = "xyes" ; then -- PKG_CHECK_MODULES([GTKSPELL], [gtkspell-2.0 >= $GTKSPELL_REQUIRED], -+ PKG_CHECK_MODULES([GTKSPELL], [gtkspell-3.0 >= $GTKSPELL_REQUIRED], +- PKG_CHECK_MODULES([GTKSPELL], [gtkspell-2.0 >= $GTKSPELL_REQUIRED enchant >= $ENCHANT_REQUIRED], ++ PKG_CHECK_MODULES([GTKSPELL], [gtkspell-3.0 >= $GTKSPELL_REQUIRED enchant >= $ENCHANT_REQUIRED], [ gtkspell_msg=yes AC_DEFINE(HAVE_GTKSPELL,[1],[Spellcheck Library]) diff --git a/pidgin-gfire-svn/PKGBUILD b/pidgin-gfire-svn/PKGBUILD index d56b7e2de..03c3df959 100644 --- a/pidgin-gfire-svn/PKGBUILD +++ b/pidgin-gfire-svn/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: LookTJ pkgname=pidgin-gfire-svn -pkgver=546 +pkgver=547 pkgrel=1 pkgdesc="Plugin to Pidgin which adds Xfire network support (Dev/svn tree)" url="http://gfireproject.org/" diff --git a/python2-pjproject/PKGBUILD b/python2-pjproject/PKGBUILD index a94e901f1..d53bd5db0 100644 --- a/python2-pjproject/PKGBUILD +++ b/python2-pjproject/PKGBUILD @@ -3,16 +3,15 @@ _pkg=pjproject pkgname=python2-$_pkg -pkgver=1.10 -pkgrel=2 -pkgdesc="Open source SIP stack and media stack" +pkgver=1.12 +pkgrel=1 +pkgdesc="Open source SIP stack and media stack (also known as pjsip)" arch=('i686' 'x86_64') url="http://www.pjsip.org/" license=('GPL') depends=('alsa-lib' 'util-linux' 'python2') makedepends=('e2fsprogs' 'python2-distribute') source=("http://www.pjsip.org/release/$pkgver/pjproject-$pkgver.tar.bz2") -md5sums=('e215d0637d3422d49a63c2cde6673951') build() { cd "$srcdir/$_pkg-$pkgver" @@ -38,4 +37,4 @@ package() { python2 setup.py install --root="$pkgdir" } -# vim:set ts=2 sw=2 et: +md5sums=('1db8e5a5dd73b216409b15afa34651a4') diff --git a/sacks/PKGBUILD b/sacks/PKGBUILD index cd3190ca0..2f7a23409 100644 --- a/sacks/PKGBUILD +++ b/sacks/PKGBUILD @@ -2,12 +2,12 @@ pkgname=sacks -pkgver=20110206 +pkgver=20120114 pkgrel=1 pkgdesc="An integrated system to allow Digital Gathering (Adunanza Digitale).Adunanza Digitale is an assembly available on-line." arch=('i686' 'x86_64') url="http://adunanzadigitale.org" -depends=('libvncserver' 'python2' 'python-qt' 'vlc' 'python-dnspython' 'fakeroot' 'openssl' 'python2-pjproject' 'pyvnc') +depends=('libvncserver' 'python2' 'python2-qt' 'vlc' 'python-dnspython' 'openssl' 'python2-pjproject' 'pyvnc' 'xmpppy') makedepends=('git') conflicts=() license=('GPL3') diff --git a/sonata-bzr/PKGBUILD b/sonata-bzr/PKGBUILD index 9580db55a..6518ab3f7 100644 --- a/sonata-bzr/PKGBUILD +++ b/sonata-bzr/PKGBUILD @@ -1,7 +1,7 @@ # Contributor: kaivalagi pkgname=sonata-bzr -pkgver=5 +pkgver=6 pkgrel=1 pkgdesc="Sonata with my own tweaks/fixes" arch=('i686' 'x86_64') diff --git a/theide-nogtk-svn/PKGBUILD b/theide-nogtk-svn/PKGBUILD index fceeb3b57..63d9394b8 100644 --- a/theide-nogtk-svn/PKGBUILD +++ b/theide-nogtk-svn/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jan Dolinar pkgname=theide-nogtk-svn -pkgver=4401 +pkgver=4415 pkgrel=1 pkgdesc="Modern IDE designed for developping large U++/C++ applications (nogtk version)" arch=('i686' 'x86_64') diff --git a/theide-svn/PKGBUILD b/theide-svn/PKGBUILD index 64148fef2..d2e7f6abb 100644 --- a/theide-svn/PKGBUILD +++ b/theide-svn/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jan Dolinar pkgname=theide-svn -pkgver=4399 +pkgver=4415 pkgrel=1 pkgdesc="Modern IDE designed for developping large U++/C++ applications" arch=('i686' 'x86_64') diff --git a/tpm-tools/PKGBUILD b/tpm-tools/PKGBUILD index 0c4159f41..53b215553 100644 --- a/tpm-tools/PKGBUILD +++ b/tpm-tools/PKGBUILD @@ -1,24 +1,30 @@ -# Maintainer: Gavin Lloyd +# Maintainer: Robert Buhren +# Contributor: Gavin Lloyd # Contributor: xav # Contributor: julian pkgname=tpm-tools -pkgver=1.3.6 -pkgrel=2 -_baserel=1 +pkgver=1.3.7 +pkgrel=1 pkgdesc="Tools to manage and diagnose a TPM" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/trousers" license=('CPL') depends=('trousers' 'opencryptoki') -source=(http://downloads.sourceforge.net/project/trousers/${pkgname}/${pkgver}/${pkgname}-${pkgver}-${_baserel}.tar.gz - no-werror.patch) -md5sums=('b1b1e831cfe4a6ab4830775b987e99d0' - '82c10054a34f9b9f2e6dd2f0f7057beb') +source=(http://downloads.sourceforge.net/project/trousers/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz + no-werror.patch + add-libdl.patch + add-nvcommon.patch) +md5sums=('e8cdfff5b766f9db31a6184824251b03' + '268f6bd7e2e34ca0cb1de0e094607e08' + '8d4313663bea683edf2d5b9c299e323b' + '152b4d341b0a7c16aa72eb3df34a83ca') build() { cd ${srcdir} patch -p 0 < no-werror.patch + patch -p 0 < add-libdl.patch + patch -p 0 < add-nvcommon.patch cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --mandir=/usr/share/man @@ -27,5 +33,6 @@ build() { package() { cd ${srcdir}/${pkgname}-${pkgver} + ./configure --enable-static make DESTDIR=${pkgdir} install } diff --git a/tpm-tools/add-libdl.patch b/tpm-tools/add-libdl.patch new file mode 100644 index 000000000..501ee2c67 --- /dev/null +++ b/tpm-tools/add-libdl.patch @@ -0,0 +1,11 @@ +--- tpm-tools-1.3.7/src/data_mgmt/Makefile.in 2011-09-07 16:48:28.000000000 +0200 ++++ tpm-tools-1.3.7_NEW/src/data_mgmt/Makefile.in 2012-01-06 15:19:58.501731023 +0100 +@@ -272,7 +272,7 @@ + # + # Common build flags + AM_CPPFLAGS = -I$(top_srcdir)/include -D_LINUX +-LDADD = $(top_builddir)/lib/libtpm_pkcs11.la -ltspi ++LDADD = $(top_builddir)/lib/libtpm_pkcs11.la -ltspi -ldl + + # + # TPM Token initialization command diff --git a/tpm-tools/add-nvcommon.patch b/tpm-tools/add-nvcommon.patch new file mode 100644 index 000000000..9cb5a05c9 --- /dev/null +++ b/tpm-tools/add-nvcommon.patch @@ -0,0 +1,70 @@ +diff -Naur tpm-tools-1.3.7/src/tpm_mgmt/tpm_nvcommon.h tpm-tools-1.3.7_NEW/src/tpm_mgmt/tpm_nvcommon.h +--- tpm-tools-1.3.7/src/tpm_mgmt/tpm_nvcommon.h 1970-01-01 01:00:00.000000000 +0100 ++++ tpm-tools-1.3.7_NEW/src/tpm_mgmt/tpm_nvcommon.h 2012-01-06 14:59:52.973469694 +0100 +@@ -0,0 +1,66 @@ ++/* ++ * The Initial Developer of the Original Code is International ++ * Business Machines Corporation. Portions created by IBM ++ * Corporation are Copyright (C) 2005 International Business ++ * Machines Corporation. All Rights Reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the Common Public License as published by ++ * IBM Corporation; either version 1 of the License, or (at your option) ++ * any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * Common Public License for more details. ++ * ++ * You should have received a copy of the Common Public License ++ * along with this program; if not, a copy can be viewed at ++ * http://www.opensource.org/licenses/cpl1.0.php. ++ */ ++#ifndef TPM_NVCOMMON_H ++#define TPM_NVCOMMON_H ++ ++#include "tpm_tspi.h" ++ ++ ++struct strings_with_values ++{ ++ const char *name; ++ UINT32 value; ++ const char *desc; ++}; ++ ++extern const struct strings_with_values permvalues[]; ++ ++int parseStringWithValues(const char *aArg, ++ const struct strings_with_values *svals, ++ unsigned int *x, unsigned int maximum, ++ const char *name); ++ ++char *printValueAsStrings(unsigned int value, ++ const struct strings_with_values *svals); ++ ++int parseHexOrDecimal(const char *aArg, unsigned int *x, ++ unsigned int minimum, unsigned int maximum, ++ const char *name); ++ ++void displayStringsAndValues(const struct strings_with_values *svals, const char *indent); ++ ++TSS_RESULT getNVDataPublic(TSS_HTPM hTpm, TPM_NV_INDEX nvindex, TPM_NV_DATA_PUBLIC **pub); ++void freeNVDataPublic(TPM_NV_DATA_PUBLIC *pub); ++ ++static inline UINT32 ++Decode_UINT32(BYTE * y) ++{ ++ UINT32 x = 0; ++ ++ x = y[0]; ++ x = ((x << 8) | (y[1] & 0xFF)); ++ x = ((x << 8) | (y[2] & 0xFF)); ++ x = ((x << 8) | (y[3] & 0xFF)); ++ ++ return x; ++} ++ ++#endif /* TPM_NVCOMMON_H */ diff --git a/tpm-tools/no-werror.patch b/tpm-tools/no-werror.patch index 573f2dc80..711d8670c 100644 --- a/tpm-tools/no-werror.patch +++ b/tpm-tools/no-werror.patch @@ -1,5 +1,5 @@ ---- tpm-tools-1.3.6/configure.ORIG 2011-09-11 01:15:55.353300286 -0700 -+++ tpm-tools-1.3.6/configure 2011-09-11 01:16:04.469966672 -0700 +--- tpm-tools-1.3.7/configure 2011-09-07 16:48:29.000000000 +0200 ++++ tpm-tools-1.3.7_NEW/configure 2012-01-06 14:59:52.970136356 +0100 @@ -13037,7 +13037,7 @@ fi diff --git a/traverso-git/PKGBUILD b/traverso-git/PKGBUILD index 68a7eebc2..189362088 100644 --- a/traverso-git/PKGBUILD +++ b/traverso-git/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: Philipp Überbacher pkgname=traverso-git -pkgver=20111205 +pkgver=20120114 pkgrel=1 pkgdesc="DAW with an innovative and fast Graphical User Interface" arch=('i686' 'x86_64') url="http://traverso-daw.org" license=('GPL') -depends=('jack' 'lame' 'wavpack' 'qt' 'fftw' 'libmad' 'redland' 'raptor1') +depends=('jack' 'lame' 'wavpack' 'qt' 'fftw' 'libmad' 'lilv') makedepends=('git' 'cmake') provides=('traverso') conflicts=('traverso') diff --git a/trayer-dwm/PKGBUILD b/trayer-dwm/PKGBUILD index 788d647a0..8a922f80c 100644 --- a/trayer-dwm/PKGBUILD +++ b/trayer-dwm/PKGBUILD @@ -26,6 +26,7 @@ build() { patch -p1 -i "$srcdir/manpage.diff" patch -p1 -i "$srcdir/dwm.diff" sed -i 's/$(LIBS) $(OBJ) $(SYSTRAYOBJ)/$(OBJ) $(SYSTRAYOBJ) $(LIBS)/' Makefile + sed -i 's/-lXmu/-lXmu -lX11/' Makefile.common make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" } diff --git a/trousers/PKGBUILD b/trousers/PKGBUILD index d26197b6b..0e8f95194 100644 --- a/trousers/PKGBUILD +++ b/trousers/PKGBUILD @@ -1,10 +1,11 @@ -# Maintainer: Gavin Lloyd +# Maintainer: Robert Buhren +# Contributor: Gavin Lloyd # Contributor: xav # Contributor: julian pkgname=trousers -pkgver=0.3.7 -pkgrel=3 +pkgver=0.3.8 +pkgrel=1 pkgdesc="Open-source TCG Software Stack implementation for use with a TPM" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/trousers" @@ -12,20 +13,20 @@ license=('CPL') depends=('openssl') install=${pkgname}.install source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz + no-werror.patch tss-user.patch - no-werror.patch ${pkgname}.install tcsd) -md5sums=('0b4bc5daed265a56409a9c7af77c7ca6' - '9a82bc0d3a08753c1aac5bfa3a4294a9' - '326e92ef91883b3fe7f261c11e1c0e69' +md5sums=('6411e70e24e55a22885193484f6669be' + '7b9db39b3144194d691e703cf6bb4afd' + 'c69c679b5dc64974c450f6f094f6b522' '3808cb22913851d0e93349cbac7b2900' '9fa52c5a41ddc58e7826488424db310a') build() { cd ${srcdir} - patch -p 0 < tss-user.patch patch -p 0 < no-werror.patch + patch -p 0 < tss-user.patch cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib --with-openssl=/usr diff --git a/trousers/no-werror.patch b/trousers/no-werror.patch index 61cc67971..c7c93f498 100644 --- a/trousers/no-werror.patch +++ b/trousers/no-werror.patch @@ -1,6 +1,6 @@ ---- trousers-0.3.7/configure.ORIG 2011-09-10 19:24:04.969048520 -0700 -+++ trousers-0.3.7/configure 2011-09-10 19:24:15.689048201 -0700 -@@ -12716,7 +12716,7 @@ +--- trousers-0.3.8_ORG/configure 2012-01-06 12:32:25.862498967 +0100 ++++ trousers-0.3.8/configure 2012-01-06 13:00:00.224342034 +0100 +@@ -12708,7 +12708,7 @@ if test "x${GCC}" = "xyes"; then diff --git a/trousers/tss-user.patch b/trousers/tss-user.patch index 98a26c19a..5cfdee6ae 100644 --- a/trousers/tss-user.patch +++ b/trousers/tss-user.patch @@ -1,6 +1,6 @@ ---- trousers-0.3.7-orig/dist/Makefile.am 2010-01-28 22:47:32.000000000 +0100 -+++ trousers-0.3.7/dist/Makefile.am 2010-02-01 15:24:24.782825558 +0100 -@@ -2,15 +2,9 @@ +--- trousers-0.3.8_ORG/dist/Makefile.am 2012-01-06 12:32:25.855832307 +0100 ++++ trousers-0.3.8/dist/Makefile.am 2012-01-06 12:46:18.958344853 +0100 +@@ -2,16 +2,9 @@ fedora/fedora.initrd.tcsd install: install-exec-hook if test ! -e ${DESTDIR}/@sysconfdir@/tcsd.conf; then mkdir -p ${DESTDIR}/@sysconfdir@ && cp tcsd.conf ${DESTDIR}/@sysconfdir@; fi @@ -16,11 +16,12 @@ + @echo "rule install-exec-hook skipped" uninstall-hook: - /usr/sbin/userdel tss || true -diff -aburN trousers-0.3.4-orig/dist/Makefile.in trousers-0.3.4/dist/Makefile.in ---- trousers-0.3.7-orig/dist/Makefile.in 2010-01-28 22:56:44.000000000 +0100 -+++ trousers-0.3.7/dist/Makefile.in 2010-02-01 15:24:59.142799178 +0100 -@@ -364,15 +364,9 @@ +- /usr/sbin/userdel tss || true +- /usr/sbin/groupdel tss || true ++ @echo "rule uninstall-hook skipped" +--- trousers-0.3.8_ORG/dist/Makefile.in 2012-01-06 12:32:25.855832307 +0100 ++++ trousers-0.3.8/dist/Makefile.in 2012-01-06 12:42:47.328535153 +0100 +@@ -367,20 +367,11 @@ install: install-exec-hook if test ! -e ${DESTDIR}/@sysconfdir@/tcsd.conf; then mkdir -p ${DESTDIR}/@sysconfdir@ && cp tcsd.conf ${DESTDIR}/@sysconfdir@; fi @@ -33,7 +34,13 @@ diff -aburN trousers-0.3.4-orig/dist/Makefile.in trousers-0.3.4/dist/Makefile.in - /bin/sh -c 'if [ ! -e ${DESTDIR}/@localstatedir@/lib/tpm ];then mkdir -p ${DESTDIR}/@localstatedir@/lib/tpm; fi' - /bin/chown tss:tss ${DESTDIR}/@localstatedir@/lib/tpm || true - /bin/chmod 0700 ${DESTDIR}/@localstatedir@/lib/tpm +- + @echo "rule install-exec-hook skipped" - uninstall-hook: - /usr/sbin/userdel tss || true +- /usr/sbin/userdel tss || true +- /usr/sbin/groupdel tss || true +- ++ @echo "rule uninstall-hook skipped" + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff --git a/upp-svn/PKGBUILD b/upp-svn/PKGBUILD index aee2cba82..fa6ec3fb2 100644 --- a/upp-svn/PKGBUILD +++ b/upp-svn/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jan Dolinar pkgname=upp-svn -pkgver=4412 +pkgver=4416 pkgrel=1 pkgdesc="Radical and innovative multiplatform C++ framework (known as U++)" arch=('any') -- 2.11.4.GIT