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/kdelibs4support | |
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/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 |
3 files changed, 37 insertions, 1 deletions
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 |