Merge branch 'testing' of gitorious.org:chakra-packages/desktop into testing

Conflicts:
	kdeedu/PKGBUILD
	kdepim-runtime/PKGBUILD
	kdepim/PKGBUILD

kdeedu/PKGBUILD

@@ -0,0 +1,415 @@
+#
+# KDE SC Packages for Chakra, part of chakra-project.org
+#
+# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
+# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+
+# include global config
+source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
+
+#
+# package info
+#
+pkgbase="kdeedu"
+pkgname=('kdeedu-common'
+         '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-marble'
+         'kdeedu-parley'
+	 'kdeedu-rocs'
+	 'kdeedu-step')
+
+arch=('i686' 'x86_64')
+pkgver=${_kdever}
+pkgrel=1
+pkgdesc="split package"
+url="http://www.kde.org"
+license=('GPL' 'LGPL' 'FDL')
+options=('!splithdr' 'splitdbg' 'log')
+
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'ocaml' 'facile' 'eigen' 'cfitsio' "kdelibs>=${_kdever}"
+             "kdebase-runtime>=${_kdever}" 'openbabel' 'libqalculate' 'gsl' 'boost' 'indilib' 'r>=2.11.1'
+             'libspectre' 'python' 'xplanet' 'docbook-xsl' 'avogadro')
+
+source=("$_mirror/${pkgbase}-$_kdever.tar.bz2")
+md5sums=(`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`)
+
+
+#
+# build function
+#
+build()
+{
+	cd ${srcdir}/${pkgbase}-${pkgver}
+
+        # parallel build breaks kalzium
+	export MAKEFLAGS="-j1"
+
+	msg "starting build ..."
+	cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
+		-DCMAKE_INSTALL_PREFIX=${_installprefix} \
+                -DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_SKIP_RPATH=OFF \
+		-DEXPERIMENTAL_PYTHON_BINDINGS=FALSE
+
+	make || return 1
+}
+
+
+
+#
+# split-install functions
+#
+package_kdeedu-common()
+{
+	pkgdesc="KDE Education Programs - Common files and libraries"
+	depends=("kdebase-runtime>=${_kdever}" "kdelibs>=${_kdever}")
+	groups=("kde" "kdeedu" "kde-uninstall")
+	conflicts=('kdeedu-doc')
+	install=${pkgbase}.install
+
+	splitdirs="libkdeedu"
+		for i in ${splitdirs} ; do
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
+			make DESTDIR=${pkgdir} install || return 1
+		done
+
+	# include our patches into the package
+#	ls -1 ${startdir}/*.patch &>/dev/null 2>&1
+#	if [ "$?" = "0" ]; then
+#		warning "incuding patches into package"
+#		mkdir -p ${pkgdir}/usr/share/kdemod/patches/${pkgbase} &>/dev/null
+#		for i in ${startdir}/*.patch; do
+#			msg "$i"
+#			cp $i ${pkgdir}/usr/share/kdemod/patches/${pkgbase}/ &>/dev/null
+#		done
+#	else
+#		warning "no patches found, skipping to include them into the package..."
+#	fi
+}
+
+package_kdeedu-blinken()
+{
+	pkgdesc="BlinKen is the KDE version of the well-known game Simon Says"
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
+
+	splitdirs="blinken"
+		for i in ${splitdirs} ; do
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
+			make DESTDIR=${pkgdir} install || return 1
+		done
+}
+
+package_kdeedu-cantor()
+{
+	pkgdesc="Cantor is a KDE Application aimed to provide a nice Interface for doing Mathematics and Scientific Computing."
+	depends=("${pkgbase}-common>=${_kdever}" 'r>=2.11.1')
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
+
+	splitdirs="cantor"
+		for i in ${splitdirs} ; do
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
+			make DESTDIR=${pkgdir} install || return 1
+		done
+}
+
+package_kdeedu-kalgebra()
+{
+	pkgdesc="KAlgebra is a mathematical calculator based on the content markup MathML language"
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
+
+	splitdirs="kalgebra"
+		for i in ${splitdirs} ; do
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
+			make DESTDIR=${pkgdir} install || return 1
+		done
+}
+
+package_kdeedu-kalzium()
+{
+	pkgdesc="Kalzium is an application which will show you some information about the periodic system of the elements"
+	depends=("${pkgbase}-common>=${_kdever}" 'openbabel' 'avogadro')
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
+
+	splitdirs="kalzium"
+		for i in ${splitdirs} ; do
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
+			make DESTDIR=${pkgdir} install || return 1
+		done
+
+	# Rempve duplicated files in kalzium
+	msg "Fixing duplicated files in Kalzium and Common"
+	rm -rv ${pkgdir}/usr/include/libkdeedu/chemicaldataobject.h
+	rm -rv ${pkgdir}/usr/include/libkdeedu/element.h
+	rm -rv ${pkgdir}/usr/include/libkdeedu/elementparser.h
+	rm -rv ${pkgdir}/usr/include/libkdeedu/isotope.h
+	rm -rv ${pkgdir}/usr/include/libkdeedu/isotopeparser.h
+	rm -rv ${pkgdir}/usr/include/libkdeedu/libkdeedu_science_export.h
+	rm -rv ${pkgdir}/usr/include/libkdeedu/moleculeparser.h
+	rm -rv ${pkgdir}/usr/include/libkdeedu/parser.h
+	rm -rv ${pkgdir}/usr/include/libkdeedu/psetables.h
+	rm -rv ${pkgdir}/usr/include/libkdeedu/spectrum.h
+	rm -rv ${pkgdir}/usr/include/libkdeedu/spectrumparser.h
+	rm -rv ${pkgdir}/usr/include/libkdeedu/tempunit.h
+	rm -rv ${pkgdir}/usr/lib/libscience.so
+	rm -rv ${pkgdir}/usr/lib/libscience.so.4
+	rm -rv ${pkgdir}/usr/lib/libscience.so.4.6.0
+	rm -rv ${pkgdir}/usr/share/apps/libkdeedu/data/elements.xml
+	rm -rv ${pkgdir}/usr/share/apps/libkdeedu/data/isotopes.xml
+	rm -rv ${pkgdir}/usr/share/apps/libkdeedu/data/spectra.xml 
+	rm -rv ${pkgdir}/usr/share/apps/libkdeedu/data/symbols.csv 
+	rm -rv ${pkgdir}/usr/share/apps/libkdeedu/data/symbols2.csv
+
+}
+
+package_kdeedu-kanagram()
+{
+	pkgdesc="Kanagram mixes up the letters of a word (creating an anagram), and you have to guess what the mixed up word is"
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
+
+	splitdirs="kanagram"
+		for i in ${splitdirs} ; do
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
+			make DESTDIR=${pkgdir} install || return 1
+		done
+}
+
+package_kdeedu-kbruch()
+{
+	pkgdesc="KBruch is a small program to practice calculating with fractions"
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
+
+	splitdirs="kbruch"
+		for i in ${splitdirs} ; do
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
+			make DESTDIR=${pkgdir} install || return 1
+		done
+}
+
+package_kdeedu-kgeography()
+{
+	pkgdesc="KGeography is a geography learning program"
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
+
+	splitdirs="kgeography"
+		for i in ${splitdirs} ; do
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
+			make DESTDIR=${pkgdir} install || return 1
+		done
+}
+
+package_kdeedu-khangman()
+{
+	pkgdesc="KHangman is the classical hangman game"
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
+
+	splitdirs="khangman"
+		for i in ${splitdirs} ; do
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
+			make DESTDIR=${pkgdir} install || return 1
+		done
+}
+
+package_kdeedu-kig()
+{
+	pkgdesc="Kig is a program for exploring geometric constructions"
+	depends=("${pkgbase}-common>=${_kdever}" 'boost-libs' 'python')
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
+
+	splitdirs="kig"
+		for i in ${splitdirs} ; do
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
+			make DESTDIR=${pkgdir} install || return 1
+		done
+}
+
+package_kdeedu-kiten()
+{
+	pkgdesc="Kiten is a Japanese reference and learning tool"
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
+
+	splitdirs="kiten"
+		for i in ${splitdirs} ; do
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
+			make DESTDIR=${pkgdir} install || return 1
+		done
+}
+
+package_kdeedu-klettres()
+{
+	pkgdesc="KLettres aims to help to learn the alphabet and then to read some syllables in different languages"
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
+
+	splitdirs="klettres"
+		for i in ${splitdirs} ; do
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
+			make DESTDIR=${pkgdir} install || return 1
+		done
+}
+
+package_kdeedu-kmplot()
+{
+	pkgdesc="KmPlot is a mathematical function plotter for the KDE-Desktop"
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
+
+	splitdirs="kmplot"
+		for i in ${splitdirs} ; do
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
+			make DESTDIR=${pkgdir} install || return 1
+		done
+}
+
+package_kdeedu-kstars()
+{
+	pkgdesc="A complete Desktop Planetarium application"
+	depends=("${pkgbase}-common>=${_kdever}" 'indilib' 'xplanet')
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
+
+	splitdirs="kstars"
+		for i in ${splitdirs} ; do
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
+			make DESTDIR=${pkgdir} install || return 1
+		done
+
+	# provided by indilib
+	rm -f ${pkgdir}/usr/bin/indiserver
+}
+
+package_kdeedu-ktouch()
+{
+	pkgdesc="KTouch is a program for learning touch typing"
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
+
+	splitdirs="ktouch"
+		for i in ${splitdirs} ; do
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
+			make DESTDIR=${pkgdir} install || return 1
+		done
+}
+
+package_kdeedu-kturtle()
+{
+	pkgdesc="KTurtle is an educational programming environment"
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
+
+	splitdirs="kturtle"
+		for i in ${splitdirs} ; do
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
+			make DESTDIR=${pkgdir} install || return 1
+		done
+}
+
+package_kdeedu-kwordquiz()
+{
+	pkgdesc="KWordQuiz is a general purpose flash card program"
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
+
+	splitdirs="kwordquiz"
+		for i in ${splitdirs} ; do
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
+			make DESTDIR=${pkgdir} install || return 1
+		done
+}
+
+package_kdeedu-marble()
+{
+	pkgdesc="Marble is a generic geographical map widget that is meant to be used by KDE applications"
+	depends=("${pkgbase}-common>=${_kdever}" "kdebindings-python>=${_kdever}" 'python')
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
+
+	splitdirs="marble"
+		for i in ${splitdirs} ; do
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
+			make DESTDIR=${pkgdir} install || return 1
+		done
+
+}
+
+package_kdeedu-parley()
+{
+	pkgdesc="Parley is a vocabulary trainer"
+	depends=("${pkgbase}-common>=${_kdever}" "kdebindings-python>=${_kdever}" 'python')
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
+
+	splitdirs="parley"
+		for i in ${splitdirs} ; do
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
+			make DESTDIR=${pkgdir} install || return 1
+		done
+}
+
+package_kdeedu-rocs()
+{
+	pkgdesc="Rocs aims to be a full featured Graph Editor and Programming Enviroment"
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
+
+	splitdirs="rocs"
+		for i in ${splitdirs} ; do
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
+			make DESTDIR=${pkgdir} install || return 1
+		done
+}
+
+package_kdeedu-step()
+{
+	pkgdesc="Step is an interactive physics simulator"
+	depends=("${pkgbase}-common>=${_kdever}" 'gsl' 'libqalculate')
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
+
+	splitdirs="step"
+		for i in ${splitdirs} ; do
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
+			make DESTDIR=${pkgdir} install || return 1
+		done
+
+	# WORKAROUND -> also in oxygen-icons
+	rm -rf $pkgdir/usr/share/icons/oxygen/22x22/actions/pointer.png
+}
+

