Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/abe/PKGBUILD
	community/account-plugins/PKGBUILD
	community/adesklets/PKGBUILD
	community/aircrack-ng/PKGBUILD
	community/audit/PKGBUILD
	community/bchunk/PKGBUILD
	community/bibutils/PKGBUILD
	community/cantata/PKGBUILD
	community/cdck/PKGBUILD
	community/cinnamon-control-center/PKGBUILD
	community/clusterssh/PKGBUILD
	community/consonance/PKGBUILD
	community/credentials-preferences/PKGBUILD
	community/dee/PKGBUILD
	community/dosbox/PKGBUILD
	community/drbd/PKGBUILD
	community/dvdisaster/PKGBUILD
	community/ekg/PKGBUILD
	community/ekg2/PKGBUILD
	community/emelfm2/PKGBUILD
	community/erlang/PKGBUILD
	community/ettercap/PKGBUILD
	community/evilwm/PKGBUILD
	community/fatrat/PKGBUILD
	community/fcitx-mozc/PKGBUILD
	community/fcrackzip/PKGBUILD
	community/ffmpegsource/PKGBUILD
	community/fssos-nsvs/PKGBUILD
	community/geda-gaf/PKGBUILD
	community/gnome-applets/PKGBUILD
	community/gnome-panel/PKGBUILD
	community/gnustep-make/PKGBUILD
	community/gwibber/PKGBUILD
	community/html2text/PKGBUILD
	community/intellij-idea-libs/PKGBUILD
	community/libcgns2/PKGBUILD
	community/libmatio/PKGBUILD
	community/librcc/PKGBUILD
	community/libsignon-glib/PKGBUILD
	community/linux-tools/PKGBUILD
	community/minitube/PKGBUILD
	community/mpdscribble/PKGBUILD
	community/mplayer2/PKGBUILD
	community/musepack-tools/PKGBUILD
	community/nginx/PKGBUILD
	community/pam_pwcheck/PKGBUILD
	community/portaudio/PKGBUILD
	community/portaudio_cpp/PKGBUILD
	community/prelink/PKGBUILD
	community/projectm/PKGBUILD
	community/prosody/PKGBUILD
	community/python-basemap/PKGBUILD
	community/qgit/PKGBUILD
	community/raptor1/PKGBUILD
	community/sensors-applet/PKGBUILD
	community/signon-keyring-extension/PKGBUILD
	community/signon-plugin-oauth2/PKGBUILD
	community/signon-ui/PKGBUILD
	community/sshguard/PKGBUILD
	community/tea/PKGBUILD
	community/tint2/PKGBUILD
	community/tremulous/PKGBUILD
	community/vobcopy/PKGBUILD
	community/windowlab/PKGBUILD
	community/xdelta/PKGBUILD
	community/xmms2/PKGBUILD
	community/xosd/PKGBUILD
	core/gdbm/PKGBUILD
	core/heirloom-mailx/PKGBUILD
	core/libffi/PKGBUILD
	core/procps-ng/PKGBUILD
	core/systemd/PKGBUILD
	core/tar/PKGBUILD
	cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
	extra/arj/PKGBUILD
	extra/audacity/PKGBUILD
	extra/cdparanoia/PKGBUILD
	extra/elfutils/PKGBUILD
	extra/fltk/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gstreamer/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/indent/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/lcms/PKGBUILD
	extra/lesstif/PKGBUILD
	extra/libchewing/PKGBUILD
	extra/libdrm/PKGBUILD
	extra/libmodplug/PKGBUILD
	extra/libnotify/PKGBUILD
	extra/libsm/PKGBUILD
	extra/libxmu/PKGBUILD
	extra/libxpm/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/mesa/PKGBUILD
	extra/mkvtoolnix/PKGBUILD
	extra/neon/PKGBUILD
	extra/ocaml/PKGBUILD
	extra/phonon-vlc/PKGBUILD
	extra/php-xcache/PKGBUILD
	extra/polkit/PKGBUILD
	extra/pycups/PKGBUILD
	extra/python-cairo/PKGBUILD
	extra/python/PKGBUILD
	extra/ruby/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/talloc/PKGBUILD
	extra/thunar-archive-plugin/PKGBUILD
	extra/totem-plparser/PKGBUILD
	extra/totem/PKGBUILD
	extra/vinagre/PKGBUILD
	extra/vino/PKGBUILD
	extra/vlc/PKGBUILD
	extra/wget/PKGBUILD
	extra/xine-lib/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/xorg-twm/PKGBUILD
	extra/xorg-xclipboard/PKGBUILD
	extra/xorg-xclock/PKGBUILD
	extra/xorg-xkill/PKGBUILD
	extra/xorg-xlsclients/PKGBUILD
	extra/xorg-xman/PKGBUILD
	extra/xorg-xrdb/PKGBUILD
	extra/xpdf/PKGBUILD
	extra/xvidcore/PKGBUILD
	extra/yelp/PKGBUILD
	libre/audacious-plugins-libre/PKGBUILD
	libre/mc-libre/PKGBUILD
	libre/python2-reportlab-libre/PKGBUILD

