[136891] trunk/dports/textproc/cuneiform

[ryandesign at macports.org]

Revision: 136891
          https://trac.macports.org/changeset/136891
Author:   ryandesign at macports.org
Date:     2015-05-29 03:31:29 -0700 (Fri, 29 May 2015)
Log Message:
-----------
cuneiform: fix build with clang (#36572); use cmake.out_of_source yes (#47197)

Modified Paths:
--------------
    trunk/dports/textproc/cuneiform/Portfile

Added Paths:
-----------
    trunk/dports/textproc/cuneiform/files/patch-cuneiform_src-Kern-leo-src-leo_dll.c.diff

Modified: trunk/dports/textproc/cuneiform/Portfile
===================================================================
--- trunk/dports/textproc/cuneiform/Portfile	2015-05-29 09:23:57 UTC (rev 136890)
+++ trunk/dports/textproc/cuneiform/Portfile	2015-05-29 10:31:29 UTC (rev 136891)
@@ -31,35 +31,17 @@
 
 depends_lib             port:ImageMagick
 
-platform darwin {
-    if {${os.major} >= 13} {
-        depends_lib
-        depends_run
-        pre-fetch {
-            ui_error "$name does not build on Mavericks or later."
-            error "unsupported platform"
-        }
-    }
-}
-
-post-extract {
-    file mkdir ${worksrcpath}/build
-}
-
 platform darwin powerpc {
     patchfiles          patch-perc.c.diff \
                         patch-CMakeLists.txt.diff
 }
 
-# character too large for enclosing character literal type
-compiler.blacklist      *clang*
+patchfiles-append       patch-cuneiform_src-Kern-leo-src-leo_dll.c.diff
 
-configure.dir           ${worksrcpath}/build
+cmake.out_of_source     yes
+
 configure.args-append   -DImageMagick_Magick++_INCLUDE_DIR:PATH=${prefix}/include/ImageMagick-6 \
-                        -DImageMagick_Magick++_LIBRARY:FILEPATH=${prefix}/lib/libMagick++-6.Q16.dylib \
-                        ${worksrcpath}
+                        -DImageMagick_Magick++_LIBRARY:FILEPATH=${prefix}/lib/libMagick++-6.Q16.dylib
 
-build.dir               ${worksrcpath}/build
-
 livecheck.type          regex
 livecheck.regex         ${name}-linux-(\[0-9.\]+)${extract.suffix}

Added: trunk/dports/textproc/cuneiform/files/patch-cuneiform_src-Kern-leo-src-leo_dll.c.diff
===================================================================
--- trunk/dports/textproc/cuneiform/files/patch-cuneiform_src-Kern-leo-src-leo_dll.c.diff	                        (rev 0)
+++ trunk/dports/textproc/cuneiform/files/patch-cuneiform_src-Kern-leo-src-leo_dll.c.diff	2015-05-29 10:31:29 UTC (rev 136891)
@@ -0,0 +1,22 @@
+Fix "character too large for enclosing character literal type" seen with clang
+http://lists.freebsd.org/pipermail/freebsd-ports-bugs/2013-August/261138.html
+--- cuneiform_src/Kern/leo/src/leo_dll.c.orig	2011-04-19 07:49:57.000000000 -0500
++++ cuneiform_src/Kern/leo/src/leo_dll.c	2015-05-29 05:20:16.000000000 -0500
+@@ -622,12 +622,12 @@
+ 	}
+ leo_current_alpha_ndx=leo_register_alphabet(alphabet);
+ prn_roma_regim = (
+-        !ansi_letters[(uchar)'�'] &&
++        !ansi_letters[(uchar)L'�'] &&
+         ansi_letters['I'] &&
+-        ansi_letters[(uchar)'�'] &&
+-        ansi_letters[(uchar)'�'] &&
+-        ansi_letters[(uchar)'�'] &&
+-        ansi_letters[(uchar)'�'] &&
++        ansi_letters[(uchar)L'�'] &&
++        ansi_letters[(uchar)L'�'] &&
++        ansi_letters[(uchar)L'�'] &&
++        ansi_letters[(uchar)L'�'] &&
+         ansi_letters['1']);
+ 
+ if( leo_alpha_type&ALPH_R_E )
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150529/b1f87a39/attachment.html>