From 1a1b748f1738b1989a834d75b1623be21bf9bab5 Mon Sep 17 00:00:00 2001 From: Parabola Date: Mon, 11 Jul 2011 18:35:04 +0000 Subject: Mon Jul 11 18:34:51 UTC 2011 --- staging/kdeedu/PKGBUILD | 273 ----------------------- staging/kdeedu/gpsd-2.96.patch | 43 ---- staging/kdeedu/kdeedu.install | 11 - staging/kdeedu/remove-libkdeedu-libscience.patch | 10 - 4 files changed, 337 deletions(-) delete mode 100644 staging/kdeedu/PKGBUILD delete mode 100644 staging/kdeedu/gpsd-2.96.patch delete mode 100644 staging/kdeedu/kdeedu.install delete mode 100644 staging/kdeedu/remove-libkdeedu-libscience.patch (limited to 'staging/kdeedu') diff --git a/staging/kdeedu/PKGBUILD b/staging/kdeedu/PKGBUILD deleted file mode 100644 index 449a41c1c..000000000 --- a/staging/kdeedu/PKGBUILD +++ /dev/null @@ -1,273 +0,0 @@ -# $Id: PKGBUILD 130257 2011-07-04 19:27:28Z andrea $ -# Maintainer: Andrea Scarpino -# Contributor: Pierre Schmitz - -pkgbase=kdeedu -pkgname=('kdeedu-blinken' - 'kdeedu-cantor' - 'kdeedu-kalgebra' - 'kdeedu-kalzium' - 'kdeedu-kanagram' - 'kdeedu-kbruch' - 'kdeedu-kgeography' - 'kdeedu-khangman' - 'kdeedu-kig' - 'kdeedu-kiten' - 'kdeedu-klettres' - 'kdeedu-kmplot' - 'kdeedu-kstars' - 'kdeedu-ktouch' - 'kdeedu-kturtle' - 'kdeedu-kwordquiz' - 'kdeedu-libkdeedu' - 'kdeedu-marble' - 'kdeedu-parley' - 'kdeedu-rocs' - 'kdeedu-step') -pkgver=4.6.5 -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' 'avogadro') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" - 'gpsd-2.96.patch' - 'remove-libkdeedu-libscience.patch') -sha1sums=('64247eb68b2710a66baaf824d798e46b34ca4d4f' - 'fd6b6b81945d951bb6ad0bb735df33c11bb2008e' - 'cd4e18f2b30d42f6e2bcc518ad72fd49839fd8dc') - -build() { - cd ${srcdir}/${pkgbase}-${pkgver} - patch -Np1 -i ${srcdir}/gpsd-2.96.patch - patch -p1 -i ${srcdir}/remove-libkdeedu-libscience.patch - - cd ${srcdir} - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package_kdeedu-blinken() { - pkgdesc='A memory enhancement game' - depends=('kdebase-runtime' 'kdeedu-libkdeedu') - install='kdeedu.install' - cd $srcdir/build/blinken - make DESTDIR=$pkgdir install - cd $srcdir/build/blinken/doc - make DESTDIR=$pkgdir install -} - -package_kdeedu-cantor() { - pkgdesc='KDE Frontend to Mathematical Software' - depends=('kdeedu-libkdeedu' 'libspectre') - optdepends=('kdeedu-kalgebra: backend' - 'maxima: backend' - 'r: backend') - install='kdeedu.install' - cd $srcdir/build/cantor - make DESTDIR=$pkgdir install - cd $srcdir/build/cantor/doc - 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/kalgebra/doc - make DESTDIR=$pkgdir install -} - -package_kdeedu-kalzium() { - pkgdesc='KDE Periodic Table of Elements' - depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'avogadro') - install='kdeedu.install' - cd $srcdir/build/kalzium - make DESTDIR=$pkgdir install - cd $srcdir/build/kalzium/doc - make DESTDIR=$pkgdir install -} - -package_kdeedu-kanagram() { - pkgdesc='KDE Letter Order Game' - depends=('kdebase-runtime' 'kdeedu-libkdeedu') - install='kdeedu.install' - cd $srcdir/build/kanagram - make DESTDIR=$pkgdir install - cd $srcdir/build/kanagram/doc - make DESTDIR=$pkgdir install -} - -package_kdeedu-kbruch() { - pkgdesc='Practice exercises with fractions' - depends=('kdelibs' 'kdebase-runtime') - install='kdeedu.install' - cd $srcdir/build/kbruch - make DESTDIR=$pkgdir install - cd $srcdir/build/kbruch/doc - make DESTDIR=$pkgdir install -} - -package_kdeedu-kgeography() { - pkgdesc='A Geography Learning Program' - depends=('kdebase-runtime') - install='kdeedu.install' - cd $srcdir/build/kgeography - make DESTDIR=$pkgdir install - cd $srcdir/build/kgeography/doc - make DESTDIR=$pkgdir install -} - -package_kdeedu-khangman() { - pkgdesc='KDE Hangman Game' - depends=('kdebase-runtime' 'kdeedu-libkdeedu') - install='kdeedu.install' - cd $srcdir/build/khangman - make DESTDIR=$pkgdir install - cd $srcdir/build/khangman/doc - make DESTDIR=$pkgdir install -} - -package_kdeedu-kig() { - pkgdesc='Explore Geometric Constructions' - depends=('kdebase-runtime' 'boost-libs' 'python2') - install='kdeedu.install' - cd $srcdir/build/kig - make DESTDIR=$pkgdir install - cd $srcdir/build/kig/doc - make DESTDIR=$pkgdir install - - # Use the python2 executable - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' ${pkgdir}/usr/bin/pykig.py -} - -package_kdeedu-kiten() { - pkgdesc='Japanese Reference and Study Tool' - depends=('kdebase-runtime') - install='kdeedu.install' - cd $srcdir/build/kiten - make DESTDIR=$pkgdir install - cd $srcdir/build/kiten/doc - make DESTDIR=$pkgdir install -} - -package_kdeedu-klettres() { - pkgdesc='a KDE program to learn the alphabet' - depends=('kdebase-runtime') - install='kdeedu.install' - cd $srcdir/build/klettres - make DESTDIR=$pkgdir install - cd $srcdir/build/klettres/doc - make DESTDIR=$pkgdir install -} - -package_kdeedu-kmplot() { - pkgdesc='Function Plotter' - depends=('kdebase-runtime') - install='kdeedu.install' - cd $srcdir/build/kmplot - make DESTDIR=$pkgdir install - cd $srcdir/build/kmplot/doc - make DESTDIR=$pkgdir install -} - -package_kdeedu-kstars() { - pkgdesc='Desktop Planetarium' - depends=('kdebase-runtime' 'libindi') - install='kdeedu.install' - cd $srcdir/build/kstars - make DESTDIR=$pkgdir install - cd $srcdir/build/kstars/doc - make DESTDIR=$pkgdir install -} - -package_kdeedu-ktouch() { - pkgdesc='Touch Typing Tutor' - depends=('kdebase-runtime') - install='kdeedu.install' - cd $srcdir/build/ktouch - make DESTDIR=$pkgdir install - cd $srcdir/build/ktouch/doc - make DESTDIR=$pkgdir install -} - -package_kdeedu-kturtle() { - pkgdesc='Educational Programming Environment' - depends=('kdebase-runtime') - install='kdeedu.install' - cd $srcdir/build/kturtle - make DESTDIR=$pkgdir install - cd $srcdir/build/kturtle/doc - make DESTDIR=$pkgdir install -} - -package_kdeedu-kwordquiz() { - pkgdesc='A flashcard and vocabulary learning program' - depends=('kdebase-runtime' 'kdeedu-libkdeedu') - install='kdeedu.install' - cd $srcdir/build/kwordquiz - make DESTDIR=$pkgdir install - cd $srcdir/build/kwordquiz/doc - make DESTDIR=$pkgdir install -} - -package_kdeedu-libkdeedu() { - pkgdesc='Support library for KDE Educational Software' - groups=() - depends=('kdelibs') - install='kdeedu.install' - replaces=('kdeedu-data') - conflicts=('kdeedu-data') - cd $srcdir/build/libkdeedu - make DESTDIR=$pkgdir install -} - -package_kdeedu-marble() { - pkgdesc='Desktop Globe' - depends=('kdebase-runtime' 'gpsd') - install='kdeedu.install' - cd $srcdir/build/marble - make DESTDIR=$pkgdir install - cd $srcdir/build/marble/doc - make DESTDIR=$pkgdir install -} - -package_kdeedu-parley() { - pkgdesc='Vocabulary Trainer' - depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdebindings-python') - install='kdeedu.install' - cd $srcdir/build/parley - make DESTDIR=$pkgdir install - cd $srcdir/build/parley/doc - make DESTDIR=$pkgdir install -} - -package_kdeedu-rocs() { - pkgdesc='Graph Theory Tool for Professors and Students.' - depends=('kdebase-runtime' 'kdeedu-libkdeedu') - install='kdeedu.install' - cd $srcdir/build/rocs - make DESTDIR=$pkgdir install - cd $srcdir/build/rocs/doc - make DESTDIR=$pkgdir install -} - -package_kdeedu-step() { - pkgdesc='Simulate physics experiments' - depends=('kdebase-runtime' 'gsl' 'libqalculate') - install='kdeedu.install' - cd $srcdir/build/step - make DESTDIR=$pkgdir install - cd $srcdir/build/step/doc - make DESTDIR=$pkgdir install -} diff --git a/staging/kdeedu/gpsd-2.96.patch b/staging/kdeedu/gpsd-2.96.patch deleted file mode 100644 index ec515e99d..000000000 --- a/staging/kdeedu/gpsd-2.96.patch +++ /dev/null @@ -1,43 +0,0 @@ -Index: kdeedu-4.5.5/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp -=================================================================== ---- kdeedu-4.5.5.orig/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp -+++ kdeedu-4.5.5/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp -@@ -18,6 +18,9 @@ using namespace Marble; - - GpsdConnection::GpsdConnection( QObject* parent ) - : QObject( parent ), -+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 ) -+ m_gpsd("localhost", DEFAULT_GPSD_PORT), -+#endif - m_timer( 0 ) - { - connect( &m_timer, SIGNAL( timeout() ), this, SLOT( update() ) ); -@@ -26,7 +29,11 @@ GpsdConnection::GpsdConnection( QObject* - void GpsdConnection::initialize() - { - m_timer.stop(); -+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 ) -+ gps_data_t* data; -+#else - gps_data_t* data = m_gpsd.open(); -+#endif - if ( data ) { - m_status = PositionProviderStatusAcquiring; - emit statusChanged( m_status ); -@@ -73,8 +80,16 @@ void GpsdConnection::initialize() - void GpsdConnection::update() - { - #if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) && defined( PACKET_SET ) -+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 ) -+ if ( m_gpsd.waiting(0) ) { -+#else - if ( m_gpsd.waiting() ) { -+#endif -+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 ) -+ gps_data_t* data = m_gpsd.read(); -+#else - gps_data_t* data = m_gpsd.poll(); -+#endif - if ( data && data->set & PACKET_SET ) { - emit gpsdInfo( *data ); - } diff --git a/staging/kdeedu/kdeedu.install b/staging/kdeedu/kdeedu.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/kdeedu/kdeedu.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdeedu/remove-libkdeedu-libscience.patch b/staging/kdeedu/remove-libkdeedu-libscience.patch deleted file mode 100644 index a8643d49f..000000000 --- a/staging/kdeedu/remove-libkdeedu-libscience.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- kdeedu-4.6.4/libkdeedu/CMakeLists.txt~ 2011-06-10 16:59:34.922935038 +0000 -+++ kdeedu-4.6.4/libkdeedu/CMakeLists.txt 2011-06-10 16:59:56.279802081 +0000 -@@ -8,7 +8,6 @@ - - add_subdirectory(keduvocdocument) - add_subdirectory(kdeeduui) --add_subdirectory(libscience) - add_subdirectory(data) - #add_subdirectory(widgets) - add_subdirectory(qtmmlwidget) -- cgit v1.2.3-54-g00ecf