[arch-commits] Commit in glib2/trunk (6 files)
Jan Steffens
heftig at archlinux.org
Tue Jan 9 03:23:16 UTC 2018
Date: Tuesday, January 9, 2018 @ 03:23:15
Author: heftig
Revision: 314282
2.54.3-1
Modified:
glib2/trunk/PKGBUILD
Deleted:
glib2/trunk/0001-docs-Fix-building-with-meson.patch
glib2/trunk/0001-meson-Fix-GDB-scripts-install_dir-for-nix.patch
glib2/trunk/0001-meson-Fix-libmount-support.patch
glib2/trunk/0001-meson-Fix-permissions-of-installed-scripts.patch
glib2/trunk/libs.diff
-------------------------------------------------------+
0001-docs-Fix-building-with-meson.patch | 85 ------------
0001-meson-Fix-GDB-scripts-install_dir-for-nix.patch | 50 -------
0001-meson-Fix-libmount-support.patch | 41 -----
0001-meson-Fix-permissions-of-installed-scripts.patch | 50 -------
PKGBUILD | 65 +++------
libs.diff | 110 ----------------
6 files changed, 25 insertions(+), 376 deletions(-)
Deleted: 0001-docs-Fix-building-with-meson.patch
===================================================================
--- 0001-docs-Fix-building-with-meson.patch 2018-01-09 03:14:10 UTC (rev 314281)
+++ 0001-docs-Fix-building-with-meson.patch 2018-01-09 03:23:15 UTC (rev 314282)
@@ -1,85 +0,0 @@
-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
-
Deleted: 0001-meson-Fix-GDB-scripts-install_dir-for-nix.patch
===================================================================
--- 0001-meson-Fix-GDB-scripts-install_dir-for-nix.patch 2018-01-09 03:14:10 UTC (rev 314281)
+++ 0001-meson-Fix-GDB-scripts-install_dir-for-nix.patch 2018-01-09 03:23:15 UTC (rev 314282)
@@ -1,50 +0,0 @@
-From b454a60bf154332bd5961880700b7d08aec98995 Mon Sep 17 00:00:00 2001
-Message-Id: <b454a60bf154332bd5961880700b7d08aec98995.1508856243.git.jan.steffens at gmail.com>
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-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. at 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. at 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
-
Deleted: 0001-meson-Fix-libmount-support.patch
===================================================================
--- 0001-meson-Fix-libmount-support.patch 2018-01-09 03:14:10 UTC (rev 314281)
+++ 0001-meson-Fix-libmount-support.patch 2018-01-09 03:23:15 UTC (rev 314282)
@@ -1,41 +0,0 @@
-From c93756c8f066a1e35fa2f46b231771d78e292600 Mon Sep 17 00:00:00 2001
-Message-Id: <c93756c8f066a1e35fa2f46b231771d78e292600.1509419562.git.jan.steffens at gmail.com>
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Tue, 31 Oct 2017 04:11:42 +0100
-Subject: [PATCH] meson: Fix libmount support
-
-The define was still missing.
----
- config.h.meson | 3 +++
- meson.build | 1 +
- 2 files changed, 4 insertions(+)
-
-diff --git a/config.h.meson b/config.h.meson
-index c67e1792f4af1ada..3f310b3c960fcb29 100644
---- a/config.h.meson
-+++ b/config.h.meson
-@@ -247,6 +247,9 @@
- /* Define if libelf is available */
- #mesondefine HAVE_LIBELF
-
-+/* Define if libmount is available */
-+#mesondefine HAVE_LIBMOUNT
-+
- /* Define to 1 if you have the <linux/magic.h> header file. */
- #mesondefine HAVE_LINUX_MAGIC_H
-
-diff --git a/meson.build b/meson.build
-index 208c23087627de1e..cd9cbf2ce10595c2 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1535,6 +1535,7 @@ if use_system_pcre
- endif
- if libmount_dep.length() == 1 and libmount_dep[0].found()
- glib_conf.set('LIBMOUNT_LIBS', '-lmount')
-+ glib_conf.set('HAVE_LIBMOUNT', 1)
- endif
- glib_conf.set('GIO_MODULE_DIR', '${libdir}/gio/modules')
- # FIXME: Missing:
---
-2.15.0
-
Deleted: 0001-meson-Fix-permissions-of-installed-scripts.patch
===================================================================
--- 0001-meson-Fix-permissions-of-installed-scripts.patch 2018-01-09 03:14:10 UTC (rev 314281)
+++ 0001-meson-Fix-permissions-of-installed-scripts.patch 2018-01-09 03:23:15 UTC (rev 314282)
@@ -1,50 +0,0 @@
-From e36f79439be76f125b67081eb4605b377d738cca Mon Sep 17 00:00:00 2001
-Message-Id: <e36f79439be76f125b67081eb4605b377d738cca.1505389490.git.jan.steffens at gmail.com>
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Thu, 14 Sep 2017 07:36:37 +0200
-Subject: [PATCH] meson: Fix permissions of installed scripts
-
-configure_file preserves the attributes, so the templates need to be
-executable for the (installed) outputs to be executable.
----
- gio/gdbus-2.0/codegen/gdbus-codegen.in | 0
- gio/gdbus-2.0/codegen/meson.build | 1 -
- glib-gettextize.in | 0
- gobject/meson.build | 1 -
- 4 files changed, 2 deletions(-)
- mode change 100644 => 100755 gio/gdbus-2.0/codegen/gdbus-codegen.in
- mode change 100644 => 100755 glib-gettextize.in
-
-diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
-old mode 100644
-new mode 100755
-diff --git a/gio/gdbus-2.0/codegen/meson.build b/gio/gdbus-2.0/codegen/meson.build
-index 0e9ffbdfade70779..93d9106adba17a89 100644
---- a/gio/gdbus-2.0/codegen/meson.build
-+++ b/gio/gdbus-2.0/codegen/meson.build
-@@ -13,7 +13,6 @@ gdbus_codegen_conf.set('VERSION', glib_version)
- gdbus_codegen_conf.set('PYTHON', python.path())
-
- # Install gdbus-codegen executable
--# FIXME: Set permissions
- gdbus_codegen = configure_file(input : 'gdbus-codegen.in',
- output : 'gdbus-codegen',
- install : true,
-diff --git a/glib-gettextize.in b/glib-gettextize.in
-old mode 100644
-new mode 100755
-diff --git a/gobject/meson.build b/gobject/meson.build
-index 0d39f2bbc36f816e..01f37a33a623f4b8 100644
---- a/gobject/meson.build
-+++ b/gobject/meson.build
-@@ -76,7 +76,6 @@ python_tools_conf.set('VERSION', glib_version)
- python_tools_conf.set('PYTHON', python.path())
-
- foreach tool: python_tools
-- # FIXME: Ensure we set the appropriate permissions
- tool_bin = configure_file(
- input : tool + '.in',
- output : tool,
---
-2.14.1
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-01-09 03:14:10 UTC (rev 314281)
+++ PKGBUILD 2018-01-09 03:23:15 UTC (rev 314282)
@@ -3,33 +3,23 @@
pkgbase=glib2
pkgname=(glib2 glib2-docs)
-pkgver=2.54.2
-pkgrel=2
+pkgver=2.54.3
+pkgrel=1
pkgdesc="Low level core library"
url="https://wiki.gnome.org/Projects/GLib"
license=(LGPL2.1)
arch=(x86_64)
depends=(pcre libffi libutil-linux zlib)
-makedepends=(gettext gtk-doc shared-mime-info python libelf git util-linux meson dbus)
+makedepends=(gettext gtk-doc shared-mime-info python libelf git util-linux dbus)
checkdepends=(desktop-file-utils)
optdepends=('python: for gdbus-codegen and gtester-report'
'libelf: gresource inspection tool')
options=(!emptydirs)
-_commit=52b3e434d849e2b0233d6d3d663b5dda82ab263e # tags/2.54.2^0
+_commit=5a650925899c7aae62e9ff79e405e72a6adc981c # tags/2.54.3^0
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
- 0001-meson-Fix-libmount-support.patch
- libs.diff
noisy-glib-compile-schemas.diff
glib-compile-schemas.hook gio-querymodules.hook)
sha256sums=('SKIP'
- '8b289f3e1a5a3b29d310d45610468199acfe6f2b38a0d1be38c9224437a0e40c'
- '12b1a2f4e304e4c03e48ae9564d73ae38619bbb7711a013138939ff8e5cc2327'
- 'f53d5acfda4b7141a4813f1e49610e9176dc5bdf8e867d88290e34d91a40ebcb'
- '14c0dcfb4efb690f7cb44673faf31f5eb40ac68c01974eddb53d5aa7ae366629'
- '2fb828f51727bd9c8b48cfd9d6833c8b4ff82803331f6e2340b0ec8edfe57c52'
'81a4df0b638730cffb7fa263c04841f7ca6b9c9578ee5045db6f30ff0c3fc531'
'e1123a5d85d2445faac33f6dae1085fdd620d83279a4e130a83fe38db52b62b3'
'5ba204a2686304b1454d401a39a9d27d09dd25e4529664e3fd565be3d439f8b6')
@@ -40,45 +30,38 @@
}
prepare() {
- mkdir -p build glib2-docs/usr/share
cd glib
- # https://bugzilla.gnome.org/show_bug.cgi?id=786796
- patch -Np1 -i ../0001-docs-Fix-building-with-meson.patch
-
- # 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
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=789681
- patch -Np1 -i ../0001-meson-Fix-libmount-support.patch
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=788773
- patch -Np1 -i ../libs.diff
-
# Suppress noise from glib-compile-schemas.hook
patch -Np1 -i ../noisy-glib-compile-schemas.diff
+
+ NOCONFIGURE=1 ./autogen.sh
}
build() {
- cd build
- arch-meson ../glib
- ninja
+ cd glib
+ ./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib \
+ --sysconfdir=/etc \
+ --with-pcre=system \
+ --enable-debug=yes \
+ --enable-gtk-doc \
+ --disable-fam
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make
}
check() {
- cd build
- meson test -t 2
+ cd glib
+ make check
}
package_glib2() {
- cd build
- DESTDIR="$pkgdir" ninja install
- mv "$pkgdir/usr/share/gtk-doc" "$srcdir/glib2-docs/usr/share"
+ cd glib
+ make DESTDIR="$pkgdir" install
+ mv "$pkgdir/usr/share/gtk-doc" "$srcdir"
- # install hooks
install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 ../*.hook
}
@@ -88,6 +71,8 @@
optdepends=()
license+=(custom)
- mv glib2-docs/* "$pkgdir"
+ mkdir -p "$pkgdir/usr/share"
+ mv gtk-doc "$pkgdir/usr/share"
+
install -Dt "$pkgdir/usr/share/licenses/glib2-docs" -m644 glib/docs/reference/COPYING
}
Deleted: libs.diff
===================================================================
--- libs.diff 2018-01-09 03:14:10 UTC (rev 314281)
+++ libs.diff 2018-01-09 03:23:15 UTC (rev 314282)
@@ -1,110 +0,0 @@
-diff --git i/gio/meson.build w/gio/meson.build
-index 4a10d49d7eb3229c..77537a77a26dcb5b 100644
---- i/gio/meson.build
-+++ w/gio/meson.build
-@@ -741,7 +741,7 @@ libgio = shared_library('gio-2.0',
- libgobject_dep, libgmodule_dep] + platform_deps + network_libs,
- c_args : gio_c_args,
- # intl.lib is not compatible with SAFESEH
-- link_args : noseh_link_args,
-+ link_args : noseh_link_args + library_link_args,
- )
-
- libgio_dep = declare_dependency(link_with : libgio,
-diff --git i/glib/meson.build w/glib/meson.build
-index f12a8b45bbbfec8f..2a505b3dd79ef163 100644
---- i/glib/meson.build
-+++ w/glib/meson.build
-@@ -227,7 +227,7 @@ libglib = shared_library('glib-2.0',
- soversion : soversion,
- install : true,
- # intl.lib is not compatible with SAFESEH
-- link_args : noseh_link_args,
-+ link_args : noseh_link_args + library_link_args,
- include_directories : configinc,
- link_with : [charset_lib, gnulib_lib],
- dependencies : [pcre, thread_dep, libintl, librt] + libiconv + platform_deps,
-diff --git i/gmodule/meson.build w/gmodule/meson.build
-index 191bca2446f9977e..fd0219d9225f2f3f 100644
---- i/gmodule/meson.build
-+++ w/gmodule/meson.build
-@@ -37,7 +37,7 @@ elif cc.has_function('NSLinkModule')
- elif cc.links(dlopen_dlsym_test_code, args : '-ldl', name : 'dlopen() and dlsym() in libdl')
- g_module_impl = 'G_MODULE_IMPL_DL'
- libdl_dep = cc.find_library('dl')
-- g_module_lib_args = '-ldl'
-+ g_module_lib_args = ['-ldl']
- endif
-
- # additional checks for G_MODULE_IMPL_DL
-@@ -72,25 +72,29 @@ if g_module_impl == ''
- message('WARNING: No suitable GModule implementation found!')
- endif
-
-+# For pc files
-+glib_conf.set('G_MODULE_SUPPORTED', g_module_impl == '0' ? 'false' : 'true')
-+glib_conf.set('G_MODULE_LIBS', ' '.join(g_module_lib_args))
-+
- gmoduleconf_conf.set('G_MODULE_IMPL', g_module_impl)
--gmoduleconf_conf.set('G_MODULE_SUPPORTED', g_module_impl != '0')
- gmoduleconf_conf.set('G_MODULE_HAVE_DLERROR', g_module_have_dlerror)
- gmoduleconf_conf.set('G_MODULE_NEED_USCORE', g_module_need_uscore)
- gmoduleconf_conf.set('G_MODULE_BROKEN_RTLD_GLOBAL', g_module_broken_rtld_global)
-
- gmoduleconf_h = configure_file(input : 'gmoduleconf.h.in',
- output : 'gmoduleconf.h',
- configuration : gmoduleconf_conf)
-
- install_headers(['gmodule.h'], subdir : 'glib-2.0')
-
- libgmodule = shared_library('gmodule-2.0',
- sources : ['gmodule.c'],
- version : library_version,
- soversion : soversion,
- install : true,
- include_directories : [configinc, gmoduleinc],
- dependencies : [libdl_dep, libglib_dep],
-+ link_args : library_link_args,
- c_args : ['-DG_LOG_DOMAIN="GModule"', '-DG_DISABLE_DEPRECATED'] + glib_hidden_visibility_args)
-
- libgmodule_dep = declare_dependency(link_with : libgmodule,
-diff --git i/gobject/meson.build w/gobject/meson.build
-index 65ffef0697b3bad4..32f6f91db12f29b6 100644
---- i/gobject/meson.build
-+++ w/gobject/meson.build
-@@ -61,6 +61,7 @@ libgobject = shared_library('gobject-2.0',
- install : true,
- include_directories : [configinc],
- dependencies : [libintl, libffi_dep, libglib_dep],
-+ link_args : library_link_args,
- c_args : ['-DG_LOG_DOMAIN="GLib-GObject"', '-DGOBJECT_COMPILATION'] + glib_hidden_visibility_args)
-
- libgobject_dep = declare_dependency(link_with : libgobject,
-diff --git i/gthread/meson.build w/gthread/meson.build
-index 8ccac3369894bda4..2d5913a91525460f 100644
---- i/gthread/meson.build
-+++ w/gthread/meson.build
-@@ -6,4 +6,5 @@ libgthread = shared_library('gthread-2.0',
- soversion : soversion,
- install : true,
- dependencies : [libglib_dep],
-+ link_args : library_link_args,
- c_args : ['-DG_LOG_DOMAIN="GThread"' ] + glib_hidden_visibility_args)
-diff --git i/meson.build w/meson.build
-index 208c23087627de1e..dd860592b26c9973 100644
---- i/meson.build
-+++ w/meson.build
-@@ -1541,6 +1541,13 @@ glib_conf.set('GIO_MODULE_DIR', '${libdir}/gio/modules')
- # @G_MODULE_LIBS@ @SELINUX_LIBS@ @COCOA_LIBS@ @CARBON_LIBS@ @G_LIBS_EXTRA@
- # @PCRE_REQUIRES@ @GLIB_EXTRA_CFLAGS@ @G_THREAD_CFLAGS@
-
-+# HACK
-+glib_conf.set('G_THREAD_LIBS', '-pthread')
-+glib_conf.set('G_THREAD_CFLAGS', '-pthread')
-+glib_conf.set('G_MODULE_LDFLAGS', '-Wl,--export-dynamic')
-+glib_conf.set('PCRE_REQUIRES', 'libpcre')
-+library_link_args = [ '-Wl,-z,nodelete' ]
-+
- # Tracing: dtrace
- want_dtrace = get_option('enable-dtrace')
- enable_dtrace = false
More information about the arch-commits
mailing list