Sat Apr 21 00:01:27 UTC 2012

10 files changed, 77 insertions, 43 deletions

diff --git a/extra/kdevelop-php/PKGBUILD b/extra/kdevelop-php/PKGBUILD
index 6e2041ba4..009fe1136 100644
--- a/extra/kdevelop-php/PKGBUILD
+++ b/extra/kdevelop-php/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 153918 2012-03-20 14:06:28Z andrea $
+# $Id: PKGBUILD 156483 2012-04-19 10:23:39Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdevelop-php
-pkgver=1.3.0
-_pkgver=4.3.0
+pkgver=1.3.1
+_pkgver=4.3.1
 pkgrel=1
 pkgdesc="PHP language and documentation plugin for KDevelop/Quanta"
 arch=('i686' 'x86_64')
@@ -14,8 +14,8 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdevelop-php-docs')
 conflicts=('kdevelop-php-docs')
 source=(http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-{,docs-}${pkgver}.tar.bz2)
-sha1sums=('8ae280cf5085c473b6b95b3683629b49d19dfe12'
-          '398001b7d192af4c71bddb246dfd59d61db02618')
+sha1sums=('c5d31de0bf0ae4b242b6265851807e5b44606525'
+          '2b5c3dd2b26196a83bc95cfe8ee595e160f595f0')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdevelop/PKGBUILD b/extra/kdevelop/PKGBUILD
index 8a679c943..7890cd561 100644
--- a/extra/kdevelop/PKGBUILD
+++ b/extra/kdevelop/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 153916 2012-03-20 14:05:01Z andrea $
+# $Id: PKGBUILD 156481 2012-04-19 10:22:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=kdevelop
-pkgver=4.3.0
+pkgver=4.3.1
 pkgrel=1
 pkgdesc="A C/C++ development environment for KDE"
 arch=('i686' 'x86_64')
 url="http://www.kdevelop.org/"
 license=('GPL')
-depends=('kdebase-workspace' 'kdevplatform' 'kdesdk-okteta' 'kdebase-kwrite')
+depends=('kdebase-workspace' 'kdevplatform' 'kdesdk-okteta' 'kdebase-katepart')
 makedepends=('cmake' 'automoc4')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('06a91f9ae0fc15bcec12a92bd9c30a7517b3b8e0')
+sha1sums=('99596bf333bf5a62547f3dc0800674db146eb401')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdevplatform/PKGBUILD b/extra/kdevplatform/PKGBUILD
index 4b489927e..a60d25716 100644
--- a/extra/kdevplatform/PKGBUILD
+++ b/extra/kdevplatform/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 153914 2012-03-20 14:01:46Z andrea $
+# $Id: PKGBUILD 156479 2012-04-19 10:22:22Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=kdevplatform
-pkgver=1.3.0
-_pkgver=4.3.0
+pkgver=1.3.1
+_pkgver=4.3.1
 pkgrel=1
 pkgdesc="A C/C++ development platform for KDE"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ optdepends=("kdesdk-kompare: difference checking")
 makedepends=('cmake' 'automoc4' 'boost')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('990ec335418445ae11b8ee11aa9a25729994de59')
+sha1sums=('bba0cefdac6de83c8d3354534a94e8500dccda37')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/link-grammar/PKGBUILD b/extra/link-grammar/PKGBUILD
index 2d30106bb..6a3cd512f 100644
--- a/extra/link-grammar/PKGBUILD
+++ b/extra/link-grammar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 143897 2011-11-30 19:52:19Z giovanni $
+# $Id: PKGBUILD 156475 2012-04-19 09:19:16Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=link-grammar
-pkgver=4.7.4
-pkgrel=2
+pkgver=4.7.5
+pkgrel=1
 pkgdesc="A Grammar Checking library"
 arch=('i686' 'x86_64')
 url="http://www.abisource.com/downloads/link-grammar/"
@@ -12,7 +12,7 @@ license=('BSD')
 depends=('glibc')
 options=('!libtool' '!makeflags')
 source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('e90e702a953641713a1292db20677bd2')
+md5sums=('598e531d8f213e0a2b211631e5c7e5bb')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 090556f7b..1a4f8b0a0 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 155693 2012-04-05 06:04:51Z giovanni $
+# $Id: PKGBUILD 156477 2012-04-19 09:35:14Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2012.04.04
+pkgver=2012.04.18
 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=('25ad098a6e4a2e329ca6295a9ba27074')
