[gimp] Bug 555525 - 64 Bit Build on Mac OS X Leopard fails...

[Michael Natterer <mitch src gnome org>]

commit 8bb48ac5de915cf5b6f2136541c403101ddee52a
Author: Michael Natterer <mitch gimp org>
Date:   Mon Apr 18 00:05:41 2016 +0100

    Bug 555525 - 64 Bit Build on Mac OS X Leopard fails...
    
    ...because of TWAIN interface
    
    Remove all Mac TWAIN stuff, we will get proper OS X scanner support
    pretty soon.

 configure.ac                 |   23 ----
 plug-ins/Makefile.am         |    4 -
 plug-ins/twain/Makefile.am   |   12 +--
 plug-ins/twain/tw_mac.c      |  228 ------------------------------------------
 plug-ins/twain/tw_platform.h |   24 -----
 5 files changed, 1 insertions(+), 290 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 52d26e6..fe3d22f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1979,28 +1979,6 @@ fi
 
 AM_CONDITIONAL(PLATFORM_OSX_QUARTZ, test "x$gtk_mac_integration_ok" = xyes)
 
-####################################
-# Check for Mac OS X TWAIN framework
-####################################
-
-AC_ARG_WITH(mac-twain,  [  --without-mac-twain     don't build the Mac TWAIN plug-in])
-
-mac_twain_ok=no
-if test "x$with_mac_twain" != xno; then
-  AC_MSG_CHECKING([for Mac OS X TWAIN support])
-  AC_PREPROC_IFELSE(
-    [AC_LANG_SOURCE([[
-#include <Carbon/Carbon.h>
-#include <TWAIN/TWAIN.h>
-#ifdef __x86_64__
-#error Please somebody port this to non-deprecated and non-removed APIs
-#endif]])],
-    [mac_twain_ok=yes])
-  AC_MSG_RESULT($mac_twain_ok)
-fi
-
-AM_CONDITIONAL(HAVE_MAC_TWAIN, test "x$mac_twain_ok" = xyes)
-
 
 ##########################################################
 # Determine where to install the desktop & mime info files
@@ -2517,7 +2495,6 @@ Optional Plug-Ins:
   Python 2:            $enable_python
   Script-Fu:           $have_script_fu
   SVG:                 $have_librsvg
-  TWAIN (MacOS X):     $mac_twain_ok
   TWAIN (Win32):       $os_win32
   Webpage:             $have_webkit
   WMF:                 $have_libwmf
diff --git a/plug-ins/Makefile.am b/plug-ins/Makefile.am
index c10daff..f4c8c10 100644
--- a/plug-ins/Makefile.am
+++ b/plug-ins/Makefile.am
@@ -20,10 +20,6 @@ if BUILD_SCRIPT_FU
 script_fu = script-fu
 endif
 
-if HAVE_MAC_TWAIN
-twain = twain
-endif
-
 if OS_WIN32
 twain = twain
 win_snap = win-snap
diff --git a/plug-ins/twain/Makefile.am b/plug-ins/twain/Makefile.am
index 8b24508..094769d 100644
--- a/plug-ins/twain/Makefile.am
+++ b/plug-ins/twain/Makefile.am
@@ -24,15 +24,6 @@ include $(top_srcdir)/build/windows/gimprc-plug-ins.rule
 twain_RC = twain.rc.o
 endif
 
-if HAVE_MAC_TWAIN
-twain_LDFLAGS = -framework Carbon -framework TWAIN
-
-twainplatform = tw_mac.c
-
-twaindatadir = $(gimpdatadir)/twain
-twaindata_DATA = gimp-twain.png
-endif
-
 
 twain_SOURCES = \
        tw_func.c       \
@@ -50,8 +41,7 @@ EXTRA_DIST = \
        gimp-twain.png  \
        tw_dump.c       \
        tw_dump.h       \
-       tw_win.c        \
-       tw_mac.c
+       tw_win.c
 
 AM_CPPFLAGS = \
        -I$(top_srcdir) \
diff --git a/plug-ins/twain/tw_platform.h b/plug-ins/twain/tw_platform.h
index 7ffce44..850a1ba 100644
--- a/plug-ins/twain/tw_platform.h
+++ b/plug-ins/twain/tw_platform.h
@@ -4,10 +4,6 @@
  * Craig Setera <setera home com>
  * 03/31/1999
  *
- * Updated for Mac OS X support
- * Brion Vibber <brion pobox com>
- * 07/22/2004
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
@@ -25,24 +21,6 @@
 #ifndef _TW_PLATFORM_H
 #define _TW_PLATFORM_H
 
-#ifdef __APPLE__
-
-/* Mac OS X */
-
-#include <Carbon/Carbon.h>
-#include <TWAIN/TWAIN.h>
-
-#define DEBUG_LOGFILE "/tmp/twain.log"
-#define DUMP_FILE "/tmp/twaincap.bin"
-#define DUMP_NAME "dtwain"
-#define READDUMP_NAME "rtwain"
-
-#define _stricmp strcasecmp
-
-#else
-
-/* Win32 */
-
 #include <windows.h>
 #include "twain.h"
 
@@ -57,5 +35,3 @@
 #define TWAIN_ALTERNATE_MAIN
 
 #endif
-
-#endif