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

2020-03-11 Thread Jan Steffens via arch-commits 
Date: Wednesday, March 11, 2020 @ 13:40:35
  Author: heftig
Revision: 377375

2.64.1-1

Modified:
  glib2/trunk/PKGBUILD
Deleted:
  glib2/trunk/0001-tests-Move-memory_monitor_tests-under-installed_test.patch

-+
 0001-tests-Move-memory_monitor_tests-under-installed_test.patch |   52 
--
 PKGBUILD|9 -
 2 files changed, 2 insertions(+), 59 deletions(-)

Deleted: 0001-tests-Move-memory_monitor_tests-under-installed_test.patch
===
--- 0001-tests-Move-memory_monitor_tests-under-installed_test.patch 
2020-03-11 13:39:01 UTC (rev 377374)
+++ 0001-tests-Move-memory_monitor_tests-under-installed_test.patch 
2020-03-11 13:40:35 UTC (rev 377375)
@@ -1,52 +0,0 @@
-From 9be108136dc5e7ef0143a3ae4338476ffa6377e9 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" 
-Date: Thu, 27 Feb 2020 21:13:19 +0100
-Subject: [PATCH] tests: Move memory_monitor_tests under
- installed_tests_enabled
-
-So they're not installed when the latter is disabled.

- gio/tests/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gio/tests/meson.build b/gio/tests/meson.build
-index 695ad1f8f..76e28fc76 100644
 a/gio/tests/meson.build
-+++ b/gio/tests/meson.build
-@@ -521,32 +521,32 @@ if installed_tests_enabled
-   )
-   install_subdir('static-link', install_dir : installed_tests_execdir)
-   install_data('static-link.py', install_dir : installed_tests_execdir)
--endif
- 
- memory_monitor_tests = [
-   'memory-monitor-dbus',
-   'memory-monitor-portal',
- ]
- 
- foreach memory_monitor_test : memory_monitor_tests
-   cdata = configuration_data()
-   cdata.set('installed_tests_dir', installed_tests_execdir)
-   cdata.set('program', memory_monitor_test + '.py')
-   configure_file(
- input: installed_tests_template,
- output: memory_monitor_test + '.test',
- install_dir: installed_tests_metadir,
- configuration: cdata
-   )
-   cdata = configuration_data()
-   cdata.set('libexecdir', join_paths(glib_prefix, get_option('libexecdir')))
-   configure_file(
- input: memory_monitor_test + '.py.in',
- output: memory_monitor_test + '.py',
- install_dir : installed_tests_execdir,
- configuration: cdata,
-   )
- endforeach
-+endif
- 
- if not meson.is_cross_build() or meson.has_exe_wrapper()
- 
--- 
-2.25.1
-

Modified: PKGBUILD
===
--- PKGBUILD2020-03-11 13:39:01 UTC (rev 377374)
+++ PKGBUILD2020-03-11 13:40:35 UTC (rev 377375)
@@ -3,7 +3,7 @@
 
 pkgbase=glib2
 pkgname=(glib2 glib2-docs)
-pkgver=2.64.0
+pkgver=2.64.1
 pkgrel=1
 pkgdesc="Low level core library"
 url="https://wiki.gnome.org/Projects/GLib;
@@ -13,14 +13,12 @@
 makedepends=(gettext gtk-doc shared-mime-info python libelf git util-linux
  meson dbus)
 checkdepends=(desktop-file-utils)
-_commit=369626e3105d688afaa316d89d34e8927a8a0171  # tags/2.64.0^0
+_commit=24d272511c7ae8bb4c46dce0b0c67eca8d2ca3e5  # tags/2.64.1^0
 source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit;
 noisy-glib-compile-schemas.diff
-0001-tests-Move-memory_monitor_tests-under-installed_test.patch
 glib-compile-schemas.hook gio-querymodules.hook)
 sha256sums=('SKIP'
 '81a4df0b638730cffb7fa263c04841f7ca6b9c9578ee5045db6f30ff0c3fc531'
-'3f7f20c817ef970f9d1bc6606023eca44df5c31dd2334847bc8df2dbcf8e0e43'
 '64ae5597dda3cc160fc74be038dbe6267d41b525c0c35da9125fbf0de27f9b25'
 '557c88177f011ced17bdeac1af3f882b2ca33b386a866fdf900b35f927a2bbe8')
 
