rpms/codeblocks/devel codeblocks-drop-const.patch, NONE, 1.1 codeblocks.spec, 1.28, 1.29

[Dan Horák]

Author: sharkcz

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

Modified Files:
	codeblocks.spec 
Added Files:
	codeblocks-drop-const.patch 
Log Message:
* Wed Feb 18 2009 Dan Horak <dan[at]danny.cz> 8.02-5
- fix compile error with gcc 4.4/glibc 2.9.90


codeblocks-drop-const.patch:

--- NEW FILE codeblocks-drop-const.patch ---
>From a7f611bd46b1a29e0a5ac3fde563bfaeb3f573e4 Mon Sep 17 00:00:00 2001
From: Dan Horak <dan at danny.cz>
Date: Wed, 18 Feb 2009 12:59:45 +0100
Subject: [PATCH] drop const modifier for compatibility with recent ISO C++ standards

---
 src/src/prefix.cpp |    4 ++--
 src/src/prefix.h   |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/src/prefix.cpp b/src/src/prefix.cpp
index 5fb6246..6b8901e 100644
--- a/src/src/prefix.cpp
+++ b/src/src/prefix.cpp
@@ -387,7 +387,7 @@ br_strndup (char *str, size_t size)
  * br_extract_dir ("/usr/local/foobar");  --> Returns: "/usr/local"
  */
 char *
-br_extract_dir (const char *path)
+br_extract_dir (char *path)
 {
 	char *end, *result;
 
@@ -422,7 +422,7 @@ br_extract_dir (const char *path)
  * br_extract_prefix ("/usr/local/libfoo.so");       --> Returns "/usr"
  */
 char *
-br_extract_prefix (const char *path)
+br_extract_prefix (char *path)
 {
 	char *end, *tmp, *result;
 
diff --git a/src/src/prefix.h b/src/src/prefix.h
index 0406f29..6c15bc6 100644
--- a/src/src/prefix.h
+++ b/src/src/prefix.h
@@ -111,8 +111,8 @@ char *br_prepend_prefix	(void *symbol, char *path);
 #endif
 
 char *br_strcat	(const char *str1, const char *str2);
-char *br_extract_dir	(const char *path);
-char *br_extract_prefix(const char *path);
+char *br_extract_dir	(char *path);
+char *br_extract_prefix(char *path);
 
 
 #ifdef __cplusplus
-- 
1.6.0.6



Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/codeblocks.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- codeblocks.spec	31 Oct 2008 09:01:22 -0000	1.28
+++ codeblocks.spec	18 Feb 2009 13:54:56 -0000	1.29
@@ -1,6 +1,6 @@
 Name:		codeblocks
 Version:	8.02
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPLv3+
@@ -21,6 +21,9 @@
 Patch3:         codeblocks-run.patch
 # bug #469096 (fixed in upstream svn revision 5159)
 Patch4:         codeblocks-8.02-gcc-detect.patch
+# fix for gcc 4.4/glibc 2.9.90 http://developer.berlios.de/patch/index.php?func=detailpatch&patch_id=2699&group_id=5358
+Patch5:         codeblocks-drop-const.patch
+
 
 %description
 Code::Blocks is a free C++ IDE built specifically to meet the most demanding
@@ -74,6 +77,7 @@
 %patch2 -p1
 %patch3 -p0 -b .run
 %patch4 -p0 -b .gcc-detect
+%patch5 -p1 -b .gcc44
 
 # convert EOLs
 find . -type f -and -not -name "*.cpp" -and -not -name "*.h" -and -not -name "*.png" -and -not -name "*.bmp" -and -not -name "*.c" -and -not -name "*.cxx" -and -not -name "*.ico" | sed "s/.*/\"\\0\"/" | xargs dos2unix --keepdate &> /dev/null
@@ -261,6 +265,9 @@
 
 
 %changelog
+* Wed Feb 18 2009 Dan Horak <dan[at]danny.cz> 8.02-5
+- fix compile error with gcc 4.4/glibc 2.9.90
+
 * Fri Oct 31 2008 Dan Horak <dan[at]danny.cz> 8.02-4
 - fix gcc detection (#469096)