[arch-commits] Commit in kdelibs4support/repos (6 files)
Andrea Scarpino
andrea at nymeria.archlinux.org
Fri Jul 11 11:50:04 UTC 2014
Date: Friday, July 11, 2014 @ 13:50:04
Author: andrea
Revision: 216790
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
kdelibs4support/repos/extra-i686/PKGBUILD
(from rev 216789, kdelibs4support/trunk/PKGBUILD)
kdelibs4support/repos/extra-i686/update-FindGettext.patch
(from rev 216789, kdelibs4support/trunk/update-FindGettext.patch)
kdelibs4support/repos/extra-x86_64/PKGBUILD
(from rev 216789, kdelibs4support/trunk/PKGBUILD)
kdelibs4support/repos/extra-x86_64/update-FindGettext.patch
(from rev 216789, kdelibs4support/trunk/update-FindGettext.patch)
Deleted:
kdelibs4support/repos/extra-i686/PKGBUILD
kdelibs4support/repos/extra-x86_64/PKGBUILD
---------------------------------------+
/PKGBUILD | 86 ++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 38 --------------
extra-i686/update-FindGettext.patch | 37 +++++++++++++
extra-x86_64/PKGBUILD | 38 --------------
extra-x86_64/update-FindGettext.patch | 37 +++++++++++++
5 files changed, 160 insertions(+), 76 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-07-11 11:49:56 UTC (rev 216789)
+++ extra-i686/PKGBUILD 2014-07-11 11:50:04 UTC (rev 216790)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kdelibs4support
-pkgver=5.0.0
-pkgrel=1
-pkgdesc='KDE 4 Support'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/frameworks/kdelibs4support'
-license=('LGPL')
-depends=('kunitconversion' 'kdesignerplugin')
-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')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_INSTALL_DIR=lib \
- -DQT_PLUGIN_INSTALL_DIR=lib/qt/plugins \
- -DSYSCONF_INSTALL_DIR=/etc \
- -DBUILD_TESTING=OFF
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: kdelibs4support/repos/extra-i686/PKGBUILD (from rev 216789, kdelibs4support/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-07-11 11:50:04 UTC (rev 216790)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kdelibs4support
+pkgver=5.0.0
+pkgrel=2
+pkgdesc='KDE 4 Support'
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/frameworks/kdelibs4support'
+license=('LGPL')
+depends=('kunitconversion' 'kdesignerplugin')
+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')
+
+prepare() {
+ mkdir -p build
+
+ cd ${pkgname}-${pkgver}
+ patch -p1 -i "${srcdir}"/update-FindGettext.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_INSTALL_DIR=lib \
+ -DQT_PLUGIN_INSTALL_DIR=lib/qt/plugins \
+ -DSYSCONF_INSTALL_DIR=/etc \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Copied: kdelibs4support/repos/extra-i686/update-FindGettext.patch (from rev 216789, kdelibs4support/trunk/update-FindGettext.patch)
===================================================================
--- extra-i686/update-FindGettext.patch (rev 0)
+++ extra-i686/update-FindGettext.patch 2014-07-11 11:50:04 UTC (rev 216790)
@@ -0,0 +1,37 @@
+From: Alex Merry <alex.merry at 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)
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-07-11 11:49:56 UTC (rev 216789)
+++ extra-x86_64/PKGBUILD 2014-07-11 11:50:04 UTC (rev 216790)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kdelibs4support
-pkgver=5.0.0
-pkgrel=1
-pkgdesc='KDE 4 Support'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/frameworks/kdelibs4support'
-license=('LGPL')
-depends=('kunitconversion' 'kdesignerplugin')
-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')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_INSTALL_DIR=lib \
- -DQT_PLUGIN_INSTALL_DIR=lib/qt/plugins \
- -DSYSCONF_INSTALL_DIR=/etc \
- -DBUILD_TESTING=OFF
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: kdelibs4support/repos/extra-x86_64/PKGBUILD (from rev 216789, kdelibs4support/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-07-11 11:50:04 UTC (rev 216790)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kdelibs4support
+pkgver=5.0.0
+pkgrel=2
+pkgdesc='KDE 4 Support'
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/frameworks/kdelibs4support'
+license=('LGPL')
+depends=('kunitconversion' 'kdesignerplugin')
+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')
+
+prepare() {
+ mkdir -p build
+
+ cd ${pkgname}-${pkgver}
+ patch -p1 -i "${srcdir}"/update-FindGettext.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_INSTALL_DIR=lib \
+ -DQT_PLUGIN_INSTALL_DIR=lib/qt/plugins \
+ -DSYSCONF_INSTALL_DIR=/etc \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Copied: kdelibs4support/repos/extra-x86_64/update-FindGettext.patch (from rev 216789, kdelibs4support/trunk/update-FindGettext.patch)
===================================================================
--- extra-x86_64/update-FindGettext.patch (rev 0)
+++ extra-x86_64/update-FindGettext.patch 2014-07-11 11:50:04 UTC (rev 216790)
@@ -0,0 +1,37 @@
+From: Alex Merry <alex.merry at 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)
+
More information about the arch-commits
mailing list