@@ -34,9 +32,6 @@
 
   # Suppress noise from glib-compile-schemas.hook
   git apply -3 ../noisy-glib-compile-schemas.diff
-
-  # Clean installed tests
-  git apply -3 
../0001-tests-Move-memory_monitor_tests-under-installed_test.patch
 }
 
 build() {

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

2020-02-27 Thread Jan Steffens via arch-commits 
Date: Thursday, February 27, 2020 @ 22:10:41
  Author: heftig
Revision: 376333

2.64.0-1

Added:
  glib2/trunk/0001-tests-Move-memory_monitor_tests-under-installed_test.patch
Modified:
  glib2/trunk/PKGBUILD

-+
 0001-tests-Move-memory_monitor_tests-under-installed_test.patch |   52 
++
 PKGBUILD|9 +
 2 files changed, 59 insertions(+), 2 deletions(-)

Added: 0001-tests-Move-memory_monitor_tests-under-installed_test.patch
===
--- 0001-tests-Move-memory_monitor_tests-under-installed_test.patch 
(rev 0)
+++ 0001-tests-Move-memory_monitor_tests-under-installed_test.patch 
2020-02-27 22:10:41 UTC (rev 376333)
@@ -0,0 +1,52 @@
+From 9be108136dc5e7ef0143a3ae4338476ffa6377e9 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" 
+Date: Thu, 27 Feb 2020 21:13:19 +0100
+Subject: [PATCH] tests: Move memory_monitor_tests under
+ installed_tests_enabled
+
+So they're not installed when the latter is disabled.
+---
+ gio/tests/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gio/tests/meson.build b/gio/tests/meson.build
+index 695ad1f8f..76e28fc76 100644
+--- a/gio/tests/meson.build
 b/gio/tests/meson.build
+@@ -521,32 +521,32 @@ if installed_tests_enabled
+   )
+   install_subdir('static-link', install_dir : installed_tests_execdir)
+   install_data('static-link.py', install_dir : installed_tests_execdir)
+-endif
+ 
+ memory_monitor_tests = [
+   'memory-monitor-dbus',
+   'memory-monitor-portal',
+ ]
+ 
+ foreach memory_monitor_test : memory_monitor_tests
+   cdata = configuration_data()
+   cdata.set('installed_tests_dir', installed_tests_execdir)
+   cdata.set('program', memory_monitor_test + '.py')
+   configure_file(
+ input: installed_tests_template,
+ output: memory_monitor_test + '.test',
+ install_dir: installed_tests_metadir,
+ configuration: cdata
+   )
+   cdata = configuration_data()
+   cdata.set('libexecdir', join_paths(glib_prefix, get_option('libexecdir')))
+   configure_file(
+ input: memory_monitor_test + '.py.in',
+ output: memory_monitor_test + '.py',
+ install_dir : installed_tests_execdir,
+ configuration: cdata,
+   )
+ endforeach
++endif
+ 
+ if not meson.is_cross_build() or meson.has_exe_wrapper()
+ 
+-- 
+2.25.1
+

Modified: PKGBUILD
===
--- PKGBUILD2020-02-27 22:07:24 UTC (rev 376332)
+++ PKGBUILD2020-02-27 22:10:41 UTC (rev 376333)
@@ -3,7 +3,7 @@
 
 pkgbase=glib2
 pkgname=(glib2 glib2-docs)
-pkgver=2.62.5
+pkgver=2.64.0
 pkgrel=1
 pkgdesc="Low level core library"
 url="https://wiki.gnome.org/Projects/GLib;
@@ -13,12 +13,14 @@
 makedepends=(gettext gtk-doc shared-mime-info python libelf git util-linux
  meson dbus)
 checkdepends=(desktop-file-utils)
