diff options
author | Eric Hameleers <alien@slackware.com> | 2020-07-31 16:13:18 +0200 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2020-07-31 16:13:18 +0200 |
commit | 703149752c6265b36973d2c1f0f5a69721e3128a (patch) | |
tree | 7ded0d801771d5705f48ffbfb48f37dd4829439e /kde/patch/kdelibs4support | |
parent | dd005500c624d127321ff3fe14a0c29bfa8d67f7 (diff) | |
parent | cd7ff1719433fbb3b6a8304596be173bc1b91b00 (diff) | |
download | ktown-master.tar.gz ktown-master.tar.xz |
Diffstat (limited to '')
-rw-r--r-- | kde/patch/kdelibs4support.patch | 4 | ||||
-rw-r--r-- | kde/patch/kdelibs4support/update-FindGettext.patch | 36 |
2 files changed, 0 insertions, 40 deletions
diff --git a/kde/patch/kdelibs4support.patch b/kde/patch/kdelibs4support.patch index 8e9fe7b..7d6626e 100644 --- a/kde/patch/kdelibs4support.patch +++ b/kde/patch/kdelibs4support.patch @@ -1,6 +1,2 @@ -# Make FindGettext compatible with the one provided by CMake: -# Fixed in 5.1.0. -#cat $CWD/patch/kdelibs4support/update-FindGettext.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } - # Allow cmake to find our doctools: cat $CWD/patch/kdelibs4support/FindDocBookXML4.cmake.diff | 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 deleted file mode 100644 index 1b75cd8..0000000 --- a/kde/patch/kdelibs4support/update-FindGettext.patch +++ /dev/null @@ -1,36 +0,0 @@ -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) |