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

Jan Steffens heftig at archlinux.org
Wed Feb 24 18:16:22 UTC 2016


    Date: Wednesday, February 24, 2016 @ 19:16:21
  Author: heftig
Revision: 260228

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  glib2/repos/testing-i686/0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch
    (from rev 260227, glib2/trunk/0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch)
  glib2/repos/testing-i686/PKGBUILD
    (from rev 260227, glib2/trunk/PKGBUILD)
  glib2/repos/testing-i686/memleak.patch
    (from rev 260227, glib2/trunk/memleak.patch)
  glib2/repos/testing-i686/revert-warn-glib-compile-schemas.patch
    (from rev 260227, glib2/trunk/revert-warn-glib-compile-schemas.patch)
  glib2/repos/testing-x86_64/0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch
    (from rev 260227, glib2/trunk/0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch)
  glib2/repos/testing-x86_64/PKGBUILD
    (from rev 260227, glib2/trunk/PKGBUILD)
  glib2/repos/testing-x86_64/memleak.patch
    (from rev 260227, glib2/trunk/memleak.patch)
  glib2/repos/testing-x86_64/revert-warn-glib-compile-schemas.patch
    (from rev 260227, glib2/trunk/revert-warn-glib-compile-schemas.patch)
Deleted:
  glib2/repos/testing-i686/PKGBUILD
  glib2/repos/testing-i686/glib2.install
  glib2/repos/testing-i686/memleak.patch
  glib2/repos/testing-i686/revert-warn-glib-compile-schemas.patch
  glib2/repos/testing-x86_64/PKGBUILD
  glib2/repos/testing-x86_64/glib2.install
  glib2/repos/testing-x86_64/memleak.patch
  glib2/repos/testing-x86_64/revert-warn-glib-compile-schemas.patch

-------------------------------------------------------------------------------+
 /PKGBUILD                                                                     |  144 ++++++++++
 /memleak.patch                                                                |   50 +++
 /revert-warn-glib-compile-schemas.patch                                       |   66 ++++
 testing-i686/0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch   |   49 +++
 testing-i686/PKGBUILD                                                         |   70 ----
 testing-i686/glib2.install                                                    |   13 
 testing-i686/memleak.patch                                                    |   25 -
 testing-i686/revert-warn-glib-compile-schemas.patch                           |   33 --
 testing-x86_64/0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch |   49 +++
 testing-x86_64/PKGBUILD                                                       |   70 ----
 testing-x86_64/glib2.install                                                  |   13 
 testing-x86_64/memleak.patch                                                  |   25 -
 testing-x86_64/revert-warn-glib-compile-schemas.patch                         |   33 --
 13 files changed, 358 insertions(+), 282 deletions(-)

Copied: glib2/repos/testing-i686/0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch (from rev 260227, glib2/trunk/0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch)
===================================================================
--- testing-i686/0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch	                        (rev 0)
+++ testing-i686/0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch	2016-02-24 18:16:21 UTC (rev 260228)
@@ -0,0 +1,49 @@
+From 4850cb55d3415b7d95c80c80ceb60f221f5dddf5 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Wed, 24 Feb 2016 18:58:25 +0100
+Subject: [PATCH] gsettings: Don't crash when no schemas are installed
+
+Still doesn't behave well ("gsettings help" causes an error),
+but at least there's no segfault anymore.
+---
+ gio/gsettings-tool.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/gio/gsettings-tool.c b/gio/gsettings-tool.c
+index 6a302ce..0026f55 100644
+--- a/gio/gsettings-tool.c
++++ b/gio/gsettings-tool.c
+@@ -697,7 +697,7 @@ main (int argc, char **argv)
+   if (argc < 2)
+     return gsettings_help (FALSE, NULL);
+ 
+-  global_schema_source = g_settings_schema_source_ref (g_settings_schema_source_get_default ());
++  global_schema_source = g_settings_schema_source_get_default ();
+ 
+   if (argc > 3 && g_str_equal (argv[1], "--schemadir"))
+     {
+@@ -705,7 +705,6 @@ main (int argc, char **argv)
+       GError *error = NULL;
+ 
+       global_schema_source = g_settings_schema_source_new_from_directory (argv[2], parent, FALSE, &error);
+-      g_settings_schema_source_unref (parent);
+ 
+       if (global_schema_source == NULL)
+         {
+@@ -719,6 +718,13 @@ main (int argc, char **argv)
+       argv = argv + 2;
+       argc -= 2;
+     }
++  else if (global_schema_source == NULL)
++    {
++      g_printerr (_("No schemas installed\n"));
++      return 1;
++    }
++  else
++    g_settings_schema_source_ref (global_schema_source);
+ 
+   need_settings = TRUE;
+ 
+-- 
+2.7.1
+

Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2016-02-24 18:13:21 UTC (rev 260227)
+++ testing-i686/PKGBUILD	2016-02-24 18:16:21 UTC (rev 260228)
@@ -1,70 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=glib2
-pkgname=(glib2 glib2-docs)
-pkgver=2.46.2
-pkgrel=3
-pkgdesc="Common C routines used by GTK+ and other libs"
-url="http://www.gtk.org/"
-arch=(i686 x86_64)
-makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml' 'pcre' 'libffi' 'libelf')
-source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver:0:4}/glib-$pkgver.tar.xz
-        revert-warn-glib-compile-schemas.patch memleak.patch)
-sha256sums=('5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db'
-            '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97'
-            '8337eeba4a32133d41575c8338fca32ac6a867e6e4a4e021355fcdeb606420a6')
-
-prepare() {
-  cd glib-$pkgver
-  patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch
-  patch -Np1 -i ../memleak.patch
-}
-  
-build() {
-  cd glib-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \
-      --sysconfdir=/etc \
-      --with-pcre=system \
-      --disable-fam
-  make
-}
-
-check() {
-  cd glib-$pkgver
-  #make -k check || :
-}
-
-package_glib2() {
-  depends=('pcre' 'libffi')
-  optdepends=('python2: for gdbus-codegen and gtester-report'
-              'libelf: gresource inspection tool')
-  options=('!docs' '!emptydirs')
-  license=('LGPL')
-  install=glib2.install
-
-  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
-
-  # Our gdb does not ship the required python modules, so remove it
-  rm -rf "$pkgdir/usr/share/gdb/"
-}
-
-package_glib2-docs() {
-  pkgdesc="Documentation for glib2"
-  conflicts=('gobject2-docs')
-  replaces=('gobject2-docs')
-  license=('custom')
-  options=('docs' '!emptydirs')
-  
-  cd glib-$pkgver/docs
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/glib2-docs"
-  install -m644 reference/COPYING "${pkgdir}/usr/share/licenses/glib2-docs/"
-
-  rm -rf "${pkgdir}/usr/share/man"
-}

Copied: glib2/repos/testing-i686/PKGBUILD (from rev 260227, glib2/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2016-02-24 18:16:21 UTC (rev 260228)
@@ -0,0 +1,72 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=glib2
+pkgname=(glib2 glib2-docs)
+pkgver=2.46.2
+pkgrel=4
+pkgdesc="Common C routines used by GTK+ and other libs"
+url="http://www.gtk.org/"
+arch=(i686 x86_64)
+makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml' 'pcre' 'libffi' 'libelf')
+source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver:0:4}/glib-$pkgver.tar.xz
+        0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch
+        revert-warn-glib-compile-schemas.patch memleak.patch)
+sha256sums=('5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db'
+            '06520be36842422fddcad839c07f15f04910b3dc3b6f8f146cfcaa86e9bc983b'
+            '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97'
+            '8337eeba4a32133d41575c8338fca32ac6a867e6e4a4e021355fcdeb606420a6')
+
+prepare() {
+  cd glib-$pkgver
+  patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch
+  patch -Np1 -i ../memleak.patch
+  patch -Np1 -i ../0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch
+}
+  
+build() {
+  cd glib-$pkgver
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \
+      --sysconfdir=/etc \
+      --with-pcre=system \
+      --disable-fam
+  make
+}
+
+check() {
+  cd glib-$pkgver
+  #make -k check || :
+}
+
+package_glib2() {
+  depends=('pcre' 'libffi')
+  optdepends=('python2: for gdbus-codegen and gtester-report'
+              'libelf: gresource inspection tool')
+  options=('!docs' '!emptydirs')
+  license=('LGPL')
+
+  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
+
+  # Our gdb does not ship the required python modules, so remove it
+  rm -rf "$pkgdir/usr/share/gdb/"
+}
+
+package_glib2-docs() {
+  pkgdesc="Documentation for glib2"
+  conflicts=('gobject2-docs')
+  replaces=('gobject2-docs')
+  license=('custom')
+  options=('docs' '!emptydirs')
+  
+  cd glib-$pkgver/docs
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/glib2-docs"
+  install -m644 reference/COPYING "${pkgdir}/usr/share/licenses/glib2-docs/"
+
+  rm -rf "${pkgdir}/usr/share/man"
+}

