plasma_stable: plasma-5.3.2 -> plasma-5.4.2
This commit is contained in:
Thomas Tuegel
parent
afc364f194
commit
db408a8ceb
@ -1,28 +0,0 @@
|
||||
From 1a526e40ffc1d6cb050334e8641d8b90d9858a54 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Sun, 30 Aug 2015 07:05:03 -0500
|
||||
Subject: [PATCH] qalculate filename string type
|
||||
|
||||
---
|
||||
src/backends/qalculate/qalculateexpression.cpp | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/backends/qalculate/qalculateexpression.cpp b/src/backends/qalculate/qalculateexpression.cpp
|
||||
index 1891baa..b2a1984 100644
|
||||
--- a/src/backends/qalculate/qalculateexpression.cpp
|
||||
+++ b/src/backends/qalculate/qalculateexpression.cpp
|
||||
@@ -771,9 +771,9 @@ void QalculateExpression::evaluatePlotCommand()
|
||||
if (plotParameters.filetype == PLOT_FILETYPE_EPS ||
|
||||
plotParameters.filetype == PLOT_FILETYPE_PS ||
|
||||
(plotParameters.filetype == PLOT_FILETYPE_AUTO && p >= 4 &&
|
||||
- plotParameters.filename.substr(p-4,4) == QLatin1String(".eps")) ||
|
||||
+ plotParameters.filename.substr(p-4,4) == basic_string<char>(".eps")) ||
|
||||
(plotParameters.filetype == PLOT_FILETYPE_AUTO && p >= 3 &&
|
||||
- plotParameters.filename.substr(p-3,3) == QLatin1String(".ps")))
|
||||
+ plotParameters.filename.substr(p-3,3) == basic_string<char>(".ps")))
|
||||
setResult(new Cantor::EpsResult(KUrl(plotParameters.filename.c_str())));
|
||||
else
|
||||
setResult(new Cantor::ImageResult(KUrl(plotParameters.filename.c_str())));
|
||||
--
|
||||
2.5.0
|
||||
|
||||
@ -1,540 +0,0 @@
|
||||
# Maintainer's Notes:
|
||||
#
|
||||
# Minor updates:
|
||||
# 1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes
|
||||
# releases updates that include only the changed packages; in this case,
|
||||
# multiple URLs can be provided and the results will be merged.
|
||||
# 2. Run ./manifest.sh and ./dependencies.sh.
|
||||
# 3. Build and enjoy.
|
||||
#
|
||||
# Major updates:
|
||||
# We prefer not to immediately overwrite older versions with major updates, so
|
||||
# make a copy of this directory first. After copying, be sure to delete ./tmp
|
||||
# if it exists. Then follow the minor update instructions.
|
||||
|
||||
{ pkgs, newScope, kf5 ? null, plasma5 ? null, qt5 ? null, debug ? false }:
|
||||
|
||||
let inherit (pkgs) autonix kde4 stdenv symlinkJoin; in
|
||||
|
||||
with autonix; let inherit (stdenv) lib; in
|
||||
|
||||
let
|
||||
kf5_ = if kf5 != null then kf5 else pkgs.kf510;
|
||||
plasma5_ = if plasma5 != null then plasma5 else pkgs.plasma53;
|
||||
qt5_ = if qt5 != null then qt5 else pkgs.qt54;
|
||||
in
|
||||
|
||||
let
|
||||
|
||||
kf5 = kf5_.override { inherit debug qt5; };
|
||||
plasma5 = plasma5_.override { inherit debug kf5 qt5; };
|
||||
qt5 = qt5_;
|
||||
|
||||
kdeOrL10nPackage = name: pkg:
|
||||
assert (builtins.isAttrs pkg);
|
||||
if lib.hasPrefix "kde-l10n" pkg.name
|
||||
then l10nPackage name pkg
|
||||
else kdePackage name pkg;
|
||||
|
||||
kdePackage = name: pkg:
|
||||
let defaultOverride = drv: drv // {
|
||||
setupHook = ./setup-hook.sh;
|
||||
cmakeFlags =
|
||||
(drv.cmakeFlags or [])
|
||||
++ [ "-DBUILD_TESTING=OFF" ]
|
||||
++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
|
||||
meta = {
|
||||
license = with stdenv.lib.licenses; [
|
||||
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
|
||||
];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = with stdenv.lib.maintainers; [ ttuegel ];
|
||||
homepage = "http://www.kde.org";
|
||||
};
|
||||
};
|
||||
callPackage = newScope {
|
||||
inherit (stdenv) mkDerivation;
|
||||
inherit (pkgs) fetchurl;
|
||||
inherit scope;
|
||||
};
|
||||
in mkPackage callPackage defaultOverride name pkg;
|
||||
|
||||
l10nPackage = name: pkg:
|
||||
let nameVersion = builtins.parseDrvName pkg.name;
|
||||
|
||||
pkgQt4 = pkg // {
|
||||
name = "${nameVersion.name}-qt4-${nameVersion.version}";
|
||||
buildInputs = [ "kdelibs" "qt4" ];
|
||||
nativeBuildInputs = [ "cmake" "gettext" "perl" ];
|
||||
propagatedBuildInputs = [];
|
||||
propagatedNativeBuildInputs = [];
|
||||
propagatedUserEnvPkgs = [];
|
||||
};
|
||||
drvQt4 = overrideDerivation (kdePackage name pkgQt4) (drv: {
|
||||
preConfigure = (drv.preConfigure or "") + ''
|
||||
cd 4/
|
||||
'';
|
||||
});
|
||||
|
||||
pkgQt5 = pkg // {
|
||||
name = "${nameVersion.name}-qt5-${nameVersion.version}";
|
||||
buildInputs = [ "kdoctools" "ki18n" ];
|
||||
nativeBuildInputs = [ "cmake" "extra-cmake-modules" "gettext" "perl" ];
|
||||
propagatedBuildInputs = [];
|
||||
propagatedNativeBuildInputs = [];
|
||||
propagatedUserEnvPkgs = [];
|
||||
};
|
||||
drvQt5 = overrideDerivation (kdePackage name pkgQt5) (drv: {
|
||||
preConfigure = (drv.preConfigure or "") + ''
|
||||
cd 5/
|
||||
'';
|
||||
});
|
||||
in symlinkJoin pkg.name [ drvQt4 drvQt5 ];
|
||||
|
||||
super =
|
||||
let json = builtins.fromJSON (builtins.readFile ./packages.json);
|
||||
mirrorUrl = n: pkg: pkg // {
|
||||
src = pkg.src // { url = "mirror://kde/${pkg.src.url}"; };
|
||||
};
|
||||
renames =
|
||||
(builtins.fromJSON (builtins.readFile ./kf5-renames.json))
|
||||
// (builtins.fromJSON (builtins.readFile ./plasma5-renames.json))
|
||||
// (builtins.fromJSON (builtins.readFile ./renames.json));
|
||||
propagated = [ "extra-cmake-modules" ];
|
||||
native = [
|
||||
"bison"
|
||||
"extra-cmake-modules"
|
||||
"flex"
|
||||
"kdoctools"
|
||||
"ki18n"
|
||||
"libxslt"
|
||||
"perl"
|
||||
"pythoninterp"
|
||||
];
|
||||
user = [
|
||||
"qt5"
|
||||
"qt5core"
|
||||
"qt5dbus"
|
||||
"qt5gui"
|
||||
"qt5qml"
|
||||
"qt5quick"
|
||||
"qt5svg"
|
||||
"qt5webkitwidgets"
|
||||
"qt5widgets"
|
||||
"qt5x11extras"
|
||||
"shareddesktopontologies"
|
||||
"sharedmimeinfo"
|
||||
];
|
||||
in lib.fold (f: attrs: f attrs) json [
|
||||
(lib.mapAttrs kdeOrL10nPackage)
|
||||
(userEnvDeps user)
|
||||
(nativeDeps native)
|
||||
(propagateDeps propagated)
|
||||
(renameDeps renames)
|
||||
(lib.mapAttrs mirrorUrl)
|
||||
];
|
||||
|
||||
kde4Package = pkg: overrideScope pkg (with kde4; {
|
||||
inherit akonadi baloo kactivities libkdegames libkmahjongg;
|
||||
kde4 = self.kdelibs;
|
||||
});
|
||||
|
||||
scope =
|
||||
# KDE Frameworks 5
|
||||
kf5 //
|
||||
# packages in this collection
|
||||
self //
|
||||
{
|
||||
kf5baloo = plasma5.baloo;
|
||||
kf5kdcraw = self.libkdcraw;
|
||||
kf5kdegames = self.libkdegames;
|
||||
kf5kipi = self.libkipi;
|
||||
libkonq = self.kde-baseapps;
|
||||
} //
|
||||
# packages requiring same Qt 5
|
||||
(with pkgs; {
|
||||
accountsqt5 = accounts-qt.override { inherit qt5; };
|
||||
dbusmenuqt = libdbusmenu_qt;
|
||||
grantlee5 = grantlee5.override { inherit qt5; };
|
||||
mlt = pkgs.mlt-qt5.override { inherit qt5; };
|
||||
phonon4qt5 = pkgs.phonon_qt5.override { inherit qt5; };
|
||||
qca-qt5 = qca-qt5.override { inherit qt5; };
|
||||
qt5script = qt5.script;
|
||||
qt5x11extras = qt5.x11extras;
|
||||
signonqt5 = signon.override { inherit qt5; };
|
||||
telepathyqt5 = telepathy_qt5.override { inherit qt5; };
|
||||
}) //
|
||||
# packages from nixpkgs
|
||||
(with pkgs; {
|
||||
inherit acl attr automoc4 avahi bison cdparanoia cfitsio cmake cups
|
||||
djvulibre docbook_xml_dtd_42 docbook_xsl enchant eigen2
|
||||
exiv2 fam ffmpeg flac flex freetype gmp gettext gpgme
|
||||
grantlee gsl hunspell ilmbase intltool jasper lcms2
|
||||
libaccounts-glib libgcrypt libotr libraw libssh libspectre
|
||||
libvncserver libical networkmanager openal opencv
|
||||
openexr perl phonon pkgconfig polkit_qt4 prison python qca2
|
||||
qimageblitz qjson qt4 samba saneBackends soprano speechd
|
||||
strigi taglib udev xorg xplanet xscreensaver xz;
|
||||
alsa = alsaLib;
|
||||
assuan = libassuan;
|
||||
boost = boost155;
|
||||
canberra = libcanberra;
|
||||
eigen3 = eigen;
|
||||
epub = ebook_tools;
|
||||
gif = giflib;
|
||||
gphoto2 = libgphoto2;
|
||||
hupnp = herqq;
|
||||
indi = indilib;
|
||||
jpeg = libjpeg;
|
||||
ldap = openldap;
|
||||
libattica = attica;
|
||||
musicbrainz3 = libmusicbrainz;
|
||||
oggvorbis = libvorbis;
|
||||
poppler = poppler_qt4;
|
||||
pulseaudio = libpulseaudio;
|
||||
qalculate = libqalculate;
|
||||
sasl2 = cyrus_sasl;
|
||||
shareddesktopontologies = shared_desktop_ontologies;
|
||||
sharedmimeinfo = shared_mime_info;
|
||||
sndfile = libsndfile;
|
||||
tiff = libtiff;
|
||||
telepathyqt4 = telepathy_qt;
|
||||
tunepimp = libtunepimp;
|
||||
usb = libusb;
|
||||
xsltproc = libxslt;
|
||||
});
|
||||
|
||||
self =
|
||||
(builtins.removeAttrs super [
|
||||
"artikulate" # build failure; wrong boost?
|
||||
"kde-dev-scripts" "kde-dev-utils" # docbook errors
|
||||
"kdewebdev" # unknown build failure
|
||||
"kde-l10n-sr" # missing CMake command
|
||||
]) // {
|
||||
audiocd-kio = kde4Package super.audiocd-kio;
|
||||
|
||||
amor = kde4Package super.amor;
|
||||
|
||||
ark = extendDerivation (kde4Package super.ark) {
|
||||
buildInputs = [ pkgs.makeWrapper ];
|
||||
# runtime dependency
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/ark --prefix PATH : "${pkgs.unzipNLS}/bin"
|
||||
'';
|
||||
};
|
||||
|
||||
cantor = extendDerivation (kde4Package super.cantor) {
|
||||
patches = [ ./cantor/0001-qalculate-filename-string-type.patch ];
|
||||
};
|
||||
|
||||
cervisia = kde4Package super.cervisia;
|
||||
|
||||
dolphin-plugins = kde4Package super.dolphin-plugins;
|
||||
|
||||
dragon = kde4Package super.dragon;
|
||||
|
||||
ffmpegthumbs = extendDerivation (kde4Package super.ffmpegthumbs) {
|
||||
nativeBuildInputs = [ scope.pkgconfig ];
|
||||
};
|
||||
|
||||
juk = kde4Package super.juk;
|
||||
|
||||
jovie = kde4Package super.jovie;
|
||||
|
||||
kaccessible = kde4Package super.kaccessible;
|
||||
|
||||
kaccounts-providers = extendDerivation super.kaccounts-providers {
|
||||
buildInputs = [ pkgs.libaccounts-glib ];
|
||||
# hard-coded install path
|
||||
preConfigure = ''
|
||||
substituteInPlace webkit-options/CMakeLists.txt \
|
||||
--replace "/etc/signon-ui/webkit-options.d/" \
|
||||
"$out/etc/signon-ui/webkit-options.d/"
|
||||
'';
|
||||
};
|
||||
|
||||
kajongg = kde4Package super.kajongg;
|
||||
|
||||
kalzium = extendDerivation (kde4Package super.kalzium) {
|
||||
nativeBuildInputs = [ scope.pkgconfig ];
|
||||
};
|
||||
|
||||
kamera = kde4Package super.kamera;
|
||||
|
||||
kate = extendDerivation super.kate {
|
||||
buildInputs = with scope; [
|
||||
kconfig kguiaddons kiconthemes ki18n kinit kjobwidgets kio
|
||||
kparts ktexteditor kwindowsystem kxmlgui
|
||||
];
|
||||
nativeBuildInputs = [ scope.kdoctools ];
|
||||
};
|
||||
|
||||
kcachegrind = kde4Package super.kcachegrind;
|
||||
|
||||
kcolorchooser = kde4Package super.kcolorchooser;
|
||||
|
||||
kde-base-artwork = kde4Package super.kde-base-artwork;
|
||||
|
||||
kde-baseapps = kde4Package super.kde-baseapps;
|
||||
|
||||
kde-runtime = extendDerivation (kde4Package super.kde-runtime) {
|
||||
buildInputs = [ scope.canberra ];
|
||||
nativeBuildInputs = [ scope.pkgconfig ];
|
||||
# cmake does not detect path to `ilmbase`
|
||||
NIX_CFLAGS_COMPILE = "-I${scope.ilmbase}/include/OpenEXR -I${pkgs.glib}/include/glib-2.0 -I${pkgs.glib}/lib/glib-2.0/include";
|
||||
# some components of this package have been replaced in other packages
|
||||
meta = { priority = 10; };
|
||||
};
|
||||
|
||||
kde-wallpapers = kde4Package super.kde-wallpapers;
|
||||
|
||||
kde-workspace = extendDerivation (kde4Package super.kde-workspace) {
|
||||
patches = [ ./kde-workspace/ksysguard-0001-disable-signalplottertest.patch ];
|
||||
buildInputs = with scope.xorg; [
|
||||
libxkbfile libXcomposite xcbutilimage xcbutilkeysyms xcbutilrenderutil
|
||||
];
|
||||
nativeBuildInputs = [ scope.pkgconfig ];
|
||||
# some components of this package have been replaced in other packages
|
||||
meta = { priority = 10; };
|
||||
};
|
||||
|
||||
kdeartwork = kde4Package super.kdeartwork;
|
||||
|
||||
kdegraphics-mobipocket = kde4Package super.kdegraphics-mobipocket;
|
||||
|
||||
kdegraphics-strigi-analyzer = kde4Package super.kdegraphics-strigi-analyzer;
|
||||
|
||||
kdegraphics-thumbnailers = kde4Package super.kdegraphics-thumbnailers;
|
||||
|
||||
kdelibs = extendDerivation super.kdelibs {
|
||||
buildInputs = with scope; [ attr polkit_qt4 xsltproc xz ];
|
||||
propagatedBuildInputs = with scope; [ qt4 soprano phonon strigi ];
|
||||
nativeBuildInputs = [ scope.pkgconfig ];
|
||||
propagatedNativeBuildInputs = with scope; [
|
||||
automoc4 cmake perl sharedmimeinfo
|
||||
];
|
||||
|
||||
patches = [ ./kdelibs/polkit-install.patch ];
|
||||
|
||||
# cmake does not detect path to `ilmbase`
|
||||
NIX_CFLAGS_COMPILE = "-I${scope.ilmbase}/include/OpenEXR";
|
||||
|
||||
cmakeFlags = [
|
||||
"-DDOCBOOKXML_CURRENTDTD_DIR=${scope.docbook_xml_dtd_42}/xml/dtd/docbook"
|
||||
"-DDOCBOOKXSL_DIR=${scope.docbook_xsl}/xml/xsl/docbook"
|
||||
"-DHUPNP_ENABLED=ON"
|
||||
"-DWITH_SOLID_UDISKS2=ON"
|
||||
"-DKDE_DEFAULT_HOME=.kde"
|
||||
];
|
||||
};
|
||||
|
||||
kdenetwork-filesharing = kde4Package super.kdenetwork-filesharing;
|
||||
|
||||
kdenetwork-strigi-analyzers = kde4Package super.kdenetwork-strigi-analyzers;
|
||||
|
||||
kdenlive = extendDerivation super.kdenlive { buildInputs = [ scope.mlt ]; };
|
||||
|
||||
kdepim = extendDerivation (kde4Package super.kdepim) {
|
||||
buildInputs = with scope; [ gpgme assuan ];
|
||||
nativeBuildInputs = [ scope.pkgconfig ];
|
||||
};
|
||||
|
||||
kdepim-runtime = kde4Package super.kdepim-runtime;
|
||||
|
||||
kdepimlibs = extendDerivation (kde4Package super.kdepimlibs) {
|
||||
nativeBuildInputs = [ scope.pkgconfig ];
|
||||
};
|
||||
|
||||
kdesdk-kioslaves = kde4Package super.kdesdk-kioslaves;
|
||||
|
||||
kdesdk-strigi-analyzers = kde4Package super.kdesdk-strigi-analyzers;
|
||||
|
||||
kdesdk-thumbnailers =
|
||||
extendDerivation (kde4Package super.kdesdk-thumbnailers) {
|
||||
nativeBuildInputs = [ scope.gettext ];
|
||||
};
|
||||
|
||||
kdf = kde4Package super.kdf;
|
||||
|
||||
kfloppy = kde4Package super.kfloppy;
|
||||
|
||||
kgamma = kde4Package super.kgamma;
|
||||
|
||||
kget = kde4Package super.kget;
|
||||
|
||||
kgoldrunner = kde4Package super.kgoldrunner;
|
||||
|
||||
kgpg = extendDerivation (kde4Package super.kgpg) {
|
||||
buildInputs = [ scope.boost ];
|
||||
};
|
||||
|
||||
khangman = extendDerivation super.khangman { buildInputs = [ scope.kio ]; };
|
||||
|
||||
kigo = kde4Package super.kigo;
|
||||
|
||||
kiriki = kde4Package super.kiriki;
|
||||
|
||||
klickety = kde4Package super.klickety;
|
||||
|
||||
kmag = kde4Package super.kmag;
|
||||
|
||||
kmahjongg = kde4Package super.kmahjongg;
|
||||
|
||||
kmix = extendDerivation super.kmix {
|
||||
nativeBuildInputs = [ scope.pkgconfig ];
|
||||
cmakeFlags = [ "-DKMIX_KF5_BUILD=ON" ];
|
||||
};
|
||||
|
||||
kmousetool = extendDerivation (kde4Package super.kmousetool) {
|
||||
buildInputs = with scope.xorg; [ libXtst libXt ];
|
||||
};
|
||||
|
||||
kmouth = kde4Package super.kmouth;
|
||||
|
||||
knavalbattle = kde4Package super.knavalbattle;
|
||||
|
||||
kolf = kde4Package super.kolf;
|
||||
|
||||
kolourpaint = kde4Package super.kolourpaint;
|
||||
|
||||
konquest = kde4Package super.konquest;
|
||||
|
||||
kopete = kde4Package super.kopete;
|
||||
|
||||
kppp = kde4Package super.kppp;
|
||||
|
||||
kqtquickcharts = kde4Package super.kqtquickcharts;
|
||||
|
||||
krdc = kde4Package super.krdc;
|
||||
|
||||
kremotecontrol = extendDerivation (kde4Package super.kremotecontrol) {
|
||||
buildInputs = [ scope.xorg.libXtst ];
|
||||
};
|
||||
|
||||
kreversi = kde4Package super.kreversi;
|
||||
|
||||
krfb = extendDerivation (kde4Package super.krfb) {
|
||||
buildInputs = with scope; [ xorg.libXtst ktp-common-internals ];
|
||||
};
|
||||
|
||||
ksaneplugin = kde4Package super.ksaneplugin;
|
||||
|
||||
kscd = kde4Package super.kscd;
|
||||
|
||||
ksirk = kde4Package super.ksirk;
|
||||
|
||||
ksnakeduel = kde4Package super.ksnakeduel;
|
||||
|
||||
ksnapshot = kde4Package super.ksnapshot;
|
||||
|
||||
kspaceduel = kde4Package super.kspaceduel;
|
||||
|
||||
kstars = extendDerivation super.kstars {
|
||||
buildInputs = with scope; [ kparts cfitsio ];
|
||||
};
|
||||
|
||||
ksudoku = kde4Package super.ksudoku;
|
||||
|
||||
ksystemlog = kde4Package super.ksystemlog;
|
||||
|
||||
ktp-accounts-kcm = extendDerivation super.ktp-accounts-kcm {
|
||||
buildInputs = [ scope.libaccounts-glib ];
|
||||
};
|
||||
|
||||
ktp-common-internals = extendDerivation super.ktp-common-internals {
|
||||
buildInputs = with scope; [ kdelibs4support kparts libotr ];
|
||||
};
|
||||
|
||||
ktp-text-ui = extendDerivation super.ktp-text-ui {
|
||||
buildInputs = [ scope.kdbusaddons ];
|
||||
};
|
||||
|
||||
ktuberling = kde4Package super.ktuberling;
|
||||
|
||||
ktux = kde4Package super.ktux;
|
||||
|
||||
kubrick = kde4Package super.kubrick;
|
||||
|
||||
kuser = kde4Package super.kuser;
|
||||
|
||||
kwalletmanager = kde4Package super.kwalletmanager;
|
||||
|
||||
lokalize = extendDerivation super.lokalize {
|
||||
buildInputs = [ scope.kdbusaddons ];
|
||||
};
|
||||
|
||||
libkcddb = kde4Package super.libkcddb;
|
||||
|
||||
libkcompactdisc = kde4Package super.libkcompactdisc;
|
||||
|
||||
libkdcraw = extendDerivation super.libkdcraw {
|
||||
buildInputs = with scope; [ kdelibs libraw ];
|
||||
nativeBuildInputs = [ scope.pkgconfig ];
|
||||
};
|
||||
|
||||
libkdeedu = kde4Package super.libkdeedu;
|
||||
|
||||
libkexiv2 = extendDerivation super.libkexiv2 {
|
||||
buildInputs = with scope; [ exiv2 kdelibs ];
|
||||
};
|
||||
|
||||
libkface = extendDerivation super.libkface {
|
||||
buildInputs = with scope; [ kdelibs opencv ];
|
||||
};
|
||||
|
||||
libkgeomap = extendDerivation (kde4Package super.libkgeomap) {
|
||||
cmakeFlags =
|
||||
[ "-DCMAKE_MODULE_PATH=${scope.marble}/share/apps/cmake/modules" ];
|
||||
};
|
||||
|
||||
libkipi = extendDerivation super.libkipi {
|
||||
buildInputs = [ scope.kdelibs ];
|
||||
};
|
||||
|
||||
libksane = extendDerivation super.libksane {
|
||||
buildInputs = with scope; [ kdelibs saneBackends];
|
||||
};
|
||||
|
||||
lskat = kde4Package super.lskat;
|
||||
|
||||
marble = kde4Package super.marble;
|
||||
|
||||
mplayerthumbs = kde4Package super.mplayerthumbs;
|
||||
|
||||
okular = extendDerivation (kde4Package super.okular) {
|
||||
nativeBuildInputs = [ scope.pkgconfig ];
|
||||
};
|
||||
|
||||
pairs = kde4Package super.pairs;
|
||||
|
||||
palapeli = kde4Package super.palapeli;
|
||||
|
||||
picmi = kde4Package super.picmi;
|
||||
|
||||
poxml = kde4Package super.poxml;
|
||||
|
||||
rocs = extendDerivation super.rocs {
|
||||
buildInputs = [ scope.kdelibs4support ];
|
||||
};
|
||||
|
||||
signon-kwallet-extension = extendDerivation super.signon-kwallet-extension {
|
||||
buildInputs = [ scope.signonqt5 ];
|
||||
preConfigure = ''
|
||||
sed -i src/CMakeLists.txt \
|
||||
-e "s,\''${SIGNONEXTENSION_PLUGINDIR},$out/lib/signon/extensions,"
|
||||
'';
|
||||
};
|
||||
|
||||
superkaramba = kde4Package super.superkaramba;
|
||||
|
||||
svgpart = kde4Package super.svgpart;
|
||||
|
||||
sweeper = kde4Package super.sweeper;
|
||||
|
||||
umbrello = kde4Package super.umbrello;
|
||||
|
||||
zeroconf-ioslave = kde4Package super.zeroconf-ioslave;
|
||||
|
||||
};
|
||||
|
||||
in self
|
||||
@ -1,36 +0,0 @@
|
||||
From 38f35dcec38458f7192424b3d63bc0c614bb86e0 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Mon, 7 Sep 2015 18:55:44 -0500
|
||||
Subject: [PATCH] ksysguard disable signalplottertest
|
||||
|
||||
---
|
||||
libs/ksysguard/tests/CMakeLists.txt | 16 ----------------
|
||||
1 file changed, 16 deletions(-)
|
||||
|
||||
diff --git a/libs/ksysguard/tests/CMakeLists.txt b/libs/ksysguard/tests/CMakeLists.txt
|
||||
index d472fd7..f178b71 100644
|
||||
--- a/libs/ksysguard/tests/CMakeLists.txt
|
||||
+++ b/libs/ksysguard/tests/CMakeLists.txt
|
||||
@@ -14,19 +14,3 @@ target_link_libraries(processtest processui ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIB
|
||||
set( signalplotterbenchmark_SRCS signalplotterbenchmark.cpp ../signalplotter/ksignalplotter.cpp)
|
||||
kde4_add_unit_test( signalplotterbenchmark TESTNAME ksysguard-signalplottertest ${signalplotterbenchmark_SRCS} )
|
||||
target_link_libraries( signalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY} )
|
||||
-
|
||||
-
|
||||
-# KGraphicsSignalPlotter benchmark
|
||||
-set( graphicssignalplotterbenchmark_SRCS graphicssignalplotterbenchmark.cpp ../signalplotter/kgraphicssignalplotter.cpp)
|
||||
-kde4_add_unit_test( graphicssignalplotterbenchmark TESTNAME ksysguard-signalplottertest ${graphicssignalplotterbenchmark_SRCS} )
|
||||
-target_link_libraries( graphicssignalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY} )
|
||||
-
|
||||
-
|
||||
-# KSignalPlotter unit test
|
||||
-set( signalplottertest_SRCS signalplottertest.cpp ../signalplotter/ksignalplotter.cpp)
|
||||
-kde4_add_unit_test( signalplottertest TESTNAME ksysguard-signalplottertest ${signalplottertest_SRCS} )
|
||||
-target_link_libraries( signalplottertest ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} )
|
||||
-
|
||||
-
|
||||
-
|
||||
-
|
||||
--
|
||||
2.5.0
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake
|
||||
--- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake 2011-05-20 22:24:54.000000000 +0200
|
||||
+++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake 2011-07-12 14:03:00.000000000 +0200
|
||||
@@ -139,7 +139,7 @@
|
||||
${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR
|
||||
${POLKITQT-1_POLICY_FILES_INSTALL_DIR})
|
||||
|
||||
- set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING
|
||||
+ set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING
|
||||
"Where policy files generated by KAuth will be installed" FORCE)
|
||||
elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE")
|
||||
set (KAUTH_COMPILING_FAKE_BACKEND TRUE)
|
||||
@ -1,70 +0,0 @@
|
||||
{
|
||||
"kf5widgetsaddons": "kwidgetsaddons",
|
||||
"kf5texteditor": "ktexteditor",
|
||||
"kf5designerplugin": "kdesignerplugin",
|
||||
"kf5bookmarks": "kbookmarks",
|
||||
"kf5frameworkintegration": "frameworkintegration",
|
||||
"kf5package": "kpackage",
|
||||
"kf5archive": "karchive",
|
||||
"kf5plasma": "plasma-framework",
|
||||
"kf5kcmutils": "kcmutils",
|
||||
"kf5configwidgets": "kconfigwidgets",
|
||||
"ctest": "attica",
|
||||
"kf5kio": "kio",
|
||||
"kf5networkmanagerqt": "networkmanager-qt",
|
||||
"kf5coreaddons": "kcoreaddons",
|
||||
"kf5guiaddons": "kguiaddons",
|
||||
"kf5jobwidgets": "kjobwidgets",
|
||||
"kf5modemmanagerqt": "modemmanager-qt",
|
||||
"kf5runner": "krunner",
|
||||
"kf5globalaccel": "kglobalaccel",
|
||||
"kf5dbusaddons": "kdbusaddons",
|
||||
"kf5crash": "kcrash",
|
||||
"kf5itemviews": "kitemviews",
|
||||
"kf5doctools": "kdoctools",
|
||||
"kf5i18n": "ki18n",
|
||||
"kf5webkit": "kdewebkit",
|
||||
"kf5newstuff": "knewstuff",
|
||||
"kded": "kded",
|
||||
"kf5notifications": "knotifications",
|
||||
"kf5activitiesexperimentalstats": "kactivities",
|
||||
"kf5dnssd": "kdnssd",
|
||||
"kf5notifyconfig": "knotifyconfig",
|
||||
"kf5iconthemes": "kiconthemes",
|
||||
"kf5js": "kjs",
|
||||
"kf5kde4support": "kdelibs4support",
|
||||
"kf5parts": "kparts",
|
||||
"backend": "plasma-framework",
|
||||
"kf5completion": "kcompletion",
|
||||
"kf5threadweaver": "threadweaver",
|
||||
"kf5mediaplayer": "kmediaplayer",
|
||||
"kf5plasmaquick": "plasma-framework",
|
||||
"kf5wallet": "kwallet",
|
||||
"kf5xmlgui": "kxmlgui",
|
||||
"kf5attica": "attica",
|
||||
"kf5declarative": "kdeclarative",
|
||||
"kf5config": "kconfig",
|
||||
"kf5init": "kinit",
|
||||
"kf5textwidgets": "ktextwidgets",
|
||||
"kf5jsembed": "kjsembed",
|
||||
"kf5codecs": "kcodecs",
|
||||
"kf5service": "kservice",
|
||||
"kf5sonnet": "sonnet",
|
||||
"kf5kdelibs4support": "kdelibs4support",
|
||||
"kf5pty": "kpty",
|
||||
"kf5solid": "solid",
|
||||
"kf5auth": "kauth",
|
||||
"ecm": "extra-cmake-modules",
|
||||
"kf5activities": "kactivities",
|
||||
"kf5plotting": "kplotting",
|
||||
"kf5people": "kpeople",
|
||||
"kf5emoticons": "kemoticons",
|
||||
"kf5kross": "kross",
|
||||
"kf5su": "kdesu",
|
||||
"kf5khtml": "khtml",
|
||||
"kf5unitconversion": "kunitconversion",
|
||||
"kf5idletime": "kidletime",
|
||||
"kf5windowsystem": "kwindowsystem",
|
||||
"kf5xmlrpcclient": "kxmlrpcclient",
|
||||
"kf5itemmodels": "kitemmodels"
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,22 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
set -x
|
||||
|
||||
origin="$(pwd)"
|
||||
|
||||
# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS
|
||||
KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
|
||||
|
||||
alias nix-build="nix-build --no-out-link \"$origin/../../..\""
|
||||
|
||||
# The extra slash at the end of the URL is necessary to stop wget
|
||||
# from recursing over the whole server! (No, it's not a bug.)
|
||||
$(nix-build -A autonix.manifest) \
|
||||
"${KDE_MIRROR}/stable/applications/15.04.3/" \
|
||||
"$@" -A '*.tar.xz'
|
||||
|
||||
AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellPackages.autonix-deps-kf5)/bin/kf5-deps"}
|
||||
|
||||
$AUTONIX_DEPS_KF5 manifest.json
|
||||
|
||||
rm manifest.json
|
||||
@ -1,20 +0,0 @@
|
||||
{
|
||||
"kf5sysguard": "libksysguard",
|
||||
"kf5baloo": "baloo",
|
||||
"krunnerappdbusinterface": "plasma-workspace",
|
||||
"screensaverdbusinterface": "plasma-workspace",
|
||||
"ctest": "kdeplasma-addons",
|
||||
"kf5filemetadata": "kfilemetadata",
|
||||
"kwindbusinterface": "kwin",
|
||||
"kf5activitiesexperimentalstats": "plasma-desktop",
|
||||
"khotkeysdbusinterface": "khotkeys",
|
||||
"libkworkspace": "plasma-workspace",
|
||||
"libtaskmanager": "plasma-workspace",
|
||||
"backend": "powerdevil",
|
||||
"kf5screen": "libkscreen",
|
||||
"ksmserverdbusinterface": "plasma-workspace",
|
||||
"kf5wayland": "kwayland",
|
||||
"kdecoration2": "kdecoration",
|
||||
"kf5bluezqt": "bluez-qt",
|
||||
"oxygenfont": "oxygen-fonts"
|
||||
}
|
||||
@ -1,31 +0,0 @@
|
||||
{
|
||||
"libkomparediff2": "libkomparediff2",
|
||||
"kdegames": "libkdegames",
|
||||
"ksane": "libksane",
|
||||
"ctest": "sweeper",
|
||||
"kastencore": "okteta",
|
||||
"kastengui": "okteta",
|
||||
"gpgmepp": "kdepimlibs",
|
||||
"oktetacore": "okteta",
|
||||
"kf5kmahjongglib": "libkmahjongg",
|
||||
"oktetagui": "okteta",
|
||||
"libkcompactdisc": "libkcompactdisc",
|
||||
"libkdeedu": "libkdeedu",
|
||||
"kaccounts": "kaccounts-integration",
|
||||
"kastencontrollers": "okteta",
|
||||
"backend": "kde-workspace",
|
||||
"ktp": "ktp-common-internals",
|
||||
"kdepimlibs": "kdepimlibs",
|
||||
"qjdns": "kopete",
|
||||
"libkeduvocdocument": "libkeduvocdocument",
|
||||
"oktetakastencore": "okteta",
|
||||
"libkcddb": "libkcddb",
|
||||
"oktetakastengui": "okteta",
|
||||
"kde4workspace": "kde-workspace",
|
||||
"jdns": "kopete",
|
||||
"okular": "okular",
|
||||
"qmobipocket": "kdegraphics-mobipocket",
|
||||
"kdeclarative": "kdelibs",
|
||||
"analitza5": "analitza",
|
||||
"oktetakastencontrollers": "okteta"
|
||||
}
|
||||
@ -1,12 +0,0 @@
|
||||
addToSearchPath XDG_DATA_DIRS @out@/share
|
||||
|
||||
addQt4Plugins() {
|
||||
if [[ -d "$1/lib/qt4/plugins" ]]; then
|
||||
propagatedUserEnvPkgs+=" $1"
|
||||
fi
|
||||
|
||||
if [[ -d "$1/lib/kde4/plugins" ]]; then
|
||||
propagatedUserEnvPkgs+=" $1"
|
||||
fi
|
||||
}
|
||||
envHooks+=(addQt4Plugins)
|
||||
@ -1,258 +0,0 @@
|
||||
# Maintainer's Notes:
|
||||
#
|
||||
# Minor updates:
|
||||
# 1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes
|
||||
# releases updates that include only the changed packages; in this case,
|
||||
# multiple URLs can be provided and the results will be merged.
|
||||
# 2. Run ./manifest.sh and ./dependencies.sh.
|
||||
# 3. Build and enjoy.
|
||||
#
|
||||
# Major updates:
|
||||
# We prefer not to immediately overwrite older versions with major updates, so
|
||||
# make a copy of this directory first. After copying, be sure to delete ./tmp
|
||||
# if it exists. Then follow the minor update instructions.
|
||||
|
||||
{ pkgs, newScope, kdeApps ? null, kf5 ? null, qt5 ? null, debug ? false }:
|
||||
|
||||
let inherit (pkgs) autonix stdenv symlinkJoin; in
|
||||
|
||||
with autonix; let inherit (stdenv) lib; in
|
||||
|
||||
let
|
||||
kdeApps_ = if kdeApps != null then kdeApps else pkgs.kdeApps_15_04;
|
||||
kf5_ = if kf5 != null then kf5 else pkgs.kf510;
|
||||
qt5_ = if qt5 != null then qt5 else pkgs.qt54;
|
||||
in
|
||||
|
||||
let
|
||||
|
||||
kdeApps = kdeApps_.override { inherit debug kf5 qt5; plasma5 = self; };
|
||||
kf5 = kf5_.override { inherit debug qt5; };
|
||||
qt5 = qt5_;
|
||||
|
||||
kdePackage = name: pkg:
|
||||
let defaultOverride = drv: drv // {
|
||||
setupHook = ./setup-hook.sh;
|
||||
cmakeFlags =
|
||||
(drv.cmakeFlags or [])
|
||||
++ [ "-DBUILD_TESTING=OFF" ]
|
||||
++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
|
||||
meta = {
|
||||
license = with stdenv.lib.licenses; [
|
||||
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
|
||||
];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = with stdenv.lib.maintainers; [ ttuegel ];
|
||||
homepage = "http://www.kde.org";
|
||||
};
|
||||
};
|
||||
callPackage = newScope {
|
||||
inherit (stdenv) mkDerivation;
|
||||
inherit (pkgs) fetchurl;
|
||||
inherit scope;
|
||||
};
|
||||
in mkPackage callPackage defaultOverride name pkg;
|
||||
|
||||
super =
|
||||
let json = builtins.fromJSON (builtins.readFile ./packages.json);
|
||||
mirrorUrl = n: pkg: pkg // {
|
||||
src = pkg.src // { url = "mirror://kde/${pkg.src.url}"; };
|
||||
};
|
||||
renames =
|
||||
(builtins.fromJSON (builtins.readFile ./kf5-renames.json))
|
||||
// (builtins.fromJSON (builtins.readFile ./renames.json));
|
||||
propagated = [ "extra-cmake-modules" ];
|
||||
native = [
|
||||
"bison"
|
||||
"extra-cmake-modules"
|
||||
"flex"
|
||||
"kdoctools"
|
||||
"ki18n"
|
||||
"libxslt"
|
||||
"perl"
|
||||
"pythoninterp"
|
||||
];
|
||||
user = [
|
||||
"qt5"
|
||||
"qt5core"
|
||||
"qt5dbus"
|
||||
"qt5gui"
|
||||
"qt5qml"
|
||||
"qt5quick"
|
||||
"qt5svg"
|
||||
"qt5webkitwidgets"
|
||||
"qt5widgets"
|
||||
"qt5x11extras"
|
||||
"shareddesktopontologies"
|
||||
"sharedmimeinfo"
|
||||
];
|
||||
in lib.fold (f: attrs: f attrs) json [
|
||||
(lib.mapAttrs kdePackage)
|
||||
(userEnvDeps user)
|
||||
(nativeDeps native)
|
||||
(propagateDeps propagated)
|
||||
(renameDeps renames)
|
||||
(lib.mapAttrs mirrorUrl)
|
||||
];
|
||||
|
||||
scope =
|
||||
# KDE Frameworks 5
|
||||
kf5 //
|
||||
# packages in this collection
|
||||
self //
|
||||
# packages pinned to this version of Qt 5
|
||||
{
|
||||
dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; };
|
||||
libbluedevil = pkgs.libbluedevil.override { inherit qt5; };
|
||||
phonon4qt5 = pkgs.phonon_qt5.override { inherit qt5; };
|
||||
polkitqt5-1 = pkgs.polkit_qt5.override { inherit qt5; };
|
||||
poppler_qt5 = pkgs.poppler_qt5.override { inherit qt5; };
|
||||
qt5 = qt5.base;
|
||||
qt5core = qt5.base;
|
||||
qt5dbus = qt5.base;
|
||||
qt5gui = qt5.base;
|
||||
qt5linguisttools = qt5.tools;
|
||||
qt5qml = [qt5.declarative qt5.graphicaleffects];
|
||||
qt5quick = [qt5.quickcontrols qt5.graphicaleffects];
|
||||
qt5script = qt5.script;
|
||||
qt5svg = qt5.svg;
|
||||
qt5tools = qt5.tools;
|
||||
qt5webkitwidgets = qt5.webkit;
|
||||
qt5widgets = qt5.base;
|
||||
qt5x11extras = qt5.x11extras;
|
||||
qt5xmlpatterns = qt5.xmlpatterns;
|
||||
} //
|
||||
# packages from nixpkgs
|
||||
(with pkgs; {
|
||||
inherit attr bash cairo cmake coreutils dbus epoxy exiv2 ffmpeg
|
||||
freetype glib gnugrep gnused gtk2 gtk3 libinput libssh
|
||||
modemmanager openconnect openexr pam pango qt4 samba
|
||||
socat substituteAll taglib utillinux wayland xapian
|
||||
xkeyboard_config xorg;
|
||||
boost = boost155;
|
||||
canberra = libcanberra;
|
||||
epub = ebook_tools;
|
||||
fontforge_executable = fontforge;
|
||||
mobilebroadbandproviderinfo = mobile_broadband_provider_info;
|
||||
mtp = libmtp;
|
||||
pulseaudio = libpulseaudio;
|
||||
qalculate = libqalculate;
|
||||
shareddesktopontologies = shared_desktop_ontologies;
|
||||
sharedmimeinfo = shared_mime_info;
|
||||
usb = libusb;
|
||||
});
|
||||
|
||||
self = super // {
|
||||
|
||||
bluez-qt = overrideDerivation super.bluez-qt (drv: {
|
||||
preConfigure = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace /lib/udev/rules.d "$out/lib/udev/rules.d"
|
||||
'';
|
||||
});
|
||||
|
||||
breeze =
|
||||
let
|
||||
version = (builtins.parseDrvName super.breeze.name).version;
|
||||
|
||||
breeze-qt4 = overrideDerivation super.breeze (drv: {
|
||||
name = "breeze-qt4-${version}";
|
||||
buildInputs = [ pkgs.xorg.xproto pkgs.kde4.kdelibs pkgs.qt4 ];
|
||||
nativeBuildInputs = [ pkgs.automoc4 scope.cmake pkgs.pkgconfig ];
|
||||
cmakeFlags = [
|
||||
"-DUSE_KDE4=ON"
|
||||
"-DQT_QMAKE_EXECUTABLE=${scope.qt4}/bin/qmake"
|
||||
];
|
||||
});
|
||||
|
||||
breeze-qt5 = overrideDerivation super.breeze (drv: {
|
||||
name = "breeze-qt5-${version}";
|
||||
buildInputs = with kf5; with self; [
|
||||
kcompletion kconfig kconfigwidgets kcoreaddons kdecoration
|
||||
kguiaddons frameworkintegration ki18n kwindowsystem qt5.base
|
||||
qt5.x11extras
|
||||
];
|
||||
nativeBuildInputs = [ scope.cmake kf5.extra-cmake-modules pkgs.pkgconfig ];
|
||||
cmakeFlags = [ "-DUSE_KDE4=OFF" ];
|
||||
});
|
||||
in symlinkJoin "breeze-${version}" [ breeze-qt4 breeze-qt5 ];
|
||||
|
||||
kde-gtk-config = extendDerivation super.kde-gtk-config {
|
||||
NIX_CFLAGS_COMPILE = with scope;
|
||||
lib.concatStringsSep " " [
|
||||
"-I${cairo}/include/cairo"
|
||||
"-I${gtk2}/include/gtk-2.0"
|
||||
"-I${gtk2}/lib/gtk-2.0/include"
|
||||
"-I${glib}/include/glib-2.0"
|
||||
"-I${glib}/lib/glib-2.0/include"
|
||||
"-I${pango}/include/pango-1.0"
|
||||
];
|
||||
};
|
||||
|
||||
kfilemetadata = extendDerivation super.kfilemetadata {
|
||||
buildInputs = [ scope.attr ];
|
||||
};
|
||||
|
||||
kwin = extendDerivation super.kwin {
|
||||
buildInputs = with scope.xorg; [ libICE libSM libXcursor ];
|
||||
patches = [ ./kwin/kwin-import-plugin-follow-symlinks.patch ];
|
||||
};
|
||||
|
||||
libkscreen = extendDerivation super.libkscreen {
|
||||
buildInputs = [ scope.xorg.libXrandr];
|
||||
};
|
||||
|
||||
plasma-desktop = extendDerivation super.plasma-desktop {
|
||||
buildInputs = with scope;
|
||||
[ canberra ]
|
||||
++ (with xorg; [ libxkbfile libXcursor libXft ]);
|
||||
patches = [
|
||||
(scope.substituteAll {
|
||||
src = ./plasma-desktop/plasma-desktop-hwclock.patch;
|
||||
hwclock = "${scope.utillinux}/sbin/hwclock";
|
||||
})
|
||||
./plasma-desktop/plasma-desktop-zoneinfo.patch
|
||||
(scope.substituteAll {
|
||||
src = ./plasma-desktop/plasma-desktop-xkb-rules.patch;
|
||||
xkb = scope.xkeyboard_config;
|
||||
})
|
||||
];
|
||||
NIX_CFLAGS_COMPILE = with scope.xorg;
|
||||
lib.concatStringsSep " " [
|
||||
"-I${xf86inputsynaptics}/include/xorg"
|
||||
"-I${xf86inputevdev}/include/xorg"
|
||||
"-I${xorgserver}/include/xorg"
|
||||
];
|
||||
cmakeFlags = with scope.xorg; [
|
||||
"-DEvdev_INCLUDE_DIRS=${xf86inputevdev}/include"
|
||||
"-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include"
|
||||
];
|
||||
};
|
||||
|
||||
plasma-workspace = extendDerivation super.plasma-workspace {
|
||||
patches = [ ./plasma-workspace/0001-startkde-NixOS-patches.patch ];
|
||||
buildInputs = with scope.xorg; [ libSM libXcursor scope.pam ];
|
||||
|
||||
inherit (scope) bash coreutils gnused gnugrep socat;
|
||||
inherit (scope) kconfig kinit kservice qt5tools;
|
||||
inherit (scope.xorg) mkfontdir xmessage xprop xrdb xset xsetroot;
|
||||
dbus_tools = scope.dbus.tools;
|
||||
kde_workspace = kdeApps.kde-workspace;
|
||||
postPatch = ''
|
||||
substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \
|
||||
--replace kdostartupconfig5 $out/bin/kdostartupconfig5
|
||||
substituteAllInPlace startkde/startkde.cmake
|
||||
'';
|
||||
};
|
||||
|
||||
powerdevil = extendDerivation super.powerdevil {
|
||||
buildInputs = [ scope.xorg.libXrandr ];
|
||||
};
|
||||
|
||||
sddm-kcm = extendDerivation super.sddm-kcm {
|
||||
buildInputs = [ scope.xorg.libXcursor ];
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
in self
|
||||
@ -1,70 +0,0 @@
|
||||
{
|
||||
"kf5widgetsaddons": "kwidgetsaddons",
|
||||
"kf5texteditor": "ktexteditor",
|
||||
"kf5designerplugin": "kdesignerplugin",
|
||||
"kf5bookmarks": "kbookmarks",
|
||||
"kf5frameworkintegration": "frameworkintegration",
|
||||
"kf5package": "kpackage",
|
||||
"kf5archive": "karchive",
|
||||
"kf5plasma": "plasma-framework",
|
||||
"kf5kcmutils": "kcmutils",
|
||||
"kf5configwidgets": "kconfigwidgets",
|
||||
"ctest": "attica",
|
||||
"kf5kio": "kio",
|
||||
"kf5networkmanagerqt": "networkmanager-qt",
|
||||
"kf5coreaddons": "kcoreaddons",
|
||||
"kf5guiaddons": "kguiaddons",
|
||||
"kf5jobwidgets": "kjobwidgets",
|
||||
"kf5modemmanagerqt": "modemmanager-qt",
|
||||
"kf5runner": "krunner",
|
||||
"kf5globalaccel": "kglobalaccel",
|
||||
"kf5dbusaddons": "kdbusaddons",
|
||||
"kf5crash": "kcrash",
|
||||
"kf5itemviews": "kitemviews",
|
||||
"kf5doctools": "kdoctools",
|
||||
"kf5i18n": "ki18n",
|
||||
"kf5webkit": "kdewebkit",
|
||||
"kf5newstuff": "knewstuff",
|
||||
"kded": "kded",
|
||||
"kf5notifications": "knotifications",
|
||||
"kf5activitiesexperimentalstats": "kactivities",
|
||||
"kf5dnssd": "kdnssd",
|
||||
"kf5notifyconfig": "knotifyconfig",
|
||||
"kf5iconthemes": "kiconthemes",
|
||||
"kf5js": "kjs",
|
||||
"kf5kde4support": "kdelibs4support",
|
||||
"kf5parts": "kparts",
|
||||
"backend": "plasma-framework",
|
||||
"kf5completion": "kcompletion",
|
||||
"kf5threadweaver": "threadweaver",
|
||||
"kf5mediaplayer": "kmediaplayer",
|
||||
"kf5plasmaquick": "plasma-framework",
|
||||
"kf5wallet": "kwallet",
|
||||
"kf5xmlgui": "kxmlgui",
|
||||
"kf5attica": "attica",
|
||||
"kf5declarative": "kdeclarative",
|
||||
"kf5config": "kconfig",
|
||||
"kf5init": "kinit",
|
||||
"kf5textwidgets": "ktextwidgets",
|
||||
"kf5jsembed": "kjsembed",
|
||||
"kf5codecs": "kcodecs",
|
||||
"kf5service": "kservice",
|
||||
"kf5sonnet": "sonnet",
|
||||
"kf5kdelibs4support": "kdelibs4support",
|
||||
"kf5pty": "kpty",
|
||||
"kf5solid": "solid",
|
||||
"kf5auth": "kauth",
|
||||
"ecm": "extra-cmake-modules",
|
||||
"kf5activities": "kactivities",
|
||||
"kf5plotting": "kplotting",
|
||||
"kf5people": "kpeople",
|
||||
"kf5emoticons": "kemoticons",
|
||||
"kf5kross": "kross",
|
||||
"kf5su": "kdesu",
|
||||
"kf5khtml": "khtml",
|
||||
"kf5unitconversion": "kunitconversion",
|
||||
"kf5idletime": "kidletime",
|
||||
"kf5windowsystem": "kwindowsystem",
|
||||
"kf5xmlrpcclient": "kxmlrpcclient",
|
||||
"kf5itemmodels": "kitemmodels"
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/clients/aurorae/src/aurorae.cpp b/clients/aurorae/src/aurorae.cpp
|
||||
index 26b44a9..d14e226 100644
|
||||
--- a/clients/aurorae/src/aurorae.cpp
|
||||
+++ b/clients/aurorae/src/aurorae.cpp
|
||||
@@ -73,7 +73,7 @@ void AuroraeFactory::init()
|
||||
// so let's try to locate our plugin:
|
||||
QString pluginPath;
|
||||
for (const QString &path : m_engine->importPathList()) {
|
||||
- QDirIterator it(path, QDirIterator::Subdirectories);
|
||||
+ QDirIterator it(path, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
|
||||
while (it.hasNext()) {
|
||||
it.next();
|
||||
QFileInfo fileInfo = it.fileInfo();
|
||||
@ -1,25 +0,0 @@
|
||||
commit a93a2ab1918630c6d571b5a24379c15a0458d1fa
|
||||
Author: Martin Gräßlin <mgraesslin@kde.org>
|
||||
Date: Wed Jan 28 16:20:57 2015 +0100
|
||||
|
||||
Disable libinput integration if >= 0.8 is found
|
||||
|
||||
libinput 0.8 is incompatible causing the build to fail. As we are in
|
||||
dependency freeze the only option is to disable the build.
|
||||
|
||||
BUG: 342893
|
||||
FIXED-IN: 5.2.1
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 550ef57..8d9c593 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -145,7 +145,7 @@ set_package_properties(UDev PROPERTIES URL "http://www.freedesktop.org/software
|
||||
PURPOSE "Required for input handling on Wayland."
|
||||
)
|
||||
set(HAVE_INPUT FALSE)
|
||||
-if (Libinput_FOUND AND UDEV_FOUND)
|
||||
+if (Libinput_FOUND AND UDEV_FOUND AND Libinput_VERSION VERSION_LESS 0.8)
|
||||
set(HAVE_INPUT TRUE)
|
||||
endif()
|
||||
|
||||
@ -1,130 +0,0 @@
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 460022f..422a708 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -1,5 +1,7 @@
|
||||
include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDES})
|
||||
|
||||
+configure_file(config-libkscreen.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-libkscreen.h)
|
||||
+
|
||||
set(libkscreen_SRCS
|
||||
backendloader.cpp
|
||||
config.cpp
|
||||
diff --git a/src/backendloader.cpp b/src/backendloader.cpp
|
||||
index b93e469..8aebc14 100644
|
||||
--- a/src/backendloader.cpp
|
||||
+++ b/src/backendloader.cpp
|
||||
@@ -16,6 +16,7 @@
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA *
|
||||
*************************************************************************************/
|
||||
|
||||
+#include "config-libkscreen.h"
|
||||
#include "backendloader.h"
|
||||
#include "debug_p.h"
|
||||
#include "backends/abstractbackend.h"
|
||||
@@ -40,55 +41,54 @@ bool BackendLoader::init()
|
||||
const QString backend = qgetenv("KSCREEN_BACKEND").constData();
|
||||
const QString backendFilter = QString::fromLatin1("KSC_%1*").arg(backend);
|
||||
|
||||
- const QStringList paths = QCoreApplication::libraryPaths();
|
||||
- Q_FOREACH (const QString &path, paths) {
|
||||
- const QDir dir(path + QDir::separator() + QLatin1String("/kf5/kscreen/"),
|
||||
- backendFilter,
|
||||
- QDir::SortFlags(QDir::QDir::NoSort),
|
||||
- QDir::NoDotAndDotDot | QDir::Files);
|
||||
- const QFileInfoList finfos = dir.entryInfoList();
|
||||
- Q_FOREACH (const QFileInfo &finfo, finfos) {
|
||||
- // Skip "Fake" backend unless explicitly specified via KSCREEN_BACKEND
|
||||
- if (backend.isEmpty() && finfo.fileName().contains(QLatin1String("KSC_Fake"))) {
|
||||
- continue;
|
||||
- }
|
||||
+ QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" PLUGIN_INSTALL_DIR "/");
|
||||
|
||||
- // When on X11, skip the QScreen backend, instead use the XRandR backend,
|
||||
- // if not specified in KSCREEN_BACKEND
|
||||
- if (backend.isEmpty() &&
|
||||
- finfo.fileName().contains(QLatin1String("KSC_QScreen")) &&
|
||||
- QX11Info::isPlatformX11()) {
|
||||
- continue;
|
||||
- }
|
||||
+ const QDir dir(path + QDir::separator() + QLatin1String("/kf5/kscreen/"),
|
||||
+ backendFilter,
|
||||
+ QDir::SortFlags(QDir::QDir::NoSort),
|
||||
+ QDir::NoDotAndDotDot | QDir::Files);
|
||||
+ const QFileInfoList finfos = dir.entryInfoList();
|
||||
+ Q_FOREACH (const QFileInfo &finfo, finfos) {
|
||||
+ // Skip "Fake" backend unless explicitly specified via KSCREEN_BACKEND
|
||||
+ if (backend.isEmpty() && finfo.fileName().contains(QLatin1String("KSC_Fake"))) {
|
||||
+ continue;
|
||||
+ }
|
||||
|
||||
- // When not on X11, skip the XRandR backend, and fall back to QSCreen
|
||||
- // if not specified in KSCREEN_BACKEND
|
||||
- if (backend.isEmpty() &&
|
||||
- finfo.fileName().contains(QLatin1String("KSC_XRandR")) &&
|
||||
- !QX11Info::isPlatformX11()) {
|
||||
- continue;
|
||||
- }
|
||||
+ // When on X11, skip the QScreen backend, instead use the XRandR backend,
|
||||
+ // if not specified in KSCREEN_BACKEND
|
||||
+ if (backend.isEmpty() &&
|
||||
+ finfo.fileName().contains(QLatin1String("KSC_QScreen")) &&
|
||||
+ QX11Info::isPlatformX11()) {
|
||||
+ continue;
|
||||
+ }
|
||||
+
|
||||
+ // When not on X11, skip the XRandR backend, and fall back to QSCreen
|
||||
+ // if not specified in KSCREEN_BACKEND
|
||||
+ if (backend.isEmpty() &&
|
||||
+ finfo.fileName().contains(QLatin1String("KSC_XRandR")) &&
|
||||
+ !QX11Info::isPlatformX11()) {
|
||||
+ continue;
|
||||
+ }
|
||||
|
||||
- QPluginLoader loader(finfo.filePath());
|
||||
- loader.load();
|
||||
- QObject *instance = loader.instance();
|
||||
- if (!instance) {
|
||||
+ QPluginLoader loader(finfo.filePath());
|
||||
+ loader.load();
|
||||
+ QObject *instance = loader.instance();
|
||||
+ if (!instance) {
|
||||
+ loader.unload();
|
||||
+ continue;
|
||||
+ }
|
||||
+
|
||||
+ s_backend = qobject_cast< AbstractBackend* >(instance);
|
||||
+ if (s_backend) {
|
||||
+ if (!s_backend->isValid()) {
|
||||
+ qCDebug(KSCREEN) << "Skipping" << s_backend->name() << "backend";
|
||||
+ delete s_backend;
|
||||
+ s_backend = 0;
|
||||
loader.unload();
|
||||
continue;
|
||||
}
|
||||
-
|
||||
- s_backend = qobject_cast< AbstractBackend* >(instance);
|
||||
- if (s_backend) {
|
||||
- if (!s_backend->isValid()) {
|
||||
- qCDebug(KSCREEN) << "Skipping" << s_backend->name() << "backend";
|
||||
- delete s_backend;
|
||||
- s_backend = 0;
|
||||
- loader.unload();
|
||||
- continue;
|
||||
- }
|
||||
- qCDebug(KSCREEN) << "Loading" << s_backend->name() << "backend";
|
||||
- return true;
|
||||
- }
|
||||
+ qCDebug(KSCREEN) << "Loading" << s_backend->name() << "backend";
|
||||
+ return true;
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/src/config-libkscreen.h.cmake b/src/config-libkscreen.h.cmake
|
||||
new file mode 100644
|
||||
index 0000000..a99f3d1
|
||||
--- /dev/null
|
||||
+++ b/src/config-libkscreen.h.cmake
|
||||
@@ -0,0 +1,2 @@
|
||||
+#define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}"
|
||||
+#define PLUGIN_INSTALL_DIR "${PLUGIN_INSTALL_DIR}"
|
||||
@ -1,10 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS
|
||||
KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
|
||||
|
||||
# The extra slash at the end of the URL is necessary to stop wget
|
||||
# from recursing over the whole server! (No, it's not a bug.)
|
||||
$(nix-build ../../.. -A autonix.manifest) \
|
||||
"${KDE_MIRROR}/stable/plasma/5.3.1/" \
|
||||
$MANIFEST_EXTRA_ARGS -A '*.tar.xz'
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,22 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
set -x
|
||||
|
||||
origin="$(pwd)"
|
||||
|
||||
# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS
|
||||
KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
|
||||
|
||||
alias nix-build="nix-build --no-out-link \"$origin/../../..\""
|
||||
|
||||
# The extra slash at the end of the URL is necessary to stop wget
|
||||
# from recursing over the whole server! (No, it's not a bug.)
|
||||
$(nix-build -A autonix.manifest) \
|
||||
"${KDE_MIRROR}/stable/plasma/5.3.2/" \
|
||||
"$@" -A '*.tar.xz'
|
||||
|
||||
AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellPackages.autonix-deps-kf5)/bin/kf5-deps"}
|
||||
|
||||
$AUTONIX_DEPS_KF5 manifest.json
|
||||
|
||||
rm manifest.json
|
||||
@ -1,24 +0,0 @@
|
||||
diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp
|
||||
index cec5ab8..fc4a6b9 100644
|
||||
--- a/kcms/dateandtime/helper.cpp
|
||||
+++ b/kcms/dateandtime/helper.cpp
|
||||
@@ -48,10 +48,6 @@
|
||||
#include <sys/stat.h>
|
||||
#endif
|
||||
|
||||
-// We cannot rely on the $PATH environment variable, because D-Bus activation
|
||||
-// clears it. So we have to use a reasonable default.
|
||||
-static const QString exePath = QLatin1String("/usr/sbin:/usr/bin:/sbin:/bin");
|
||||
-
|
||||
int ClockHelper::ntp( const QStringList& ntpServers, bool ntpEnabled )
|
||||
{
|
||||
int ret = 0;
|
||||
@@ -227,7 +223,7 @@ int ClockHelper::tzreset()
|
||||
|
||||
void ClockHelper::toHwclock()
|
||||
{
|
||||
- QString hwclock = KStandardDirs::findExe("hwclock", exePath);
|
||||
+ QString hwclock = "@hwclock@";
|
||||
if (!hwclock.isEmpty()) {
|
||||
KProcess::execute(hwclock, QStringList() << "--systohc");
|
||||
}
|
||||
@ -1,47 +0,0 @@
|
||||
From 3f175a5ecc9b4fecd8fe25cb482cf2c91aa47cf6 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Mon, 4 May 2015 22:23:21 -0500
|
||||
Subject: [PATCH] xkb rules path
|
||||
|
||||
---
|
||||
kcms/keyboard/xkb_rules.cpp | 24 +-----------------------
|
||||
1 file changed, 1 insertion(+), 23 deletions(-)
|
||||
|
||||
diff --git a/kcms/keyboard/xkb_rules.cpp b/kcms/keyboard/xkb_rules.cpp
|
||||
index 341369d..27066d6 100644
|
||||
--- a/kcms/keyboard/xkb_rules.cpp
|
||||
+++ b/kcms/keyboard/xkb_rules.cpp
|
||||
@@ -157,29 +157,7 @@ QString Rules::getRulesName()
|
||||
|
||||
QString Rules::findXkbDir()
|
||||
{
|
||||
- QString xkbParentDir;
|
||||
-
|
||||
- QString base(XLIBDIR);
|
||||
- if( base.count('/') >= 3 ) {
|
||||
- // .../usr/lib/X11 -> /usr/share/X11/xkb vs .../usr/X11/lib -> /usr/X11/share/X11/xkb
|
||||
- QString delta = base.endsWith("X11") ? "/../../share/X11" : "/../share/X11";
|
||||
- QDir baseDir(base + delta);
|
||||
- if( baseDir.exists() ) {
|
||||
- xkbParentDir = baseDir.absolutePath();
|
||||
- }
|
||||
- else {
|
||||
- QDir baseDir(base + "/X11"); // .../usr/X11/lib/X11/xkb (old XFree)
|
||||
- if( baseDir.exists() ) {
|
||||
- xkbParentDir = baseDir.absolutePath();
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- if( xkbParentDir.isEmpty() ) {
|
||||
- xkbParentDir = "/usr/share/X11";
|
||||
- }
|
||||
-
|
||||
- return xkbParentDir + "/xkb";
|
||||
+ return "@xkb@/share/X11/xkb";
|
||||
}
|
||||
|
||||
static QString findXkbRulesFile()
|
||||
--
|
||||
2.3.6
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp
|
||||
index fc4a6b9..7b64d05 100644
|
||||
--- a/kcms/dateandtime/helper.cpp
|
||||
+++ b/kcms/dateandtime/helper.cpp
|
||||
@@ -181,7 +181,12 @@ int ClockHelper::tz( const QString& selectedzone )
|
||||
|
||||
val = selectedzone;
|
||||
#else
|
||||
- QString tz = "/usr/share/zoneinfo/" + selectedzone;
|
||||
+ // NixOS-specific path
|
||||
+ QString tz = "/etc/zoneinfo/" + selectedzone;
|
||||
+ if (!QFile::exists(tz)) {
|
||||
+ // Standard Linux path
|
||||
+ tz = "/usr/share/zoneinfo/" + selectedzone;
|
||||
+ }
|
||||
|
||||
if (QFile::exists(tz)) { // make sure the new TZ really exists
|
||||
QFile::remove("/etc/localtime");
|
||||
@ -1,411 +0,0 @@
|
||||
From f124d2204cff11ae0ff0d6c788d268b746180407 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Sat, 18 Jul 2015 12:13:08 -0500
|
||||
Subject: [PATCH] startkde NixOS patches
|
||||
|
||||
---
|
||||
startkde/startkde.cmake | 222 ++++++++++++++++++++----------------------------
|
||||
1 file changed, 91 insertions(+), 131 deletions(-)
|
||||
|
||||
diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
|
||||
index 6f93108..26cc2fc 100644
|
||||
--- a/startkde/startkde.cmake
|
||||
+++ b/startkde/startkde.cmake
|
||||
@@ -1,8 +1,31 @@
|
||||
-#!/bin/sh
|
||||
+#!@bash@/bin/bash
|
||||
#
|
||||
# DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ )
|
||||
#
|
||||
|
||||
+set -x
|
||||
+
|
||||
+# The KDE icon cache is supposed to update itself
|
||||
+# automatically, but it uses the timestamp on the icon
|
||||
+# theme directory as a trigger. Since in Nix the
|
||||
+# timestamp is always the same, this doesn't work. So as
|
||||
+# a workaround, nuke the icon cache on login. This isn't
|
||||
+# perfect, since it may require logging out after
|
||||
+# installing new applications to update the cache.
|
||||
+# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html
|
||||
+rm -fv $HOME/.cache/icon-cache.kcache
|
||||
+
|
||||
+# Qt writes a weird ‘libraryPath’ line to
|
||||
+# ~/.config/Trolltech.conf that causes the KDE plugin
|
||||
+# paths of previous KDE invocations to be searched.
|
||||
+# Obviously using mismatching KDE libraries is potentially
|
||||
+# disastrous, so here we nuke references to the Nix store
|
||||
+# in Trolltech.conf. A better solution would be to stop
|
||||
+# Qt from doing this wackiness in the first place.
|
||||
+if [ -e $HOME/.config/Trolltech.conf ]; then
|
||||
+ @gnused@/bin/sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
|
||||
+fi
|
||||
+
|
||||
if test "x$1" = x--failsafe; then
|
||||
KDE_FAILSAFE=1 # General failsafe flag
|
||||
KWIN_COMPOSE=N # Disable KWin's compositing
|
||||
@@ -16,29 +39,16 @@ trap 'echo GOT SIGHUP' HUP
|
||||
# we have to unset this for Darwin since it will screw up KDE's dynamic-loading
|
||||
unset DYLD_FORCE_FLAT_NAMESPACE
|
||||
|
||||
-# in case we have been started with full pathname spec without being in PATH
|
||||
-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
|
||||
-if [ -n "$bindir" ]; then
|
||||
- qbindir=`qtpaths --binaries-dir`
|
||||
- qdbus=$qbindir/qdbus
|
||||
- case $PATH in
|
||||
- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
|
||||
- *) PATH=$bindir:$PATH; export PATH;;
|
||||
- esac
|
||||
-else
|
||||
- qdbus=qdbus
|
||||
-fi
|
||||
-
|
||||
# Check if a KDE session already is running and whether it's possible to connect to X
|
||||
-kcheckrunning
|
||||
+@out@/bin/kcheckrunning
|
||||
kcheckrunning_result=$?
|
||||
if test $kcheckrunning_result -eq 0 ; then
|
||||
- echo "KDE seems to be already running on this display."
|
||||
- xmessage -geometry 500x100 "KDE seems to be already running on this display." > /dev/null 2>/dev/null
|
||||
+ echo "KDE seems to be already running on this display."
|
||||
+ @xmessage@/bin/xmessage -geometry 500x100 "KDE seems to be already running on this display."
|
||||
exit 1
|
||||
elif test $kcheckrunning_result -eq 2 ; then
|
||||
echo "\$DISPLAY is not set or cannot connect to the X server."
|
||||
- exit 1
|
||||
+ exit 1
|
||||
fi
|
||||
|
||||
# Boot sequence:
|
||||
@@ -56,13 +66,8 @@ fi
|
||||
# * Then ksmserver is started which takes control of the rest of the startup sequence
|
||||
|
||||
# We need to create config folder so we can write startupconfigkeys
|
||||
-if [ ${XDG_CONFIG_HOME} ]; then
|
||||
- configDir=$XDG_CONFIG_HOME;
|
||||
-else
|
||||
- configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
|
||||
-fi
|
||||
-
|
||||
-mkdir -p $configDir
|
||||
+configDir=$(@qt5tools@/bin/qtpaths --writable-path GenericConfigLocation)
|
||||
+mkdir -p "$configDir"
|
||||
|
||||
#This is basically setting defaults so we can use them with kstartupconfig5
|
||||
cat >$configDir/startupconfigkeys <<EOF
|
||||
@@ -106,55 +111,21 @@ toolBarFont=Oxygen-Sans,9,-1,5,50,0,0,0,0,0
|
||||
EOF
|
||||
}
|
||||
|
||||
-# Make sure the Oxygen font is installed
|
||||
-# This is necessary for setups where CMAKE_INSTALL_PREFIX
|
||||
-# is not in /usr. fontconfig looks in /usr, ~/.fonts and
|
||||
-# $XDG_DATA_HOME for fonts. In this case, we symlink the
|
||||
-# Oxygen font under ${XDG_DATA_HOME} and make it known to
|
||||
-# fontconfig
|
||||
-
|
||||
-usr_share="/usr/share"
|
||||
-install_share="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@"
|
||||
-
|
||||
-if [ ! $install_share = $usr_share ]; then
|
||||
-
|
||||
- if [ ${XDG_DATA_HOME} ]; then
|
||||
- fontsDir="${XDG_DATA_HOME}/fonts"
|
||||
- else
|
||||
- fontsDir="${HOME}/.fonts"
|
||||
- fi
|
||||
-
|
||||
- test -d $fontsDir || {
|
||||
- mkdir -p $fontsDir
|
||||
- }
|
||||
-
|
||||
- oxygenDir=$fontsDir/oxygen
|
||||
- prefixDir="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@/fonts/oxygen"
|
||||
-
|
||||
- # if the oxygen dir doesn't exist, create a symlink to be sure that the
|
||||
- # Oxygen font is available to the user
|
||||
- test -d $oxygenDir || test -d $prefixDir && {
|
||||
- test -h $oxygenDir || ln -s $prefixDir $oxygenDir && fc-cache $oxygenDir
|
||||
- }
|
||||
-fi
|
||||
-
|
||||
-kstartupconfig5
|
||||
+@out@/bin/kstartupconfig5
|
||||
returncode=$?
|
||||
if test $returncode -ne 0; then
|
||||
- xmessage -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation."
|
||||
+ @xmessage@/bin/xmessage -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation."
|
||||
exit 1
|
||||
fi
|
||||
[ -r $configDir/startupconfig ] && . $configDir/startupconfig
|
||||
|
||||
-if test "$kdeglobals_kscreen_scalefactor" -ne 1; then
|
||||
- export QT_DEVICE_PIXEL_RATIO=$kdeglobals_kscreen_scalefactor
|
||||
-fi
|
||||
+XCURSOR_PATH=~/.icons:$(echo "$XDG_DATA_DIRS" | @coreutils@/bin/tr ":" "\n" | @gnused@/bin/sed 's,$,/icons,g' | @coreutils@/bin/tr "\n" ":")
|
||||
+export XCURSOR_PATH
|
||||
|
||||
# XCursor mouse theme needs to be applied here to work even for kded or ksmserver
|
||||
if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
|
||||
- @EXPORT_XCURSOR_PATH@
|
||||
|
||||
- kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
|
||||
+ @kde_workspace@/bin/kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
|
||||
if test $? -eq 10; then
|
||||
XCURSOR_THEME=breeze_cursors
|
||||
export XCURSOR_THEME
|
||||
@@ -168,21 +139,39 @@ if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize"
|
||||
fi
|
||||
fi
|
||||
|
||||
-if test "$kcmfonts_general_forcefontdpi" -ne 0; then
|
||||
- xrdb -quiet -merge -nocpp <<EOF
|
||||
-Xft.dpi: $kcmfonts_general_forcefontdpi
|
||||
-EOF
|
||||
-fi
|
||||
+# Set a left cursor instead of the standard X11 "X" cursor, since I've heard
|
||||
+# from some users that they're confused and don't know what to do. This is
|
||||
+# especially necessary on slow machines, where starting KDE takes one or two
|
||||
+# minutes until anything appears on the screen.
|
||||
+#
|
||||
+# If the user has overwritten fonts, the cursor font may be different now
|
||||
+# so don't move this up.
|
||||
+#
|
||||
+@xsetroot@/bin/xsetroot -cursor_name left_ptr
|
||||
|
||||
dl=$DESKTOP_LOCKED
|
||||
unset DESKTOP_LOCKED # Don't want it in the environment
|
||||
|
||||
+# Make sure that D-Bus is running
|
||||
+# D-Bus autolaunch is broken
|
||||
+if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
|
||||
+ eval `@dbus_tools@/bin/dbus-launch --sh-syntax --exit-with-session`
|
||||
+fi
|
||||
+if @qt5tools@/bin/qdbus >/dev/null 2>/dev/null; then
|
||||
+ : # ok
|
||||
+else
|
||||
+ echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2
|
||||
+ test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
|
||||
+ @xmessage@/bin/xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
|
||||
+ exit 1
|
||||
+fi
|
||||
+
|
||||
ksplash_pid=
|
||||
if test -z "$dl"; then
|
||||
# the splashscreen and progress indicator
|
||||
case "$ksplashrc_ksplash_engine" in
|
||||
KSplashQML)
|
||||
- ksplash_pid=`ksplashqml "${ksplashrc_ksplash_theme}" --pid`
|
||||
+ ksplash_pid=`@out@/bin/ksplashqml "${ksplashrc_ksplash_theme}" --pid`
|
||||
;;
|
||||
None)
|
||||
;;
|
||||
@@ -205,8 +194,7 @@ fi
|
||||
# For anything else (that doesn't set env vars, or that needs a window manager),
|
||||
# better use the Autostart folder.
|
||||
|
||||
-# TODO: Use GenericConfigLocation once we depend on Qt 5.4
|
||||
-scriptpath=`qtpaths --paths ConfigLocation | tr ':' '\n' | sed 's,$,/plasma-workspace,g'`
|
||||
+scriptpath=$(@qt5tools@/bin/qtpaths --paths GenericConfigLocation | tr ':' '\n' | @gnused@/bin/sed 's,$,/plasma-workspace,g')
|
||||
|
||||
# Add /env/ to the directory to locate the scripts to be sourced
|
||||
for prefix in `echo $scriptpath`; do
|
||||
@@ -216,7 +204,7 @@ for prefix in `echo $scriptpath`; do
|
||||
done
|
||||
|
||||
# Set the path for Qt plugins provided by KDE
|
||||
-QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`qtpaths --plugin-dir`
|
||||
+QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`@qt5tools@/bin/qtpaths --plugin-dir`
|
||||
# TODO: Do we really need this?
|
||||
QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$kdehome/lib/kde5/plugins/
|
||||
export QT_PLUGIN_PATH
|
||||
@@ -242,7 +230,7 @@ usr_odir=$HOME/.fonts/kde-override
|
||||
usr_fdir=$HOME/.fonts
|
||||
|
||||
if test -n "$KDEDIRS"; then
|
||||
- kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'`
|
||||
+ kdedirs_first=`echo "$KDEDIRS" | @gnused@/bin/sed -e 's/:.*//'`
|
||||
sys_odir=$kdedirs_first/share/fonts/override
|
||||
sys_fdir=$kdedirs_first/share/fonts
|
||||
else
|
||||
@@ -255,23 +243,13 @@ fi
|
||||
# add the user's dirs to the font path, as they might simply have been made
|
||||
# read-only by the administrator, for whatever reason.
|
||||
|
||||
-test -d "$sys_odir" && xset +fp "$sys_odir"
|
||||
-test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir")
|
||||
-test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir")
|
||||
-test -d "$sys_fdir" && xset fp+ "$sys_fdir"
|
||||
+test -d "$sys_odir" && @xset@/bin/xset +fp "$sys_odir"
|
||||
+test -d "$usr_odir" && ( @mkfontdir@/bin/mkfontdir "$usr_odir" ; @xset@/bin/xset +fp "$usr_odir" )
|
||||
+test -d "$usr_fdir" && ( @mkfontdir@/bin/mkfontdir "$usr_fdir" ; @xset@/bin/xset fp+ "$usr_fdir" )
|
||||
+test -d "$sys_fdir" && @xset@/bin/xset fp+ "$sys_fdir"
|
||||
|
||||
# Ask X11 to rebuild its font list.
|
||||
-xset fp rehash
|
||||
-
|
||||
-# Set a left cursor instead of the standard X11 "X" cursor, since I've heard
|
||||
-# from some users that they're confused and don't know what to do. This is
|
||||
-# especially necessary on slow machines, where starting KDE takes one or two
|
||||
-# minutes until anything appears on the screen.
|
||||
-#
|
||||
-# If the user has overwritten fonts, the cursor font may be different now
|
||||
-# so don't move this up.
|
||||
-#
|
||||
-xsetroot -cursor_name left_ptr
|
||||
+@xset@/bin/xset fp rehash
|
||||
|
||||
# Get Ghostscript to look into user's KDE fonts dir for additional Fontmap
|
||||
if test -n "$GS_LIB" ; then
|
||||
@@ -284,30 +262,6 @@ fi
|
||||
|
||||
echo 'startkde: Starting up...' 1>&2
|
||||
|
||||
-# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all.
|
||||
-# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend
|
||||
-# to set it to a list of paths *not* including the KDE prefix if it's not /usr or
|
||||
-# /usr/local.
|
||||
-if test -z "$XDG_DATA_DIRS"; then
|
||||
- XDG_DATA_DIRS="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@:/usr/share:/usr/local/share"
|
||||
-fi
|
||||
-export XDG_DATA_DIRS
|
||||
-
|
||||
-# Make sure that D-Bus is running
|
||||
-# D-Bus autolaunch is broken
|
||||
-if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
|
||||
- eval `dbus-launch --sh-syntax --exit-with-session`
|
||||
-fi
|
||||
-if $qdbus >/dev/null 2>/dev/null; then
|
||||
- : # ok
|
||||
-else
|
||||
- echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2
|
||||
- test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
|
||||
- xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
|
||||
- exit 1
|
||||
-fi
|
||||
-
|
||||
-
|
||||
# Mark that full KDE session is running (e.g. Konqueror preloading works only
|
||||
# with full KDE running). The KDE_FULL_SESSION property can be detected by
|
||||
# any X client connected to the same X session, even if not launched
|
||||
@@ -332,11 +286,11 @@ fi
|
||||
#
|
||||
KDE_FULL_SESSION=true
|
||||
export KDE_FULL_SESSION
|
||||
-xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
|
||||
+@xprop@/bin/xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
|
||||
|
||||
KDE_SESSION_VERSION=5
|
||||
export KDE_SESSION_VERSION
|
||||
-xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
|
||||
+@xprop@/bin/xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
|
||||
|
||||
KDE_SESSION_UID=`id -ru`
|
||||
export KDE_SESSION_UID
|
||||
@@ -346,30 +300,36 @@ export XDG_CURRENT_DESKTOP
|
||||
|
||||
# At this point all the environment is ready, let's send it to kwalletd if running
|
||||
if test -n "$PAM_KWALLET_LOGIN" ; then
|
||||
- env | socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN
|
||||
+ env | @socat@/bin/socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN
|
||||
fi
|
||||
|
||||
-# At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
|
||||
+# At this point all environment variables are set, let's send it to the DBus
|
||||
+# session server to update the activation environment
|
||||
@CMAKE_INSTALL_FULL_LIBEXECDIR@/ksyncdbusenv
|
||||
if test $? -ne 0; then
|
||||
# Startup error
|
||||
echo 'startkde: Could not sync environment to dbus.' 1>&2
|
||||
test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
|
||||
- xmessage -geometry 500x100 "Could not sync environment to dbus."
|
||||
+ @xmessage@/bin/xmessage -geometry 500x100 "Could not sync environment to dbus."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# We set LD_BIND_NOW to increase the efficiency of kdeinit.
|
||||
# kdeinit unsets this variable before loading applications.
|
||||
-LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup
|
||||
+LD_BIND_NOW=true @kinit@/lib/libexec/kf5/start_kdeinit_wrapper --kded +kcminit_startup
|
||||
if test $? -ne 0; then
|
||||
# Startup error
|
||||
echo 'startkde: Could not start kdeinit5. Check your installation.' 1>&2
|
||||
test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
|
||||
- xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation."
|
||||
+ @xmessage@/bin/xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
+# (NixOS) We run kbuildsycoca5 before starting the user session because things
|
||||
+# may be missing or moved if they have run nixos-rebuild and it may not be
|
||||
+# possible for them to start Konsole to run it manually!
|
||||
+@kservice@/bin/kbuildsycoca5
|
||||
+
|
||||
# finally, give the session control to the session manager
|
||||
# see kdebase/ksmserver for the description of the rest of the startup sequence
|
||||
# if the KDEWM environment variable has been set, then it will be used as KDE's
|
||||
@@ -385,27 +345,27 @@ test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM"
|
||||
# lock now and do the rest of the KDE startup underneath the locker.
|
||||
KSMSERVEROPTIONS=""
|
||||
test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen"
|
||||
-kwrapper5 ksmserver $KDEWM $KSMSERVEROPTIONS
|
||||
+@kinit@/bin/kwrapper5 ksmserver $KDEWM $KSMSERVEROPTIONS
|
||||
if test $? -eq 255; then
|
||||
# Startup error
|
||||
echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2
|
||||
test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
|
||||
- xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
|
||||
+ @xmessage@/bin/xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
|
||||
fi
|
||||
|
||||
-wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
|
||||
+wait_drkonqi=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
|
||||
|
||||
if test x"$wait_drkonqi"x = x"true"x ; then
|
||||
# wait for remaining drkonqi instances with timeout (in seconds)
|
||||
- wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
|
||||
+ wait_drkonqi_timeout=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
|
||||
wait_drkonqi_counter=0
|
||||
- while $qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
|
||||
+ while @qt5tools@/bin/qdbus | @gnugrep@/bin/grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
|
||||
sleep 5
|
||||
wait_drkonqi_counter=$((wait_drkonqi_counter+5))
|
||||
if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then
|
||||
# ask remaining drkonqis to die in a graceful way
|
||||
- $qdbus | grep 'org.kde.drkonqi-' | while read address ; do
|
||||
- $qdbus "$address" "/MainApplication" "quit"
|
||||
+ @qt5tools@/bin/qdbus | @gnugrep@/bin/grep 'org.kde.drkonqi-' | while read address ; do
|
||||
+ @qt5tools@/bin/qdbus "$address" "/MainApplication" "quit"
|
||||
done
|
||||
break
|
||||
fi
|
||||
@@ -417,21 +377,21 @@ echo 'startkde: Shutting down...' 1>&2
|
||||
test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
|
||||
|
||||
# Clean up
|
||||
-kdeinit5_shutdown
|
||||
+@kinit@/bin/kdeinit5_shutdown
|
||||
|
||||
echo 'startkde: Running shutdown scripts...' 1>&2
|
||||
|
||||
# Run scripts found in <config locations>/plasma-workspace/shutdown
|
||||
for prefix in `echo "$scriptpath"`; do
|
||||
- for file in `ls "$prefix"/shutdown 2> /dev/null | egrep -v '(~|\.bak)$'`; do
|
||||
+ for file in `ls "$prefix"/shutdown 2> /dev/null | @gnugrep@/bin/egrep -v '(~|\.bak)$'`; do
|
||||
test -x "$prefix/shutdown/$file" && "$prefix/shutdown/$file"
|
||||
done
|
||||
done
|
||||
|
||||
unset KDE_FULL_SESSION
|
||||
-xprop -root -remove KDE_FULL_SESSION
|
||||
+@xprop@/bin/xprop -root -remove KDE_FULL_SESSION
|
||||
unset KDE_SESSION_VERSION
|
||||
-xprop -root -remove KDE_SESSION_VERSION
|
||||
+@xprop@/bin/xprop -root -remove KDE_SESSION_VERSION
|
||||
unset KDE_SESSION_UID
|
||||
|
||||
echo 'startkde: Done.' 1>&2
|
||||
--
|
||||
2.4.5
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
{
|
||||
"kf5sysguard": "libksysguard",
|
||||
"kf5baloo": "baloo",
|
||||
"krunnerappdbusinterface": "plasma-workspace",
|
||||
"screensaverdbusinterface": "plasma-workspace",
|
||||
"ctest": "kdeplasma-addons",
|
||||
"kf5filemetadata": "kfilemetadata",
|
||||
"kwindbusinterface": "kwin",
|
||||
"kf5activitiesexperimentalstats": "plasma-desktop",
|
||||
"khotkeysdbusinterface": "khotkeys",
|
||||
"libkworkspace": "plasma-workspace",
|
||||
"libtaskmanager": "plasma-workspace",
|
||||
"backend": "powerdevil",
|
||||
"kf5screen": "libkscreen",
|
||||
"ksmserverdbusinterface": "plasma-workspace",
|
||||
"kf5wayland": "kwayland",
|
||||
"kdecoration2": "kdecoration",
|
||||
"kf5bluezqt": "bluez-qt",
|
||||
"oxygenfont": "oxygen-fonts"
|
||||
}
|
||||
@ -1 +0,0 @@
|
||||
addToSearchPath XDG_DATA_DIRS @out@/share
|
||||
@ -1,217 +0,0 @@
|
||||
# Maintainer's Notes:
|
||||
#
|
||||
# Minor updates:
|
||||
# 1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes
|
||||
# releases updates that include only the changed packages; in this case,
|
||||
# multiple URLs can be provided and the results will be merged.
|
||||
# 2. Run ./manifest.sh and ./dependencies.sh.
|
||||
# 3. Build and enjoy.
|
||||
#
|
||||
# Major updates:
|
||||
# We prefer not to immediately overwrite older versions with major updates, so
|
||||
# make a copy of this directory first. After copying, be sure to delete ./tmp
|
||||
# if it exists. Then follow the minor update instructions.
|
||||
|
||||
{ pkgs, newScope, qt5 ? null, debug ? false }:
|
||||
|
||||
let inherit (pkgs) autonix stdenv symlinkJoin; in
|
||||
|
||||
with autonix; let inherit (stdenv) lib; in
|
||||
|
||||
let
|
||||
qt5_ = if qt5 != null then qt5 else pkgs.qt54;
|
||||
in
|
||||
|
||||
let
|
||||
|
||||
qt5 = qt5_;
|
||||
|
||||
super =
|
||||
let json = builtins.fromJSON (builtins.readFile ./packages.json);
|
||||
mirrorUrl = n: pkg: pkg // {
|
||||
src = pkg.src // { url = "mirror://kde/${pkg.src.url}"; };
|
||||
};
|
||||
renames = builtins.fromJSON (builtins.readFile ./renames.json);
|
||||
propagated = [ "extra-cmake-modules" ];
|
||||
native = [
|
||||
"bison"
|
||||
"extra-cmake-modules"
|
||||
"flex"
|
||||
"kdoctools"
|
||||
"ki18n"
|
||||
"libxslt"
|
||||
"perl"
|
||||
"pythoninterp"
|
||||
];
|
||||
user = [
|
||||
"qt5"
|
||||
"qt5core"
|
||||
"qt5dbus"
|
||||
"qt5gui"
|
||||
"qt5qml"
|
||||
"qt5quick"
|
||||
"qt5svg"
|
||||
"qt5webkitwidgets"
|
||||
"qt5widgets"
|
||||
"qt5x11extras"
|
||||
"shareddesktopontologies"
|
||||
"sharedmimeinfo"
|
||||
];
|
||||
in lib.fold (f: attrs: f attrs) json [
|
||||
(lib.mapAttrs kdePackage)
|
||||
(userEnvDeps user)
|
||||
(nativeDeps native)
|
||||
(propagateDeps propagated)
|
||||
(renameDeps renames)
|
||||
(lib.mapAttrs mirrorUrl)
|
||||
];
|
||||
|
||||
kdePackage = name: pkg:
|
||||
let defaultOverride = drv: drv // {
|
||||
setupHook = ./setup-hook.sh;
|
||||
cmakeFlags =
|
||||
(drv.cmakeFlags or [])
|
||||
++ [ "-DBUILD_TESTING=OFF" ]
|
||||
++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
|
||||
meta = {
|
||||
license = with stdenv.lib.licenses; [
|
||||
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
|
||||
];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = with stdenv.lib.maintainers; [ ttuegel ];
|
||||
homepage = "http://www.kde.org";
|
||||
};
|
||||
};
|
||||
callPackage = newScope {
|
||||
inherit (stdenv) mkDerivation;
|
||||
inherit (pkgs) fetchurl;
|
||||
inherit scope;
|
||||
};
|
||||
in mkPackage callPackage defaultOverride name pkg;
|
||||
|
||||
scope =
|
||||
# packages in this collection
|
||||
self //
|
||||
# packages pinned to this version of Qt 5
|
||||
{
|
||||
dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; };
|
||||
phonon4qt5 = pkgs.phonon_qt5.override { inherit qt5; };
|
||||
polkit_qt5 = pkgs.polkit_qt5.override { inherit qt5; };
|
||||
qt5 = qt5.base;
|
||||
qt5core = qt5.base;
|
||||
qt5dbus = qt5.base;
|
||||
qt5gui = qt5.base;
|
||||
qt5linguisttools = qt5.tools;
|
||||
qt5qml = [qt5.declarative qt5.graphicaleffects];
|
||||
qt5quick = [qt5.quickcontrols qt5.graphicaleffects];
|
||||
qt5script = qt5.script;
|
||||
qt5svg = qt5.svg;
|
||||
qt5webkitwidgets = qt5.webkit;
|
||||
qt5widgets = qt5.base;
|
||||
qt5x11extras = qt5.x11extras;
|
||||
qt5xmlpatterns = qt5.xmlpatterns;
|
||||
} //
|
||||
# packages from the nixpkgs collection
|
||||
(with pkgs;
|
||||
{
|
||||
inherit acl cmake docbook_xml_dtd_45 docbook5_xsl epoxy fam gpgme
|
||||
libgcrypt libgit2 modemmanager networkmanager perl
|
||||
perlPackages qimageblitz xorg zlib;
|
||||
boost = boost155;
|
||||
gif = giflib;
|
||||
glib2 = glib;
|
||||
jpeg = libjpeg;
|
||||
libintl = gettext;
|
||||
liblzma = lzma;
|
||||
pythoninterp = python;
|
||||
pythonlibrary = python;
|
||||
sharedmimeinfo = shared_mime_info;
|
||||
}
|
||||
);
|
||||
|
||||
self = super // {
|
||||
extra-cmake-modules = overrideDerivation super.extra-cmake-modules (drv: {
|
||||
buildInputs = [];
|
||||
nativeBuildInputs = [];
|
||||
propagatedBuildInputs = [];
|
||||
propagatedNativeBuildInputs = [ scope.cmake pkgs.pkgconfig qt5.tools ];
|
||||
propagatedUserEnvPkgs = [];
|
||||
cmakeFlags = ["-DBUILD_TESTING=OFF"];
|
||||
patches = [./extra-cmake-modules/0001-extra-cmake-modules-paths.patch];
|
||||
meta = {
|
||||
license = stdenv.lib.licenses.bsd2;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = with stdenv.lib.maintainers; [ ttuegel ];
|
||||
homepage = "http://www.kde.org";
|
||||
};
|
||||
});
|
||||
|
||||
frameworkintegration = extendDerivation super.frameworkintegration {
|
||||
buildInputs = [ scope.xorg.libXcursor ];
|
||||
};
|
||||
|
||||
kauth = extendDerivation super.kauth {
|
||||
buildInputs = [ scope.polkit_qt5 ];
|
||||
patches = [ ./kauth/kauth-policy-install.patch ];
|
||||
};
|
||||
|
||||
kcmutils = extendDerivation super.kcmutils {
|
||||
patches = [ ./kcmutils/kcmutils-pluginselector-follow-symlinks.patch ];
|
||||
};
|
||||
|
||||
kconfigwidgets = extendDerivation super.kconfigwidgets {
|
||||
patches = [ ./kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch ];
|
||||
};
|
||||
|
||||
kdelibs4support = extendDerivation super.kdelibs4support {
|
||||
buildInputs = [ scope.networkmanager scope.xorg.libSM ];
|
||||
cmakeFlags = [
|
||||
"-DDocBookXML4_DTD_DIR=${pkgs.docbook_xml_dtd_45}/xml/dtd/docbook"
|
||||
"-DDocBookXML4_DTD_VERSION=4.5"
|
||||
];
|
||||
};
|
||||
|
||||
kdoctools = extendDerivation super.kdoctools {
|
||||
propagatedNativeBuildInputs = [ scope.perl scope.perlPackages.URI ];
|
||||
cmakeFlags = [
|
||||
"-DDocBookXML4_DTD_DIR=${scope.docbook_xml_dtd_45}/xml/dtd/docbook"
|
||||
"-DDocBookXML4_DTD_VERSION=4.5"
|
||||
"-DDocBookXSL_DIR=${scope.docbook5_xsl}/xml/xsl/docbook"
|
||||
];
|
||||
patches = [ ./kdoctools/kdoctools-no-find-docbook-xml.patch ];
|
||||
};
|
||||
|
||||
ki18n = extendDerivation super.ki18n {
|
||||
propagatedNativeBuildInputs = with scope; [ libintl pythoninterp ];
|
||||
};
|
||||
|
||||
kimageformats = extendDerivation super.kimageformats {
|
||||
NIX_CFLAGS_COMPILE = "-I${pkgs.ilmbase}/include/OpenEXR";
|
||||
};
|
||||
|
||||
kinit = extendDerivation super.kinit {
|
||||
patches = [./kinit/0001-kinit-libpath.patch];
|
||||
};
|
||||
|
||||
kpackage = extendDerivation super.kpackage {
|
||||
patches = [ ./kpackage/0001-allow-external-paths.patch ];
|
||||
};
|
||||
|
||||
kservice = extendDerivation super.kservice {
|
||||
buildInputs = [ scope.kwindowsystem ];
|
||||
patches = [
|
||||
./kservice/kservice-kbuildsycoca-follow-symlinks.patch
|
||||
./kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
|
||||
];
|
||||
};
|
||||
|
||||
ktexteditor = extendDerivation super.ktexteditor {
|
||||
patches = [ ./ktexteditor/0001-no-qcoreapplication.patch ];
|
||||
};
|
||||
|
||||
networkmanager-qt = extendDerivation super.networkmanager-qt {
|
||||
propagatedBuildInputs = [ scope.networkmanager ];
|
||||
};
|
||||
};
|
||||
|
||||
in self
|
||||
@ -1,22 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# This script rebuilds dependencies.nix.
|
||||
# You must run manifest.sh first to download the packages.
|
||||
|
||||
# Without arguments, this will use the version of autonix-deps-kf5 in nixpkgs.
|
||||
# If you are working on the packages, this is probably what you want.
|
||||
|
||||
# You can also pass the path to a source tree where you have built
|
||||
# autonix-deps-kf5 yourself. If you are working on autonix-deps-kf5, this is
|
||||
# probably what you want.
|
||||
|
||||
manifestXML=$(nix-build -E 'with (import ../../../.. {}); autonix.writeManifestXML ./manifest.nix')
|
||||
|
||||
autonixDepsKf5=""
|
||||
if [[ -z $1 ]]; then
|
||||
autonixDepsKF5=$(nix-build ../../../.. -A haskellPackages.autonix-deps-kf5)/bin
|
||||
else
|
||||
autonixDepsKF5="$1/dist/build/kf5-deps"
|
||||
fi
|
||||
|
||||
exec ${autonixDepsKF5}/kf5-deps "${manifestXML}"
|
||||
@ -1,74 +0,0 @@
|
||||
From 3cc148e878b69fc3e0228f3e3bf1bbe689dad87c Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Fri, 20 Feb 2015 23:17:39 -0600
|
||||
Subject: [PATCH] extra-cmake-modules paths
|
||||
|
||||
---
|
||||
kde-modules/KDEInstallDirs.cmake | 37 ++++---------------------------------
|
||||
1 file changed, 4 insertions(+), 33 deletions(-)
|
||||
|
||||
diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
|
||||
index b7cd34d..2f868ac 100644
|
||||
--- a/kde-modules/KDEInstallDirs.cmake
|
||||
+++ b/kde-modules/KDEInstallDirs.cmake
|
||||
@@ -193,37 +193,8 @@
|
||||
# (To distribute this file outside of extra-cmake-modules, substitute the full
|
||||
# License text for the above reference.)
|
||||
|
||||
-# Figure out what the default install directory for libraries should be.
|
||||
-# This is based on the logic in GNUInstallDirs, but simplified (the
|
||||
-# GNUInstallDirs code deals with re-configuring, but that is dealt with
|
||||
-# by the _define_* macros in this module).
|
||||
+# The default library directory on NixOS is *always* /lib.
|
||||
set(_LIBDIR_DEFAULT "lib")
|
||||
-# Override this default 'lib' with 'lib64' iff:
|
||||
-# - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
|
||||
-# - we are NOT on debian
|
||||
-# - we are on a 64 bits system
|
||||
-# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
|
||||
-# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
|
||||
-# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
|
||||
-# See http://wiki.debian.org/Multiarch
|
||||
-if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
|
||||
- AND NOT CMAKE_CROSSCOMPILING)
|
||||
- if (EXISTS "/etc/debian_version") # is this a debian system ?
|
||||
- if(CMAKE_LIBRARY_ARCHITECTURE)
|
||||
- set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
|
||||
- endif()
|
||||
- else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
|
||||
- if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
|
||||
- message(AUTHOR_WARNING
|
||||
- "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. "
|
||||
- "Please enable at least one language before including KDEInstallDirs.")
|
||||
- else()
|
||||
- if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
|
||||
- set(_LIBDIR_DEFAULT "lib64")
|
||||
- endif()
|
||||
- endif()
|
||||
- endif()
|
||||
-endif()
|
||||
|
||||
set(_gnu_install_dirs_vars
|
||||
BINDIR
|
||||
@@ -445,15 +416,15 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS)
|
||||
"QtQuick2 imports"
|
||||
QML_INSTALL_DIR)
|
||||
else()
|
||||
- _define_relative(QTPLUGINDIR LIBDIR "plugins"
|
||||
+ _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins"
|
||||
"Qt plugins"
|
||||
QT_PLUGIN_INSTALL_DIR)
|
||||
|
||||
- _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports"
|
||||
+ _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "qt5/imports"
|
||||
"QtQuick1 imports"
|
||||
IMPORTS_INSTALL_DIR)
|
||||
|
||||
- _define_relative(QMLDIR LIBDIR "qml"
|
||||
+ _define_relative(QMLDIR LIBDIR "qt5/qml"
|
||||
"QtQuick2 imports"
|
||||
QML_INSTALL_DIR)
|
||||
endif()
|
||||
--
|
||||
2.3.0
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in
|
||||
index e859ec7..9a8ab18 100644
|
||||
--- a/KF5AuthConfig.cmake.in
|
||||
+++ b/KF5AuthConfig.cmake.in
|
||||
@@ -4,7 +4,7 @@ set(KAUTH_STUB_FILES_DIR "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@/kauth/")
|
||||
|
||||
set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@")
|
||||
set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@")
|
||||
-set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@")
|
||||
+set(KAUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions")
|
||||
set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@")
|
||||
|
||||
find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@")
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
|
||||
index c63241b..2243f94 100644
|
||||
--- a/src/kpluginselector.cpp
|
||||
+++ b/src/kpluginselector.cpp
|
||||
@@ -304,7 +304,7 @@ void KPluginSelector::addPlugins(const QString &componentName,
|
||||
QStringList desktopFileNames;
|
||||
const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory);
|
||||
Q_FOREACH (const QString &dir, dirs) {
|
||||
- QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
|
||||
+ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
|
||||
while (it.hasNext()) {
|
||||
desktopFileNames.append(it.next());
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp
|
||||
index 53a331e..80fbb01 100644
|
||||
--- a/src/khelpclient.cpp
|
||||
+++ b/src/khelpclient.cpp
|
||||
@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname)
|
||||
QString docPath;
|
||||
const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
|
||||
Q_FOREACH (const QString &dir, desktopDirs) {
|
||||
- QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
|
||||
+ QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
|
||||
while (it.hasNext()) {
|
||||
const QString desktopPath(it.next());
|
||||
KDesktopFile desktopFile(desktopPath);
|
||||
@ -1,12 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 5c4863c..f731775 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -46,7 +46,6 @@ set_package_properties(LibXml2 PROPERTIES
|
||||
)
|
||||
|
||||
|
||||
-find_package(DocBookXML4 "4.5")
|
||||
|
||||
set_package_properties(DocBookXML4 PROPERTIES
|
||||
TYPE REQUIRED
|
||||
@ -1,42 +0,0 @@
|
||||
From 723c9b1268a04127647a1c20eebe9804150566dd Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Sat, 13 Jun 2015 08:57:55 -0500
|
||||
Subject: [PATCH] kinit libpath
|
||||
|
||||
---
|
||||
src/kdeinit/kinit.cpp | 18 ++++++++++--------
|
||||
1 file changed, 10 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp
|
||||
index 9e775b6..0ac5646 100644
|
||||
--- a/src/kdeinit/kinit.cpp
|
||||
+++ b/src/kdeinit/kinit.cpp
|
||||
@@ -660,15 +660,17 @@ static pid_t launch(int argc, const char *_name, const char *args,
|
||||
if (!libpath.isEmpty()) {
|
||||
if (!l.load()) {
|
||||
if (libpath_relative) {
|
||||
- // NB: Because Qt makes the actual dlopen() call, the
|
||||
- // RUNPATH of kdeinit is *not* respected - see
|
||||
- // https://sourceware.org/bugzilla/show_bug.cgi?id=13945
|
||||
- // - so we try hacking it in ourselves
|
||||
- QString install_lib_dir = QFile::decodeName(
|
||||
- CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/");
|
||||
- libpath = install_lib_dir + libpath;
|
||||
- l.setFileName(libpath);
|
||||
+ // Use QT_PLUGIN_PATH to find shared library directories
|
||||
+ // For KF5, the plugin path is /lib/qt5/plugins/, so kdeinit5
|
||||
+ // shared libraries should be in /lib/qt5/plugins/../../
|
||||
+ const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]"));
|
||||
+ const QString up = QString::fromLocal8Bit("/../../");
|
||||
+ const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts);
|
||||
+ Q_FOREACH (const QString &path, paths) {
|
||||
+ l.setFileName(path + up + libpath);
|
||||
l.load();
|
||||
+ if (l.isLoaded()) break;
|
||||
+ }
|
||||
}
|
||||
}
|
||||
if (!l.isLoaded()) {
|
||||
--
|
||||
2.4.2
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From fbf10d2059fa1f19a0f0cfa2fda0abb6c435fa78 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Wed, 28 Jan 2015 07:15:30 -0600
|
||||
Subject: [PATCH] allow external paths
|
||||
|
||||
---
|
||||
src/kpackage/package.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp
|
||||
index eb4a09b..f70f1a1 100644
|
||||
--- a/src/kpackage/package.cpp
|
||||
+++ b/src/kpackage/package.cpp
|
||||
@@ -758,7 +758,7 @@ PackagePrivate::PackagePrivate()
|
||||
: QSharedData(),
|
||||
fallbackPackage(0),
|
||||
metadata(0),
|
||||
- externalPaths(false),
|
||||
+ externalPaths(true),
|
||||
valid(false),
|
||||
checkedValid(false)
|
||||
{
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/src/kbuildsycoca/kbuildsycoca.cpp b/src/kbuildsycoca/kbuildsycoca.cpp
|
||||
index 69b1427..9c37a49 100644
|
||||
--- a/src/kbuildsycoca/kbuildsycoca.cpp
|
||||
+++ b/src/kbuildsycoca/kbuildsycoca.cpp
|
||||
@@ -227,7 +227,7 @@ bool KBuildSycoca::build()
|
||||
QStringList relFiles;
|
||||
const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, g_resourceSubdir, QStandardPaths::LocateDirectory);
|
||||
Q_FOREACH (const QString &dir, dirs) {
|
||||
- QDirIterator it(dir, QDirIterator::Subdirectories);
|
||||
+ QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
|
||||
while (it.hasNext()) {
|
||||
const QString filePath = it.next();
|
||||
Q_ASSERT(filePath.startsWith(dir)); // due to the line below...
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/src/kbuildsycoca/vfolder_menu.cpp b/src/kbuildsycoca/vfolder_menu.cpp
|
||||
index 2eb1275..e39a36f 100644
|
||||
--- a/src/kbuildsycoca/vfolder_menu.cpp
|
||||
+++ b/src/kbuildsycoca/vfolder_menu.cpp
|
||||
@@ -412,7 +412,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR
|
||||
}
|
||||
|
||||
if (!relative) {
|
||||
- QString resolved = QDir(dir).canonicalPath();
|
||||
+ QString resolved = QDir::cleanPath(dir);
|
||||
if (!resolved.isEmpty()) {
|
||||
dir = resolved;
|
||||
}
|
||||
@ -1,48 +0,0 @@
|
||||
From 71e28c7c6fdd1142f04c662f45cc8f779e457cda Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Sun, 15 Feb 2015 19:09:17 -0600
|
||||
Subject: [PATCH] no qcoreapplication
|
||||
|
||||
---
|
||||
src/syntax/data/katehighlightingindexer.cpp | 11 ++++-------
|
||||
1 file changed, 4 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/src/syntax/data/katehighlightingindexer.cpp b/src/syntax/data/katehighlightingindexer.cpp
|
||||
index 3f02e8c..d1a865b 100644
|
||||
--- a/src/syntax/data/katehighlightingindexer.cpp
|
||||
+++ b/src/syntax/data/katehighlightingindexer.cpp
|
||||
@@ -49,19 +49,16 @@ QStringList readListing(const QString &fileName)
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
- // get app instance
|
||||
- QCoreApplication app(argc, argv);
|
||||
-
|
||||
// ensure enough arguments are passed
|
||||
- if (app.arguments().size() < 3)
|
||||
+ if (argc < 3)
|
||||
return 1;
|
||||
|
||||
// open schema
|
||||
QXmlSchema schema;
|
||||
- if (!schema.load(QUrl::fromLocalFile(app.arguments().at(2))))
|
||||
+ if (!schema.load(QUrl::fromLocalFile(QString::fromLocal8Bit(argv[2]))))
|
||||
return 2;
|
||||
|
||||
- const QString hlFilenamesListing = app.arguments().value(3);
|
||||
+ const QString hlFilenamesListing = QString::fromLocal8Bit(argv[3]);
|
||||
if (hlFilenamesListing.isEmpty()) {
|
||||
return 1;
|
||||
}
|
||||
@@ -127,7 +124,7 @@ int main(int argc, char *argv[])
|
||||
return anyError;
|
||||
|
||||
// create outfile, after all has worked!
|
||||
- QFile outFile(app.arguments().at(1));
|
||||
+ QFile outFile(QString::fromLocal8Bit(argv[1]));
|
||||
if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate))
|
||||
return 7;
|
||||
|
||||
--
|
||||
2.1.4
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,22 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
set -x
|
||||
|
||||
origin="$(pwd)"
|
||||
|
||||
# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS
|
||||
KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
|
||||
|
||||
alias nix-build="nix-build --no-out-link \"$origin/../../../..\""
|
||||
|
||||
# The extra slash at the end of the URL is necessary to stop wget
|
||||
# from recursing over the whole server! (No, it's not a bug.)
|
||||
$(nix-build -A autonix.manifest) \
|
||||
"${KDE_MIRROR}/stable/frameworks/5.10/" \
|
||||
"$@" -A '*.tar.xz'
|
||||
|
||||
AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellPackages.autonix-deps-kf5)/bin/kf5-deps"}
|
||||
|
||||
$AUTONIX_DEPS_KF5 manifest.json
|
||||
|
||||
rm manifest.json
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/src/plasma/package.cpp b/src/plasma/package.cpp
|
||||
index 07b3c90..84417e3 100644
|
||||
--- a/src/plasma/package.cpp
|
||||
+++ b/src/plasma/package.cpp
|
||||
@@ -791,7 +791,7 @@ PackagePrivate::PackagePrivate()
|
||||
servicePrefix("plasma-applet-"),
|
||||
fallbackPackage(0),
|
||||
metadata(0),
|
||||
- externalPaths(false),
|
||||
+ externalPaths(true),
|
||||
valid(false),
|
||||
checkedValid(false)
|
||||
{
|
||||
@ -1,70 +0,0 @@
|
||||
{
|
||||
"kf5widgetsaddons": "kwidgetsaddons",
|
||||
"kf5texteditor": "ktexteditor",
|
||||
"kf5designerplugin": "kdesignerplugin",
|
||||
"kf5bookmarks": "kbookmarks",
|
||||
"kf5frameworkintegration": "frameworkintegration",
|
||||
"kf5package": "kpackage",
|
||||
"kf5archive": "karchive",
|
||||
"kf5plasma": "plasma-framework",
|
||||
"kf5kcmutils": "kcmutils",
|
||||
"kf5configwidgets": "kconfigwidgets",
|
||||
"ctest": "attica",
|
||||
"kf5kio": "kio",
|
||||
"kf5networkmanagerqt": "networkmanager-qt",
|
||||
"kf5coreaddons": "kcoreaddons",
|
||||
"kf5guiaddons": "kguiaddons",
|
||||
"kf5jobwidgets": "kjobwidgets",
|
||||
"kf5modemmanagerqt": "modemmanager-qt",
|
||||
"kf5runner": "krunner",
|
||||
"kf5globalaccel": "kglobalaccel",
|
||||
"kf5dbusaddons": "kdbusaddons",
|
||||
"kf5crash": "kcrash",
|
||||
"kf5itemviews": "kitemviews",
|
||||
"kf5doctools": "kdoctools",
|
||||
"kf5i18n": "ki18n",
|
||||
"kf5webkit": "kdewebkit",
|
||||
"kf5newstuff": "knewstuff",
|
||||
"kded": "kded",
|
||||
"kf5notifications": "knotifications",
|
||||
"kf5activitiesexperimentalstats": "kactivities",
|
||||
"kf5dnssd": "kdnssd",
|
||||
"kf5notifyconfig": "knotifyconfig",
|
||||
"kf5iconthemes": "kiconthemes",
|
||||
"kf5js": "kjs",
|
||||
"kf5kde4support": "kdelibs4support",
|
||||
"kf5parts": "kparts",
|
||||
"backend": "plasma-framework",
|
||||
"kf5completion": "kcompletion",
|
||||
"kf5threadweaver": "threadweaver",
|
||||
"kf5mediaplayer": "kmediaplayer",
|
||||
"kf5plasmaquick": "plasma-framework",
|
||||
"kf5wallet": "kwallet",
|
||||
"kf5xmlgui": "kxmlgui",
|
||||
"kf5attica": "attica",
|
||||
"kf5declarative": "kdeclarative",
|
||||
"kf5config": "kconfig",
|
||||
"kf5init": "kinit",
|
||||
"kf5textwidgets": "ktextwidgets",
|
||||
"kf5jsembed": "kjsembed",
|
||||
"kf5codecs": "kcodecs",
|
||||
"kf5service": "kservice",
|
||||
"kf5sonnet": "sonnet",
|
||||
"kf5kdelibs4support": "kdelibs4support",
|
||||
"kf5pty": "kpty",
|
||||
"kf5solid": "solid",
|
||||
"kf5auth": "kauth",
|
||||
"ecm": "extra-cmake-modules",
|
||||
"kf5activities": "kactivities",
|
||||
"kf5plotting": "kplotting",
|
||||
"kf5people": "kpeople",
|
||||
"kf5emoticons": "kemoticons",
|
||||
"kf5kross": "kross",
|
||||
"kf5su": "kdesu",
|
||||
"kf5khtml": "khtml",
|
||||
"kf5unitconversion": "kunitconversion",
|
||||
"kf5idletime": "kidletime",
|
||||
"kf5windowsystem": "kwindowsystem",
|
||||
"kf5xmlrpcclient": "kxmlrpcclient",
|
||||
"kf5itemmodels": "kitemmodels"
|
||||
}
|
||||
@ -1 +0,0 @@
|
||||
addToSearchPath XDG_DATA_DIRS @out@/share
|
||||
@ -6750,9 +6750,8 @@ let
|
||||
automake = automake111x;
|
||||
};
|
||||
|
||||
kf510 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.10 { });
|
||||
kf515 = recurseIntoAttrs (import ../development/libraries/kde-frameworks-5.15 { inherit pkgs; });
|
||||
kf5_stable = kf510;
|
||||
kf5_stable = kf515;
|
||||
kf5_latest = kf515;
|
||||
|
||||
kf5PackagesFun = self: with self; {
|
||||
@ -12042,9 +12041,8 @@ let
|
||||
boost = boost155;
|
||||
};
|
||||
|
||||
kdeApps_15_04 = recurseIntoAttrs (callPackage ../applications/kde-apps-15.04 {});
|
||||
kdeApps_stable = kdeApps_15_04;
|
||||
kdeApps_15_08 = recurseIntoAttrs (import ../applications/kde-apps-15.08 { inherit pkgs; });
|
||||
kdeApps_stable = kdeApps_15_08;
|
||||
kdeApps_latest = kdeApps_15_08;
|
||||
|
||||
keepnote = callPackage ../applications/office/keepnote {
|
||||
@ -14373,9 +14371,8 @@ let
|
||||
|
||||
numix-gtk-theme = callPackage ../misc/themes/gtk3/numix-gtk-theme { };
|
||||
|
||||
plasma53 = recurseIntoAttrs (callPackage ../desktops/plasma-5.3 { });
|
||||
plasma5_stable = plasma53;
|
||||
plasma54 = recurseIntoAttrs (callPackage ../desktops/plasma-5.4 { inherit pkgs; });
|
||||
plasma5_stable = plasma54;
|
||||
plasma5_latest = plasma54;
|
||||
|
||||
kde5 = kf5_stable // plasma5_stable // kdeApps_stable;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user