Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (5682c1d80b03ab515321a21b372f3d2ab080b51a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (5682c1d80b03ab515321a21b372f3d2ab080b51a)
  • Date: Sun, 27 Apr 2008 02:05:39 -0500

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

kde-apps/kid3/DEPENDS | 9 +++--
kde-apps/kid3/HISTORY | 4 ++
kde-core/kdelibs/HISTORY | 3 +
kde-core/kdelibs/PRE_SUB_DEPENDS | 1
kde-core/kdelibs/SUB_DEPENDS | 3 +
libs/xalan-c/HISTORY | 4 ++
libs/xalan-c/PRE_BUILD | 3 +
libs/xalan-c/gcc43.patch | 60
+++++++++++++++++++++++++++++++++++++++
8 files changed, 84 insertions(+), 3 deletions(-)

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

kid3: Use libxslt with kdelibs or docbook-utils (Fixes Bug #14496)

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

kdelibs: Allow forcing libxslt dependency

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

xalan-c: Fix compilation with gcc 4.3.0

diff --git a/kde-apps/kid3/DEPENDS b/kde-apps/kid3/DEPENDS
index f3e25a9..6adb54d 100755
--- a/kde-apps/kid3/DEPENDS
+++ b/kde-apps/kid3/DEPENDS
@@ -2,11 +2,14 @@ depends g++ &&

if [[ $KID3_KDE == "--with-kde" ]]
then
+ depends libxslt &&
+ depends -sub 'XSLT' kdelibs &&
. "$SECTION_DIRECTORY/KDE_DEPENDS"
else
- depends X11-LIBS &&
- depends qt-x11 &&
- depends libpng &&
+ depends docbook-utils &&
+ depends X11-LIBS &&
+ depends qt-x11 &&
+ depends libpng &&
. "$GRIMOIRE/FUNCTIONS" &&
if check_if_xorg_modular_libs
then
diff --git a/kde-apps/kid3/HISTORY b/kde-apps/kid3/HISTORY
index 8c7210d..e2cac1f 100644
--- a/kde-apps/kid3/HISTORY
+++ b/kde-apps/kid3/HISTORY
@@ -1,3 +1,7 @@
+2008-04-26 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on libxslt if using kdelibs or docbook-utils
+ if not (Bug #14496)
+
2008-04-16 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 1.0

diff --git a/kde-core/kdelibs/HISTORY b/kde-core/kdelibs/HISTORY
index 403a524..67d6281 100644
--- a/kde-core/kdelibs/HISTORY
+++ b/kde-core/kdelibs/HISTORY
@@ -1,3 +1,6 @@
+2008-04-26 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_SUB_DEPENDS, SUB_DEPENDS: Allow forcing libxslt dependency
+
2008-04-22 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Optionally depends on mdnsresponder

diff --git a/kde-core/kdelibs/PRE_SUB_DEPENDS
b/kde-core/kdelibs/PRE_SUB_DEPENDS
index 9839dc8..5eaa5bb 100755
--- a/kde-core/kdelibs/PRE_SUB_DEPENDS
+++ b/kde-core/kdelibs/PRE_SUB_DEPENDS
@@ -2,5 +2,6 @@ case $THIS_SUB_DEPENDS in
SVG) is_depends_enabled $SPELL libart_lgpl && return 0;;
SSL) is_depends_enabled $SPELL openssl && return 0;;
ARTS) is_depends_enabled $SPELL arts && return 0;;
+ XSLT) is_depends_enabled $SPELL libxslt && return 0;;
esac
return 1
diff --git a/kde-core/kdelibs/SUB_DEPENDS b/kde-core/kdelibs/SUB_DEPENDS
index f432249..e9c7c88 100755
--- a/kde-core/kdelibs/SUB_DEPENDS
+++ b/kde-core/kdelibs/SUB_DEPENDS
@@ -8,5 +8,8 @@ SSL) echo "SSL support requested, forcing openssl
dependency." &&
ARTS) echo "aRts support requested, forcing arts dependency." &&
depends arts
;;
+XSLT) echo "XSLT support requested, forcing libxslt dependency." &&
+ depends libxslt
+ ;;
*) echo unknown sub-depends!!! ; return 1 ;;
esac
diff --git a/libs/xalan-c/HISTORY b/libs/xalan-c/HISTORY
index cf5304e..69bd90b 100644
--- a/libs/xalan-c/HISTORY
+++ b/libs/xalan-c/HISTORY
@@ -1,3 +1,7 @@
+2008-04-26 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gcc43.patch
+ * gcc43.patch: Fix compilation with GCC 4.3.0
+
2007-05-30 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, BUILD, INSTALL: created this spell, version 1_10_0

