remove kf512
This commit is contained in:
Thomas Tuegel
parent
79832d773b
commit
2e06a781bc
@ -1,228 +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 // {
|
||||
bluez-qt = overrideDerivation super.bluez-qt (drv: {
|
||||
preConfigure = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace /lib/udev/rules.d "$out/lib/udev/rules.d"
|
||||
'';
|
||||
});
|
||||
|
||||
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 ];
|
||||
};
|
||||
|
||||
kwallet = extendDerivation super.kwallet {
|
||||
buildInputs = [ scope.kdoctools ];
|
||||
};
|
||||
|
||||
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
|
||||
|
||||
13
pkgs/development/libraries/kde-frameworks-5.12/kservice/kservice-kbuildsycoca-follow-symlinks.patch
13
pkgs/development/libraries/kde-frameworks-5.12/kservice/kservice-kbuildsycoca-follow-symlinks.patch
@ -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.12/" \
|
||||
"$@" -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,71 +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",
|
||||
"kf5bluezqt": "bluez-qt",
|
||||
"kf5windowsystem": "kwindowsystem",
|
||||
"kf5xmlrpcclient": "kxmlrpcclient",
|
||||
"kf5itemmodels": "kitemmodels"
|
||||
}
|
||||
@ -1 +0,0 @@
|
||||
addToSearchPath XDG_DATA_DIRS @out@/share
|
||||
@ -6751,7 +6751,6 @@ let
|
||||
};
|
||||
|
||||
kf510 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.10 { });
|
||||
kf512 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.12 { });
|
||||
kf514 = recurseIntoAttrs (import ../development/libraries/kde-frameworks-5.14 { inherit pkgs; });
|
||||
kf5_stable = kf510;
|
||||
kf5_latest = kf514;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user