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

[arekm]

Author: arekm                        Date: Sat Oct  9 10:56:56 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 6; official fix for smokegen segfaults

---- Files affected:
packages/kde4-kdebindings:
   kde4-kdebindings.spec (1.79 -> 1.80) , kde4-kdebindings-branch.diff (NONE -> 1.1)  (NEW), kde4-kdebindings-segv.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/kde4-kdebindings/kde4-kdebindings.spec
diff -u packages/kde4-kdebindings/kde4-kdebindings.spec:1.79 packages/kde4-kdebindings/kde4-kdebindings.spec:1.80
--- packages/kde4-kdebindings/kde4-kdebindings.spec:1.79	Fri Oct  8 22:22:12 2010
+++ packages/kde4-kdebindings/kde4-kdebindings.spec	Sat Oct  9 12:56:50 2010
@@ -15,14 +15,13 @@
 Summary(pl.UTF-8):	Dowiązania KDE dla języków innych niż C++
 Name:		kde4-kdebindings
 Version:	4.5.2
-Release:	5
+Release:	6
 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
+Patch1:		%{name}-branch.diff
 BuildRequires:	PolicyKit-devel
 BuildRequires:	QtDesigner-devel >= %{qtver}
 BuildRequires:	QtGui-devel >= %{qtver}
@@ -210,7 +209,7 @@
 %prep
 %setup -q -n %{orgname}-%{version}
 %patch0 -p1
-%patch1 -p1
+%patch1 -p0
 # 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
@@ -544,6 +543,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.80  2010/10/09 10:56:50  arekm
+- rel 6; official fix for smokegen segfaults
+
 Revision 1.79  2010/10/08 20:22:12  arekm
 - rel 5; add BR akonadi-devel
 

================================================================
Index: packages/kde4-kdebindings/kde4-kdebindings-branch.diff
diff -u /dev/null packages/kde4-kdebindings/kde4-kdebindings-branch.diff:1.1
--- /dev/null	Sat Oct  9 12:56:56 2010
+++ packages/kde4-kdebindings/kde4-kdebindings-branch.diff	Sat Oct  9 12:56:50 2010
@@ -0,0 +1,69 @@
+Index: generator/type_compiler.cpp
+===================================================================
+--- generator/type_compiler.cpp	(.../tags/KDE/4.5.2/kdebindings)	(wersja 1184172)
++++ generator/type_compiler.cpp	(.../branches/KDE/4.5/kdebindings)	(wersja 1184172)
+@@ -182,7 +182,7 @@
+     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 && node->declarator->sub_declarator)
+         name_cc.run(node->declarator->sub_declarator->id);
+     else if (node->declarator)
+         name_cc.run(node->declarator->id);
+Index: generator/parser/rpp/pp-macro-expander.cpp
+===================================================================
+--- generator/parser/rpp/pp-macro-expander.cpp	(.../tags/KDE/4.5.2/kdebindings)	(wersja 1184172)
++++ generator/parser/rpp/pp-macro-expander.cpp	(.../branches/KDE/4.5/kdebindings)	(wersja 1184172)
+@@ -268,10 +268,10 @@
+         output << '\"';
+ 
+         while (!is.atEnd()) {
+-          if (input == '"') {
++          if (is == '"') {
+             output << '\\' << is;
+ 
+-          } else if (input == '\n') {
++          } else if (is == '\n') {
+             output << '"' << is << '"';
+ 
+           } else {
+@@ -338,7 +338,7 @@
+             
+             skip_blanks(input, devnull());
+             //Omit paste tokens behind empty used actuals, else we will merge with the previous text
+-            if(input == '#' && (++input) == '#') {
++            if(!input.atEnd() && input == '#' && !(++input).atEnd() && input == '#') {
+               ++input;
+               //We have skipped a paste token
+             }else{
+Index: generator/generators/smoke/helpers.cpp
+===================================================================
+--- generator/generators/smoke/helpers.cpp	(.../tags/KDE/4.5.2/kdebindings)	(wersja 1184172)
++++ generator/generators/smoke/helpers.cpp	(.../branches/KDE/4.5/kdebindings)	(wersja 1184172)
+@@ -131,10 +131,10 @@
+         // map this method to the function, so we can later retrieve the header it was defined in
+         globalFunctionMap[&parent->methods().last()] = &fn;
+         
+-        int methIndex = parent->methods().length() - 1;
++        int methIndex = parent->methods().size() - 1;
+         addOverloads(meth);
+         // handle the methods appended by addOverloads()
+-        for (int i = parent->methods().length() - 1; i > methIndex; --i)
++        for (int i = parent->methods().size() - 1; i > methIndex; --i)
+             globalFunctionMap[&parent->methods()[i]] = &fn;
+ 
+         (*usedTypes) << meth.type();
+@@ -458,7 +458,11 @@
+         return munge(&resolved);
+     }
+ 
+-    if (type->pointerDepth() > 1 || (type->getClass() && type->getClass()->isTemplate() && (!Options::qtMode || (Options::qtMode && type->getClass()->name() != "QFlags"))) ||
++    if (type->name().contains("long long") || type->name() == "size_t") {
++        // Special case 'long long' types as '$'.
++        // Hack: 'size_t' isn't being fully resolved for some reason.
++        return '$';
++    } else if (type->pointerDepth() > 1 || (type->getClass() && type->getClass()->isTemplate() && (!Options::qtMode || (Options::qtMode && type->getClass()->name() != "QFlags"))) ||
+         (Options::voidpTypes.contains(type->name()) && !Options::scalarTypes.contains(type->name())) )
+     {
+         // QString and QStringList are both mapped to Smoke::t_voidp, but QString is a scalar as well
================================================================

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