[117626] trunk/dports/graphics/jpeg

[ryandesign at macports.org]

Revision: 117626
          https://trac.macports.org/changeset/117626
Author:   ryandesign at macports.org
Date:     2014-03-05 22:40:40 -0800 (Wed, 05 Mar 2014)
Log Message:
-----------
jpeg: fix build failure of digikam (#42710), swftools (#42735), and possibly others

Modified Paths:
--------------
    trunk/dports/graphics/jpeg/Portfile
    trunk/dports/graphics/jpeg/files/boolean.patch

Added Paths:
-----------
    trunk/dports/graphics/jpeg/files/

Modified: trunk/dports/graphics/jpeg/Portfile
===================================================================
--- trunk/dports/graphics/jpeg/Portfile	2014-03-06 06:33:41 UTC (rev 117625)
+++ trunk/dports/graphics/jpeg/Portfile	2014-03-06 06:40:40 UTC (rev 117626)
@@ -6,6 +6,7 @@
 name                jpeg
 conflicts           libjpeg-turbo
 version             9a
+revision            1
 categories          graphics
 platforms           darwin freebsd sunos
 maintainers         ryandesign openmaintainer
@@ -27,6 +28,8 @@
 checksums           rmd160  885898b3db086ad3b65169d0149bf1f270dff1b5 \
                     sha256  3a753ea48d917945dd54a2d97de388aa06ca2eb1066cbfdc6652036349fe05a7
 
+patchfiles          boolean.patch
+
 configure.ldflags-delete    -L${prefix}/lib
 configure.cppflags-delete   -I${prefix}/include
 configure.args      --disable-silent-rules


Property changes on: trunk/dports/graphics/jpeg/files
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/mld-qt-481/dports/graphics/jpeg/files:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856

Modified: trunk/dports/graphics/jpeg/files/boolean.patch
===================================================================
--- trunk/dports/graphics/jpeg/files/boolean.patch	2014-03-02 20:54:57 UTC (rev 117525)
+++ trunk/dports/graphics/jpeg/files/boolean.patch	2014-03-06 06:40:40 UTC (rev 117626)
@@ -1,12 +1,12 @@
---- jmorecfg.h.orig	2013-02-08 22:31:48.000000000 -0800
-+++ jmorecfg.h	2013-02-08 22:33:47.000000000 -0800
-@@ -252,17 +252,16 @@ typedef void noreturn_t;
-  * Defining HAVE_BOOLEAN before including jpeglib.h should make it work.
+--- jmorecfg.h.orig	2013-09-17 02:20:20.000000000 -0500
++++ jmorecfg.h	2014-03-05 21:48:38.000000000 -0600
+@@ -304,19 +304,15 @@
   */
  
--#ifdef HAVE_BOOLEAN
-+#ifndef HAVE_BOOLEAN
-+typedef int boolean;
+ #ifndef HAVE_BOOLEAN
+-#if defined FALSE || defined TRUE || defined QGLOBAL_H
+-/* Qt3 defines FALSE and TRUE as "const" variables in qglobal.h */
+ typedef int boolean;
 +#endif
 +
  #ifndef FALSE			/* in case these macros already exist */
@@ -18,7 +18,7 @@
 -#else
 -typedef enum { FALSE = 0, TRUE = 1 } boolean;
 -#endif
--
+-#endif
  
+ 
  /*
-  * The remaining options affect code selection within the JPEG library,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140305/61c3095b/attachment.html>