mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-07 16:59:22 +00:00
Code Issues Projects Releases Wiki Activity

glib-2.0: Upgrade 2.50.3 -> 2.52.2

Browse Source 
Remove upstreamed patches (thanks Ross).

(From OE-Core rev: 2fffd85e0799deab09e32af65c524498b140749d)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jussi Kukkonen
2017-05-31 14:23:10 +03:00
committed by Richard Purdie
parent 4f8d1e737a
commit 6831ee0465
4 changed files with 4 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-core/glib-2.0/glib-2.0/fix-conflicting-rand.patch
-35
View File
@@ -1,35 +0,0 @@
Rename 'rand' variable to avoid conflict.
Upstream-Status: pending
Signed-off-by: Björn Stenberg <bjst@enea.com>
diff -u glib-2.34.3/tests/refcount/signals.c~ glib-2.34.3/tests/refcount/signals.c
--- glib-2.34.3/tests/refcount/signals.c 2012-11-26 17:52:48.000000000 +0100
+++ glib-2.34.3/tests/refcount/signals.c 2013-02-08 14:24:10.052477546 +0100
@@ -9,7 +9,7 @@
#define MY_IS_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_TYPE ((tclass), G_TYPE_TEST))
#define MY_TEST_GET_CLASS(test) (G_TYPE_INSTANCE_GET_CLASS ((test), G_TYPE_TEST, GTestClass))
-static GRand *rand;
+static GRand *grand;
typedef struct _GTest GTest;
typedef struct _GTestClass GTestClass;
@@ -84,7 +84,7 @@
NULL
};
- rand = g_rand_new();
+ grand = g_rand_new();
test_type = g_type_register_static (G_TYPE_OBJECT, "GTest",
&test_info, 0);
@@ -218,7 +218,7 @@
static void
my_test_do_prop (GTest * test)
{
- test->value = g_rand_int (rand);
+ test->value = g_rand_int (grand);
g_object_notify (G_OBJECT (test), "test-prop");
}
meta/recipes-core/glib-2.0/glib-2.0/glib-gettextize-dir.patch
-24
View File
@@ -1,24 +0,0 @@
# an very old patch cherry-picked in every glib-2.0 patch directory. The earliest container
# for it is 2.6.5 in OE. The earliest commit for it is c8e5702127e507e82e6f68a4b8c546803accea9d
# in OE side which ports from previous bitkeeper SCM. In OE side it's only used til 2.12.4.
#
# keep it since it's always cleaner to not hardcode destination path. Use @datadir@ is more
# portable here. mark for upstream
#
# by Kevin Tian <kevin.tian@intel.com>, 06/25/2010
# Rebased by Dongxiao Xu <dongxiao.xu@intel.com>, 11/16/2010
Upstream-Status: Inappropriate [configuration]
diff -ruN glib-2.27.3-orig/glib-gettextize.in glib-2.27.3/glib-gettextize.in
--- glib-2.27.3-orig/glib-gettextize.in 2009-04-01 07:04:20.000000000 +0800
+++ glib-2.27.3/glib-gettextize.in 2010-11-16 12:55:06.874605916 +0800
@@ -52,7 +52,7 @@
datadir=@datadir@
datarootdir=@datarootdir@
-gettext_dir=$prefix/share/glib-2.0/gettext
+gettext_dir=@datadir@/glib-2.0/gettext
while test $# -gt 0; do
case "$1" in
meta/recipes-core/glib-2.0/glib-2.0_2.50.3.bb → meta/recipes-core/glib-2.0/glib-2.0_2.52.2.bb
+3 -5
View File
@@ -6,7 +6,6 @@ SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}"
SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
file://configure-libtool.patch \
file://fix-conflicting-rand.patch \
file://run-ptest \
file://ptest-paths.patch \
file://uclibc_musl_translation.patch \
@@ -18,8 +17,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
file://0001-Test-for-pthread_getname_np-before-using-it.patch \
"
SRC_URI_append_class-native = " file://glib-gettextize-dir.patch \
file://relocate-modules.patch"
SRC_URI_append_class-native = " file://relocate-modules.patch"
SRC_URI[md5sum] = "381ab22934f296750d036aa55a397ded"
SRC_URI[sha256sum] = "82ee94bf4c01459b6b00cb9db0545c2237921e3060c0b74cff13fbc020cfd999"
SRC_URI[md5sum] = "ec099bce26ce6a85104ed1d89bb45856"
SRC_URI[sha256sum] = "f00e5d9e2a2948b1da25fcba734a6b7a40f556de8bc9f528a53f6569969ac5d0"
meta/recipes-core/glib-2.0/glib.inc
+1
View File
@@ -65,6 +65,7 @@ FILES_${PN}-dev += "${libdir}/glib-2.0/include \
${bindir}/glib-compile-resources \
${datadir}/glib-2.0/gettext/po/Makefile.in.in \
${datadir}/glib-2.0/schemas/gschema.dtd \
${datadir}/glib-2.0/valgrind/glib.supp \
${datadir}/gettext/its"
FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb"
FILES_${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py \