rpms/kdesdk/devel kdesdk-4.1.96-boost-1.37.patch, NONE, 1.1 kdesdk.spec, 1.131, 1.132 kdesdk-4.1.96-boost137-workaround.patch, 1.1, NONE

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdesdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32358

Modified Files:
	kdesdk.spec 
Added Files:
	kdesdk-4.1.96-boost-1.37.patch 
Removed Files:
	kdesdk-4.1.96-boost137-workaround.patch 
Log Message:
apply patch to fix  build against Boost 1.37.0


kdesdk-4.1.96-boost-1.37.patch:

--- NEW FILE kdesdk-4.1.96-boost-1.37.patch ---
--- kdesdk/umbrello/umbrello/codeimport/kdevcppparser/lexer.h	2009/01/19 15:43:21	913606
+++ kdesdk/umbrello/umbrello/codeimport/kdevcppparser/lexer.h	2009/01/19 15:46:29	913607
@@ -105,8 +105,8 @@
     QChar currentChar() const {
       return m_ptr != m_endPtr ? *m_ptr : QChar::null;
     }
-    bool eof() const {return m_ptr >= m_endPtr;}
-    int length() const {return m_endPtr - m_ptr;}
+    bool eof() const {return m_ptr == m_endPtr;}
+    int length() const {return std::distance(m_ptr, m_endPtr);}
     void nextChar() {
       QChar l_current = *m_ptr++;
       switch( l_current.toAscii()) {
--- kdesdk/umbrello/umbrello/codeimport/kdevcppparser/preprocesslexer.h	2009/01/19 15:43:21	913606
+++ kdesdk/umbrello/umbrello/codeimport/kdevcppparser/preprocesslexer.h	2009/01/19 15:46:29	913607
@@ -264,8 +264,8 @@
     QChar currentChar() const {
       return m_ptr != m_endPtr ? *m_ptr : QChar::null;
     }
-    bool eof() const {return m_ptr >= m_endPtr;}
-    int length() const {return m_endPtr - m_ptr;}
+    bool eof() const {return m_ptr == m_endPtr;}
+    int length() const {return std::distance(m_ptr, m_endPtr);}
     void nextChar() {
       QChar l_current = *m_ptr++;
     }


Index: kdesdk.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- kdesdk.spec	13 Jan 2009 17:09:30 -0000	1.131
+++ kdesdk.spec	19 Jan 2009 19:57:33 -0000	1.132
@@ -1,6 +1,6 @@
 Name:           kdesdk
 Version:        4.1.96
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
 Group:          User Interface/Desktops
@@ -8,8 +8,8 @@
 License:        GPLv2
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
-# Fix build with Boost 1.37 (but does not look like the correct fix to me) -- Kevin
-Patch0:         kdesdk-4.1.96-boost137-workaround.patch
+# upstream patches
+Patch100:       kdesdk-4.1.96-boost-1.37.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdepimlibs-devel >= %{version}
@@ -81,10 +81,9 @@
 
 %prep
 %setup -q
-%if 0%{?fedora} >= 11
-%patch0 -p1 -b .boost137-workaround
-%endif
 
+# upstream patches
+%patch100 -p1 -b .boost-1.37
 
 %build
 mkdir -p %{_target_platform}
@@ -218,6 +217,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Than Ngo <than at redhat.com> - 4.1.96-4
+- apply patch to fix  build against Boost 1.37.0 
+
 * Tue Jan 13 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.96-3
 - F11+: add workaround to fix build against Boost 1.37.0
 


--- kdesdk-4.1.96-boost137-workaround.patch DELETED ---