rpms/kdewebdev/devel kdewebdev-3.5.8-gcc43.patch, NONE, 1.1 kdewebdev.spec, 1.43, 1.44

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdewebdev/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10637/devel

Modified Files:
	kdewebdev.spec 
Added Files:
	kdewebdev-3.5.8-gcc43.patch 
Log Message:
* Sat Jan 05 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.8-6
- apply upstream build fix for GCC 4.3 (IS_BLANK macro name conflict w/ libxml)

kdewebdev-3.5.8-gcc43.patch:

--- NEW FILE kdewebdev-3.5.8-gcc43.patch ---
Index: kxsldbg/kxsldbgpart/libxsldbg/utils.h
===================================================================
--- kxsldbg/kxsldbgpart/libxsldbg/utils.h	(Revision 728435)
+++ kxsldbg/kxsldbgpart/libxsldbg/utils.h	(Revision 728436)
@@ -76,14 +76,14 @@
 
 
 /**
- * IS_BLANK:
+ * _IS_BLANK:
  * @c:  an UNICODE value (int)
  *
  * Macro to check the following production in the XML spec
  *
  * [3] S ::= (#x20 | #x9 | #xD | #xA)+
  */
-#define IS_BLANK(c) (((c) == 0x20) || ((c) == 0x09) || ((c) == 0xA) ||	\
+#define _IS_BLANK(c) (((c) == 0x20) || ((c) == 0x09) || ((c) == 0xA) ||	\
                      ((c) == 0x0D))
 
 
Index: kxsldbg/kxsldbgpart/libxsldbg/utils.cpp
===================================================================
--- kxsldbg/kxsldbgpart/libxsldbg/utils.cpp	(Revision 728435)
+++ kxsldbg/kxsldbgpart/libxsldbg/utils.cpp	(Revision 728436)
@@ -38,10 +38,10 @@
     if (text && xmlStrlen(text)) {
         start = text;
         end = text + xmlStrLen(text) - 1;
-        while (IS_BLANK(*start) && (start <= end))
+        while (_IS_BLANK(*start) && (start <= end))
             start++;
 
-        while (IS_BLANK(*end) && (end >= start))
+        while (_IS_BLANK(*end) && (end >= start))
             end--;
 
         /* copy  to @text */
@@ -81,7 +81,7 @@
 
     while ((*textIn != '\0') && (wordCount < maxStrings)) {
         /*skip the first spaces ? */
-        while (IS_BLANK(*textIn))
+        while (_IS_BLANK(*textIn))
             textIn++;
 
         if (*textIn == '\"') {
@@ -92,7 +92,7 @@
 
         /* look for end of word */
         if (foundQuote == 0) {
-            while (!IS_BLANK(*textIn) && (*textIn != '\0'))
+            while (!_IS_BLANK(*textIn) && (*textIn != '\0'))
                 textIn++;
 
             if (*textIn != '\0') {
Index: kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp
===================================================================
--- kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp	(Revision 728435)
+++ kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp	(Revision 728436)
@@ -523,7 +523,7 @@
 
                     /* quickly find a template */
                     /* skip any white spaces */
-                    while (IS_BLANK(arg[offset]))
+                    while (_IS_BLANK(arg[offset]))
                         offset++;
 
                     templateNode =


Index: kdewebdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdewebdev/devel/kdewebdev.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- kdewebdev.spec	24 Dec 2007 15:30:31 -0000	1.43
+++ kdewebdev.spec	5 Jan 2008 12:08:19 -0000	1.44
@@ -10,7 +10,7 @@
 Summary: Web development applications 
 Epoch:   6
 Version: 3.5.8
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPLv2
 Url:     http://kdewebdev.org/ 
@@ -27,6 +27,9 @@
 Patch0: javascript.patch
 Patch1: kdewebdev-3.5.4-kxsldbg-icons.patch
 Patch2: kdewebdev-3.5.8-rename-arrow.patch
+# http://websvn.kde.org/?view=rev&revision=728436
+# GCC 4.3 build fix (IS_BLANK macro name conflict with libxml) by Stephan Binner
+Patch3: kdewebdev-3.5.8-gcc43.patch
 
 %if %{make_cvs}
 BuildRequires: automake libtool
@@ -99,6 +102,7 @@
 %patch1 -p1 -b .kxsldbg-icons
 %patch2 -p1 -b .rename-arrow
 mv -f kimagemapeditor/pics/hi22-action-arrow.png kimagemapeditor/pics/hi22-action-arrowptr.png
+%patch3 -p0 -b .gcc43
 
 install -m644 -p %{SOURCE5} kxsldbg/
 
@@ -220,6 +224,9 @@
 
 
 %changelog
+* Sat Jan 05 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.8-6
+- apply upstream build fix for GCC 4.3 (IS_BLANK macro name conflict w/ libxml)
+
 * Mon Dec 24 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.8-5
 - remove crystalsvg icon which conflicts with kdeartwork (F9+) (#426694)