Deleted: testing-i686/glib2.install
===================================================================
--- testing-i686/glib2.install	2016-02-24 18:13:21 UTC (rev 260227)
+++ testing-i686/glib2.install	2016-02-24 18:16:21 UTC (rev 260228)
@@ -1,13 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-pre_remove() {
-    if [ -f /usr/share/glib-2.0/schemas/gschemas.compiled ]; then
-        rm /usr/share/glib-2.0/schemas/gschemas.compiled
-    fi
-}

Deleted: testing-i686/memleak.patch
===================================================================
--- testing-i686/memleak.patch	2016-02-24 18:13:21 UTC (rev 260227)
+++ testing-i686/memleak.patch	2016-02-24 18:16:21 UTC (rev 260228)
@@ -1,25 +0,0 @@
-From db641e32920ee8b553ab6f2d318aafa156e4390c Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos at foutrelis.com>
-Date: Wed, 25 Nov 2015 23:29:18 +0200
-Subject: GDBusProxy: Fix a memory leak during initialization
-
-https://bugzilla.gnome.org/show_bug.cgi?id=758641
----
- gio/gdbusproxy.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/gio/gdbusproxy.c b/gio/gdbusproxy.c
-index 52a22fb..7b1140f 100644
---- a/gio/gdbusproxy.c
-+++ b/gio/gdbusproxy.c
-@@ -1720,6 +1720,7 @@ async_initable_init_second_finish (GAsyncInitable  *initable,
-   if (result != NULL)
-     {
-       process_get_all_reply (proxy, result);
-+      g_variant_unref (result);
-     }
- 
-   proxy->priv->initialized = TRUE;
--- 
-cgit v0.11.2
-

Copied: glib2/repos/testing-i686/memleak.patch (from rev 260227, glib2/trunk/memleak.patch)
===================================================================
--- testing-i686/memleak.patch	                        (rev 0)
+++ testing-i686/memleak.patch	2016-02-24 18:16:21 UTC (rev 260228)
@@ -0,0 +1,25 @@
+From db641e32920ee8b553ab6f2d318aafa156e4390c Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos at foutrelis.com>
+Date: Wed, 25 Nov 2015 23:29:18 +0200
+Subject: GDBusProxy: Fix a memory leak during initialization
+
+https://bugzilla.gnome.org/show_bug.cgi?id=758641
+---
+ gio/gdbusproxy.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/gio/gdbusproxy.c b/gio/gdbusproxy.c
+index 52a22fb..7b1140f 100644
+--- a/gio/gdbusproxy.c
++++ b/gio/gdbusproxy.c
+@@ -1720,6 +1720,7 @@ async_initable_init_second_finish (GAsyncInitable  *initable,
+   if (result != NULL)
+     {
+       process_get_all_reply (proxy, result);
++      g_variant_unref (result);
+     }
+ 
+   proxy->priv->initialized = TRUE;
+-- 
+cgit v0.11.2
+

Deleted: testing-i686/revert-warn-glib-compile-schemas.patch
===================================================================
--- testing-i686/revert-warn-glib-compile-schemas.patch	2016-02-24 18:13:21 UTC (rev 260227)
+++ testing-i686/revert-warn-glib-compile-schemas.patch	2016-02-24 18:16:21 UTC (rev 260228)
@@ -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: glib2/repos/testing-i686/revert-warn-glib-compile-schemas.patch (from rev 260227, glib2/trunk/revert-warn-glib-compile-schemas.patch)
===================================================================
--- testing-i686/revert-warn-glib-compile-schemas.patch	                        (rev 0)
+++ testing-i686/revert-warn-glib-compile-schemas.patch	2016-02-24 18:16:21 UTC (rev 260228)
@@ -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

Copied: glib2/repos/testing-x86_64/0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch (from rev 260227, glib2/trunk/0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch)
===================================================================
--- testing-x86_64/0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch	                        (rev 0)
+++ testing-x86_64/0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch	2016-02-24 18:16:21 UTC (rev 260228)
@@ -0,0 +1,49 @@
+From 4850cb55d3415b7d95c80c80ceb60f221f5dddf5 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Wed, 24 Feb 2016 18:58:25 +0100
+Subject: [PATCH] gsettings: Don't crash when no schemas are installed
+
+Still doesn't behave well ("gsettings help" causes an error),
+but at least there's no segfault anymore.
+---
+ gio/gsettings-tool.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/gio/gsettings-tool.c b/gio/gsettings-tool.c
+index 6a302ce..0026f55 100644
+--- a/gio/gsettings-tool.c
++++ b/gio/gsettings-tool.c
+@@ -697,7 +697,7 @@ main (int argc, char **argv)
+   if (argc < 2)
+     return gsettings_help (FALSE, NULL);
+ 
+-  global_schema_source = g_settings_schema_source_ref (g_settings_schema_source_get_default ());
++  global_schema_source = g_settings_schema_source_get_default ();
+ 
+   if (argc > 3 && g_str_equal (argv[1], "--schemadir"))
+     {
+@@ -705,7 +705,6 @@ main (int argc, char **argv)
+       GError *error = NULL;
+ 
+       global_schema_source = g_settings_schema_source_new_from_directory (argv[2], parent, FALSE, &error);
+-      g_settings_schema_source_unref (parent);
+ 
+       if (global_schema_source == NULL)
+         {
+@@ -719,6 +718,13 @@ main (int argc, char **argv)
+       argv = argv + 2;
+       argc -= 2;
+     }
++  else if (global_schema_source == NULL)
++    {
++      g_printerr (_("No schemas installed\n"));
++      return 1;
++    }
++  else
++    g_settings_schema_source_ref (global_schema_source);
+ 
+   need_settings = TRUE;
+ 
+-- 
+2.7.1
+

Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2016-02-24 18:13:21 UTC (rev 260227)
+++ testing-x86_64/PKGBUILD	2016-02-24 18:16:21 UTC (rev 260228)
@@ -1,70 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=glib2
-pkgname=(glib2 glib2-docs)
-pkgver=2.46.2
-pkgrel=3
-pkgdesc="Common C routines used by GTK+ and other libs"
-url="http://www.gtk.org/"
-arch=(i686 x86_64)
-makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml' 'pcre' 'libffi' 'libelf')
-source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver:0:4}/glib-$pkgver.tar.xz
-        revert-warn-glib-compile-schemas.patch memleak.patch)
-sha256sums=('5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db'
-            '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97'
-            '8337eeba4a32133d41575c8338fca32ac6a867e6e4a4e021355fcdeb606420a6')
-
-prepare() {
-  cd glib-$pkgver
-  patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch
-  patch -Np1 -i ../memleak.patch
-}
-  
-build() {
-  cd glib-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \
-      --sysconfdir=/etc \
-      --with-pcre=system \
-      --disable-fam
-  make
-}
-
-check() {
-  cd glib-$pkgver
-  #make -k check || :
-}
-
-package_glib2() {
-  depends=('pcre' 'libffi')
-  optdepends=('python2: for gdbus-codegen and gtester-report'
-              'libelf: gresource inspection tool')
-  options=('!docs' '!emptydirs')
-  license=('LGPL')
-  install=glib2.install
-
-  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
-
-  # Our gdb does not ship the required python modules, so remove it
-  rm -rf "$pkgdir/usr/share/gdb/"
-}
-
-package_glib2-docs() {
-  pkgdesc="Documentation for glib2"
-  conflicts=('gobject2-docs')
-  replaces=('gobject2-docs')
-  license=('custom')
-  options=('docs' '!emptydirs')
-  
-  cd glib-$pkgver/docs
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/glib2-docs"
-  install -m644 reference/COPYING "${pkgdir}/usr/share/licenses/glib2-docs/"
-
-  rm -rf "${pkgdir}/usr/share/man"
-}

Copied: glib2/repos/testing-x86_64/PKGBUILD (from rev 260227, glib2/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2016-02-24 18:16:21 UTC (rev 260228)
@@ -0,0 +1,72 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=glib2
+pkgname=(glib2 glib2-docs)
+pkgver=2.46.2
+pkgrel=4
+pkgdesc="Common C routines used by GTK+ and other libs"
+url="http://www.gtk.org/"
+arch=(i686 x86_64)
+makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml' 'pcre' 'libffi' 'libelf')
+source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver:0:4}/glib-$pkgver.tar.xz
+        0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch
+        revert-warn-glib-compile-schemas.patch memleak.patch)
+sha256sums=('5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db'
+            '06520be36842422fddcad839c07f15f04910b3dc3b6f8f146cfcaa86e9bc983b'
+            '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97'
+            '8337eeba4a32133d41575c8338fca32ac6a867e6e4a4e021355fcdeb606420a6')
+
+prepare() {
+  cd glib-$pkgver
+  patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch
+  patch -Np1 -i ../memleak.patch
+  patch -Np1 -i ../0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch
+}
+  
+build() {
+  cd glib-$pkgver
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \
+      --sysconfdir=/etc \
+      --with-pcre=system \
+      --disable-fam
+  make
+}
+
+check() {
+  cd glib-$pkgver
+  #make -k check || :
+}
+
+package_glib2() {
+  depends=('pcre' 'libffi')
+  optdepends=('python2: for gdbus-codegen and gtester-report'
+              'libelf: gresource inspection tool')
+  options=('!docs' '!emptydirs')
+  license=('LGPL')
+
+  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
+
+  # Our gdb does not ship the required python modules, so remove it
+  rm -rf "$pkgdir/usr/share/gdb/"
+}
+
+package_glib2-docs() {
+  pkgdesc="Documentation for glib2"
+  conflicts=('gobject2-docs')
+  replaces=('gobject2-docs')
+  license=('custom')
+  options=('docs' '!emptydirs')
+  
+  cd glib-$pkgver/docs
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/glib2-docs"
+  install -m644 reference/COPYING "${pkgdir}/usr/share/licenses/glib2-docs/"
+
+  rm -rf "${pkgdir}/usr/share/man"
+}

