[arch-commits] Commit in lib32-glib2/repos/multilib-x86_64 (4 files)

Florian Pritz bluewind at archlinux.org
Sun Nov 23 10:25:57 UTC 2014


    Date: Sunday, November 23, 2014 @ 11:25:56
  Author: bluewind
Revision: 122985

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-glib2/repos/multilib-x86_64/PKGBUILD
    (from rev 122984, lib32-glib2/trunk/PKGBUILD)
  lib32-glib2/repos/multilib-x86_64/revert-warn-glib-compile-schemas.patch
    (from rev 122984, lib32-glib2/trunk/revert-warn-glib-compile-schemas.patch)
Deleted:
  lib32-glib2/repos/multilib-x86_64/PKGBUILD
  lib32-glib2/repos/multilib-x86_64/revert-warn-glib-compile-schemas.patch

----------------------------------------+
 PKGBUILD                               |   96 +++++++++++++++----------------
 revert-warn-glib-compile-schemas.patch |   66 ++++++++++-----------
 2 files changed, 81 insertions(+), 81 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-23 10:25:53 UTC (rev 122984)
+++ PKGBUILD	2014-11-23 10:25:56 UTC (rev 122985)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer:  Ionut Biru <ibiru at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-# Contributor: Mikko Seppälä <t-r-a-y at mbnet.fi>
-
-_pkgbasename=glib2
-pkgname=lib32-$_pkgbasename
-pkgver=2.42.0
-pkgrel=1
-pkgdesc="Common C routines used by GTK+ 2.4 and other libs (32-bit)"
-url="http://www.gtk.org/"
-arch=('x86_64')
-license=('LGPL')
-depends=('lib32-dbus' 'lib32-libffi' 'lib32-pcre' 'lib32-zlib' "$_pkgbasename")
-makedepends=('gcc-multilib' 'python2')
-options=('!docs')
-source=("http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-${pkgver}.tar.xz"
-        'revert-warn-glib-compile-schemas.patch')
-sha256sums=('94fbc0a7d10633433ff383e540607de649c1b46baaa59dea446a50977a6c4472'
-            '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
-
-prepare() {
-  cd "${srcdir}/glib-${pkgver}"
-  patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch
-}
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/glib-${pkgver}"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --libdir=/usr/lib32 --with-pcre=system --disable-fam
-  make
-}
-
-package() {
-  cd "${srcdir}/glib-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/{etc,usr/{share,include}}
-
-  cd "${pkgdir}"/usr/bin
-  mv gio-querymodules gio-querymodules-32
-  rm -f gdbus glib* gobject-query gsettings gtester*
-  rm -rf "$pkgdir"/usr/lib32/gdbus-2.0
-  find "$pkgdir/usr/bin" -type f -not -name gio-querymodules-32 -delete
-}

Copied: lib32-glib2/repos/multilib-x86_64/PKGBUILD (from rev 122984, lib32-glib2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2014-11-23 10:25:56 UTC (rev 122985)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer:  Ionut Biru <ibiru at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+# Contributor: Mikko Seppälä <t-r-a-y at mbnet.fi>
+
+_pkgbasename=glib2
+pkgname=lib32-$_pkgbasename
+pkgver=2.42.1
+pkgrel=1
+pkgdesc="Common C routines used by GTK+ 2.4 and other libs (32-bit)"
+url="http://www.gtk.org/"
+arch=('x86_64')
+license=('LGPL')
+depends=('lib32-dbus' 'lib32-libffi' 'lib32-pcre' 'lib32-zlib' "$_pkgbasename")
+makedepends=('gcc-multilib' 'python2')
+options=('!docs')
+source=("http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-${pkgver}.tar.xz"
+        'revert-warn-glib-compile-schemas.patch')
+sha256sums=('8f3f0865280e45b8ce840e176ef83bcfd511148918cc8d39df2ee89b67dcf89a'
+            '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
+
+prepare() {
+  cd "${srcdir}/glib-${pkgver}"
+  patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch
+}
+
+build() {
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  cd "${srcdir}/glib-${pkgver}"
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
+      --libdir=/usr/lib32 --with-pcre=system --disable-fam
+  make
+}
+
+package() {
+  cd "${srcdir}/glib-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  rm -rf "${pkgdir}"/{etc,usr/{share,include}}
+
+  cd "${pkgdir}"/usr/bin
+  mv gio-querymodules gio-querymodules-32
+  rm -f gdbus glib* gobject-query gsettings gtester*
+  rm -rf "$pkgdir"/usr/lib32/gdbus-2.0
+  find "$pkgdir/usr/bin" -type f -not -name gio-querymodules-32 -delete
+}

Deleted: revert-warn-glib-compile-schemas.patch
===================================================================
--- revert-warn-glib-compile-schemas.patch	2014-11-23 10:25:53 UTC (rev 122984)
+++ revert-warn-glib-compile-schemas.patch	2014-11-23 10:25:56 UTC (rev 122985)
@@ -1,33 +0,0 @@
-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

Copied: lib32-glib2/repos/multilib-x86_64/revert-warn-glib-compile-schemas.patch (from rev 122984, lib32-glib2/trunk/revert-warn-glib-compile-schemas.patch)
===================================================================
--- revert-warn-glib-compile-schemas.patch	                        (rev 0)
+++ revert-warn-glib-compile-schemas.patch	2014-11-23 10:25:56 UTC (rev 122985)
@@ -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