From 2acc68da6fb20beb19e60e326e511d96971338f9 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Sun, 21 May 2017 22:30:07 +0200 Subject: Prepare for KDE 5_17.05 for Slackware --- kde/KDE.options | 2 +- kde/build/calligra | 1 + kde/cmake/krusader | 25 ++++- kde/cmake/oxygen | 36 ++++++- kde/make/oxygen | 10 ++ kde/patch/oxygen-gtk2.patch | 3 + .../oxygen-gtk2/oxygen-gtk2_KDEBUG_341181.patch | 115 +++++++++++++++++++++ 7 files changed, 189 insertions(+), 3 deletions(-) create mode 100644 kde/build/calligra mode change 120000 => 100644 kde/cmake/krusader mode change 120000 => 100644 kde/cmake/oxygen create mode 100644 kde/make/oxygen create mode 100644 kde/patch/oxygen-gtk2.patch create mode 100644 kde/patch/oxygen-gtk2/oxygen-gtk2_KDEBUG_341181.patch (limited to 'kde') 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 deleted file mode 120000 index ab12832..0000000 --- a/kde/cmake/krusader +++ /dev/null @@ -1 +0,0 @@ -applications5 \ No newline at end of file diff --git a/kde/cmake/krusader b/kde/cmake/krusader new file mode 100644 index 0000000..c0ff58c --- /dev/null +++ b/kde/cmake/krusader @@ -0,0 +1,24 @@ +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 deleted file mode 120000 index eff359e..0000000 --- a/kde/cmake/oxygen +++ /dev/null @@ -1 +0,0 @@ -plasma \ No newline at end of file diff --git a/kde/cmake/oxygen b/kde/cmake/oxygen new file mode 100644 index 0000000..bf73c11 --- /dev/null +++ b/kde/cmake/oxygen @@ -0,0 +1,35 @@ +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 +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 +@@ -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 ++* ++* inspired notably from kdelibs/kdeui/color/kcolorutils.h ++* Copyright (C) 2007 Matthew Woehlke ++* Copyright (C) 2007 Thomas Zander ++* Copyright (C) 2007 Zack Rusin ++* ++* 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 ++ ++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 + + -- cgit v1.2.3