diff --git a/libs/xalan-c/PRE_BUILD b/libs/xalan-c/PRE_BUILD
new file mode 100755
index 0000000..34cce88
--- /dev/null
+++ b/libs/xalan-c/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch
diff --git a/libs/xalan-c/gcc43.patch b/libs/xalan-c/gcc43.patch
new file mode 100644
index 0000000..08ab96d
--- /dev/null
+++ b/libs/xalan-c/gcc43.patch
@@ -0,0 +1,60 @@
+diff -Naur
xml-xalan.orig/c/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp
xml-xalan/c/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp
+--- xml-xalan.orig/c/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp
2008-04-26 23:26:57.562243805 -0700
++++ xml-xalan/c/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp
2008-04-26 23:35:04.648219538 -0700
+@@ -33,7 +33,7 @@
+ #endif
+
+
+-
++#include <cstring>
+ #include <functional>
+ #include <iterator>
+
+diff -Naur xml-xalan.orig/c/src/xalanc/XalanDOM/XalanDOMString.cpp
xml-xalan/c/src/xalanc/XalanDOM/XalanDOMString.cpp
+--- xml-xalan.orig/c/src/xalanc/XalanDOM/XalanDOMString.cpp 2008-04-26
23:26:57.543246489 -0700
++++ xml-xalan/c/src/xalanc/XalanDOM/XalanDOMString.cpp 2008-04-26
23:29:52.102244630 -0700
+@@ -19,7 +19,7 @@
+
+
+ #include <cassert>
+-
++#include <cstring>
+
+
+ #include <xalanc/Include/XalanMemMngArrayAllocate.hpp>
+diff -Naur xml-xalan.orig/c/src/xalanc/XalanExe/XalanExe.cpp
xml-xalan/c/src/xalanc/XalanExe/XalanExe.cpp
+--- xml-xalan.orig/c/src/xalanc/XalanExe/XalanExe.cpp 2008-04-26
23:26:57.539246609 -0700
++++ xml-xalan/c/src/xalanc/XalanExe/XalanExe.cpp 2008-04-26
23:39:40.217246885 -0700
+@@ -19,6 +19,8 @@
+
+
+ #include <cstdlib>
++#include <cstring>
++
+ #if defined(XALAN_CLASSIC_IOSTREAMS)
+ #include <iostream.h>
+ #else
+diff -Naur xml-xalan.orig/c/src/xalanc/XMLSupport/FormatterToHTML.cpp
xml-xalan/c/src/xalanc/XMLSupport/FormatterToHTML.cpp
+--- xml-xalan.orig/c/src/xalanc/XMLSupport/FormatterToHTML.cpp 2008-04-26
23:26:57.558245951 -0700
++++ xml-xalan/c/src/xalanc/XMLSupport/FormatterToHTML.cpp 2008-04-26
23:29:44.427218893 -0700
+@@ -26,7 +26,7 @@
+
+
+ #include <cassert>
+-
++#include <cstring>
+
+
+ #include <xercesc/sax/AttributeList.hpp>
+diff -Naur xml-xalan.orig/c/src/xalanc/XSLT/ElemNumber.cpp
xml-xalan/c/src/xalanc/XSLT/ElemNumber.cpp
+--- xml-xalan.orig/c/src/xalanc/XSLT/ElemNumber.cpp 2008-04-26
23:26:57.549242642 -0700
++++ xml-xalan/c/src/xalanc/XSLT/ElemNumber.cpp 2008-04-26 23:32:11.155219240
-0700
+@@ -15,7 +15,7 @@
+ */
+ #include "ElemNumber.hpp"
+
+-
++#include <cstring>
+
+ #include <xercesc/sax/AttributeList.hpp>
+



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (5682c1d80b03ab515321a21b372f3d2ab080b51a), Eric Sandall, 04/27/2008

Archive powered by MHonArc 2.6.24.

Top of Page