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

[Eric Bélanger]

    Date: Wednesday, April 18, 2012 @ 13:11:42
  Author: eric
Revision: 156467

upgpkg: fcitx 4.2.2-1

Upstream update, Remove old patch

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

-------------------------+
 Fix-for-gcc-4.7.0.patch |   31 -------------------------------
 PKGBUILD                |   10 ++++------
 2 files changed, 4 insertions(+), 37 deletions(-)

Deleted: Fix-for-gcc-4.7.0.patch
===================================================================
--- Fix-for-gcc-4.7.0.patch	2012-04-18 14:54:36 UTC (rev 156466)
+++ Fix-for-gcc-4.7.0.patch	2012-04-18 17:11:42 UTC (rev 156467)
@@ -1,31 +0,0 @@
-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-04-18 14:54:36 UTC (rev 156466)
+++ PKGBUILD	2012-04-18 17:11:42 UTC (rev 156467)
@@ -4,19 +4,17 @@
 
 pkgbase=fcitx
 pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt')
-pkgver=4.2.1
-pkgrel=2
+pkgver=4.2.2
+pkgrel=1
 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 Fix-for-gcc-4.7.0.patch)
-sha1sums=('74ad009cde48fb1efd48f8d2490fa36ddf36d215'
-          '3f9a31d67cdbbb25f2151cb81208f1f3e0dd6e8f')
+source=(http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}.tar.xz)
+sha1sums=('09d2e7110f652027ea7c285c5845070f8a353f38')
 
 build() {
   cd "${srcdir}"
-  (cd ${pkgbase}-${pkgver}; patch -p1 -i ../Fix-for-gcc-4.7.0.patch)
   mkdir build
   cd build
   cmake ../${pkgbase}-${pkgver} \