Sun Jan 15 23:14:55 UTC 2012

4 files changed, 54 insertions, 49 deletions

diff --git a/extra/gjs/PKGBUILD b/extra/gjs/PKGBUILD
index 37ba73ba9..b7dc6877c 100644
--- a/extra/gjs/PKGBUILD
+++ b/extra/gjs/PKGBUILD
@@ -1,7 +1,8 @@
-# $Id: PKGBUILD 139275 2011-10-01 18:57:14Z ibiru $
+# $Id: PKGBUILD 146616 2012-01-14 12:13:58Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
+
 pkgname=gjs
-pkgver=1.30.0
+pkgver=1.30.1
 pkgrel=1
 pkgdesc="Javascript Bindings for GNOME"
 arch=('i686' 'x86_64')
@@ -9,17 +10,17 @@ url="http://live.gnome.org/Gjs"
 license=('GPL')
 depends=('cairo' 'dbus-glib' 'gobject-introspection' 'js')
 options=('!libtool')
-source=(http://download.gnome.org/sources/${pkgname}/1.30/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('ffe01980dd183abd96b2cc861d2e86ef12751d0a1af86daa4c491b82c74ac7b9')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('f5db07ddf70458a33a5d0bdf83f84070fc234237ecb0d49a8676e67b52119a05')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
   sed -i 's|python|python2|' scripts/make-tests
   ./configure --prefix=/usr --disable-static
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index 125c5eb13..53a37e5c8 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 146473 2012-01-11 15:22:18Z stephane $
+# $Id: PKGBUILD 146608 2012-01-14 08:15:18Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase="libreoffice"
@@ -35,9 +35,9 @@ pkgname=('libreoffice-common'
 	'libreoffice-extension-validator'
 	'libreoffice-extension-watch-window'
 	'libreoffice-extension-wiki-publisher')
-_LOver=3.4.4.2
-pkgver=3.4.4
-pkgrel=5
+_LOver=3.4.5.2
+pkgver=3.4.5
+pkgrel=1
 arch=('i686' 'x86_64')
 #_LO_tree="3.4"
 _OFFICEUPD="340"
@@ -61,8 +61,11 @@ makedepends=( # makedepends
 
 _mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
 #_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
+#_mirror="http://dev-builds.libreoffice.org/pre-releases-3-4/src"
 _additional_source_url="http://hg.services.openoffice.org/binaries"
+_additional_source_url="http://dev-www.libreoffice.org/src"
 source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}.tar.bz2 #,translations
+	${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 	${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 	${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
@@ -102,11 +105,9 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions
 	buildfix_boost.diff
 	buildfix_ct2n.diff
 	vbahelper.visibility.patch
-	scp2-more-reasonable-file-access-rights.diff
-	oracle-recognition.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=549e54fb2f8113502743c443d6deadfe648dede1
-	RemovetheoslSecuritygetHomeDircheck.diff::http://cgit.freedesktop.org/libreoffice/ure/patch/?id=bc9b86940a707e9e2e1076f2954f38075398b5d7
-	gcc462_buildfix.diff)
+	scp2-more-reasonable-file-access-rights.diff)
 noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll
+	f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
 	ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
 	798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
@@ -142,25 +143,26 @@ noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt
 	b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
 	90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2)
-md5sums=('be8b13f83045f0a53b69fe76d6d72e9c'
-         'db423cbb1cee416b718138044a5de930'
-         '31944d2139d6d81ef1131bd513530621'
-         'f447fd4ffe54aab9561c6caa262754b3'
-         '97fe698737a35c8803712d4e08007620'
-         'acff44d97a5106d9b53c747dabeb0800'
-         '620d43a0b9f36388f423e030513864ef'
-         '4c5b1ed870363eca2602f0cb42a8415a'
-         '702c6ca31525d7d2c2ded86c77b0bd2e'
-         'ac9b3acf78f43c1395d0e2dedc860f30'
-         'd8d2c41cb86bc8ba2a07e001a5317abb'
-         '4d4af2fc06dbe33ec2307df812f7abe1'
-         '1398a566eb76598bf3005e187fc2386c'
-         'dd962d2d57f88b9e07e665adad3cabbc'
-         'fff0fc9cd16ef1eb2b2ed5d0a6e77f95'
-         'e54d41d39e63d04ac4a88ce79e37af98'
-         'dbc71403040f447683bf55d1f0be3cad'
-         '69ce5b72f44b008d0e78767c5b1dbf39'
-         '34a2e8ae6b81a042966740263c53e135'
+md5sums=('a75d7d4ebefb4c9a4bb256acf866fa81'
+         'c1e2dabdf4cfcd5957779014a7f9787e'
+         '79c9c7fc208e7f56af09f284f261a7da'
+         'c83a8a374d3d5cc83c6ac3b5ff613e46'
+         'fa64799ebad8cbd2c160ac2f87bd5599'
+         'b24fba57aa4185934e86a0a8db4a3433'
+         '4f98020088ab9b597fc21b617121bd47'
+         '3c3be7c5f923339c90b0d1d6ecad0243'
+         '3a0bb4bb096b7488533ed2ee466a2bc9'
+         'f2b180aa1eff3884b4ca81c048f1e327'
+         'a9af488ef92ad4442eafba874249c529'
+         'db6a67c96a9090bc5e21b64e202a984e'
+         'e00187ae0840e1f6a00fa3290cacf0d1'
+         '20fbf6cffd2b06e90a52105b75a57828'
+         '4af055f590732ec19a2534b2278ac49c'
+         'c84693796d2b1d9c8269425b1fa53aef'
+         'd4926dc27b6884656feec6753f4fdf22'
+         '770678ca19cca0f7985c1c82b2dccf48'
+         '97a1e3de430b124faf35bf334248ad53'
+         'f02578f5218f217a9f20e9c30e119c6a'
          '1f24ab1d39f4a51faf22244c94a6203f'
          '35c94d2df8893241173de1d16b6034c0'
          '798b2ffdc8bcfe7bca2cf92b62caf685'
@@ -200,10 +202,7 @@ md5sums=('be8b13f83045f0a53b69fe76d6d72e9c'
          'bc228237108cab7745897a9f466b6d39'
          'eee273f501ff45dc5f1365e78c6d57c0'
          '43b145db28e6c0d73578ae6fd35e510d'
-         '37638431e7e40baf2e47966ebb9bc0e9'
-         '3c6c62e77c30649a3dfe73512947cc9a'
-         'eb35d4c715e0dfc23bbc706996033829'
-         '10600d04ee81014bc9b5cc04e615d799')
+         '37638431e7e40baf2e47966ebb9bc0e9')
 
 build() {
 
@@ -233,10 +232,6 @@ build() {
 	patch -Np1 -i ${srcdir}/buildfix_ct2n.diff
 	patch -Np0 -i ${srcdir}/vbahelper.visibility.patch
 	patch -Np0 -i ${srcdir}/scp2-more-reasonable-file-access-rights.diff
-	patch -Np1 -i ${srcdir}/oracle-recognition.diff
-	patch -Np1 -i ${srcdir}/RemovetheoslSecuritygetHomeDircheck.diff
-	# https://www.libreoffice.org/bugzilla/show_bug.cgi?id=43139
-	patch -Np1 -i ${srcdir}/gcc462_buildfix.diff
 	
 	# unset C(XX)FLAGS
 	# http://www.openoffice.org/issues/show_bug.cgi?id=103205
@@ -290,7 +285,6 @@ build() {
 		--enable-lockdown\
 		--enable-opengl \
 		--enable-odk\
-		--enable-opengl\
 		--enable-ext-barcode \
 		--enable-ext-diagram \
 		--enable-ext-google-docs \
@@ -333,7 +327,7 @@ build() {
 		--with-external-libtextcat-data \
 		--with-openldap\
 		--with-ant-home="/usr/share/java/apache-ant"\
-		--with-system-boost\
+		--without-system-boost\
 		--with-system-cairo\
 		--with-system-libs\
 		--with-system-mozilla\
diff --git a/extra/qtwebkit/PKGBUILD b/extra/qtwebkit/PKGBUILD
index 84a006909..c0c13dd98 100644
--- a/extra/qtwebkit/PKGBUILD
+++ b/extra/qtwebkit/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 145469 2011-12-22 22:02:51Z andrea $
+# $Id: PKGBUILD 146627 2012-01-14 15:25:15Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=qtwebkit
 pkgver=2.2.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://trac.webkit.org/wiki/QtWebKit'
 pkgdesc='An open source web browser engine (Qt port)'
@@ -13,8 +13,10 @@ makedepends=('python2' 'mesa' 'chrpath')
 conflicts=('qt<4.8')
 #source=("http://get.qt.nokia.com/${pkgname}/QtWebKit-${pkgver}.tar.gz"
 source=("ftp://ftp.archlinux.org/other/${pkgname}/QtWebKit-${pkgver}.tar.gz"
+        "ftp://ftp.archlinux.org/other/${pkgname}/qwebview-4.8.0.tar.bz2"
         'python2-path.patch')
 sha1sums=('283fc116882157df0474af496be73bb9b34cb001'
+          '0e44b27a0f71aceb91a89a2c28ab6331126518d9'
           'b0ef3d5596171e3900a685df9bcfac3068ad6330')
 
 build() {
@@ -28,6 +30,11 @@ build() {
     --makeargs="${MAKEFLAGS}" \
     --release \
     --3d-canvas
+
+  # Build the QWebView plugin (FS#27914)
+  cd "${srcdir}"/QtWebKit-${pkgver}/qwebview-4.8.0/plugins/qwebview
+  qmake
+  make
 }
 
 package() {
@@ -36,4 +43,7 @@ package() {
 
   # Fix RPATH
   chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/qt/imports/QtWebKit/libqmlwebkitplugin.so
+
+  cd "${srcdir}"/QtWebKit-${pkgver}/qwebview-4.8.0/plugins/qwebview
+  make INSTALL_ROOT="${pkgdir}" install
 }
diff --git a/extra/ristretto/PKGBUILD b/extra/ristretto/PKGBUILD
index 7bd21048b..3c45bbd56 100644
--- a/extra/ristretto/PKGBUILD
+++ b/extra/ristretto/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 144969 2011-12-12 17:23:28Z andrea $
+# $Id: PKGBUILD 146610 2012-01-14 08:51:04Z eric $
 # Maintainer:
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=ristretto
-pkgver=0.3.0
+pkgver=0.3.1
 pkgrel=1
 pkgdesc="A fast and lightweight picture-viewer for Xfce"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ makedepends=('intltool')
 groups=('xfce4-goodies')
 install=ristretto.install
 source=("http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2")
-sha1sums=('c7034ad543bea3c1b99a2336dcee9d5ba480b2bb')
+sha1sums=('1a0c4a5f0edf6594d14c7e24fb41a6127c4c1774')
 
 build() {
   cd "${srcdir}/$pkgname-$pkgver"