Changeset 98123

Timestamp:

Sep 25, 2012, 2:35:12 PM (12 years ago)

Author:

jmr@…

Message:

fontforge: fix carbon includes (#35379)

Location:

trunk/dports/graphics/fontforge

Files:

• Portfile (modified) (1 diff)
• files/patch-xcode-43.diff (modified) (3 diffs)

trunk/dports/graphics/fontforge/Portfile

@@ -45 +45 @@
 post-patch {
     if {${os.major} > 11} {
-        reinplace s|@@DEVDIR@@|${developer_dir}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk/Developer| ${worksrcpath}/fontforge/macbinary.c \
-                                                   ${worksrcpath}/fontforge/startui.c \
-                                                   ${worksrcpath}/gutils/giomime.c
         foreach file [glob ${worksrcpath}/fontforge/*.c] {
             reinplace s|AnchorPoint|FFAnchorPoint|g $file
         }
-    } else {
-        reinplace s|@@DEVDIR@@|${developer_dir}| ${worksrcpath}/fontforge/macbinary.c \
-                                                   ${worksrcpath}/fontforge/startui.c \
-                                                   ${worksrcpath}/gutils/giomime.c
     }
 }

trunk/dports/graphics/fontforge/files/patch-xcode-43.diff

@@ -6 +6 @@
  # include <ctype.h>
 -# include </Developer/Headers/FlatCarbon/Files.h>
-+# include <@@DEVDIR@@/Headers/FlatCarbon/Files.h>
++# include <CoreServices/CoreServices.h>
  #else
  # include <utype.h>
@@ -17 +17 @@
  #ifdef __Mac
 -# include </Developer/Headers/FlatCarbon/Files.h>
-+# include <@@DEVDIR@@/Headers/FlatCarbon/Files.h>
++# include <CoreServices/CoreServices.h>
  # define FontInfo      MacFontInfo
  # define KernPair      MacKernPair
 -# include </Developer/Headers/FlatCarbon/CarbonEvents.h>
-+# include <@@DEVDIR@@/Headers/FlatCarbon/CarbonEvents.h>
++# include <Carbon/Carbon.h>
  /* For reasons obscure to me RunApplicationEventLoop is not defined in */
  /*  the mac header files if we are in 64 bit mode. Strangely it seems to */
@@ -32 +32 @@
  #ifdef __Mac
 -#include </Developer/Headers/FlatCarbon/Files.h>
-+#include <@@DEVDIR@@/Headers/FlatCarbon/Files.h>
++#include <CoreServices/CoreServices.h>
  #define CHR(ch1,ch2,ch3,ch4) (((ch1)<<24)|((ch2)<<16)|((ch3)<<8)|(ch4))