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

Conflicts:
	community/fotoxx/PKGBUILD
	community/gtkdialog/PKGBUILD
	community/hubbub/PKGBUILD
	community/libgdamm/PKGBUILD
	community/libparserutils/PKGBUILD
	community/mingw32-binutils/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-gcc/PKGBUILD
	community/mtpaint/PKGBUILD
	community/netsurf/PKGBUILD
	community/patchage/PKGBUILD
	community/qgo/PKGBUILD
	community/tomoyo-tools/PKGBUILD
	community/tre/PKGBUILD
	community/virtualbox/PKGBUILD
	core/net-tools/PKGBUILD
	core/openldap/PKGBUILD
	extra/epiphany/PKGBUILD
	extra/evince/PKGBUILD
	extra/evolution-data-server/PKGBUILD
	extra/evolution/PKGBUILD
	extra/exiv2/PKGBUILD
	extra/folks/PKGBUILD
	extra/gimp-ufraw/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-power-manager/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnome-python-extras/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/jack/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/koffice/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/mutter/PKGBUILD
	extra/nautilus/PKGBUILD
	extra/openmpi/PKGBUILD
	extra/pavucontrol/PKGBUILD
	extra/php/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/pygobject2/PKGBUILD
	extra/swt/PKGBUILD
	extra/tomcat/PKGBUILD
	extra/totem/PKGBUILD
	extra/vigra/PKGBUILD
	extra/vte/PKGBUILD
	extra/xulrunner/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	multilib/lib32-atk/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-glew/PKGBUILD
	multilib/lib32-glib2/PKGBUILD
	multilib/lib32-jack/PKGBUILD
	multilib/lib32-libpulse/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	multilib/wine/PKGBUILD
	social/miniupnpc/PKGBUILD
	testing/icedtea-web-java7/PKGBUILD
	testing/sqlite3/PKGBUILD
	~xihh/abiword/PKGBUILD

1 files changed, 29 insertions, 30 deletions

diff --git a/extra/libgweather/gettext-not-xml.patch b/extra/libgweather/gettext-not-xml.patch
index 4fd2e3aa6..db9c64148 100644
--- a/extra/libgweather/gettext-not-xml.patch
+++ b/extra/libgweather/gettext-not-xml.patch
@@ -1,19 +1,18 @@
-diff -up libgweather-2.91.0/configure.ac.gettext libgweather-2.91.0/configure.ac
---- libgweather-2.91.0/configure.ac.gettext	2010-10-04 18:08:07.000000000 -0400
-+++ libgweather-2.91.0/configure.ac	2011-01-30 13:51:19.615635059 -0500
-@@ -40,6 +40,10 @@ LIBXML_REQUIRED=2.6.0
- AM_MAINTAINER_MODE
- GNOME_MAINTAINER_MODE_DEFINES
+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
+ LT_PREREQ([2.2.6])
+ LT_INIT([dlopen win32-dll disable-static])
  
 +dnl IT_PROG_INTLTOOL does this for us in the case of the po/ subdir, but we're on our own for po-locations
 +AC_OUTPUT_COMMANDS([sed -e "/POTFILES =/r po/POTFILES" po-locations/Makefile.in > po-locations/Makefile])
 +IT_PO_SUBDIR([po-locations])
 +
- IT_PROG_INTLTOOL([0.40.3])
+ IT_PROG_INTLTOOL([0.40.6])
  PKG_PROG_PKG_CONFIG([0.19])
  
