Date: Thursday, September 7, 2017 @ 20:37:10 Author: heftig Revision: 305009
Unstable glib should be in glib, not glib2 Added: glib/trunk/0001-docs-Fix-building-with-meson.patch (from rev 305008, glib2/trunk/0001-docs-Fix-building-with-meson.patch) glib/trunk/PKGBUILD (from rev 305008, glib2/trunk/PKGBUILD) glib/trunk/gio-querymodules.hook (from rev 305008, glib2/trunk/gio-querymodules.hook) glib/trunk/glib-compile-schemas.hook (from rev 305008, glib2/trunk/glib-compile-schemas.hook) glib/trunk/noisy-glib-compile-schemas.diff (from rev 305008, glib2/trunk/noisy-glib-compile-schemas.diff) glib2/trunk/skip-broken-timer-test.patch (from rev 305006, glib2/trunk/skip-broken-timer-test.patch) Modified: glib2/trunk/PKGBUILD Deleted: glib2/trunk/0001-docs-Fix-building-with-meson.patch glib2/trunk/noisy-glib-compile-schemas.diff -------------------------------------------------+ 2/trunk/0001-docs-Fix-building-with-meson.patch | 85 ------------------- 2/trunk/PKGBUILD | 96 +++++++++++----------- 2/trunk/noisy-glib-compile-schemas.diff | 24 ----- 2/trunk/skip-broken-timer-test.patch | 12 ++ trunk/0001-docs-Fix-building-with-meson.patch | 85 +++++++++++++++++++ trunk/PKGBUILD | 79 ++++++++++++++++++ trunk/gio-querymodules.hook | 11 ++ trunk/glib-compile-schemas.hook | 12 ++ trunk/noisy-glib-compile-schemas.diff | 24 +++++ 9 files changed, 274 insertions(+), 154 deletions(-) Copied: glib/trunk/0001-docs-Fix-building-with-meson.patch (from rev 305008, glib2/trunk/0001-docs-Fix-building-with-meson.patch) =================================================================== --- trunk/0001-docs-Fix-building-with-meson.patch (rev 0) +++ trunk/0001-docs-Fix-building-with-meson.patch 2017-09-07 20:37:10 UTC (rev 305009) @@ -0,0 +1,85 @@ +From a7cbd565aad04f92cbd9ac36696a9d033ae6bcc0 Mon Sep 17 00:00:00 2001 +From: Armin K <kre...@email.com> +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() ++ glib_top_build_dir = join_paths(top_build_dir, 'glib') ++ glib_top_source_dir = join_paths(top_source_dir, 'glib') ++ ++ scan_dep = declare_dependency(include_directories : [ top_source_dir, glib_top_build_dir, glib_top_source_dir ]) ++ + gnome.gtkdoc('gio', + main_xml : 'gio-docs.xml', + namespace : 'g', + gobject_typesfile : 'gio.types', + mode : 'none', +- dependencies : [libgio_dep, libgobject_dep, libglib_dep], ++ dependencies : [libgio_dep, libgobject_dep, libglib_dep, scan_dep], + src_dir : 'gio', + scan_args : [ + '--rebuild-types', +diff --git a/docs/reference/gobject/meson.build b/docs/reference/gobject/meson.build +index 1025e174f..9ec1f9123 100644 +--- a/docs/reference/gobject/meson.build ++++ b/docs/reference/gobject/meson.build +@@ -17,12 +17,23 @@ 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 ++ doc_source_dir = meson.current_source_dir() ++ top_build_dir = meson.build_root() ++ top_source_dir = meson.source_root() ++ glib_top_build_dir = join_paths(top_build_dir, 'glib') ++ glib_top_source_dir = join_paths(top_source_dir, 'glib') ++ ++ scan_dep = declare_dependency(include_directories : [ doc_source_dir, top_source_dir, glib_top_build_dir, glib_top_source_dir ]) ++ + gnome.gtkdoc('gobject', + main_xml : 'gobject-docs.xml', + namespace : 'g', + gobject_typesfile : join_paths(meson.current_source_dir(), 'gobject.types'), + mode : 'none', +- dependencies : [libgobject_dep, libglib_dep], ++ dependencies : [libgobject_dep, libglib_dep, scan_dep], + src_dir : 'gobject', + scan_args : [ + '--deprecated-guards=G_DISABLE_DEPRECATED', +-- +2.14.1 + Copied: glib/trunk/PKGBUILD (from rev 305008, glib2/trunk/PKGBUILD) =================================================================== --- trunk/PKGBUILD (rev 0) +++ trunk/PKGBUILD 2017-09-07 20:37:10 UTC (rev 305009) @@ -0,0 +1,79 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgbase=glib +pkgname=(glib glib-docs) +pkgver=2.53.7 +pkgrel=1 +pkgdesc="Low level core library" +url="https://wiki.gnome.org/Projects/GLib" +license=(LGPL2.1) +arch=(i686 x86_64) +depends=(pcre libffi libutil-linux) +makedepends=(gettext gtk-doc zlib shared-mime-info python libelf git util-linux meson) +checkdepends=(desktop-file-utils dbus) +optdepends=('python: for gdbus-codegen and gtester-report' + 'libelf: gresource inspection tool') +provides=("glib2=$pkgver") +conflicts=(glib2) +replaces=(glib2) +options=(!emptydirs) +_commit=052f134528ae5bf828f39684efe2ff4d4e0cf24c # tags/2.53.7^0 +source=("git+https://git.gnome.org/browse/glib#commit=$_commit" + 0001-docs-Fix-building-with-meson.patch + noisy-glib-compile-schemas.diff + glib-compile-schemas.hook gio-querymodules.hook) +sha256sums=('SKIP' + '8b289f3e1a5a3b29d310d45610468199acfe6f2b38a0d1be38c9224437a0e40c' + '81a4df0b638730cffb7fa263c04841f7ca6b9c9578ee5045db6f30ff0c3fc531' + 'e1123a5d85d2445faac33f6dae1085fdd620d83279a4e130a83fe38db52b62b3' + '5ba204a2686304b1454d401a39a9d27d09dd25e4529664e3fd565be3d439f8b6') + +pkgver() { + cd glib + git describe --tags | sed 's/-/+/g' +} + +prepare() { + mkdir -p build glib-docs/usr/share + cd glib + + # https://bugzilla.gnome.org/show_bug.cgi?id=786796 + patch -Np1 -i ../0001-docs-Fix-building-with-meson.patch + + # Suppress noise from glib-compile-schemas.hook + patch -Np1 -i ../noisy-glib-compile-schemas.diff +} + +build() { + cd build + meson setup --prefix=/usr --buildtype=release ../glib + ninja +} + +check() { + cd build + meson test +} + +package_glib() { + cd build + DESTDIR="$pkgdir" ninja install + mv "$pkgdir/usr/share/gtk-doc" "$srcdir/glib-docs/usr/share" + + # install hooks + install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 ../*.hook +} + +package_glib-docs() { + pkgdesc="Documentation for glib" + depends=() + optdepends=() + provides=("glib2-docs=$pkgver") + conflicts=(glib2-docs) + replaces=(glib2-docs) + license+=(custom) + + mv glib-docs/* "$pkgdir" + install -Dt "$pkgdir/usr/share/licenses/glib-docs" -m644 glib/docs/reference/COPYING +} Copied: glib/trunk/gio-querymodules.hook (from rev 305008, glib2/trunk/gio-querymodules.hook) =================================================================== --- trunk/gio-querymodules.hook (rev 0) +++ trunk/gio-querymodules.hook 2017-09-07 20:37:10 UTC (rev 305009) @@ -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 Copied: glib/trunk/glib-compile-schemas.hook (from rev 305008, glib2/trunk/glib-compile-schemas.hook) =================================================================== --- trunk/glib-compile-schemas.hook (rev 0) +++ trunk/glib-compile-schemas.hook 2017-09-07 20:37:10 UTC (rev 305009) @@ -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 Copied: glib/trunk/noisy-glib-compile-schemas.diff (from rev 305008, glib2/trunk/noisy-glib-compile-schemas.diff) =================================================================== --- trunk/noisy-glib-compile-schemas.diff (rev 0) +++ trunk/noisy-glib-compile-schemas.diff 2017-09-07 20:37:10 UTC (rev 305009) @@ -0,0 +1,24 @@ +diff --git i/gio/glib-compile-schemas.c w/gio/glib-compile-schemas.c +index b8de0907248f6860..130f89b1728f7932 100644 +--- i/gio/glib-compile-schemas.c ++++ w/gio/glib-compile-schemas.c +@@ -1219,19 +1219,6 @@ 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/"))) +- { +- gchar *message = NULL; +- message = g_strdup_printf (_("Warning: Schema “%s” has path “%s”. " +- "Paths starting with " +- "“/apps/”, “/desktop/” or “/system/” are deprecated."), +- id, path); +- g_printerr ("%s\n", message); +- g_free (message); +- } +- + state->schema_state = schema_state_new (path, gettext_domain, + extends, extends_name, list_of); + Deleted: 2/trunk/0001-docs-Fix-building-with-meson.patch =================================================================== --- 2/trunk/0001-docs-Fix-building-with-meson.patch 2017-09-07 20:34:44 UTC (rev 305008) +++ 2/trunk/0001-docs-Fix-building-with-meson.patch 2017-09-07 20:37:10 UTC (rev 305009) @@ -1,85 +0,0 @@ -From a7cbd565aad04f92cbd9ac36696a9d033ae6bcc0 Mon Sep 17 00:00:00 2001 -From: Armin K <kre...@email.com> -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() -+ glib_top_build_dir = join_paths(top_build_dir, 'glib') -+ glib_top_source_dir = join_paths(top_source_dir, 'glib') -+ -+ scan_dep = declare_dependency(include_directories : [ top_source_dir, glib_top_build_dir, glib_top_source_dir ]) -+ - gnome.gtkdoc('gio', - main_xml : 'gio-docs.xml', - namespace : 'g', - gobject_typesfile : 'gio.types', - mode : 'none', -- dependencies : [libgio_dep, libgobject_dep, libglib_dep], -+ dependencies : [libgio_dep, libgobject_dep, libglib_dep, scan_dep], - src_dir : 'gio', - scan_args : [ - '--rebuild-types', -diff --git a/docs/reference/gobject/meson.build b/docs/reference/gobject/meson.build -index 1025e174f..9ec1f9123 100644 ---- a/docs/reference/gobject/meson.build -+++ b/docs/reference/gobject/meson.build -@@ -17,12 +17,23 @@ 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 -+ doc_source_dir = meson.current_source_dir() -+ top_build_dir = meson.build_root() -+ top_source_dir = meson.source_root() -+ glib_top_build_dir = join_paths(top_build_dir, 'glib') -+ glib_top_source_dir = join_paths(top_source_dir, 'glib') -+ -+ scan_dep = declare_dependency(include_directories : [ doc_source_dir, top_source_dir, glib_top_build_dir, glib_top_source_dir ]) -+ - gnome.gtkdoc('gobject', - main_xml : 'gobject-docs.xml', - namespace : 'g', - gobject_typesfile : join_paths(meson.current_source_dir(), 'gobject.types'), - mode : 'none', -- dependencies : [libgobject_dep, libglib_dep], -+ dependencies : [libgobject_dep, libglib_dep, scan_dep], - src_dir : 'gobject', - scan_args : [ - '--deprecated-guards=G_DISABLE_DEPRECATED', --- -2.14.1 - Modified: 2/trunk/PKGBUILD =================================================================== --- 2/trunk/PKGBUILD 2017-09-07 20:34:44 UTC (rev 305008) +++ 2/trunk/PKGBUILD 2017-09-07 20:37:10 UTC (rev 305009) @@ -1,33 +1,24 @@ # $Id$ # Maintainer: Jan de Groot <j...@archlinux.org> -pkgbase=glib -pkgname=(glib glib-docs) -pkgver=2.53.7 +pkgbase=glib2 +pkgname=(glib2 glib2-docs) +pkgver=2.52.3 pkgrel=1 pkgdesc="Low level core library" -url="https://wiki.gnome.org/Projects/GLib" -license=(LGPL2.1) +url="http://www.gtk.org/" arch=(i686 x86_64) -depends=(pcre libffi libutil-linux) -makedepends=(gettext gtk-doc zlib shared-mime-info python libelf git util-linux meson) +makedepends=(gettext gtk-doc libffi pcre zlib shared-mime-info python libelf git util-linux) checkdepends=(desktop-file-utils dbus) -optdepends=('python: for gdbus-codegen and gtester-report' - 'libelf: gresource inspection tool') -provides=("glib2=$pkgver") -conflicts=(glib2) -replaces=(glib2) -options=(!emptydirs) -_commit=052f134528ae5bf828f39684efe2ff4d4e0cf24c # tags/2.53.7^0 +_commit=90bb8778f2eabf00bee5bff1259c48f1e7b791b8 # tags/2.52.3^0 source=("git+https://git.gnome.org/browse/glib#commit=$_commit" - 0001-docs-Fix-building-with-meson.patch - noisy-glib-compile-schemas.diff - glib-compile-schemas.hook gio-querymodules.hook) + glib-compile-schemas.hook + gio-querymodules.hook + skip-broken-timer-test.patch) sha256sums=('SKIP' - '8b289f3e1a5a3b29d310d45610468199acfe6f2b38a0d1be38c9224437a0e40c' - '81a4df0b638730cffb7fa263c04841f7ca6b9c9578ee5045db6f30ff0c3fc531' 'e1123a5d85d2445faac33f6dae1085fdd620d83279a4e130a83fe38db52b62b3' - '5ba204a2686304b1454d401a39a9d27d09dd25e4529664e3fd565be3d439f8b6') + '5ba204a2686304b1454d401a39a9d27d09dd25e4529664e3fd565be3d439f8b6' + 'a39dc8c1c1707053d565d5b198b1f03f7c55b31e11335a1bfdc3f9803b114d5d') pkgver() { cd glib @@ -35,45 +26,60 @@ } prepare() { - mkdir -p build glib-docs/usr/share cd glib + git revert -n 6560b37450cd # Noisy glib-compile-schemas - # https://bugzilla.gnome.org/show_bug.cgi?id=786796 - patch -Np1 -i ../0001-docs-Fix-building-with-meson.patch + # Rounding error in timer tests? + # GLib:ERROR:timer.c:38:test_timer_basic: assertion failed (micros == ((guint64)(elapsed * 1e6)) % 1000000): (1 == 0) + [[ $CARCH == i686 ]] && patch -Np1 -i ../skip-broken-timer-test.patch - # Suppress noise from glib-compile-schemas.hook - patch -Np1 -i ../noisy-glib-compile-schemas.diff + NOCONFIGURE=1 ./autogen.sh } build() { - cd build - meson setup --prefix=/usr --buildtype=release ../glib - ninja + cd glib + ./configure --prefix=/usr --libdir=/usr/lib \ + --sysconfdir=/etc \ + --with-pcre=system \ + --disable-fam \ + --enable-gtk-doc \ + $(check_option debug y && echo --enable-debug=yes) + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } check() { - cd build - meson test + cd glib + make check } -package_glib() { - cd build - DESTDIR="$pkgdir" ninja install - mv "$pkgdir/usr/share/gtk-doc" "$srcdir/glib-docs/usr/share" +package_glib2() { + depends=(pcre libffi libutil-linux) + optdepends=('python: for gdbus-codegen and gtester-report' + 'libelf: gresource inspection tool') + options=(!emptydirs) + license=(LGPL) + cd glib + make DESTDIR="$pkgdir" install + rm -r "$pkgdir/usr/share/gtk-doc" + # install hooks - install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 ../*.hook + install -d "$pkgdir/usr/share/libalpm/hooks/" + install -m644 "$srcdir"/{glib-compile-schemas,gio-querymodules}.hook \ + "$pkgdir/usr/share/libalpm/hooks/" } -package_glib-docs() { - pkgdesc="Documentation for glib" - depends=() - optdepends=() - provides=("glib2-docs=$pkgver") - conflicts=(glib2-docs) - replaces=(glib2-docs) - license+=(custom) +package_glib2-docs() { + pkgdesc="Documentation for glib2" + conflicts=(gobject2-docs) + replaces=(gobject2-docs) + license=(custom) + options=(!emptydirs) - mv glib-docs/* "$pkgdir" - install -Dt "$pkgdir/usr/share/licenses/glib-docs" -m644 glib/docs/reference/COPYING + cd glib/docs + make DESTDIR="$pkgdir" install + rm -r "$pkgdir/usr/share/man" + + install -Dm644 reference/COPYING "$pkgdir/usr/share/licenses/glib2-docs/COPYING" } Deleted: 2/trunk/noisy-glib-compile-schemas.diff =================================================================== --- 2/trunk/noisy-glib-compile-schemas.diff 2017-09-07 20:34:44 UTC (rev 305008) +++ 2/trunk/noisy-glib-compile-schemas.diff 2017-09-07 20:37:10 UTC (rev 305009) @@ -1,24 +0,0 @@ -diff --git i/gio/glib-compile-schemas.c w/gio/glib-compile-schemas.c -index b8de0907248f6860..130f89b1728f7932 100644 ---- i/gio/glib-compile-schemas.c -+++ w/gio/glib-compile-schemas.c -@@ -1219,19 +1219,6 @@ 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/"))) -- { -- gchar *message = NULL; -- message = g_strdup_printf (_("Warning: Schema “%s” has path “%s”. " -- "Paths starting with " -- "“/apps/”, “/desktop/” or “/system/” are deprecated."), -- id, path); -- g_printerr ("%s\n", message); -- g_free (message); -- } -- - state->schema_state = schema_state_new (path, gettext_domain, - extends, extends_name, list_of); - Copied: glib2/trunk/skip-broken-timer-test.patch (from rev 305006, glib2/trunk/skip-broken-timer-test.patch) =================================================================== --- 2/trunk/skip-broken-timer-test.patch (rev 0) +++ 2/trunk/skip-broken-timer-test.patch 2017-09-07 20:37:10 UTC (rev 305009) @@ -0,0 +1,12 @@ +diff --git i/glib/tests/Makefile.am w/glib/tests/Makefile.am +index 43b11f05da63fa02..37406ecdf17e0094 100644 +--- i/glib/tests/Makefile.am ++++ w/glib/tests/Makefile.am +@@ -106,7 +106,6 @@ test_programs = \ + test-printf \ + thread \ + timeout \ +- timer \ + tree \ + utf8-performance \ + utf8-pointer \