Source Mage code commit list

[Eric Sandall <scm AT sourcemage.org>]

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

 kde-core/kdebase/HISTORY             |    5 +++++
 kde-core/kdebase/PRE_BUILD           |    7 +++++--
 kde-core/kdebase/kdebase-gcc44.patch |   23 +++++++++++++++++++++++
 kde-core/kdelibs/HISTORY             |    5 +++++
 kde-core/kdelibs/PRE_BUILD           |    4 +++-
 kde-core/kdelibs/kdelibs-gcc44.patch |   20 ++++++++++++++++++++
 6 files changed, 61 insertions(+), 3 deletions(-)

New commits:
commit f161fa8edb39d241125dd55e8463be52dd054b2b
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    kdebase: Fix compilation with GCC 4.4
    From https://bugs.kde.org/show_bug.cgi?id=193242

commit 16e28de79a5aac80b532326deab88c2cd06596f2
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    kdelibs: Patch to fix building with GCC 4.4
    From https://bugs.kde.org/show_bug.cgi?id=193242

diff --git a/kde-core/kdebase/HISTORY b/kde-core/kdebase/HISTORY
index fa62257..46d9508 100644
--- a/kde-core/kdebase/HISTORY
+++ b/kde-core/kdebase/HISTORY
@@ -1,3 +1,8 @@
+2009-05-28 Eric Sandall <sandalle AT sourcemage.org>
+       * PRE_BUILD: Apply kdebase-gcc44.patch
+       * kdebase-gcc44.patch: Fix compilation with GCC 4.4
+         From https://bugs.kde.org/show_bug.cgi?id=193242
+
 2009-05-02 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
        * init.d/kdm: made it non-sh, bug #13702
 
diff --git a/kde-core/kdebase/PRE_BUILD b/kde-core/kdebase/PRE_BUILD
index 49d7088..7f08210 100755
--- a/kde-core/kdebase/PRE_BUILD
+++ b/kde-core/kdebase/PRE_BUILD
@@ -1,5 +1,8 @@
-default_pre_build          &&
-cd $SOURCE_DIRECTORY      &&
+default_pre_build                                                 &&
+cd $SOURCE_DIRECTORY                                             &&
+patch $SOURCE_DIRECTORY/kcontrol/kfontinst/kfontinst/Fontmap.cpp  \
+      $SCRIPT_DIRECTORY/kdebase-gcc44.patch                       &&
+
 # splashscreen patch
 if [[ $SMGL_THEME == "y" ]]; then
   unpack_file 2
diff --git a/kde-core/kdebase/kdebase-gcc44.patch 
b/kde-core/kdebase/kdebase-gcc44.patch
new file mode 100644
index 0000000..18aeb8a
--- /dev/null
+++ b/kde-core/kdebase/kdebase-gcc44.patch
@@ -0,0 +1,23 @@
+#
+# From https://bugs.kde.org/show_bug.cgi?id=193242
+#
+--- kdebase-3.5.10/kcontrol/kfontinst/kfontinst/Fontmap.cpp    2009-05-20 
13:06:00.477670083 +0300
++++ kdebase-3.5.10/kcontrol/kfontinst/kfontinst/Fontmap.cpp    2009-05-20 
15:09:44.061136748 +0300
+@@ -44,7 +44,7 @@
+ 
+ using namespace std;
+ 
+-static char * findSpace(char *str)
++static const char * findSpace(const char *str)
+ {
+     while(str && *str!=' ' && *str!='\t')
+         str++;
+@@ -65,7 +65,7 @@
+     char a[constMaxLen+1],
+          b[constFileMaxLen+1];
+ 
+-    char *slash1=strchr(line, '/'),
++    const char *slash1=strchr(line, '/'),
+          *space1=slash1 ? findSpace(slash1) : NULL, //strchr(slash1, ' ') : 
NULL,
+          *ob=slash1 ? strchr(slash1, '(') : NULL,
+          *cb=ob ? strchr(ob, ')') : NULL,
diff --git a/kde-core/kdelibs/HISTORY b/kde-core/kdelibs/HISTORY
index af0d4f3..0f9f691 100644
--- a/kde-core/kdelibs/HISTORY
+++ b/kde-core/kdelibs/HISTORY
@@ -1,3 +1,8 @@
+2009-05-28 Eric Sandall <sandalle AT sourcemage.org>
+       * PRE_BUILD: Apply kdelibs-gcc44.patch
+       * kdelibs-gcc44.patch: Patch to fix building with GCC 4.4
+         From https://bugs.kde.org/show_bug.cgi?id=193242
+
 2009-02-18 Thomas Orgis <sobukus AT sourcemage.org>
        * PRE_BUILD, inotify.patch: fix build; bad kernel header usage
 
diff --git a/kde-core/kdelibs/PRE_BUILD b/kde-core/kdelibs/PRE_BUILD
index 38085cb..c5e4c8b 100755
--- a/kde-core/kdelibs/PRE_BUILD
+++ b/kde-core/kdelibs/PRE_BUILD
@@ -1,3 +1,5 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
-patch -Np0 < "$SCRIPT_DIRECTORY/inotify.patch"
+patch -Np0 < "$SCRIPT_DIRECTORY/inotify.patch"  &&
+patch $SOURCE_DIRECTORY/kioslave/ftp/ftp.cc     \
+      $SCRIPT_DIRECTORY/kdelibs-gcc44.patch
diff --git a/kde-core/kdelibs/kdelibs-gcc44.patch 
b/kde-core/kdelibs/kdelibs-gcc44.patch
new file mode 100644
index 0000000..7dc3689
--- /dev/null
+++ b/kde-core/kdelibs/kdelibs-gcc44.patch
@@ -0,0 +1,20 @@
+Upstream URL: https://bugs.kde.org/show_bug.cgi?id=193242
+Signed off by: Elan Ruusamäe <glen AT delfi.ee>
+--- kdelibs-3.5.10/kioslave/ftp/ftp.cc~        2009-05-19 14:57:21.000000000 
+0300
++++ kdelibs-3.5.10/kioslave/ftp/ftp.cc 2009-05-19 14:57:24.016475767 +0300
+@@ -876,5 +876,5 @@
+   // The usual answer is '227 Entering Passive Mode. (160,39,200,55,6,245)'
+   // but anonftpd gives '227 =160,39,200,55,6,245'
+   int i[6];
+-  char *start = strchr(ftpResponse(3), '(');
++  const char *start = strchr(ftpResponse(3), '(');
+   if ( !start )
+@@ -931,7 +931,7 @@
+     return ERR_INTERNAL;
+   }
+ 
+-  char *start = strchr(ftpResponse(3), '|');
++  const char *start = strchr(ftpResponse(3), '|');
+   if ( !start || sscanf(start, "|||%d|", &portnum) != 1)
+     return ERR_INTERNAL;
+