git » kdelibs4support.git » commit c4d96a3

KDE Frameworks 5.1

author Andrea Scarpino
2014-08-05 11:08:13 UTC
committer Andrea Scarpino
2014-08-05 11:08:13 UTC
parent 93d9c9735cbf00fcac0bb524a122fd96ff243c0a

KDE Frameworks 5.1

PKGBUILD +4 -9
update-FindGettext.patch +0 -37

diff --git a/PKGBUILD b/PKGBUILD
index 8131584..1472f00 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdelibs4support
-pkgver=5.0.0
-pkgrel=3
+pkgver=5.1.0
+pkgrel=1
 pkgdesc='KDE 4 Support'
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/frameworks/kdelibs4support'
@@ -12,16 +12,11 @@ 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"
-        'update-FindGettext.patch')
-md5sums=('1fe3fc10a31a2c123338c3a8ae82455a'
-         'cfde4360628836b039cb614f6641112d')
+source=("http://download.kde.org/stable/frameworks/${pkgver}/portingAids/${pkgname}-${pkgver}.tar.xz")
+md5sums=('3e97f7a6eb9120b00ced27b8abd02c5e')
 
 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
deleted file mode 100644
index 5647fea..0000000
--- a/update-FindGettext.patch
+++ /dev/null
@@ -1,37 +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)
-