Patchwork glib-2.0 2.28.x: update to 2.28.8

login
register
mail settings
Submitter Koen Kooi
Date June 18, 2011, 6 p.m.
Message ID <1308420055-25820-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/6107/
State New, archived
Headers show

Comments

Koen Kooi - June 18, 2011, 6 p.m.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/recipes-core/glib-2.0/glib-2.0_2.28.6.bb |   18 ------------------
 meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb |   19 +++++++++++++++++++
 meta/recipes-core/glib-2.0/glib.inc           |    3 ++-
 3 files changed, 21 insertions(+), 19 deletions(-)
 delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.28.6.bb
 create mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb
Koen Kooi - June 19, 2011, 8:35 a.m.
Disregard this one, I have some backports from OE.dev that need to go in first

Op 18 jun 2011, om 20:00 heeft Koen Kooi het volgende geschreven:

> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
> meta/recipes-core/glib-2.0/glib-2.0_2.28.6.bb |   18 ------------------
> meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb |   19 +++++++++++++++++++
> meta/recipes-core/glib-2.0/glib.inc           |    3 ++-
> 3 files changed, 21 insertions(+), 19 deletions(-)
> delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.28.6.bb
> create mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb
> 
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.28.6.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.28.6.bb
> deleted file mode 100644
> index ca5f4c8..0000000
> --- a/meta/recipes-core/glib-2.0/glib-2.0_2.28.6.bb
> +++ /dev/null
> @@ -1,18 +0,0 @@
> -require glib.inc
> -
> -PE = "1"
> -PR = "r1"
> -
> -SRC_URI = "${GNOME_MIRROR}/glib/2.28/glib-${PV}.tar.bz2 \
> -           file://configure-libtool.patch \
> -           file://60_wait-longer-for-threads-to-die.patch \
> -           file://g_once_init_enter.patch \
> -          "
> -# Only apply this patch for target recipe on uclibc
> -SRC_URI_append_libc-uclibc = " ${@['', 'file://no-iconv.patch']['${PN}' == '${BPN}']}"
> -
> -SRC_URI[md5sum] = "7d8fc15ae70d5111c0cf2a79d50ef717"
> -SRC_URI[sha256sum] = "557fb7c39d21b9359fbac51fd6b0b883bc97a2561c0166eef993a4078312f578"
> -
> -SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch"
> -BBCLASSEXTEND = "native"
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb
> new file mode 100644
> index 0000000..dd34c78
> --- /dev/null
> +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb
> @@ -0,0 +1,19 @@
> +require glib.inc
> +
> +PE = "1"
> +
> +SRC_URI = "${GNOME_MIRROR}/glib/2.28/glib-${PV}.tar.bz2 \
> +           file://configure-libtool.patch \
> +           file://60_wait-longer-for-threads-to-die.patch \
> +           file://g_once_init_enter.patch \
> +          "
> +# Only apply this patch for target recipe on uclibc
> +SRC_URI_append_libc-uclibc = " ${@['', 'file://no-iconv.patch']['${PN}' == '${BPN}']}"
> +
> +SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch"
> +
> +SRC_URI[md5sum] = "789e7520f71c6a4bf08bc683ec764d24"
> +SRC_URI[sha256sum] = "222f3055d6c413417b50901008c654865e5a311c73f0ae918b0a9978d1f9466f"
> +
> +BBCLASSEXTEND = "native"
> +
> diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
> index 0488490..0800c85 100644
> --- a/meta/recipes-core/glib-2.0/glib.inc
> +++ b/meta/recipes-core/glib-2.0/glib.inc
> @@ -31,7 +31,8 @@ EXTRA_OECONF = "--disable-debug --enable-included-printf=no"
> EXTRA_OECONF_virtclass-native = ""
> EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no"
> 
> -FILES_${PN} = "${libdir}/lib*${SOLIBS}"
> +FILES_${PN} = "${libdir}/lib*${SOLIBS} ${sysconfdir}/bash_completion.d ${datadir}/glib-2.0/schemas"
> FILES_${PN}-dev += "${libdir}/glib-2.0/include"
> +FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb"
> 
> ARM_INSTRUCTION_SET = "arm"
> -- 
> 1.6.6.1
>

Patch

diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.28.6.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.28.6.bb
deleted file mode 100644
index ca5f4c8..0000000
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.28.6.bb
+++ /dev/null
@@ -1,18 +0,0 @@ 
-require glib.inc
-
-PE = "1"
-PR = "r1"
-
-SRC_URI = "${GNOME_MIRROR}/glib/2.28/glib-${PV}.tar.bz2 \
-           file://configure-libtool.patch \
-           file://60_wait-longer-for-threads-to-die.patch \
-           file://g_once_init_enter.patch \
-          "
-# Only apply this patch for target recipe on uclibc
-SRC_URI_append_libc-uclibc = " ${@['', 'file://no-iconv.patch']['${PN}' == '${BPN}']}"
-
-SRC_URI[md5sum] = "7d8fc15ae70d5111c0cf2a79d50ef717"
-SRC_URI[sha256sum] = "557fb7c39d21b9359fbac51fd6b0b883bc97a2561c0166eef993a4078312f578"
-
-SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch"
-BBCLASSEXTEND = "native"
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb
new file mode 100644
index 0000000..dd34c78
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb
@@ -0,0 +1,19 @@ 
+require glib.inc
+
+PE = "1"
+
+SRC_URI = "${GNOME_MIRROR}/glib/2.28/glib-${PV}.tar.bz2 \
+           file://configure-libtool.patch \
+           file://60_wait-longer-for-threads-to-die.patch \
+           file://g_once_init_enter.patch \
+          "
+# Only apply this patch for target recipe on uclibc
+SRC_URI_append_libc-uclibc = " ${@['', 'file://no-iconv.patch']['${PN}' == '${BPN}']}"
+
+SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch"
+
+SRC_URI[md5sum] = "789e7520f71c6a4bf08bc683ec764d24"
+SRC_URI[sha256sum] = "222f3055d6c413417b50901008c654865e5a311c73f0ae918b0a9978d1f9466f"
+
+BBCLASSEXTEND = "native"
+
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 0488490..0800c85 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -31,7 +31,8 @@  EXTRA_OECONF = "--disable-debug --enable-included-printf=no"
 EXTRA_OECONF_virtclass-native = ""
 EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no"
 
-FILES_${PN} = "${libdir}/lib*${SOLIBS}"
+FILES_${PN} = "${libdir}/lib*${SOLIBS} ${sysconfdir}/bash_completion.d ${datadir}/glib-2.0/schemas"
 FILES_${PN}-dev += "${libdir}/glib-2.0/include"
+FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb"
 
 ARM_INSTRUCTION_SET = "arm"