[arch-commits] Commit in glib/repos (12 files)
Jan Steffens
heftig at archlinux.org
Thu Sep 7 20:40:00 UTC 2017
Date: Thursday, September 7, 2017 @ 20:39:58
Author: heftig
Revision: 305010
archrelease: copy trunk to gnome-unstable-i686, gnome-unstable-x86_64
Added:
glib/repos/gnome-unstable-i686/
glib/repos/gnome-unstable-i686/0001-docs-Fix-building-with-meson.patch
(from rev 305009, glib/trunk/0001-docs-Fix-building-with-meson.patch)
glib/repos/gnome-unstable-i686/PKGBUILD
(from rev 305009, glib/trunk/PKGBUILD)
glib/repos/gnome-unstable-i686/gio-querymodules.hook
(from rev 305009, glib/trunk/gio-querymodules.hook)
glib/repos/gnome-unstable-i686/glib-compile-schemas.hook
(from rev 305009, glib/trunk/glib-compile-schemas.hook)
glib/repos/gnome-unstable-i686/noisy-glib-compile-schemas.diff
(from rev 305009, glib/trunk/noisy-glib-compile-schemas.diff)
glib/repos/gnome-unstable-x86_64/
glib/repos/gnome-unstable-x86_64/0001-docs-Fix-building-with-meson.patch
(from rev 305009, glib/trunk/0001-docs-Fix-building-with-meson.patch)
glib/repos/gnome-unstable-x86_64/PKGBUILD
(from rev 305009, glib/trunk/PKGBUILD)
glib/repos/gnome-unstable-x86_64/gio-querymodules.hook
(from rev 305009, glib/trunk/gio-querymodules.hook)
glib/repos/gnome-unstable-x86_64/glib-compile-schemas.hook
(from rev 305009, glib/trunk/glib-compile-schemas.hook)
glib/repos/gnome-unstable-x86_64/noisy-glib-compile-schemas.diff
(from rev 305009, glib/trunk/noisy-glib-compile-schemas.diff)
---------------------------------------------------------------+
gnome-unstable-i686/0001-docs-Fix-building-with-meson.patch | 85 ++++++++++
gnome-unstable-i686/PKGBUILD | 79 +++++++++
gnome-unstable-i686/gio-querymodules.hook | 11 +
gnome-unstable-i686/glib-compile-schemas.hook | 12 +
gnome-unstable-i686/noisy-glib-compile-schemas.diff | 24 ++
gnome-unstable-x86_64/0001-docs-Fix-building-with-meson.patch | 85 ++++++++++
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/noisy-glib-compile-schemas.diff | 24 ++
10 files changed, 422 insertions(+)
Copied: glib/repos/gnome-unstable-i686/0001-docs-Fix-building-with-meson.patch (from rev 305009, glib/trunk/0001-docs-Fix-building-with-meson.patch)
===================================================================
--- gnome-unstable-i686/0001-docs-Fix-building-with-meson.patch (rev 0)
+++ gnome-unstable-i686/0001-docs-Fix-building-with-meson.patch 2017-09-07 20:39:58 UTC (rev 305010)
@@ -0,0 +1,85 @@
+From a7cbd565aad04f92cbd9ac36696a9d033ae6bcc0 Mon Sep 17 00:00:00 2001
+From: Armin K <krejzi at 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/repos/gnome-unstable-i686/PKGBUILD (from rev 305009, glib/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-i686/PKGBUILD (rev 0)
+++ gnome-unstable-i686/PKGBUILD 2017-09-07 20:39:58 UTC (rev 305010)
@@ -0,0 +1,79 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at 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/repos/gnome-unstable-i686/gio-querymodules.hook (from rev 305009, glib/trunk/gio-querymodules.hook)
===================================================================
--- gnome-unstable-i686/gio-querymodules.hook (rev 0)
+++ gnome-unstable-i686/gio-querymodules.hook 2017-09-07 20:39:58 UTC (rev 305010)
@@ -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/repos/gnome-unstable-i686/glib-compile-schemas.hook (from rev 305009, glib/trunk/glib-compile-schemas.hook)
===================================================================
--- gnome-unstable-i686/glib-compile-schemas.hook (rev 0)
+++ gnome-unstable-i686/glib-compile-schemas.hook 2017-09-07 20:39:58 UTC (rev 305010)
@@ -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/repos/gnome-unstable-i686/noisy-glib-compile-schemas.diff (from rev 305009, glib/trunk/noisy-glib-compile-schemas.diff)
===================================================================
--- gnome-unstable-i686/noisy-glib-compile-schemas.diff (rev 0)
+++ gnome-unstable-i686/noisy-glib-compile-schemas.diff 2017-09-07 20:39:58 UTC (rev 305010)
@@ -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);
+
Copied: glib/repos/gnome-unstable-x86_64/0001-docs-Fix-building-with-meson.patch (from rev 305009, glib/trunk/0001-docs-Fix-building-with-meson.patch)
===================================================================
--- gnome-unstable-x86_64/0001-docs-Fix-building-with-meson.patch (rev 0)
+++ gnome-unstable-x86_64/0001-docs-Fix-building-with-meson.patch 2017-09-07 20:39:58 UTC (rev 305010)
@@ -0,0 +1,85 @@
+From a7cbd565aad04f92cbd9ac36696a9d033ae6bcc0 Mon Sep 17 00:00:00 2001
+From: Armin K <krejzi at 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/repos/gnome-unstable-x86_64/PKGBUILD (from rev 305009, glib/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-x86_64/PKGBUILD (rev 0)
+++ gnome-unstable-x86_64/PKGBUILD 2017-09-07 20:39:58 UTC (rev 305010)
@@ -0,0 +1,79 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at 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/repos/gnome-unstable-x86_64/gio-querymodules.hook (from rev 305009, glib/trunk/gio-querymodules.hook)
===================================================================
--- gnome-unstable-x86_64/gio-querymodules.hook (rev 0)
+++ gnome-unstable-x86_64/gio-querymodules.hook 2017-09-07 20:39:58 UTC (rev 305010)
@@ -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/repos/gnome-unstable-x86_64/glib-compile-schemas.hook (from rev 305009, glib/trunk/glib-compile-schemas.hook)
===================================================================
--- gnome-unstable-x86_64/glib-compile-schemas.hook (rev 0)
+++ gnome-unstable-x86_64/glib-compile-schemas.hook 2017-09-07 20:39:58 UTC (rev 305010)
@@ -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/repos/gnome-unstable-x86_64/noisy-glib-compile-schemas.diff (from rev 305009, glib/trunk/noisy-glib-compile-schemas.diff)
===================================================================
--- gnome-unstable-x86_64/noisy-glib-compile-schemas.diff (rev 0)
+++ gnome-unstable-x86_64/noisy-glib-compile-schemas.diff 2017-09-07 20:39:58 UTC (rev 305010)
@@ -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);
+
More information about the arch-commits
mailing list