-_commit=86c2832f950c389e230ec09c8bf0b92b475f0ee3  # tags/2.62.5^0
+_commit=369626e3105d688afaa316d89d34e8927a8a0171  # tags/2.64.0^0
 source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit;
 noisy-glib-compile-schemas.diff
+0001-tests-Move-memory_monitor_tests-under-installed_test.patch
 glib-compile-schemas.hook gio-querymodules.hook)
 sha256sums=('SKIP'
 '81a4df0b638730cffb7fa263c04841f7ca6b9c9578ee5045db6f30ff0c3fc531'
+'3f7f20c817ef970f9d1bc6606023eca44df5c31dd2334847bc8df2dbcf8e0e43'
 '64ae5597dda3cc160fc74be038dbe6267d41b525c0c35da9125fbf0de27f9b25'
 '557c88177f011ced17bdeac1af3f882b2ca33b386a866fdf900b35f927a2bbe8')
 
@@ -32,6 +34,9 @@
 
   # Suppress noise from glib-compile-schemas.hook
   git apply -3 ../noisy-glib-compile-schemas.diff
+
+  # Clean installed tests
+  git apply -3 
../0001-tests-Move-memory_monitor_tests-under-installed_test.patch
 }
 
 build() {

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

2016-08-17 Thread 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)" 
-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, );
--  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
===
--- PKGBUILD2016-08-17 22:52:41 UTC (rev 273905)
+++ PKGBUILD2016-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"
 }

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

2015-10-14 Thread Jan Steffens 
Date: Wednesday, October 14, 2015 @ 16:24:09
  Author: heftig
Revision: 249325

2.46.1

Modified:
  glib2/trunk/PKGBUILD
Deleted:
  glib2/trunk/0001-Revert-list-store-Fix-a-parameter-check.patch

+
 0001-Revert-list-store-Fix-a-parameter-check.patch |   74 ---
 PKGBUILD   |9 --
 2 files changed, 3 insertions(+), 80 deletions(-)

Deleted: 0001-Revert-list-store-Fix-a-parameter-check.patch
===
--- 0001-Revert-list-store-Fix-a-parameter-check.patch  2015-10-14 09:10:51 UTC 
(rev 249324)
+++ 0001-Revert-list-store-Fix-a-parameter-check.patch  2015-10-14 14:24:09 UTC 
(rev 249325)
@@ -1,74 +0,0 @@
-From 19a560f9491c4964e7093e22cb3876fc53a442e6 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" 
-Date: Wed, 23 Sep 2015 23:16:04 +0200
-Subject: [PATCH] Revert "list store: Fix a parameter check"
-
-This reverts commit d28639507db2029b8f184a5d93e9d8c28acc1955.
-
-Bogus commit changing the behavior of g_sequence_search in violation
-of the documentation. Breaks GStreamer test suite.

- glib/gsequence.c | 18 +++---
- 1 file changed, 7 insertions(+), 11 deletions(-)
-
-diff --git a/glib/gsequence.c b/glib/gsequence.c
-index 75c1f76..76e24e7 100644
 a/glib/gsequence.c
