Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-kde49 grimoire by Ladislav Hagara (5db6b928aedc3ca0deab3b1070f694de931cf579)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-kde49 grimoire by Ladislav Hagara (5db6b928aedc3ca0deab3b1070f694de931cf579)
  • Date: Thu, 16 Aug 2012 17:45:46 -0500

GIT changes to devel-kde49 grimoire by Ladislav Hagara <hgr AT vabo.cz>:

kde4/kdesdk4/DETAILS | 4 ++--
kde4/kdesdk4/HISTORY | 4 ++++
kde4/kdesdk4/PRE_BUILD | 7 +------
kde4/kdesdk4/kdesdk-findsvn.patch | 25 -------------------------
4 files changed, 7 insertions(+), 33 deletions(-)

New commits:
commit 5db6b928aedc3ca0deab3b1070f694de931cf579
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

kdesdk4 4.9.0

diff --git a/kde4/kdesdk4/DETAILS b/kde4/kdesdk4/DETAILS
index e4d50f2..c99cf68 100755
--- a/kde4/kdesdk4/DETAILS
+++ b/kde4/kdesdk4/DETAILS
@@ -1,7 +1,7 @@
SPELL=kdesdk4
SPELLX=${SPELL//4}
- VERSION=4.8.4
-
SOURCE_HASH=sha512:a5f52e1bd51fd283902f620e4d0e37030bc6a2e6046632471f7c73482ffc1a491f25356f998514726bd7d3eb13bf386478cce81fed8bc7e0f6b69e81445b9740
+ VERSION=4.9.0
+
SOURCE_HASH=sha512:24e4850eab23b61d36053ea19a3703a35e2922ebf0e88c8c94fb9b2e9ee706e8c64f560b4db69cf157623e8cbe1fbc36b56302452273278c555a73713e031fac
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL[0]=$KDE_URL/stable/$VERSION/src/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/kde4/kdesdk4/HISTORY b/kde4/kdesdk4/HISTORY
index e33db5f..37d5545 100644
--- a/kde4/kdesdk4/HISTORY
+++ b/kde4/kdesdk4/HISTORY
@@ -1,3 +1,7 @@
+2012-08-16 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.9.0
+ * PRE_BUILD, kdesdk-findsvn.patch: patch removed
+
2012-07-30 Sukneet Basuta <sukneet AT sourcemage.org>
* DEPENDS, BUILD: use % instead of @ to pass cmake flags,
as prepare_cmake_flags handles this
diff --git a/kde4/kdesdk4/PRE_BUILD b/kde4/kdesdk4/PRE_BUILD
index a282d74..a1da686 100755
--- a/kde4/kdesdk4/PRE_BUILD
+++ b/kde4/kdesdk4/PRE_BUILD
@@ -1,9 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

-sedit '/update_xdg_mimetypes/D' okteta/mimetypes/CMakeLists.txt &&
-# fix compilation issue of 4.1.x version with apr-util
-# see http://bugs.kde.org/show_bug.cgi?id=161005
-if [ "$KDESDK_SUBVERSION" == "y" ]; then
- patch -p0 < $SPELL_DIRECTORY/kdesdk-findsvn.patch
-fi
+sedit '/update_xdg_mimetypes/D' okteta/mimetypes/CMakeLists.txt
diff --git a/kde4/kdesdk4/kdesdk-findsvn.patch
b/kde4/kdesdk4/kdesdk-findsvn.patch
deleted file mode 100644
index 9041cb6..0000000
--- a/kde4/kdesdk4/kdesdk-findsvn.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- ./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)
-



  • [SM-Commit] GIT changes to devel-kde49 grimoire by Ladislav Hagara (5db6b928aedc3ca0deab3b1070f694de931cf579), Ladislav Hagara, 08/16/2012

Archive powered by MHonArc 2.6.24.

Top of Page