Source Mage code commit list

[Eric Sandall <scm AT sourcemage.org>]

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

 kde4/FUNCTIONS                 |    5 -
 kde4/HISTORY                   |    3 
 kde4/kdelibs4/HISTORY          |   11 +-
 kde4/kdelibs4/PRE_BUILD        |    2 
 kde4/kdelibs4/glibc-2.11.patch |  167 
+++++++++++++++++++++++++++++++++++++++++
 5 files changed, 178 insertions(+), 10 deletions(-)

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

    Revert "kde4/FUNCTIONS - fix for kdelibs4"
    
    This reverts commit 6e2634691b4fc210a759b1e12178d81309404613.
    
    Causes kdelibs4 4.3 to fail to even run configure:
    -- Detecting CXX compiler ABI info - done
    CMake Error at cmake/modules/FindQt4.cmake:1498 (MESSAGE):
      Qt qmake not found!
    Call Stack (most recent call first):
      cmake/modules/FindKDE4Internal.cmake:295 (find_package)
      CMakeLists.txt:35 (find_package)

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

    kdelibs4: Cleanup whitespace

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

    kdelibs4: Fixes compilation with glibc 2.11
    https://bugs.kde.org/show_bug.cgi?id=213223

diff --git a/kde4/FUNCTIONS b/kde4/FUNCTIONS
index 7fe261e..b4c2106 100755
--- a/kde4/FUNCTIONS
+++ b/kde4/FUNCTIONS
@@ -5,10 +5,7 @@ default_build() {
   cd $SOURCE_DIRECTORY                            &&
   mkdir -p build                                  &&
   cd build                                        &&
-  PATH+=:$QTDIR   &&
-  if [[ $SPELL != kdelibs4 ]];then
-   PATH+=:$KDE4DIR
-  fi &&
+  PATH=$KDE4DIR:$QTDIR:$PATH                      &&
   CMAKE_PREFIX_PATH=$KDE4DIR                      &&
   cmake -DCMAKE_INSTALL_PREFIX=$KDE4DIR           \
         -DCMAKE_BUILD_TYPE=$KDE_DEBUG_OPTION      \
diff --git a/kde4/HISTORY b/kde4/HISTORY
index 1ba12ca..b9cd173 100644
--- a/kde4/HISTORY
+++ b/kde4/HISTORY
@@ -1,6 +1,3 @@
-2009-11-27 Treeve Jelbert <treeve AT sourcemage.org>
-       * FUNCTIONS: fix special case of kdelibs4
-
 2009-11-18 Treeve Jelbert <treeve AT sourcemage.org>
        * FUNCTIONS: add $OPTS to build
 
diff --git a/kde4/kdelibs4/HISTORY b/kde4/kdelibs4/HISTORY
index e08a06d..fd1a8d3 100644
--- a/kde4/kdelibs4/HISTORY
+++ b/kde4/kdelibs4/HISTORY
@@ -1,8 +1,13 @@
-2009-11-04 Treeve Jelbert <treeve AT sourcemage.org> 
+2009-11-29 Eric Sandall <sandalle AT sourcemage.org>
+       * glibc-2.11.patch: Fixes compilation with glibc 2.11
+         https://bugs.kde.org/show_bug.cgi?id=213223
+       * PRE_BUILD: Apply glibc-2.11.patch to kdecore/fakes.c
+
+2009-11-04 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: fix WEB_SITE, broken by previous update
 
-2009-11-03 Treeve Jelbert <treeve AT sourcemage.org> 
-       * DETAILS: version 4.3.3 (stable) 
+2009-11-03 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 4.3.3 (stable)
 
 2009-10-28 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: remove support for multiple versions
diff --git a/kde4/kdelibs4/PRE_BUILD b/kde4/kdelibs4/PRE_BUILD
index 0dcce2d..5bd2a53 100755
--- a/kde4/kdelibs4/PRE_BUILD
+++ b/kde4/kdelibs4/PRE_BUILD
@@ -1,3 +1,5 @@
 default_pre_build    &&
 cd $SOURCE_DIRECTORY &&
+patch $SOURCE_DIRECTORY/kdecore/fakes.c  \
+      $SPELL_DIRECTORY/glibc-2.11.patch  &&
 sed -i '/update_xdg_mimetypes/D' mimetypes/CMakeLists.txt
diff --git a/kde4/kdelibs4/glibc-2.11.patch b/kde4/kdelibs4/glibc-2.11.patch
new file mode 100644
index 0000000..58324d8
--- /dev/null
+++ b/kde4/kdelibs4/glibc-2.11.patch
@@ -0,0 +1,167 @@
+#
+# From https://bugs.kde.org/show_bug.cgi?id=213223
+#
+--- branches/KDE/4.3/kdelibs/kdecore/fakes.c   2009/11/07 20:17:03     
1046198
++++ branches/KDE/4.3/kdelibs/kdecore/fakes.c   2009/11/07 20:17:19     
1046199
+@@ -31,7 +31,7 @@
+ 
+ 
+ #define KDE_open open
+-#define KDE_mkdir mkdir 
++#define KDE_mkdir mkdir
+ 
+ 
+ #ifndef HAVE_SETENV
+@@ -39,10 +39,15 @@
+ #ifdef HAVE_ALLOCA_H
+ #include <alloca.h>
+ #endif
+-
++#ifdef HAVE_STRING_H
+ #include <string.h>
++#endif
++#ifdef HAVE_STDLIB_H
+ #include <stdlib.h>
++#endif
++#ifdef HAVE_UNISTD_H
+ #include <unistd.h>
++#endif
+ 
+ KDECORE_EXPORT int setenv(const char *name, const char *value, int 
overwrite) {
+     int i;
+@@ -67,11 +72,18 @@
+ #ifdef HAVE_ALLOCA_H
+ #include <alloca.h>
+ #endif
+-
++#ifdef HAVE_STRING_H
+ #include <string.h>
++#endif
++#ifdef HAVE_STDLIB_H
+ #include <stdlib.h>
++#endif
++#ifdef HAVE_ERRNO_H
+ #include <errno.h>
++#endif
++#ifdef HAVE_UNISTD_H
+ #include <unistd.h>
++#endif
+ 
+ #ifndef environ
+ extern char ** environ;
+@@ -154,24 +166,32 @@
+ {
+     srand48(seed);
+ }
+-#endif
++#endif /* !HAVE_RANDOM */
+ 
+ #ifndef HAVE_SETEUID
+ int seteuid(uid_t euid)
+ {
+     return setreuid(-1, euid); /* Well, if you have neither you are in 
trouble :) */
+ }
+-#endif
++#endif /* !HAVE_SETEUID */
+ 
+ #ifndef HAVE_MKSTEMPS
++#ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
++#endif
+ #ifdef HAVE_SYS_STAT_H
+ #include <sys/stat.h>
+ #endif
+ #include <fcntl.h>
++#ifdef HAVE_STRING_H
+ #include <string.h>
++#endif
++#ifdef HAVE_STRINGS_H
+ #include <strings.h>
++#endif
++#ifdef HAVE_STDLIB_H
+ #include <stdlib.h>
++#endif
+ 
+ /* this is based on code taken from the GNU libc, distributed under the 
LGPL license */
+ 
+@@ -244,12 +264,14 @@
+ {
+   return mkstemps( _template, 0 );
+ }
+-#endif
++#endif /* !HAVE_MKSTEMP */
+ 
+ #ifndef HAVE_MKDTEMP
+ 
+ #ifndef HAVE_MKSTEMPS
++#ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
++#endif
+ #ifdef HAVE_SYS_STAT_H
+ #include <sys/stat.h>
+ #endif
+@@ -306,13 +328,18 @@
+       value += 7777;
+ 
+       if (!KDE_mkdir(_template,0700))
+-      return _template;       
++      return _template;
+     }
+     return 0;
+ }
+ #endif /* !HAVE_MKDTEMP */
+ 
+ #ifndef HAVE_STRLCPY
++
++#ifdef HAVE_STRING_H
++#include <string.h>
++#endif
++
+ KDECORE_EXPORT unsigned long strlcpy(char* d, const char* s, unsigned long 
bufsize)
+ {
+     unsigned long len, ret = strlen(s);
+@@ -325,12 +352,17 @@
+         }
+     } else
+       memcpy(d, s, ret + 1);
+-      
++
+     return ret;
+ }
+-#endif
++#endif /* !HAVE_STRLCPY */
+ 
+ #ifndef HAVE_STRLCAT
++
++#ifdef HAVE_STRING_H
++#include <string.h>
++#endif
++
+ KDECORE_EXPORT unsigned long strlcat(char* d, const char* s, unsigned long 
bufsize)
+ {
+     char *cp;
+@@ -350,7 +382,7 @@
+ 
+     return ret;
+ }
+-#endif
++#endif /* !HAVE_STRLCAT */
+ 
+ #ifndef HAVE_STRCASESTR
+ /*
+@@ -450,7 +482,7 @@
+ ret0:
+   return 0;
+ }
+-#endif
++#endif /* !HAVE_STRCASESTR */
+ 
+ #ifndef HAVE_TRUNC
+ 
+@@ -467,4 +499,4 @@
+ {
+        return x < 0 ? -floor(-x) : floor(x);
+ }
+-#endif
++#endif /* !HAVE_TRUNC */
+