tools-pkg-cinstall/PKGBUILD

@@ -6,8 +6,8 @@
 # (c) 2010 Drake Justice
 
 pkgname=cinstall
-pkgver=0.4.6.5
-pkgrel=3
+pkgver=0.4.6.6
+pkgrel=1
 depends=('rsync' 'cbundle')
 makedepends=('kdelibs' 'qt' 'automoc4' 'libcroco')
 pkgdesc="Chakra's Bundle manager"
@@ -16,23 +16,22 @@ license=('GPL')
 install=$pkgname.install
 url="http://chakra-project.org/"
 
-source=("cinstall-$pkgver.tar.xz" 'refresh.patch')
-md5sums=('1c5119fbb846ffb25aa1517e4a75e89f'
-         'c4e85f9e536fb62f466a535cd5a1dedc')
+source=("cinstall-$pkgver.tar.xz")
+md5sums=('05c19be50c26a1e6ab686621b6dc54c7')
 
 # create tarball: source PKGBUILD && mksource
 
 mksource() {
-  git clone git://gitorious.org/~fritzvantom/chakra/fritzvantoms-cinstall-differentui.git
+  git clone git://gitorious.org/~fritzvantom/chakra/fritzvantoms-cinstall.git
   pushd fritzvantoms-cinstall
   popd
-  tar -cvJf cinstall-${pkgver}.tar.xz fritzvantoms-cinstall-differentui/*
+  tar -cvJf cinstall-${pkgver}.tar.xz fritzvantoms-cinstall/*
   md5sum cinstall-${pkgver}.tar.xz
 }
 
 build() {
-        cd "${srcdir}/fritzvantoms-cinstall-differentui"
-        patch -Np1 -i "${srcdir}/refresh.patch"
+        cd "${srcdir}/fritzvantoms-cinstall"
+        
         cmake  \
           -DCMAKE_INSTALL_PREFIX=/usr \
           -DCMAKE_BUILD_TYPE=Release

tools-pkg-cinstall/refresh.patch

@@ -1,79 +0,0 @@
-diff --git a/src/packageui/bundlemodel.cpp b/src/packageui/bundlemodel.cpp
-index d43dd8f..65bc2b7 100644
---- a/src/packageui/bundlemodel.cpp
-+++ b/src/packageui/bundlemodel.cpp
-@@ -28,6 +28,8 @@
- #include "utils.h"
- 
- //KDE Includes
-+#include <KXmlGuiWindow>
-+#include <KActionCollection>
- #include <KDesktopFile>
- #include <KIO/Job>
- #include <KIO/FileCopyJob>
-@@ -35,6 +37,7 @@
- #include <KUrl>
- 
- //Qt Includes
-+#include <QAction>
- #include <QProcess>
- #include <QtConcurrentRun>
- #include <QFuture>
-@@ -42,7 +45,7 @@
- //BundleModel
- BundleModel::BundleModel(QObject* parent)
-     : QSortFilterProxyModel(parent)
--    , m_sourceModel(new BundleModelPrivate(this))
-+    , m_sourceModel(new BundleModelPrivate(parent))
-     , m_showInstalledOnly(false)
- {
-     setSourceModel(m_sourceModel);
-@@ -90,6 +93,8 @@ BundleModelPrivate::BundleModelPrivate(QObject* parent)
-     , m_currentArch(Utils::getArchitecture())
-     , m_process(new QProcess(this))
- {
-+    m_xmlGui = qobject_cast<KXmlGuiWindow*>(parent);
-+
-     //needed to use the model with qml
-     QHash<int, QByteArray> rNames;
-     rNames.insert(BundleRoles::Name, "name");
-@@ -269,6 +274,7 @@ void BundleModelPrivate::runBundle(const QModelIndex index)
- 
- void BundleModelPrivate::downloadBundle(const int& index)
- {
-+    m_xmlGui->actionCollection()->action("reload")->setEnabled(false);
-     QString bundleName = m_info[index].completeName + "-" + m_currentArch;
-     KUrl url ("http://chakra-project.org/repo/bundles/" + m_currentArch + "/" + bundleName + ".cb");
- 
-@@ -320,6 +326,7 @@ void BundleModelPrivate::setFinishedPercentage(KJob* job, long unsigned int perc
- 
- void BundleModelPrivate::jobFinished(KJob* job)
- {
-+    m_xmlGui->actionCollection()->action("reload")->setEnabled(true);
-     const int index = job->property("index").toInt();
- 
-     //aborted jobs
-diff --git a/src/packageui/bundlemodel.h b/src/packageui/bundlemodel.h
-index d9d9141..c8ae652 100644
---- a/src/packageui/bundlemodel.h
-+++ b/src/packageui/bundlemodel.h
-@@ -24,6 +24,9 @@
- //Project Includes
- #include "defines.h"
- 
-+//KDE Includes
-+#include <KXmlGuiWindow>
-+
- //Qt Includes
- #include <QAbstractItemModel>
- #include <QSortFilterProxyModel>
-@@ -129,7 +132,9 @@ private slots:
-     void setFinishedPercentage(KJob *job, unsigned long percent);
-     void jobFinished(KJob *job);
-     void setSpeed(KJob *job, ulong speed);
-+
- private:
-+    KXmlGuiWindow *m_xmlGui;
-     QList<BundleInfo> m_info;
-     BundleInfo infoForInstalledBundle(const QString &BundlePath) const;
-     QHash<int, bool> m_runningJobs;