[arch-commits] Commit in kdeedu/trunk (PKGBUILD cmake-build-fixes-2.diff)

[Andrea Scarpino]

    Date: Wednesday, May 4, 2011 @ 17:20:07
  Author: andrea
Revision: 122608

KDE 4.6.3

Added:
  kdeedu/trunk/cmake-build-fixes-2.diff
Modified:
  kdeedu/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   13 ++--
 cmake-build-fixes-2.diff |  125 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 133 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-04 20:32:43 UTC (rev 122607)
+++ PKGBUILD	2011-05-04 21:20:07 UTC (rev 122608)
@@ -25,23 +25,26 @@
          'kdeedu-parley'
          'kdeedu-rocs'
          'kdeedu-step')
-pkgver=4.6.2
-pkgrel=2
+pkgver=4.6.3
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'ocaml' 'facile' 'cfitsio' 'gpsd'
 	'kdebase-runtime' 'libqalculate' 'gsl' 'boost' 'libindi' 'r' 'libspectre'
-	'python2' 'docbook-xsl' 'avogadro')
+	'python2' 'avogadro')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-        'gpsd-2.96.patch')
+        'gpsd-2.96.patch'
+        'cmake-build-fixes-2.diff')
 sha1sums=('7c94a10f5c17237dcd5c348a8ac129973934cf05'
-          'fd6b6b81945d951bb6ad0bb735df33c11bb2008e')
+          'fd6b6b81945d951bb6ad0bb735df33c11bb2008e'
+          '2c2f3985734a47d6e0f5142604e197fb050ff547')
 
 build() {
     cd ${srcdir}/${pkgbase}-${pkgver}
     patch -Np1 -i ${srcdir}/gpsd-2.96.patch
+    patch -p1 -i ${srcdir}/cmake-build-fixes-2.diff
 
     cd ${srcdir}
 	mkdir build

Added: cmake-build-fixes-2.diff
===================================================================
--- cmake-build-fixes-2.diff	                        (rev 0)
+++ cmake-build-fixes-2.diff	2011-05-04 21:20:07 UTC (rev 122608)
@@ -0,0 +1,125 @@
+--- blinken/src/blinken.cpp
++++ blinken/src/blinken.cpp
+@@ -28,7 +28,7 @@
+ 
+ #include "button.h"
+ #include "counter.h"
+-#include "libkdeedu/kedufontutils.h"
++#include <kedufontutils.h>
+ #include "number.h"
+ #include "highscoredialog.h"
+ #include "settings.h"
+--- blinken/src/highscoredialog.cpp
++++ blinken/src/highscoredialog.cpp
+@@ -19,7 +19,7 @@
+ #include <ktabwidget.h>
+ 
+ #include "counter.h"
+-#include "libkdeedu/kedufontutils.h"
++#include <kedufontutils.h>
+ #include "settings.h"
+ 
+ static const int margin = 15;
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -2,6 +2,11 @@
+ 
+ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
+ 
++include_directories(
++   ${CMAKE_SOURCE_DIR}/libkdeedu/kdeeduui
++   ${CMAKE_SOURCE_DIR}/libkdeedu/keduvocdocument
++)
++
+ # search packages used by KDE
+ find_package(KDE4 4.3.80 REQUIRED)
+ if(WIN32)
+--- kanagram/src/CMakeLists.txt
++++ kanagram/src/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ 
+-find_path(LIBKEDUVOCDOCUMENT_INCLUDE_DIR keduvocdocument.h PATH_SUFFIXES libkdeedu)
+-include_directories( ${LIBKEDUVOCDOCUMENT_INCLUDE_DIR} )
+-
++include_directories(
++   ${CMAKE_SOURCE_DIR}/libkdeedu/kdeeduui
++   ${CMAKE_SOURCE_DIR}/libkdeedu/keduvocdocument
++)
+ 
+ ########### next target ###############
+ 
+--- kanagram/src/kanagram.cpp
++++ kanagram/src/kanagram.cpp
+@@ -51,7 +51,7 @@
+ #include "kanagramsettings.h"
+ #include "mainsettings.h"
+ #include "vocabsettings.h"
+-#include "libkdeedu/kedufontutils.h"
++#include <kedufontutils.h>
+ 
+ static const char* m_textRevealWord = I18N_NOOP("reveal word");
+ static const char* m_textHint = I18N_NOOP("hint");
+--- khangman/src/CMakeLists.txt
++++ khangman/src/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ 
+ find_path(LIBKEDUVOCDOCUMENT_INCLUDE_DIR keduvocdocument.h PATH_SUFFIXES libkdeedu)
+-include_directories( ${LIBKEDUVOCDOCUMENT_INCLUDE_DIR} )
++#include_directories( ${LIBKEDUVOCDOCUMENT_INCLUDE_DIR} )
+ 
+ ########### next target ###############
+ 
+--- kwordquiz/src/CMakeLists.txt
++++ kwordquiz/src/CMakeLists.txt
+@@ -4,7 +4,6 @@
+ add_subdirectory( examples )
+ 
+ find_path(LIBKEDUVOCDOCUMENT_INCLUDE_DIR keduvocdocument.h PATH_SUFFIXES libkdeedu)
+-include_directories( ${LIBKEDUVOCDOCUMENT_INCLUDE_DIR} )
+ 
+ 
+ ########### next target ###############
+--- libkdeedu/LibKdeEduConfig.cmake.in
++++ libkdeedu/LibKdeEduConfig.cmake.in
+@@ -28,7 +28,7 @@
+ endif(NOT WIN32)
+ 
+ if( NOT TARGET LibKdeEduImport__keduvocdocument )
+-    include("${_LIBKDEEDU_CURRENT_DIR}/LibKdeEduTargets.cmake")
++   # include("${_LIBKDEEDU_CURRENT_DIR}/LibKdeEduTargets.cmake")
+ endif( NOT TARGET LibKdeEduImport__keduvocdocument )
+ 
+ macro( _libkdeedu_set_lib_vars _prefix _lib )
+--- parley/plasmoid/CMakeLists.txt
++++ parley/plasmoid/CMakeLists.txt
+@@ -11,7 +11,7 @@
+ kde4_add_plugin(plasma_applet_parley ${parley_plasma_SRCS})
+ target_link_libraries(plasma_applet_parley
+     plasma ${KDE4_KIO_LIBS}
+-    ${LIBKDEEDU_KEDUVOCDOCUMENT_LIBRARIES}
++    keduvocdocument
+     )
+ 
+ install(
+--- parley/plasmoid/engine/CMakeLists.txt
++++ parley/plasmoid/engine/CMakeLists.txt
+@@ -7,7 +7,7 @@
+ kde4_add_plugin(plasma_engine_parley ${parley_engine_SRCS})
+ target_link_libraries(plasma_engine_parley ${KDE4_KDECORE_LIBS}
+   plasma
+-  ${LIBKDEEDU_KEDUVOCDOCUMENT_LIBRARIES}
++  keduvocdocument
+ )
+ 
+ install(TARGETS plasma_engine_parley DESTINATION ${PLUGIN_INSTALL_DIR})
+--- parley/src/CMakeLists.txt
++++ parley/src/CMakeLists.txt
+@@ -164,7 +164,7 @@
+ 
+ target_link_libraries(
+     parley
+-    ${LIBKDEEDU_KEDUVOCDOCUMENT_LIBRARIES}
++    keduvocdocument
+     ${KDE4_KHTML_LIBS}
+     ${KDE4_KNEWSTUFF3_LIBS}
+     ${KDE4_PHONON_LIBS}
\ No newline at end of file