Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/dwdiff/PKGBUILD
	community/ejabberd/PKGBUILD
	community/gnome-settings-daemon-updates/PKGBUILD
	community/gpicview/PKGBUILD
	community/libgexiv2/PKGBUILD
	community/mapnik/PKGBUILD
	community/mplayer2/PKGBUILD
	community/open-vm-tools/PKGBUILD
	community/vdrift/PKGBUILD
	community/xboard/PKGBUILD
	core/openssh/PKGBUILD
	extra/boost/PKGBUILD
	extra/dconf/PKGBUILD
	extra/elfutils/PKGBUILD
	extra/gconf/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-disk-utility/PKGBUILD
	extra/gnome-menus/PKGBUILD
	extra/gnome-panel/PKGBUILD
	extra/gnome-power-manager/PKGBUILD
	extra/gnome-themes-standard/PKGBUILD
	extra/gobject-introspection/PKGBUILD
	extra/gtk3/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/icu/PKGBUILD
	extra/libgsf/PKGBUILD
	extra/libimobiledevice/PKGBUILD
	extra/libplist/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/mutter/PKGBUILD
	extra/pango/PKGBUILD
	extra/php/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/telepathy-kde-accounts-kcm/PKGBUILD
	extra/telepathy-kde-approver/PKGBUILD
	extra/telepathy-kde-auth-handler/PKGBUILD
	extra/telepathy-kde-contact-list/PKGBUILD
	extra/telepathy-kde-filetransfer-handler/PKGBUILD
	extra/telepathy-kde-integration-module/PKGBUILD
	extra/telepathy-kde-send-file/PKGBUILD
	extra/telepathy-kde-text-ui/PKGBUILD
	extra/totem-plparser/PKGBUILD
	extra/virtuoso/PKGBUILD
	extra/yelp/PKGBUILD
	libre/unarchiver/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-glib2/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	testing/binutils/PKGBUILD

3 files changed, 49 insertions, 49 deletions

diff --git a/extra/libgweather/PKGBUILD b/extra/libgweather/PKGBUILD
index e98bc6ae5..5f182ad52 100644
--- a/extra/libgweather/PKGBUILD
+++ b/extra/libgweather/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 141132 2011-10-24 16:18:24Z ibiru $
+# $Id: PKGBUILD 156902 2012-04-23 09:08:42Z ibiru $
 # Maintainer: Jan de Groot  <jgc@archlinux.org>
 
 pkgname=libgweather
-pkgver=3.2.1
+pkgver=3.4.1
 pkgrel=1
 pkgdesc="Provides access to weather information from the net"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('gconf' 'libsoup-gnome' 'gnome-icon-theme')
-makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gobject-introspection' 'gnome-common')
+makedepends=('intltool' 'gtk-doc' 'gobject-introspection' 'gnome-common')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org/"
 install=libgweather.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
         gettext-not-xml.patch)
-sha256sums=('495f6d0f79947d6e601db3220360b1fcd6ae43608cd1571be5bcd5c05b7388d5'
-            '5b6bf182294b8974a89492237d98b60678b83efcf31de8a0ca1bebd90f3356a3')
+sha256sums=('ee9c4d09f33ae2b066dd1e696aa3e483a689cba6d63bcd388cc2ef95df9b1b60'
+            '3808da5c27bad1152eee824db2cead21de599af198eca017a18e1b0adb366330')
 
 build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
+    cd "$pkgname-$pkgver"
 
-    patch -Np1 -i "${srcdir}/gettext-not-xml.patch"
+    patch -Np1 -i "$srcdir/gettext-not-xml.patch"
     gtkdocize
     autoreconf -fi
 
@@ -31,10 +31,10 @@ build() {
 }
 
 package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+    cd "$pkgname-$pkgver"
+    make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
 
