Changeset 117626 for trunk/dports

Timestamp:

Mar 6, 2014, 6:40:40 AM (10 years ago)

Author:

ryandesign@…

Message:

jpeg: fix build failure of digikam (#42710), swftools (#42735), and possibly others

Location:

trunk/dports/graphics/jpeg

Files:

• Portfile (modified) (2 diffs)
• files (copied) (copied from trunk/dports/graphics/jpeg/files) (1 prop)
• files/boolean.patch (modified) (2 diffs)

trunk/dports/graphics/jpeg/Portfile

@@ -7 +7 @@
 conflicts           libjpeg-turbo
 version             9a
+revision            1
 categories          graphics
 platforms           darwin freebsd sunos
@@ -28 +29 @@
                     sha256  3a753ea48d917945dd54a2d97de388aa06ca2eb1066cbfdc6652036349fe05a7
 
+patchfiles          boolean.patch
+
 configure.ldflags-delete    -L${prefix}/lib
 configure.cppflags-delete   -I${prefix}/include

trunk/dports/graphics/jpeg/files/boolean.patch

@@ -1 @@
---- 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
 +
@@ -19 +19 @@
 -typedef enum { FALSE = 0, TRUE = 1 } boolean;
 -#endif
--
+-#endif
+ 
  
  /*
-  * The remaining options affect code selection within the JPEG library,