Attachment 155145 Details for Bug 199112 – new patch

[patch] new patch

fix-linking-old-lib-and-iconv.diff (text/plain), 1.25 KB, created by lichray on 2015-04-03 02:54:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lichray

Created: 2015-04-03 02:54:43 UTC

Size: 1.25 KB

patch

obsolete

>diff --git chinese/fcitx/Makefile chinese/fcitx/Makefile
>index 26dc313..b1cb36b 100644
>--- chinese/fcitx/Makefile
>+++ chinese/fcitx/Makefile
>@@ -33,10 +33,9 @@ CONFLICTS=	zh-scim-fcitx-3.*
> USE_GNOME=	pango intltool libxml2 introspection
> USE_XORG=	x11 xext xkbfile
> USE_LDCONFIG=	yes
>-USES=		tar:xz cmake desktop-file-utils execinfo gettext iconv \
>+USES=		tar:xz cmake desktop-file-utils execinfo gettext iconv:wchar_t \
> 		pathfix pkgconfig shared-mime-info
> INSTALLS_ICONS=	yes
>-LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
> 
> OPTIONS_DEFINE=	GTK2 GTK3 QT4 OPENCC TPUNC DOCS
> OPTIONS_DEFAULT=GTK2 QT4
>diff --git chinese/fcitx/files/patch-cmake__FindLibiconv.cmake chinese/fcitx/files/patch-cmake__FindLibiconv.cmake
>new file mode 100644
>index 0000000..5c90942
>--- /dev/null
>+++ chinese/fcitx/files/patch-cmake__FindLibiconv.cmake
>@@ -0,0 +1,11 @@
>+--- cmake/FindLibiconv.cmake.orig	2015-04-03 02:44:55.321687654 +0000
>++++ cmake/FindLibiconv.cmake	2015-04-03 02:46:05.734216729 +0000
>+@@ -30,7 +30,7 @@ set(LIBICONV_LIB_FOUND FALSE)
>+ 
>+ if(LIBICONV_INCLUDE_DIR)
>+   include(CheckFunctionExists)
>+-  check_function_exists(iconv_open LIBICONV_LIBC_HAS_ICONV_OPEN)
>++  set(LIBICONV_LIBC_HAS_ICONV_OPEN FALSE)
>+ 
>+   if (LIBICONV_LIBC_HAS_ICONV_OPEN)
>+     set(LIBICONV_LIBRARIES)

Actions: View | Diff

Attachments on bug 199112: 155133 | 155134 | 155145