[arch-commits] Commit in glib2/repos (8 files)

Ionut Biru ibiru at archlinux.org
Mon Apr 23 05:23:06 EDT 2012


    Date: Monday, April 23, 2012 @ 05:23:05
  Author: ibiru
Revision: 157012

db-move: moved glib2 from [extra] to [core] (x86_64)

Added:
  glib2/repos/core-x86_64/PKGBUILD
    (from rev 157010, glib2/repos/extra-x86_64/PKGBUILD)
  glib2/repos/core-x86_64/glib2.csh
    (from rev 157010, glib2/repos/extra-x86_64/glib2.csh)
  glib2/repos/core-x86_64/glib2.sh
    (from rev 157010, glib2/repos/extra-x86_64/glib2.sh)
  glib2/repos/core-x86_64/revert-warn-glib-compile-schemas.patch
    (from rev 157010, glib2/repos/extra-x86_64/revert-warn-glib-compile-schemas.patch)
Deleted:
  glib2/repos/core-x86_64/PKGBUILD
  glib2/repos/core-x86_64/glib2.csh
  glib2/repos/core-x86_64/glib2.sh
  glib2/repos/extra-x86_64/

----------------------------------------+
 PKGBUILD                               |   89 ++++++++++++++++---------------
 glib2.csh                              |    2 
 glib2.sh                               |    2 
 revert-warn-glib-compile-schemas.patch |   33 +++++++++++
 4 files changed, 81 insertions(+), 45 deletions(-)

Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD	2012-04-23 09:23:04 UTC (rev 157011)
+++ core-x86_64/PKGBUILD	2012-04-23 09:23:05 UTC (rev 157012)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=glib2
-pkgver=2.30.2
-pkgrel=2
-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=('pkgconfig' 'python2')
-optdepends=('python2: for gdbus-codegen')
-options=('!libtool' '!docs' '!emptydirs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.30/glib-${pkgver}.tar.xz
-        glib2.sh
-        glib2.csh)
-sha256sums=('f0e91e6333321ddb48fa12b5c66f56c3d5f05325748c66dd2e9016c278ff8e82'
-            '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a'
-            '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3')
-
-build() {
-  cd "${srcdir}/glib-${pkgver}"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-      --sysconfdir=/etc \
-      --with-pcre=system \
-      --disable-fam
-  make
-}
-
-package() {
-  cd "${srcdir}/glib-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -d "${pkgdir}/etc/profile.d"
-  install -m755 "${srcdir}/glib2.sh" "${pkgdir}/etc/profile.d/"
-  install -m755 "${srcdir}/glib2.csh" "${pkgdir}/etc/profile.d/"
-
-  for _i in "${pkgdir}/etc/bash_completion.d/"*; do
-      chmod -x "${_i}"
-  done
-  sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir"/usr/bin/gdbus-codegen
-}

Copied: glib2/repos/core-x86_64/PKGBUILD (from rev 157010, glib2/repos/extra-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD	                        (rev 0)
+++ core-x86_64/PKGBUILD	2012-04-23 09:23:05 UTC (rev 157012)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=glib2
+pkgver=2.32.1
+pkgrel=2
+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=('pkgconfig' 'python2')
+optdepends=('python2: for gdbus-codegen')
+options=('!libtool' '!docs' '!emptydirs')
+source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz
+        glib2.sh
+        glib2.csh
+        revert-warn-glib-compile-schemas.patch)
+sha256sums=('484d5b7fc09f3fa398355adaf74b369768f5859866c299f229c99721990f8398'
+            '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a'
+            '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3'
+            '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
+
+build() {
+  cd glib-$pkgver
+  patch -Rp1 -i "$srcdir/revert-warn-glib-compile-schemas.patch"
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+      --sysconfdir=/etc \
+      --with-pcre=system \
+      --disable-fam
+  make
+}
+
+package() {
+  cd glib-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  install -d "$pkgdir/etc/profile.d"
+  install -m755 "$srcdir/glib2.sh" "$pkgdir/etc/profile.d/"
+  install -m755 "$srcdir/glib2.csh" "$pkgdir/etc/profile.d/"
+
+  for _i in "$pkgdir/etc/bash_completion.d/"*; do
+      chmod -x "$_i"
+  done
+  sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir"/usr/bin/gdbus-codegen
+}

Deleted: core-x86_64/glib2.csh
===================================================================
--- core-x86_64/glib2.csh	2012-04-23 09:23:04 UTC (rev 157011)
+++ core-x86_64/glib2.csh	2012-04-23 09:23:05 UTC (rev 157012)
@@ -1 +0,0 @@
-setenv G_BROKEN_FILENAMES 1

Copied: glib2/repos/core-x86_64/glib2.csh (from rev 157010, glib2/repos/extra-x86_64/glib2.csh)
===================================================================
--- core-x86_64/glib2.csh	                        (rev 0)
+++ core-x86_64/glib2.csh	2012-04-23 09:23:05 UTC (rev 157012)
@@ -0,0 +1 @@
+setenv G_BROKEN_FILENAMES 1

Deleted: core-x86_64/glib2.sh
===================================================================
--- core-x86_64/glib2.sh	2012-04-23 09:23:04 UTC (rev 157011)
+++ core-x86_64/glib2.sh	2012-04-23 09:23:05 UTC (rev 157012)
@@ -1 +0,0 @@
-export G_BROKEN_FILENAMES=1

Copied: glib2/repos/core-x86_64/glib2.sh (from rev 157010, glib2/repos/extra-x86_64/glib2.sh)
===================================================================
--- core-x86_64/glib2.sh	                        (rev 0)
+++ core-x86_64/glib2.sh	2012-04-23 09:23:05 UTC (rev 157012)
@@ -0,0 +1 @@
+export G_BROKEN_FILENAMES=1

Copied: glib2/repos/core-x86_64/revert-warn-glib-compile-schemas.patch (from rev 157010, glib2/repos/extra-x86_64/revert-warn-glib-compile-schemas.patch)
===================================================================
--- core-x86_64/revert-warn-glib-compile-schemas.patch	                        (rev 0)
+++ core-x86_64/revert-warn-glib-compile-schemas.patch	2012-04-23 09:23:05 UTC (rev 157012)
@@ -0,0 +1,33 @@
+From 6560b37450cd19c4a7c7b690e279fe97b7bfdcaa Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt at 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



More information about the arch-commits mailing list