packages: kde4-kdebindings/kde4-kdebindings.spec, kde4-kdebindings/kde4-kde...

[arekm]

Author: arekm                        Date: Fri Oct  8 20:07:13 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4; fix smokegen segfault

---- Files affected:
packages/kde4-kdebindings:
   kde4-kdebindings.spec (1.77 -> 1.78) , kde4-kdebindings-segv.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/kde4-kdebindings/kde4-kdebindings.spec
diff -u packages/kde4-kdebindings/kde4-kdebindings.spec:1.77 packages/kde4-kdebindings/kde4-kdebindings.spec:1.78
--- packages/kde4-kdebindings/kde4-kdebindings.spec:1.77	Wed Oct  6 22:05:52 2010
+++ packages/kde4-kdebindings/kde4-kdebindings.spec	Fri Oct  8 22:07:07 2010
@@ -15,12 +15,14 @@
 Summary(pl.UTF-8):	Dowiązania KDE dla języków innych niż C++
 Name:		kde4-kdebindings
 Version:	4.5.2
-Release:	3
+Release:	4
 License:	GPL
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
 # Source0-md5:	02f6a8397beb6a034fe9025f03f6bd02
 Patch0:		%{name}-sip.patch
+# this is hack, when > 4.5.2 version appears try building this package without this patch
+Patch1:		%{name}-segv.patch
 BuildRequires:	PolicyKit-devel
 BuildRequires:	QtDesigner-devel >= %{qtver}
 BuildRequires:	QtGui-devel >= %{qtver}
@@ -207,6 +209,7 @@
 %prep
 %setup -q -n %{orgname}-%{version}
 %patch0 -p1
+%patch1 -p1
 # Very ugly hack, but damn, i'm sick of this package
 %if %{without smoke}
 %{__sed} -i -e 's/macro_optional_add_subdirectory(smoke)//' CMakeLists.txt
@@ -540,6 +543,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.78  2010/10/08 20:07:07  arekm
+- rel 4; fix smokegen segfault
+
 Revision 1.77  2010/10/06 20:05:52  shadzik
 - add sip patch, from gentoo (thx arekm)
 

================================================================
Index: packages/kde4-kdebindings/kde4-kdebindings-segv.patch
diff -u /dev/null packages/kde4-kdebindings/kde4-kdebindings-segv.patch:1.1
--- /dev/null	Fri Oct  8 22:07:13 2010
+++ packages/kde4-kdebindings/kde4-kdebindings-segv.patch	Fri Oct  8 22:07:07 2010
@@ -0,0 +1,11 @@
+--- kdebindings-4.5.2/generator/type_compiler.cpp~	2010-04-28 10:00:56.000000000 +0200
++++ kdebindings-4.5.2/generator/type_compiler.cpp	2010-10-08 22:04:06.861340552 +0200
+@@ -182,7 +182,7 @@ void TypeCompiler::visitParameterDeclara
+     TypeCompiler tc(m_session, m_visitor);
+     tc.run(node->type_specifier, node->declarator);
+     NameCompiler name_cc(m_session, m_visitor);
+-    if (tc.type().isFunctionPointer())
++    if (tc.type().isFunctionPointer() && node->declarator->sub_declarator)
+         name_cc.run(node->declarator->sub_declarator->id);
+     else if (node->declarator)
+         name_cc.run(node->declarator->id);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebindings/kde4-kdebindings.spec?r1=1.77&r2=1.78&f=u