Date: Thursday, March 8, 2012 @ 16:16:34 Author: ibiru Revision: 152693
update to 3.4.0 Modified: libgweather/trunk/PKGBUILD libgweather/trunk/gettext-not-xml.patch libgweather/trunk/libgweather.install -----------------------+ PKGBUILD | 24 +++++++++--------- gettext-not-xml.patch | 64 ++++++++++++++++++++++++------------------------ libgweather.install | 8 +++--- 3 files changed, 48 insertions(+), 48 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-03-08 20:39:45 UTC (rev 152692) +++ PKGBUILD 2012-03-08 21:16:34 UTC (rev 152693) @@ -2,25 +2,25 @@ # Maintainer: Jan de Groot <[email protected]> pkgname=libgweather -pkgver=3.2.1 +pkgver=3.4.0 pkgrel=1 pkgdesc="Provides access to weather information from the net" arch=('i686' 'x86_64') 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=('db8fdfc022fffd1ef97615c19af278fb6e1fca5ebf4ff2da5e255d54869c9e18' + '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 @@ } 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 } Modified: gettext-not-xml.patch =================================================================== --- gettext-not-xml.patch 2012-03-08 20:39:45 UTC (rev 152692) +++ gettext-not-xml.patch 2012-03-08 21:16:34 UTC (rev 152693) @@ -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 @@ 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 @@ 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 @@ 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 @@ ### 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 @@ #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 @@ 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 @@ #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 @@ 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 @@ 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 @@ +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 <[email protected]> @@ -522,9 +522,9 @@ +# 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. Modified: libgweather.install =================================================================== --- libgweather.install 2012-03-08 20:39:45 UTC (rev 152692) +++ libgweather.install 2012-03-08 21:16:34 UTC (rev 152693) @@ -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 @@ } pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} + sbin/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 }