1 files changed, 19 insertions, 34 deletions

diff --git a/community/gnome-panel/PKGBUILD b/community/gnome-panel/PKGBUILD
index 4740091d5..3081043f6 100644
--- a/community/gnome-panel/PKGBUILD
+++ b/community/gnome-panel/PKGBUILD
@@ -1,53 +1,40 @@
-# $Id: PKGBUILD 96624 2013-09-02 13:22:45Z bgyorgy $
+# $Id: PKGBUILD 98191 2013-10-07 12:08:25Z jgc $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gnome-panel
 pkgname=('gnome-panel' 'gnome-flashback-session')
-pkgver=3.6.2
-pkgrel=7
+pkgver=3.8.0
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 pkgdesc="Legacy GNOME panel"
 url="https://live.gnome.org/GnomePanel"
 depends=('dconf' 'evolution-data-server' 'gconf' 'gnome-desktop' 'gnome-menus' 'librsvg'
          'libwnck3' 'telepathy-glib')
-makedepends=('gobject-introspection' 'intltool' 'yelp-tools' 'networkmanager' 'gnome-common')
+makedepends=('gobject-introspection' 'intltool' 'itstool' 'networkmanager')
 install=$pkgbase.install
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:3}/$pkgbase-$pkgver.tar.xz
-        gnome-desktop-3.8.patch
-        drop-gweather-xml-include.patch
-        18_fix_force_quit_applet.patch
-        0001-Add-the-GNOME-Flashback-session.patch
-        fix-autoconf.patch)
-sha256sums=('a41c45c5512e796b8602ce50bf0d205993eab364c860aae31afa582d77b77079'
-            '3a67f4b07a7dd356fad6b40a43983f3945123ed40080eb153396a481b34efc0c'
-            'e3298c62bc577969817c5d6752be83a5129004fd344e4f7998a0d8aa61874305'
-            '9d742f675d9e09a032bfe00e0523a4ef7e234589a74a6086243bf335ce212775'
-            '79b6aab33bde167446ddea7f5c1a815dee150ba4a0678577464acbd2ba4a7504'
-            '6828c097505d2dbbf465ed7ff694adbd646a0af2105c8dd864d1061bf0afea71')
+        libgweather-3.10.patch
+        session.patch)
+sha256sums=('d1cda458a38cb4f7d2a50c61b1a72f4bf4c39cab65ae0e6cfdc4e0c122252e7a'
+            'd9e21449fc6c5f235673fe47e5b817ac7597490518a557908b14ca875263d90e'
+            'cd4c21cf394ea5a702c660bb0d31cae31260bec1cee4e7ca8ee6c8aec2707ebb')
 
-build() {
+prepare() {
   cd "$pkgbase-$pkgver"
 
-  # Port to gnome-desktop 3.8
-  patch -Np1 -i "$srcdir/gnome-desktop-3.8.patch"
-
-  # Fix build with libgweather 3.8
-  patch -Np0 -i "$srcdir/drop-gweather-xml-include.patch"
+  # Fix build with libgweather 3.10
+  patch -Np1 -i "$srcdir/libgweather-3.10.patch"
 
-  # Fix force quit applet to avoid freeze
-  patch -Np1 -i "$srcdir/18_fix_force_quit_applet.patch"
-
-  # Add GNOME Flashback session
-  # https://bugzilla.gnome.org/show_bug.cgi?id=694625
-  patch -Np1 -i "$srcdir/0001-Add-the-GNOME-Flashback-session.patch"
+  # Add more required components to the session file
+  patch -Np1 -i "$srcdir/session.patch"
+}
 
-  # Fix build
-  patch -Np1 -i "$srcdir/fix-autoconf.patch"
+build() {
+  cd "$pkgbase-$pkgver"
 
-  autoreconf -fi
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgbase \
               --disable-static --disable-schemas-compile \
               PYTHON=/usr/bin/python2 
@@ -58,11 +45,8 @@ package_gnome-panel() {
   cd "$pkgbase-$pkgver"
   make DESTDIR="$pkgdir" install
 
-  # Remove unneeded script
-  rm "$pkgdir/usr/lib/gnome-panel/gnome-panel-add"
-
   # Split out the session files
-  rm -r "$pkgdir"/usr/share/{gnome-session,xsessions}
+  rm -r "$pkgdir"/usr/{lib/gnome-panel/gnome-*,share/{gnome-session,xsessions}}
 }
 
 package_gnome-flashback-session() {
@@ -74,6 +58,7 @@ package_gnome-flashback-session() {
   install=
 
   cd "$pkgbase-$pkgver"
+  make -C gnome-panel DESTDIR="$pkgdir" install-libexecSCRIPTS
   make -C data DESTDIR="$pkgdir" install-sessionDATA
   make -C data DESTDIR="$pkgdir" install-xsessionDATA
 }