[arch-commits] Commit in kdeedu/trunk (PKGBUILD cmake-build-fixes-2.diff)
Andrea Scarpino
andrea at archlinux.org
Thu May 5 21:05:29 UTC 2011
Date: Thursday, May 5, 2011 @ 17:05:28
Author: andrea
Revision: 122660
new tarball
Modified:
kdeedu/trunk/PKGBUILD
Deleted:
kdeedu/trunk/cmake-build-fixes-2.diff
--------------------------+
PKGBUILD | 74 ++++++++++----------------
cmake-build-fixes-2.diff | 125 ---------------------------------------------
2 files changed, 30 insertions(+), 169 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-05-05 16:46:06 UTC (rev 122659)
+++ PKGBUILD 2011-05-05 21:05:28 UTC (rev 122660)
@@ -5,7 +5,6 @@
pkgbase=kdeedu
pkgname=('kdeedu-blinken'
'kdeedu-cantor'
- 'kdeedu-data'
'kdeedu-kalgebra'
'kdeedu-kalzium'
'kdeedu-kanagram'
@@ -35,16 +34,13 @@
'kdebase-runtime' 'libqalculate' 'gsl' 'boost' 'libindi' 'r' 'libspectre'
'python2' 'avogadro')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
- 'gpsd-2.96.patch'
- 'cmake-build-fixes-2.diff')
-sha1sums=('7c94a10f5c17237dcd5c348a8ac129973934cf05'
- 'fd6b6b81945d951bb6ad0bb735df33c11bb2008e'
- '2c2f3985734a47d6e0f5142604e197fb050ff547')
+ 'gpsd-2.96.patch')
+sha1sums=('a3e88f234ab4efe71f2169d3d81764300cde7248'
+ 'fd6b6b81945d951bb6ad0bb735df33c11bb2008e')
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
@@ -63,7 +59,7 @@
install='kdeedu.install'
cd $srcdir/build/blinken
make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/blinken
+ cd $srcdir/build/blinken/doc
make DESTDIR=$pkgdir install
}
@@ -76,24 +72,17 @@
install='kdeedu.install'
cd $srcdir/build/cantor
make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/cantor
+ cd $srcdir/build/cantor/doc
make DESTDIR=$pkgdir install
}
-package_kdeedu-data() {
- pkgdesc='Data for KDE Educational Software'
- groups=()
- cd $srcdir/build/data
- make DESTDIR=$pkgdir install
-}
-
package_kdeedu-kalgebra() {
pkgdesc='Math Expression Solver and Plotter'
depends=('kdebase-runtime')
install='kdeedu.install'
cd $srcdir/build/kalgebra
make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kalgebra
+ cd $srcdir/build/kalgebra/doc
make DESTDIR=$pkgdir install
}
@@ -103,17 +92,17 @@
install='kdeedu.install'
cd $srcdir/build/kalzium
make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kalzium
+ cd $srcdir/build/kalzium/doc
make DESTDIR=$pkgdir install
}
package_kdeedu-kanagram() {
pkgdesc='KDE Letter Order Game'
- depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data')
+ depends=('kdebase-runtime' 'kdeedu-libkdeedu')
install='kdeedu.install'
cd $srcdir/build/kanagram
make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kanagram
+ cd $srcdir/build/kanagram/doc
make DESTDIR=$pkgdir install
}
@@ -123,7 +112,7 @@
install='kdeedu.install'
cd $srcdir/build/kbruch
make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kbruch
+ cd $srcdir/build/kbruch/doc
make DESTDIR=$pkgdir install
}
@@ -133,17 +122,17 @@
install='kdeedu.install'
cd $srcdir/build/kgeography
make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kgeography
+ cd $srcdir/build/kgeography/doc
make DESTDIR=$pkgdir install
}
package_kdeedu-khangman() {
pkgdesc='KDE Hangman Game'
- depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data')
+ depends=('kdebase-runtime' 'kdeedu-libkdeedu')
install='kdeedu.install'
cd $srcdir/build/khangman
make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/khangman
+ cd $srcdir/build/khangman/doc
make DESTDIR=$pkgdir install
}
@@ -153,7 +142,7 @@
install='kdeedu.install'
cd $srcdir/build/kig
make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kig
+ cd $srcdir/build/kig/doc
make DESTDIR=$pkgdir install
# Use the python2 executable
@@ -166,7 +155,7 @@
install='kdeedu.install'
cd $srcdir/build/kiten
make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kiten
+ cd $srcdir/build/kiten/doc
make DESTDIR=$pkgdir install
}
@@ -176,7 +165,7 @@
install='kdeedu.install'
cd $srcdir/build/klettres
make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/klettres
+ cd $srcdir/build/klettres/doc
make DESTDIR=$pkgdir install
}
@@ -186,7 +175,7 @@
install='kdeedu.install'
cd $srcdir/build/kmplot
make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kmplot
+ cd $srcdir/build/kmplot/doc
make DESTDIR=$pkgdir install
}
@@ -196,7 +185,7 @@
install='kdeedu.install'
cd $srcdir/build/kstars
make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kstars
+ cd $srcdir/build/kstars/doc
make DESTDIR=$pkgdir install
}
@@ -206,7 +195,7 @@
install='kdeedu.install'
cd $srcdir/build/ktouch
make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/ktouch
+ cd $srcdir/build/ktouch/doc
make DESTDIR=$pkgdir install
}
@@ -216,17 +205,17 @@
install='kdeedu.install'
cd $srcdir/build/kturtle
make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kturtle
+ cd $srcdir/build/kturtle/doc
make DESTDIR=$pkgdir install
}
package_kdeedu-kwordquiz() {
pkgdesc='A flashcard and vocabulary learning program'
- depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data')
+ depends=('kdebase-runtime' 'kdeedu-libkdeedu')
install='kdeedu.install'
cd $srcdir/build/kwordquiz
make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kwordquiz
+ cd $srcdir/build/kwordquiz/doc
make DESTDIR=$pkgdir install
}
@@ -234,11 +223,10 @@
pkgdesc='Support library for KDE Educational Software'
groups=()
depends=('kdelibs')
+ replaces=('kdeedu-data')
install='kdeedu.install'
cd $srcdir/build/libkdeedu
make DESTDIR=$pkgdir install
- install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindKDEEdu.cmake \
- $pkgdir/usr/share/apps/cmake/modules/FindKDEEdu.cmake
}
package_kdeedu-marble() {
@@ -247,19 +235,17 @@
install='kdeedu.install'
cd $srcdir/build/marble
make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/marble
- make DESTDIR=$pkgdir install
- install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindMarbleWidget.cmake \
- $pkgdir/usr/share/apps/cmake/modules/FindMarbleWidget.cmake
+# cd $srcdir/build/marble/doc
+# make DESTDIR=$pkgdir install
}
package_kdeedu-parley() {
pkgdesc='Vocabulary Trainer'
- depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data' 'kdebindings-python')
+ depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdebindings-python')
install='kdeedu.install'
cd $srcdir/build/parley
make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/parley
+ cd $srcdir/build/parley/doc
make DESTDIR=$pkgdir install
}
@@ -269,8 +255,8 @@
install='kdeedu.install'
cd $srcdir/build/rocs
make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/rocs
- make DESTDIR=$pkgdir install
+# cd $srcdir/build/rocs/doc
+# make DESTDIR=$pkgdir install
}
package_kdeedu-step() {
@@ -279,6 +265,6 @@
install='kdeedu.install'
cd $srcdir/build/step
make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/step
+ cd $srcdir/build/step/doc
make DESTDIR=$pkgdir install
}
Deleted: cmake-build-fixes-2.diff
===================================================================
--- cmake-build-fixes-2.diff 2011-05-05 16:46:06 UTC (rev 122659)
+++ cmake-build-fixes-2.diff 2011-05-05 21:05:28 UTC (rev 122660)
@@ -1,125 +0,0 @@
---- 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
More information about the arch-commits
mailing list