Sun Apr 8 00:02:42 UTC 2012

4 files changed, 166 insertions, 29 deletions

diff --git a/staging/libreoffice/PKGBUILD b/staging/libreoffice/PKGBUILD
index 07f3c14e5..54d5640f9 100644
--- a/staging/libreoffice/PKGBUILD
+++ b/staging/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 154994 2012-04-01 08:55:21Z andyrtr $
+# $Id: PKGBUILD 155765 2012-04-06 08:45:54Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase="libreoffice"
@@ -19,9 +19,9 @@ pkgname=('libreoffice-common'
 	'libreoffice-extension-presenter-screen'
 	'libreoffice-extension-presentation-minimizer'
 	'libreoffice-extension-report-builder')
-_LOver=3.5.1.2
-pkgver=3.5.1
-pkgrel=3
+_LOver=3.5.2.2
+pkgver=3.5.2
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -75,7 +75,6 @@ source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
 	http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	gmake_install.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=1048d8fa4abd3e55a45dfb6884db808da1d72c9e
 	smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810
-	buildfix_kde4fpicker.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=ee67c55260ec7723c39606955ccdbd3e2934935a
 	buildfix_icu49.diff
 	libreoffice-common.sh libreoffice-common.csh)
 noextract=(d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2
@@ -106,9 +105,9 @@ noextract=(d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2
 	ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
 	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
 	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip)
-md5sums=('1edf0d39a7a921f6415f6a6ec7b314b3'
-         '607b544cd7b38f9e6db6fe7da25007a7'
-         'a3fa7818bfab14a6cccec645193e9982'
+md5sums=('a21156d5657b8619a523ffdc5cc0003e'
+         '3c064a24191274fcd8fd466ce9d5dc42'
+         '17ebcd0d25e716d3905b1a905907fd67'
          '18f577b374d60b3c760a3a3350407632'
          'd28864eb2b59bb57b034c0d4662a3cee'
          '1f24ab1d39f4a51faf22244c94a6203f'
@@ -139,7 +138,6 @@ md5sums=('1edf0d39a7a921f6415f6a6ec7b314b3'
          '185d60944ea767075d27247c3162b3bc'
          '60ce5dc9bd098f95c2e621a930c98dd9'
          '661a52a02a31b3afbe4b3b3146061afd'
-         '15fe8b5d79fbdc0b6bc2b454086671e7'
          '9734ea20c9f67e1b6e1c5a1247fbd3ff'
          '32fcd844935434807e68d7bd06b94f09'
          '06a45184aefe078c4314e002ba666b52')
@@ -166,7 +164,6 @@ build() {
 	# one late fix to solve make distro-pack-install issue
 	patch -Np1 -i ${srcdir}/gmake_install.diff
 	patch -Np1 -i ${srcdir}/smp_buildfix.diff
-	patch -Np1 -i ${srcdir}/buildfix_kde4fpicker.diff
 	patch -Np0 -i ${srcdir}/buildfix_icu49.diff
 	
 	# unset C(XX)FLAGS
@@ -335,12 +332,6 @@ package_libreoffice-common() {
  ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
  cd ${pkgdir}/usr/lib/libreoffice/share/psprint/
  ln -vsf /etc/libreoffice/psprint.conf .
-
- #fix http://bugs.archlinux.org/task/17656
- find ${pkgdir} -perm 444 -exec ls -lh {} \;
- find ${pkgdir} -perm 444 -exec chmod 644 {} \;
- find ${pkgdir} -perm 555 -exec ls -lh {} \;
- find ${pkgdir} -perm 555 -exec chmod 755 {} \;
  
  # set python-uno PYTHON path
  install -dm755 ${pkgdir}/etc/profile.d
@@ -553,19 +544,9 @@ package_libreoffice-sdk() {
    mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
  done
  
- # fix ArchLinux LibreOffice installation paths	
- sed -i -e "s,@OO_SDK_NAME@,libreoffice-sdk," \
-        -e "s,@OO_SDK_HOME@,/usr/lib/libreoffice/sdk," \
-        -e "s,@OFFICE_HOME@,/usr/lib/libreoffice," \
-        -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice," \
-        -e "s,@OO_SDK_URE_HOME@,/usr/lib/libreoffice/ure," \
-        -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \
-        -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \
-        -e "s,@OO_SDK_CPP_HOME@,/usr/bin," \
-        -e "s,@OO_SDK_CC_55_OR_HIGHER@,," \
-        -e "s,@OO_SDK_JAVA_HOME@,\$J2SDKDIR," \
-        -e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \
-        -e "s,@SDK_AUTO_DEPLOYMENT@,NO," ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{csh,sh}.in
+  # fix environment path to keep compatibility with openjdk6 and openjdk7
+  #sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:"          /usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh}
+  sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh}
 }
 
 package_libreoffice-sdk-doc() {
diff --git a/staging/libwebkit/PKGBUILD b/staging/libwebkit/PKGBUILD
new file mode 100644
index 000000000..e48ede41e
--- /dev/null
+++ b/staging/libwebkit/PKGBUILD
@@ -0,0 +1,59 @@
+# $Id: PKGBUILD 155762 2012-04-06 07:52:12Z ibiru $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+
+pkgbase=libwebkit
+pkgname=(libwebkit libwebkit3)
+pkgver=1.8.0
+pkgrel=2
+pkgdesc="An opensource web content engine"
+arch=('i686' 'x86_64')
+url="http://webkitgtk.org/"
+license=('custom')
+depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 'enchant' 'libgl'
+         'geoclue')
+makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'gtk3' 'mesa')
+options=('!libtool' '!emptydirs')
+source=(http://webkitgtk.org/releases/webkit-$pkgver.tar.xz)
+sha256sums=('8cebd53b412ae9eb192493ad8e41fa8739a7b1a00f74c6b5a69d367709a801bc')
+
+build() {
+  cd "$srcdir/webkit-$pkgver"
+  mkdir build-gtk{2,3}
+
+  # clear makeflags: race during introspection.
+  # WebKit*.gir should be created before WebKit*.typelib, but isn't
+  MAKEFLAGS=
+
+  ( cd build-gtk2 && _build --with-gtk=2.0 )
+  ( cd build-gtk3 && _build --with-gtk=3.0 )
+}
+
+_build() {
+  PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
+    --enable-introspection \
+    --with-font-backend=freetype \
+    --with-unicode-backend=icu \
+    --enable-spellcheck "$@"
+  make all stamp-po
+}
+
+package_libwebkit() {
+  pkgdesc+=" (for GTK2)"
+  depends+=(gtk2)
+
+  cd "$srcdir/webkit-$pkgver/build-gtk2"
+  make DESTDIR="$pkgdir" install
+  install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/libwebkit/LICENSE"
+}
+
+package_libwebkit3() {
+  pkgdesc+=" (for GTK3)"
+  depends+=(gtk3)
+
+  cd "$srcdir/webkit-$pkgver/build-gtk3"
+  make DESTDIR="$pkgdir" install
+  install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/libwebkit3/LICENSE"
+}
+
+
+
diff --git a/staging/tracker/PKGBUILD b/staging/tracker/PKGBUILD
new file mode 100644
index 000000000..5273f9e95
--- /dev/null
+++ b/staging/tracker/PKGBUILD
@@ -0,0 +1,84 @@
+# $Id: PKGBUILD 155781 2012-04-06 12:00:40Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Alexander Fehr <pizzapunk gmail com>
+
+pkgbase=tracker
+pkgname=(tracker libtracker-sparql)
+pkgver=0.14.0
+_tver=${pkgver%.*}
+pkgrel=2
+pkgdesc="All-in-one indexer, search tool and metadata database"
+arch=('i686' 'x86_64')
+license=('GPL')
+makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi'
+             'poppler-glib' 'libgsf' 'icu' 'enca' 'networkmanager' 'gtk3'
+             'desktop-file-utils' 'hicolor-icon-theme' 'gobject-introspection'
+             'intltool' 'giflib' 'gstreamer0.10-base' 'totem-plparser'
+             'taglib' 'nautilus' 'gnome-panel' 'libvorbis' 'flac' 'vala')
+url="http://www.gnome.org"
+options=('!libtool' '!emptydirs')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz)
+sha256sums=('78e432c5c14b9d186ccca3c382accdcdb4f07c2c6e25989fda48401b4a68f7d4')
+
+build() {
+  cd $pkgbase-$pkgver
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --libexecdir=/usr/lib/tracker \
+    --disable-unit-tests \
+    --enable-libflac \
+    --enable-libvorbis
+
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
+  make
+}
+
+package_tracker() {
+  depends=("libtracker-sparql=$pkgver-$pkgrel" 'libgee' 'libgnome-keyring'
+           'upower' 'libexif' 'exempi' 'poppler-glib' 'libgsf' 'enca'
+           'networkmanager' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme')
+  optdepends=('giflib: extractor for GIF data'
+              'gstreamer0.10-base: video extractor'
+              'totem-plparser: playlist support'
+              'nautilus: nautilus-extension'
+              'libvorbis: Vorbis metadata extractor'
+              'flac: FLAC metadata extractor'
+              'taglib: writeback for audio files'
+              'gnome-panel: tracker-search-bar')
+  groups=('gnome-extra')
+  install=tracker.install
+
+  cd $pkgbase-$pkgver
+  make DESTDIR="$pkgdir" install
+
+### Split libtracker-sparql
+
+  mkdir -p "$srcdir"/sparql/usr/{include,lib}/tracker-$_tver
+  mkdir -p "$srcdir"/sparql/usr/lib/{girepository-1.0,pkgconfig}
+  mkdir -p "$srcdir"/sparql/usr/share/{gir-1.0,vala/vapi}
+
+  mv "$pkgdir"/usr/lib/libtracker-sparql-* "$srcdir/sparql/usr/lib"
+
+  mv "$pkgdir"/usr/lib/tracker-$_tver/*.so* \
+    "$srcdir/sparql/usr/lib/tracker-$_tver"
+
+  mv "$pkgdir"/usr/share/vala/vapi/tracker-sparql-* \
+    "$srcdir/sparql/usr/share/vala/vapi"
+
+  mv {"$pkgdir","$srcdir/sparql"}/usr/include/tracker-$_tver/libtracker-sparql
+  mv {"$pkgdir","$srcdir/sparql"}/usr/lib/girepository-1.0/Tracker-$_tver.typelib
+  mv {"$pkgdir","$srcdir/sparql"}/usr/lib/pkgconfig/tracker-sparql-$_tver.pc
+  mv {"$pkgdir","$srcdir/sparql"}/usr/share/gir-1.0/Tracker-$_tver.gir
+}
+
+package_libtracker-sparql() {
+  pkgdesc="$pkgdesc (SPARQL library)"
+  depends=('sqlite3' 'icu' 'glib2' 'libffi' 'pcre' 'util-linux')
+
+  mv "$srcdir"/sparql/* "$pkgdir"
+}
diff --git a/staging/tracker/tracker.install b/staging/tracker/tracker.install
new file mode 100644
index 000000000..95114273e
--- /dev/null
+++ b/staging/tracker/tracker.install
@@ -0,0 +1,13 @@
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}