Mon Mar 25 00:05:30 PDT 2013

author: root <root@rshg054.dnsready.net> 2013-03-25 00:05:30 -0700
committer: root <root@rshg054.dnsready.net> 2013-03-25 00:05:30 -0700
commit: 32793d9a5b60ef0591c71c12ad75121d9b155adf (patch)
tree: ab1afae584dd06fd4ab20f57fb5a624e907f0985 /extra
parent: 31416859638d756d88136e4e0eb78027c16ac17f (diff)
21 files changed, 270 insertions, 97 deletions
diff --git a/extra/gegl/PKGBUILD b/extra/gegl/PKGBUILD
index 6e9cfd9ea..ce98d5f33 100644
--- a/extra/gegl/PKGBUILD
+++ b/extra/gegl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 169746 2012-10-27 23:41:47Z eric $
+# $Id: PKGBUILD 180578 2013-03-23 23:09:32Z td123 $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=gegl
 pkgver=0.2.0
-pkgrel=5
+pkgrel=6
 pkgdesc="Graph based image processing framework"
 arch=('i686' 'x86_64')
 url="http://www.gegl.org/"
diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD
index f77500bc2..f70320e11 100644
--- a/extra/graphviz/PKGBUILD
+++ b/extra/graphviz/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 179080 2013-03-03 07:46:56Z bisson $
+# $Id: PKGBUILD 180579 2013-03-23 23:09:33Z td123 $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=graphviz
 pkgver=2.30.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Graph visualization software'
 url='http://www.graphviz.org/'
 license=('custom:EPL')
@@ -35,11 +35,14 @@ build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
 	sed \
-		-e '/"archdir"/s:$:+" '"$(echo -I/usr/include/ruby-1.9.1/{$CARCH-linux,ruby/backward,})"'":' \
+		-e '/"archdir"/s:$:+" '"$(echo -I/usr/include/ruby-2.0.0/{$CARCH-linux,ruby/backward,})"'":' \
 		-e '/CONFIG/s:site:vendor:' \
 		-i config/config_ruby.rb
+	sed \
+		-e 's:ruby-1.9:ruby-2.0:g' \
+		-e '/LIBPOSTFIX="64"/d' \
+		-i configure
 
-	sed '/LIBPOSTFIX="64"/d' -i configure
 	source /etc/profile.d/qt4.sh
 	export PYTHON=python2
 	export LUA=lua5.1
diff --git a/extra/gummiboot/PKGBUILD b/extra/gummiboot/PKGBUILD
index 2bd4a9e55..99ca11299 100644
--- a/extra/gummiboot/PKGBUILD
+++ b/extra/gummiboot/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 180109 2013-03-17 07:03:05Z tpowa $
+# $Id: PKGBUILD 180605 2013-03-24 16:16:26Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 # Contributor:  Mantas Mikulėnas <grawity@gmail.com>
 
 pkgname="gummiboot"
-pkgver="28"
+pkgver="29"
 pkgrel="1"
 pkgdesc="Simple text-mode UEFI Boot Manager"
 url="http://freedesktop.org/wiki/Software/gummiboot"
@@ -39,6 +39,6 @@ package() {
 	cd "${srcdir}/${pkgname}-${pkgver}/"
 	make DESTDIR="${pkgdir}" install
 }
