[arch-commits] Commit in fcitx/trunk (Fix-for-gcc-4.7.0.patch PKGBUILD)

[Eric Bélanger]

    Date: Monday, March 26, 2012 @ 00:44:18
  Author: eric
Revision: 154318

upgpkg: fcitx 4.2.1-2

Rebuild agsinst icu 49, Add gcc 4.7 build patch

Added:
  fcitx/trunk/Fix-for-gcc-4.7.0.patch
Modified:
  fcitx/trunk/PKGBUILD

-------------------------+
 Fix-for-gcc-4.7.0.patch |   31 +++++++++++++++++++++++++++++++
 PKGBUILD                |    8 +++++---
 2 files changed, 36 insertions(+), 3 deletions(-)

Added: Fix-for-gcc-4.7.0.patch
===================================================================
--- Fix-for-gcc-4.7.0.patch	                        (rev 0)
+++ Fix-for-gcc-4.7.0.patch	2012-03-26 04:44:18 UTC (rev 154318)
@@ -0,0 +1,31 @@
+From 74ae75e291862530801ec9cc707dc810c52a84fd Mon Sep 17 00:00:00 2001
+From: Weng Xuetian <wengxt at gmail.com>
+Date: Sun, 25 Mar 2012 09:59:24 +0800
+Subject: [PATCH 1/2] fix for gcc 4.7.0
+
+---
+ src/lib/fcitx-config/CMakeLists.txt |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/fcitx-config/CMakeLists.txt b/src/lib/fcitx-config/CMakeLists.txt
+index f9fd2ec..2b361c6 100644
+--- a/src/lib/fcitx-config/CMakeLists.txt
++++ b/src/lib/fcitx-config/CMakeLists.txt
+@@ -1,10 +1,13 @@
+ set(FCITX_CONFIG_SOURCES
+     fcitx-config.c
+     hotkey.c
+-    sprintf.c
+     xdg.c
+ )
+ 
++if (NOT HAVE_ASPRINTF)
++    set(FCITX_CONFIG_SOURCES ${FCITX_CONFIG_SOURCES} sprintf.c)
++endif (NOT HAVE_ASPRINTF)
++
+ set(FCITX_CONFIG_HEADERS
+     fcitx-config.h
+     hotkey.h
+-- 
+1.7.9.4
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-26 03:38:49 UTC (rev 154317)
+++ PKGBUILD	2012-03-26 04:44:18 UTC (rev 154318)
@@ -5,16 +5,18 @@
 pkgbase=fcitx
 pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt')
 pkgver=4.2.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/fcitx/"
 license=('GPL')
 makedepends=('cmake' 'intltool' 'doxygen' 'gtk2' 'gtk3' 'qt' 'dbus-glib' 'icu')
-source=("http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('74ad009cde48fb1efd48f8d2490fa36ddf36d215')
+source=(http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}.tar.xz Fix-for-gcc-4.7.0.patch)
+sha1sums=('74ad009cde48fb1efd48f8d2490fa36ddf36d215'
+          '3f9a31d67cdbbb25f2151cb81208f1f3e0dd6e8f')
 
 build() {
   cd "${srcdir}"
+  (cd ${pkgbase}-${pkgver}; patch -p1 -i ../Fix-for-gcc-4.7.0.patch)
   mkdir build
   cd build
   cmake ../${pkgbase}-${pkgver} \