-    install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-    gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain libgweather ${pkgdir}/etc/gconf/schemas/*.schemas
-    rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+    install -m755 -d "$pkgdir/usr/share/gconf/schemas"
+    gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain libgweather "$pkgdir"/etc/gconf/schemas/*.schemas
+    rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
 }
diff --git a/extra/libgweather/gettext-not-xml.patch b/extra/libgweather/gettext-not-xml.patch
index db9c64148..46ea98f48 100644
--- a/extra/libgweather/gettext-not-xml.patch
+++ b/extra/libgweather/gettext-not-xml.patch
@@ -1,7 +1,7 @@
-diff -up libgweather-3.1.3/configure.ac.gettext libgweather-3.1.3/configure.ac
---- libgweather-3.1.3/configure.ac.gettext	2011-07-04 10:52:13.000000000 -0400
-+++ libgweather-3.1.3/configure.ac	2011-07-06 20:26:17.180168365 -0400
-@@ -43,19 +43,16 @@ GNOME_MAINTAINER_MODE_DEFINES
+diff -Nur libgweather-3.4.0.orig/configure.ac libgweather-3.4.0/configure.ac
+--- libgweather-3.4.0.orig/configure.ac	2012-03-08 20:49:21.497783149 +0000
++++ libgweather-3.4.0/configure.ac	2012-03-08 20:59:21.082941563 +0000
+@@ -43,19 +43,16 @@
  LT_PREREQ([2.2.6])
  LT_INIT([dlopen win32-dll disable-static])
  
@@ -16,16 +16,16 @@ diff -up libgweather-3.1.3/configure.ac.gettext libgweather-3.1.3/configure.ac
  AC_PATH_PROG(GCONFTOOL, gconftool-2)
  
 -AC_ARG_ENABLE(all-translations-in-one-xml,
--        [AC_HELP_STRING([--enable-all-translations-in-one-xml],
+-        [AS_HELP_STRING([--enable-all-translations-in-one-xml],
 -                        [Put all translations in a big Locations.xml file (slow to parse)])],
 -        [enable_big_xml=yes],
 -        [enable_big_xml=no])
 -AM_CONDITIONAL(USE_ONE_BIG_XML, test "x$enable_big_xml" = "xyes")
 -
  AC_ARG_ENABLE(locations-compression,
-         [AC_HELP_STRING([--enable-locations-compression],
+         [AS_HELP_STRING([--enable-locations-compression],
                          [Compress Locations.xml files])],
-@@ -191,7 +188,7 @@ AC_OUTPUT([
+@@ -178,7 +175,7 @@
  Makefile
  doc/Makefile
  po/Makefile.in
@@ -34,9 +34,9 @@ diff -up libgweather-3.1.3/configure.ac.gettext libgweather-3.1.3/configure.ac
  libgweather/Makefile
  libgweather/gweather-3.0.pc
  libgweather/gweather-3.0-uninstalled.pc
-@@ -199,12 +196,6 @@ data/Makefile
- icons/Makefile
+@@ -187,12 +184,6 @@
  ])
+ AC_OUTPUT
  
 -if test "x$enable_big_xml" = "xyes"; then
 -	LOCATIONS_XML_TRANSLATIONS="one big file"
@@ -47,17 +47,17 @@ diff -up libgweather-3.1.3/configure.ac.gettext libgweather-3.1.3/configure.ac
  dnl ***************************************************************************
  dnl *** Display Summary                                                     ***
  dnl ***************************************************************************
-@@ -215,6 +206,4 @@ libgweather-$VERSION configure summary:
+@@ -203,6 +194,4 @@
  	Source code location:		${srcdir}
  	Compiler:			${CC}
  	Introspection support:          ${found_introspection}
 -	Locations.xml translations:	${LOCATIONS_XML_TRANSLATIONS}
 -	Locations.xml compression:	${enable_locations_compression}
  " >&2
-diff -up libgweather-3.1.3/data/Makefile.am.gettext libgweather-3.1.3/data/Makefile.am
---- libgweather-3.1.3/data/Makefile.am.gettext	2011-04-04 16:52:54.000000000 -0400
-+++ libgweather-3.1.3/data/Makefile.am	2011-07-06 20:18:42.244855841 -0400
-@@ -4,55 +4,23 @@ libgweatherdtd_DATA = locations.dtd
+diff -Nur libgweather-3.4.0.orig/data/Makefile.am libgweather-3.4.0/data/Makefile.am
+--- libgweather-3.4.0.orig/data/Makefile.am	2012-03-08 20:49:21.484449916 +0000
++++ libgweather-3.4.0/data/Makefile.am	2012-03-08 21:00:28.359065326 +0000
+@@ -4,55 +4,23 @@
  libgweatherlocationsdir = $(pkgdatadir)
  libgweatherlocations_in_files = Locations.xml.in
  
@@ -119,9 +119,9 @@ diff -up libgweather-3.1.3/data/Makefile.am.gettext libgweather-3.1.3/data/Makef
  ### Locations.xml.in rebuild
  rebuild-locations: locationdb.sqlite update-locations.py
  	$(AM_V_GEN)($(srcdir)/update-locations.py > Locations.xml.in.new && mv Locations.xml.in.new Locations.xml.in) || rm -f Locations.xml.in.new
-diff -up libgweather-3.1.3/libgweather/gweather-location.c.gettext libgweather-3.1.3/libgweather/gweather-location.c
---- libgweather-3.1.3/libgweather/gweather-location.c.gettext	2010-02-09 07:28:03.000000000 -0500
-+++ libgweather-3.1.3/libgweather/gweather-location.c	2011-07-06 20:18:42.251855754 -0400
+diff -Nur libgweather-3.4.0.orig/libgweather/gweather-location.c libgweather-3.4.0/libgweather/gweather-location.c
+--- libgweather-3.4.0.orig/libgweather/gweather-location.c	2012-03-08 20:49:21.487783240 +0000
++++ libgweather-3.4.0/libgweather/gweather-location.c	2012-03-08 21:00:28.359065326 +0000
 @@ -22,11 +22,14 @@
  #include <config.h>
  #endif
@@ -137,7 +137,7 @@ diff -up libgweather-3.1.3/libgweather/gweather-location.c.gettext libgweather-3
  
  #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
  #include "gweather-location.h"
-@@ -184,10 +187,20 @@ location_new_from_xml (GWeatherParser *p
+@@ -185,10 +188,20 @@
  
  	tagname = (const char *) xmlTextReaderConstName (parser->xml);
  	if (!strcmp (tagname, "name") && !loc->name) {
@@ -160,9 +160,9 @@ diff -up libgweather-3.1.3/libgweather/gweather-location.c.gettext libgweather-3
  	    xmlFree (value);
  	    normalized = g_utf8_normalize (loc->name, -1, G_NORMALIZE_ALL);
  	    loc->sort_name = g_utf8_casefold (normalized, -1);
-diff -up libgweather-3.1.3/libgweather/gweather-timezone.c.gettext libgweather-3.1.3/libgweather/gweather-timezone.c
---- libgweather-3.1.3/libgweather/gweather-timezone.c.gettext	2010-02-09 07:28:03.000000000 -0500
-+++ libgweather-3.1.3/libgweather/gweather-timezone.c	2011-07-06 20:18:42.252855742 -0400
+diff -Nur libgweather-3.4.0.orig/libgweather/gweather-timezone.c libgweather-3.4.0/libgweather/gweather-timezone.c
+--- libgweather-3.4.0.orig/libgweather/gweather-timezone.c	2012-03-08 20:49:21.487783240 +0000
++++ libgweather-3.4.0/libgweather/gweather-timezone.c	2012-03-08 21:00:28.359065326 +0000
 @@ -23,6 +23,7 @@
  #endif
  
@@ -171,7 +171,7 @@ diff -up libgweather-3.1.3/libgweather/gweather-timezone.c.gettext libgweather-3
  
  #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
  #include "gweather-timezone.h"
-@@ -152,7 +153,7 @@ static GWeatherTimezone *
+@@ -154,7 +155,7 @@
  parse_timezone (GWeatherParser *parser)
  {
      GWeatherTimezone *zone = NULL;
@@ -180,7 +180,7 @@ diff -up libgweather-3.1.3/libgweather/gweather-timezone.c.gettext libgweather-3
      int offset = 0, dst_offset = 0;
      gboolean has_dst = FALSE;
  
-@@ -175,27 +176,34 @@ parse_timezone (GWeatherParser *parser)
+@@ -177,27 +178,34 @@
  		continue;
  	    }
  
@@ -219,9 +219,9 @@ diff -up libgweather-3.1.3/libgweather/gweather-timezone.c.gettext libgweather-3
      if (name)
  	xmlFree (name);
  
-diff -up libgweather-3.1.3/po-locations/LINGUAS.gettext libgweather-3.1.3/po-locations/LINGUAS
---- libgweather-3.1.3/po-locations/LINGUAS.gettext	2011-07-06 20:18:42.253855730 -0400
-+++ libgweather-3.1.3/po-locations/LINGUAS	2011-07-06 20:18:42.253855730 -0400
+diff -Nur libgweather-3.4.0.orig/po-locations/LINGUAS libgweather-3.4.0/po-locations/LINGUAS
+--- libgweather-3.4.0.orig/po-locations/LINGUAS	1970-01-01 00:00:00.000000000 +0000
++++ libgweather-3.4.0/po-locations/LINGUAS	2012-03-08 21:00:28.359065326 +0000
 @@ -0,0 +1,78 @@
 +ang
 +ar
@@ -301,9 +301,9 @@ diff -up libgweather-3.1.3/po-locations/LINGUAS.gettext libgweather-3.1.3/po-loc
 +zh_CN
 +zh_HK
 +zh_TW
-diff -up libgweather-3.1.3/po-locations/Makefile.in.in.gettext libgweather-3.1.3/po-locations/Makefile.in.in
---- libgweather-3.1.3/po-locations/Makefile.in.in.gettext	2011-07-06 20:18:42.254855718 -0400
-+++ libgweather-3.1.3/po-locations/Makefile.in.in	2011-07-06 20:18:42.254855718 -0400
+diff -Nur libgweather-3.4.0.orig/po-locations/Makefile.in.in libgweather-3.4.0/po-locations/Makefile.in.in
+--- libgweather-3.4.0.orig/po-locations/Makefile.in.in	1970-01-01 00:00:00.000000000 +0000
++++ libgweather-3.4.0/po-locations/Makefile.in.in	2012-03-08 21:00:28.359065326 +0000
 @@ -0,0 +1,217 @@
 +# Makefile for program source directory in GNU NLS utilities package.
 +# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
@@ -522,9 +522,9 @@ diff -up libgweather-3.1.3/po-locations/Makefile.in.in.gettext libgweather-3.1.3
 +# Tell versions [3.59,3.63) of GNU make not to export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -up libgweather-3.1.3/po-locations/POTFILES.in.gettext libgweather-3.1.3/po-locations/POTFILES.in
---- libgweather-3.1.3/po-locations/POTFILES.in.gettext	2011-07-06 20:18:42.254855718 -0400
-+++ libgweather-3.1.3/po-locations/POTFILES.in	2011-07-06 20:18:42.254855718 -0400
+diff -Nur libgweather-3.4.0.orig/po-locations/POTFILES.in libgweather-3.4.0/po-locations/POTFILES.in
+--- libgweather-3.4.0.orig/po-locations/POTFILES.in	1970-01-01 00:00:00.000000000 +0000
++++ libgweather-3.4.0/po-locations/POTFILES.in	2012-03-08 21:00:28.359065326 +0000
 @@ -0,0 +1,4 @@
 +# This list should contain *only* data/Locations.xml.in.
 +# Everything else should be in POTFILES.skip.
diff --git a/extra/libgweather/libgweather.install b/extra/libgweather/libgweather.install
index 7062d4167..0d646b872 100644
--- a/extra/libgweather/libgweather.install
+++ b/extra/libgweather/libgweather.install
@@ -1,8 +1,8 @@
 pkgname=libgweather
 
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/gnome
+  gconfpkg --install $pkgname
+  gtk-update-icon-cache -q -t -f /usr/share/icons/gnome
 }
 
 pre_upgrade() {
@@ -14,9 +14,9 @@ post_upgrade() {
 }
 
 pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
+  gconfpkg --uninstall $pkgname
 }
 
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/gnome
+  gtk-update-icon-cache -q -t -f /usr/share/icons/gnome
 }