Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Julien ROZO (20410375add6585af3eea813ac2cd462172b327f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Julien ROZO <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Julien ROZO (20410375add6585af3eea813ac2cd462172b327f)
  • Date: Fri, 3 Oct 2008 15:20:39 -0500

GIT changes to master grimoire by Julien ROZO <julien AT rozo.org>:

kde4/kdesdk4/HISTORY | 4 ++++
kde4/kdesdk4/PRE_BUILD | 8 ++++++++
kde4/kdesdk4/kdesdk-findsvn.patch | 25 +++++++++++++++++++++++++
kde4/kdewebdev4/DETAILS | 4 ++--
kde4/kdewebdev4/HISTORY | 3 +++
5 files changed, 42 insertions(+), 2 deletions(-)

New commits:
commit 20410375add6585af3eea813ac2cd462172b327f
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

kdewebdev4: updated version to 4.1.2

commit 5a04ab71014a25a287d43bf9169aadf5ef5ecdd6
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

kdesdk4 : added patch to fix compilation issue of stable version with
apr-util

diff --git a/kde4/kdesdk4/HISTORY b/kde4/kdesdk4/HISTORY
index 8428d9c..5e473dc 100644
--- a/kde4/kdesdk4/HISTORY
+++ b/kde4/kdesdk4/HISTORY
@@ -1,3 +1,7 @@
+2008-10-03 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * PRE_BUILD, kdesdk-findsvn.patch: added patch to fix compilation
issue
+ of stable version with apr-util
+
2008-10-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.1.2

diff --git a/kde4/kdesdk4/PRE_BUILD b/kde4/kdesdk4/PRE_BUILD
new file mode 100755
index 0000000..4da74b0
--- /dev/null
+++ b/kde4/kdesdk4/PRE_BUILD
@@ -0,0 +1,8 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+# fix compilation issue of 4.1.x version with apr-util
+# see http://bugs.kde.org/show_bug.cgi?id=161005
+if [[ ${KDE_VER} == stable ]];then
+ patch -p0 < $SPELL_DIRECTORY/kdesdk-findsvn.patch
+fi
diff --git a/kde4/kdesdk4/kdesdk-findsvn.patch
b/kde4/kdesdk4/kdesdk-findsvn.patch
new file mode 100644
index 0000000..9041cb6
--- /dev/null
+++ b/kde4/kdesdk4/kdesdk-findsvn.patch
@@ -0,0 +1,25 @@
+--- ./cmake/modules/FindSVN.cmake.orig 2008-09-26 13:35:20.000000000 +0200
++++ ./cmake/modules/FindSVN.cmake 2008-09-26 13:40:02.000000000 +0200
+@@ -17,6 +17,9 @@
+ FIND_PROGRAM(APRCONFIG_EXECUTABLE NAMES apr-1-config apr-config PATHS
+ /usr/local/apr/bin
+ )
++FIND_PROGRAM(APUCONFIG_EXECUTABLE NAMES apu-1-config apu-config PATHS
++ /usr/local/apr/bin
++)
+
+ if(SVNCONFIG_EXECUTABLE)
+
+@@ -72,6 +75,11 @@
+ set(SVN_FOUND FALSE) # no apr == can't compile!
+ endif(_INCLUDES)
+ endif(APRCONFIG_EXECUTABLE)
++ if(APUCONFIG_EXECUTABLE)
++ EXEC_PROGRAM(${APUCONFIG_EXECUTABLE} ARGS --includes RETURN_VALUE
_return_VALUE OUTPUT_VARIABLE _INCLUDES)
++ string(REPLACE "-I" "" _INCLUDES ${_INCLUDES})
++ set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
++ endif(APUCONFIG_EXECUTABLE)
+ FIND_LIBRARY(SVN_LIBRARIES NAMES svn_client-1)
+ if(SVN_LIBRARIES)
+ FIND_LIBRARY(_LIBRARIES NAMES svn_subr-1)
+
diff --git a/kde4/kdewebdev4/DETAILS b/kde4/kdewebdev4/DETAILS
index e475159..cd3d32d 100755
--- a/kde4/kdewebdev4/DETAILS
+++ b/kde4/kdewebdev4/DETAILS
@@ -18,8 +18,8 @@ else
VERSION=4.1.68

SOURCE_HASH=sha512:4d1ed708ec9f55621d77b92ddf8fdcd5d39c1a035825239b6d8487c76070ed4fa8850926c9c339e187f75f2688ec299ef82afb40a68308eb003311ebe1f32935
else
- VERSION=4.1.1
-
SOURCE_HASH=sha512:91a19ef4a8937f6ca46b531be63570f66f3c2413f4617f8936727cf4a9d1944c0ef484b90ab9f8c0843c15f90124d312d46e9079567b88a03ca1463de6cddc11
+ VERSION=4.1.2
+
SOURCE_HASH=sha512:56d46dfccf5e319b898c4e14e7bcfe50fed2b3423af04c8865b6ef68b2ad1d37e6f7fc46cd6c6d456fc83c8420d9c664f6e3df14dba3320079659af2641e4907
fi
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_URL[0]=$KDE_URL/${KDE_VER:-stable}/${VERSION}/src/$SOURCE
diff --git a/kde4/kdewebdev4/HISTORY b/kde4/kdewebdev4/HISTORY
index fa4bfad..1ffddb4 100644
--- a/kde4/kdewebdev4/HISTORY
+++ b/kde4/kdewebdev4/HISTORY
@@ -1,3 +1,6 @@
+2008-10-03 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 4.1.2
+
2008-10-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.1.68




  • [SM-Commit] GIT changes to master grimoire by Julien ROZO (20410375add6585af3eea813ac2cd462172b327f), Julien ROZO, 10/03/2008

Archive powered by MHonArc 2.6.24.

Top of Page