rpms/swig
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix for PHP 5.4 bindings (#770696)

Browse Source 
Signed-off-by: Adam Tkac <atkac@redhat.com>
This commit is contained in:
Adam Tkac 2012-01-05 13:24:13 +01:00
parent 033829cc42
commit 63f13af526
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
swig.spec
View File

@ -4,7 +4,7 @@
Summary: Connects C/C++/Objective C to some high-level programming languages Summary: Connects C/C++/Objective C to some high-level programming languages
Name: swig Name: swig
Version: 2.0.4 Version: 2.0.4
Release: 4%{?dist} Release: 5%{?dist}
License: GPLv3+ and BSD License: GPLv3+ and BSD
Group: Development/Tools Group: Development/Tools
URL: http://swig.sourceforge.net/ URL: http://swig.sourceforge.net/
@ -14,6 +14,7 @@ Patch4: swig203-rh706140.patch
Patch5: swig204-rh753321.patch Patch5: swig204-rh753321.patch
Patch6: swig204-rh752054.patch Patch6: swig204-rh752054.patch
Patch7: swig204-rh679948.patch Patch7: swig204-rh679948.patch
Patch8: swig204-rh770696.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: perl, python-devel, pcre-devel BuildRequires: perl, python-devel, pcre-devel
@ -51,6 +52,7 @@ This package contains documentation for SWIG and useful examples
# Apply patch 6 when guile2 gets into distro # Apply patch 6 when guile2 gets into distro
#%patch6 -p1 -b .rh752054 #%patch6 -p1 -b .rh752054
%patch7 -p0 -b .rh679948 %patch7 -p0 -b .rh679948
%patch8 -p1 -b .rh770696
# as written on https://fedoraproject.org/wiki/Packaging_talk:Perl, section 2 # as written on https://fedoraproject.org/wiki/Packaging_talk:Perl, section 2
# (specific req/prov filtering). Before you remove this hack make sure you don't # (specific req/prov filtering). Before you remove this hack make sure you don't
@ -122,6 +124,9 @@ rm -rf %{buildroot}
%doc Doc Examples LICENSE LICENSE-GPL LICENSE-UNIVERSITIES COPYRIGHT %doc Doc Examples LICENSE LICENSE-GPL LICENSE-UNIVERSITIES COPYRIGHT
%changelog %changelog
* Thu Jan 05 2012 Adam Tkac <atkac redhat com> 2.0.4-5
- fix for PHP 5.4 bindings (#770696)
* Tue Nov 15 2011 Adam Tkac <atkac redhat com> 2.0.4-4 * Tue Nov 15 2011 Adam Tkac <atkac redhat com> 2.0.4-4
- don't apply patch for #752054 till guile2 gets into distro - don't apply patch for #752054 till guile2 gets into distro

11
swig204-rh770696.patch Normal file
View File

@ -0,0 +1,11 @@
--- trunk/Lib/php/phprun.swg 2011/03/12 01:38:27 12528
+++ trunk/Lib/php/phprun.swg 2011/05/24 03:59:35 12710
@@ -192,7 +192,7 @@
swig_object_wrapper *value;
void *p;
int type;
- char *type_name;
+ const char *type_name;
value = (swig_object_wrapper *) zend_list_find(z->value.lval, &type);
if ( flags & SWIG_POINTER_DISOWN ) {