From f163bfcab1c26a7879e1a8065caad2d2ded21a3435ecc765352279aeb87d7e93 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 5 Dec 2011 15:48:36 +0000 Subject: [PATCH 1/2] - generate guile 2 friendly code OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/swig?expand=0&rev=25 --- swig-2.0.4-guile2.patch | 25 +++++++++++++++++++++++++ swig.changes | 5 +++++ swig.spec | 6 ++++++ 3 files changed, 36 insertions(+) create mode 100644 swig-2.0.4-guile2.patch diff --git a/swig-2.0.4-guile2.patch b/swig-2.0.4-guile2.patch new file mode 100644 index 0000000..5a8f5c2 --- /dev/null +++ b/swig-2.0.4-guile2.patch @@ -0,0 +1,25 @@ +Index: swig-2.0.4/Lib/guile/guile_scm_run.swg +=================================================================== +--- swig-2.0.4.orig/Lib/guile/guile_scm_run.swg ++++ swig-2.0.4/Lib/guile/guile_scm_run.swg +@@ -60,16 +60,17 @@ static swig_module_info *SWIG_Guile_GetM + SWIGINTERN char * + SWIG_Guile_scm2newstr(SCM str, size_t *len) { + #define FUNC_NAME "SWIG_Guile_scm2newstr" +- char *ret; ++ char *ret, *tmp; + size_t l; + + SCM_ASSERT (SCM_STRINGP(str), str, 1, FUNC_NAME); + +- l = SCM_STRING_LENGTH(str); ++ tmp = scm_to_utf8_string(str); ++ memcpy(ret, tmp, l); ++ free(tmp); + ret = (char *) SWIG_malloc( (l + 1) * sizeof(char)); + if (!ret) return NULL; + +- memcpy(ret, SCM_STRING_CHARS(str), l); + ret[l] = '\0'; + if (len) *len = l; + return ret; diff --git a/swig.changes b/swig.changes index d8a0737..b20371f 100644 --- a/swig.changes +++ b/swig.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 5 13:37:26 UTC 2011 - pgajdos@suse.com + +- generate guile 2 friendly code + ------------------------------------------------------------------- Tue Sep 20 09:31:28 UTC 2011 - kkaempf@suse.com diff --git a/swig.spec b/swig.spec index 06dc357..418dd7c 100644 --- a/swig.spec +++ b/swig.spec @@ -65,6 +65,8 @@ Patch2: swig-2.0.4-ptrdiff_t.patch Patch3: swig-2.0.4-disable-broken-tests.patch # swig-2.0.4-disable-broken-tests_rhel4.patch kkaempf@suse.com -- disable tests failing on RHEL4 Patch4: swig-2.0.4-disable-broken-tests_rhel4.patch +# PATCH-FIX-UPSTREAM swig-2.0.4-guile2.patch pgajdos@suse.com -- generate guile 2 friendly code +Patch5: swig-2.0.4-guile2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -125,6 +127,10 @@ understandig SWIG usage. %if 0%{?rhel_version} >= 400 && 0%{?rhel_version} < 500 %patch4 -p1 %endif +# guile 2 from 12.1 +%if 0%{?suse_version} >= 1210 +%patch5 -p1 +%endif %build %configure --disable-ccache From c39aafaeebd68fca867e77bdc4c34e960ae30a66dbb8111f87a2bd9c532310af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 9 Dec 2011 09:06:26 +0000 Subject: [PATCH 2/2] Accepting request 96070 from devel:openSUSE:Factory:for-legal - fix license to be in spdx.org format OBS-URL: https://build.opensuse.org/request/show/96070 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/swig?expand=0&rev=26 --- swig.changes | 5 +++++ swig.spec | 14 +++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/swig.changes b/swig.changes index b20371f..f833ea6 100644 --- a/swig.changes +++ b/swig.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Dec 9 08:55:59 UTC 2011 - coolo@suse.com + +- fix license to be in spdx.org format + ------------------------------------------------------------------- Mon Dec 5 13:37:26 UTC 2011 - pgajdos@suse.com diff --git a/swig.spec b/swig.spec index 418dd7c..b5ce0fc 100644 --- a/swig.spec +++ b/swig.spec @@ -15,8 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: swig BuildRequires: boost-devel BuildRequires: gcc-c++ @@ -50,11 +48,11 @@ BuildRequires: ruby-devel %endif %endif Version: 2.0.4 -Release: 5 -License: GPLv3+ and BSD +Release: 0 Summary: Simplified Wrapper and Interface Generator -Url: http://www.swig.org +License: GPL-3.0+ and BSD-3-Clause Group: Development/Languages/C and C++ +Url: http://www.swig.org Source: %{name}-%{version}.tar.bz2 Source1: %{name}.rpmlintrc # PATCH-FIX-UPSTREAM swig-2.0.4-support-python32.patch idoenmez@suse.de -- Support Python 3.2 @@ -80,9 +78,8 @@ documentation generation, module and library management, extensive customization options, and more. %package doc -License: BSD3c Summary: SWIG Manual -Group: Development/Languages/C and C++ +License: BSD-3-Clause Requires: swig %if 0%{?suse_version} >= 1120 BuildArch: noarch @@ -101,9 +98,8 @@ customization options, and more. This package contains the SWIG manual. %package examples -License: BSD3c Summary: SWIG example files -Group: Development/Languages/C and C++ +License: BSD-3-Clause Requires: swig %description examples