Chakra_Linux/desktop
1
0
Fork 0
mirror of https://gitdl.cn/https://github.com/chakralinux/desktop.git synced 2025-02-03 03:17:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

missing kde applications packages from previous build, patches required in order to build them

Browse Source
This commit is contained in:
AlmAck 2017-02-11 21:22:09 +00:00
parent fd7009768f
commit 1a048a8351
4 changed files with 187 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
cantor/PKGBUILD
View File

@ -10,32 +10,43 @@ url="http://kde.org/applications/education/cantor/"
screenshot="https://www.kde.org/images/screenshots/cantor.png"
arch=('x86_64')
license=('GPL' 'LGPL' 'FDL')
depends=('analitza' 'kdelibs4support' 'knewstuff' 'kpty' 'ktexteditor' 'libqalculate' 'libspectre')
optdepends=('luajit: LUA backend'
'maxima: Maxima backend'
'octave: Octave backend'
'python3: Python 3 backend'
'python2: Python 2 backend'
depends=('analitza' 'libspectre' 'kpty' 'ktexteditor' 'knewstuff' 'libqalculate' 'hicolor-icon-theme')
optdepends=('maxima: Maxima backend'
'octave: Octave backend'
'r: R backend'
'sage-mathematics: Sage backend')
makedepends=('extra-cmake-modules' 'kdoctools' 'luajit' 'python3' 'python2' 'r')
'luajit: LUA backend'
'python3: Python 3 backend'
'python2: Python 2 backend'
'sagemath: SageMath backend')
#'julia: Julia backend')
makedepends=('extra-cmake-modules' 'python3' 'python2' 'kdoctools' 'luajit' 'r') # 'julia')
replaces=('kdeedu-cantor')
conflicts=('kdeedu-cantor')
groups=('kde' 'kde-uninstall' 'kde-applications' 'kdeedu')
options=('docs' 'debug')
install=${pkgname}.install
source=("$_mirror/${pkgname}-$_kdever.tar.xz"{,.sig})
source=("$_mirror/${pkgname}-$_kdever.tar.xz"{,.sig}
fno-operator-names_cantor.patch::https://cgit.kde.org/cantor.git/patch/?id=4b8ef6bed62daced90c7826985650c2a813d2996)
sha256sums=(`grep ${pkgname}-$_kdever.tar.xz ../kdeapps.sums | cut -d " " -f1`
'SKIP')
'SKIP'
'775ab4f099bdab34bff88d2f2bb6de9477ef68d1f5e062659b68d6a0718d7135')
validpgpkeys=(${Avalidpgpkeys})
prepare() {
mkdir -p build
cd ${pkgname}-${pkgver}
# https://cgit.kde.org/cantor.git/patch/?id=4b8ef6bed62daced90c7826985650c2a813d2996
patch -Np1 -i "${srcdir}/fno-operator-names_cantor.patch"
# wait patch for julia, enable later when the operato names are fixed
}
build() {
cd build
cmake_kf5 ../${pkgname}-${pkgver}
cmake_kf5 ../${pkgname}-${pkgver} \
-DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
-DPYTHON_LIBRARY=/usr/lib/libpython2.7.so
make
}

156
cantor/fno-operator-names_cantor_2.patch Normal file
View File

