[arch-commits] Commit in kdeedu-cantor/repos (10 files)
Andrea Scarpino
andrea at nymeria.archlinux.org
Fri Jun 28 13:52:03 UTC 2013
Date: Friday, June 28, 2013 @ 15:52:03
Author: andrea
Revision: 189055
archrelease: copy kde-unstable to kde-unstable-i686, kde-unstable-x86_64
Added:
kdeedu-cantor/repos/kde-unstable-i686/PKGBUILD
(from rev 189054, kdeedu-cantor/kde-unstable/PKGBUILD)
kdeedu-cantor/repos/kde-unstable-i686/kdeedu-cantor.install
(from rev 189054, kdeedu-cantor/kde-unstable/kdeedu-cantor.install)
kdeedu-cantor/repos/kde-unstable-x86_64/PKGBUILD
(from rev 189054, kdeedu-cantor/kde-unstable/PKGBUILD)
kdeedu-cantor/repos/kde-unstable-x86_64/kdeedu-cantor.install
(from rev 189054, kdeedu-cantor/kde-unstable/kdeedu-cantor.install)
Deleted:
kdeedu-cantor/repos/kde-unstable-i686/PKGBUILD
kdeedu-cantor/repos/kde-unstable-i686/kdeedu-cantor.install
kdeedu-cantor/repos/kde-unstable-i686/sage58.patch
kdeedu-cantor/repos/kde-unstable-x86_64/PKGBUILD
kdeedu-cantor/repos/kde-unstable-x86_64/kdeedu-cantor.install
kdeedu-cantor/repos/kde-unstable-x86_64/sage58.patch
-------------------------------------------+
/PKGBUILD | 76 +++++++++++++++++
/kdeedu-cantor.install | 24 +++++
kde-unstable-i686/PKGBUILD | 41 ---------
kde-unstable-i686/kdeedu-cantor.install | 12 --
kde-unstable-i686/sage58.patch | 123 ----------------------------
kde-unstable-x86_64/PKGBUILD | 41 ---------
kde-unstable-x86_64/kdeedu-cantor.install | 12 --
kde-unstable-x86_64/sage58.patch | 123 ----------------------------
8 files changed, 100 insertions(+), 352 deletions(-)
Deleted: kde-unstable-i686/PKGBUILD
===================================================================
--- kde-unstable-i686/PKGBUILD 2013-06-28 13:51:55 UTC (rev 189054)
+++ kde-unstable-i686/PKGBUILD 2013-06-28 13:52:03 UTC (rev 189055)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kdeedu-cantor
-pkgver=4.10.80
-pkgrel=1
-pkgdesc="KDE Frontend to Mathematical Software"
-url="http://kde.org/applications/education/cantor/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libspectre' 'kdeedu-analitza' 'libqalculate')
-makedepends=('cmake' 'automoc4' 'r')
-optdepends=('maxima: Maxima backend'
- 'octave: Octave backend'
- 'r: R backend')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/cantor-${pkgver}.tar.xz"
- 'sage58.patch')
-sha1sums=('5988e049930217b123fb3b9ec5c91d4e8e4f60a3'
- 'c02051c30ece57800d693da60280b0bdb5f45697')
-
-prepare() {
- cd cantor-${pkgver}
- patch -p1 -i "${srcdir}"/sage58.patch
-}
-
-build() {
- mkdir build
- cd build
- cmake ../cantor-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DKDE4_BUILD_TESTS=OFF \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
Copied: kdeedu-cantor/repos/kde-unstable-i686/PKGBUILD (from rev 189054, kdeedu-cantor/kde-unstable/PKGBUILD)
===================================================================
--- kde-unstable-i686/PKGBUILD (rev 0)
+++ kde-unstable-i686/PKGBUILD 2013-06-28 13:52:03 UTC (rev 189055)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kdeedu-cantor
+pkgver=4.10.90
+pkgrel=1
+pkgdesc="KDE Frontend to Mathematical Software"
+url="http://kde.org/applications/education/cantor/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime' 'libspectre' 'kdeedu-analitza' 'libqalculate')
+makedepends=('cmake' 'automoc4' 'r')
+optdepends=('maxima: Maxima backend'
+ 'octave: Octave backend'
+ 'r: R backend')
+install=${pkgname}.install
+source=("http://download.kde.org/unstable/${pkgver}/src/cantor-${pkgver}.tar.xz")
+sha1sums=('2540037fe225d073c363927647778e87557f14c2')
+
+prepare() {
+ mkdir build
+}
+
+build() {
+ cd build
+ cmake ../cantor-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DKDE4_BUILD_TESTS=OFF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_SKIP_RPATH=ON
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
Deleted: kde-unstable-i686/kdeedu-cantor.install
===================================================================
--- kde-unstable-i686/kdeedu-cantor.install 2013-06-28 13:51:55 UTC (rev 189054)
+++ kde-unstable-i686/kdeedu-cantor.install 2013-06-28 13:52:03 UTC (rev 189055)
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: kdeedu-cantor/repos/kde-unstable-i686/kdeedu-cantor.install (from rev 189054, kdeedu-cantor/kde-unstable/kdeedu-cantor.install)
===================================================================
--- kde-unstable-i686/kdeedu-cantor.install (rev 0)
+++ kde-unstable-i686/kdeedu-cantor.install 2013-06-28 13:52:03 UTC (rev 189055)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: kde-unstable-i686/sage58.patch
===================================================================
--- kde-unstable-i686/sage58.patch 2013-06-28 13:51:55 UTC (rev 189054)
+++ kde-unstable-i686/sage58.patch 2013-06-28 13:52:03 UTC (rev 189055)
@@ -1,123 +0,0 @@
-diff --git a/src/backends/sage/sagecompletionobject.cpp b/src/backends/sage/sagecompletionobject.cpp
-index dec0c8f..a132295 100644
---- a/src/backends/sage/sagecompletionobject.cpp
-+++ b/src/backends/sage/sagecompletionobject.cpp
-@@ -52,7 +52,7 @@ void SageCompletionObject::fetchCompletions()
-
- //cache the value of the "_" variable into __hist_tmp__, so we can restore the previous result
- //after complete() was evaluated
-- m_expression=session()->evaluateExpression("__hist_tmp__=_; __IPYTHON__.complete(\""+command()+"\");_=__hist_tmp__");
-+ m_expression=session()->evaluateExpression("__hist_tmp__=_; __CANTOR_IPYTHON_SHELL__.complete(\""+command()+"\");_=__hist_tmp__");
- connect(m_expression, SIGNAL(gotResult()), this,
- SLOT(extractCompletions()));
-
-@@ -71,11 +71,19 @@ void SageCompletionObject::extractCompletions()
- kDebug()<<"something went wrong fetching tab completion";
- return;
- }
--
-+
- //the result looks like "['comp1', 'comp2']" parse it
-+
-+ //for sage version 5.7 this looks like
-+ //('s1', ['comp1','comp2']) where s1 is the string we called complete with
-+
- QString txt=res->toHtml().trimmed();
-+ txt.remove("<br/>");
-+ txt=txt.mid(txt.indexOf(command())+command().length()+2).trimmed();
- txt=txt.mid(1); //remove [
-- txt.chop(1); //remove ]
-+ txt.chop(2); //remove ]
-+
-+ kDebug()<<"completion string: "<<txt;
-
- QStringList tmp=txt.split(',');
- QStringList completions;
-diff --git a/src/backends/sage/sageexpression.cpp b/src/backends/sage/sageexpression.cpp
-index eabdda2..fbde7c1 100644
---- a/src/backends/sage/sageexpression.cpp
-+++ b/src/backends/sage/sageexpression.cpp
-@@ -122,7 +122,7 @@ void SageExpression::parseOutput(const QString& text)
- //reset the indices
- index=index2=-1;
- }
--
-+
- m_outputCache+=output;
-
- if(m_promptCount<=0)
-@@ -160,11 +160,9 @@ void SageExpression::addFileResult( const QString& path )
- {
- KUrl url( path );
- KMimeType::Ptr type=KMimeType::findByUrl(url);
-- kDebug()<<"MimeType: "<<type->name();
-- if(type->name().contains("image"))
-+ if(m_imagePath.isEmpty()||type->name().contains("image")||path.endsWith(".png")||path.endsWith(".gif"))
- {
-- kDebug()<<"adding file "<<path<<" "<<url;
-- m_imagePath=path;
-+ m_imagePath=path;
- }
- }
-
-@@ -172,8 +170,11 @@ void SageExpression::evalFinished()
- {
- kDebug()<<"evaluation finished";
- kDebug()<<m_outputCache;
-+
-+ //check if our image path contains a valid image that we can try to show
-+ bool hasImage=!m_imagePath.isNull();
-
-- if ( m_imagePath.isNull() ) //If this result contains a file, drop the text information
-+ if ( !hasImage ) //If this result contains a file, drop the text information
- {
- Cantor::TextResult* result=0;
-
-@@ -219,7 +220,7 @@ void SageExpression::evalFinished()
- }
- else
- {
-- KMimeType::Ptr type=KMimeType::findByUrl(m_imagePath);
-+ KMimeType::Ptr type=KMimeType::findByUrl(m_imagePath);
- if(type->is("image/gif"))
- setResult( new Cantor::AnimationResult( KUrl(m_imagePath ),i18n("Result of %1" , command() ) ) );
- else
-diff --git a/src/backends/sage/sagesession.cpp b/src/backends/sage/sagesession.cpp
-index a535277..d8ac325 100644
---- a/src/backends/sage/sagesession.cpp
-+++ b/src/backends/sage/sagesession.cpp
-@@ -38,10 +38,13 @@ const QByteArray SageSession::SageAlternativePrompt="....: "; //Text, sage outpu
- static QByteArray initCmd="os.environ['PAGER'] = 'cat' \n "\
- "sage.misc.pager.EMBEDDED_MODE = True \n "\
- "sage.misc.viewer.BROWSER='' \n "\
-+ "sage.misc.viewer.viewer.png_viewer('') \n" \
- "sage.plot.plot3d.base.SHOW_DEFAULTS['viewer'] = 'tachyon' \n"\
- "sage.misc.latex.EMBEDDED_MODE = True \n "\
- "os.environ['PAGER'] = 'cat' \n "\
-- " __IPYTHON__.shell.autoindent=False \n "\
-+ "%colors nocolor \n "\
-+ "__CANTOR_IPYTHON_SHELL__=get_ipython() \n "\
-+ "__CANTOR_IPYTHON_SHELL__.autoindent=False \n "\
- "print '____TMP_DIR____', sage.misc.misc.SAGE_TMP\n"\
- "print '____END_OF_INIT____' \n ";
-
-@@ -277,6 +280,7 @@ void SageSession::waitForNextPrompt()
-
- void SageSession::fileCreated( const QString& path )
- {
-+ kDebug()<<"got a file "<<path;
- SageExpression* expr=m_expressionQueue.first();
- if ( expr )
- expr->addFileResult( path );
-@@ -290,9 +294,9 @@ void SageSession::setTypesettingEnabled(bool enable)
- //the _ and __IP.outputcache() are needed to keep the
- // _ operator working
- if (enable)
-- evaluateExpression("sage.misc.latex.pretty_print_default(true);_;__IP.outputcache()", Cantor::Expression::DeleteOnFinish);
-+ evaluateExpression("sage.misc.latex.pretty_print_default(true)", Cantor::Expression::DeleteOnFinish);
- else
-- evaluateExpression("sage.misc.latex.pretty_print_default(false);_;__IP.outputcache()", Cantor::Expression::DeleteOnFinish);
-+ evaluateExpression("sage.misc.latex.pretty_print_default(false)", Cantor::Expression::DeleteOnFinish);
- }
-
- Cantor::CompletionObject* SageSession::completionFor(const QString& command, int index)
Deleted: kde-unstable-x86_64/PKGBUILD
===================================================================
--- kde-unstable-x86_64/PKGBUILD 2013-06-28 13:51:55 UTC (rev 189054)
+++ kde-unstable-x86_64/PKGBUILD 2013-06-28 13:52:03 UTC (rev 189055)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kdeedu-cantor
-pkgver=4.10.80
-pkgrel=1
-pkgdesc="KDE Frontend to Mathematical Software"
-url="http://kde.org/applications/education/cantor/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libspectre' 'kdeedu-analitza' 'libqalculate')
-makedepends=('cmake' 'automoc4' 'r')
-optdepends=('maxima: Maxima backend'
- 'octave: Octave backend'
- 'r: R backend')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/cantor-${pkgver}.tar.xz"
- 'sage58.patch')
-sha1sums=('5988e049930217b123fb3b9ec5c91d4e8e4f60a3'
- 'c02051c30ece57800d693da60280b0bdb5f45697')
-
-prepare() {
- cd cantor-${pkgver}
- patch -p1 -i "${srcdir}"/sage58.patch
-}
-
-build() {
- mkdir build
- cd build
- cmake ../cantor-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DKDE4_BUILD_TESTS=OFF \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
Copied: kdeedu-cantor/repos/kde-unstable-x86_64/PKGBUILD (from rev 189054, kdeedu-cantor/kde-unstable/PKGBUILD)
===================================================================
--- kde-unstable-x86_64/PKGBUILD (rev 0)
+++ kde-unstable-x86_64/PKGBUILD 2013-06-28 13:52:03 UTC (rev 189055)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kdeedu-cantor
+pkgver=4.10.90
+pkgrel=1
+pkgdesc="KDE Frontend to Mathematical Software"
+url="http://kde.org/applications/education/cantor/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime' 'libspectre' 'kdeedu-analitza' 'libqalculate')
+makedepends=('cmake' 'automoc4' 'r')
+optdepends=('maxima: Maxima backend'
+ 'octave: Octave backend'
+ 'r: R backend')
+install=${pkgname}.install
+source=("http://download.kde.org/unstable/${pkgver}/src/cantor-${pkgver}.tar.xz")
+sha1sums=('2540037fe225d073c363927647778e87557f14c2')
+
+prepare() {
+ mkdir build
+}
+
+build() {
+ cd build
+ cmake ../cantor-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DKDE4_BUILD_TESTS=OFF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_SKIP_RPATH=ON
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
Deleted: kde-unstable-x86_64/kdeedu-cantor.install
===================================================================
--- kde-unstable-x86_64/kdeedu-cantor.install 2013-06-28 13:51:55 UTC (rev 189054)
+++ kde-unstable-x86_64/kdeedu-cantor.install 2013-06-28 13:52:03 UTC (rev 189055)
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: kdeedu-cantor/repos/kde-unstable-x86_64/kdeedu-cantor.install (from rev 189054, kdeedu-cantor/kde-unstable/kdeedu-cantor.install)
===================================================================
--- kde-unstable-x86_64/kdeedu-cantor.install (rev 0)
+++ kde-unstable-x86_64/kdeedu-cantor.install 2013-06-28 13:52:03 UTC (rev 189055)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: kde-unstable-x86_64/sage58.patch
===================================================================
--- kde-unstable-x86_64/sage58.patch 2013-06-28 13:51:55 UTC (rev 189054)
+++ kde-unstable-x86_64/sage58.patch 2013-06-28 13:52:03 UTC (rev 189055)
@@ -1,123 +0,0 @@
-diff --git a/src/backends/sage/sagecompletionobject.cpp b/src/backends/sage/sagecompletionobject.cpp
-index dec0c8f..a132295 100644
---- a/src/backends/sage/sagecompletionobject.cpp
-+++ b/src/backends/sage/sagecompletionobject.cpp
-@@ -52,7 +52,7 @@ void SageCompletionObject::fetchCompletions()
-
- //cache the value of the "_" variable into __hist_tmp__, so we can restore the previous result
- //after complete() was evaluated
-- m_expression=session()->evaluateExpression("__hist_tmp__=_; __IPYTHON__.complete(\""+command()+"\");_=__hist_tmp__");
-+ m_expression=session()->evaluateExpression("__hist_tmp__=_; __CANTOR_IPYTHON_SHELL__.complete(\""+command()+"\");_=__hist_tmp__");
- connect(m_expression, SIGNAL(gotResult()), this,
- SLOT(extractCompletions()));
-
-@@ -71,11 +71,19 @@ void SageCompletionObject::extractCompletions()
- kDebug()<<"something went wrong fetching tab completion";
- return;
- }
--
-+
- //the result looks like "['comp1', 'comp2']" parse it
-+
-+ //for sage version 5.7 this looks like
-+ //('s1', ['comp1','comp2']) where s1 is the string we called complete with
-+
- QString txt=res->toHtml().trimmed();
-+ txt.remove("<br/>");
-+ txt=txt.mid(txt.indexOf(command())+command().length()+2).trimmed();
- txt=txt.mid(1); //remove [
-- txt.chop(1); //remove ]
-+ txt.chop(2); //remove ]
-+
-+ kDebug()<<"completion string: "<<txt;
-
- QStringList tmp=txt.split(',');
- QStringList completions;
-diff --git a/src/backends/sage/sageexpression.cpp b/src/backends/sage/sageexpression.cpp
-index eabdda2..fbde7c1 100644
---- a/src/backends/sage/sageexpression.cpp
-+++ b/src/backends/sage/sageexpression.cpp
-@@ -122,7 +122,7 @@ void SageExpression::parseOutput(const QString& text)
- //reset the indices
- index=index2=-1;
- }
--
-+
- m_outputCache+=output;
-
- if(m_promptCount<=0)
-@@ -160,11 +160,9 @@ void SageExpression::addFileResult( const QString& path )
- {
- KUrl url( path );
- KMimeType::Ptr type=KMimeType::findByUrl(url);
-- kDebug()<<"MimeType: "<<type->name();
-- if(type->name().contains("image"))
-+ if(m_imagePath.isEmpty()||type->name().contains("image")||path.endsWith(".png")||path.endsWith(".gif"))
- {
-- kDebug()<<"adding file "<<path<<" "<<url;
-- m_imagePath=path;
-+ m_imagePath=path;
- }
- }
-
-@@ -172,8 +170,11 @@ void SageExpression::evalFinished()
- {
- kDebug()<<"evaluation finished";
- kDebug()<<m_outputCache;
-+
-+ //check if our image path contains a valid image that we can try to show
-+ bool hasImage=!m_imagePath.isNull();
-
-- if ( m_imagePath.isNull() ) //If this result contains a file, drop the text information
-+ if ( !hasImage ) //If this result contains a file, drop the text information
- {
- Cantor::TextResult* result=0;
-
-@@ -219,7 +220,7 @@ void SageExpression::evalFinished()
- }
- else
- {
-- KMimeType::Ptr type=KMimeType::findByUrl(m_imagePath);
-+ KMimeType::Ptr type=KMimeType::findByUrl(m_imagePath);
- if(type->is("image/gif"))
- setResult( new Cantor::AnimationResult( KUrl(m_imagePath ),i18n("Result of %1" , command() ) ) );
- else
-diff --git a/src/backends/sage/sagesession.cpp b/src/backends/sage/sagesession.cpp
-index a535277..d8ac325 100644
---- a/src/backends/sage/sagesession.cpp
-+++ b/src/backends/sage/sagesession.cpp
-@@ -38,10 +38,13 @@ const QByteArray SageSession::SageAlternativePrompt="....: "; //Text, sage outpu
- static QByteArray initCmd="os.environ['PAGER'] = 'cat' \n "\
- "sage.misc.pager.EMBEDDED_MODE = True \n "\
- "sage.misc.viewer.BROWSER='' \n "\
-+ "sage.misc.viewer.viewer.png_viewer('') \n" \
- "sage.plot.plot3d.base.SHOW_DEFAULTS['viewer'] = 'tachyon' \n"\
- "sage.misc.latex.EMBEDDED_MODE = True \n "\
- "os.environ['PAGER'] = 'cat' \n "\
-- " __IPYTHON__.shell.autoindent=False \n "\
-+ "%colors nocolor \n "\
-+ "__CANTOR_IPYTHON_SHELL__=get_ipython() \n "\
-+ "__CANTOR_IPYTHON_SHELL__.autoindent=False \n "\
- "print '____TMP_DIR____', sage.misc.misc.SAGE_TMP\n"\
- "print '____END_OF_INIT____' \n ";
-
-@@ -277,6 +280,7 @@ void SageSession::waitForNextPrompt()
-
- void SageSession::fileCreated( const QString& path )
- {
-+ kDebug()<<"got a file "<<path;
- SageExpression* expr=m_expressionQueue.first();
- if ( expr )
- expr->addFileResult( path );
-@@ -290,9 +294,9 @@ void SageSession::setTypesettingEnabled(bool enable)
- //the _ and __IP.outputcache() are needed to keep the
- // _ operator working
- if (enable)
-- evaluateExpression("sage.misc.latex.pretty_print_default(true);_;__IP.outputcache()", Cantor::Expression::DeleteOnFinish);
-+ evaluateExpression("sage.misc.latex.pretty_print_default(true)", Cantor::Expression::DeleteOnFinish);
- else
-- evaluateExpression("sage.misc.latex.pretty_print_default(false);_;__IP.outputcache()", Cantor::Expression::DeleteOnFinish);
-+ evaluateExpression("sage.misc.latex.pretty_print_default(false)", Cantor::Expression::DeleteOnFinish);
- }
-
- Cantor::CompletionObject* SageSession::completionFor(const QString& command, int index)
More information about the arch-commits
mailing list