author | Andrea Scarpino
<andrea@archlinux.org> 2014-07-11 11:49:56 UTC |
committer | Andrea Scarpino
<andrea@archlinux.org> 2014-07-11 11:49:56 UTC |
parent | 6d239252c16c4af656addade5bf7e9407cc7bf7a |
PKGBUILD | +8 | -3 |
update-FindGettext.patch | +37 | -0 |
diff --git a/PKGBUILD b/PKGBUILD index 54ab85a..cb93421 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ pkgname=kdelibs4support pkgver=5.0.0 -pkgrel=1 +pkgrel=2 pkgdesc='KDE 4 Support' arch=('i686' 'x86_64') url='https://projects.kde.org/projects/frameworks/kdelibs4support' @@ -12,11 +12,16 @@ makedepends=('extra-cmake-modules' 'kdoctools' 'qt5-tools') # 'networkmanager' groups=('kf5-aids') replaces=('kde4support') conflicts=('kde4support') -source=("http://download.kde.org/stable/frameworks/${pkgver}/portingAids/${pkgname}-${pkgver}.tar.xz") -md5sums=('1fe3fc10a31a2c123338c3a8ae82455a') +source=("http://download.kde.org/stable/frameworks/${pkgver}/portingAids/${pkgname}-${pkgver}.tar.xz" + 'update-FindGettext.patch') +md5sums=('1fe3fc10a31a2c123338c3a8ae82455a' + 'cfde4360628836b039cb614f6641112d') prepare() { mkdir -p build + + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/update-FindGettext.patch } build() { diff --git a/update-FindGettext.patch b/update-FindGettext.patch new file mode 100644 index 0000000..5647fea --- /dev/null +++ b/update-FindGettext.patch @@ -0,0 +1,37 @@ +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) +