[arch-commits] Commit in glib2/repos (16 files)
Date: Sunday, October 8, 2017 @ 21:33:23 Author: heftig Revision: 307203 archrelease: copy trunk to testing-i686, testing-x86_64 Added: glib2/repos/testing-i686/ glib2/repos/testing-i686/0001-docs-Fix-building-with-meson.patch (from rev 307202, glib2/trunk/0001-docs-Fix-building-with-meson.patch) glib2/repos/testing-i686/0001-meson-Fix-permissions-of-installed-scripts.patch (from rev 307202, glib2/trunk/0001-meson-Fix-permissions-of-installed-scripts.patch) glib2/repos/testing-i686/PKGBUILD (from rev 307202, glib2/trunk/PKGBUILD) glib2/repos/testing-i686/gio-querymodules.hook (from rev 307202, glib2/trunk/gio-querymodules.hook) glib2/repos/testing-i686/glib-compile-schemas.hook (from rev 307202, glib2/trunk/glib-compile-schemas.hook) glib2/repos/testing-i686/libs.diff (from rev 307202, glib2/trunk/libs.diff) glib2/repos/testing-i686/noisy-glib-compile-schemas.diff (from rev 307202, glib2/trunk/noisy-glib-compile-schemas.diff) glib2/repos/testing-x86_64/ glib2/repos/testing-x86_64/0001-docs-Fix-building-with-meson.patch (from rev 307202, glib2/trunk/0001-docs-Fix-building-with-meson.patch) glib2/repos/testing-x86_64/0001-meson-Fix-permissions-of-installed-scripts.patch (from rev 307202, glib2/trunk/0001-meson-Fix-permissions-of-installed-scripts.patch) glib2/repos/testing-x86_64/PKGBUILD (from rev 307202, glib2/trunk/PKGBUILD) glib2/repos/testing-x86_64/gio-querymodules.hook (from rev 307202, glib2/trunk/gio-querymodules.hook) glib2/repos/testing-x86_64/glib-compile-schemas.hook (from rev 307202, glib2/trunk/glib-compile-schemas.hook) glib2/repos/testing-x86_64/libs.diff (from rev 307202, glib2/trunk/libs.diff) glib2/repos/testing-x86_64/noisy-glib-compile-schemas.diff (from rev 307202, glib2/trunk/noisy-glib-compile-schemas.diff) --+ testing-i686/0001-docs-Fix-building-with-meson.patch | 85 ++ testing-i686/0001-meson-Fix-permissions-of-installed-scripts.patch | 50 +++ testing-i686/PKGBUILD| 84 ++ testing-i686/gio-querymodules.hook | 11 testing-i686/glib-compile-schemas.hook | 12 testing-i686/libs.diff | 128 ++ testing-i686/noisy-glib-compile-schemas.diff | 24 + testing-x86_64/0001-docs-Fix-building-with-meson.patch | 85 ++ testing-x86_64/0001-meson-Fix-permissions-of-installed-scripts.patch | 50 +++ testing-x86_64/PKGBUILD | 84 ++ testing-x86_64/gio-querymodules.hook | 11 testing-x86_64/glib-compile-schemas.hook | 12 testing-x86_64/libs.diff | 128 ++ testing-x86_64/noisy-glib-compile-schemas.diff | 24 + 14 files changed, 788 insertions(+) Copied: glib2/repos/testing-i686/0001-docs-Fix-building-with-meson.patch (from rev 307202, glib2/trunk/0001-docs-Fix-building-with-meson.patch) === --- testing-i686/0001-docs-Fix-building-with-meson.patch (rev 0) +++ testing-i686/0001-docs-Fix-building-with-meson.patch2017-10-08 21:33:23 UTC (rev 307203) @@ -0,0 +1,85 @@ +From a7cbd565aad04f92cbd9ac36696a9d033ae6bcc0 Mon Sep 17 00:00:00 2001 +From: Armin K+Date: Fri, 25 Aug 2017 13:36:23 +0200 +Subject: [PATCH] docs: Fix building with meson + +This fixes {gio,gobject}-doc ninja targets as well as +install process when gtk-doc is enabled +--- + docs/reference/gio/meson.build | 15 ++- + docs/reference/gobject/meson.build | 13 - + 2 files changed, 26 insertions(+), 2 deletions(-) + +diff --git a/docs/reference/gio/meson.build b/docs/reference/gio/meson.build +index 7f0467726..8f8dc7ce5 100644 +--- a/docs/reference/gio/meson.build b/docs/reference/gio/meson.build +@@ -52,9 +52,12 @@ if get_option('with-docs') != 'no' + 'gnetworkmonitorbase.h', + 'gnetworkmonitornetlink.h', + 'gnetworkmonitornm.h', ++'gnetworkmonitorportal.h', + 'gnotificationbackend.h', + 'gnotification-private.h', ++'gosxappinfo.h', + 'gpollfilemonitor.h', ++'gproxyresolverportal.h', + 'gregistrysettingsbackend.h', + 'gresourcefile.h', + 'gsettingsbackendinternal.h', +@@ -95,12 +98,22 @@ if get_option('with-docs') != 'no' + configuration: version_conf + ) + ++ # Meson uses paths relative to meson.source_root() in dependencies, ++ # which is invalid relative to current_source_dir(), so the compile ++ # process fails to find glib headers ++ top_build_dir = meson.build_root() ++ top_source_dir = meson.source_root() ++
[arch-commits] Commit in glib2/repos (16 files)
Date: Monday, October 10, 2016 @ 21:17:03 Author: heftig Revision: 278193 archrelease: copy trunk to testing-i686, testing-x86_64 Added: glib2/repos/testing-i686/PKGBUILD (from rev 278192, glib2/trunk/PKGBUILD) glib2/repos/testing-i686/gio-querymodules.hook (from rev 278192, glib2/trunk/gio-querymodules.hook) glib2/repos/testing-i686/glib-compile-schemas.hook (from rev 278192, glib2/trunk/glib-compile-schemas.hook) glib2/repos/testing-i686/revert-warn-glib-compile-schemas.patch (from rev 278192, glib2/trunk/revert-warn-glib-compile-schemas.patch) glib2/repos/testing-x86_64/PKGBUILD (from rev 278192, glib2/trunk/PKGBUILD) glib2/repos/testing-x86_64/gio-querymodules.hook (from rev 278192, glib2/trunk/gio-querymodules.hook) glib2/repos/testing-x86_64/glib-compile-schemas.hook (from rev 278192, glib2/trunk/glib-compile-schemas.hook) glib2/repos/testing-x86_64/revert-warn-glib-compile-schemas.patch (from rev 278192, glib2/trunk/revert-warn-glib-compile-schemas.patch) Deleted: glib2/repos/testing-i686/PKGBUILD glib2/repos/testing-i686/gio-querymodules.hook glib2/repos/testing-i686/glib-compile-schemas.hook glib2/repos/testing-i686/revert-warn-glib-compile-schemas.patch glib2/repos/testing-x86_64/PKGBUILD glib2/repos/testing-x86_64/gio-querymodules.hook glib2/repos/testing-x86_64/glib-compile-schemas.hook glib2/repos/testing-x86_64/revert-warn-glib-compile-schemas.patch ---+ /PKGBUILD | 166 /gio-querymodules.hook| 22 ++ /glib-compile-schemas.hook| 24 ++ /revert-warn-glib-compile-schemas.patch | 66 ++ testing-i686/PKGBUILD | 79 --- testing-i686/gio-querymodules.hook| 11 - testing-i686/glib-compile-schemas.hook| 12 - testing-i686/revert-warn-glib-compile-schemas.patch | 33 --- testing-x86_64/PKGBUILD | 79 --- testing-x86_64/gio-querymodules.hook | 11 - testing-x86_64/glib-compile-schemas.hook | 12 - testing-x86_64/revert-warn-glib-compile-schemas.patch | 33 --- 12 files changed, 278 insertions(+), 270 deletions(-) Deleted: testing-i686/PKGBUILD === --- testing-i686/PKGBUILD 2016-10-10 21:16:42 UTC (rev 278192) +++ testing-i686/PKGBUILD 2016-10-10 21:17:03 UTC (rev 278193) @@ -1,79 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot- -pkgbase=glib2 -pkgname=(glib2 glib2-docs) -pkgver=2.50.0+9+g34751ad -pkgrel=1 -pkgdesc="Low level core library" -url="http://www.gtk.org/; -arch=(i686 x86_64) -makedepends=('gettext' 'gtk-doc' 'libffi' 'pcre' 'zlib' 'shared-mime-info' 'python' 'libelf' 'git') -_commit=34751ad17ac8e73558c530d15a3398273a5f4f67 -source=("git://git.gnome.org/glib#commit=$_commit" -glib-compile-schemas.hook -gio-querymodules.hook -revert-warn-glib-compile-schemas.patch) -sha256sums=('SKIP' -'e1123a5d85d2445faac33f6dae1085fdd620d83279a4e130a83fe38db52b62b3' -'5ba204a2686304b1454d401a39a9d27d09dd25e4529664e3fd565be3d439f8b6' -'049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') - -pkgver() { - cd glib - git describe --tags | sed 's/-/+/g' -} - -prepare() { - cd glib - patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch - NOCONFIGURE=1 ./autogen.sh -} - -build() { - cd glib - ./configure --prefix=/usr --libdir=/usr/lib \ - --sysconfdir=/etc \ - --with-pcre=system \ - --disable-fam \ - --enable-gtk-doc - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - make -} - -check() { - cd glib - # Takes an effing long time - #make -k check || : -} - -package_glib2() { - depends=('pcre' 'libffi') - optdepends=('python: for gdbus-codegen and gtester-report' - 'libelf: gresource inspection tool') - options=('!docs' '!emptydirs') - license=('LGPL') - - cd glib - make completiondir=/usr/share/bash-completion/completions DESTDIR="$pkgdir" install - - chmod -x "$pkgdir"/usr/share/bash-completion/completions/* - - # install hooks - install -dm755 "$pkgdir"/usr/share/libalpm/hooks/ - install -m644 "$srcdir"/{glib-compile-schemas,gio-querymodules}.hook "$pkgdir"/usr/share/libalpm/hooks/ -} - -package_glib2-docs() { - pkgdesc="Documentation for glib2" - conflicts=('gobject2-docs') - replaces=('gobject2-docs') - license=('custom') - options=('docs' '!emptydirs') - - cd glib/docs - make DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}/usr/share/man" - install -m755 -d "${pkgdir}/usr/share/licenses/glib2-docs" - install -m644 reference/COPYING "${pkgdir}/usr/share/licenses/glib2-docs/" -} Copied: glib2/repos/testing-i686/PKGBUILD (from rev 278192,
[arch-commits] Commit in glib2/repos (16 files)
Date: Tuesday, September 27, 2016 @ 08:08:23 Author: jgc Revision: 277012 archrelease: copy trunk to gnome-unstable-i686, gnome-unstable-x86_64 Added: glib2/repos/gnome-unstable-i686/PKGBUILD (from rev 277011, glib2/trunk/PKGBUILD) glib2/repos/gnome-unstable-i686/gio-querymodules.hook (from rev 277011, glib2/trunk/gio-querymodules.hook) glib2/repos/gnome-unstable-i686/glib-compile-schemas.hook (from rev 277011, glib2/trunk/glib-compile-schemas.hook) glib2/repos/gnome-unstable-i686/revert-warn-glib-compile-schemas.patch (from rev 277011, glib2/trunk/revert-warn-glib-compile-schemas.patch) glib2/repos/gnome-unstable-x86_64/PKGBUILD (from rev 277011, glib2/trunk/PKGBUILD) glib2/repos/gnome-unstable-x86_64/gio-querymodules.hook (from rev 277011, glib2/trunk/gio-querymodules.hook) glib2/repos/gnome-unstable-x86_64/glib-compile-schemas.hook (from rev 277011, glib2/trunk/glib-compile-schemas.hook) glib2/repos/gnome-unstable-x86_64/revert-warn-glib-compile-schemas.patch (from rev 277011, glib2/trunk/revert-warn-glib-compile-schemas.patch) Deleted: glib2/repos/gnome-unstable-i686/PKGBUILD glib2/repos/gnome-unstable-i686/gio-querymodules.hook glib2/repos/gnome-unstable-i686/glib-compile-schemas.hook glib2/repos/gnome-unstable-i686/revert-warn-glib-compile-schemas.patch glib2/repos/gnome-unstable-x86_64/PKGBUILD glib2/repos/gnome-unstable-x86_64/gio-querymodules.hook glib2/repos/gnome-unstable-x86_64/glib-compile-schemas.hook glib2/repos/gnome-unstable-x86_64/revert-warn-glib-compile-schemas.patch --+ /PKGBUILD| 158 ++ /gio-querymodules.hook | 22 + /glib-compile-schemas.hook | 24 + /revert-warn-glib-compile-schemas.patch | 66 gnome-unstable-i686/PKGBUILD | 79 - gnome-unstable-i686/gio-querymodules.hook| 11 gnome-unstable-i686/glib-compile-schemas.hook| 12 gnome-unstable-i686/revert-warn-glib-compile-schemas.patch | 33 -- gnome-unstable-x86_64/PKGBUILD | 79 - gnome-unstable-x86_64/gio-querymodules.hook | 11 gnome-unstable-x86_64/glib-compile-schemas.hook | 12 gnome-unstable-x86_64/revert-warn-glib-compile-schemas.patch | 33 -- 12 files changed, 270 insertions(+), 270 deletions(-) Deleted: gnome-unstable-i686/PKGBUILD === --- gnome-unstable-i686/PKGBUILD2016-09-27 08:08:18 UTC (rev 277011) +++ gnome-unstable-i686/PKGBUILD2016-09-27 08:08:23 UTC (rev 277012) @@ -1,79 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot- -pkgbase=glib2 -pkgname=(glib2 glib2-docs) -pkgver=2.49.7+6+g3602f93 -pkgrel=1 -pkgdesc="Low level core library" -url="http://www.gtk.org/; -arch=(i686 x86_64) -makedepends=('gettext' 'gtk-doc' 'libffi' 'pcre' 'zlib' 'shared-mime-info' 'python' 'libelf' 'git') -_commit=3602f934855a484c5eec28f12a6535e14de1778d -source=("git://git.gnome.org/glib#commit=$_commit" -glib-compile-schemas.hook -gio-querymodules.hook -revert-warn-glib-compile-schemas.patch) -sha256sums=('SKIP' -'e1123a5d85d2445faac33f6dae1085fdd620d83279a4e130a83fe38db52b62b3' -'5ba204a2686304b1454d401a39a9d27d09dd25e4529664e3fd565be3d439f8b6' -'049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') - -pkgver() { - cd glib - git describe --tags | sed 's/-/+/g' -} - -prepare() { - cd glib - patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch - NOCONFIGURE=1 ./autogen.sh -} - -build() { - cd glib - ./configure --prefix=/usr --libdir=/usr/lib \ - --sysconfdir=/etc \ - --with-pcre=system \ - --disable-fam \ - --enable-gtk-doc - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - make -} - -check() { - cd glib - # Takes an effing long time - #make -k check || : -} - -package_glib2() { - depends=('pcre' 'libffi') - optdepends=('python: for gdbus-codegen and gtester-report' - 'libelf: gresource inspection tool') - options=('!docs' '!emptydirs') - license=('LGPL') - - cd glib - make completiondir=/usr/share/bash-completion/completions DESTDIR="$pkgdir" install - - chmod -x "$pkgdir"/usr/share/bash-completion/completions/* - - # install hooks - install -dm755 "$pkgdir"/usr/share/libalpm/hooks/ - install -m644 "$srcdir"/{glib-compile-schemas,gio-querymodules}.hook "$pkgdir"/usr/share/libalpm/hooks/ -} - -package_glib2-docs() { - pkgdesc="Documentation for glib2" - conflicts=('gobject2-docs') - replaces=('gobject2-docs') - license=('custom') - options=('docs' '!emptydirs') - - cd glib/docs - make DESTDIR="${pkgdir}" install - rm -rf
[arch-commits] Commit in glib2/repos (16 files)
Date: Wednesday, March 23, 2016 @ 09:55:48 Author: jgc Revision: 262447 archrelease: copy trunk to gnome-unstable-i686, gnome-unstable-x86_64 Added: glib2/repos/gnome-unstable-i686/0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch (from rev 262446, glib2/trunk/0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch) glib2/repos/gnome-unstable-i686/PKGBUILD (from rev 262446, glib2/trunk/PKGBUILD) glib2/repos/gnome-unstable-i686/memleak.patch (from rev 262446, glib2/trunk/memleak.patch) glib2/repos/gnome-unstable-i686/revert-warn-glib-compile-schemas.patch (from rev 262446, glib2/trunk/revert-warn-glib-compile-schemas.patch) glib2/repos/gnome-unstable-x86_64/0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch (from rev 262446, glib2/trunk/0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch) glib2/repos/gnome-unstable-x86_64/PKGBUILD (from rev 262446, glib2/trunk/PKGBUILD) glib2/repos/gnome-unstable-x86_64/memleak.patch (from rev 262446, glib2/trunk/memleak.patch) glib2/repos/gnome-unstable-x86_64/revert-warn-glib-compile-schemas.patch (from rev 262446, glib2/trunk/revert-warn-glib-compile-schemas.patch) Deleted: glib2/repos/gnome-unstable-i686/0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch glib2/repos/gnome-unstable-i686/PKGBUILD glib2/repos/gnome-unstable-i686/memleak.patch glib2/repos/gnome-unstable-i686/revert-warn-glib-compile-schemas.patch glib2/repos/gnome-unstable-x86_64/0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch glib2/repos/gnome-unstable-x86_64/PKGBUILD glib2/repos/gnome-unstable-x86_64/memleak.patch glib2/repos/gnome-unstable-x86_64/revert-warn-glib-compile-schemas.patch --+ /0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch | 98 +++ /PKGBUILD | 134 ++ /memleak.patch | 50 +++ /revert-warn-glib-compile-schemas.patch | 66 gnome-unstable-i686/0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch | 49 --- gnome-unstable-i686/PKGBUILD | 67 - gnome-unstable-i686/memleak.patch | 25 - gnome-unstable-i686/revert-warn-glib-compile-schemas.patch | 33 -- gnome-unstable-x86_64/0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch | 49 --- gnome-unstable-x86_64/PKGBUILD | 67 - gnome-unstable-x86_64/memleak.patch | 25 - gnome-unstable-x86_64/revert-warn-glib-compile-schemas.patch | 33 -- 12 files changed, 348 insertions(+), 348 deletions(-) Deleted: gnome-unstable-i686/0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch === --- gnome-unstable-i686/0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch 2016-03-23 08:55:40 UTC (rev 262446) +++ gnome-unstable-i686/0001-gsettings-Don-t-crash-when-no-schemas-are-installed.patch 2016-03-23 08:55:48 UTC (rev 262447) @@ -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; -+}
[arch-commits] Commit in glib2/repos (16 files)
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)"+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 + Deleted: testing-i686/PKGBUILD
[arch-commits] Commit in glib2/repos (16 files)
Date: Thursday, April 25, 2013 @ 13:34:18 Author: jgc Revision: 183610 archrelease: copy trunk to testing-i686, testing-x86_64 Added: glib2/repos/testing-i686/0001-Make-gtester-report-work-with-Python-3.x.patch (from rev 183609, glib2/trunk/0001-Make-gtester-report-work-with-Python-3.x.patch) glib2/repos/testing-i686/PKGBUILD (from rev 183609, glib2/trunk/PKGBUILD) glib2/repos/testing-i686/gvariant-fix-annotation.patch (from rev 183609, glib2/trunk/gvariant-fix-annotation.patch) glib2/repos/testing-i686/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch (from rev 183609, glib2/trunk/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch) glib2/repos/testing-i686/revert-warn-glib-compile-schemas.patch (from rev 183609, glib2/trunk/revert-warn-glib-compile-schemas.patch) glib2/repos/testing-x86_64/0001-Make-gtester-report-work-with-Python-3.x.patch (from rev 183609, glib2/trunk/0001-Make-gtester-report-work-with-Python-3.x.patch) glib2/repos/testing-x86_64/PKGBUILD (from rev 183609, glib2/trunk/PKGBUILD) glib2/repos/testing-x86_64/gvariant-fix-annotation.patch (from rev 183609, glib2/trunk/gvariant-fix-annotation.patch) glib2/repos/testing-x86_64/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch (from rev 183609, glib2/trunk/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch) glib2/repos/testing-x86_64/revert-warn-glib-compile-schemas.patch (from rev 183609, glib2/trunk/revert-warn-glib-compile-schemas.patch) Deleted: glib2/repos/testing-i686/0001-Make-gtester-report-work-with-Python-3.x.patch glib2/repos/testing-i686/PKGBUILD glib2/repos/testing-i686/revert-warn-glib-compile-schemas.patch glib2/repos/testing-x86_64/0001-Make-gtester-report-work-with-Python-3.x.patch glib2/repos/testing-x86_64/PKGBUILD glib2/repos/testing-x86_64/revert-warn-glib-compile-schemas.patch + /0001-Make-gtester-report-work-with-Python-3.x.patch | 120 /PKGBUILD | 150 ++ /revert-warn-glib-compile-schemas.patch | 66 testing-i686/0001-Make-gtester-report-work-with-Python-3.x.patch | 60 testing-i686/PKGBUILD | 67 testing-i686/gvariant-fix-annotation.patch | 25 + testing-i686/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch | 132 testing-i686/revert-warn-glib-compile-schemas.patch | 33 -- testing-x86_64/0001-Make-gtester-report-work-with-Python-3.x.patch | 60 testing-x86_64/PKGBUILD | 67 testing-x86_64/gvariant-fix-annotation.patch | 25 + testing-x86_64/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch | 132 testing-x86_64/revert-warn-glib-compile-schemas.patch | 33 -- 13 files changed, 650 insertions(+), 320 deletions(-) Deleted: testing-i686/0001-Make-gtester-report-work-with-Python-3.x.patch === --- testing-i686/0001-Make-gtester-report-work-with-Python-3.x.patch 2013-04-25 11:34:05 UTC (rev 183609) +++ testing-i686/0001-Make-gtester-report-work-with-Python-3.x.patch 2013-04-25 11:34:18 UTC (rev 183610) @@ -1,60 +0,0 @@ -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') -+
[arch-commits] Commit in glib2/repos (16 files)
Date: Wednesday, September 5, 2012 @ 15:51:18 Author: jgc Revision: 166301 archrelease: copy trunk to gnome-unstable-i686, gnome-unstable-x86_64 Added: glib2/repos/gnome-unstable-i686/PKGBUILD (from rev 166300, glib2/trunk/PKGBUILD) glib2/repos/gnome-unstable-i686/glib2.csh (from rev 166300, glib2/trunk/glib2.csh) glib2/repos/gnome-unstable-i686/glib2.sh (from rev 166300, glib2/trunk/glib2.sh) glib2/repos/gnome-unstable-i686/revert-warn-glib-compile-schemas.patch (from rev 166300, glib2/trunk/revert-warn-glib-compile-schemas.patch) glib2/repos/gnome-unstable-x86_64/PKGBUILD (from rev 166300, glib2/trunk/PKGBUILD) glib2/repos/gnome-unstable-x86_64/glib2.csh (from rev 166300, glib2/trunk/glib2.csh) glib2/repos/gnome-unstable-x86_64/glib2.sh (from rev 166300, glib2/trunk/glib2.sh) glib2/repos/gnome-unstable-x86_64/revert-warn-glib-compile-schemas.patch (from rev 166300, glib2/trunk/revert-warn-glib-compile-schemas.patch) Deleted: glib2/repos/gnome-unstable-i686/PKGBUILD glib2/repos/gnome-unstable-i686/glib2.csh glib2/repos/gnome-unstable-i686/glib2.sh glib2/repos/gnome-unstable-i686/revert-warn-glib-compile-schemas.patch glib2/repos/gnome-unstable-x86_64/PKGBUILD glib2/repos/gnome-unstable-x86_64/glib2.csh glib2/repos/gnome-unstable-x86_64/glib2.sh glib2/repos/gnome-unstable-x86_64/revert-warn-glib-compile-schemas.patch --+ gnome-unstable-i686/PKGBUILD | 92 +- gnome-unstable-i686/glib2.csh|2 gnome-unstable-i686/glib2.sh |2 gnome-unstable-i686/revert-warn-glib-compile-schemas.patch | 66 +++ gnome-unstable-x86_64/PKGBUILD | 92 +- gnome-unstable-x86_64/glib2.csh |2 gnome-unstable-x86_64/glib2.sh |2 gnome-unstable-x86_64/revert-warn-glib-compile-schemas.patch | 66 +++ 8 files changed, 162 insertions(+), 162 deletions(-) Deleted: gnome-unstable-i686/PKGBUILD === --- gnome-unstable-i686/PKGBUILD2012-09-05 19:50:41 UTC (rev 166300) +++ gnome-unstable-i686/PKGBUILD2012-09-05 19:51:18 UTC (rev 166301) @@ -1,46 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot j...@archlinux.org - -pkgname=glib2 -pkgver=2.33.10 -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') -optdepends=('python2: for gdbus-codegen') -options=('!libtool' '!docs' '!emptydirs') -source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz -glib2.sh -glib2.csh -revert-warn-glib-compile-schemas.patch) -sha256sums=('6caf18eb963aa2c3c7c0dc63201021bc29e7972c60d191f566e8971af77e9505' -'9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a' -'8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3' -'049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') - -build() { - cd glib-$pkgver - patch -Rp1 -i $srcdir/revert-warn-glib-compile-schemas.patch - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \ - --sysconfdir=/etc \ - --with-pcre=system \ - --disable-fam - make -} - -package() { - cd glib-$pkgver - make completiondir=/usr/share/bash-completion/completions DESTDIR=$pkgdir install - - install -d $pkgdir/etc/profile.d - install -m755 $srcdir/glib2.sh $pkgdir/etc/profile.d/ - install -m755 $srcdir/glib2.csh $pkgdir/etc/profile.d/ - - for _i in $pkgdir/usr/share/bash-completion/completions/*; do - chmod -x $_i - done - sed -i s|#!/usr/bin/env python|#!/usr/bin/env python2| $pkgdir/usr/bin/gdbus-codegen -} Copied: glib2/repos/gnome-unstable-i686/PKGBUILD (from rev 166300, glib2/trunk/PKGBUILD) === --- gnome-unstable-i686/PKGBUILD(rev 0) +++ gnome-unstable-i686/PKGBUILD2012-09-05 19:51:18 UTC (rev 166301) @@ -0,0 +1,46 @@ +# $Id$ +# Maintainer: Jan de Groot j...@archlinux.org + +pkgname=glib2 +pkgver=2.33.12 +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') +optdepends=('python2: for gdbus-codegen') +options=('!libtool' '!docs' '!emptydirs') +source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz +glib2.sh +glib2.csh +revert-warn-glib-compile-schemas.patch) +sha256sums=('a97dfd3fd36bcdc26f6726cbbcd3bc2353028a7ecd5dbe7ab3a4dc80d672a2e9' +
[arch-commits] Commit in glib2/repos (16 files)
Date: Friday, May 4, 2012 @ 21:35:46 Author: heftig Revision: 158592 archrelease: copy trunk to testing-i686, testing-x86_64 Added: glib2/repos/testing-i686/PKGBUILD (from rev 158591, glib2/trunk/PKGBUILD) glib2/repos/testing-i686/glib2.csh (from rev 158591, glib2/trunk/glib2.csh) glib2/repos/testing-i686/glib2.sh (from rev 158591, glib2/trunk/glib2.sh) glib2/repos/testing-i686/revert-warn-glib-compile-schemas.patch (from rev 158591, glib2/trunk/revert-warn-glib-compile-schemas.patch) glib2/repos/testing-x86_64/PKGBUILD (from rev 158591, glib2/trunk/PKGBUILD) glib2/repos/testing-x86_64/glib2.csh (from rev 158591, glib2/trunk/glib2.csh) glib2/repos/testing-x86_64/glib2.sh (from rev 158591, glib2/trunk/glib2.sh) glib2/repos/testing-x86_64/revert-warn-glib-compile-schemas.patch (from rev 158591, glib2/trunk/revert-warn-glib-compile-schemas.patch) Deleted: glib2/repos/testing-i686/PKGBUILD glib2/repos/testing-i686/glib2.csh glib2/repos/testing-i686/glib2.sh glib2/repos/testing-i686/revert-warn-glib-compile-schemas.patch glib2/repos/testing-x86_64/PKGBUILD glib2/repos/testing-x86_64/glib2.csh glib2/repos/testing-x86_64/glib2.sh glib2/repos/testing-x86_64/revert-warn-glib-compile-schemas.patch ---+ testing-i686/PKGBUILD | 92 testing-i686/glib2.csh|2 testing-i686/glib2.sh |2 testing-i686/revert-warn-glib-compile-schemas.patch | 66 +-- testing-x86_64/PKGBUILD | 92 testing-x86_64/glib2.csh |2 testing-x86_64/glib2.sh |2 testing-x86_64/revert-warn-glib-compile-schemas.patch | 66 +-- 8 files changed, 162 insertions(+), 162 deletions(-) Deleted: testing-i686/PKGBUILD === --- testing-i686/PKGBUILD 2012-05-05 01:33:36 UTC (rev 158591) +++ testing-i686/PKGBUILD 2012-05-05 01:35:46 UTC (rev 158592) @@ -1,46 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot j...@archlinux.org - -pkgname=glib2 -pkgver=2.32.2 -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') -optdepends=('python2: for gdbus-codegen') -options=('!libtool' '!docs' '!emptydirs') -source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz -glib2.sh -glib2.csh -revert-warn-glib-compile-schemas.patch) -sha256sums=('b1764abf00bac96e0e93e29fb9715ce75f3583579acac40648e18771d43d6136' -'9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a' -'8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3' -'049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') - -build() { - cd glib-$pkgver - patch -Rp1 -i $srcdir/revert-warn-glib-compile-schemas.patch - PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --with-pcre=system \ - --disable-fam - make -} - -package() { - cd glib-$pkgver - make DESTDIR=$pkgdir install - - install -d $pkgdir/etc/profile.d - install -m755 $srcdir/glib2.sh $pkgdir/etc/profile.d/ - install -m755 $srcdir/glib2.csh $pkgdir/etc/profile.d/ - - for _i in $pkgdir/etc/bash_completion.d/*; do - chmod -x $_i - done - sed -i s|#!/usr/bin/env python|#!/usr/bin/env python2| $pkgdir/usr/bin/gdbus-codegen -} Copied: glib2/repos/testing-i686/PKGBUILD (from rev 158591, glib2/trunk/PKGBUILD) === --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2012-05-05 01:35:46 UTC (rev 158592) @@ -0,0 +1,46 @@ +# $Id$ +# Maintainer: Jan de Groot j...@archlinux.org + +pkgname=glib2 +pkgver=2.32.2 +pkgrel=2 +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') +optdepends=('python2: for gdbus-codegen') +options=('!libtool' '!docs' '!emptydirs') +source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz +glib2.sh +glib2.csh +revert-warn-glib-compile-schemas.patch) +sha256sums=('b1764abf00bac96e0e93e29fb9715ce75f3583579acac40648e18771d43d6136' +'9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a' +'8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3' +'049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') + +build() { + cd glib-$pkgver + patch -Rp1 -i $srcdir/revert-warn-glib-compile-schemas.patch + PYTHON=/usr/bin/python2 ./configure