View | Details | Raw Unified | Return to bug 199112 | Differences between
and this patch

Collapse All | Expand All

(-)chinese/fcitx/Makefile (-2 / +1 lines)
Lines 33-42 CONFLICTS= zh-scim-fcitx-3.* Link Here
33 
USE_GNOME=	pango intltool libxml2 introspection
 33 
USE_GNOME=	pango intltool libxml2 introspection
34 
USE_XORG=	x11 xext xkbfile
 34 
USE_XORG=	x11 xext xkbfile
35 
USE_LDCONFIG=	yes
 35 
USE_LDCONFIG=	yes
36 
USES=		tar:xz cmake desktop-file-utils execinfo gettext iconv \
 36 
USES=		tar:xz cmake desktop-file-utils execinfo gettext iconv:wchar_t \
37 
		pathfix pkgconfig shared-mime-info
 37 
		pathfix pkgconfig shared-mime-info
38 
INSTALLS_ICONS=	yes
 38 
INSTALLS_ICONS=	yes
39 
LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
40 

          39
          

        

        

          41
          
OPTIONS_DEFINE=	GTK2 GTK3 QT4 OPENCC TPUNC DOCS

          40
          
OPTIONS_DEFINE=	GTK2 GTK3 QT4 OPENCC TPUNC DOCS

        

        

          42
          
OPTIONS_DEFAULT=GTK2 QT4

          41
          
OPTIONS_DEFAULT=GTK2 QT4

        



(-)chinese/fcitx/files/patch-cmake__FindLibiconv.cmake
      (+11 lines)




  

    
      
          Added
      
      
        Link Here
      
    
  

            

              1
              
--- cmake/FindLibiconv.cmake.orig	2015-04-03 02:44:55.321687654 +0000

            

            

              2
              
+++ cmake/FindLibiconv.cmake	2015-04-03 02:46:05.734216729 +0000

            

            

              3
              
@@ -30,7 +30,7 @@ set(LIBICONV_LIB_FOUND FALSE)

            

            

              4
              
 

            

            

              5
              
 if(LIBICONV_INCLUDE_DIR)

            

            

              6
              
   include(CheckFunctionExists)

            

            

              7
              
-  check_function_exists(iconv_open LIBICONV_LIBC_HAS_ICONV_OPEN)

            

            

              8
              
+  set(LIBICONV_LIBC_HAS_ICONV_OPEN FALSE)

            

            

              9
              
 

            

            

              10
              
   if (LIBICONV_LIBC_HAS_ICONV_OPEN)

            

            

              11
              
     set(LIBICONV_LIBRARIES)

            






  

  Return to bug 199112