-md5sums=('3a3a4f2e68ea72cf76a18b2f34d3b002'
+md5sums=('7e133411b805ce6fb5dd3e3bd08b88a2'
          '6ea803e5179d623716e3be0b636de658'
          '82bda9612e3a361a74cf8de2a0134b15')
diff --git a/extra/kdebindings-korundum/PKGBUILD b/extra/kdebindings-korundum/PKGBUILD
index 83721fc34..8f1d3987a 100644
--- a/extra/kdebindings-korundum/PKGBUILD
+++ b/extra/kdebindings-korundum/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 179366 2013-03-05 15:29:18Z andrea $
+# $Id: PKGBUILD 180580 2013-03-23 23:09:35Z td123 $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-korundum
 pkgver=4.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Ruby bindings for libraries created by the KDE community"
 url="https://projects.kde.org/projects/kde/kdebindings/ruby/korundum"
 arch=('i686' 'x86_64')
@@ -21,13 +21,12 @@ sha1sums=('ba0326225e6d040ea215f1991295f7e43d5aaed4'
           'c074f027bac3b9bffe70a2c2304a6a7be12be034')
 
 build() {
-  cd "${srcdir}/korundum-${pkgver}"
+  cd korundum-${pkgver}
   patch -p1 -i "${srcdir}/ruby19.patch"
+  cd ../
 
-  cd "${srcdir}"
   mkdir build
   cd build
-
   cmake ../korundum-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DKDE4_BUILD_TESTS=OFF \
@@ -39,6 +38,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/kdebindings-qtruby/PKGBUILD b/extra/kdebindings-qtruby/PKGBUILD
index 1b0c53525..a23330a72 100644
--- a/extra/kdebindings-qtruby/PKGBUILD
+++ b/extra/kdebindings-qtruby/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 179340 2013-03-05 15:23:35Z andrea $
+# $Id: PKGBUILD 180581 2013-03-23 23:09:36Z td123 $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-qtruby
 pkgver=4.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Ruby bindings for the Qt libraries"
 url="https://projects.kde.org/projects/kde/kdebindings/ruby/qtruby"
 arch=('i686' 'x86_64')
@@ -16,7 +16,6 @@ source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.xz")
 sha1sums=('732a5e127ffec591b99b91ed41d00d739d8c0300')
 
 build() {
-  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../qtruby-${pkgver} \
@@ -29,6 +28,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libebml/PKGBUILD b/extra/libebml/PKGBUILD
index 7302de3d0..d4baabe56 100644
--- a/extra/libebml/PKGBUILD
+++ b/extra/libebml/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 143796 2011-11-29 12:02:45Z giovanni $
+# $Id: PKGBUILD 180600 2013-03-24 12:10:12Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: 03/08/04 <lefungus@altern.org>
 
 pkgname=libebml
-pkgver=1.2.2
-pkgrel=2
+pkgver=1.3.0
+pkgrel=1
 pkgdesc="Extensible Binary Meta Language library"
 arch=('i686' 'x86_64')
 url="http://dl.matroska.org/downloads/libebml/"
 license=('LGPL')
 depends=('gcc-libs')
 source=("http://dl.matroska.org/downloads/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('726cc2bd1a525929ff35ff9854c0ebab')
+md5sums=('efec729bf5a51e649e1d9d1f61c0ae7a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}/make/linux"
diff --git a/extra/libmatroska/PKGBUILD b/extra/libmatroska/PKGBUILD
index 78f4f253f..88a3c5b8c 100644
--- a/extra/libmatroska/PKGBUILD
+++ b/extra/libmatroska/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 143895 2011-11-30 19:46:58Z giovanni $
+# $Id: PKGBUILD 180602 2013-03-24 12:53:07Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor 03/08/04 <lefungus@altern.org>
 
 pkgname=libmatroska
-pkgver=1.3.0
-pkgrel=2
+pkgver=1.4.0
+pkgrel=1
 pkgdesc="Matroska library"
 arch=('i686' 'x86_64')
 url="http://dl.matroska.org/downloads/libmatroska/"
 license=('LGPL')
 depends=('libebml')
 source=("http://dl.matroska.org/downloads/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('f4a8c411f09d39c754eb726efd616043')
+md5sums=('5b83155019589b04a49f9db923b5bf74')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}/make/linux"
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index 8bd7cf113..ac49b5778 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180554 2013-03-23 07:24:00Z bpiotrowski $
+# $Id: PKGBUILD 180591 2013-03-24 07:51:29Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase="libreoffice"
@@ -21,7 +21,7 @@ pkgname=('libreoffice-common'
 	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
 _LOver=4.0.1.2
 pkgver=4.0.1
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -78,7 +78,8 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz
 	${_additional_source_url}/libmspub-0.0.5.tar.bz2
 	${_additional_source_url}/libvisio-0.0.25.tar.bz2
 	make-pyuno-work-with-system-wide-module-install.diff
-	libreoffice-common.sh libreoffice-common.csh)
+	libreoffice-common.sh libreoffice-common.csh
+	librelogo.diff)
 noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 	185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2
@@ -148,7 +149,8 @@ md5sums=('52c3bacdf46b4648c5697cc55b648784'
          '92bde158f249b9b27f76f48cc65a0242'
          '97bf43dda273d79ff90c848ab53b0e3c'
          'abcb1b0a7deaffe13ab3d7ca70becb49'
-         '72790a4103da259a55cadd66db931d00')
+         '72790a4103da259a55cadd66db931d00'
+         'cc07fdb40e005ad2a79ba8a6756b0ad6')
 
 build() {
 
@@ -158,6 +160,10 @@ build() {
 
     cd ${srcdir}/libreoffice-$_LOver
 
+    # make librelogo depend on libreoffice-writer
+    # http://cgit.freedesktop.org/libreoffice/core/commit/?id=4e69b35674882d8d675a677940805b187cad0bc3
+    patch -Np1 -i ${srcdir}/librelogo.diff
+
 	# move external sources into place
 	mkdir ${srcdir}/ext_sources &&	pushd ${srcdir}/ext_sources
 	for source in "${noextract[@]}"; do
@@ -206,7 +212,6 @@ build() {
 		--enable-gtk3 \
 		--enable-gstreamer \
 		--enable-lockdown\
-		--enable-mergelibs \
 		--enable-opengl \
 		--enable-odk\
 		--enable-python=system \
@@ -253,7 +258,9 @@ build() {
 		--with-system-clucene\
 		--without-system-servlet-api
 
-#		--without-ppds\
+#		--enable-mergelibs \ # https://bugs.archlinux.org/task/34414
+
+#		--without-ppds\ # breaks spadmin permission
 
 #--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
 
@@ -274,13 +281,12 @@ package_libreoffice-common() {
 
  pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
  install=libreoffice-common.install
- depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6"
+ depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib'
           'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=50.1" 'clucene' 'lcms2' "poppler>=0.22.2"
           'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') # 'orbit2')
  optdepends=('libreoffice-langpack: additional language support'
              'java-runtime:     adds java support'
              'libcups:          adds printing support'
-             'dbus-glib:        adds dbus support'
              'pstoedit:         translates PostScript and PDF graphics into other vector formats'
              'libmythes:        for use in thesaurus'
              'beanshell:        interactive java -- good for prototyping /macros'
@@ -337,6 +343,9 @@ package_libreoffice-common() {
  rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/ScriptProviderForJavaScript.jar
  rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar
  rm -f ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb
+ 
+ # workaround all packages now depend on that file
+ cp  ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/writer.xcd ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd
 }
 
 package_libreoffice-base() {
@@ -388,9 +397,8 @@ package_libreoffice-postgresql-connector() {
 package_libreoffice-calc() {
  pkgdesc="Spreadsheet application for LibreOffice."
  install=libreoffice-calc.install
- #depends=('libreoffice-common' 'lpsolve' )
- depends=('libreoffice-writer' 'lpsolve' ) # some hidden uno linking to parts of the writer pkg - https://bugs.archlinux.org/task/34332
- depends=('libreoffice-writer' 'lpsolve' ) # some hidden uno linking to parts of the writer pkg - https://bugs.archlinux.org/task/34332
+ depends=('libreoffice-common' 'lpsolve' )
+ #depends=('libreoffice-writer' 'lpsolve' ) # some hidden uno linking to parts of the writer pkg - https://bugs.archlinux.org/task/34332
  groups=('libreoffice')
  replaces=('libreoffice')
  
@@ -575,6 +583,9 @@ package_libreoffice-writer() {
    # mv file from fakeinstall to pkgdir
    mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
  done
+ 
+ # for workaround this file belongs now to common
+ rm ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd
 }
 
 package_libreoffice-en-US() {
diff --git a/extra/libreoffice/librelogo.diff b/extra/libreoffice/librelogo.diff
new file mode 100644
index 000000000..c17143225
--- /dev/null
+++ b/extra/libreoffice/librelogo.diff
@@ -0,0 +1,43 @@
+From 939daba04c25a9a3b7be2f3df39692453cf9a304 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman@redhat.com>
+Date: Thu, 21 Mar 2013 14:57:18 +0000
+Subject: Missing dependency of librelogo on writer
+
+...at least due to dependency of librelogo.xcd on writer.xcd, see
+82c53d537a05dadf4d7fd7ea41292897bf2d47c7 "Missing dependency."
+
+Otherwise, having librelogo installed but not writer will cause an uncaught
+RuntimeException from configmgr::Components::parseXcdFiles
+(configmgr/source/components.cxx) early on in soffice.bin.
+
+(cherry picked from commit 4e69b35674882d8d675a677940805b187cad0bc3)
+Conflicts:
+	setup_native/source/packinfo/packinfo_office.txt
+
+Change-Id: I97565fe5c790ed182bb27fd722c650acf8a8ee08
+Reviewed-on: https://gerrit.libreoffice.org/2898
+Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
+Reviewed-by: Andras Timar <atimar@suse.com>
+Reviewed-by: Petr Mladek <pmladek@suse.cz>
+Tested-by: Petr Mladek <pmladek@suse.cz>
+---
+diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
+index 3e8c89e..cbf8c490 100644
+--- a/setup_native/source/packinfo/packinfo_office.txt
++++ b/setup_native/source/packinfo/packinfo_office.txt
+@@ -314,10 +314,10 @@ End
+ Start
+ module = "gid_Module_Optional_Pyuno_LibreLogo"
+ solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-librelogo"
+-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, SUNWPython"
++solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-writer,SUNWPython"
+ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-librelogo"
+-freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
+-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
++freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer"
++requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer"
+ copyright = "2012 The Document Foundation"
+ solariscopyright = "solariscopyrightfile"
+ vendor = "The Document Foundation"
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/libssh/PKGBUILD b/extra/libssh/PKGBUILD
index c546e7b61..fa668b5be 100644
--- a/extra/libssh/PKGBUILD
+++ b/extra/libssh/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 172472 2012-12-03 12:34:31Z tomegun $
+# $Id: PKGBUILD 180604 2013-03-24 15:55:47Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: ice-man <icemanf@gmail.com>
 # Contributor: sergeantspoon <sergeantspoon@archlinux.us>
 
 pkgname=libssh
-pkgver=0.5.3
+pkgver=0.5.4
 pkgrel=1
 pkgdesc="Library for accessing ssh client services through C libraries"
 url="http://www.libssh.org/"
@@ -13,7 +13,7 @@ license=('LGPL')
 arch=('i686' 'x86_64')
 depends=('openssl')
 makedepends=('cmake' 'doxygen')
-source=("https://red.libssh.org/attachments/download/38/${pkgname}-${pkgver}.tar.gz")
+source=("https://red.libssh.org/attachments/download/41/${pkgname}-${pkgver}.tar.gz")
 
 build() {
   cd "${srcdir}"
@@ -29,4 +29,4 @@ package(){
   cd "${srcdir}"/build
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('9ad01838d3b89d98e900e0f6260a88cc')
+md5sums=('b8b4e733c13dfabae33b2688ef82dacc')
diff --git a/extra/ncmpc/PKGBUILD b/extra/ncmpc/PKGBUILD
index 63fdf1565..d6397c819 100644
--- a/extra/ncmpc/PKGBUILD
+++ b/extra/ncmpc/PKGBUILD
@@ -1,37 +1,36 @@
-# $Id: PKGBUILD 150715 2012-02-21 01:22:44Z angvp $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
+# $Id: PKGBUILD 180582 2013-03-23 23:09:37Z td123 $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Daniel Bainton <dpb [at] backarrow.org>
 
 pkgname=ncmpc
 pkgver=0.20
-pkgrel=1
-pkgdesc="A ncurses (command line) interface for MPD"
-arch=("i686" "x86_64")
-url="http://mpd.wikia.com/wiki/Client:Ncmpc"
+pkgrel=2
+pkgdesc='Fully featured MPD client using ncurses'
+url='http://mpd.wikia.com/wiki/Client:Ncmpc'
+arch=('i686' 'x86_64')
 license=('GPL')
 depends=('ncurses' 'glib2' 'libmpdclient')
 optdepends=('python2: to enable lyrics plugin'
-	'ruby: to enable lyrics plugin')
+            'ruby: to enable lyrics plugin')
 source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('62b9df0263d9567babf7446c258acc5d')
+sha1sums=('da106de4b11a48eb2d63619da1316713f95cc9cb')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  sed -i 's#python#python2#' lyrics/30-leoslyrics.py
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --enable-lyrics-screen \
-    --with-lyrics-plugin-dir=/usr/share/ncmpc/lyrics
-  make
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	sed -i 's#python#python2#' lyrics/30-leoslyrics.py
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--enable-lyrics-screen \
+		--with-lyrics-plugin-dir=/usr/share/ncmpc/lyrics
+	make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  install -d ${pkgdir}/usr/share/ncmpc/lyrics
-  install -m755 lyrics/{10-hd.sh,15-leoslyrics.sh,20-lyricwiki.rb,30-leoslyrics.py} \
-    ${pkgdir}/usr/share/ncmpc/lyrics
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+	for i in lyrics/*; do install -Dm755 "$i" "${pkgdir}/usr/share/ncmpc/$i"; done
 }
diff --git a/extra/nx/PKGBUILD b/extra/nx/PKGBUILD
index 93d5028e3..bb5e5e4a4 100644
--- a/extra/nx/PKGBUILD
+++ b/extra/nx/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180572 2013-03-23 15:42:01Z andyrtr $
+# $Id: PKGBUILD 180598 2013-03-24 10:41:11Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 'nx-headers')
 pkgver=3.5.0.18
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://wiki.x2go.org/"
 license=('GPL')
@@ -132,7 +132,8 @@ package_x2go-agent() {
 	
   install -dm755 ${pkgdir}/usr/{bin,lib/x2go/bin,share/{pixmaps,x2go/versions}}
   # this is a nxagent symlink
-  cp -a ${srcdir}/fakeinstall/usr/lib/x2go/bin/x2goagent ${pkgdir}/usr/lib/x2go/bin
+  ln -sv /usr/lib/nx/bin/nxagent ${pkgdir}/usr/lib/x2go/bin/x2goagent 
+
   # the wrapper
   cp -a ${srcdir}/fakeinstall/usr/bin/x2goagent ${pkgdir}/usr/bin
   
diff --git a/extra/qtwebkit/PKGBUILD b/extra/qtwebkit/PKGBUILD
index 90ef10954..190c09638 100644
--- a/extra/qtwebkit/PKGBUILD
+++ b/extra/qtwebkit/PKGBUILD
@@ -1,10 +1,9 @@
-# $Id: PKGBUILD 178989 2013-03-01 10:24:37Z andrea $
+# $Id: PKGBUILD 180583 2013-03-23 23:09:38Z td123 $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=qtwebkit
-pkgver=2.3.beta2
-_pkgver=2.3-beta2
-pkgrel=2
+pkgver=2.3.0
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://trac.webkit.org/wiki/QtWebKit'
 pkgdesc='An open source web browser engine (Qt port)'
@@ -12,10 +11,15 @@ license=('LGPL2.1' 'GPL3')
 depends=('qt4' 'systemd' 'gstreamer0.10-base')
 makedepends=('gperf' 'python2' 'ruby' 'git' 'mesa')
 conflicts=('qt<4.8')
-source=("${pkgname}-${pkgver}.tar.gz"::"http://gitorious.org/webkit/qtwebkit-23/archive-tarball/${pkgname}-${_pkgver}"
-        'use-python2.patch')
-sha1sums=('b1bfa9e3303ce9c95eec0a1e66b2b812b844bf08'
-          '315b6ff603f35e5492a036f7082f6aa075dfb607')
+_qtver=4.8.4
+source=("${pkgname}-${pkgver}.tar.gz"::"http://gitorious.org/webkit/qtwebkit-23/archive-tarball/${pkgname}-${pkgver}"
+        "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${_qtver}.tar.gz"
+        'use-python2.patch'
+        'qwebview.patch')
+sha1sums=('8e0aa2f895376a0a88b55548bfadb270da3708ba'
+          'f5880f11c139d7d8d01ecb8d874535f7d9553198'
+          '315b6ff603f35e5492a036f7082f6aa075dfb607'
+          'ef467fcfc9e74aa88356f27acc21792706ed1e4d')
 
 build() {
   cd webkit-qtwebkit-23
@@ -25,17 +29,28 @@ build() {
   OPTS="--no-webkit2"
   if [ "${CARCH}" = "i686" ]; then
       # FS#33418
-      OPTS="${OPTS} --no-sse2"
+      OPTS="${OPTS} --no-force-sse2"
   fi
 
   export QTDIR=/usr
+  export PATH="/usr/lib/qt4/bin:$PATH"
   Tools/Scripts/build-webkit --qt \
     --makeargs="${MAKEFLAGS}" \
     --prefix=/usr \
     ${OPTS}
+
+  # Build the QWebView plugin (FS#27914)
+  cd ../qt-everywhere-opensource-src-${_qtver}
+  patch -p1 -i "${srcdir}"/qwebview.patch
+  cd tools/designer/src/plugins/qwebview
+  qmake-qt4
+  make
 }
 
 package() {
   cd webkit-qtwebkit-23
   make INSTALL_ROOT="${pkgdir}" -C WebKitBuild/Release install
+
+  cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
+  make INSTALL_ROOT="${pkgdir}" install
 }
diff --git a/extra/qtwebkit/qwebview.patch b/extra/qtwebkit/qwebview.patch
new file mode 100644
index 000000000..98f6f0f03
--- /dev/null
+++ b/extra/qtwebkit/qwebview.patch
@@ -0,0 +1,21 @@
+--- qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pri~	2013-01-09 12:56:08.915412090 +0000
++++ qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pri	2013-01-09 12:58:06.911391299 +0000
+@@ -1,3 +1,6 @@
++INCLUDEPATH += ../../../../../../webkit-qtwebkit-23/WebKitBuild/Release/include
++LIBS += -L../../../../../../webkit-qtwebkit-23/WebKitBuild/Release/lib
++
+ CONFIG += designer
+ win32|mac: CONFIG+= debug_and_release
+ QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer
+--- qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pro~	2013-01-09 12:55:43.598892405 +0000
++++ qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pro	2013-01-09 12:55:53.352169136 +0000
+@@ -2,9 +2,4 @@
+ CONFIG += ordered
+
+ REQUIRES = !CONFIG(static,shared|static)
+-contains(QT_CONFIG, qt3support): SUBDIRS += widgets
+-win32: SUBDIRS += activeqt
+-# contains(QT_CONFIG, opengl): SUBDIRS += tools/view3d
+ contains(QT_CONFIG, webkit): SUBDIRS += qwebview
+-contains(QT_CONFIG, phonon): SUBDIRS += phononwidgets
+-contains(QT_CONFIG, declarative): SUBDIRS += qdeclarativeview
diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD
index 239918d4c..3c829c047 100644
--- a/extra/rrdtool/PKGBUILD
+++ b/extra/rrdtool/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 174294 2013-01-04 03:15:34Z eric $
+# $Id: PKGBUILD 180584 2013-03-23 23:09:38Z td123 $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=rrdtool
 pkgver=1.4.7
-pkgrel=4
+pkgrel=5
 pkgdesc="Data logging and graphing application"
 arch=('i686' 'x86_64')
 url="http://www.rrdtool.org"
@@ -35,6 +35,6 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" includedir=/usr/include install
   install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD
index 5f3c8a174..4f17adce2 100644
--- a/extra/ruby/PKGBUILD
+++ b/extra/ruby/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Jeramy Rutley <jrutley@gmail.com>
 
 pkgname=('ruby' 'ruby-docs')
-pkgver=1.9.3_p392
+pkgver=2.0.0_p0
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.ruby-lang.org/en/'
@@ -13,7 +13,7 @@ makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml')
 options=('!emptydirs' '!makeflags')
 source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2"
         'gemrc')
-md5sums=('a810d64e2255179d2f334eb61fb8519c'
+md5sums=('895c1c581f8d28e8b3bb02472b2ccf6a'
          '6fb8e7a09955e0f64be3158fb4a27e7a')
 
 build() {
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index e96680658..cdec798df 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -6,8 +6,8 @@
 pkgbase=vim
 pkgname=('vim' 'gvim' 'vim-runtime')
 _topver=7.3
-_patchlevel=798
-__hgrev=30b3b1da0350
+_patchlevel=834
+__hgrev=ad7bbe9ea65b
 _versiondir="vim${_topver//./}"
 pkgver=${_topver}.${_patchlevel}
 pkgrel=1
@@ -21,8 +21,8 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz"
         'vimrc'
         'archlinux.vim'
         'gvim.desktop')
-md5sums=('e4a759fdb7cf91d91fd4f8e4f44d5d9c'
-         'ff8221082bdd0f9b63f57e5cc7773ee7'
+md5sums=('f50a7f4e07ae991db324f0c4b3dcad3d'
+         '57e197f51fbbd22944bfc51041ab89d1'
          '6e7adfbd5d26c1d161030ec203a7f243'
          '20fceda56badf201695c57999b0bc609'
          '10353a61aadc3f276692d0e17db1478e'
diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD
index 59d848c63..762abed7c 100644
--- a/extra/weechat/PKGBUILD
+++ b/extra/weechat/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 175728 2013-01-20 12:37:22Z giovanni $
+# $Id: PKGBUILD 180587 2013-03-23 23:09:44Z td123 $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: lucke <lucke at o2 dot pl>
 
 pkgname=weechat
 pkgver=0.4.0
-pkgrel=1
+pkgrel=3
 pkgdesc="Fast, light and extensible IRC client (curses UI)"
 arch=('i686' 'x86_64')
 url="http://www.weechat.org/"
@@ -13,12 +13,18 @@ depends=('gnutls' 'curl' 'libgcrypt')
 makedepends=('cmake' 'pkgconfig' 'perl' 'python2' 'lua' 'tcl>=8.6.0' 'ruby' 'aspell' 'guile')
 optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell' 'guile')
 options=('!libtool')
-source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('b2e10ca1e3a72142fcc8d58c7c774b1b')
+source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2"
+        'ruby-2.0.0-crash-fix.diff')
+md5sums=('b2e10ca1e3a72142fcc8d58c7c774b1b'
+         '8bafb0ec603af018e2d66155640685b4')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  # fix: https://bugs.archlinux.org/task/34342
+  # original commit: http://git.savannah.gnu.org/gitweb/?p=weechat.git;a=commit;h=4fdbb83a079f24a742633fd4d02084911580c19c
+  patch -Np1 -i ${srcdir}/ruby-2.0.0-crash-fix.diff
+
   mkdir build
   cd build
   cmake .. -DPREFIX=/usr \
diff --git a/extra/weechat/ruby-2.0.0-crash-fix.diff b/extra/weechat/ruby-2.0.0-crash-fix.diff
new file mode 100644
index 000000000..bfc816ade
--- /dev/null
+++ b/extra/weechat/ruby-2.0.0-crash-fix.diff
@@ -0,0 +1,76 @@
+X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=weechat.git;a=blobdiff_plain;f=src%2Fplugins%2Fruby%2Fweechat-ruby-api.c;h=101caec961829de03f8097edc63f497eab99aaa3;hp=bbc2fbcbe3c5290a8a975c4676a85a8c7e0998b7;hb=4fdbb83a079f24a742633fd4d02084911580c19c;hpb=55e58811b3df451db4f95b1035a39f5659788989
+
+diff --git a/src/plugins/ruby/weechat-ruby-api.c b/src/plugins/ruby/weechat-ruby-api.c
+index bbc2fbc..101caec 100644
+--- a/src/plugins/ruby/weechat-ruby-api.c
++++ b/src/plugins/ruby/weechat-ruby-api.c
+@@ -1333,28 +1333,21 @@ weechat_ruby_api_config_new_option (VALUE class, VALUE config_file,
+                                     VALUE description, VALUE string_values,
+                                     VALUE min, VALUE max, VALUE default_value,
+                                     VALUE value, VALUE null_value_allowed,
+-                                    VALUE function_check_value,
+-                                    VALUE data_check_value,
+-                                    VALUE function_change,
+-                                    VALUE data_change,
+-                                    VALUE function_delete,
+-                                    VALUE data_delete)
++                                    VALUE callbacks)
+ {
+     char *c_config_file, *c_section, *c_name, *c_type, *c_description;
+     char *c_string_values, *c_default_value, *c_value;
+     char *c_function_check_value, *c_data_check_value, *c_function_change;
+     char *c_data_change, *c_function_delete, *c_data_delete, *result;
+     int c_min, c_max, c_null_value_allowed;
+-    VALUE return_value;
++    VALUE function_check_value, data_check_value, function_change, data_change;
++    VALUE function_delete, data_delete, return_value;
+ 
+     API_FUNC(1, "config_new_option", API_RETURN_EMPTY);
+     if (NIL_P (config_file) || NIL_P (section) || NIL_P (name) || NIL_P (type)
+         || NIL_P (description) || NIL_P (string_values) || NIL_P (min)
+         || NIL_P (max) || NIL_P (default_value) || NIL_P (value)
+-        || NIL_P (null_value_allowed) || NIL_P (function_check_value)
+-        || NIL_P (data_check_value) || NIL_P (function_change)
+-        || NIL_P (data_change) || NIL_P (function_delete)
+-        || NIL_P (data_delete))
++        || NIL_P (null_value_allowed) || NIL_P (callbacks))
+         API_WRONG_ARGS(API_RETURN_EMPTY);
+ 
+     Check_Type (config_file, T_STRING);
+@@ -1368,12 +1361,21 @@ weechat_ruby_api_config_new_option (VALUE class, VALUE config_file,
+     Check_Type (default_value, T_STRING);
+     Check_Type (value, T_STRING);
+     Check_Type (null_value_allowed, T_FIXNUM);
+-    Check_Type (function_check_value, T_STRING);
+-    Check_Type (data_check_value, T_STRING);
+-    Check_Type (function_change, T_STRING);
+-    Check_Type (data_change, T_STRING);
+-    Check_Type (function_delete, T_STRING);
+-    Check_Type (data_delete, T_STRING);
++    Check_Type (callbacks, T_ARRAY);
++
++    /*
++     * due to a Ruby limitation (15 arguments max by function), we receive the
++     * the callbacks in an array of 6 strings (3 callbacks + 3 data)
++     */
++    if (RARRAY_LEN(callbacks) != 6)
++        API_WRONG_ARGS(API_RETURN_EMPTY);
++
++    function_check_value = rb_ary_entry (callbacks, 0);
++    data_check_value = rb_ary_entry (callbacks, 1);
++    function_change = rb_ary_entry (callbacks, 2);
++    data_change = rb_ary_entry (callbacks, 3);
++    function_delete = rb_ary_entry (callbacks, 4);
++    data_delete = rb_ary_entry (callbacks, 5);
+ 
+     c_config_file = StringValuePtr (config_file);
+     c_section = StringValuePtr (section);
+@@ -5915,7 +5917,7 @@ weechat_ruby_api_init (VALUE ruby_mWeechat)
+     API_DEF_FUNC(config_new, 3);
+     API_DEF_FUNC(config_new_section, 14);
+     API_DEF_FUNC(config_search_section, 2);
+-    API_DEF_FUNC(config_new_option, 17);
++    API_DEF_FUNC(config_new_option, 12);
+     API_DEF_FUNC(config_search_option, 3);
+     API_DEF_FUNC(config_string_to_boolean, 1);
+     API_DEF_FUNC(config_option_reset, 2);
diff --git a/extra/x2goclient/PKGBUILD b/extra/x2goclient/PKGBUILD
index 75e038641..2f051b7f5 100644
--- a/extra/x2goclient/PKGBUILD
+++ b/extra/x2goclient/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 179029 2013-03-01 18:54:32Z andrea $
+# $Id: PKGBUILD 180595 2013-03-24 09:37:30Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Gerhard Brauer <gerbra@archlinux.de>
 # Contributor: Richard Murri <admin@richardmurri.com>
 
 pkgname=x2goclient
-pkgver=4.0.0.3
-pkgrel=2
+pkgver=4.0.1.0
+pkgrel=1
 pkgdesc="x2go qt4 client"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -14,7 +14,7 @@ depends=('qt4' 'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 'hicolor-icon-the
 makedepends=('man2html')
 install=x2goclient.install
 source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('e08fa2248f0882ee7ed6c5310d47fcfc')
+md5sums=('ff223344915b9def9e9e5a01ae919532')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/x2goserver/PKGBUILD b/extra/x2goserver/PKGBUILD
index 48b2fe134..25d8a829b 100644
--- a/extra/x2goserver/PKGBUILD
+++ b/extra/x2goserver/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 179012 2013-03-01 14:04:57Z andyrtr $
+# $Id: PKGBUILD 180593 2013-03-24 09:34:13Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 # Contributor: Gerhard Brauer <gerbra@archlinux.de>
@@ -7,8 +7,8 @@
 # Contributor: Milan Knížek <knizek@volny.cz>
 
 pkgname=x2goserver
-pkgver=4.0.0.0
-pkgrel=5
+pkgver=4.0.0.1
+pkgrel=1
 pkgdesc="Open source terminal server"
 arch=('i686' 'x86_64')
 url="http://www.x2go.org/"
@@ -20,7 +20,7 @@ options=('emptydirs')
 install=x2goserver.install
 backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql')
 source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz x2goserver.service)
-md5sums=('1fc38566832c30897c6583e7ffa1fda3'
+md5sums=('85dc2a2d52e82eead744a51007155ff9'
          'b09799f9203150dc1277a56058be48a8')
 
 build() {
@@ -43,7 +43,7 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make PREFIX=/usr DESTDIR="$pkgdir" install
+  make -j1 PREFIX=/usr DESTDIR="$pkgdir" install
 
   # systemd service file - only runs x2gocleansessions
   install -Dm 644 "$srcdir/x2goserver.service" "$pkgdir/usr/lib/systemd/system/x2goserver.service"
author	root <root@rshg054.dnsready.net>	2013-03-25 00:05:30 -0700
committer	root <root@rshg054.dnsready.net>	2013-03-25 00:05:30 -0700
commit	32793d9a5b60ef0591c71c12ad75121d9b155adf (patch)
tree	ab1afae584dd06fd4ab20f57fb5a624e907f0985 /extra
parent	31416859638d756d88136e4e0eb78027c16ac17f (diff)