Source Mage code commit list

[Thomas Orgis <scm AT mail.sourcemage.org>]

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

 printer/xpp/HISTORY                |    3 +++
 printer/xpp/PRE_BUILD              |    3 +++
 printer/xpp/xpp-1.5-gcc-4.1.patch  |   12 ++++++++++++
 windowmanagers/windowmaker/BUILD   |   12 +++++++++---
 windowmanagers/windowmaker/HISTORY |    3 +++
 5 files changed, 30 insertions(+), 3 deletions(-)

New commits:
commit 5798668376eb4f02b1b063d9b792aea2f17241f0
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    xpp: fix syntax issue, makes it work with gcc-4.1

commit a6809323a35825b02349171a389076c473342266
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    windowmaker: do not disable PIC on alpha

diff --git a/printer/xpp/HISTORY b/printer/xpp/HISTORY
index 71a01d6..95fc857 100644
--- a/printer/xpp/HISTORY
+++ b/printer/xpp/HISTORY
@@ -1,3 +1,6 @@
+2006-12-31 Thomas Orgis <sobukus AT sourcemage.org>
+       * xpp-1.5-gcc-4.1.patch, PRE_BUILD: fix C++ syntax issue
+
 2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: [automated] Removed UPDATED.
 
diff --git a/printer/xpp/PRE_BUILD b/printer/xpp/PRE_BUILD
new file mode 100755
index 0000000..866f1a6
--- /dev/null
+++ b/printer/xpp/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+patch < "$SCRIPT_DIRECTORY/xpp-1.5-gcc-4.1.patch"
diff --git a/printer/xpp/xpp-1.5-gcc-4.1.patch 
b/printer/xpp/xpp-1.5-gcc-4.1.patch
new file mode 100644
index 0000000..a546d7b
--- /dev/null
+++ b/printer/xpp/xpp-1.5-gcc-4.1.patch
@@ -0,0 +1,12 @@
+diff -ruN xpp-1.5.orig/xpp.h xpp-1.5/xpp.h
+--- xpp-1.5.orig/xpp.h 2006-12-31 22:07:11.000000000 +0100
++++ xpp-1.5/xpp.h      2006-12-31 22:08:45.000000000 +0100
+@@ -177,7 +177,7 @@
+    */
+ 
+   int /* O - index of the record of the given option in the array */
+-  printFiles::getSpecialOptionIndex(int *num_special_opts_in_arr,
++  getSpecialOptionIndex(int *num_special_opts_in_arr,
+                                     /* number of options in the array */
+                                     special_opt_t **special_opts_arr,
+                                       /* array of numerical/string 
diff --git a/windowmanagers/windowmaker/BUILD 
b/windowmanagers/windowmaker/BUILD
index 645483a..dfc5b48 100755
--- a/windowmanagers/windowmaker/BUILD
+++ b/windowmanagers/windowmaker/BUILD
@@ -1,3 +1,9 @@
-OPTS="--without-pic ${OPTS}" &&
-disable_pic force            &&
-default_build
+if [ ${SMGL_COMPAT_ARCHS[1]} != alpha ]; then
+  message "disabling PIC on non-alpha arch" &&
+  OPTS="--without-pic ${OPTS}" &&
+  disable_pic force            &&
+  default_build
+else
+  message "we are on alpha, letting it PIC" &&
+  default_build
+fi
diff --git a/windowmanagers/windowmaker/HISTORY 
b/windowmanagers/windowmaker/HISTORY
index ad5cb12..50949ce 100644
--- a/windowmanagers/windowmaker/HISTORY
+++ b/windowmanagers/windowmaker/HISTORY
@@ -1,3 +1,6 @@
+2006-12-31 Thomas Orgis <sobukus AT sourcemage.org>
+       * BUILD: do _not_ disable PIC on alpha!
+
 2006-12-02 Eric Sandall <eric AT sandall.us>
        * DEPENDS: Changed dependency on libungif to LIBGIF