diff options
author | Eric Hameleers <alien@slackware.com> | 2015-01-09 00:06:49 +0100 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2015-01-09 00:06:49 +0100 |
commit | da1be5a21ba06235b67a999f696ec66e35dc17a1 (patch) | |
tree | 6df637d821a6ac0ad65f8caaf967ea2a6956a862 /kde/patch/kdelibs | |
parent | b1b35d20ce6b70330b23a9d056dcb44b58795bd6 (diff) | |
download | ktown-da1be5a21ba06235b67a999f696ec66e35dc17a1.tar.gz ktown-da1be5a21ba06235b67a999f696ec66e35dc17a1.tar.xz |
Prepare for new KDE 5: Frameworks 5.6.0, Plasma 5.1.2, Applications 14.12.0.
KDE 5_1501
==========
This is going to be KDE 5 for Slackware-current, composed of Frameworks 5.6.0,
Plasma 5.1.2 and Applications 14.12.0.
Note that there is still a lot of KDE 4 stuff in here, which is necessary to
support all the Applications that have not yet been ported to KDE Frameworks 5.
The Applications 15.04 (march 2015) release should offer a lot more KF5 ports.
Preliminary build procedure (not verified 100% yet):
----------------------------------------------------
- (crude) get rid of Slackware's KDE: removepkg /var/log/packages/*-4.10.5-*
- build all the deps using "updates.SlackBuild" script in the "deps/" directory
- note that extra-cmake-modules is required here as well as when building the
frameworks, so I just copied it from frameworks to deps.
- logoff/login to activate Qt5 profile script.
- removepkg akonadi-qt5 or else kdepimlibs-4.14.3 picks up Qt5 dependencies and
its compilation will fail as a result
- build all the KDE 4 stuff in the "kde/" directory, using "./KDE.SlackBuild kde
libs kdebase:nepomuk-core kdepimlibs kdebase kdebindings kdebase:kde-workspace k
depim extragear"
- installpkg akonadi-qt5
- build the remaining KDE 5 stuff in the "kde/" directory, using "./KDE.SlackBui
ld frameworks plasma plasma-extra polkit-kde applications"
- build kdei
==============================================================================
Eric Hameleers / alien at slackware dot com / 09-jan-2015
Diffstat (limited to '')
-rw-r--r-- | kde/patch/kdelibs.patch | 10 | ||||
-rw-r--r-- | kde/patch/kdelibs/coding-style-fixes.patch | 62 | ||||
-rw-r--r-- | kde/patch/kdelibs/coding-style-fixes.patch.gz | bin | 916 -> 0 bytes | |||
-rw-r--r-- | kde/patch/kdelibs/kdelibs.docbook.patch | 11 | ||||
-rw-r--r-- | kde/patch/kdelibs/kdelibs.docbook.patch.gz | bin | 361 -> 0 bytes | |||
-rw-r--r-- | kde/patch/kdelibs/kdelibs.upnp_conditional.patch | 15 | ||||
-rw-r--r-- | kde/patch/kdelibs/kdelibs.upnp_conditional.patch.gz | bin | 347 -> 0 bytes | |||
-rw-r--r-- | kde/patch/kdelibs/return-application-icons-properly.patch | 56 | ||||
-rw-r--r-- | kde/patch/kdelibs/return-application-icons-properly.patch.gz | bin | 955 -> 0 bytes | |||
-rw-r--r-- | kde/patch/kdelibs/return-not-break.-copy-paste-error.patch | 31 | ||||
-rw-r--r-- | kde/patch/kdelibs/return-not-break.-copy-paste-error.patch.gz | bin | 572 -> 0 bytes | |||
-rw-r--r-- | kde/patch/kdelibs4support.patch | 2 | ||||
-rw-r--r-- | kde/patch/kdelibs4support/update-FindGettext.patch | 36 | ||||
-rw-r--r-- | kde/patch/kdelibs4support/update-FindGettext.patch.gz | bin | 747 -> 0 bytes |
14 files changed, 217 insertions, 6 deletions
diff --git a/kde/patch/kdelibs.patch b/kde/patch/kdelibs.patch index c314b55..e083090 100644 --- a/kde/patch/kdelibs.patch +++ b/kde/patch/kdelibs.patch @@ -1,14 +1,14 @@ # Slackware ships a different version of XML DTDs: -zcat $CWD/patch/kdelibs/kdelibs.docbook.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/kdelibs/kdelibs.docbook.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } # Make uPnP support depend on the environment variable SOLID_UPNP, # e.g. by creating an /etc/profile.d/upnp.sh file with the following contents: # export SOLID_UPNP=1 -zcat $CWD/patch/kdelibs/kdelibs.upnp_conditional.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/kdelibs/kdelibs.upnp_conditional.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } # Revert 3 patches which (although they probably follow the FDo spec better), # cause incorrect icon overrides: -zcat $CWD/patch/kdelibs/return-not-break.-copy-paste-error.patch.gz | patch -R -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } -zcat $CWD/patch/kdelibs/coding-style-fixes.patch.gz | patch -R -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } -zcat $CWD/patch/kdelibs/return-application-icons-properly.patch.gz | patch -R -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/kdelibs/return-not-break.-copy-paste-error.patch | patch -R -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/kdelibs/coding-style-fixes.patch | patch -R -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/kdelibs/return-application-icons-properly.patch | patch -R -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/patch/kdelibs/coding-style-fixes.patch b/kde/patch/kdelibs/coding-style-fixes.patch new file mode 100644 index 0000000..11108f0 --- /dev/null +++ b/kde/patch/kdelibs/coding-style-fixes.patch @@ -0,0 +1,62 @@ +From 2173580f070e806d4715e13048c697c49ec262e2 Mon Sep 17 00:00:00 2001 +From: Aaron Seigo <aseigo@kde.org> +Date: Thu, 21 Feb 2013 17:59:58 +0100 +Subject: [PATCH 047/111] coding style fixes + +--- + kdeui/icons/kiconloader.cpp | 27 ++++++++++++--------------- + 1 file changed, 12 insertions(+), 15 deletions(-) + +diff --git a/kdeui/icons/kiconloader.cpp b/kdeui/icons/kiconloader.cpp +index 6fed667..dba474d 100644 +--- a/kdeui/icons/kiconloader.cpp ++++ b/kdeui/icons/kiconloader.cpp +@@ -938,32 +938,29 @@ K3Icon KIconLoaderPrivate::findMatchingIcon(const QString& name, int size) const + } + } + +- foreach (KIconThemeNode *themeNode, links) +- { ++ foreach (KIconThemeNode *themeNode, links) { + QString currentName = name; + +- while (!currentName.isEmpty()) +- { +- ++ while (!currentName.isEmpty()) { + //kDebug(264) << "Looking up" << currentName; + +-// The following code has been commented out because the Qt SVG renderer needs +-// to be improved. If you are going to change/remove some code from this part, +-// please contact me before (ereslibre@kde.org), or kde-core-devel@kde.org. (ereslibre) +- for (int i = 0 ; i < 4 ; i++) +- { ++ for (int i = 0 ; i < 4 ; i++) { + icon = themeNode->theme->iconPath(currentName + ext[i], size, KIconLoader::MatchExact); +- if (icon.isValid()) +- return icon; ++ if (icon.isValid()) { ++ break; ++ } + + icon = themeNode->theme->iconPath(currentName + ext[i], size, KIconLoader::MatchBest); +- if (icon.isValid()) +- return icon; ++ if (icon.isValid()) { ++ break; ++ } + } ++ //kDebug(264) << "Looking up" << currentName; + +- if (genericFallback) ++ if (genericFallback) { + // we already tested the base name + break; ++ } + + int rindex = currentName.lastIndexOf('-'); + if (rindex > 1) { // > 1 so that we don't split x-content or x-epoc +-- +1.8.1.4 + + diff --git a/kde/patch/kdelibs/coding-style-fixes.patch.gz b/kde/patch/kdelibs/coding-style-fixes.patch.gz Binary files differdeleted file mode 100644 index 0e0ec0f..0000000 --- a/kde/patch/kdelibs/coding-style-fixes.patch.gz +++ /dev/null diff --git a/kde/patch/kdelibs/kdelibs.docbook.patch b/kde/patch/kdelibs/kdelibs.docbook.patch new file mode 100644 index 0000000..6a20cd2 --- /dev/null +++ b/kde/patch/kdelibs/kdelibs.docbook.patch @@ -0,0 +1,11 @@ +--- kdelibs-4.4.85/cmake/modules/FindDocBookXML.cmake.orig 2010-05-27 19:25:00.000000000 +0200 ++++ kdelibs-4.4.85/cmake/modules/FindDocBookXML.cmake 2010-06-07 16:18:35.000000000 +0200 +@@ -12,7 +12,7 @@ + # Redistribution and use is allowed according to the terms of the BSD license. + # For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +-set (DOCBOOKXML_CURRENTDTD_VERSION "4.2" ++set (DOCBOOKXML_CURRENTDTD_VERSION "4.5" + CACHE INTERNAL "Required version of XML DTDs") + + set (DTD_PATH_LIST diff --git a/kde/patch/kdelibs/kdelibs.docbook.patch.gz b/kde/patch/kdelibs/kdelibs.docbook.patch.gz Binary files differdeleted file mode 100644 index 2de9a66..0000000 --- a/kde/patch/kdelibs/kdelibs.docbook.patch.gz +++ /dev/null diff --git a/kde/patch/kdelibs/kdelibs.upnp_conditional.patch b/kde/patch/kdelibs/kdelibs.upnp_conditional.patch new file mode 100644 index 0000000..3a19447 --- /dev/null +++ b/kde/patch/kdelibs/kdelibs.upnp_conditional.patch @@ -0,0 +1,15 @@ +--- kdelibs-4.8.0/solid/solid/managerbase.cpp.orig 2011-07-27 20:34:39.000000000 +0200 ++++ kdelibs-4.8.0/solid/solid/managerbase.cpp 2012-01-26 09:17:49.409993419 +0100 +@@ -90,7 +90,11 @@ + # endif + + # if defined (HUPNP_FOUND) +- m_backends << new Solid::Backends::UPnP::UPnPDeviceManager(0); ++ bool solidUpnpEnabled ++ = QString::fromLocal8Bit(qgetenv("SOLID_UPNP")).toInt()==1; ++ if (solidUpnpEnabled) { ++ m_backends << new Solid::Backends::UPnP::UPnPDeviceManager(0); ++ } + # endif + } + } diff --git a/kde/patch/kdelibs/kdelibs.upnp_conditional.patch.gz b/kde/patch/kdelibs/kdelibs.upnp_conditional.patch.gz Binary files differdeleted file mode 100644 index 479980f..0000000 --- a/kde/patch/kdelibs/kdelibs.upnp_conditional.patch.gz +++ /dev/null diff --git a/kde/patch/kdelibs/return-application-icons-properly.patch b/kde/patch/kdelibs/return-application-icons-properly.patch new file mode 100644 index 0000000..2bdb53a --- /dev/null +++ b/kde/patch/kdelibs/return-application-icons-properly.patch @@ -0,0 +1,56 @@ +From 613c951a1157df0d8a907a155a5eaa706816d5f9 Mon Sep 17 00:00:00 2001 +From: Aaron Seigo <aseigo@kde.org> +Date: Thu, 21 Feb 2013 17:58:11 +0100 +Subject: return application icons properly + +BUG:315578 +--- + kdeui/icons/kiconloader.cpp | 31 ++++++++++++++++++++++++++++++- + 1 file changed, 30 insertions(+), 1 deletion(-) + +diff --git a/kdeui/icons/kiconloader.cpp b/kdeui/icons/kiconloader.cpp +index f65e941..6fed667 100644 +--- a/kdeui/icons/kiconloader.cpp ++++ b/kdeui/icons/kiconloader.cpp +@@ -909,7 +909,36 @@ K3Icon KIconLoaderPrivate::findMatchingIcon(const QString& name, int size) const + const char * const ext[4] = { ".png", ".svgz", ".svg", ".xpm" }; + bool genericFallback = name.endsWith(QLatin1String("-x-generic")); + +- foreach(KIconThemeNode *themeNode, links) ++ // Do two passes through themeNodes. ++ // ++ // The first pass looks for an exact match in each themeNode one after the other. ++ // If one is found and it is an app icon then return that icon. ++ // ++ // In the next pass (assuming the first pass failed), it looks for exact matches ++ // and then generic fallbacks in each themeNode one after the other ++ // ++ // The reasoning is that application icons should always match exactly, all other ++ // icons may fallback. Since we do not know what the context is here when we start ++ // looking for it, we can only go by the path found. ++ foreach (KIconThemeNode *themeNode, links) { ++ for (int i = 0 ; i < 4 ; i++) { ++ icon = themeNode->theme->iconPath(name + ext[i], size, KIconLoader::MatchExact); ++ if (icon.isValid()) { ++ break; ++ } ++ ++ icon = themeNode->theme->iconPath(name + ext[i], size, KIconLoader::MatchBest); ++ if (icon.isValid()) { ++ break; ++ } ++ } ++ ++ if (icon.isValid() && icon.path.contains("/apps/")) { ++ return icon; ++ } ++ } ++ ++ foreach (KIconThemeNode *themeNode, links) + { + QString currentName = name; + +-- +1.8.1.4 + + diff --git a/kde/patch/kdelibs/return-application-icons-properly.patch.gz b/kde/patch/kdelibs/return-application-icons-properly.patch.gz Binary files differdeleted file mode 100644 index 76e3d75..0000000 --- a/kde/patch/kdelibs/return-application-icons-properly.patch.gz +++ /dev/null diff --git a/kde/patch/kdelibs/return-not-break.-copy-paste-error.patch b/kde/patch/kdelibs/return-not-break.-copy-paste-error.patch new file mode 100644 index 0000000..b62818e --- /dev/null +++ b/kde/patch/kdelibs/return-not-break.-copy-paste-error.patch @@ -0,0 +1,31 @@ +From 0edfd42151ad57322a10a24ab4971b638e220e6e Mon Sep 17 00:00:00 2001 +From: Aaron Seigo <aseigo@kde.org> +Date: Thu, 21 Feb 2013 18:14:54 +0100 +Subject: [PATCH 049/111] return, not break. copy/paste error + +--- + kdeui/icons/kiconloader.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/kdeui/icons/kiconloader.cpp b/kdeui/icons/kiconloader.cpp +index dba474d..ce6aeea 100644 +--- a/kdeui/icons/kiconloader.cpp ++++ b/kdeui/icons/kiconloader.cpp +@@ -947,12 +947,12 @@ K3Icon KIconLoaderPrivate::findMatchingIcon(const QString& name, int size) const + for (int i = 0 ; i < 4 ; i++) { + icon = themeNode->theme->iconPath(currentName + ext[i], size, KIconLoader::MatchExact); + if (icon.isValid()) { +- break; ++ return icon; + } + + icon = themeNode->theme->iconPath(currentName + ext[i], size, KIconLoader::MatchBest); + if (icon.isValid()) { +- break; ++ return icon; + } + } + //kDebug(264) << "Looking up" << currentName; +-- +1.8.1.4 + diff --git a/kde/patch/kdelibs/return-not-break.-copy-paste-error.patch.gz b/kde/patch/kdelibs/return-not-break.-copy-paste-error.patch.gz Binary files differdeleted file mode 100644 index 77d86ba..0000000 --- a/kde/patch/kdelibs/return-not-break.-copy-paste-error.patch.gz +++ /dev/null diff --git a/kde/patch/kdelibs4support.patch b/kde/patch/kdelibs4support.patch index a1199e6..ada5f0a 100644 --- a/kde/patch/kdelibs4support.patch +++ b/kde/patch/kdelibs4support.patch @@ -1,4 +1,4 @@ # Make FindGettext compatible with the one provided by CMake: # Fixed in 5.1.0. -#zcat $CWD/patch/kdelibs4support/update-FindGettext.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +#cat $CWD/patch/kdelibs4support/update-FindGettext.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/patch/kdelibs4support/update-FindGettext.patch b/kde/patch/kdelibs4support/update-FindGettext.patch new file mode 100644 index 0000000..1b75cd8 --- /dev/null +++ b/kde/patch/kdelibs4support/update-FindGettext.patch @@ -0,0 +1,36 @@ +From: Alex Merry <alex.merry@kde.org> +Date: Fri, 04 Jul 2014 10:10:27 +0000 +Subject: Make FindGettext compatible with the one provided by CMake +X-Git-Url: http://quickgit.kde.org/?p=kdelibs4support.git&a=commitdiff&h=581ee6b370d8b5627196c8d6d8760d3655f6daea +--- +Make FindGettext compatible with the one provided by CMake + +This version will accept the old GETTEXT_PROCESS_PO_FILES() syntax (no +PO_FILES argument), but will also accept the new syntax required by +CMake's version of this file. It will also warn when PO_FILES is not +given. + +REVIEW: 119111 +--- + + +--- a/cmake/modules/FindGettext.cmake ++++ b/cmake/modules/FindGettext.cmake +@@ -212,7 +212,16 @@ + LIST(REMOVE_AT _args 0 1) + ENDIF("${_tmp}" STREQUAL "INSTALL_DESTINATION") + +-# message(STATUS "2 all ${_addToAll} dest ${_installDest} args: ${_args}") ++ LIST(GET _args 0 _tmp) ++ IF("${_tmp}" STREQUAL "PO_FILES") ++ LIST(REMOVE_AT _args 0) ++ ELSE() ++ SET(_deprecation_arg DEPRECATION) ++ IF(CMAKE_VERSION VERSION_LESS 3.0.0) ++ SET(_deprecation_arg AUTHOR_WARNING) ++ ENDIF() ++ MESSAGE(${_deprecation_arg} "GETTEXT_PROCESS_PO_FILES without a PO_FILES argument is deprecated") ++ ENDIF() + + FOREACH(_current_PO_FILE ${_args}) + GET_FILENAME_COMPONENT(_name ${_current_PO_FILE} NAME) diff --git a/kde/patch/kdelibs4support/update-FindGettext.patch.gz b/kde/patch/kdelibs4support/update-FindGettext.patch.gz Binary files differdeleted file mode 100644 index 5cefcb0..0000000 --- a/kde/patch/kdelibs4support/update-FindGettext.patch.gz +++ /dev/null |