diff options
author | root <root@rshg054.dnsready.net> | 2011-09-01 23:14:36 +0000 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2011-09-01 23:14:36 +0000 |
commit | eb3d40c72c9dd19f6a5ef79b41e9d8ba73ccd928 (patch) | |
tree | 8b84e75352e1becac08cfc404361e88753b5daac /gnome-unstable | |
parent | 31f40feaa17912cf0ebfa72dd9368264633b3830 (diff) |
Thu Sep 1 23:14:36 UTC 2011
Diffstat (limited to 'gnome-unstable')
39 files changed, 2547 insertions, 3 deletions
diff --git a/gnome-unstable/at-spi2-atk/PKGBUILD b/gnome-unstable/at-spi2-atk/PKGBUILD new file mode 100644 index 000000000..4499da016 --- /dev/null +++ b/gnome-unstable/at-spi2-atk/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 136677 2011-08-31 12:40:10Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=at-spi2-atk +pkgver=2.1.90 +pkgrel=1 +pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi" +arch=('i686' 'x86_64') +url="http://www.gnome.org" +license=('GPL2') +depends=('at-spi2-core' 'libx11' 'atk' 'dconf') +makedepends=('intltool') +install=at-spi2-atk.install +options=('!libtool') +groups=('gnome') +source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('218090dc38ea5614ec86e3f388c3c504f94d129df4eee6d4c2f5066b257e1faf') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sed -i -e '/AC_PATH_XTRA/d' configure.ac + autoreconf --force --install + + ./configure --prefix=/usr --sysconfdir=/etc \ + --disable-schemas-compile + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} + +# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/at-spi2-atk/at-spi2-atk.install b/gnome-unstable/at-spi2-atk/at-spi2-atk.install new file mode 100644 index 000000000..2ef26aaa9 --- /dev/null +++ b/gnome-unstable/at-spi2-atk/at-spi2-atk.install @@ -0,0 +1,11 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/gnome-unstable/at-spi2-core/PKGBUILD b/gnome-unstable/at-spi2-core/PKGBUILD new file mode 100644 index 000000000..cd86f482d --- /dev/null +++ b/gnome-unstable/at-spi2-core/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 136673 2011-08-31 12:35:25Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +pkgname=at-spi2-core +pkgver=2.1.90 +pkgrel=1 +pkgdesc="Protocol definitions and daemon for D-Bus at-spi" +arch=('i686' 'x86_64') +url="http://www.gnome.org" +license=('GPL2') +depends=('dbus-core' 'glib2' 'libxtst') +makedepends=('intltool' 'gobject-introspection') +options=('!libtool') +source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('2e60f0b511b68d0d9b5a0eb9f4ada3d855d3615883238593923ebb9cd33936fa') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sed -i -e '/AC_PATH_XTRA/d' configure.ac + autoreconf --force --install + + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/at-spi2-core --disable-xevie + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} + +# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/clutter/PKGBUILD b/gnome-unstable/clutter/PKGBUILD new file mode 100644 index 000000000..8378c60a4 --- /dev/null +++ b/gnome-unstable/clutter/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 136638 2011-08-31 10:00:35Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: William Rea <sillywilly@gmail.com> + +pkgname=clutter +pkgver=1.7.12 +pkgrel=1 +pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces" +arch=('i686' 'x86_64') +url="http://clutter-project.org/" +options=('!libtool') +license=('LGPL') +depends=('cogl>=1.7.6' 'libgl' 'json-glib' 'atk' 'libxi') +makedepends=('gobject-introspection' 'mesa') +source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('b145cb02b1682fd9a4fb5af38d7baee94d3841e84a5ad960ecc2fead96b3ac7a') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --enable-introspection + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/gnome-unstable/dconf/PKGBUILD b/gnome-unstable/dconf/PKGBUILD new file mode 100644 index 000000000..f098d80d5 --- /dev/null +++ b/gnome-unstable/dconf/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 136651 2011-08-31 11:05:39Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +pkgname=dconf +pkgver=0.9.0 +pkgrel=1 +pkgdesc="A low-level configuration system." +arch=(i686 x86_64) +url="http://live.gnome.org/dconf" +license=('LGPL2.1') +depends=('glib2') +makedepends=('vala' 'gobject-introspection' 'gtk3') +optdepends=('gtk3: for dconf-editor') +install=dconf.install +source=(http://download.gnome.org/sources/${pkgname}/0.9/${pkgname}-${pkgver}.tar.xz) +sha256sums=('df16ba1af423145f968fb7d36d0a1bfd75f27aefb5d3016aaecb1ab311944581') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/dconf + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} + +# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/dconf/dconf.install b/gnome-unstable/dconf/dconf.install new file mode 100644 index 000000000..39bce8f45 --- /dev/null +++ b/gnome-unstable/dconf/dconf.install @@ -0,0 +1,12 @@ +post_install() { + usr/bin/gio-querymodules usr/lib/gio/modules + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade(){ + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/evolution-data-server/PKGBUILD b/gnome-unstable/evolution-data-server/PKGBUILD new file mode 100644 index 000000000..404ad3414 --- /dev/null +++ b/gnome-unstable/evolution-data-server/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 136715 2011-08-31 17:09:39Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=evolution-data-server +pkgver=3.1.90 +pkgrel=1 +pkgdesc="Central location for addressbook and calendar storage in the GNOME Desktop" +arch=('i686' 'x86_64') +depends=('gconf' 'gnome-online-accounts' 'nss' 'krb5' 'libgweather' 'libical' 'db' 'libgdata') +makedepends=('intltool' 'gperf' 'gobject-introspection') +options=('!libtool') +url="http://www.gnome.org" +license=('GPL') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.1/${pkgname}-${pkgver}.tar.xz) +sha256sums=('24c48a0f006c7ed94c08409bb6479ca6915b49ef4291430ca0c3476687d442f9') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --with-openldap=yes \ + --libexecdir=/usr/lib/evolution-data-server \ + --with-krb5=/usr --with-libdb=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/gnome-unstable/folks/PKGBUILD b/gnome-unstable/folks/PKGBUILD new file mode 100644 index 000000000..a27541e31 --- /dev/null +++ b/gnome-unstable/folks/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 136723 2011-08-31 17:52:23Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +pkgname=folks +pkgver=0.6.1 +pkgrel=1 +pkgdesc="Library to aggregates people into metacontacts " +arch=(i686 x86_64) +url="http://telepathy.freedesktop.org/wiki/Folks" +license=('LGPL2.1') +depends=('telepathy-glib' 'libgee' 'libxml2' 'evolution-data-server' 'libsocialweb') +makedepends=('gobject-introspection' 'vala' 'intltool') +options=('!libtool') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.6/${pkgname}-${pkgver}.tar.xz) +sha256sums=('c194c1feac58ed7f9870b08ef0658077967fe96d90eff02fad130237df10c9f4') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/gconf/01_xml-gettext-domain.patch b/gnome-unstable/gconf/01_xml-gettext-domain.patch new file mode 100644 index 000000000..d1323f61f --- /dev/null +++ b/gnome-unstable/gconf/01_xml-gettext-domain.patch @@ -0,0 +1,362 @@ +# Description: Support calling gettext at runtime and putting the gettext domain into the .schemas file instead of replicating translations in /usr/share/gconf/schemas/*.schemas *and* /var/lib/gconf/defaults/%gconf-tree-$LANG.xml. This saves in the order of 90 MB uncompressed/10 MB compressed on hard disks. +# Ubuntu: https://bugs.launchpad.net/bugs/123025 +# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=568845 +--- GConf-2.26.0/backends/markup-tree.c.gettext 2009-04-26 23:33:05.258484987 -0400 ++++ GConf-2.26.0/backends/markup-tree.c 2009-04-26 23:34:25.026700526 -0400 +@@ -52,6 +52,7 @@ struct _MarkupEntry + char *schema_name; + char *mod_user; + GTime mod_time; ++ const char *gettext_domain; + }; + + static LocalSchemaInfo* local_schema_info_new (void); +@@ -1593,6 +1594,8 @@ markup_entry_set_value (MarkupEntry + gconf_schema_get_type (schema)); + gconf_schema_set_owner (current_schema, + gconf_schema_get_owner (schema)); ++ gconf_schema_set_gettext_domain (current_schema, ++ gconf_schema_get_gettext_domain (schema)); + } + + /* Update mod time */ +@@ -1805,6 +1808,8 @@ markup_entry_get_value (MarkupEntry *ent + else if (c_local_schema && c_local_schema->long_desc) + gconf_schema_set_long_desc (schema, c_local_schema->long_desc); + ++ gconf_schema_set_gettext_domain (schema, entry->gettext_domain); ++ + return retval; + } + } +@@ -2339,8 +2344,9 @@ parse_value_element (GMarkupParseContext + const char *ltype; + const char *list_type; + const char *owner; ++ + GConfValueType vtype; +- const char *dummy1, *dummy2, *dummy3, *dummy4; ++ const char *dummy1, *dummy2, *dummy3, *dummy4, *dummy5; + + #if 0 + g_assert (ELEMENT_IS ("entry") || +@@ -2377,6 +2383,7 @@ parse_value_element (GMarkupParseContext + "muser", &dummy2, + "mtime", &dummy3, + "schema", &dummy4, ++ "gettext_domain", &dummy5, + + NULL)) + return; +@@ -2683,6 +2690,7 @@ parse_entry_element (GMarkupParseContext + const char *mtime; + const char *schema; + const char *type; ++ const char *gettext_domain; + const char *dummy1, *dummy2, *dummy3, *dummy4; + const char *dummy5, *dummy6, *dummy7; + GConfValue *value; +@@ -2693,6 +2701,7 @@ parse_entry_element (GMarkupParseContext + mtime = NULL; + schema = NULL; + type = NULL; ++ gettext_domain = NULL; + + if (!locate_attributes (context, element_name, attribute_names, attribute_values, + error, +@@ -2701,6 +2710,7 @@ parse_entry_element (GMarkupParseContext + "mtime", &mtime, + "schema", &schema, + "type", &type, ++ "gettext_domain", &gettext_domain, + + /* These are allowed but we don't use them until + * parse_value_element +@@ -2768,6 +2778,9 @@ parse_entry_element (GMarkupParseContext + */ + if (schema) + entry->schema_name = g_strdup (schema); ++ ++ if (gettext_domain) ++ entry->gettext_domain = g_intern_string (gettext_domain); + } + else + { +@@ -3716,6 +3729,7 @@ write_value_element (GConfValue *value, + GConfSchema *schema; + GConfValueType stype; + const char *owner; ++ const char *gettext_domain; + + schema = gconf_value_get_schema (value); + +@@ -3741,6 +3755,23 @@ write_value_element (GConfValue *value, + + g_free (s); + } ++ ++ gettext_domain = gconf_schema_get_gettext_domain (schema); ++ ++ if (gettext_domain) ++ { ++ char *s; ++ ++ s = g_markup_escape_text (gettext_domain, -1); ++ ++ if (fprintf (f, " gettext_domain=\"%s\"", s) < 0) ++ { ++ g_free (s); ++ return FALSE; ++ } ++ ++ g_free (s); ++ } + + if (stype == GCONF_VALUE_LIST) + { +diff -up GConf-2.26.0/doc/gconf-1.0.dtd.gettext GConf-2.26.0/doc/gconf-1.0.dtd +--- GConf-2.26.0/doc/gconf-1.0.dtd.gettext 2009-04-26 23:33:17.240736103 -0400 ++++ GConf-2.26.0/doc/gconf-1.0.dtd 2009-04-26 23:34:25.027700384 -0400 +@@ -7,7 +7,7 @@ + <!-- A single schema. What I am trying to say is "this set of + elements, in any order". Duplicate elements (apart from <locale>) are + not allowed). --> +-<!ELEMENT schema (key|applyto*|owner?|type|(list_type|(car_type,cdr_type))?|default?|locale*)*> ++<!ELEMENT schema (key|applyto*|owner?|type|(list_type|(car_type,cdr_type))?|default?|locale*|gettext_domain?)*> + + <!-- The key for this schema (e.g. /schemas/apps/foo/bar) --> + <!ELEMENT key (#PCDATA)> +diff -up GConf-2.26.0/gconf/gconf-internals.c.gettext GConf-2.26.0/gconf/gconf-internals.c +--- GConf-2.26.0/gconf/gconf-internals.c.gettext 2009-04-26 23:34:10.994700035 -0400 ++++ GConf-2.26.0/gconf/gconf-internals.c 2009-04-26 23:34:53.767450191 -0400 +@@ -513,6 +513,7 @@ gconf_fill_corba_schema_from_gconf_schem + cs->short_desc = CORBA_string_dup (gconf_schema_get_short_desc (sc) ? gconf_schema_get_short_desc (sc) : ""); + cs->long_desc = CORBA_string_dup (gconf_schema_get_long_desc (sc) ? gconf_schema_get_long_desc (sc) : ""); + cs->owner = CORBA_string_dup (gconf_schema_get_owner (sc) ? gconf_schema_get_owner (sc) : ""); ++ cs->gettext_domain = CORBA_string_dup (gconf_schema_get_gettext_domain (sc) ? gconf_schema_get_gettext_domain (sc) : ""); + + { + gchar* encoded; +@@ -600,6 +601,14 @@ gconf_schema_from_corba_schema(const Con + gconf_schema_set_owner(sc, cs->owner); + } + ++ if (*cs->gettext_domain != '\0') ++ { ++ if (!g_utf8_validate (cs->gettext_domain, -1, NULL)) ++ gconf_log (GCL_ERR, _("Invalid UTF-8 in gettext domain for schema")); ++ else ++ gconf_schema_set_gettext_domain(sc, cs->gettext_domain); ++ } ++ + { + GConfValue* val; + +diff -up GConf-2.26.0/gconf/gconf-schema.c.gettext GConf-2.26.0/gconf/gconf-schema.c +--- GConf-2.26.0/gconf/gconf-schema.c.gettext 2009-04-26 23:33:26.787483545 -0400 ++++ GConf-2.26.0/gconf/gconf-schema.c 2009-04-26 23:35:54.240450142 -0400 +@@ -32,9 +32,10 @@ typedef struct { + GConfValueType car_type; /* Pair car type of the described entry */ + GConfValueType cdr_type; /* Pair cdr type of the described entry */ + gchar* locale; /* Schema locale */ +- gchar* owner; /* Name of creating application */ ++ const gchar* owner; /* Name of creating application */ + gchar* short_desc; /* 40 char or less description, no newlines */ + gchar* long_desc; /* could be a paragraph or so */ ++ const gchar* gettext_domain; /* description gettext domain */ + GConfValue* default_value; /* Default value of the key */ + } GConfRealSchema; + +@@ -63,7 +64,6 @@ gconf_schema_free (GConfSchema* sc) + g_free (real->locale); + g_free (real->short_desc); + g_free (real->long_desc); +- g_free (real->owner); + + if (real->default_value) + gconf_value_free (real->default_value); +@@ -91,7 +91,9 @@ gconf_schema_copy (const GConfSchema* sc + + dest->long_desc = g_strdup (real->long_desc); + +- dest->owner = g_strdup (real->owner); ++ dest->gettext_domain = real->gettext_domain; ++ ++ dest->owner = real->owner; + + dest->default_value = real->default_value ? gconf_value_copy (real->default_value) : NULL; + +@@ -136,6 +138,17 @@ gconf_schema_set_locale (GConfSchema* sc + REAL_SCHEMA (sc)->locale = NULL; + } + ++void ++gconf_schema_set_gettext_domain (GConfSchema* sc, const gchar* domain) ++{ ++ g_return_if_fail (domain == NULL || g_utf8_validate (domain, -1, NULL)); ++ ++ if (domain) ++ REAL_SCHEMA (sc)->gettext_domain = g_intern_string (domain); ++ else ++ REAL_SCHEMA (sc)->gettext_domain = NULL; ++} ++ + void + gconf_schema_set_short_desc (GConfSchema* sc, const gchar* desc) + { +@@ -169,11 +182,8 @@ gconf_schema_set_owner (GConfSchema* sc, + { + g_return_if_fail (owner == NULL || g_utf8_validate (owner, -1, NULL)); + +- if (REAL_SCHEMA (sc)->owner) +- g_free (REAL_SCHEMA (sc)->owner); +- + if (owner) +- REAL_SCHEMA (sc)->owner = g_strdup (owner); ++ REAL_SCHEMA (sc)->owner = g_intern_string (owner); + else + REAL_SCHEMA (sc)->owner = NULL; + } +@@ -228,6 +238,14 @@ gconf_schema_validate (const GConfSchema + return FALSE; + } + ++ if (real->gettext_domain && !g_utf8_validate (real->gettext_domain, -1, NULL)) ++ { ++ g_set_error (err, GCONF_ERROR, ++ GCONF_ERROR_FAILED, ++ _("Schema contains invalid UTF-8")); ++ return FALSE; ++ } ++ + if (real->owner && !g_utf8_validate (real->owner, -1, NULL)) + { + g_set_error (err, GCONF_ERROR, +@@ -299,11 +317,32 @@ gconf_schema_get_locale (const GConfSche + } + + const char* ++gconf_schema_get_gettext_domain (const GConfSchema *schema) ++{ ++ g_return_val_if_fail (schema != NULL, NULL); ++ ++ return REAL_SCHEMA (schema)->gettext_domain; ++} ++ ++static inline const char * ++schema_translate (const GConfSchema *schema, ++ const char *string) ++{ ++ if (REAL_SCHEMA (schema)->gettext_domain) ++ { ++ bind_textdomain_codeset (REAL_SCHEMA (schema)->gettext_domain, "UTF-8"); ++ return g_dgettext(REAL_SCHEMA (schema)->gettext_domain, string); ++ } ++ else ++ return string; ++} ++ ++const char* + gconf_schema_get_short_desc (const GConfSchema *schema) + { + g_return_val_if_fail (schema != NULL, NULL); + +- return REAL_SCHEMA (schema)->short_desc; ++ return schema_translate (schema, REAL_SCHEMA (schema)->short_desc); + } + + const char* +@@ -311,7 +350,7 @@ gconf_schema_get_long_desc (const GConfS + { + g_return_val_if_fail (schema != NULL, NULL); + +- return REAL_SCHEMA (schema)->long_desc; ++ return schema_translate (schema, REAL_SCHEMA (schema)->long_desc); + } + + const char* +diff -up GConf-2.26.0/gconf/gconf-schema.h.gettext GConf-2.26.0/gconf/gconf-schema.h +--- GConf-2.26.0/gconf/gconf-schema.h.gettext 2009-04-26 23:33:33.979744088 -0400 ++++ GConf-2.26.0/gconf/gconf-schema.h 2009-04-26 23:34:25.030737043 -0400 +@@ -48,6 +48,8 @@ void gconf_schema_set_cdr_type + GConfValueType type); + void gconf_schema_set_locale (GConfSchema *sc, + const gchar *locale); ++void gconf_schema_set_gettext_domain (GConfSchema *sc, ++ const gchar *domain); + void gconf_schema_set_short_desc (GConfSchema *sc, + const gchar *desc); + void gconf_schema_set_long_desc (GConfSchema *sc, +@@ -65,6 +67,7 @@ GConfValueType gconf_schema_get_list_typ + GConfValueType gconf_schema_get_car_type (const GConfSchema *schema); + GConfValueType gconf_schema_get_cdr_type (const GConfSchema *schema); + const char* gconf_schema_get_locale (const GConfSchema *schema); ++const char* gconf_schema_get_gettext_domain(const GConfSchema *schema); + const char* gconf_schema_get_short_desc (const GConfSchema *schema); + const char* gconf_schema_get_long_desc (const GConfSchema *schema); + const char* gconf_schema_get_owner (const GConfSchema *schema); +diff -up GConf-2.26.0/gconf/gconftool.c.gettext GConf-2.26.0/gconf/gconftool.c +--- GConf-2.26.0/gconf/gconftool.c.gettext 2009-04-26 23:33:41.907451190 -0400 ++++ GConf-2.26.0/gconf/gconftool.c 2009-04-26 23:34:25.034736752 -0400 +@@ -3295,6 +3295,7 @@ struct _SchemaInfo { + GConfValueType cdr_type; + GConfValue* global_default; + GHashTable* hash; ++ gchar* gettext_domain; + }; + + static int +@@ -3547,6 +3548,15 @@ extract_global_info(xmlNodePtr node, + else + g_printerr (_("WARNING: empty <applyto> node")); + } ++ else if (strcmp((char *)iter->name, "gettext_domain") == 0) ++ { ++ tmp = (char *)xmlNodeGetContent(iter); ++ if (tmp) ++ { ++ info->gettext_domain = g_strdup(tmp); ++ xmlFree(tmp); ++ } ++ } + else + g_printerr (_("WARNING: node <%s> not understood below <schema>\n"), + iter->name); +@@ -3636,6 +3646,9 @@ process_locale_info(xmlNodePtr node, Sch + if (info->owner != NULL) + gconf_schema_set_owner(schema, info->owner); + ++ if (info->gettext_domain != NULL) ++ gconf_schema_set_gettext_domain(schema, info->gettext_domain); ++ + xmlFree(name); + + /* Locale-specific info */ +@@ -3765,6 +3778,7 @@ get_schema_from_xml(xmlNodePtr node, gch + info.apply_to = NULL; + info.owner = NULL; + info.global_default = NULL; ++ info.gettext_domain = NULL; + info.hash = g_hash_table_new(g_str_hash, g_str_equal); + + extract_global_info(node, &info); +@@ -3801,6 +3815,8 @@ get_schema_from_xml(xmlNodePtr node, gch + ; /* nothing */ + else if (strcmp((char *)iter->name, "applyto") == 0) + ; /* nothing */ ++ else if (strcmp((char *)iter->name, "gettext_domain") == 0) ++ ; /* nothing */ + else if (strcmp((char *)iter->name, "locale") == 0) + { + process_locale_info(iter, &info); +diff -up GConf-2.26.0/gconf/GConfX.idl.gettext GConf-2.26.0/gconf/GConfX.idl +--- GConf-2.26.0/gconf/GConfX.idl.gettext 2009-04-26 23:33:58.457483190 -0400 ++++ GConf-2.26.0/gconf/GConfX.idl 2009-04-26 23:34:53.764448732 -0400 +@@ -16,6 +16,7 @@ struct ConfigSchema { + string short_desc; + string long_desc; + string owner; ++ string gettext_domain; + // Work around lack of recursive data types + string encoded_default_value; + }; diff --git a/gnome-unstable/gconf/PKGBUILD b/gnome-unstable/gconf/PKGBUILD new file mode 100644 index 000000000..3638b9878 --- /dev/null +++ b/gnome-unstable/gconf/PKGBUILD @@ -0,0 +1,51 @@ +# $Id: PKGBUILD 136645 2011-08-31 10:47:39Z ibiru $ +# Maintainer: Jan de Groot <jan@archlinux.org> + +pkgname=gconf +pkgver=3.1.90 +pkgrel=1 +pkgdesc="A configuration database system" +arch=(i686 x86_64) +license=('LGPL') +depends=('libxml2' 'polkit' 'libldap' 'dbus-glib' 'gtk3') +makedepends=('intltool' 'gtk-doc' 'gobject-introspection') +options=('!libtool') +install=gconf.install +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/GConf/3.1/GConf-${pkgver}.tar.xz + gconf-merge-schema + gconfpkg + gconf-reload.patch + 01_xml-gettext-domain.patch) +sha256sums=('98769f368d2e67c82adf820f0193824169382676a8bc53972727d6a7ad9a7b5f' + 'ee6b6e6f4975dad13a8c45f1c1f0547a99373bdecdcd6604bfc12965c328a028' + 'bf1928718caa5df2b9e54a13cfd0f15a8fe0e09e86b84385ce023616a114e898' + '567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694' + 'c883dec2b96978874a53700cfe7f26f24f8296767203e970bc6402b4b9945eb8') + +build() { + cd "${srcdir}/GConf-${pkgver}" + # Patch from fedora - reloads gconf after installing schemas + patch -Np1 -i "${srcdir}/gconf-reload.patch" + # http://bugzilla.gnome.org/show_bug.cgi?id=568845 + patch -Np1 -i "${srcdir}/01_xml-gettext-domain.patch" + + # Python2 fix + sed -i '1s|#!/usr/bin/env python$|&2|' gsettings/gsettings-schema-convert + + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --libexecdir=/usr/lib/GConf \ + --disable-static --enable-defaults-service --with-gtk=3.0 \ + --disable-orbit + + make pkglibdir=/usr/lib/GConf +} + +package() { + cd "${srcdir}/GConf-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/etc/gconf/gconf.xml.system" + install -m755 "${srcdir}/gconf-merge-schema" "${pkgdir}/usr/bin/" + install -Dm755 "${srcdir}/gconfpkg" "${pkgdir}/usr/sbin/gconfpkg" +} diff --git a/gnome-unstable/gconf/gconf-merge-schema b/gnome-unstable/gconf/gconf-merge-schema new file mode 100755 index 000000000..992c162e6 --- /dev/null +++ b/gnome-unstable/gconf/gconf-merge-schema @@ -0,0 +1,34 @@ +#!/bin/bash +if [ ! "$1" -a ! "$2" ]; then + echo "Usage: $0 output.schemas [--domain gettextdomain] file1.schemas [file2.schemas [...]]" + exit 1 +fi + +OUTFILE="$1" +DOMAIN="" +shift + +if [ "$1" = "--domain" ]; then + shift + DOMAIN=$1 + shift +fi + +echo '<?xml version="1.0"?>' > "$OUTFILE" +echo '<gconfschemafile><schemalist>' >> "$OUTFILE" + +while [ "$1" ]; do + if [ -f "$1" ]; then + sed -e '/<?xml/d' \ + -e 's|<gconfschemafile>||g' \ + -e 's|</gconfschemafile>||g' \ + -e 's|<schemalist>||g' \ + -e 's|</schemalist>||g' "$1" >> "$OUTFILE" + fi + shift +done + +echo '</schemalist></gconfschemafile>' >> "$OUTFILE" +if [ "$DOMAIN" != "" ]; then + sed -ri "s/^([[:space:]]*)(<locale name=\"C\">)/\1<gettext_domain>$DOMAIN<\/gettext_domain>\n\1\2/; /^[[:space:]]*<locale name=\"[^C]/,/^[[:space:]]*<\/locale>[[:space:]]*\$/ d; /^$/d; s/<\/schema>$/&\n/" "$OUTFILE" +fi diff --git a/gnome-unstable/gconf/gconf-reload.patch b/gnome-unstable/gconf/gconf-reload.patch new file mode 100644 index 000000000..910f0dae4 --- /dev/null +++ b/gnome-unstable/gconf/gconf-reload.patch @@ -0,0 +1,20 @@ +--- GConf-2.16.0/gconf/gconftool.c.orig 2006-10-14 17:37:14.000000000 +0000 ++++ GConf-2.16.0/gconf/gconftool.c 2006-10-14 17:39:27.000000000 +0000 +@@ -963,6 +963,8 @@ main (int argc, char** argv) + + gconf_engine_unref (conf); + ++ g_spawn_command_line_sync ("/usr/bin/killall -q -TERM " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL); ++ + return retval; + } + +@@ -975,6 +977,8 @@ main (int argc, char** argv) + + gconf_engine_unref (conf); + ++ g_spawn_command_line_sync ("/usr/bin/killall -q -TERM " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL); ++ + return retval; + } + diff --git a/gnome-unstable/gconf/gconf.install b/gnome-unstable/gconf/gconf.install new file mode 100644 index 000000000..f7945d165 --- /dev/null +++ b/gnome-unstable/gconf/gconf.install @@ -0,0 +1,20 @@ +post_install() { + ldconfig -r . + chmod 755 etc/gconf/gconf.xml.system + usr/bin/gio-querymodules usr/lib/gio/modules +} + +post_upgrade() { + ldconfig -r . + chmod 755 etc/gconf/gconf.xml.system + usr/bin/gio-querymodules usr/lib/gio/modules + + PID=`pidof gconfd-2` + if [ ! -z "${PID}" ]; then + kill ${PID} + fi +} + +post_remove() { + usr/bin/gio-querymodules usr/lib/gio/modules +} diff --git a/gnome-unstable/gconf/gconfpkg b/gnome-unstable/gconf/gconfpkg new file mode 100755 index 000000000..72021e45e --- /dev/null +++ b/gnome-unstable/gconf/gconfpkg @@ -0,0 +1,50 @@ +#!/bin/sh + +usage() { +cat << _EOF +Usage: + gconfpkg [OPTION] [PACKAGE] + + Help Options: + -?, --help Show help options + + Application Options: + --install Install schemas for a given package + --uninstall Uninstall schemas for a given package + +_EOF +} + +install() { + GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \ + /usr/bin/gconftool-2 --makefile-install-rule /usr/share/gconf/schemas/${pkgname}.schemas >/dev/null +} + +uninstall() { + if [ -f /usr/share/gconf/schemas/${pkgname}.schemas ]; then + schemas=/usr/share/gconf/schemas/${pkgname}.schemas + elif [ -f /opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then + schemas=/opt/gnome/share/gconf/schemas/${pkgname}.schemas + else + schemas=`pacman -Ql ${pkgname} | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'` + fi + GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \ + /usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas} >/dev/null +} + +if [ -z "$2" ]; then + usage +else + pkgname="$2" + case "$1" in + --install) + install + ;; + --uninstall) + uninstall + ;; + *) + usage + ;; + esac +fi diff --git a/gnome-unstable/glibmm/PKGBUILD b/gnome-unstable/glibmm/PKGBUILD new file mode 100644 index 000000000..8b289e953 --- /dev/null +++ b/gnome-unstable/glibmm/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 136655 2011-08-31 11:23:00Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgbase=glibmm +pkgname=('glibmm' 'glibmm-docs') +pkgver=2.29.12 +pkgrel=1 +arch=('i686' 'x86_64') +license=('LGPL') +makedepends=('glib2' 'libsigc++2.0' 'pkgconfig' 'namcap') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +options=('!libtool') +url="http://gtkmm.sourceforge.net/" +sha256sums=('b66797ee8af80f9bd0748758f9a57cccfeb81960aad145b33e2650be947de5d5') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package_glibmm() { + pkgdesc="Glib-- (glibmm) is a C++ interface for glib" + depends=('glib2' 'libsigc++2.0') + cd "${srcdir}/${pkgbase}-${pkgver}" + sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile + make DESTDIR="${pkgdir}" install +} + +package_glibmm-docs() { + pkgdesc="Developer documentation for glibmm" + cd "${srcdir}/${pkgbase}-${pkgver}/docs" + make DESTDIR="${pkgdir}" install +} diff --git a/gnome-unstable/gnome-online-accounts/PKGBUILD b/gnome-unstable/gnome-online-accounts/PKGBUILD new file mode 100644 index 000000000..52cc802f9 --- /dev/null +++ b/gnome-unstable/gnome-online-accounts/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 136707 2011-08-31 16:23:30Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +pkgname=gnome-online-accounts +pkgver=3.1.90 +pkgrel=1 +pkgdesc="GNOME service to access online accounts" +arch=(i686 x86_64) +url="http://www.gnome.org" +license=('GPL') +depends=('libwebkit3' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme') +makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl') +options=(!libtool) +install=$pkgname.install +source=(http://download.gnome.org/sources/$pkgname/3.1/$pkgname-$pkgver.tar.xz) +sha256sums=('60e9a66f9d5aa5ff6d68c99e0c9af424eaffb667e298aa41438ad29fc8c8a0a1') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --libexec=/usr/lib/gnome-online-accounts + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/gnome-online-accounts/gnome-online-accounts.install b/gnome-unstable/gnome-online-accounts/gnome-online-accounts.install new file mode 100644 index 000000000..2e02b7952 --- /dev/null +++ b/gnome-unstable/gnome-online-accounts/gnome-online-accounts.install @@ -0,0 +1,11 @@ +post_install () { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/gnome-themes-standard/PKGBUILD b/gnome-unstable/gnome-themes-standard/PKGBUILD new file mode 100644 index 000000000..43e9d1221 --- /dev/null +++ b/gnome-unstable/gnome-themes-standard/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 136725 2011-08-31 18:01:31Z ibiru $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +pkgname=gnome-themes-standard +pkgver=3.1.90 +pkgrel=1 +pkgdesc="Default themes for the GNOME desktop" +arch=('i686' 'x86_64') +url="http://abattis.org/cantarell/" +license=('GPL2') +depends=('cantarell-fonts' 'gtk3' 'gtk-engines' 'librsvg') +makedepends=('intltool') +groups=('gnome') +replaces=('gnome-themes') +conflicts=('gnome-themes') +source=(http://download.gnome.org/sources/$pkgname/3.1/$pkgname-${pkgver}.tar.xz) +sha256sums=('12e40625577f03c5224f64dadcdbe9749c63ff198b5951983e8c86eaf94b90d4') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="${pkgdir}" install +} + +# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/gobject-introspection/PKGBUILD b/gnome-unstable/gobject-introspection/PKGBUILD index c464a91a4..6cf9e2d1d 100644 --- a/gnome-unstable/gobject-introspection/PKGBUILD +++ b/gnome-unstable/gobject-introspection/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 136582 2011-08-30 16:58:37Z ibiru $ +# $Id: PKGBUILD 136718 2011-08-31 17:27:59Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gobject-introspection pkgver=1.29.17 -pkgrel=1 +pkgrel=2 pkgdesc="Introspection system for GObject-based libraries" url="http://live.gnome.org/GObjectInstrospection" arch=('x86_64' 'i686') license=('LGPL' 'GPL') depends=('glib2' 'python2') -makedepends=('cairo') +makedepends=('cairo' 'vala') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.29/${pkgname}-${pkgver}.tar.xz) sha256sums=('ce1cc5a9a992151f91d56ec1a0d424e3fe019e58b74fef02a133d91ed8dcebfe') diff --git a/gnome-unstable/gtkhtml4/PKGBUILD b/gnome-unstable/gtkhtml4/PKGBUILD new file mode 100644 index 000000000..4b85bea61 --- /dev/null +++ b/gnome-unstable/gtkhtml4/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 136689 2011-08-31 14:17:48Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=gtkhtml4 +_pkgbasename=gtkhtml +pkgver=4.1.90.1 +pkgrel=1 +pkgdesc="A lightweight HTML renderer/editor widget for GTK3" +arch=(i686 x86_64) +license=('GPL') +depends=('gtk3' 'enchant' 'iso-codes' 'gnome-icon-theme' 'libsoup') +makedepends=('intltool') +url="http://www.gnome.org" +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*.*}/${_pkgbasename}-${pkgver}.tar.xz) +sha256sums=('d5a72b235f750c16548630255686d32e80fbf21a725c905f9d8bc818b057a106') + +build() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/gtkhtml4 \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/gnome-unstable/gtkmm3/PKGBUILD b/gnome-unstable/gtkmm3/PKGBUILD new file mode 100644 index 000000000..b21770c91 --- /dev/null +++ b/gnome-unstable/gtkmm3/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 136703 2011-08-31 15:06:35Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgbase=gtkmm3 +_pkgbasename=gtkmm +pkgname=('gtkmm3' 'gtkmm3-docs') +pkgver=3.1.16 +pkgrel=1 +arch=('i686' 'x86_64') +makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common') +license=('LGPL') +options=('!libtool' '!emptydirs') +url="http://gtkmm.sourceforge.net/" +source=(http://ftp.gnome.org/pub/GNOME/sources/${_pkgbasename}/3.1/${_pkgbasename}-${pkgver}.tar.xz) +sha256sums=('b6d76b88444329bc04b596cdf6e9b45e529c373bb09b1653d7bb6ff57bf12c2c') + +build() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + ./configure --prefix=/usr + make +} + +package_gtkmm3() { + pkgdesc="C++ bindings for gtk3" + depends=('gtk3' 'pangomm' 'atkmm') + cd "${srcdir}/${_pkgbasename}-${pkgver}" + + sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile + + make DESTDIR="${pkgdir}" install +} + +package_gtkmm3-docs() { + pkgdesc="Developer documentation for gtkmm v3" + + cd "${srcdir}/${_pkgbasename}-${pkgver}" + make -C docs DESTDIR="${pkgdir}" install +} diff --git a/gnome-unstable/gvfs/PKGBUILD b/gnome-unstable/gvfs/PKGBUILD new file mode 100644 index 000000000..bf9069629 --- /dev/null +++ b/gnome-unstable/gvfs/PKGBUILD @@ -0,0 +1,115 @@ +# $Id: PKGBUILD 136731 2011-08-31 19:24:33Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgbase=gvfs +pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp') +pkgver=1.9.4 +pkgrel=1 +arch=('i686' 'x86_64') +license=('LGPL') +makedepends=('libsoup-gnome' 'libcdio' 'fuse' 'bluez' 'smbclient' 'libgphoto2' + 'libarchive' 'gnome-disk-utility' 'pkgconfig' 'intltool' + 'libimobiledevice' 'namcap') +url="http://www.gnome.org" +options=(!libtool) +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz) +sha256sums=('a923e183b35357e8a6a33dd2909ebe6b26311d0fa99c1752a7050752f339fa60') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --libexecdir=/usr/lib/gvfs \ + --with-bash-completion-dir=/etc/bash_completion.d + make +} + +package_gvfs() { + pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio" + depends=('libsoup-gnome' 'gnome-disk-utility' 'libcdio' 'fuse' 'libarchive') + optdepends=('gvfs-afc: AFC (mobile devices) support' + 'gvfs-smb: SMB/CIFS (Windows client) support' + 'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support' + 'gvfs-obexftp: ObexFTP (bluetooth) support' + 'gvfs-afp: Apple Filing Protocol (AFP) support') + install=gvfs.install + + cd "${srcdir}/${pkgbase}-${pkgver}" + sed -e 's/^am__append_3/#am__append_3/' \ + -e 's/^am__append_4/#am__append_4/' \ + -i monitor/Makefile + make DESTDIR="${pkgdir}" install + + cd "${pkgdir}" + rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp} + rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}.mount + rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml + rm usr/share/GConf/gsettings/gvfs-smb.convert +} + +package_gvfs-smb() { + pkgdesc="SMB/CIFS (Windows client) backend for gvfs" + depends=("gvfs=${pkgver}" 'smbclient' 'libgnome-keyring') + install=gvfs-smb.install + + cd "${srcdir}/${pkgbase}-${pkgver}/daemon" + install -m755 -d "${pkgdir}/usr/lib/gvfs" + install -m755 -d "${pkgdir}/usr/share/gvfs/mounts" + + install -m755 .libs/gvfsd-smb{,-browse} "${pkgdir}/usr/lib/gvfs/" + install -m644 smb{,-browse}.mount "${pkgdir}/usr/share/gvfs/mounts/" + + install -Dm644 org.gnome.system.smb.gschema.xml \ + "${pkgdir}/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml" + install -Dm644 gvfs-smb.convert \ + "${pkgdir}/usr/share/GConf/gsettings/gvfs-smb.convert" +} + +package_gvfs-afc() { + pkgdesc="AFC (mobile devices) backend for gvfs" + depends=("gvfs=${pkgver}" 'libimobiledevice') + install=gvfs-module.install + + cd "${srcdir}/${pkgbase}-${pkgver}/daemon" + install -D .libs/gvfsd-afc "${pkgdir}/usr/lib/gvfs/gvfsd-afc" + install -Dm644 afc.mount "${pkgdir}/usr/share/gvfs/mounts/afc.mount" + + cd "${srcdir}/${pkgbase}-${pkgver}/monitor/afc" + make DESTDIR="${pkgdir}" install +} + +package_gvfs-gphoto2() { + pkgdesc="gphoto2 (PTP camera/MTP media player) backend for gvfs" + depends=("gvfs=${pkgver}" 'dbus-core' 'libgphoto2' 'udev') + install=gvfs-module.install + + cd "${srcdir}/${pkgbase}-${pkgver}/daemon" + install -D .libs/gvfsd-gphoto2 "${pkgdir}/usr/lib/gvfs/gvfsd-gphoto2" + install -Dm644 gphoto2.mount "${pkgdir}/usr/share/gvfs/mounts/gphoto2.mount" + + cd "${srcdir}/${pkgbase}-${pkgver}/monitor/gphoto2" + make DESTDIR="${pkgdir}" install +} + +package_gvfs-obexftp() { + pkgdesc="ObexFTP (bluetooth) backend for gvfs" + depends=("gvfs=${pkgver}" 'dbus-glib' 'bluez' 'obex-data-server') + install=gvfs-module.install + + cd "${srcdir}/${pkgbase}-${pkgver}/daemon" + install -D .libs/gvfsd-obexftp "${pkgdir}/usr/lib/gvfs/gvfsd-obexftp" + install -Dm644 obexftp.mount "${pkgdir}/usr/share/gvfs/mounts/obexftp.mount" +} + +package_gvfs-afp() { + pkgdesc="Apple Filing Protocol (AFP) backend for gvfs" + depends=("gvfs=${pkgver}") + install=gvfs-module.install + install -m755 -d "${pkgdir}/usr/lib/gvfs" + install -m755 -d "${pkgdir}/usr/share/gvfs/mounts" + + cd "${srcdir}/${pkgbase}-${pkgver}/daemon" + install -m755 .libs/gvfsd-afp{,-browse} "${pkgdir}/usr/lib/gvfs/" + install -m644 afp{,-browse}.mount "${pkgdir}/usr/share/gvfs/mounts/" + +} diff --git a/gnome-unstable/gvfs/gvfs-module.install b/gnome-unstable/gvfs/gvfs-module.install new file mode 100644 index 000000000..09d1f11ec --- /dev/null +++ b/gnome-unstable/gvfs/gvfs-module.install @@ -0,0 +1,7 @@ +post_install() { + killall -USR1 gvfsd >&/dev/null || : +} + +post_upgrade() { + post_install +} diff --git a/gnome-unstable/gvfs/gvfs-smb.install b/gnome-unstable/gvfs/gvfs-smb.install new file mode 100644 index 000000000..0b8783c7b --- /dev/null +++ b/gnome-unstable/gvfs/gvfs-smb.install @@ -0,0 +1,12 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + killall -USR1 gvfsd >&/dev/null || : +} + +post_upgrade() { + post_install +} + +post_remove() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas +} diff --git a/gnome-unstable/gvfs/gvfs.install b/gnome-unstable/gvfs/gvfs.install new file mode 100644 index 000000000..9458b1513 --- /dev/null +++ b/gnome-unstable/gvfs/gvfs.install @@ -0,0 +1,14 @@ +post_install() { + usr/bin/gio-querymodules usr/lib/gio/modules + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + killall -USR1 gvfsd >&/dev/null || : +} + +post_upgrade() { + post_install +} + +post_remove() { + usr/bin/gio-querymodules usr/lib/gio/modules + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas +} diff --git a/gnome-unstable/json-c/PKGBUILD b/gnome-unstable/json-c/PKGBUILD new file mode 100644 index 000000000..2f689ba64 --- /dev/null +++ b/gnome-unstable/json-c/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> +# Contributor: congyiwu <congyiwu AT gmail DOT com> +pkgname=json-c +pkgver=0.9 +pkgrel=1 +pkgdesc="A JSON implementation in C" +url="http://oss.metaparadigm.com/json-c/" +license=("MIT") +arch=('i686' 'x86_64') +depends=('glibc') +source=(http://oss.metaparadigm.com/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('3a13d264528dcbaf3931b0cede24abae') +options=(!libtool) +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -D COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} diff --git a/gnome-unstable/libgdata/PKGBUILD b/gnome-unstable/libgdata/PKGBUILD new file mode 100644 index 000000000..2629b9a04 --- /dev/null +++ b/gnome-unstable/libgdata/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 136697 2011-08-31 14:39:04Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=libgdata +pkgver=0.10.0 +pkgrel=1 +pkgdesc="GLib-based library for accessing online service APIs using the GData protocol" +arch=('i686' 'x86_64') +license=('GPL') +depends=('libsoup-gnome' 'liboauth') +makedepends=('pkgconfig' 'intltool' 'gobject-introspection') +url="http://www.gnome.org" +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('af4805304763b93058773bbfdb06925189159196066207f275cb34b1b5c552ec') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/gnome-unstable/libgnome-keyring/PKGBUILD b/gnome-unstable/libgnome-keyring/PKGBUILD new file mode 100644 index 000000000..b69fefae2 --- /dev/null +++ b/gnome-unstable/libgnome-keyring/PKGBUILD @@ -0,0 +1,28 @@ +#$Id: PKGBUILD 136653 2011-08-31 11:15:05Z ibiru $ +#Maintainer: Jan De Groot <jgc@archlinux.org> + +pkgname=libgnome-keyring +pkgver=3.1.90 +pkgrel=1 +pkgdesc="GNOME keyring client library" +arch=(i686 x86_64) +license=('GPL' 'LGPL') +depends=('dbus-core' 'libgcrypt' 'glib2') +makedepends=('intltool' 'pkgconfig') +options=('!libtool' '!emptydirs') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('805f3100ae75741a86f9090f8bbfffeec4424c7629a35cd71e1c128420cf8840') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --libexecdir=/usr/lib/gnome-keyring + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/gnome-unstable/libgweather/01_gettext_not_xml.patch b/gnome-unstable/libgweather/01_gettext_not_xml.patch new file mode 100644 index 000000000..d5f57305e --- /dev/null +++ b/gnome-unstable/libgweather/01_gettext_not_xml.patch @@ -0,0 +1,527 @@ +only in patch2: +unchanged: +diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/configure.in libgweather-2.27.91.new/configure.in +--- libgweather-2.27.91/configure.in 2009-08-25 23:56:58.000000000 +1000 ++++ libgweather-2.27.91.new/configure.in 2009-08-26 11:54:52.000000000 +1000 +@@ -40,6 +40,10 @@ + AM_MAINTAINER_MODE + GNOME_MAINTAINER_MODE_DEFINES + ++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]) + PKG_PROG_PKG_CONFIG([0.19]) + +@@ -50,13 +54,6 @@ + AM_PROG_LIBTOOL + AC_PATH_PROG(GCONFTOOL, gconftool-2) + +-AC_ARG_ENABLE(all-translations-in-one-xml, +- [AC_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], + [Compress Locations.xml files])], +@@ -253,7 +250,7 @@ + Makefile + doc/Makefile + po/Makefile.in +-po-locations/Makefile ++po-locations/Makefile.in + libgweather/Makefile + libgweather/gweather.pc + libgweather/gweather-uninstalled.pc +@@ -261,12 +258,6 @@ + python/Makefile + ]) + +-if test "x$enable_big_xml" = "xyes"; then +- LOCATIONS_XML_TRANSLATIONS="one big file" +-else +- LOCATIONS_XML_TRANSLATIONS="one file per translation" +-fi +- + dnl *************************************************************************** + dnl *** Display Summary *** + dnl *************************************************************************** +diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/data/Makefile.am libgweather-2.27.91.new/data/Makefile.am +--- libgweather-2.27.91/data/Makefile.am 2009-07-22 03:01:11.000000000 +1000 ++++ libgweather-2.27.91.new/data/Makefile.am 2009-08-26 11:57:46.000000000 +1000 +@@ -4,55 +4,23 @@ + libgweatherlocationsdir = $(pkgdatadir) + libgweatherlocations_in_files = Locations.xml.in + +-if USE_ONE_BIG_XML +- +-LOCATIONS_STAMP = +- +-libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml$(COMPRESS_EXT)) +- +-%.xml$(COMPRESS_EXT): %.xml.in $(wildcard $(top_srcdir)/po-locations/*.po) +- $(AM_V_GEN)LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"` && \ +- if test "x$(COMPRESS_EXT)" = "x.gz"; then \ +- gzip --force `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"`; \ +- fi +- +-else # USE_ONE_BIG_XML +- + LOCATIONS_STAMP = stamp-Locations.xml + +-PO_LOCATIONS = $(shell if test -n "$(LINGUAS)"; then for lang in $(LINGUAS); do if test -f "$(top_srcdir)/po-locations/$$lang.po"; then echo "$(top_srcdir)/po-locations/$$lang.po "; fi; done; else for pofile in $(top_srcdir)/po-locations/*.po; do echo $$pofile; done; fi) +- + # Helper variable +-libgweatherlocations_data = $(libgweatherlocations_in_files:.xml.in=.xml) +- +-libgweatherlocations_DATA = $(shell echo $(PO_LOCATIONS) | sed "s|$(top_srcdir)/po-locations/|Locations.|g;s|\.po|.xml$(COMPRESS_EXT)|g") $(libgweatherlocations_data)$(COMPRESS_EXT) ++libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml) + + # We need this step so that we merge all the make Locations.xy.xml destinations + # into one unique destination. This makes -j2 work. (Else, we end up with + # multiple and conflicting calls to intltool-merge) + $(libgweatherlocations_DATA): $(LOCATIONS_STAMP) + +-$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) $(PO_LOCATIONS) Makefile +- $(AM_V_at)LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< $(libgweatherlocations_data) && \ +- for pofile in $(PO_LOCATIONS); do \ +- locale=`echo $$pofile | sed "s;$(top_srcdir)/po-locations/\(.*\)\.po;\1;"`; \ +- xmllint --noblanks -o Locations.$$locale.xml $$locale/$(libgweatherlocations_data); \ +- rm -f $$locale/$(libgweatherlocations_data); \ +- test -d $$locale && rmdir $$locale; \ +- if test "x$(COMPRESS_EXT)" = "x.gz"; then \ +- gzip --force Locations.$$locale.xml; \ +- fi; \ +- done && \ +- xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_data) && \ +- rm -f C/$(libgweatherlocations_data) && \ ++$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) Makefile ++ LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache /dev/null $< $(libgweatherlocations_DATA) && \ ++ xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_DATA) && \ ++ rm -f C/$(libgweatherlocations_DATA) && \ + test -d C && rmdir C && \ +- if test "x$(COMPRESS_EXT)" = "x.gz"; then \ +- gzip --force Locations.xml; \ +- fi && \ + touch $@ + +-endif # USE_ONE_BIG_XML +- + check: + xmllint --valid --noout $(top_srcdir)/data/Locations.xml.in + $(srcdir)/check-timezones.sh $(srcdir)/Locations.xml.in +diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/libgweather/gweather-location.c libgweather-2.27.91.new/libgweather/gweather-location.c +--- libgweather-2.27.91/libgweather/gweather-location.c 2009-04-20 03:41:11.000000000 +1000 ++++ libgweather-2.27.91.new/libgweather/gweather-location.c 2009-08-26 11:54:52.000000000 +1000 +@@ -22,11 +22,14 @@ + #include <config.h> + #endif + ++#include "config.h" ++ + #include <string.h> + #include <math.h> + #include <locale.h> + #include <gtk/gtk.h> + #include <libxml/xmlreader.h> ++#include <libintl.h> + + #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE + #include "gweather-location.h" +@@ -184,10 +187,20 @@ + + tagname = (const char *) xmlTextReaderConstName (parser->xml); + if (!strcmp (tagname, "name") && !loc->name) { +- value = gweather_parser_get_localized_value (parser); ++ char *context = NULL; ++ context = xmlTextReaderGetAttribute(parser->xml,"msgctxt"); ++ ++ value = gweather_parser_get_value (parser); + if (!value) + goto error_out; +- loc->name = g_strdup (value); ++ ++ if (context != NULL) { ++ loc->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, value)); ++ xmlFree (context); ++ } ++ else ++ loc->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",value)); ++ + xmlFree (value); + normalized = g_utf8_normalize (loc->name, -1, G_NORMALIZE_ALL); + loc->sort_name = g_utf8_casefold (normalized, -1); +diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/libgweather/gweather-timezone.c libgweather-2.27.91.new/libgweather/gweather-timezone.c +--- libgweather-2.27.91/libgweather/gweather-timezone.c 2009-08-12 19:00:52.000000000 +1000 ++++ libgweather-2.27.91.new/libgweather/gweather-timezone.c 2009-08-26 11:54:52.000000000 +1000 +@@ -23,6 +23,7 @@ + #endif + + #include <string.h> ++#include <libintl.h> + + #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE + #include "gweather-timezone.h" +@@ -152,7 +153,7 @@ + parse_timezone (GWeatherParser *parser) + { + GWeatherTimezone *zone = NULL; +- char *id = NULL, *name = NULL; ++ char *id = NULL, *name = NULL, *context = NULL; + int offset = 0, dst_offset = 0; + gboolean has_dst = FALSE; + +@@ -175,27 +176,34 @@ + continue; + } + +- if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name")) +- name = gweather_parser_get_localized_value (parser); ++ if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name")) { ++ context = xmlTextReaderGetAttribute(parser->xml,"msgctxt"); ++ name = gweather_parser_get_value (parser); ++ } + else { + if (xmlTextReaderNext (parser->xml) != 1) + break; + } + } + } +- ++ + if (parse_tzdata (id, parser->year_start, parser->year_end, + &offset, &has_dst, &dst_offset)) { + zone = g_slice_new0 (GWeatherTimezone); + zone->ref_count = 1; + zone->id = g_strdup (id); +- zone->name = g_strdup (name); ++ if (context != NULL) ++ zone->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, name)); ++ else ++ zone->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",name)); + zone->offset = offset; + zone->has_dst = has_dst; + zone->dst_offset = dst_offset; + } + + xmlFree (id); ++ if (context) ++ xmlFree (context); + if (name) + xmlFree (name); + +diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/po-locations/LINGUAS libgweather-2.27.91.new/po-locations/LINGUAS +--- libgweather-2.27.91/po-locations/LINGUAS 1970-01-01 10:00:00.000000000 +1000 ++++ libgweather-2.27.91.new/po-locations/LINGUAS 2009-08-26 11:54:52.000000000 +1000 +@@ -0,0 +1,78 @@ ++ang ++ar ++as ++az ++be ++be@latin ++bg ++bn_IN ++bn ++bs ++ca ++cs ++cy ++da ++de ++dz ++el ++en_CA ++en_GB ++es ++et ++eu ++fa ++fi ++fr ++ga ++gl ++gu ++he ++hi ++hr ++hu ++id ++it ++ja ++ka ++kn ++ko ++ku ++ky ++lt ++lv ++mai ++mg ++mk ++ml ++mn ++mr ++ms ++nb ++ne ++nl ++nn ++oc ++or ++pa ++pl ++pt_BR ++pt ++ro ++ru ++rw ++si ++sk ++sl ++sq ++sr@latin ++sr ++sv ++ta ++te ++th ++tr ++uk ++vi ++zh_CN ++zh_HK ++zh_TW +diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/po-locations/Makefile.in.in libgweather-2.27.91.new/po-locations/Makefile.in.in +--- libgweather-2.27.91/po-locations/Makefile.in.in 1970-01-01 10:00:00.000000000 +1000 ++++ libgweather-2.27.91.new/po-locations/Makefile.in.in 2009-08-26 11:54:52.000000000 +1000 +@@ -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> ++# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns@gmail.com> ++# ++# This file may be copied and used freely without restrictions. It may ++# be used in projects which are not available under a GNU Public License, ++# but which still want to provide support for the GNU gettext functionality. ++# ++# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE ++# instead of PACKAGE and to look for po2tbl in ./ not in intl/ ++# ++# - Modified by jacob berkman <jacob@ximian.com> to install ++# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize ++# ++# - Modified by Rodney Dawes <dobey.pwns@gmail.com> for use with intltool ++# ++# We have the following line for use by intltoolize: ++# INTLTOOL_MAKEFILE ++ ++GETTEXT_PACKAGE = @GETTEXT_PACKAGE@-locations ++PACKAGE = @PACKAGE@ ++VERSION = @VERSION@ ++ ++SHELL = /bin/sh ++ ++srcdir = @srcdir@ ++top_srcdir = @top_srcdir@ ++top_builddir = @top_builddir@ ++VPATH = @srcdir@ ++ ++prefix = @prefix@ ++exec_prefix = @exec_prefix@ ++datadir = @datadir@ ++datarootdir = @datarootdir@ ++libdir = @libdir@ ++DATADIRNAME = @DATADIRNAME@ ++itlocaledir = $(prefix)/$(DATADIRNAME)/locale ++subdir = po-locations ++install_sh = @install_sh@ ++# Automake >= 1.8 provides @mkdir_p@. ++# Until it can be supposed, use the safe fallback: ++mkdir_p = $(install_sh) -d ++ ++INSTALL = @INSTALL@ ++INSTALL_DATA = @INSTALL_DATA@ ++ ++GMSGFMT = @GMSGFMT@ ++MSGFMT = @MSGFMT@ ++XGETTEXT = @XGETTEXT@ ++INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ ++INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ ++MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist ++GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot ++ ++ALL_LINGUAS = @ALL_LINGUAS@ ++ ++PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi) ++ ++USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi) ++ ++USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) ++ ++POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done) ++ ++DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES) ++EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS ++ ++POTFILES = \ ++# This comment gets stripped out ++ ++CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done) ++ ++.SUFFIXES: ++.SUFFIXES: .po .pox .gmo .mo .msg .cat ++ ++.po.pox: ++ $(MAKE) $(GETTEXT_PACKAGE).pot ++ $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox ++ ++.po.mo: ++ $(MSGFMT) -o $@ $< ++ ++.po.gmo: ++ file=`echo $* | sed 's,.*/,,'`.gmo \ ++ && rm -f $$file && $(GMSGFMT) -o $$file $< ++ ++.po.cat: ++ sed -f ../intl/po2msg.sed < $< > $*.msg \ ++ && rm -f $@ && gencat $@ $*.msg ++ ++ ++all: all-@USE_NLS@ ++ ++all-yes: $(CATALOGS) ++all-no: ++ ++$(GETTEXT_PACKAGE).pot: $(POTFILES) ++ $(GENPOT) ++ ++install: install-data ++install-data: install-data-@USE_NLS@ ++install-data-no: all ++install-data-yes: all ++ linguas="$(USE_LINGUAS)"; \ ++ for lang in $$linguas; do \ ++ dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ ++ $(mkdir_p) $$dir; \ ++ if test -r $$lang.gmo; then \ ++ $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ ++ echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \ ++ else \ ++ $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ ++ echo "installing $(srcdir)/$$lang.gmo as" \ ++ "$$dir/$(GETTEXT_PACKAGE).mo"; \ ++ fi; \ ++ if test -r $$lang.gmo.m; then \ ++ $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \ ++ echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \ ++ else \ ++ if test -r $(srcdir)/$$lang.gmo.m ; then \ ++ $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \ ++ $$dir/$(GETTEXT_PACKAGE).mo.m; \ ++ echo "installing $(srcdir)/$$lang.gmo.m as" \ ++ "$$dir/$(GETTEXT_PACKAGE).mo.m"; \ ++ else \ ++ true; \ ++ fi; \ ++ fi; \ ++ done ++ ++# Empty stubs to satisfy archaic automake needs ++dvi info tags TAGS ID: ++ ++# Define this as empty until I found a useful application. ++install-exec installcheck: ++ ++uninstall: ++ linguas="$(USE_LINGUAS)"; \ ++ for lang in $$linguas; do \ ++ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ ++ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ ++ done ++ ++check: all $(GETTEXT_PACKAGE).pot ++ rm -f missing notexist ++ srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m ++ if [ -r missing -o -r notexist ]; then \ ++ exit 1; \ ++ fi ++ ++mostlyclean: ++ rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp ++ rm -f .intltool-merge-cache ++ ++clean: mostlyclean ++ ++distclean: clean ++ rm -f Makefile Makefile.in POTFILES stamp-it ++ rm -f *.mo *.msg *.cat *.cat.m *.gmo ++ ++maintainer-clean: distclean ++ @echo "This command is intended for maintainers to use;" ++ @echo "it deletes files that may require special tools to rebuild." ++ rm -f Makefile.in.in ++ ++distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) ++dist distdir: $(DISTFILES) ++ dists="$(DISTFILES)"; \ ++ extra_dists="$(EXTRA_DISTFILES)"; \ ++ for file in $$extra_dists; do \ ++ test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \ ++ done; \ ++ for file in $$dists; do \ ++ test -f $$file || file="$(srcdir)/$$file"; \ ++ ln $$file $(distdir) 2> /dev/null \ ++ || cp -p $$file $(distdir); \ ++ done ++ ++update-po: Makefile ++ $(MAKE) $(GETTEXT_PACKAGE).pot ++ tmpdir=`pwd`; \ ++ linguas="$(USE_LINGUAS)"; \ ++ for lang in $$linguas; do \ ++ echo "$$lang:"; \ ++ result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \ ++ if $$result; then \ ++ if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ ++ rm -f $$tmpdir/$$lang.new.po; \ ++ else \ ++ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ ++ :; \ ++ else \ ++ echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ ++ rm -f $$tmpdir/$$lang.new.po; \ ++ exit 1; \ ++ fi; \ ++ fi; \ ++ else \ ++ echo "msgmerge for $$lang.gmo failed!"; \ ++ rm -f $$tmpdir/$$lang.new.po; \ ++ fi; \ ++ done ++ ++Makefile POTFILES: stamp-it ++ @if test ! -f $@; then \ ++ rm -f stamp-it; \ ++ $(MAKE) stamp-it; \ ++ fi ++ ++stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in ++ cd $(top_builddir) \ ++ && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \ ++ $(SHELL) ./config.status ++ ++# 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 -Nur -x '*.orig' -x '*~' libgweather-2.27.91/po-locations/POTFILES.in libgweather-2.27.91.new/po-locations/POTFILES.in +--- libgweather-2.27.91/po-locations/POTFILES.in 1970-01-01 10:00:00.000000000 +1000 ++++ libgweather-2.27.91.new/po-locations/POTFILES.in 2009-08-26 11:54:52.000000000 +1000 +@@ -0,0 +1,4 @@ ++# This list should contain *only* data/Locations.xml.in. ++# Everything else should be in POTFILES.skip. ++[encoding:UTF-8] ++data/Locations.xml.in diff --git a/gnome-unstable/libgweather/PKGBUILD b/gnome-unstable/libgweather/PKGBUILD new file mode 100644 index 000000000..1d3d00858 --- /dev/null +++ b/gnome-unstable/libgweather/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 136699 2011-08-31 14:53:36Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=libgweather +pkgver=3.1.3 +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') +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 + gettext-not-xml.patch) +sha256sums=('e711f3e9f41a7b574afcaa442959e827a05b0105d925b5938ac54204b28ab308' + '5b6bf182294b8974a89492237d98b60678b83efcf31de8a0ca1bebd90f3356a3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np1 -i "${srcdir}/gettext-not-xml.patch" + gtkdocize + autoreconf -fi + + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --enable-locations-compression + make +} + +package() { + cd "${srcdir}/${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 +} diff --git a/gnome-unstable/libgweather/gettext-not-xml.patch b/gnome-unstable/libgweather/gettext-not-xml.patch new file mode 100644 index 000000000..db9c64148 --- /dev/null +++ b/gnome-unstable/libgweather/gettext-not-xml.patch @@ -0,0 +1,532 @@ +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.6]) + PKG_PROG_PKG_CONFIG([0.19]) + + AC_PROG_CC + AC_PATH_PROG(GCONFTOOL, gconftool-2) + +-AC_ARG_ENABLE(all-translations-in-one-xml, +- [AC_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], + [Compress Locations.xml files])], +@@ -191,7 +188,7 @@ AC_OUTPUT([ + Makefile + doc/Makefile + po/Makefile.in +-po-locations/Makefile ++po-locations/Makefile.in + libgweather/Makefile + libgweather/gweather-3.0.pc + libgweather/gweather-3.0-uninstalled.pc +@@ -199,12 +196,6 @@ data/Makefile + icons/Makefile + ]) + +-if test "x$enable_big_xml" = "xyes"; then +- LOCATIONS_XML_TRANSLATIONS="one big file" +-else +- LOCATIONS_XML_TRANSLATIONS="one file per translation" +-fi +- + dnl *************************************************************************** + dnl *** Display Summary *** + dnl *************************************************************************** +@@ -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-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 + +-if USE_ONE_BIG_XML +- +-LOCATIONS_STAMP = +- +-libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml$(COMPRESS_EXT)) +- +-%.xml$(COMPRESS_EXT): %.xml.in $(wildcard $(top_srcdir)/po-locations/*.po) +- $(AM_V_GEN)LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"` && \ +- if test "x$(COMPRESS_EXT)" = "x.gz"; then \ +- gzip --force `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"`; \ +- fi +- +-else # USE_ONE_BIG_XML +- + LOCATIONS_STAMP = stamp-Locations.xml + +-PO_LOCATIONS = $(shell if test -n "$(LINGUAS)"; then for lang in $(LINGUAS); do if test -f "$(top_srcdir)/po-locations/$$lang.po"; then echo "$(top_srcdir)/po-locations/$$lang.po "; fi; done; else for pofile in $(top_srcdir)/po-locations/*.po; do echo $$pofile; done; fi) +- + # Helper variable +-libgweatherlocations_data = $(libgweatherlocations_in_files:.xml.in=.xml) +- +-libgweatherlocations_DATA = $(shell echo $(PO_LOCATIONS) | sed "s|$(top_srcdir)/po-locations/|Locations.|g;s|\.po|.xml$(COMPRESS_EXT)|g") $(libgweatherlocations_data)$(COMPRESS_EXT) ++libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml) + + # We need this step so that we merge all the make Locations.xy.xml destinations + # into one unique destination. This makes -j2 work. (Else, we end up with + # multiple and conflicting calls to intltool-merge) + $(libgweatherlocations_DATA): $(LOCATIONS_STAMP) + +-$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) $(PO_LOCATIONS) Makefile +- $(AM_V_at)LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< $(libgweatherlocations_data) && \ +- for pofile in $(PO_LOCATIONS); do \ +- locale=`echo $$pofile | sed "s;$(top_srcdir)/po-locations/\(.*\)\.po;\1;"`; \ +- xmllint --noblanks -o Locations.$$locale.xml $$locale/$(libgweatherlocations_data); \ +- rm -f $$locale/$(libgweatherlocations_data); \ +- test -d $$locale && rmdir $$locale; \ +- if test "x$(COMPRESS_EXT)" = "x.gz"; then \ +- gzip --force Locations.$$locale.xml; \ +- fi; \ +- done && \ +- xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_data) && \ +- rm -f C/$(libgweatherlocations_data) && \ +- test -d C && rmdir C && \ +- if test "x$(COMPRESS_EXT)" = "x.gz"; then \ +- gzip --force Locations.xml; \ +- fi && \ ++$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) Makefile ++ LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache /dev/null $< $(libgweatherlocations_DATA) ++ xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_DATA) ++ rm -f C/$(libgweatherlocations_DATA) ++ test -d C && rmdir C + touch $@ + +-endif # USE_ONE_BIG_XML +- + ### 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 +@@ -22,11 +22,14 @@ + #include <config.h> + #endif + ++#include "config.h" ++ + #include <string.h> + #include <math.h> + #include <locale.h> + #include <gtk/gtk.h> + #include <libxml/xmlreader.h> ++#include <libintl.h> + + #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE + #include "gweather-location.h" +@@ -184,10 +187,20 @@ location_new_from_xml (GWeatherParser *p + + tagname = (const char *) xmlTextReaderConstName (parser->xml); + if (!strcmp (tagname, "name") && !loc->name) { +- value = gweather_parser_get_localized_value (parser); ++ char *context = NULL; ++ context = xmlTextReaderGetAttribute(parser->xml,"msgctxt"); ++ ++ value = gweather_parser_get_value (parser); + if (!value) + goto error_out; +- loc->name = g_strdup (value); ++ ++ if (context != NULL) { ++ loc->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, value)); ++ xmlFree (context); ++ } ++ else ++ loc->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",value)); ++ + 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 +@@ -23,6 +23,7 @@ + #endif + + #include <string.h> ++#include <libintl.h> + + #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE + #include "gweather-timezone.h" +@@ -152,7 +153,7 @@ static GWeatherTimezone * + parse_timezone (GWeatherParser *parser) + { + GWeatherTimezone *zone = NULL; +- char *id = NULL, *name = NULL; ++ char *id = NULL, *name = NULL, *context = NULL; + int offset = 0, dst_offset = 0; + gboolean has_dst = FALSE; + +@@ -175,27 +176,34 @@ parse_timezone (GWeatherParser *parser) + continue; + } + +- if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name")) +- name = gweather_parser_get_localized_value (parser); ++ if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name")) { ++ context = xmlTextReaderGetAttribute(parser->xml,"msgctxt"); ++ name = gweather_parser_get_value (parser); ++ } + else { + if (xmlTextReaderNext (parser->xml) != 1) + break; + } + } + } +- ++ + if (parse_tzdata (id, parser->year_start, parser->year_end, + &offset, &has_dst, &dst_offset)) { + zone = g_slice_new0 (GWeatherTimezone); + zone->ref_count = 1; + zone->id = g_strdup (id); +- zone->name = g_strdup (name); ++ if (context != NULL) ++ zone->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, name)); ++ else ++ zone->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",name)); + zone->offset = offset; + zone->has_dst = has_dst; + zone->dst_offset = dst_offset; + } + + xmlFree (id); ++ if (context) ++ xmlFree (context); + 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 +@@ -0,0 +1,78 @@ ++ang ++ar ++as ++az ++be ++be@latin ++bg ++bn_IN ++bn ++bs ++ca ++cs ++cy ++da ++de ++dz ++el ++en_CA ++en_GB ++es ++et ++eu ++fa ++fi ++fr ++ga ++gl ++gu ++he ++hi ++hr ++hu ++id ++it ++ja ++ka ++kn ++ko ++ku ++ky ++lt ++lv ++mai ++mg ++mk ++ml ++mn ++mr ++ms ++nb ++ne ++nl ++nn ++oc ++or ++pa ++pl ++pt_BR ++pt ++ro ++ru ++rw ++si ++sk ++sl ++sq ++sr@latin ++sr ++sv ++ta ++te ++th ++tr ++uk ++vi ++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 +@@ -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> ++# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns@gmail.com> ++# ++# This file may be copied and used freely without restrictions. It may ++# be used in projects which are not available under a GNU Public License, ++# but which still want to provide support for the GNU gettext functionality. ++# ++# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE ++# instead of PACKAGE and to look for po2tbl in ./ not in intl/ ++# ++# - Modified by jacob berkman <jacob@ximian.com> to install ++# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize ++# ++# - Modified by Rodney Dawes <dobey.pwns@gmail.com> for use with intltool ++# ++# We have the following line for use by intltoolize: ++# INTLTOOL_MAKEFILE ++ ++GETTEXT_PACKAGE = @GETTEXT_PACKAGE@-locations ++PACKAGE = @PACKAGE@ ++VERSION = @VERSION@ ++ ++SHELL = /bin/sh ++ ++srcdir = @srcdir@ ++top_srcdir = @top_srcdir@ ++top_builddir = @top_builddir@ ++VPATH = @srcdir@ ++ ++prefix = @prefix@ ++exec_prefix = @exec_prefix@ ++datadir = @datadir@ ++datarootdir = @datarootdir@ ++libdir = @libdir@ ++DATADIRNAME = @DATADIRNAME@ ++itlocaledir = $(prefix)/$(DATADIRNAME)/locale ++subdir = po-locations ++install_sh = @install_sh@ ++# Automake >= 1.8 provides @mkdir_p@. ++# Until it can be supposed, use the safe fallback: ++mkdir_p = $(install_sh) -d ++ ++INSTALL = @INSTALL@ ++INSTALL_DATA = @INSTALL_DATA@ ++ ++GMSGFMT = @GMSGFMT@ ++MSGFMT = @MSGFMT@ ++XGETTEXT = @XGETTEXT@ ++INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ ++INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ ++MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist ++GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot ++ ++ALL_LINGUAS = @ALL_LINGUAS@ ++ ++PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi) ++ ++USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi) ++ ++USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) ++ ++POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done) ++ ++DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES) ++EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS ++ ++POTFILES = \ ++# This comment gets stripped out ++ ++CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done) ++ ++.SUFFIXES: ++.SUFFIXES: .po .pox .gmo .mo .msg .cat ++ ++.po.pox: ++ $(MAKE) $(GETTEXT_PACKAGE).pot ++ $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox ++ ++.po.mo: ++ $(MSGFMT) -o $@ $< ++ ++.po.gmo: ++ file=`echo $* | sed 's,.*/,,'`.gmo \ ++ && rm -f $$file && $(GMSGFMT) -o $$file $< ++ ++.po.cat: ++ sed -f ../intl/po2msg.sed < $< > $*.msg \ ++ && rm -f $@ && gencat $@ $*.msg ++ ++ ++all: all-@USE_NLS@ ++ ++all-yes: $(CATALOGS) ++all-no: ++ ++$(GETTEXT_PACKAGE).pot: $(POTFILES) ++ $(GENPOT) ++ ++install: install-data ++install-data: install-data-@USE_NLS@ ++install-data-no: all ++install-data-yes: all ++ linguas="$(USE_LINGUAS)"; \ ++ for lang in $$linguas; do \ ++ dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ ++ $(mkdir_p) $$dir; \ ++ if test -r $$lang.gmo; then \ ++ $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ ++ echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \ ++ else \ ++ $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ ++ echo "installing $(srcdir)/$$lang.gmo as" \ ++ "$$dir/$(GETTEXT_PACKAGE).mo"; \ ++ fi; \ ++ if test -r $$lang.gmo.m; then \ ++ $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \ ++ echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \ ++ else \ ++ if test -r $(srcdir)/$$lang.gmo.m ; then \ ++ $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \ ++ $$dir/$(GETTEXT_PACKAGE).mo.m; \ ++ echo "installing $(srcdir)/$$lang.gmo.m as" \ ++ "$$dir/$(GETTEXT_PACKAGE).mo.m"; \ ++ else \ ++ true; \ ++ fi; \ ++ fi; \ ++ done ++ ++# Empty stubs to satisfy archaic automake needs ++dvi info tags TAGS ID: ++ ++# Define this as empty until I found a useful application. ++install-exec installcheck: ++ ++uninstall: ++ linguas="$(USE_LINGUAS)"; \ ++ for lang in $$linguas; do \ ++ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ ++ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ ++ done ++ ++check: all $(GETTEXT_PACKAGE).pot ++ rm -f missing notexist ++ srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m ++ if [ -r missing -o -r notexist ]; then \ ++ exit 1; \ ++ fi ++ ++mostlyclean: ++ rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp ++ rm -f .intltool-merge-cache ++ ++clean: mostlyclean ++ ++distclean: clean ++ rm -f Makefile Makefile.in POTFILES stamp-it ++ rm -f *.mo *.msg *.cat *.cat.m *.gmo ++ ++maintainer-clean: distclean ++ @echo "This command is intended for maintainers to use;" ++ @echo "it deletes files that may require special tools to rebuild." ++ rm -f Makefile.in.in ++ ++distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) ++dist distdir: $(DISTFILES) ++ dists="$(DISTFILES)"; \ ++ extra_dists="$(EXTRA_DISTFILES)"; \ ++ for file in $$extra_dists; do \ ++ test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \ ++ done; \ ++ for file in $$dists; do \ ++ test -f $$file || file="$(srcdir)/$$file"; \ ++ ln $$file $(distdir) 2> /dev/null \ ++ || cp -p $$file $(distdir); \ ++ done ++ ++update-po: Makefile ++ $(MAKE) $(GETTEXT_PACKAGE).pot ++ tmpdir=`pwd`; \ ++ linguas="$(USE_LINGUAS)"; \ ++ for lang in $$linguas; do \ ++ echo "$$lang:"; \ ++ result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \ ++ if $$result; then \ ++ if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ ++ rm -f $$tmpdir/$$lang.new.po; \ ++ else \ ++ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ ++ :; \ ++ else \ ++ echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ ++ rm -f $$tmpdir/$$lang.new.po; \ ++ exit 1; \ ++ fi; \ ++ fi; \ ++ else \ ++ echo "msgmerge for $$lang.gmo failed!"; \ ++ rm -f $$tmpdir/$$lang.new.po; \ ++ fi; \ ++ done ++ ++Makefile POTFILES: stamp-it ++ @if test ! -f $@; then \ ++ rm -f stamp-it; \ ++ $(MAKE) stamp-it; \ ++ fi ++ ++stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in ++ cd $(top_builddir) \ ++ && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \ ++ $(SHELL) ./config.status ++ ++# 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 +@@ -0,0 +1,4 @@ ++# This list should contain *only* data/Locations.xml.in. ++# Everything else should be in POTFILES.skip. ++[encoding:UTF-8] ++data/Locations.xml.in diff --git a/gnome-unstable/libgweather/libgweather.install b/gnome-unstable/libgweather/libgweather.install new file mode 100644 index 000000000..7062d4167 --- /dev/null +++ b/gnome-unstable/libgweather/libgweather.install @@ -0,0 +1,22 @@ +pkgname=libgweather + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + gtk-update-icon-cache -q -t -f usr/share/icons/gnome +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/gnome +} diff --git a/gnome-unstable/libsocialweb/PKGBUILD b/gnome-unstable/libsocialweb/PKGBUILD new file mode 100644 index 000000000..a3016c638 --- /dev/null +++ b/gnome-unstable/libsocialweb/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 136721 2011-08-31 17:35:50Z ibiru $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +pkgname=libsocialweb +pkgver=0.25.19 +pkgrel=2 +pkgdesc="A personal social data server" +arch=('i686' 'x86_64') +url="http://www.gtk.org/" +license=('GPL2') +depends=('glib2' 'gconf' 'libsoup-gnome' 'rest' 'dbus-glib' 'libgnome-keyring' + 'json-glib') +makedepends=('intltool' 'gtk-doc' 'vala' 'gobject-introspection') +options=('!libtool') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz) +sha256sums=('377b165fed92e1d4f6c7a2430191388633ad25421a72d640e9e60dfdf1d54625') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/libsocialweb \ + --enable-all-services=yes \ + --with-online=always \ + --enable-vala-bindings + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="${pkgdir}" install +} + +# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/libsoup/PKGBUILD b/gnome-unstable/libsoup/PKGBUILD new file mode 100644 index 000000000..8ffa8b63f --- /dev/null +++ b/gnome-unstable/libsoup/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 136685 2011-08-31 14:00:57Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgbase=libsoup +pkgname=('libsoup' 'libsoup-gnome') +pkgver=2.35.90 +pkgrel=1 +arch=('i686' 'x86_64') +license=('LGPL') +makedepends=('glib2' 'libxml2' 'sqlite3' 'libgnome-keyring' 'intltool' 'gobject-introspection' 'glib-networking') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz) +options=('!libtool' '!emptydirs') +sha256sums=('c679e25d5ae1dd0ff39b4b5e58daeabf9620e161bd58ca4dd144aa63b88db64a') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package_libsoup() { + pkgdesc="GNOME HTTP Library - base library" + depends=('glib2' 'libxml2' 'glib-networking') + + cd "${srcdir}/${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}" install + + rm -f "${pkgdir}"/usr/lib/libsoup-gnome-2.4.* + rm -f "${pkgdir}/usr/lib/pkgconfig/libsoup-gnome-2.4.pc" + rm -rf "${pkgdir}/usr/include/libsoup-gnome-2.4" + rm -f "${pkgdir}/usr/lib/girepository-1.0/SoupGNOME-2.4.typelib" +} + +package_libsoup-gnome() { + pkgdesc="GNOME HTTP Library - GNOME libraries" + depends=("libsoup=${pkgver}" 'libgnome-keyring') + + cd "${srcdir}/${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}" install + + rm -f "${pkgdir}"/usr/lib/libsoup-2.4.* + rm -f "${pkgdir}/usr/lib/pkgconfig/libsoup-2.4.pc" + rm -rf "${pkgdir}/usr/include/libsoup-2.4" + rm -rf "${pkgdir}/usr/share" + rm -f "${pkgdir}/usr/lib/girepository-1.0/Soup-2.4.typelib" +} diff --git a/gnome-unstable/libwnck3/PKGBUILD b/gnome-unstable/libwnck3/PKGBUILD new file mode 100644 index 000000000..5fce69b1a --- /dev/null +++ b/gnome-unstable/libwnck3/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 136659 2011-08-31 11:44:34Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +pkgname=libwnck3 +_pkgbasename=libwnck +pkgver=3.1.90 +pkgrel=1 +pkgdesc="Window Navigator Construction Kit (GTK+3)" +arch=('i686' 'x86_64') +license=('LGPL') +depends=('gtk3' 'startup-notification' 'libxres') +makedepends=('intltool' 'gobject-introspection') +options=('!libtool') +url="http://www.gnome.org/" +source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.xz) +sha256sums=('1404693cbe10b6ff42a347d49e4f2e6cea3ad44b7162b5e4e72fdb067fc52641') + +build() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/gnome-unstable/pulseaudio/PKGBUILD b/gnome-unstable/pulseaudio/PKGBUILD new file mode 100644 index 000000000..0da88e8e7 --- /dev/null +++ b/gnome-unstable/pulseaudio/PKGBUILD @@ -0,0 +1,103 @@ +# $Id: PKGBUILD 136746 2011-08-31 23:23:07Z heftig $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Corrado Primier <bardo@aur.archlinux.org> +# Contributor: William Rea <sillywilly@gmail.com> + +pkgbase=pulseaudio +pkgname=(pulseaudio libpulse) +pkgver=0.99.3 +pkgrel=1 +arch=(i686 x86_64) +url="http://pulseaudio.org/" +license=(GPL LGPL) +makedepends=(libasyncns libcap attr libxtst libsm libsndfile libtool rtkit + speex libsamplerate tdb udev dbus-core xcb-util avahi bluez + gconf intltool jack lirc-utils openssl fftw orc json-c) +options=(!emptydirs !libtool !makeflags) +source=("http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.gz" + $pkgbase.xinit) +md5sums=('95787b514872d838b49ec4d7debdd6aa' + 'eb1cfae28eb2e4d3fdbe45a90e4318ab') + +build() { + cd "$srcdir/$pkgbase-$pkgver" + + # Don't break circular dependency between libpulse and libpulsecommon + LDFLAGS="${LDFLAGS//-Wl,--as-needed}" + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --with-database=tdb \ + --disable-hal \ + --disable-tcpwrap \ + --disable-rpath \ + --disable-default-build-tests + + make +} + +package_pulseaudio() { + pkgdesc="A featureful, general-purpose sound server" + depends=("libpulse=$pkgver-$pkgrel" rtkit libtool speex libsamplerate tdb + udev fftw orc) + optdepends=('avahi: zeroconf support' + 'bluez: bluetooth support' + 'gconf: configuration through gconf (paprefs)' + 'jack: jack support' + 'lirc-utils: infra-red support' + 'openssl: RAOP support' + 'python2-pyqt: Equalizer GUI (qpaeq)') + backup=(etc/pulse/{daemon.conf,default.pa,system.pa}) + install=pulseaudio.install + cd "$srcdir/$pkgbase-$pkgver" + make DESTDIR="$pkgdir" install + + # Lower resample quality, saves CPU + sed -e '/resample-method/iresample-method=speex-float-0' \ + -i "$pkgdir/etc/pulse/daemon.conf" + + # Disable cork-request module, can result in e.g. media players unpausing + # when there's a Skype call incoming + sed -e 's|/usr/bin/pactl load-module module-x11-cork-request|#&|' \ + -i "$pkgdir/usr/bin/start-pulseaudio-x11" + + # Make module-console-kit optional + sed -e $'/load-module module-console-kit/{i.nofail\n;a.fail\n;}' \ + -i "$pkgdir/etc/pulse/default.pa" + + # Python fix + sed -i '1s:python$:&2:' "$pkgdir/usr/bin/qpaeq" + + install -Dm755 "$srcdir/pulseaudio.xinit" "$pkgdir/etc/X11/xinit/xinitrc.d/pulseaudio" + + rm "$pkgdir/etc/dbus-1/system.d/pulseaudio-system.conf" + +### Split libpulse + + mkdir -p "$srcdir"/libpulse/{etc/pulse,usr/{lib,share/man/man5}} + + mv {"$pkgdir","$srcdir/libpulse"}/etc/pulse/client.conf + + mv "$pkgdir"/usr/lib/libpulse{,dsp,-simple,-mainloop-glib}.so* \ + "$pkgdir"/usr/lib/libpulsecommon-*.so \ + "$srcdir/libpulse/usr/lib" + + mv {"$pkgdir","$srcdir/libpulse"}/usr/lib/pkgconfig + mv {"$pkgdir","$srcdir/libpulse"}/usr/include + + mv {"$pkgdir","$srcdir/libpulse"}/usr/share/man/man5/pulse-client.conf.5 + mv {"$pkgdir","$srcdir/libpulse"}/usr/share/vala +} + +package_libpulse() { + pkgdesc="A featureful, general-purpose sound server (client library)" + depends=(dbus-core xcb-util libasyncns libcap libxtst libsm libsndfile + json-c) + optdepends=('alsa-plugins: ALSA support' + 'avahi: zeroconf support') + backup=(etc/pulse/client.conf) + mv "$srcdir"/libpulse/* "$pkgdir" +} diff --git a/gnome-unstable/pulseaudio/pulseaudio.install b/gnome-unstable/pulseaudio/pulseaudio.install new file mode 100644 index 000000000..fd7db3b36 --- /dev/null +++ b/gnome-unstable/pulseaudio/pulseaudio.install @@ -0,0 +1,23 @@ +post_install() { + cat << MES +>>> See the wiki at http://wiki.archlinux.org/index.php/PulseAudio for details + on configuring your system for PulseAudio. + +>>> Make sure to install pulseaudio-alsa to configure ALSA for PulseAudio. +MES +} + +post_upgrade() { + # Delete old users and groups + # System-wide daemon not supported anymore + if (( $(vercmp $2 0.9.22) < 0 )); then + getent passwd pulse &>/dev/null && usr/sbin/userdel -f pulse + getent group pulse-access &>/dev/null && usr/sbin/groupdel pulse-access + getent group pulse-rt &>/dev/null && usr/sbin/groupdel pulse-rt + getent group pulse &>/dev/null && usr/sbin/groupdel pulse + fi + + true +} + +# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/pulseaudio/pulseaudio.xinit b/gnome-unstable/pulseaudio/pulseaudio.xinit new file mode 100644 index 000000000..ca510e882 --- /dev/null +++ b/gnome-unstable/pulseaudio/pulseaudio.xinit @@ -0,0 +1,7 @@ +#!/bin/sh + +case "$SESSION" in + GNOME|KDE*|xfce4) # PulseAudio is started via XDG Autostart + ;; + *) /usr/bin/start-pulseaudio-x11 ;; +esac diff --git a/gnome-unstable/vte3/PKGBUILD b/gnome-unstable/vte3/PKGBUILD new file mode 100644 index 000000000..66c5b1c87 --- /dev/null +++ b/gnome-unstable/vte3/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 136681 2011-08-31 13:42:14Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgbase=vte3 +pkgname=(vte3 vte-common) +pkgver=0.29.1 +pkgrel=1 +pkgdesc="Virtual Terminal Emulator widget for use with" +arch=('i686' 'x86_64') +license=('LGPL') +options=('!libtool' '!emptydirs') +makedepends=('intltool' 'gobject-introspection' 'gtk3') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.29/vte-${pkgver}.tar.xz) +sha256sums=('5f846c2763eaac95bb15b99dd212d76ec7d723c1c6f81a8b562143f6eaf2ba9e') + +build() { + cd "${srcdir}/vte-${pkgver}" + #warning: type-punning to incomplete type might break strict-aliasing rules + export CFLAGS="$CFLAGS -fno-strict-aliasing" + + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/vte \ + --localstatedir=/var --disable-static \ + --enable-introspection + make +} + +package_vte3(){ + pkgdesc+=" GTK3" + depends=('gtk3' 'vte-common') + cd "${srcdir}/vte-${pkgver}" + make DESTDIR="${pkgdir}" install + + rm "${pkgdir}"/usr/lib/vte/gnome-pty-helper +} + +package_vte-common() { + pkgdesc="Common files used by vte and vte3" + cd "${srcdir}/vte-${pkgver}" + + make -C gnome-pty-helper DESTDIR="${pkgdir}" install +} |