Deleted: testing-x86_64/glib2.install
===================================================================
--- testing-x86_64/glib2.install	2016-02-24 18:13:21 UTC (rev 260227)
+++ testing-x86_64/glib2.install	2016-02-24 18:16:21 UTC (rev 260228)
@@ -1,13 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-pre_remove() {
-    if [ -f /usr/share/glib-2.0/schemas/gschemas.compiled ]; then
-        rm /usr/share/glib-2.0/schemas/gschemas.compiled
-    fi
-}

Deleted: testing-x86_64/memleak.patch
===================================================================
--- testing-x86_64/memleak.patch	2016-02-24 18:13:21 UTC (rev 260227)
+++ testing-x86_64/memleak.patch	2016-02-24 18:16:21 UTC (rev 260228)
@@ -1,25 +0,0 @@
-From db641e32920ee8b553ab6f2d318aafa156e4390c Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos at foutrelis.com>
-Date: Wed, 25 Nov 2015 23:29:18 +0200
-Subject: GDBusProxy: Fix a memory leak during initialization
-
-https://bugzilla.gnome.org/show_bug.cgi?id=758641
----
- gio/gdbusproxy.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/gio/gdbusproxy.c b/gio/gdbusproxy.c
-index 52a22fb..7b1140f 100644
---- a/gio/gdbusproxy.c
-+++ b/gio/gdbusproxy.c
-@@ -1720,6 +1720,7 @@ async_initable_init_second_finish (GAsyncInitable  *initable,
-   if (result != NULL)
-     {
-       process_get_all_reply (proxy, result);
-+      g_variant_unref (result);
-     }
- 
-   proxy->priv->initialized = TRUE;
--- 
-cgit v0.11.2
-

Copied: glib2/repos/testing-x86_64/memleak.patch (from rev 260227, glib2/trunk/memleak.patch)
===================================================================
--- testing-x86_64/memleak.patch	                        (rev 0)
+++ testing-x86_64/memleak.patch	2016-02-24 18:16:21 UTC (rev 260228)
@@ -0,0 +1,25 @@
+From db641e32920ee8b553ab6f2d318aafa156e4390c Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos at foutrelis.com>
+Date: Wed, 25 Nov 2015 23:29:18 +0200
+Subject: GDBusProxy: Fix a memory leak during initialization
+
+https://bugzilla.gnome.org/show_bug.cgi?id=758641
+---
+ gio/gdbusproxy.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/gio/gdbusproxy.c b/gio/gdbusproxy.c
+index 52a22fb..7b1140f 100644
+--- a/gio/gdbusproxy.c
++++ b/gio/gdbusproxy.c
+@@ -1720,6 +1720,7 @@ async_initable_init_second_finish (GAsyncInitable  *initable,
+   if (result != NULL)
+     {
+       process_get_all_reply (proxy, result);
++      g_variant_unref (result);
+     }
+ 
+   proxy->priv->initialized = TRUE;
+-- 
+cgit v0.11.2
+

Deleted: testing-x86_64/revert-warn-glib-compile-schemas.patch
===================================================================
--- testing-x86_64/revert-warn-glib-compile-schemas.patch	2016-02-24 18:13:21 UTC (rev 260227)
+++ testing-x86_64/revert-warn-glib-compile-schemas.patch	2016-02-24 18:16:21 UTC (rev 260228)
@@ -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: glib2/repos/testing-x86_64/revert-warn-glib-compile-schemas.patch (from rev 260227, glib2/trunk/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	2016-02-24 18:16:21 UTC (rev 260228)
@@ -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