diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-11 10:57:18 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-11 10:57:18 -0300 |
| commit | c07ca5cb71d277e9f2fd5c7b94cf8a0021bdfab5 (patch) | |
| tree | d9d528762b726855cc356781c89abb1768c8be28 /testing/fcitx/Fix-for-gcc-4.7.0.patch | |
| parent | ece2137c9569ec806aacf3740df98c399a51b21a (diff) | |
| parent | 8119da2eaadf53531cad2aed70981ed4606340d6 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/sword/PKGBUILD
community/freedroidrpg/PKGBUILD
community/pgadmin3/PKGBUILD
libre/lame-libre/PKGBUILD
testing/dbus-core/PKGBUILD
testing/libwebkit/PKGBUILD
testing/tracker/PKGBUILD
testing/udev/0001-split-usr-always-read-config-files-from-lib-udev.patch
testing/udev/0002-reinstate-TIMEOUT-handling.patch
testing/udev/PKGBUILD
Diffstat (limited to 'testing/fcitx/Fix-for-gcc-4.7.0.patch')
| -rw-r--r-- | testing/fcitx/Fix-for-gcc-4.7.0.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/testing/fcitx/Fix-for-gcc-4.7.0.patch b/testing/fcitx/Fix-for-gcc-4.7.0.patch new file mode 100644 index 000000000..d02852281 --- /dev/null +++ b/testing/fcitx/Fix-for-gcc-4.7.0.patch @@ -0,0 +1,31 @@ +From 74ae75e291862530801ec9cc707dc810c52a84fd Mon Sep 17 00:00:00 2001 +From: Weng Xuetian <wengxt@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 + |