Hello community,
here is the log from the commit of package swig for openSUSE:Factory checked in
at 2020-06-04 17:51:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/swig (Old)
and /work/SRC/openSUSE:Factory/.swig.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "swig"
Thu Jun 4 17:51:08 2020 rev:70 rq:808396 version:4.0.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/swig/swig.changes 2020-05-20
18:37:43.468263667 +0200
+++ /work/SRC/openSUSE:Factory/.swig.new.3606/swig.changes 2020-06-04
17:51:30.864090100 +0200
@@ -1,0 +2,6 @@
+Sat May 23 07:04:09 UTC 2020 - Andreas Schwab <sch...@suse.de>
+
+- Revert last change, drop 0005-disable_li_std_wstring.patch
+- ruby-std-wstring-byte-order.patch: fix wstring encoding boo#1171368
+
+-------------------------------------------------------------------
Old:
----
0005-disable_li_std_wstring.patch
New:
----
ruby-std-wstring-byte-order.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ swig.spec ++++++
--- /var/tmp/diff_new_pack.uiZzRU/_old 2020-06-04 17:51:32.408095013 +0200
+++ /var/tmp/diff_new_pack.uiZzRU/_new 2020-06-04 17:51:32.408095013 +0200
@@ -42,8 +42,8 @@
Patch2: 0002-Add-support-for-Ruby-2.7.patch
Patch3: 0003-Move-new-macros-for-Ruby-to-their-dedicated-namespac.patch
Patch4: 0004-Improve-description-of-cast-macros-for-Ruby.patch
-Patch5: 0005-disable_li_std_wstring.patch
+Patch300: ruby-std-wstring-byte-order.patch
Patch308: swig308-isfinite.diff
BuildRequires: autoconf
@@ -120,18 +120,7 @@
%prep
%setup -q -n %{name}-rel-%{version}
-# for BE (Big Endian) do all patch (with 0005-disable_li_std_wstring.patch)
-# bypass https://bugzilla.opensuse.org/show_bug.cgi?id=1171368
-# for all other arches do all BUT that specific one
-%ifarch ppc64 s390 s390x
%autopatch -p1
-%else
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch308 -p1
-%endif
%build
%ifarch s390 s390x
++++++ ruby-std-wstring-byte-order.patch ++++++
Index: swig-rel-4.0.1/Lib/ruby/std_wstring.i
===================================================================
--- swig-rel-4.0.1.orig/Lib/ruby/std_wstring.i
+++ swig-rel-4.0.1/Lib/ruby/std_wstring.i
@@ -1,4 +1,6 @@
%{
+#include <endian.h>
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -15,9 +17,17 @@ extern "C" {
#ifndef SWIG_RUBY_WSTRING_ENCODING
#if WCHAR_MAX == 0x7fff || WCHAR_MAX == 0xffff
+#if BYTE_ORDER == LITTLE_ENDIAN
#define SWIG_RUBY_WSTRING_ENCODING "UTF-16LE"
+#elif BYTE_ORDER == BIG_ENDIAN
+#define SWIG_RUBY_WSTRING_ENCODING "UTF-16BE"
+#endif
#elif WCHAR_MAX == 0x7fffffff || WCHAR_MAX == 0xffffffff
+#if BYTE_ORDER == LITTLE_ENDIAN
#define SWIG_RUBY_WSTRING_ENCODING "UTF-32LE"
+#elif BYTE_ORDER == BIG_ENDIAN
+#define SWIG_RUBY_WSTRING_ENCODING "UTF-32BE"
+#endif
#else
#error unsupported wchar_t size. SWIG_RUBY_WSTRING_ENCODING must be given.
#endif