@ -0,0 +1,156 @@
diff --git a/src/backends/julia/juliaexpression.cpp b/src/backends/julia/juliaexpression.cpp
index 27cdd85..618200d 100644
--- a/src/backends/julia/juliaexpression.cpp
+++ b/src/backends/julia/juliaexpression.cpp
@@ -40,7 +40,7 @@ void JuliaExpression::evaluate()
// Plots integration
m_plot_filename.clear();
- if (juliaSession->integratePlots() and checkPlotShowingCommands()) {
+ if (juliaSession->integratePlots() && checkPlotShowingCommands()) {
// Simply add plot saving command to the end of execution
QStringList inlinePlotFormats;
inlinePlotFormats << QLatin1String("svg");
@@ -73,8 +73,8 @@ void JuliaExpression::finalize()
setResult(new Cantor::TextResult(juliaSession->getOutput()));
setStatus(Cantor::Expression::Error);
} else {
- if (not m_plot_filename.isEmpty()
- and QFileInfo(m_plot_filename).exists()) {
+ if (!m_plot_filename.isEmpty()
+ && QFileInfo(m_plot_filename).exists()) {
// If we have plot in result, show it
setResult(
new Cantor::ImageResult(QUrl::fromLocalFile(m_plot_filename)));
diff --git a/src/backends/julia/juliaextensions.cpp b/src/backends/julia/juliaextensions.cpp
index 4585c6f..ad5e3a9 100644
--- a/src/backends/julia/juliaextensions.cpp
+++ b/src/backends/julia/juliaextensions.cpp
@@ -138,7 +138,7 @@ QString JuliaPlotExtension::plotFunction2d(
{
auto new_left = left;
auto new_right = right;
- if (new_left.isEmpty() and new_right.isEmpty()) {
+ if (new_left.isEmpty() && new_right.isEmpty()) {
new_left = QLatin1String("-1");
new_right = QLatin1String("1");
} else if (new_left.isEmpty()) {
@@ -165,7 +165,7 @@ QString JuliaPlotExtension::plotFunction3d(
{
auto update_interval = [](Interval &interval) {
- if (interval.first.isEmpty() and interval.second.isEmpty()) {
+ if (interval.first.isEmpty() && interval.second.isEmpty()) {
interval.first = QLatin1String("-1");
interval.second = QLatin1String("1");
} else if (interval.first.isEmpty()) {
diff --git a/src/backends/julia/juliahighlighter.cpp b/src/backends/julia/juliahighlighter.cpp
index 4795361..f7d3622 100644
--- a/src/backends/julia/juliahighlighter.cpp
+++ b/src/backends/julia/juliahighlighter.cpp
@@ -98,7 +98,7 @@ void JuliaHighlighter::highlightBlock(const QString &text)
while (pos < text.length()) {
// Trying to close current environments
bool triggered = false;
- for (int i = 0; i < flags.size() and not triggered; i++) {
+ for (int i = 0; i < flags.size() && !triggered; i++) {
int flag = flags[i];
QRegExp &regexp = regexps_ends[i];
QTextCharFormat &format = formats[i];
@@ -144,7 +144,7 @@ void JuliaHighlighter::highlightBlock(const QString &text)
singleLineCommentStart.indexIn(text, pos);
if (singleLineCommentStartPos != -1
- and singleLineCommentStartPos < minPos) {
+ && singleLineCommentStartPos < minPos) {
// single line comment starts earlier
setFormat(pos, text.length() - pos, commentFormat());
break;
diff --git a/src/backends/julia/juliakeywords.cpp b/src/backends/julia/juliakeywords.cpp
index b7e29c4..4458a43 100644
--- a/src/backends/julia/juliakeywords.cpp
+++ b/src/backends/julia/juliakeywords.cpp
@@ -58,7 +58,7 @@ void JuliaKeywords::loadKeywords()
void JuliaKeywords::addVariable(const QString &variable)
{
- if (not m_variables.contains(variable)) {
+ if (!m_variables.contains(variable)) {
m_variables << variable;
}
}
@@ -71,7 +71,7 @@ void JuliaKeywords::clearVariables()
void JuliaKeywords::addFunction(const QString &function)
{
- if (not m_functions.contains(function)) {
+ if (!m_functions.contains(function)) {
m_functions << function;
}
}
diff --git a/src/backends/julia/juliaserver/juliaserver.cpp b/src/backends/julia/juliaserver/juliaserver.cpp
index c9beb4c..91585cf 100644
--- a/src/backends/julia/juliaserver/juliaserver.cpp
+++ b/src/backends/julia/juliaserver/juliaserver.cpp
@@ -47,7 +47,7 @@ void JuliaServer::runJuliaCommand(const QString &command)
{
// Redirect stdout, stderr to temprorary files
QTemporaryFile output, error;
- if (not output.open() or not error.open()) {
+ if (!output.open() || !error.open()) {
qFatal("Unable to create temprorary files for stdout/stderr");
return;
}
@@ -90,7 +90,7 @@ void JuliaServer::runJuliaCommand(const QString &command)
bool is_nothing = jl_unbox_bool(
static_cast<jl_value_t *>(jl_call2(equality, nothing, val))
);
- if (not is_nothing) {
+ if (!is_nothing) {
jl_static_show(JL_STDOUT, val);
}
m_was_exception = false;
diff --git a/src/backends/julia/juliaserver/main.cpp b/src/backends/julia/juliaserver/main.cpp
index ad7e4d9..cf73f12 100644
--- a/src/backends/julia/juliaserver/main.cpp
+++ b/src/backends/julia/juliaserver/main.cpp
@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
{
QCoreApplication app(argc, argv);
- if (not QDBusConnection::sessionBus().isConnected()) {
+ if (! QDBusConnection::sessionBus().isConnected()) {
qWarning() << "Can't connect to the D-Bus session bus.\n"
"To start it, run: eval `dbus-launch --auto-syntax`";
return 1;
@@ -39,7 +39,7 @@ int main(int argc, char *argv[])
const QString &serviceName =
QString::fromLatin1("org.kde.Cantor.Julia-%1").arg(app.applicationPid());
- if (not QDBusConnection::sessionBus().registerService(serviceName)) {
+ if (!QDBusConnection::sessionBus().registerService(serviceName)) {
qWarning() << QDBusConnection::sessionBus().lastError().message();
return 2;
}
diff --git a/src/backends/julia/juliasession.cpp b/src/backends/julia/juliasession.cpp
index 425e6cb..9183e11 100644
--- a/src/backends/julia/juliasession.cpp
+++ b/src/backends/julia/juliasession.cpp
@@ -86,7 +86,7 @@ void JuliaSession::login()
QDBusConnection::sessionBus()
);
- if (not m_interface->isValid()) {
+ if (!m_interface->isValid()) {
qWarning() << QDBusConnection::sessionBus().lastError().message();
return;
}
@@ -213,7 +213,7 @@ bool JuliaSession::getWasException()
{
const QDBusReply<bool> &reply =
m_interface->call(QLatin1String("getWasException"));
- return reply.isValid() and reply.value();
+ return reply.isValid() && reply.value();
}
void JuliaSession::listVariables()

10
kdeedu-kalzium/PKGBUILD
View File

@ -14,13 +14,19 @@ conflicts=(kdeedu-kalzium)
replaces=(kdeedu-kalzium)
options=(docs debug)
groups=(kde kde-uninstall kde-applications kdeedu)
source=("$_mirror/${pkgname}-$_kdever.tar.xz"{,.sig})
source=("$_mirror/${pkgname}-$_kdever.tar.xz"{,.sig}
fno-operator-names.patch::https://cgit.kde.org/kalzium.git/patch/?id=04048799910fc423a5fa100a1c46b91dbe8e7e61)
sha256sums=(`grep ${pkgname}-$_kdever.tar.xz ../kdeapps.sums | cut -d " " -f1`
'SKIP')
'SKIP'
'5bd740d544e726343d5e9628e20d3eab02b06755e042957566e4f596c0e73bbd')
validpgpkeys=(${Avalidpgpkeys})
prepare() {
mkdir -p build
cd ${pkgname}-${pkgver}
# https://cgit.kde.org/kalzium.git/patch/?id=04048799910fc423a5fa100a1c46b91dbe8e7e61
patch -Np1 -i "${srcdir}/fno-operator-names.patch"
}
build() {

2
kwave/PKGBUILD
View File

@ -8,7 +8,7 @@ pkgdesc="A sound editor for KDE"
arch=(x86_64)
url="http://kwave.sourceforge.net"
license=(GPL)
depends=(qt5-multimedia kio audiofile libmad libsamplerate hicolor-icon-theme id3lib fftw)
depends=(qt5-multimedia kio audiofile libmad libsamplerate hicolor-icon-theme id3lib fftw opus)
makedepends=(extra-cmake-modules kdoctools doxygen python librsvg)
groups=('kde' 'kde-uninstall' 'kde-applications' 'kdemultimedia')
screenshot=('http://kde-apps.org/CONTENT/content-pre1/11781-1.png')