Skip to content
Permalink
Browse files

jpeg: fix build failure of digikam (https://trac.macports.org/ticket/…

…42710), swftools (https://trac.macports.org/ticket/42735), and possibly others

git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@117626 d073be05-634f-4543-b044-5fe20cf6d1d6
  • Loading branch information
ryandesign committed Mar 6, 2014
1 parent 28efd8d commit 52c9983a9bd19e99d102eeb3771c4b707b5d6510
Showing with 27 additions and 0 deletions.
  1. +3 −0 graphics/jpeg/Portfile
  2. +24 −0 graphics/jpeg/files/boolean.patch
@@ -6,6 +6,7 @@ PortSystem 1.0
name jpeg
conflicts libjpeg-turbo
version 9a
revision 1
categories graphics
platforms darwin freebsd sunos
maintainers ryandesign openmaintainer
@@ -27,6 +28,8 @@ worksrcdir ${name}-${version}
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
@@ -0,0 +1,24 @@
--- 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 @@
*/

#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 */
#define FALSE 0 /* values of boolean */
#endif
#ifndef TRUE
#define TRUE 1
#endif
-#else
-typedef enum { FALSE = 0, TRUE = 1 } boolean;
-#endif
-#endif


/*

0 comments on commit 52c9983

Please sign in to comment.
You can’t perform that action at this time.