-@@ -50,13 +54,6 @@ AC_STDC_HEADERS
- AM_PROG_LIBTOOL
+ AC_PROG_CC
  AC_PATH_PROG(GCONFTOOL, gconftool-2)
  
 -AC_ARG_ENABLE(all-translations-in-one-xml,
@@ -26,7 +25,7 @@ diff -up libgweather-2.91.0/configure.ac.gettext libgweather-2.91.0/configure.ac
  AC_ARG_ENABLE(locations-compression,
          [AC_HELP_STRING([--enable-locations-compression],
                          [Compress Locations.xml files])],
-@@ -236,7 +233,7 @@ AC_OUTPUT([
+@@ -191,7 +188,7 @@ AC_OUTPUT([
  Makefile
  doc/Makefile
  po/Makefile.in
@@ -35,7 +34,7 @@ diff -up libgweather-2.91.0/configure.ac.gettext libgweather-2.91.0/configure.ac
  libgweather/Makefile
  libgweather/gweather-3.0.pc
  libgweather/gweather-3.0-uninstalled.pc
-@@ -244,12 +241,6 @@ data/Makefile
+@@ -199,12 +196,6 @@ data/Makefile
  icons/Makefile
  ])
  
@@ -48,16 +47,16 @@ diff -up libgweather-2.91.0/configure.ac.gettext libgweather-2.91.0/configure.ac
  dnl ***************************************************************************
  dnl *** Display Summary                                                     ***
  dnl ***************************************************************************
-@@ -260,6 +251,4 @@ libgweather-$VERSION configure summary:
+@@ -215,6 +206,4 @@ libgweather-$VERSION configure summary:
  	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-2.91.0/data/Makefile.am.gettext libgweather-2.91.0/data/Makefile.am
---- libgweather-2.91.0/data/Makefile.am.gettext	2010-10-04 18:07:31.000000000 -0400
-+++ libgweather-2.91.0/data/Makefile.am	2011-01-30 13:53:12.581466339 -0500
+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
  libgweatherlocationsdir = $(pkgdatadir)
  libgweatherlocations_in_files = Locations.xml.in
@@ -120,9 +119,9 @@ diff -up libgweather-2.91.0/data/Makefile.am.gettext libgweather-2.91.0/data/Mak
  ### 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-2.91.0/libgweather/gweather-location.c.gettext libgweather-2.91.0/libgweather/gweather-location.c
---- libgweather-2.91.0/libgweather/gweather-location.c.gettext	2010-02-09 07:28:03.000000000 -0500
-+++ libgweather-2.91.0/libgweather/gweather-location.c	2011-01-30 13:51:19.616635049 -0500
+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
 @@ -22,11 +22,14 @@
  #include <config.h>
  #endif
@@ -161,9 +160,9 @@ diff -up libgweather-2.91.0/libgweather/gweather-location.c.gettext libgweather-
  	    xmlFree (value);
  	    normalized = g_utf8_normalize (loc->name, -1, G_NORMALIZE_ALL);
  	    loc->sort_name = g_utf8_casefold (normalized, -1);
-diff -up libgweather-2.91.0/libgweather/gweather-timezone.c.gettext libgweather-2.91.0/libgweather/gweather-timezone.c
---- libgweather-2.91.0/libgweather/gweather-timezone.c.gettext	2010-02-09 07:28:03.000000000 -0500
-+++ libgweather-2.91.0/libgweather/gweather-timezone.c	2011-01-30 13:51:19.617635039 -0500
+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
 @@ -23,6 +23,7 @@
  #endif
  
@@ -220,9 +219,9 @@ diff -up libgweather-2.91.0/libgweather/gweather-timezone.c.gettext libgweather-
      if (name)
  	xmlFree (name);
  
-diff -up libgweather-2.91.0/po-locations/LINGUAS.gettext libgweather-2.91.0/po-locations/LINGUAS
---- libgweather-2.91.0/po-locations/LINGUAS.gettext	2011-01-30 13:51:19.617635039 -0500
-+++ libgweather-2.91.0/po-locations/LINGUAS	2011-01-30 13:51:19.617635039 -0500
+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
 @@ -0,0 +1,78 @@
 +ang
 +ar
@@ -302,9 +301,9 @@ diff -up libgweather-2.91.0/po-locations/LINGUAS.gettext libgweather-2.91.0/po-l
 +zh_CN
 +zh_HK
 +zh_TW
-diff -up libgweather-2.91.0/po-locations/Makefile.in.in.gettext libgweather-2.91.0/po-locations/Makefile.in.in
---- libgweather-2.91.0/po-locations/Makefile.in.in.gettext	2011-01-30 13:51:19.618635028 -0500
-+++ libgweather-2.91.0/po-locations/Makefile.in.in	2011-01-30 13:51:19.618635028 -0500
+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
 @@ -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>
@@ -523,9 +522,9 @@ diff -up libgweather-2.91.0/po-locations/Makefile.in.in.gettext libgweather-2.91
 +# 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-2.91.0/po-locations/POTFILES.in.gettext libgweather-2.91.0/po-locations/POTFILES.in
---- libgweather-2.91.0/po-locations/POTFILES.in.gettext	2011-01-30 13:51:19.618635028 -0500
-+++ libgweather-2.91.0/po-locations/POTFILES.in	2011-01-30 13:51:19.618635028 -0500
+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
 @@ -0,0 +1,4 @@
 +# This list should contain *only* data/Locations.xml.in.
 +# Everything else should be in POTFILES.skip.