[arch-commits] Commit in glib2/trunk (3 files)
Date: Saturday, February 22, 2020 @ 20:37:53
Author: heftig
Revision: 376061
alpm-hooks should use Type = Path, not File
Modified:
glib2/trunk/PKGBUILD
glib2/trunk/gio-querymodules.hook
glib2/trunk/glib-compile-schemas.hook
---+
PKGBUILD |4 ++--
gio-querymodules.hook |2 +-
glib-compile-schemas.hook |2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-02-22 20:36:13 UTC (rev 376060)
+++ PKGBUILD2020-02-22 20:37:53 UTC (rev 376061)
@@ -19,8 +19,8 @@
glib-compile-schemas.hook gio-querymodules.hook)
sha256sums=('SKIP'
'81a4df0b638730cffb7fa263c04841f7ca6b9c9578ee5045db6f30ff0c3fc531'
-'e1123a5d85d2445faac33f6dae1085fdd620d83279a4e130a83fe38db52b62b3'
-'5ba204a2686304b1454d401a39a9d27d09dd25e4529664e3fd565be3d439f8b6')
+'64ae5597dda3cc160fc74be038dbe6267d41b525c0c35da9125fbf0de27f9b25'
+'557c88177f011ced17bdeac1af3f882b2ca33b386a866fdf900b35f927a2bbe8')
pkgver() {
cd glib
Modified: gio-querymodules.hook
===
--- gio-querymodules.hook 2020-02-22 20:36:13 UTC (rev 376060)
+++ gio-querymodules.hook 2020-02-22 20:37:53 UTC (rev 376061)
@@ -1,5 +1,5 @@
[Trigger]
-Type = File
+Type = Path
Operation = Install
Operation = Upgrade
Operation = Remove
Modified: glib-compile-schemas.hook
===
--- glib-compile-schemas.hook 2020-02-22 20:36:13 UTC (rev 376060)
+++ glib-compile-schemas.hook 2020-02-22 20:37:53 UTC (rev 376061)
@@ -1,5 +1,5 @@
[Trigger]
-Type = File
+Type = Path
Operation = Install
Operation = Upgrade
Operation = Remove
[arch-commits] Commit in glib2/trunk (3 files)
Date: Tuesday, October 24, 2017 @ 14:54:19
Author: heftig
Revision: 308388
Split out GDB patch
Added:
glib2/trunk/0001-meson-Fix-GDB-scripts-install_dir-for-nix.patch
Modified:
glib2/trunk/PKGBUILD
glib2/trunk/libs.diff
--+
0001-meson-Fix-GDB-scripts-install_dir-for-nix.patch | 50 +
PKGBUILD |8 ++
libs.diff| 30 ++
3 files changed, 62 insertions(+), 26 deletions(-)
Added: 0001-meson-Fix-GDB-scripts-install_dir-for-nix.patch
===
--- 0001-meson-Fix-GDB-scripts-install_dir-for-nix.patch
(rev 0)
+++ 0001-meson-Fix-GDB-scripts-install_dir-for-nix.patch2017-10-24
14:54:19 UTC (rev 308388)
@@ -0,0 +1,50 @@
+From b454a60bf154332bd5961880700b7d08aec98995 Mon Sep 17 00:00:00 2001
+Message-Id:
+From: "Jan Alexander Steffens (heftig)"
+Date: Tue, 24 Oct 2017 16:29:49 +0200
+Subject: [PATCH] meson: Fix GDB scripts install_dir for *nix
+
+Disable installation on Windows for now as this would use a colon in the
+directory name.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=788772
+---
+ glib/meson.build| 5 +++--
+ gobject/meson.build | 5 +++--
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/glib/meson.build b/glib/meson.build
+index 1da0bcd3cc601b9e..33ece2d0221c1850 100644
+--- a/glib/meson.build
b/glib/meson.build
+@@ -283,8 +283,9 @@ configure_file(
+ input: 'libglib-gdb.py.in',
+ output: 'libglib-2.0.so.@0...@-gdb.py'.format(library_version),
+ configuration: gdb_conf,
+- install: true,
+- install_dir: join_paths(get_option('datadir'), 'gdb/auto-load' +
get_option('libdir'))
++ # FIXME: Figure out how to install this on Windows
++ install: host_system != 'windows',
++ install_dir: join_paths(glib_datadir, 'gdb', 'auto-load', './' +
glib_libdir)
+ )
+
+ if enable_systemtap
+diff --git a/gobject/meson.build b/gobject/meson.build
+index 5a8289e6f054818e..0c8c0cb26f053d1c 100644
+--- a/gobject/meson.build
b/gobject/meson.build
+@@ -100,8 +100,9 @@ configure_file(
+ input: 'libgobject-gdb.py.in',
+ output: 'libgobject-2.0.so.@0...@-gdb.py'.format(library_version),
+ configuration: gdb_conf,
+- install: true,
+- install_dir: join_paths(get_option('datadir'), 'gdb/auto-load/' +
get_option('libdir'))
++ # FIXME: Figure out how to install this on Windows
++ install: host_system != 'windows',
++ install_dir: join_paths(glib_datadir, 'gdb', 'auto-load', './' +
glib_libdir)
+ )
+
+ if enable_systemtap
+--
+2.14.2
+
Modified: PKGBUILD
===
--- PKGBUILD2017-10-24 10:29:00 UTC (rev 308387)
+++ PKGBUILD2017-10-24 14:54:19 UTC (rev 308388)
@@ -19,6 +19,7 @@
source=("git+https://git.gnome.org/browse/glib#commit=$_commit";
0001-docs-Fix-building-with-meson.patch
0001-meson-Fix-permissions-of-installed-scripts.patch
+0001-meson-Fix-GDB-scripts-install_dir-for-nix.patch
libs.diff
noisy-glib-compile-schemas.diff
glib-compile-schemas.hook gio-querymodules.hook)
@@ -25,7 +26,8 @@
sha256sums=('SKIP'
'8b289f3e1a5a3b29d310d45610468199acfe6f2b38a0d1be38c9224437a0e40c'
'12b1a2f4e304e4c03e48ae9564d73ae38619bbb7711a013138939ff8e5cc2327'
-'54c43d5d4d4b5fa591eb639e63050ce5eac30aff6691fa9cf56631782b2aad33'
+'f53d5acfda4b7141a4813f1e49610e9176dc5bdf8e867d88290e34d91a40ebcb'
+'2fb828f51727bd9c8b48cfd9d6833c8b4ff82803331f6e2340b0ec8edfe57c52'
'81a4df0b638730cffb7fa263c04841f7ca6b9c9578ee5045db6f30ff0c3fc531'
'e1123a5d85d2445faac33f6dae1085fdd620d83279a4e130a83fe38db52b62b3'
'5ba204a2686304b1454d401a39a9d27d09dd25e4529664e3fd565be3d439f8b6')
@@ -45,8 +47,10 @@
# https://bugzilla.gnome.org/show_bug.cgi?id=787671
patch -Np1 -i ../0001-meson-Fix-permissions-of-installed-scripts.patch
+ # https://bugzilla.gnome.org/show_bug.cgi?id=788772
+ patch -Np1 -i ../0001-meson-Fix-GDB-scripts-install_dir-for-nix.patch
+
# Unbreak .pc files when built with meson
- # Fix gdb scripts install
patch -Np1 -i ../libs.diff
# Suppress noise from glib-compile-schemas.hook
Modified: libs.diff
===
--- libs.diff 2017-10-24 10:29:00 UTC (rev 308387)
+++ libs.diff 2017-10-24 14:54:19 UTC (rev 308388)
@@ -1,8 +1,8 @@
diff --git i/gio/meson.build w/gio/meson.build
-index 32526362666b5e80..d7030aa29a6f17eb 100644
+index 4a10d49d7eb3229c..77537a77a26dcb5b 100644
--- i/gio/meson.build
+++ w/gio/meson.build
-@@ -727,7 +727,7 @@ libgio = shared_library('gio-2.0',
+@@ -741,7 +741,7 @@ libgio = shared_library('gio-2.0',
libgobject_dep, libgmodule_dep] + platform_deps +
network_libs,
c_args : gio_c
[arch-commits] Commit in glib2/trunk (3 files)
Date: Friday, May 13, 2016 @ 15:10:49
Author: heftig
Revision: 267923
correct a typo
Added:
glib2/trunk/glib-compile-schemas.hook
(from rev 267922, glib2/trunk/glib-compile-schemes.hook)
Modified:
glib2/trunk/PKGBUILD
Deleted:
glib2/trunk/glib-compile-schemes.hook
---+
PKGBUILD |4 ++--
glib-compile-schemas.hook | 12
glib-compile-schemes.hook | 12
3 files changed, 14 insertions(+), 14 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-05-13 12:06:53 UTC (rev 267922)
+++ PKGBUILD2016-05-13 13:10:49 UTC (rev 267923)
@@ -10,7 +10,7 @@
arch=(i686 x86_64)
makedepends=('pkg-config' 'python' 'libxslt' 'docbook-xml' 'pcre' 'libffi'
'libelf')
source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver:0:4}/glib-$pkgver.tar.xz
-glib-compile-schemes.hook
+glib-compile-schemas.hook
gio-querymodules.hook
revert-warn-glib-compile-schemas.patch)
sha256sums=('74411bff489cb2a3527bac743a51018841a56a4d896cc1e0d0d54f8166a14612'
@@ -56,7 +56,7 @@
# install hooks
install -dm755 "$pkgdir"/usr/share/libalpm/hooks/
- install -m644 "$srcdir"/{glib-compile-schemes,gio-querymodules}.hook
"$pkgdir"/usr/share/libalpm/hooks/
+ install -m644 "$srcdir"/{glib-compile-schemas,gio-querymodules}.hook
"$pkgdir"/usr/share/libalpm/hooks/
}
package_glib2-docs() {
Copied: glib2/trunk/glib-compile-schemas.hook (from rev 267922,
glib2/trunk/glib-compile-schemes.hook)
===
--- glib-compile-schemas.hook (rev 0)
+++ glib-compile-schemas.hook 2016-05-13 13:10:49 UTC (rev 267923)
@@ -0,0 +1,12 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/share/glib-2.0/schemas/*.gschema.xml
+Target = usr/share/glib-2.0/schemas/*.gschema.override
+
+[Action]
+Description = Compiling GSettings XML schema files...
+When = PostTransaction
+Exec = /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
Deleted: glib-compile-schemes.hook
===
--- glib-compile-schemes.hook 2016-05-13 12:06:53 UTC (rev 267922)
+++ glib-compile-schemes.hook 2016-05-13 13:10:49 UTC (rev 267923)
@@ -1,12 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/share/glib-2.0/schemas/*.gschema.xml
-Target = usr/share/glib-2.0/schemas/*.gschema.override
-
-[Action]
-Description = Compiling GSettings XML schema files...
-When = PostTransaction
-Exec = /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
[arch-commits] Commit in glib2/trunk (3 files)
Date: Wednesday, April 27, 2016 @ 13:49:34
Author: allan
Revision: 266207
upgpkg: glib2 2.48.0-2
add gio-querymodules and glib-compile-schemes hooks
Added:
glib2/trunk/gio-querymodules.hook
glib2/trunk/glib-compile-schemes.hook
Modified:
glib2/trunk/PKGBUILD
---+
PKGBUILD | 10 +-
gio-querymodules.hook | 11 +++
glib-compile-schemes.hook | 12
3 files changed, 32 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-04-27 11:04:57 UTC (rev 266206)
+++ PKGBUILD2016-04-27 11:49:34 UTC (rev 266207)
@@ -4,14 +4,18 @@
pkgbase=glib2
pkgname=(glib2 glib2-docs)
pkgver=2.48.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' 'python' 'libxslt' 'docbook-xml' 'pcre' 'libffi'
'libelf')
source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver:0:4}/glib-$pkgver.tar.xz
+glib-compile-schemes.hook
+gio-querymodules.hook
revert-warn-glib-compile-schemas.patch)
sha256sums=('744be6931ca914c68af98dc38ff6b0cf8381d65e335060faddfbf04c17147c34'
+'e1123a5d85d2445faac33f6dae1085fdd620d83279a4e130a83fe38db52b62b3'
+'5ba204a2686304b1454d401a39a9d27d09dd25e4529664e3fd565be3d439f8b6'
'049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
prepare() {
@@ -49,6 +53,10 @@
# Our gdb does not ship the required python modules, so remove it
rm -rf "$pkgdir/usr/share/gdb/"
+
+ # install hooks
+ install -dm755 "$pkgdir"/usr/share/libalpm/hooks/
+ install -m644 "$srcdir"/{glib-compile-schemes,gio-querymodules}.hook
"$pkgdir"/usr/share/libalpm/hooks/
}
package_glib2-docs() {
Added: gio-querymodules.hook
===
--- gio-querymodules.hook (rev 0)
+++ gio-querymodules.hook 2016-04-27 11:49:34 UTC (rev 266207)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/gio/modules/*.so
+
+[Action]
+Description = Updating GIO module cache...
+When = PostTransaction
+Exec = /usr/bin/gio-querymodules /usr/lib/gio/modules
Added: glib-compile-schemes.hook
===
--- glib-compile-schemes.hook (rev 0)
+++ glib-compile-schemes.hook 2016-04-27 11:49:34 UTC (rev 266207)
@@ -0,0 +1,12 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/share/glib-2.0/schemas/*.gschema.xml
+Target = usr/share/glib-2.0/schemas/*.gschema.override
+
+[Action]
+Description = Compiling GSettings XML schema files...
+When = PostTransaction
+Exec = /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
[arch-commits] Commit in glib2/trunk (3 files)
Date: Wednesday, February 24, 2016 @ 19:13:21
Author: heftig
Revision: 260227
2.46.2-4
Added:
glib2/trunk/0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch
Modified:
glib2/trunk/PKGBUILD
Deleted:
glib2/trunk/glib2.install
+
0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch | 49
++
PKGBUILD |6 -
glib2.install | 13 --
3 files changed, 53 insertions(+), 15 deletions(-)
Added: 0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch
===
--- 0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch
(rev 0)
+++ 0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch
2016-02-24 18:13:21 UTC (rev 260227)
@@ -0,0 +1,49 @@
+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, &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
===
--- PKGBUILD2016-02-24 18:12:28 UTC (rev 260226)
+++ PKGBUILD2016-02-24 18:13:21 UTC (rev 260227)
@@ -4,14 +4,16 @@
pkgbase=glib2
pkgname=(glib2 glib2-docs)
pkgver=2.46.2
-pkgrel=3
+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')
@@ -19,6 +21,7 @@
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() {
@@ -41,7 +44,6 @@
'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
Deleted: glib2.install
===
--- glib2.install 2016-02-24 18:12:28 UTC (rev 260226)
+++ glib2.install 2016-02-24 18:13:21 UTC (rev 260227)
@@ -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
-}
[arch-commits] Commit in glib2/trunk (3 files)
Date: Thursday, April 25, 2013 @ 13:34:05
Author: jgc
Revision: 183609
upgpkg: glib2 2.36.1-3
Add fixes from upstream branch. Should fix some hangs
Added:
glib2/trunk/gvariant-fix-annotation.patch
glib2/trunk/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch
Modified:
glib2/trunk/PKGBUILD
-+
PKGBUILD| 14 -
gvariant-fix-annotation.patch | 25 +
partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch | 132
++
3 files changed, 168 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-04-25 05:41:25 UTC (rev 183608)
+++ PKGBUILD2013-04-25 11:34:05 UTC (rev 183609)
@@ -4,15 +4,19 @@
pkgbase=glib2
pkgname=(glib2 glib2-docs)
pkgver=2.36.1
-pkgrel=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'
'elfutils')
source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz
-revert-warn-glib-compile-schemas.patch)
+revert-warn-glib-compile-schemas.patch
+gvariant-fix-annotation.patch
+partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch)
sha256sums=('7de37586794e92c024feebe5d306bf5f245fef4803c3666af1ae8dac6ee10b24'
-'049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
+'049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97'
+'ebbb0581322b1fc546f93f9d77f39f37584004086d2f6f2637a8bb7894e36b2b'
+'5928ac4fd114cda846fe38a3b8bedc5b038dbf9e47f76029af7d75e5dc8ae5be')
build() {
cd glib-$pkgver
@@ -20,6 +24,10 @@
# fix FS#34630 https://bugs.archlinux.org/task/34630
export CFLAGS+=" -Wall"
+ # Upstream fixes from 2.36 branch
+ patch -Np1 -i ../gvariant-fix-annotation.patch
+ patch -Np1 -i
../partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch
+
patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch
PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \
--sysconfdir=/etc \
Added: gvariant-fix-annotation.patch
===
--- gvariant-fix-annotation.patch (rev 0)
+++ gvariant-fix-annotation.patch 2013-04-25 11:34:05 UTC (rev 183609)
@@ -0,0 +1,25 @@
+From 7304bbd5d8ad56dcf3ee9fadf74f6104c49d4df7 Mon Sep 17 00:00:00 2001
+From: Giovanni Campagna
+Date: Fri, 12 Apr 2013 15:25:15 +
+Subject: GVariant: fix transfer annotation
+
+g_variant_new_from_bytes() returns a floating reference, so it
+must be annotated (transfer none)
+
+https://bugzilla.gnome.org/show_bug.cgi?id=697887
+---
+diff --git a/glib/gvariant-core.c b/glib/gvariant-core.c
+index b96bc90..f823e01 100644
+--- a/glib/gvariant-core.c
b/glib/gvariant-core.c
+@@ -498,7 +498,7 @@ g_variant_alloc (const GVariantType *type,
+ *
+ * A reference is taken on @bytes.
+ *
+- * Returns: a new #GVariant with a floating reference
++ * Returns: (transfer none): a new #GVariant with a floating reference
+ *
+ * Since: 2.36
+ */
+--
+cgit v0.9.1
Added: partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch
===
--- partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch
(rev 0)
+++ partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch
2013-04-25 11:34:05 UTC (rev 183609)
@@ -0,0 +1,132 @@
+From f3b1054b0ebb4912f700e08da0c3d35c30113e79 Mon Sep 17 00:00:00 2001
+From: Ryan Lortie
+Date: Tue, 23 Apr 2013 17:26:48 +
+Subject: Partially revert "Merge waitpid() from g_spawn_sync into gmain()"
+
+This partially reverts commit ce0022933c255313e010b27f977f4ae02aad1e7e.
+
+It used to be safe to use g_spawn_sync() from processes that had their
+own SIGCHLD handler because it simply called wait(). When it was
+changed to depend on the GLib child watching infrastructure this meant
+that GLib had to own the SIGCHLD handler.
+
+This caused hangs in at least Pidgin.
+
+The patch contained two other improvements to the child watch code which
+we want to keep, so only revert the changes to gspawn itself.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=698081
+---
+diff --git a/glib/gspawn.c b/glib/gspawn.c
+index 381ed5c..01cedf6 100644
+--- a/glib/gspawn.c
b/glib/gspawn.c
+@@ -47,7 +47,6 @@
+
+ #include "genviron.h"
+ #include "gmem.h"
+-#include "gmain.h"
+ #include "gshell.h"
+ #include "gstring.h"
+ #include "gstrfuncs.h"
+@@ -207,21 +206,6 @@ read_data (GString *str,
+ }
+ }
+
+-typedef struct {
+- GMainLoop *loop;
+- gint *status_p;
+-} SyncWaitpidData;
+-
+-static void
+-on_sync_waitpid (GPid pid,
+-
