From 775862fe5d525e5d9ef006681138c29b113cee87d56dd482e0157764dfb43275 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 20 Feb 2015 07:57:58 +0000 Subject: [PATCH] Accepting request 286874 from home:posophe:branches:devel:libraries:c_c++ Update OBS-URL: https://build.opensuse.org/request/show/286874 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libunistring?expand=0&rev=23 --- libunistring-0.9.3.tar.bz2 | 3 --- libunistring-0.9.5.tar.xz | 3 +++ libunistring-gnulib-ppc64le.patch | 41 ------------------------------- libunistring-parallel-make.patch | 27 -------------------- libunistring.changes | 16 ++++++++++++ libunistring.spec | 21 ++++------------ 6 files changed, 24 insertions(+), 87 deletions(-) delete mode 100644 libunistring-0.9.3.tar.bz2 create mode 100644 libunistring-0.9.5.tar.xz delete mode 100644 libunistring-gnulib-ppc64le.patch delete mode 100644 libunistring-parallel-make.patch diff --git a/libunistring-0.9.3.tar.bz2 b/libunistring-0.9.3.tar.bz2 deleted file mode 100644 index 839555a..0000000 --- a/libunistring-0.9.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b29df625bf6f8a6e585528645b6871fba00c2a704afa791cc80104c584719cc4 -size 2029848 diff --git a/libunistring-0.9.5.tar.xz b/libunistring-0.9.5.tar.xz new file mode 100644 index 0000000..4ecfe32 --- /dev/null +++ b/libunistring-0.9.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b3f4dbea5124f56639a701376ed78e5f595e7b720cfbb0cf1f81f375894c77b +size 1869044 diff --git a/libunistring-gnulib-ppc64le.patch b/libunistring-gnulib-ppc64le.patch deleted file mode 100644 index 1b52cfe..0000000 --- a/libunistring-gnulib-ppc64le.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/tests/test-isnanl.h b/tests/test-isnanl.h -index 06e6a7c..2df10f8 100644 ---- a/tests/test-isnanl.h -+++ b/tests/test-isnanl.h -@@ -51,6 +51,15 @@ main () - /* A bit pattern that is different from a Quiet NaN. With a bit of luck, - it's a Signalling NaN. */ - { -+#if defined __powerpc__ && LDBL_MANT_DIG == 106 -+ /* This is PowerPC "double double", a pair of two doubles. Inf and Nan are -+ represented as the corresponding 64-bit IEEE values in the first double; -+ the second is ignored. Manipulate only the first double. */ -+ #undef NWORDS -+ #define NWORDS \ -+ ((sizeof (double) + sizeof (unsigned int) - 1) / sizeof (unsigned int)) -+#endif -+ - memory_long_double m; - m.value = NaNl (); - # if LDBL_EXPBIT0_BIT > 0 -diff --git a/tests/test-signbit.c b/tests/test-signbit.c -index e8ea097..7e24292 100644 ---- a/tests/test-signbit.c -+++ b/tests/test-signbit.c -@@ -151,6 +151,16 @@ test_signbitl () - #define NWORDS \ - ((sizeof (long double) + sizeof (unsigned int) - 1) / sizeof (unsigned int)) - typedef union { long double value; unsigned int word[NWORDS]; } memory_long_double; -+ -+#if defined __powerpc__ && LDBL_MANT_DIG == 106 -+ /* This is PowerPC "double double", a pair of two doubles. Inf and Nan are -+ represented as the corresponding 64-bit IEEE values in the first double; -+ the second is ignored. Manipulate only the first double. */ -+ #undef NWORDS -+ #define NWORDS \ -+ ((sizeof (double) + sizeof (unsigned int) - 1) / sizeof (unsigned int)) -+#endif -+ - memory_long_double m; - m.value = zerol / zerol; - # if LDBL_EXPBIT0_BIT > 0 diff --git a/libunistring-parallel-make.patch b/libunistring-parallel-make.patch deleted file mode 100644 index 0cb7429..0000000 --- a/libunistring-parallel-make.patch +++ /dev/null @@ -1,27 +0,0 @@ -Fix a parallel make race where cdefs.h uses the unused-parameter.h header file -but has no dependency listed. This can result in an empty cdefs.h file which -results in a build failure like: - -| In file included from striconveh.c:30:0: -| unistr.h:193:48: error: expected ';', ',' or ')' before '_GL_UNUSED_PARAMETER' -| In file included from striconveh.c:30:0: -| unistr.h:263:54: error: expected ';', ',' or ')' before '_GL_UNUSED_PARAMETER' - -Upstream-Status: Pending - -RP 2012/4/12 - -Index: lib/Makefile.am -=================================================================== ---- lib/Makefile.am 2012-04-12 07:45:41.450059820 +0000 -+++ lib/Makefile.am 2012-04-12 07:48:45.434055559 +0000 -@@ -157,7 +157,7 @@ - - # unistring/cdefs.h is not public, but is included by other header files. - nobase_nodist_include_HEADERS += unistring/cdefs.h --unistring/cdefs.h : unistring/cdefs.in.h -+unistring/cdefs.h : unistring/cdefs.in.h $(UNUSED_PARAMETER_H) - @MKDIR_P@ unistring - rm -f $@-t $@ - sed -e '/definition of _GL_UNUSED_PARAMETER/r $(UNUSED_PARAMETER_H)' \ - diff --git a/libunistring.changes b/libunistring.changes index 3feb72d..87d94c8 100644 --- a/libunistring.changes +++ b/libunistring.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Feb 19 20:33:23 UTC 2015 - p.drouand@gmail.com + +- Update to version 0.9.5 + * The data tables and line breaking algorithm have been updated + to Unicode version 7.0.0. + * In the include file uniname.h, the function unicode_name_character + has been extended to look for name aliases. +- Remove patches merged on upstream release + * libunistring-gnulib-ppc64le.patch + * libunistring-parallel-make.patch +- Use download Url as source +- Remove autoconf, automake and libtool require; not needed anymore +- Bump so version to 2 + libunistring0 > libunistring2 + ------------------------------------------------------------------- Tue Mar 4 13:48:59 UTC 2014 - pgajdos@suse.com diff --git a/libunistring.spec b/libunistring.spec index 70dbbbe..0fba3fd 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -1,7 +1,7 @@ # # spec file for package libunistring # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,23 +17,15 @@ Name: libunistring -%define lname libunistring0 -Version: 0.9.3 +%define lname libunistring2 +Version: 0.9.5 Release: 0 Summary: GNU Unicode string library License: LGPL-3.0+ and GPL-3.0+ Group: Development/Libraries/C and C++ Url: http://www.gnu.org/software/libunistring/ -Source0: libunistring-%{version}.tar.bz2 +Source0: http://ftp.gnu.org/gnu/libunistring/libunistring-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: libtool - -# Fix imported gnulib long double math tests for little-endian PowerPC -Patch1: libunistring-gnulib-ppc64le.patch -# http://lists.openembedded.org/pipermail/openembedded-core/2012-April/059850.html -Patch2: libunistring-parallel-make.patch %description This portable C library implements Unicode string types in three flavours: @@ -69,11 +61,8 @@ case folding and regular expressions). %prep %setup -q -%patch1 -p1 -%patch2 %build -autoreconf -fi %configure --disable-static --disable-rpath --docdir=%_docdir/%name make %{?_smp_mflags} @@ -90,7 +79,7 @@ make check %{?_smp_mflags} %files -n %lname %defattr(-,root,root) -%{_libdir}/libunistring.so.0* +%{_libdir}/libunistring.so.2* %files devel %defattr(-,root,root)