Skip to contentSkip to conversation

Package upgrades

PATCH New Valentin Popa 1 participant 5 messages May 8, 2014

lore
Share & tools
lore
#0 lore raw

cover Package upgrades

The following changes since commit 3189e74559b7e5c304d7b5f73192b0fa722d8d01:

attr: Fix uclibc builds (2014-05-08 13:11:51 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib vpopa/upgrades
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=vpopa/upgrades

Valentin Popa (4):
libpng12: upgrade to 1.2.51
libsoup: upgrade to 2.46.0
libtasn1: upgrade to 3.5
icu: upgrade to 53.1

 .../{libpng12_1.2.50.bb => libpng12_1.2.51.bb}     |  8 +-
 .../gnutls/{libtasn1_3.4.bb => libtasn1_3.5.bb}    |  4 +-
 ...fer_length_check_to_UTF_16_or_32_detector.patch | 33 --------
 .../0001-Disable-LDFLAGSICUDT-for-Linux.patch      |  0
 .../{icu-51.2 => icu}/icu-pkgdata-large-cmd.patch  |  0
 .../icu/{icu_51.2.bb => icu_53.1.bb}               | 15 ++--
 ...ailed-while-mips-gcc-optimization-enabled.patch | 95 ----------------------
 ...libsoup-2.4_2.45.3.bb => libsoup-2.4_2.46.0.bb} |  9 +-
 8 files changed, 20 insertions(+), 144 deletions(-)
 rename meta/recipes-lsb4/libpng/{libpng12_1.2.50.bb => libpng12_1.2.51.bb} (70%)
 rename meta/recipes-support/gnutls/{libtasn1_3.4.bb => libtasn1_3.5.bb} (82%)
 delete mode 100644 meta/recipes-support/icu/icu-51.2/add_buffer_length_check_to_UTF_16_or_32_detector.patch
 rename meta/recipes-support/icu/{icu-51.2 => icu}/0001-Disable-LDFLAGSICUDT-for-Linux.patch (100%)
 rename meta/recipes-support/icu/{icu-51.2 => icu}/icu-pkgdata-large-cmd.patch (100%)
 rename meta/recipes-support/icu/{icu_51.2.bb => icu_53.1.bb} (40%)
 delete mode 100644 meta/recipes-support/libsoup/files/fix-compiling-failed-while-mips-gcc-optimization-enabled.patch
 rename meta/recipes-support/libsoup/{libsoup-2.4_2.45.3.bb => libsoup-2.4_2.46.0.bb} (78%)
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/4 libpng12: upgrade to 1.2.51

License is the same.

---
 .../libpng/{libpng12_1.2.50.bb => libpng12_1.2.51.bb}             | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-lsb4/libpng/{libpng12_1.2.50.bb => libpng12_1.2.51.bb} (70%)
meta/recipes-lsb4/libpng/libpng12_1.2.51.bb renamed from meta/recipes-lsb4/libpng/libpng12_1.2.50.bb +4 -4
similarity index 70%
rename from meta/recipes-lsb4/libpng/libpng12_1.2.50.bb
rename to meta/recipes-lsb4/libpng/libpng12_1.2.51.bb
index 29d581b..6b2dcba 100644
@@ -2,8 +2,8 @@ SUMMARY = "PNG image format decoding library"
 HOMEPAGE = "http://www.libpng.org/"
 SECTION = "libs"
 LICENSE = "Libpng"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=c3d807a85c09ebdff087f18b4969ff96 \
-                    file://png.h;beginline=310;endline=424;md5=b87b5e9252a3e14808a27b92912d268d"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=ec135c8490e3b3d4ba2cc21f84c3a294 \
+                    file://png.h;beginline=314;endline=428;md5=151cf86c4efc2a7400f8a9a61d743d8e"
 DEPENDS = "zlib"
 
 PN = "libpng12"
@@ -11,8 +11,8 @@ S = "${WORKDIR}/libpng-${PV}"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng12/${PV}/libpng-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "a3e00fccbfe356174ab515b5c00641c7"
-SRC_URI[sha256sum] = "4724f81f8c92ac7f360ad1fbf173396ea7c535923424db9fbaff07bfd9d8e8e7"
+SRC_URI[md5sum] = "4efba67fa5aa2b785c6fcec2cc3e90c9"
+SRC_URI[sha256sum] = "c7d7b813b022afd70474f78bcc3655c7bb54edbf28dd4652e5521cbb6da56d4a"
 
 BINCONFIG_GLOB = "${PN}-config"
 
