[arch-commits] Commit in kdepim/kde-unstable (3 files)

[Andrea Scarpino]

    Date: Tuesday, May 24, 2011 @ 05:38:48
  Author: andrea
Revision: 124768

KDE 4.7beta1

Added:
  kdepim/kde-unstable/fix-console-build.patch
Modified:
  kdepim/kde-unstable/PKGBUILD
Deleted:
  kdepim/kde-unstable/disable-l10n.patch

-------------------------+
 PKGBUILD                |   19 +++++++++----------
 disable-l10n.patch      |   10 ----------
 fix-console-build.patch |   11 +++++++++++
 3 files changed, 20 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-24 09:14:31 UTC (rev 124767)
+++ PKGBUILD	2011-05-24 09:38:48 UTC (rev 124768)
@@ -20,25 +20,24 @@
          'kdepim-ktimetracker'
          'kdepim-libkdepim'
          'kdepim-wizards')
-pkgver=4.5.96
+pkgver=4.6.80
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://pim.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdepim')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss'
-	'pilot-link' 'kde-agent' 'docbook-xsl')
-#source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-source=("http://download.kde.org/unstable/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.bz2"
-        'disable-l10n.patch')
-sha1sums=('f425f143fe3381be2bb018bab92d89fd112595f0'
-          '25e36f160ced051268e59fad6ed2de33a9c7657a')
+             'pilot-link' 'kde-agent')
+source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
+        'fix-console-build.patch')
+sha1sums=('dc32fee3332df3bdb4395f3a229d88de34ae4de1'
+          'e4b82bcee6c46aad39196a5bb2732fed72ff4541')
 
 build() {
-    cd "${srcdir}"/${pkgbase}-${pkgver}
-    patch -Np0 -i "${srcdir}"/disable-l10n.patch
+	cd "${srcdir}"/${pkgbase}-${pkgver}
+    patch -p1 -i "${srcdir}"/fix-console-build.patch
 
-	cd "${srcdir}"
+    cd "${srcdir}"
 	mkdir build
 	cd build
 	cmake ../${pkgbase}-${pkgver} \

Deleted: disable-l10n.patch
===================================================================
--- disable-l10n.patch	2011-05-24 09:14:31 UTC (rev 124767)
+++ disable-l10n.patch	2011-05-24 09:38:48 UTC (rev 124768)
@@ -1,10 +0,0 @@
---- CMakeLists.txt~	2011-01-30 06:31:02.180017202 -0800
-+++ CMakeLists.txt	2011-01-30 06:31:26.093350537 -0800
-@@ -423,7 +423,3 @@
- endif(NOT QGPGME_FOUND)
- # All done, let's display what we found...
- macro_display_feature_log()
--find_package(Msgfmt REQUIRED)
--find_package(Gettext REQUIRED)
--add_subdirectory(po)
--add_subdirectory(doc-translations)

Added: fix-console-build.patch
===================================================================
--- fix-console-build.patch	                        (rev 0)
+++ fix-console-build.patch	2011-05-24 09:38:48 UTC (rev 124768)
@@ -0,0 +1,11 @@
+--- a/console/kabcclient/src/main.cpp
++++ b/console/kabcclient/src/main.cpp
+@@ -117,7 +117,7 @@ int main(int argc, char** argv)
+ 
+     cmdLineOptions.add("match-case", ki18n("Match key fields case sensitive. UID is always matched case sensitive"));
+ 
+-    cmdLineOptions.add(ki18n("+[input data]"), ki18n("Input to use instead of reading stdin"));
++    cmdLineOptions.add("+[input data]", ki18n("Input to use instead of reading stdin"));
+ 
+     KCmdLineArgs::addCmdLineOptions(cmdLineOptions);
+     KCmdLineArgs::init(argc, argv, &aboutData);