-+++ b/glib/gsequence.c
-@@ -139,8 +139,7 @@ static GSequenceNode *node_find_closest  (GSequenceNode
*haystack,
-   GSequenceNode*needle,
-   GSequenceNode*end,
-   GSequenceIterCompareFunc  cmp,
--  gpointer  user_data,
--  gboolean  
return_match);
-+  gpointer  
user_data);
- static gint   node_get_length(GSequenceNode*node);
- static void   node_free  (GSequenceNode*node,
-   GSequence*seq);
-@@ -1080,7 +1079,7 @@ g_sequence_search_iter (GSequence*seq,
-   dummy = g_sequence_append (tmp_seq, data);
- 
-   node = node_find_closest (seq->end_node, dummy,
--seq->end_node, iter_cmp, cmp_data, TRUE);
-+seq->end_node, iter_cmp, cmp_data);
- 
-   g_sequence_free (tmp_seq);
- 
-@@ -1734,8 +1733,7 @@ node_find_closest (GSequenceNode*haystack,
-GSequenceNode*needle,
-GSequenceNode*end,
-GSequenceIterCompareFunc  iter_cmp,
--   gpointer  cmp_data,
--   gboolean  return_match)
-+   gpointer  cmp_data)
- {
-   GSequenceNode *best;
-   gint c;
-@@ -1765,12 +1763,10 @@ node_find_closest (GSequenceNode*haystack,
- }
-   while (haystack != NULL);
- 
--  /* If the best node is smaller than the data, then move one step
--   * to the right to make sure the best one is strictly bigger than the data.
--   * We do return the last exact match or the node after it, depending on
--   * the return_match argument.
-+  /* If the best node is smaller or equal to the data, then move one step
-+   * to the right to make sure the best one is strictly bigger than the data
-*/
--  if (best != end && (c < 0 || (c == 0 && !return_match)))
-+  if (best != end && c <= 0)
- best = node_get_next (best);
- 
-   return best;
-@@ -1992,7 +1988,7 @@ node_insert_sorted (GSequenceNode*node,
- {
-   GSequenceNode *closest;
- 
--  closest = node_find_closest (node, new, end, iter_cmp, cmp_data, FALSE);
-+  closest = node_find_closest (node, new, end, iter_cmp, cmp_data);
- 
-   node_unlink (new);
- 
--- 
-2.5.3
-

Modified: PKGBUILD
===
--- PKGBUILD2015-10-14 09:10:51 UTC (rev 249324)
+++ PKGBUILD2015-10-14 14:24:09 UTC (rev 249325)
@@ -3,22 +3,19 @@
 
 pkgbase=glib2
 pkgname=(glib2 glib2-docs)
-pkgver=2.46.0
-pkgrel=3
+pkgver=2.46.1
+pkgrel=1
 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-Revert-list-store-Fix-a-parameter-check.patch
 revert-warn-glib-compile-schemas.patch)
-sha256sums=('b1cee83469ae7d80f17c267c37f090414e93960bd62d2b254a5a96fbc5baacb4'
-'261ae2d2c7b94460f33ab569540313e21c9a50af38a7ebe8412e49f5b309af35'
+sha256sums=('5a1f03b952ebc3a7e9f612b8724f70898183e31503db329b4f15d07163c8fdfb'

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

2015-09-23 Thread Jan Steffens 
Date: Wednesday, September 23, 2015 @ 23:24:04
  Author: heftig
Revision: 247176

Fix GStreamer test suite

Added:
  glib2/trunk/0001-Revert-list-store-Fix-a-parameter-check.patch
Modified:
  glib2/trunk/PKGBUILD

+
 0001-Revert-list-store-Fix-a-parameter-check.patch |   74 +++
 PKGBUILD   |5 +
 2 files changed, 78 insertions(+), 1 deletion(-)

Added: 0001-Revert-list-store-Fix-a-parameter-check.patch
===
--- 0001-Revert-list-store-Fix-a-parameter-check.patch  
(rev 0)
+++ 0001-Revert-list-store-Fix-a-parameter-check.patch  2015-09-23 21:24:04 UTC 
(rev 247176)
@@ -0,0 +1,74 @@
+From 19a560f9491c4964e7093e22cb3876fc53a442e6 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" 
+Date: Wed, 23 Sep 2015 23:16:04 +0200
+Subject: [PATCH] Revert "list store: Fix a parameter check"
+
+This reverts commit d28639507db2029b8f184a5d93e9d8c28acc1955.
+
+Bogus commit changing the behavior of g_sequence_search in violation
+of the documentation. Breaks GStreamer test suite.
+---
+ glib/gsequence.c | 18 +++---
+ 1 file changed, 7 insertions(+), 11 deletions(-)
+
+diff --git a/glib/gsequence.c b/glib/gsequence.c
+index 75c1f76..76e24e7 100644
+--- a/glib/gsequence.c
 b/glib/gsequence.c
+@@ -139,8 +139,7 @@ static GSequenceNode *node_find_closest  (GSequenceNode
*haystack,
+   GSequenceNode*needle,
+   GSequenceNode*end,
+   GSequenceIterCompareFunc  cmp,
+-  gpointer  user_data,
+-  gboolean  
return_match);
++  gpointer  
user_data);
+ static gint   node_get_length(GSequenceNode*node);
+ static void   node_free  (GSequenceNode*node,
+   GSequence*seq);
+@@ -1080,7 +1079,7 @@ g_sequence_search_iter (GSequence*seq,
+   dummy = g_sequence_append (tmp_seq, data);
+ 
+   node = node_find_closest (seq->end_node, dummy,
+-seq->end_node, iter_cmp, cmp_data, TRUE);
++seq->end_node, iter_cmp, cmp_data);
+ 
+   g_sequence_free (tmp_seq);
+ 
+@@ -1734,8 +1733,7 @@ node_find_closest (GSequenceNode*haystack,
+GSequenceNode*needle,
+GSequenceNode*end,
+GSequenceIterCompareFunc  iter_cmp,
+-   gpointer  cmp_data,
+-   gboolean  return_match)
++   gpointer  cmp_data)
+ {
+   GSequenceNode *best;
+   gint c;
+@@ -1765,12 +1763,10 @@ node_find_closest (GSequenceNode*haystack,
+ }
+   while (haystack != NULL);
+ 
+-  /* If the best node is smaller than the data, then move one step
+-   * to the right to make sure the best one is strictly bigger than the data.
+-   * We do return the last exact match or the node after it, depending on
+-   * the return_match argument.
++  /* If the best node is smaller or equal to the data, then move one step
++   * to the right to make sure the best one is strictly bigger than the data
+*/
+-  if (best != end && (c < 0 || (c == 0 && !return_match)))
++  if (best != end && c <= 0)
+ best = node_get_next (best);
+ 
+   return best;
+@@ -1992,7 +1988,7 @@ node_insert_sorted (GSequenceNode*node,
+ {
+   GSequenceNode *closest;
+ 
+-  closest = node_find_closest (node, new, end, iter_cmp, cmp_data, FALSE);
++  closest = node_find_closest (node, new, end, iter_cmp, cmp_data);
+ 
+   node_unlink (new);
+ 
+-- 
+2.5.3
+

Modified: PKGBUILD
===
--- PKGBUILD2015-09-23 19:52:22 UTC (rev 247175)
+++ PKGBUILD2015-09-23 21:24:04 UTC (rev 247176)
@@ -4,18 +4,21 @@
 pkgbase=glib2
 pkgname=(glib2 glib2-docs)
 pkgver=2.46.0
-pkgrel=1
+pkgrel=2
 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' 
'elfutils')
 
source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver:0:4}/glib-$pkgver.tar.xz
+0001-Revert-list-store-Fix-a-parameter-check.patch
 revert-warn-glib-compile-schemas.patch)
 sha256sums=('b1cee83469ae7d80f17c267c37f090414e93960bd62d2b254a5a96fbc5baacb4'
+'261ae2d2c7b94460f33ab569540313e21c9a50af38a7ebe8412e49f5b309af35'
 '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
 
 prepare() {
   cd

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

2013-03-21 Thread Jan de Groot 
Date: Thursday, March 21, 2013 @ 21:13:23
  Author: jgc
Revision: 180424

upgpkg: glib2 2.35.9-1

Added:
  glib2/trunk/0001-Make-gtester-report-work-with-Python-3.x.patch
Modified:
  glib2/trunk/PKGBUILD

-+
 0001-Make-gtester-report-work-with-Python-3.x.patch |   60 ++
 PKGBUILD|   20 +++---
 2 files changed, 71 insertions(+), 9 deletions(-)

Added: 0001-Make-gtester-report-work-with-Python-3.x.patch
===
--- 0001-Make-gtester-report-work-with-Python-3.x.patch 
(rev 0)
+++ 0001-Make-gtester-report-work-with-Python-3.x.patch 2013-03-21 20:13:23 UTC 
(rev 180424)
@@ -0,0 +1,60 @@
+From 3d81e0a414ecb876f2429c0108a685152bd4ee54 Mon Sep 17 00:00:00 2001
+From: Jan de Groot j...@archlinux.org
+Date: Thu, 21 Mar 2013 20:47:57 +0100
+Subject: [PATCH] Make gtester-report work with Python 3.x: - fix indentations
+ (tabs to spaces) - Replace print with print(), still works with Python 2.x
+
+---
+ glib/gtester-report | 28 ++--
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/glib/gtester-report b/glib/gtester-report
+index 0fcdd9a..00296ea 100755
+--- a/glib/gtester-report
 b/glib/gtester-report
+@@ -308,20 +308,20 @@ class HTMLReportWriter(ReportWriter):
+ if binary.success_cases:
+   oklink = 'href=javascript:toggle_display (\'ResultTable\', \'tr\', 
\'b%u_\', \'success\')' % self.bcounter
+ if real_cases != 0:
+-  self.oprint ('a %sER/a\n' % erlink)
+-  self.oprint ('a %sOK/a\n' % oklink)
+-  self.oprint ('/td\n')
+-  perc = binary.success_cases * 100.0 / real_cases
+-  pcolor = {
+-100 : 'bgcolor=lightgreen',
+-0   : 'bgcolor=red',
+-  }.get (int (perc), 'bgcolor=yellow')
+-  self.oprint ('td align=right %s%.2f%%/td\n' % (pcolor, perc))
+-  self.oprint ('/tr\n')
++self.oprint ('a %sER/a\n' % erlink)
++self.oprint ('a %sOK/a\n' % oklink)
++self.oprint ('/td\n')
++perc = binary.success_cases * 100.0 / real_cases
++pcolor = {
++  100 : 'bgcolor=lightgreen',
++  0   : 'bgcolor=red',
++}.get (int (perc), 'bgcolor=yellow')
++self.oprint ('td align=right %s%.2f%%/td\n' % (pcolor, perc))
++self.oprint ('/tr\n')
+ else:
+-  self.oprint ('Empty\n')
+-  self.oprint ('/td\n')
+-  self.oprint ('/tr\n')
++self.oprint ('Empty\n')
++self.oprint ('/td\n')
++self.oprint ('/tr\n')
+ for tc in binary.testcases:
+   self.handle_testcase (tc, binary)
+   def handle_totals (self):
+@@ -466,7 +466,7 @@ def parse_opts():
+  Needs python-subunit])
+ options, files = parser.parse_args()
+ if options.version:
+-print parser.epilog
++print(parser.epilog)
+ return None, None
+ if len(files) != 1:
+ parser.error(Must supply a log file to parse.)
+-- 
+1.8.2
+

Modified: PKGBUILD
===
--- PKGBUILD2013-03-21 19:48:29 UTC (rev 180423)
+++ PKGBUILD2013-03-21 20:13:23 UTC (rev 180424)
@@ -2,25 +2,28 @@
 # Maintainer: Jan de Groot j...@archlinux.org
 
 pkgname=glib2
-pkgver=2.34.3
+pkgver=2.35.9
 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' 'libxslt' 'docbook-xml')
-optdepends=('python2: for gdbus-codegen')
+makedepends=('pkg-config' 'python' 'libxslt' 'docbook-xml')
+optdepends=('python: for gdbus-codegen and gtester-report')
 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=('855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7'
-'049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
+revert-warn-glib-compile-schemas.patch
+0001-Make-gtester-report-work-with-Python-3.x.patch)
+sha256sums=('75ce10a4c47c830234ce6af8e52dc4ebaf603a9c04b4114eb22dd00335f3943e'
+'049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97'
+'a2b4ff3836fc0a5b03b8e6bfa69be44b9a65f16486e4c1e4bc6c3d50fe2ad632')
 
 build() {
   cd glib-$pkgver
-  patch -Rp1 -i $srcdir/revert-warn-glib-compile-schemas.patch
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \
+  patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch
+  patch -Np1 -i ../0001-Make-gtester-report-work-with-Python-3.x.patch
+  ./configure --prefix=/usr --libdir=/usr/lib \
   --sysconfdir=/etc \
   --with-pcre=system \
   --disable-fam
@@ -34,5 +37,4 @@
   for _i in $pkgdir/usr/share/bash-completion/completions/*; do
   chmod -x $_i
   done
-  sed -i