Signature · 1 line
1.9.1
#2 lore raw

PATCH 2/4 libsoup: upgrade to 2.46.0

In reply to Valentin Popa

Removed merged patches:
fix-compiling-failed-while-mips-gcc-optimization-enabled.patch

---
 ...ailed-while-mips-gcc-optimization-enabled.patch | 95 ----------------------
 ...libsoup-2.4_2.45.3.bb => libsoup-2.4_2.46.0.bb} |  9 +-
 2 files changed, 4 insertions(+), 100 deletions(-)
 delete mode 100644 meta/recipes-support/libsoup/files/fix-compiling-failed-while-mips-gcc-optimization-enabled.patch
 rename meta/recipes-support/libsoup/{libsoup-2.4_2.45.3.bb => libsoup-2.4_2.46.0.bb} (78%)
meta/recipes-support/libsoup/files/fix-compiling-failed-while-mips-gcc-optimization-enabled.patch deleted +0 -95
deleted file mode 100644
index 3469642..0000000
@@ -1,95 +0,0 @@
-test/header-parsing.c: fix compiling failed while mips-gcc optimization enabled
-
-There was an error about mips-gcc optimization while compiling
-libsoup-2.4 2.45.3 with DEBUG_OPTIMIZATION enabled.
-
-The test code of libsoup-2.4 2.45.3 triggered gcc assert which located
-in gcc/dwarf2out.c:20810:
-...
-20806       gcc_assert (prev
-20807                   && (CALL_P (prev)
-20808                       || (NONJUMP_INSN_P (prev)
-20809                           && GET_CODE (PATTERN (prev)) == SEQUENCE
-20810                           && CALL_P (XVECEXP (PATTERN (prev), 0, 0)))));
-...
-
-The issue test code is the C function 'do_qvalue_tests' located in
-tests/header-parsing.c.
-
-The 2.45.92 have refactored the test code and this issue has been fixed.
-So backport the fix to 2.45.3.
-
-Upstream-Status: backport
-Signed-off-by: Hongxu Jia <[email protected]>
----
- tests/header-parsing.c |   28 ++--------------------------
- 1 file changed, 2 insertions(+), 26 deletions(-)
-
-diff --git a/tests/header-parsing.c b/tests/header-parsing.c
-index 5b2950f..00f5a4e 100644
---- a/tests/header-parsing.c
-+++ b/tests/header-parsing.c
-@@ -896,9 +896,7 @@ do_qvalue_tests (void)
- {
- 	int i, j;
- 	GSList *acceptable, *unacceptable, *iter;
--	gboolean wrong;
- 
--	debug_printf (1, "qvalue tests\n");
- 	for (i = 0; i < num_qvaluetests; i++) {
- 		debug_printf (1, "%2d. %s:\n", i + 1, qvaluetests[i].header_value);
- 
-@@ -907,48 +905,26 @@ do_qvalue_tests (void)
- 							     &unacceptable);
- 
- 		debug_printf (1, "    acceptable: ");
--		wrong = FALSE;
- 		if (acceptable) {
- 			for (iter = acceptable, j = 0; iter; iter = iter->next, j++) {
- 				debug_printf (1, "%s ", (char *)iter->data);
--				if (!qvaluetests[i].acceptable[j] ||
--				    strcmp (iter->data, qvaluetests[i].acceptable[j]) != 0)
--					wrong = TRUE;
-+				g_assert_cmpstr (iter->data, ==, qvaluetests[i].acceptable[j]);
- 			}
- 			debug_printf (1, "\n");
- 			soup_header_free_list (acceptable);
- 		} else
- 			debug_printf (1, "(none)\n");
--		if (wrong) {
--			debug_printf (1, "    WRONG! expected: ");
--			for (j = 0; qvaluetests[i].acceptable[j]; j++)
--				debug_printf (1, "%s ", qvaluetests[i].acceptable[j]);
--			debug_printf (1, "\n");
--			errors++;
--		}
- 
- 		debug_printf (1, "  unacceptable: ");
--		wrong = FALSE;
- 		if (unacceptable) {
- 			for (iter = unacceptable, j = 0; iter; iter = iter->next, j++) {
- 				debug_printf (1, "%s ", (char *)iter->data);
--				if (!qvaluetests[i].unacceptable[j] ||
--				    strcmp (iter->data, qvaluetests[i].unacceptable[j]) != 0)
--					wrong = TRUE;
-+				g_assert_cmpstr (iter->data, ==, qvaluetests[i].unacceptable[j]);
- 			}
- 			debug_printf (1, "\n");
- 			soup_header_free_list (unacceptable);
- 		} else
- 			debug_printf (1, "(none)\n");
--		if (wrong) {
--			debug_printf (1, "    WRONG! expected: ");
--			for (j = 0; qvaluetests[i].unacceptable[j]; j++)
--				debug_printf (1, "%s ", qvaluetests[i].unacceptable[j]);
--			debug_printf (1, "\n");
--			errors++;
--		}
--
--		debug_printf (1, "\n");
- 	}
- }
- 
--- 
-1.7.9.5
-
meta/recipes-support/libsoup/libsoup-2.4_2.46.0.bb renamed from meta/recipes-support/libsoup/libsoup-2.4_2.45.3.bb +4 -5
similarity index 78%
rename from meta/recipes-support/libsoup/libsoup-2.4_2.45.3.bb
rename to meta/recipes-support/libsoup/libsoup-2.4_2.46.0.bb
index a3629c2..f062b2e 100644
@@ -15,12 +15,11 @@ PACKAGECONFIG ??= "gnome"
 PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome"
 
 SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
-SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \
-           file://fix-compiling-failed-while-mips-gcc-optimization-enabled.patch \
-"
+SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "fe7ec04784c6b97c5f8ea963c8542f59"
-SRC_URI[sha256sum] = "6ac317b931efd2cff9cdea7122987acb3ecb0c32564a9441ba72e5cce021aa12"
+
+SRC_URI[md5sum] = "86765c0093efaf3006fa2960d170d097"
+SRC_URI[sha256sum] = "fa3d5574c1a2df521242e2ca624a2b3057121798cab9f8f40525aa186a7b15a3"
 
 S = "${WORKDIR}/libsoup-${PV}"
 
Signature · 1 line
1.9.1
#3 lore raw

PATCH 3/4 libtasn1: upgrade to 3.5

In reply to Valentin Popa
---
 meta/recipes-support/gnutls/{libtasn1_3.4.bb => libtasn1_3.5.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/gnutls/{libtasn1_3.4.bb => libtasn1_3.5.bb} (82%)
meta/recipes-support/gnutls/libtasn1_3.5.bb renamed from meta/recipes-support/gnutls/libtasn1_3.4.bb +2 -2
similarity index 82%
rename from meta/recipes-support/gnutls/libtasn1_3.4.bb
rename to meta/recipes-support/gnutls/libtasn1_3.5.bb
index 174eddf..0c0ebcd 100644
@@ -13,8 +13,8 @@ SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \
            file://dont-depend-on-help2man.patch \
            "
 
-SRC_URI[md5sum] = "21ec021c534b0f30b2834ce233c70f15"
-SRC_URI[sha256sum] = "f353507a458fe2372b791016a056c95946eebfc7256b49013851f134a5e6acc8"
+SRC_URI[md5sum] = "62c76352d0e17df1c082fe1c38bad5cf"
+SRC_URI[sha256sum] = "d7fcffbc08b6413533b817d4ede5c2eadcb3dcb21c71cc91de6ece25191519ed"
 
 inherit autotools texinfo binconfig lib_package
 
Signature · 1 line
1.9.1
#4 lore raw

PATCH 4/4 icu: upgrade to 53.1

In reply to Valentin Popa

Removed patches:
(*) add_buffer_length_check_to_UTF_16_or_32_detector.patch
- not needed anymore

License is the same. BSD-like copyright inserted for lao-dictionary.

---
 ...fer_length_check_to_UTF_16_or_32_detector.patch | 33 ----------------------
 .../0001-Disable-LDFLAGSICUDT-for-Linux.patch      |  0
 .../{icu-51.2 => icu}/icu-pkgdata-large-cmd.patch  |  0
 .../icu/{icu_51.2.bb => icu_53.1.bb}               | 15 ++++++----
 4 files changed, 10 insertions(+), 38 deletions(-)
 delete mode 100644 meta/recipes-support/icu/icu-51.2/add_buffer_length_check_to_UTF_16_or_32_detector.patch
 rename meta/recipes-support/icu/{icu-51.2 => icu}/0001-Disable-LDFLAGSICUDT-for-Linux.patch (100%)
 rename meta/recipes-support/icu/{icu-51.2 => icu}/icu-pkgdata-large-cmd.patch (100%)
 rename meta/recipes-support/icu/{icu_51.2.bb => icu_53.1.bb} (40%)
meta/recipes-support/icu/icu-51.2/add_buffer_length_check_to_UTF_16_or_32_detector.patch deleted +0 -33
deleted file mode 100644
index ad4d61c..0000000
@@ -1,33 +0,0 @@
---- source/i18n/csrucode.cpp
-+++ source/i18n/csrucode.cpp
-@@ -33,8 +33,9 @@ UBool CharsetRecog_UTF_16_BE::match(Inpu
- {
-     const uint8_t *input = textIn->fRawInput;
-     int32_t confidence = 0;
-+    int32_t length = textIn->fRawLength;
- 
--    if (input[0] == 0xFE && input[1] == 0xFF) {
-+    if (length >=2 && input[0] == 0xFE && input[1] == 0xFF) {
-         confidence = 100;
-     }
- 
-@@ -57,8 +58,9 @@ UBool CharsetRecog_UTF_16_LE::match(Inpu
- {
-     const uint8_t *input = textIn->fRawInput;
-     int32_t confidence = 0;
-+    int32_t length = textIn->fRawLength;
- 
--    if (input[0] == 0xFF && input[1] == 0xFE && (input[2] != 0x00 || input[3] != 0x00)) {
-+    if (length >= 4 && input[0] == 0xFF && input[1] == 0xFE && (input[2] != 0x00 || input[3] != 0x00)) {
-         confidence = 100;
-     }
- 
-@@ -81,7 +83,7 @@ UBool CharsetRecog_UTF_32::match(InputTe
-     bool hasBOM = FALSE;
-     int32_t confidence = 0;
- 
--    if (getChar(input, 0) == 0x0000FEFFUL) {
-+    if (limit > 0 && getChar(input, 0) == 0x0000FEFFUL) {
-         hasBOM = TRUE;
-     }
- 
meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch renamed from meta/recipes-support/icu/icu-51.2/0001-Disable-LDFLAGSICUDT-for-Linux.patch +0 -0
similarity index 100%
rename from meta/recipes-support/icu/icu-51.2/0001-Disable-LDFLAGSICUDT-for-Linux.patch
rename to meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch
meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch renamed from meta/recipes-support/icu/icu-51.2/icu-pkgdata-large-cmd.patch +0 -0
similarity index 100%
rename from meta/recipes-support/icu/icu-51.2/icu-pkgdata-large-cmd.patch
rename to meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch
meta/recipes-support/icu/icu_53.1.bb renamed from meta/recipes-support/icu/icu_51.2.bb +10 -5
similarity index 40%
rename from meta/recipes-support/icu/icu_51.2.bb
rename to meta/recipes-support/icu/icu_53.1.bb
index 2d1fd42..d93af68 100644
@@ -1,16 +1,21 @@
 require icu.inc
 
-LIC_FILES_CHKSUM = "file://../license.html;md5=443a74288a72fad9069a74e7637192c1"
+LIC_FILES_CHKSUM = "file://../license.html;md5=8b139ac5b93769623bd343318048238c"
 
+def icu_download_version(d):
+    pvsplit = d.getVar('PV', True).split('.')
+    return pvsplit[0] + "_" + pvsplit[1]
 
-BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-51_2-src.tgz"
+ICU_PV = "${@icu_download_version(d)}"
+
+BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-${ICU_PV}-src.tgz"
 SRC_URI = "${BASE_SRC_URI} \
            file://icu-pkgdata-large-cmd.patch \
-           file://add_buffer_length_check_to_UTF_16_or_32_detector.patch \
           "
 
 SRC_URI_append_class-target = "\
            file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \
           "
-SRC_URI[md5sum] = "072e501b87065f3a0ca888f1b5165709"
-SRC_URI[sha256sum] = "deb027a05f1b3bec03298b96fb93b28c84e9683c22e6f94effa67fdc7bd704cc"
+
+SRC_URI[md5sum] = "b73baa6fbdfef197608d1f69300919b9"
+SRC_URI[sha256sum] = "6fa74fb5aac070c23eaba1711a7178fe582c59867484c5ec07c49002787a9a28"
Signature · 1 line
1.9.1