Date: Thursday, October 18, 2012 @ 15:27:48 Author: jgc Revision: 169242
db-move: moved glib2 from [gnome-unstable] to [testing] (i686, x86_64) Added: glib2/repos/testing-i686/ glib2/repos/testing-i686/PKGBUILD (from rev 169138, glib2/repos/gnome-unstable-i686/PKGBUILD) glib2/repos/testing-i686/revert-warn-glib-compile-schemas.patch (from rev 169138, glib2/repos/gnome-unstable-i686/revert-warn-glib-compile-schemas.patch) glib2/repos/testing-x86_64/ glib2/repos/testing-x86_64/PKGBUILD (from rev 169138, glib2/repos/gnome-unstable-x86_64/PKGBUILD) glib2/repos/testing-x86_64/revert-warn-glib-compile-schemas.patch (from rev 169138, glib2/repos/gnome-unstable-x86_64/revert-warn-glib-compile-schemas.patch) Deleted: glib2/repos/gnome-unstable-i686/ glib2/repos/gnome-unstable-x86_64/ -------------------------------------------------------+ testing-i686/PKGBUILD | 38 ++++++++++++++++ testing-i686/revert-warn-glib-compile-schemas.patch | 33 +++++++++++++ testing-x86_64/PKGBUILD | 38 ++++++++++++++++ testing-x86_64/revert-warn-glib-compile-schemas.patch | 33 +++++++++++++ 4 files changed, 142 insertions(+) Copied: glib2/repos/testing-i686/PKGBUILD (from rev 169138, glib2/repos/gnome-unstable-i686/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2012-10-18 19:27:48 UTC (rev 169242) @@ -0,0 +1,38 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgname=glib2 +pkgver=2.34.1 +pkgrel=1 +pkgdesc="Common C routines used by GTK+ and other libs" +url="http://www.gtk.org/" +arch=(i686 x86_64) +license=('LGPL') +depends=('pcre' 'libffi') +makedepends=('pkg-config' 'python2') +optdepends=('python2: for gdbus-codegen') +options=('!libtool' '!docs' '!emptydirs') +source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz + revert-warn-glib-compile-schemas.patch) +sha256sums=('6e84dc9d84b104725b34d255421ed7ac3629e49f437d37addde5ce3891c2e2f1' + '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') + +build() { + cd glib-$pkgver + patch -Rp1 -i "$srcdir/revert-warn-glib-compile-schemas.patch" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \ + --sysconfdir=/etc \ + --with-pcre=system \ + --disable-fam + make +} + +package() { + cd glib-$pkgver + make completiondir=/usr/share/bash-completion/completions DESTDIR="$pkgdir" install + + for _i in "$pkgdir/usr/share/bash-completion/completions/"*; do + chmod -x "$_i" + done + sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir"/usr/bin/gdbus-codegen +} Copied: glib2/repos/testing-i686/revert-warn-glib-compile-schemas.patch (from rev 169138, glib2/repos/gnome-unstable-i686/revert-warn-glib-compile-schemas.patch) =================================================================== --- testing-i686/revert-warn-glib-compile-schemas.patch (rev 0) +++ testing-i686/revert-warn-glib-compile-schemas.patch 2012-10-18 19:27:48 UTC (rev 169242) @@ -0,0 +1,33 @@ +From 6560b37450cd19c4a7c7b690e279fe97b7bfdcaa Mon Sep 17 00:00:00 2001 +From: Ryan Lortie <de...@desrt.ca> +Date: Thu, 12 Apr 2012 23:55:34 +0000 +Subject: glib-compile-schemas: warn about bad dconf paths + +For quite some time the recommended usage of GSettings and dconf has +been to use paths like /org/gnome/example/. Use of /apps/ has spilled +over from GConf and is continuing to make its way into a number of +applications as they port. + +glib-compile-schemas will now warn about these types of paths being +used. This generates a lot of noise, but hopefully it will reduce the +number of ported applications making this mistake. +--- +diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c +index cf02389..27d0181 100644 +--- a/gio/glib-compile-schemas.c ++++ b/gio/glib-compile-schemas.c +@@ -1204,6 +1204,12 @@ parse_state_start_schema (ParseState *state, + return; + } + ++ if (path && (g_str_has_prefix (path, "/apps/") || ++ g_str_has_prefix (path, "/desktop/") || ++ g_str_has_prefix (path, "/system/"))) ++ g_printerr ("warning: Schema '%s' has path '%s'. Paths starting with " ++ "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path); ++ + state->schema_state = schema_state_new (path, gettext_domain, + extends, extends_name, list_of); + +-- +cgit v0.9.0.2 Copied: glib2/repos/testing-x86_64/PKGBUILD (from rev 169138, glib2/repos/gnome-unstable-x86_64/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2012-10-18 19:27:48 UTC (rev 169242) @@ -0,0 +1,38 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgname=glib2 +pkgver=2.34.1 +pkgrel=1 +pkgdesc="Common C routines used by GTK+ and other libs" +url="http://www.gtk.org/" +arch=(i686 x86_64) +license=('LGPL') +depends=('pcre' 'libffi') +makedepends=('pkg-config' 'python2') +optdepends=('python2: for gdbus-codegen') +options=('!libtool' '!docs' '!emptydirs') +source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz + revert-warn-glib-compile-schemas.patch) +sha256sums=('6e84dc9d84b104725b34d255421ed7ac3629e49f437d37addde5ce3891c2e2f1' + '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') + +build() { + cd glib-$pkgver + patch -Rp1 -i "$srcdir/revert-warn-glib-compile-schemas.patch" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \ + --sysconfdir=/etc \ + --with-pcre=system \ + --disable-fam + make +} + +package() { + cd glib-$pkgver + make completiondir=/usr/share/bash-completion/completions DESTDIR="$pkgdir" install + + for _i in "$pkgdir/usr/share/bash-completion/completions/"*; do + chmod -x "$_i" + done + sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir"/usr/bin/gdbus-codegen +} Copied: glib2/repos/testing-x86_64/revert-warn-glib-compile-schemas.patch (from rev 169138, glib2/repos/gnome-unstable-x86_64/revert-warn-glib-compile-schemas.patch) =================================================================== --- testing-x86_64/revert-warn-glib-compile-schemas.patch (rev 0) +++ testing-x86_64/revert-warn-glib-compile-schemas.patch 2012-10-18 19:27:48 UTC (rev 169242) @@ -0,0 +1,33 @@ +From 6560b37450cd19c4a7c7b690e279fe97b7bfdcaa Mon Sep 17 00:00:00 2001 +From: Ryan Lortie <de...@desrt.ca> +Date: Thu, 12 Apr 2012 23:55:34 +0000 +Subject: glib-compile-schemas: warn about bad dconf paths + +For quite some time the recommended usage of GSettings and dconf has +been to use paths like /org/gnome/example/. Use of /apps/ has spilled +over from GConf and is continuing to make its way into a number of +applications as they port. + +glib-compile-schemas will now warn about these types of paths being +used. This generates a lot of noise, but hopefully it will reduce the +number of ported applications making this mistake. +--- +diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c +index cf02389..27d0181 100644 +--- a/gio/glib-compile-schemas.c ++++ b/gio/glib-compile-schemas.c +@@ -1204,6 +1204,12 @@ parse_state_start_schema (ParseState *state, + return; + } + ++ if (path && (g_str_has_prefix (path, "/apps/") || ++ g_str_has_prefix (path, "/desktop/") || ++ g_str_has_prefix (path, "/system/"))) ++ g_printerr ("warning: Schema '%s' has path '%s'. Paths starting with " ++ "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path); ++ + state->schema_state = schema_state_new (path, gettext_domain, + extends, extends_name, list_of); + +-- +cgit v0.9.0.2