From 8984dacca520764292d01b88c0062ba6872d7308 Mon Sep 17 00:00:00 2001
From: Than Ngo <than@fedoraproject.org>
Date: Jan 19 2009 19:57:33 +0000
Subject: apply patch to fix build against Boost 1.37.0


---

diff --git a/kdesdk-4.1.96-boost-1.37.patch b/kdesdk-4.1.96-boost-1.37.patch
new file mode 100644
index 0000000..7ab0c9f
--- /dev/null
+++ b/kdesdk-4.1.96-boost-1.37.patch
@@ -0,0 +1,26 @@
+--- 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++;
+     }
diff --git a/kdesdk-4.1.96-boost137-workaround.patch b/kdesdk-4.1.96-boost137-workaround.patch
deleted file mode 100644
index 0c38d74..0000000
--- a/kdesdk-4.1.96-boost137-workaround.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur kdesdk-4.1.96/umbrello/umbrello/codeimport/kdevcppparser/preprocesslexer.h kdesdk-4.1.96-boost137-workaround/umbrello/umbrello/codeimport/kdevcppparser/preprocesslexer.h
---- kdesdk-4.1.96/umbrello/umbrello/codeimport/kdevcppparser/preprocesslexer.h	2009-01-01 17:26:52.000000000 +0100
-+++ kdesdk-4.1.96-boost137-workaround/umbrello/umbrello/codeimport/kdevcppparser/preprocesslexer.h	2009-01-13 18:05:23.000000000 +0100
-@@ -42,7 +42,7 @@
- using boost::spirit::rule;
- using boost::spirit::scanner;
- using boost::spirit::ext::skip_rule_parser;
--#ifdef Q_CC_MSVC
-+#if 1
- // this template isn't available in boost/static_assert.hpp:50
- // but msvc needs it (boost 1.37.0)
- namespace boost {
diff --git a/kdesdk.spec b/kdesdk.spec
index 7bb5616..d6d5ed0 100644
--- a/kdesdk.spec
+++ b/kdesdk.spec
@@ -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 @@ Group:          User Interface/Desktops
 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 @@ xml2pot
 
 %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 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Jan 19 2009 Than Ngo <than@redhat.com> - 4.1.96-4
+- apply patch to fix  build against Boost 1.37.0 
+
 * Tue Jan 13 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.1.96-3
 - F11+: add workaround to fix build against Boost 1.37.0