Changeset 117626


Ignore:
Timestamp:
Mar 6, 2014, 6:40:40 AM (7 years ago)
Author:
ryandesign@…
Message:

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

Location:
trunk/dports/graphics/jpeg
Files:
2 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/dports/graphics/jpeg/Portfile

    r117526 r117626  
    77conflicts           libjpeg-turbo
    88version             9a
     9revision            1
    910categories          graphics
    1011platforms           darwin freebsd sunos
     
    2829                    sha256  3a753ea48d917945dd54a2d97de388aa06ca2eb1066cbfdc6652036349fe05a7
    2930
     31patchfiles          boolean.patch
     32
    3033configure.ldflags-delete    -L${prefix}/lib
    3134configure.cppflags-delete   -I${prefix}/include
  • trunk/dports/graphics/jpeg/files

    • Property svn:mergeinfo set to (toggle deleted branches)
      /branches/mld-qt-481/dports/graphics/jpeg/files92720,​92813,​92891,​92963,​93522,​93556,​93699,​93743,​93771-93773,​93806,​93817-93818,​93856
  • trunk/dports/graphics/jpeg/files/boolean.patch

    r102830 r117626  
    1 --- jmorecfg.h.orig     2013-02-08 22:31:48.000000000 -0800
    2 +++ jmorecfg.h  2013-02-08 22:33:47.000000000 -0800
    3 @@ -252,17 +252,16 @@ typedef void noreturn_t;
    4   * Defining HAVE_BOOLEAN before including jpeglib.h should make it work.
     1--- jmorecfg.h.orig     2013-09-17 02:20:20.000000000 -0500
     2+++ jmorecfg.h  2014-03-05 21:48:38.000000000 -0600
     3@@ -304,19 +304,15 @@
    54  */
    65 
    7 -#ifdef HAVE_BOOLEAN
    8 +#ifndef HAVE_BOOLEAN
    9 +typedef int boolean;
     6 #ifndef HAVE_BOOLEAN
     7-#if defined FALSE || defined TRUE || defined QGLOBAL_H
     8-/* Qt3 defines FALSE and TRUE as "const" variables in qglobal.h */
     9 typedef int boolean;
    1010+#endif
    1111+
     
    1919-typedef enum { FALSE = 0, TRUE = 1 } boolean;
    2020-#endif
    21 -
     21-#endif
     22 
    2223 
    2324 /*
    24   * The remaining options affect code selection within the JPEG library,
Note: See TracChangeset for help on using the changeset viewer.