glib: update to 2.36.4.
This commit is contained in:
parent
e04cd0cf71
commit
078ebe75de
3 changed files with 37 additions and 2 deletions
33
srcpkgs/glib/patches/revert-warn-glib-compile-schemas.patch
Normal file
33
srcpkgs/glib/patches/revert-warn-glib-compile-schemas.patch
Normal file
|
@ -0,0 +1,33 @@
|
|||
From 6560b37450cd19c4a7c7b690e279fe97b7bfdcaa Mon Sep 17 00:00:00 2001
|
||||
From: Ryan Lortie <desrt@desrt.ca>
|
||||
Date: Thu, 12 Apr 2012 23:55:34 +0000
|
||||
Subject: glib-compile-schemas: warn about bad dconf paths
|
||||
|
||||
For quite some time the recommended usage of GSettings and dconf has
|
||||
been to use paths like /org/gnome/example/. Use of /apps/ has spilled
|
||||
over from GConf and is continuing to make its way into a number of
|
||||
applications as they port.
|
||||
|
||||
glib-compile-schemas will now warn about these types of paths being
|
||||
used. This generates a lot of noise, but hopefully it will reduce the
|
||||
number of ported applications making this mistake.
|
||||
---
|
||||
diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
|
||||
index cf02389..27d0181 100644
|
||||
--- a/gio/glib-compile-schemas.c
|
||||
+++ b/gio/glib-compile-schemas.c
|
||||
@@ -1204,6 +1204,12 @@ 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/")))
|
||||
+ g_printerr ("warning: Schema '%s' has path '%s'. Paths starting with "
|
||||
+ "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path);
|
||||
+
|
||||
state->schema_state = schema_state_new (path, gettext_domain,
|
||||
extends, extends_name, list_of);
|
||||
|
||||
--
|
||||
cgit v0.9.0.2
|
|
@ -0,0 +1 @@
|
|||
-Rp1
|
|
@ -1,6 +1,6 @@
|
|||
# Template build file for 'glib'
|
||||
pkgname=glib
|
||||
version=2.36.3
|
||||
version=2.36.4
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-fam --with-pcre=system --enable-static"
|
||||
|
@ -11,7 +11,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
|
|||
homepage="http://www.gtk.org/"
|
||||
license="LGPL-2.1"
|
||||
distfiles="${GNOME_SITE}/glib/2.36/glib-$version.tar.xz"
|
||||
checksum=5ec433bf6ce02e4c436619c3d0b9cecdd1898469398a636bad27c1f5804c761e
|
||||
checksum=f654d2542329012d8475736a165dfbf82fadf3ee940c2e0e6ddd4b2fde5cad7e
|
||||
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
configure_args+=" glib_cv_long_long_format=I64
|
||||
|
@ -37,6 +37,7 @@ libglib-devel_package() {
|
|||
vmove usr/lib/glib-2.0
|
||||
vmove usr/lib/pkgconfig
|
||||
vmove "usr/lib/*.a"
|
||||
vmove "usr/lib/*.so"
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue