summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2017-05-21 22:30:07 +0200
committer Eric Hameleers <alien@slackware.com>2017-05-21 22:30:07 +0200
commit2acc68da6fb20beb19e60e326e511d96971338f9 (patch)
treea74168fa08a8e51e4ff0eda2cc8f8247895c58d9
parent97ae115dfdcefa624cbdf6a048b97bc2a95a521a (diff)
downloadktown-2acc68da6fb20beb19e60e326e511d96971338f9.tar.gz
ktown-2acc68da6fb20beb19e60e326e511d96971338f9.tar.xz
Prepare for KDE 5_17.05 for Slackware
-rw-r--r--deps/json-glib/.url1
-rwxr-xr-xdeps/json-glib/json-glib.SlackBuild4
-rw-r--r--deps/sip/.url2
-rwxr-xr-xdeps/sip/sip.SlackBuild7
-rw-r--r--kde/KDE.options2
-rw-r--r--kde/build/calligra1
-rw-r--r--[l---------]kde/cmake/krusader25
-rw-r--r--[l---------]kde/cmake/oxygen36
-rw-r--r--kde/make/oxygen10
-rw-r--r--kde/patch/oxygen-gtk2.patch3
-rw-r--r--kde/patch/oxygen-gtk2/oxygen-gtk2_KDEBUG_341181.patch115
11 files changed, 197 insertions, 9 deletions
diff --git a/deps/json-glib/.url b/deps/json-glib/.url
new file mode 100644
index 0000000..1ca85e4
--- /dev/null
+++ b/deps/json-glib/.url
@@ -0,0 +1 @@
+http://ftp.gnome.org/pub/gnome/sources/json-glib/1.2/json-glib-1.2.8.tar.xz
diff --git a/deps/json-glib/json-glib.SlackBuild b/deps/json-glib/json-glib.SlackBuild
index 4975cb1..f9a7066 100755
--- a/deps/json-glib/json-glib.SlackBuild
+++ b/deps/json-glib/json-glib.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
# Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA
-# Copyright 2015 Eric Hameleers, Eindhoven, NL
+# Copyright 2015, 2017 Eric Hameleers, Eindhoven, NL
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for
@@ -24,7 +24,7 @@
PKGNAM=json-glib
-VERSION=${VERSION:-1.0.4}
+VERSION=${VERSION:-1.2.8}
BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:" -j4 "}
diff --git a/deps/sip/.url b/deps/sip/.url
index 906282f..2cfb996 100644
--- a/deps/sip/.url
+++ b/deps/sip/.url
@@ -1,2 +1,2 @@
-https://sourceforge.net/projects/pyqt/files/sip/sip-4.19/sip-4.19.tar.gz
+https://sourceforge.net/projects/pyqt/files/sip/sip-4.19.2/sip-4.19.2.tar.gz
diff --git a/deps/sip/sip.SlackBuild b/deps/sip/sip.SlackBuild
index 840077c..7e3b0dc 100755
--- a/deps/sip/sip.SlackBuild
+++ b/deps/sip/sip.SlackBuild
@@ -26,8 +26,8 @@
PKGNAM=sip
-VERSION=${VERSION:-4.19}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-4.19.2}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:--j7}
@@ -80,7 +80,8 @@ python configure.py \
-d "$PYTHONLIB" \
-e "/usr/include/python$PYTHONVER" \
CFLAGS="$SLKCFLAGS" \
- CXXFLAGS="$SLKCFLAGS"
+ CXXFLAGS="$SLKCFLAGS" \
+ || exit 1
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
diff --git a/kde/KDE.options b/kde/KDE.options
index 4215a58..8b76e84 100644
--- a/kde/KDE.options
+++ b/kde/KDE.options
@@ -3,7 +3,7 @@
# usually has a different version number), or by setting your own
# environment variables.
-[ -z $VERSION ] && export VERSION=5.9.4
+[ -z $VERSION ] && export VERSION=5.9.5
[ -z $BUILD ] && export BUILD=1
# Automatically determine the architecture we're building on:
diff --git a/kde/build/calligra b/kde/build/calligra
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/kde/build/calligra
@@ -0,0 +1 @@
+2
diff --git a/kde/cmake/krusader b/kde/cmake/krusader
index ab12832..c0ff58c 120000..100644
--- a/kde/cmake/krusader
+++ b/kde/cmake/krusader
@@ -1 +1,24 @@
-applications5 \ No newline at end of file
+mkdir build
+cd build
+ cmake \
+ $KDE_OPT_ARGS \
+ -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DMAN_INSTALL_DIR=/usr/man \
+ -DSYSCONF_INSTALL_DIR=/etc/kde \
+ -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+ -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \
+ -DLIBEXEC_INSTALL_DIR=lib$LIBDIRSUFFIX \
+ -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \
+ -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+ -DBUILD_TESTING=OFF \
+ -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \
+ -DKDESU_PATH=/usr/lib${LIBDIRSUFFIX}/kf5/kdesu \
+ ..
+
diff --git a/kde/cmake/oxygen b/kde/cmake/oxygen
index eff359e..bf73c11 120000..100644
--- a/kde/cmake/oxygen
+++ b/kde/cmake/oxygen
@@ -1 +1,35 @@
-plasma \ No newline at end of file
+function configure_oxygen()
+{
+ cmake \
+ $* \
+ -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DMAN_INSTALL_DIR=/usr/man \
+ -DSYSCONF_INSTALL_DIR=/etc/kde \
+ -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+ -DLIBEXEC_INSTALL_DIR=lib$LIBDIRSUFFIX \
+ -DBUILD_TESTING=OFF \
+ ..
+}
+
+# First configure the Qt5 support:
+mkdir build_qt5
+cd build_qt5
+configure_oxygen \
+ -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \
+ -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \
+ -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+cd -
+
+# Next, the Qt4 integration:
+mkdir build_qt4
+cd build_qt4
+configure_oxygen \
+ -DUSE_KDE4=ON
+
diff --git a/kde/make/oxygen b/kde/make/oxygen
new file mode 100644
index 0000000..cd5b182
--- /dev/null
+++ b/kde/make/oxygen
@@ -0,0 +1,10 @@
+# Oxygen's cmake left us in build_qt4,
+# so we build and install Qt4 support first:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Go back to build_qt5 and build/install the Qt5 support:
+cd ../build_qt5
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
diff --git a/kde/patch/oxygen-gtk2.patch b/kde/patch/oxygen-gtk2.patch
new file mode 100644
index 0000000..4ca11e9
--- /dev/null
+++ b/kde/patch/oxygen-gtk2.patch
@@ -0,0 +1,3 @@
+# Add more firefox-derived browsers as supported by the theme:
+cat $CWD/patch/oxygen-gtk2/oxygen-gtk2_KDEBUG_341181.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
diff --git a/kde/patch/oxygen-gtk2/oxygen-gtk2_KDEBUG_341181.patch b/kde/patch/oxygen-gtk2/oxygen-gtk2_KDEBUG_341181.patch
new file mode 100644
index 0000000..b6a1e55
--- /dev/null
+++ b/kde/patch/oxygen-gtk2/oxygen-gtk2_KDEBUG_341181.patch
@@ -0,0 +1,115 @@
+From b1ee5fb80c44c6c8a625333af1cfdc997d408805 Mon Sep 17 00:00:00 2001
+From: Hugo Pereira Da Costa <hugo.pereira@free.fr>
+Date: Sat, 18 Jul 2015 20:09:28 +0200
+Subject: moved xul application names to dedicated header file, added a number
+ of xul applications to prevent crash for these CCBUG: 341181
+
+---
+ src/oxygenapplicationname.cpp | 18 ++-----------
+ src/oxygenxulapplicationnames.h | 56 +++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 58 insertions(+), 16 deletions(-)
+ create mode 100644 src/oxygenxulapplicationnames.h
+
+diff --git a/src/oxygenapplicationname.cpp b/src/oxygenapplicationname.cpp
+index feb5a23..17c8a1a 100644
+--- a/src/oxygenapplicationname.cpp
++++ b/src/oxygenapplicationname.cpp
+@@ -25,6 +25,7 @@
+
+ #include "oxygenapplicationname.h"
+ #include "oxygengtkutils.h"
++#include "oxygenxulapplicationnames.h"
+ #include "config.h"
+
+ #include <cstdlib>
+@@ -79,23 +80,8 @@ namespace Oxygen
+ gtkAppName == "chromium" ||
+ gtkAppName == "chromium-browser" ||
+ gtkAppName == "google-chrome" ) _name = GoogleChrome;
+- else {
+
+- // tag all mozilla-like applications (XUL)
+- static const std::string XulAppNames[] =
+- {
+- "firefox",
+- "thunderbird",
+- "seamonkey",
+- "iceweasel",
+- "icecat",
+- "icedove",
+- "xulrunner",
+- "komodo",
+- "aurora",
+- "zotero",
+- ""
+- };
++ else {
+
+ for( unsigned int index = 0; !XulAppNames[index].empty(); ++index )
+ {
+diff --git a/src/oxygenxulapplicationnames.h b/src/oxygenxulapplicationnames.h
+new file mode 100644
+index 0000000..252a1fc
+--- /dev/null
++++ b/src/oxygenxulapplicationnames.h
+@@ -0,0 +1,56 @@
++#ifndef oxygenxulapplicationname_h
++#define oxygenxulapplicationname_h
++/*
++* this file is part of the oxygen gtk engine
++* Copyright (c) 2010 Hugo Pereira Da Costa <hugo.pereira@free.fr>
++*
++* inspired notably from kdelibs/kdeui/color/kcolorutils.h
++* Copyright (C) 2007 Matthew Woehlke <mw_triad@users.sourceforge.net>
++* Copyright (C) 2007 Thomas Zander <zander@kde.org>
++* Copyright (C) 2007 Zack Rusin <zack@kde.org>
++*
++* This library is free software; you can redistribute it and/or
++* modify it under the terms of the GNU Lesser General Public
++* License as published by the Free Software Foundation; either
++* version 2 of the License, or( at your option ) any later version.
++*
++* This library is distributed in the hope that it will be useful,
++* but WITHOUT ANY WARRANTY; without even the implied warranty of
++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++* Lesser General Public License for more details.
++*
++* You should have received a copy of the GNU Lesser General Public
++* License along with this library; if not, write to the Free
++* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++* MA 02110-1301, USA.
++*/
++
++#include <string>
++
++namespace Oxygen
++{
++
++ // tag all mozilla-like applications (XUL)
++ static const std::string XulAppNames[] =
++ {
++ "aurora",
++ "earlybird",
++ "icecat",
++ "icedove",
++ "iceweasel",
++ "instantbird",
++ "firefox",
++ "fossamail",
++ "komodo",
++ "newmoon",
++ "palemoon",
++ "seamonkey",
++ "thunderbird",
++ "xulrunner",
++ "zotero",
++ ""
++ };
++
++}
++
++#endif
+--
+cgit v0.11.2
+
+