+md5sums=('52248a7081e2989777258df4e37be966')
 
 build() {
   cd ${srcdir}/live
@@ -28,7 +28,7 @@ build() {
 package() {
   cd ${srcdir}/live
 
-  for dir in BasicUsageEnvironment UsageEnvironment groupsock liveMedia; do
+  for dir in BasicUsageEnvironment groupsock liveMedia UsageEnvironment; do
     install -dm755 ${pkgdir}/usr/{bin,lib,include/${dir}}
     install -m644 ${dir}/*.a "${pkgdir}/usr/lib"
     install -m644 ${dir}/include/*.h* "${pkgdir}/usr/include/${dir}"
diff --git a/extra/qrencode/PKGBUILD b/extra/qrencode/PKGBUILD
index c51ab4609..7caabccb0 100644
--- a/extra/qrencode/PKGBUILD
+++ b/extra/qrencode/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 155309 2012-04-01 16:17:46Z bluewind $
+# $Id: PKGBUILD 156492 2012-04-19 15:59:03Z bluewind $
 # Maintainer: Florian Pritz< flo@xinu.at>
 # Contributor: Dany Martineau <dany.luc.martineau@gmail.com>
 
 pkgname=qrencode
-pkgver=3.3.0
+pkgver=3.3.1
 pkgrel=1
 pkgdesc="C library for encoding data in a QR Code symbol."
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ url="http://megaui.net/fukuchi/works/qrencode/index.en.html"
 license=('GPL')
 options=(!libtool)
 source=(http://megaui.net/fukuchi/works/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('b7531107ffd8e4f9ce262e87893b01ca')
+md5sums=('14920ba9d0515bddcaebfbd728229c5d')
 
 build() {
   cd "${srcdir}/$pkgname-$pkgver"
diff --git a/extra/scim/PKGBUILD b/extra/scim/PKGBUILD
index 924610761..fca464709 100644
--- a/extra/scim/PKGBUILD
+++ b/extra/scim/PKGBUILD
@@ -1,34 +1,41 @@
-# $Id: PKGBUILD 137306 2011-09-06 22:52:36Z bisson $
+# $Id: PKGBUILD 156513 2012-04-20 01:11:09Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Gan Lu <rhythm.gan@gmail.com>
 
 pkgname=scim
-pkgver=1.4.11
-pkgrel=2
+pkgver=1.4.12
+pkgrel=1
 pkgdesc='Input method user interface and development platform'
 url='http://www.scim-im.org/projects/scim'
-license=('GPL')
-arch=('i686' 'x86_64')
+license=('LGPL')
 options=('!libtool')
+arch=('i686' 'x86_64')
 makedepends=('intltool')
-depends=('gtk2' 'libtool')
+depends=('libltdl' 'gtk2')
 backup=('etc/scim/config' 'etc/scim/global')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('e202e42df52f5c9a88f6ae4d4ce04f94bc22e27c')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
+        'ftp://ftp.archlinux.org/other/scim/scim-docs-20120420.tar.xz')
+sha1sums=('948180ec0af18e435a95edbdb840cf41f3b24d32'
+          'b2cccb43673e1760abf6825768bc4354a981a0ad')
+
+# Docs tarball temporarily generated with:
+# 	svn co https://scim.svn.sourceforge.net/svnroot/scim/scim/trunk/docs docs
 
 install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
+	mv ../docs .
 	./bootstrap
+	sed 's/\$nls_cv_use_gnu_gettext/yes/' -i configure
+
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--disable-static \
-		--with-gnu-ld \
-		--with-x \
+		--with-gtk-version=2 # still a couple issues with 3
 
 	make
 }
diff --git a/extra/scim/install b/extra/scim/install
index 405061cb4..c05312bfd 100644
--- a/extra/scim/install
+++ b/extra/scim/install
@@ -1,7 +1,5 @@
 post_install() {
-	echo -n 'updating gtk.immodules... '
 	/usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-	echo 'done.'
 }
 
 post_upgrade() {
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index 83693d62f..cfce9bffb 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 155972 2012-04-10 13:26:02Z tdziedzic $
+# $Id: PKGBUILD 156508 2012-04-20 01:03:19Z tdziedzic $
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Maintainer: tobias [ tobias at archlinux org ]
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -10,7 +10,7 @@ _patchlevel=495
 __hgrev=a104dae7f903
 _versiondir="vim${_topver//./}"
 pkgver=${_topver}.${_patchlevel}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('custom:vim')
 url="http://www.vim.org"
@@ -52,6 +52,9 @@ mksource() {
 }
 
 build() {
+  # remove -O2 because there is a crash with python because of it
+  export CFLAGS="-march=x86-64 -mtune=generic -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
+
   cd "${srcdir}"
 
   cp -a ${pkgname}-${pkgver} vim-build
@@ -91,6 +94,18 @@ build() {
   make
 }
 
+check() {
+  # disable tests because they seem to freeze
+
+  cd "${srcdir}"/vim-build
+
+  #make test
+
+  cd "${srcdir}"/gvim-build
+
+  #make test
+}
+
 package_vim() {
   pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor'
   depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm')
diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD
index f50c28492..60a330305 100644
--- a/extra/wireshark/PKGBUILD
+++ b/extra/wireshark/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 154405 2012-03-27 21:06:46Z guillaume $
-# Maintainer: Guillaume ALAUX <guillaume at alaux dot net>
+# $Id: PKGBUILD 156497 2012-04-19 21:01:40Z guillaume $
+# Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
-pkgname=(wireshark-cli wireshark-gtk)
+pkgname=('wireshark-cli' 'wireshark-gtk' 'wireshark-dev')
 pkgbase=wireshark
-pkgver=1.6.6
+pkgver=1.6.7
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -11,7 +11,7 @@ makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'li
 url="http://www.wireshark.org/"
 options=(!libtool)
 source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
-md5sums=('61145ccd7684b3cfb159fc902fedfecf')
+md5sums=('7e39f1c0ea4abd8bffa5122df800ca5d')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -55,3 +55,17 @@ package_wireshark-gtk() {
   done
   install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop"
 }
+
+package_wireshark-dev() {
+  pkgdesc="A free network protocol analyzer for Unix/Linux and Windows - header files"
+  depends=('wireshark-cli')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  install -dm755 ${pkgdir}/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes},wiretap,wsutil}
+
+  install -m644 color.h config.h register.h "${pkgdir}/usr/include/${pkgbase}"
+  for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes wiretap wsutil; do
+    install -m644 ${d}/*.h ${pkgdir}/usr/include/${pkgbase}/${d}
+  done
+}