[arch-commits] Commit in glib2/trunk (2 files)

[Jan Steffens]

    Date: Thursday, August 18, 2016 @ 00:08:12
  Author: heftig
Revision: 273906

2.48.2-1

Modified:
  glib2/trunk/PKGBUILD
Deleted:
  glib2/trunk/0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch

----------------------------------------------------------------+
 0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch |   49 ----------
 PKGBUILD                                                       |   15 +--
 2 files changed, 6 insertions(+), 58 deletions(-)

Deleted: 0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch
===================================================================
--- 0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch	2016-08-17 22:52:41 UTC (rev 273905)
+++ 0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch	2016-08-18 00:08:12 UTC (rev 273906)
@@ -1,49 +0,0 @@
-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
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-08-17 22:52:41 UTC (rev 273905)
+++ PKGBUILD	2016-08-18 00:08:12 UTC (rev 273906)
@@ -3,9 +3,9 @@
 
 pkgbase=glib2
 pkgname=(glib2 glib2-docs)
-pkgver=2.48.1
+pkgver=2.48.2
 pkgrel=1
-pkgdesc="Common C routines used by GTK+ and other libs"
+pkgdesc="Low level core library"
 url="http://www.gtk.org/"
 arch=(i686 x86_64)
 makedepends=('pkg-config' 'python' 'libxslt' 'docbook-xml' 'pcre' 'libffi' 'libelf')
@@ -13,7 +13,7 @@
         glib-compile-schemas.hook
         gio-querymodules.hook
         revert-warn-glib-compile-schemas.patch)
-sha256sums=('74411bff489cb2a3527bac743a51018841a56a4d896cc1e0d0d54f8166a14612'
+sha256sums=('f25e751589cb1a58826eac24fbd4186cda4518af772806b666a3f91f66e6d3f4'
             'e1123a5d85d2445faac33f6dae1085fdd620d83279a4e130a83fe38db52b62b3'
             '5ba204a2686304b1454d401a39a9d27d09dd25e4529664e3fd565be3d439f8b6'
             '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
@@ -34,6 +34,7 @@
 
 check() {
   cd glib-$pkgver
+  # Takes an effing long time
   #make -k check || :
 }
 
@@ -47,12 +48,10 @@
   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
+  chmod -x "$pkgdir"/usr/share/bash-completion/completions/*
 
   # Our gdb does not ship the required python modules, so remove it
-  rm -rf "$pkgdir/usr/share/gdb/"
+  rm -r "$pkgdir/usr/share/gdb/"
   
   # install hooks
   install -dm755 "$pkgdir"/usr/share/libalpm/hooks/
@@ -70,6 +69,4 @@
   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"
 }