Ticket #33596: gnuplot4_6_0-v2-cocoa.diff

File gnuplot4_6_0-v2-cocoa.diff, 47.3 KB (added by mojca (Mojca Miklavec), 13 years ago)

Same as gnuplot4_6_0-v2.diff (but using Cocoa instead of Carbon).

  • Portfile 

    diff --git a/Portfile b/Portfile
index f5292ef..d9b2427 100644
    a b PortSystem 1.0 
    55PortGroup                   xcodeversion 1.0
    66
    77name                        gnuplot
    8 version                     4.4.4
     8version                     4.6.0
    99categories                  math science
    1010# the license has some inconvenient requirements that we're not meeting
    1111# to be allowed to distribute binaries
    … … dist_subdir ${name}/${version} 
    3131distfiles-append            ${name}.pdf
    3232extract.only                ${distname}.tar.gz
    3333checksums                   ${distname}.tar.gz \
    34                             rmd160  7e1d039c05c46fa38b53a3c4afbd328509da901d \
    35                             sha256  d228599d08d5f87bcb79af8af8bb432c77d942802b1643f920c7baaeaf1ddbfd \
     34                            rmd160  2c06500f45fb81850b45713a2cd0e38f0021b065 \
     35                            sha256  6e60adb5039a3541f407c2ade670004178b376754c424c13f0be24c7960c17be \
    3636                            ${name}.pdf \
    37                             rmd160  f8bd424418bbf87e405c0f3d7eb2bf759c4770d5 \
    38                             sha256  3495b65604239d78cdad5ac3b34864572382c09ddf8ea202bddafce9133a1adf
     37                            rmd160  374614145a7b78e263b0cfbb695eb22d07dede9a \
     38                            sha256  57bd4d88e1321968ba06f29dfa322b4cd9e6beb4e0f42e1a4775d9c9a41af170
    3939
    4040depends_lib                 port:expat \
    4141                            port:fontconfig \
    … … depends_lib port:expat \ 
    4949                            port:xpm \
    5050                            port:zlib
    5151
    52 patchfiles                  patch-src-variable_c.diff
     52patchfiles                  patch-src-variable_c.diff \
     53                            patch-upstream-compilerwarnings.diff \
     54                            patch-upstream-wxt-scroll.diff \
     55                            patch-upstream-qt.diff \
     56                            patch-configure-qt.diff
     57
     58# upstream patches:
     59#
     60# - patch-upstream-compilerwarnings.diff
     61#   2012-03-18 17:30:42 Hans-Bernhard Broeker (cvs commit:broeker)
     62# - patch-upstream-wxt-scroll.diff
     63#   2012-02-29 19:29:25 Mojca Miklavec (cvs commit:sfeam)
     64# - patch-upstream-qt.diff
     65#   2012-04-01 08:49:45 Jérôme Lodewyck (cvs commit:lodewyck)
    5366
    5467platform darwin {
    5568    depends_lib-append      port:aquaterm
    56     configure.cflags-append -DDEFAULTTERM='"aqua"'
    5769}
    5870
    5971minimum_xcodeversions       {9 3.1}
    … … variant no_x11 { 
    8193    configure.args-append   --without-x
    8294}
    8395
    84 variant wxwidgets description "Enable wxWidgets front-end" {
    85     depends_lib-append      port:wxWidgets
     96variant luaterm description "Enable lua-based terminals" {
     97    depends_lib-append      port:lua
     98    configure.args-delete   --without-lua
     99    configure.args-append   --with-lua
     100}
     101
     102variant pangocairo description "Enable cairo-based terminals" {
     103    depends_lib-append      path:lib/pkgconfig/pango.pc:pango
     104    configure.args-delete   --without-cairo
     105}
     106
     107# One can in principle choose between wxWidgets and wxWidgets-devel,
     108# but only 2.9 allows building 64-bit binaries.
     109# If it is acceptable to depend on wxWidgets-devel only,
     110# one could delete the variant that depends on wxWidgets 2.8.
     111variant wxwidgets conflicts wxwidgets_devel description "Enable wxt terminal (wxWidgets 2.8, 32-bit only)" {
     112    depends_lib-append      port:wxWidgets path:lib/pkgconfig/pango.pc:pango
    86113    configure.args-delete   --disable-wxwidgets
    87114    configure.args-append   --with-wx-config=${prefix}/bin/wx-config
    88115}
    … … if {[variant_isset wxwidgets]} { 
    92119    supported_archs         i386 ppc
    93120}
    94121
    95 variant luaterm description "Enable Lua terminal" {
    96     depends_lib-append      port:lua
    97     configure.args-delete   --without-lua
    98     configure.args-append   --with-lua
     122variant wxwidgets_devel conflicts wxwidgets description "Enable wxt terminal (using wxWidgets 2.9, supports 64-bit)" {
     123    depends_lib-append      port:wxWidgets-devel path:lib/pkgconfig/pango.pc:pango
     124    configure.args-delete   --disable-wxwidgets
     125    configure.args-append   --with-wx-config=${prefix}/bin/wx-config
     126}
     127if {[variant_isset wxwidgets_devel]} {
     128    # http://trac.wxwidgets.org/ticket/13565
     129    if {${configure.compiler} == "clang"} {
     130        configure.compiler llvm-gcc-4.2
     131    }
    99132}
    100133
    101 variant pangocairo description "Enable cairo-based terminals" {
    102     depends_lib-append      path:lib/pkgconfig/pango.pc:pango
    103     configure.args-delete   --without-cairo
     134variant qt description "Enable qt terminal" {
     135    depends_lib-append      port:qt4-mac
     136    configure.args-append   --enable-qt
    104137}
    105138
    106139variant tutorial description "Build the tutorial (requires a tex install)" {

  • new file files/patch-configure-qt.diff 

    diff --git a/files/patch-configure-qt.diff b/files/patch-configure-qt.diff
new file mode 100644
index 0000000..fc939bd
    - +  
     1--- Makefile.in.orig
     2+++ Makefile.in
     3@@ -166,6 +166,9 @@ MAINT = @MAINT@
     4 MAKEINFO = @MAKEINFO@
     5 MKDIR_P = @MKDIR_P@
     6 MOC = @MOC@
     7+OBJC = @OBJC@
     8+OBJCDEPMODE = @OBJCDEPMODE@
     9+OBJCFLAGS = @OBJCFLAGS@
     10 OBJEXT = @OBJEXT@
     11 PACKAGE = @PACKAGE@
     12 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
     13@@ -211,6 +214,7 @@ abs_top_builddir = @abs_top_builddir@
     14 abs_top_srcdir = @abs_top_srcdir@
     15 ac_ct_CC = @ac_ct_CC@
     16 ac_ct_CXX = @ac_ct_CXX@
     17+ac_ct_OBJC = @ac_ct_OBJC@
     18 am__include = @am__include@
     19 am__leading_dot = @am__leading_dot@
     20 am__quote = @am__quote@
     21--- config/Makefile.in.orig
     22+++ config/Makefile.in
     23@@ -110,6 +110,9 @@ MAINT = @MAINT@
     24 MAKEINFO = @MAKEINFO@
     25 MKDIR_P = @MKDIR_P@
     26 MOC = @MOC@
     27+OBJC = @OBJC@
     28+OBJCDEPMODE = @OBJCDEPMODE@
     29+OBJCFLAGS = @OBJCFLAGS@
     30 OBJEXT = @OBJEXT@
     31 PACKAGE = @PACKAGE@
     32 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
     33@@ -155,6 +158,7 @@ abs_top_builddir = @abs_top_builddir@
     34 abs_top_srcdir = @abs_top_srcdir@
     35 ac_ct_CC = @ac_ct_CC@
     36 ac_ct_CXX = @ac_ct_CXX@
     37+ac_ct_OBJC = @ac_ct_OBJC@
     38 am__include = @am__include@
     39 am__leading_dot = @am__leading_dot@
     40 am__quote = @am__quote@
     41--- configure.orig
     42+++ configure
     43@@ -610,6 +610,8 @@ subdirs
     44 DIST_CONTACT
     45 HAVE_LRELEASE_FALSE
     46 HAVE_LRELEASE_TRUE
     47+BUILD_ON_APPLE_FALSE
     48+BUILD_ON_APPLE_TRUE
     49 BUILD_QT_FALSE
     50 BUILD_QT_TRUE
     51 LRELEASE
     52@@ -674,6 +676,12 @@ PLAINTEX
     53 EMACS
     54 CC_FOR_BUILD
     55 LN_S
     56+am__fastdepOBJC_FALSE
     57+am__fastdepOBJC_TRUE
     58+OBJCDEPMODE
     59+ac_ct_OBJC
     60+OBJCFLAGS
     61+OBJC
     62 ANSI2KNR
     63 U
     64 EGREP
     65@@ -810,6 +818,8 @@ LDFLAGS
     66 LIBS
     67 CPPFLAGS
     68 CPP
     69+OBJC
     70+OBJCFLAGS
     71 XMKMF
     72 PKG_CONFIG
     73 LUA_CFLAGS
     74@@ -1518,6 +1528,8 @@ Some influential environment variables:
     75   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
     76               you have headers in a nonstandard directory <include dir>
     77   CPP         C preprocessor
     78+  OBJC        Objective C compiler command
     79+  OBJCFLAGS   Objective C compiler flags
     80   XMKMF       Path to xmkmf, Makefile generator for X Window System
     81   PKG_CONFIG  path to pkg-config utility
     82   LUA_CFLAGS  C compiler flags for LUA, overriding pkg-config
     83@@ -1867,6 +1879,44 @@ $as_echo "$ac_res" >&6; }
     84 
     85 } # ac_fn_c_check_header_compile
     86 
     87+# ac_fn_objc_try_compile LINENO
     88+# -----------------------------
     89+# Try to compile conftest.$ac_ext, and return whether this succeeded.
     90+ac_fn_objc_try_compile ()
     91+{
     92+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
     93+  rm -f conftest.$ac_objext
     94+  if { { ac_try="$ac_compile"
     95+case "(($ac_try" in
     96+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     97+  *) ac_try_echo=$ac_try;;
     98+esac
     99+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     100+$as_echo "$ac_try_echo"; } >&5
     101+  (eval "$ac_compile") 2>conftest.err
     102+  ac_status=$?
     103+  if test -s conftest.err; then
     104+    grep -v '^ *+' conftest.err >conftest.er1
     105+    cat conftest.er1 >&5
     106+    mv -f conftest.er1 conftest.err
     107+  fi
     108+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     109+  test $ac_status = 0; } && {
     110+        test -z "$ac_objc_werror_flag" ||
     111+        test ! -s conftest.err
     112+       } && test -s conftest.$ac_objext; then :
     113+  ac_retval=0
     114+else
     115+  $as_echo "$as_me: failed program was:" >&5
     116+sed 's/^/| /' conftest.$ac_ext >&5
     117+
     118+       ac_retval=1
     119+fi
     120+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
     121+  as_fn_set_status $ac_retval
     122+
     123+} # ac_fn_objc_try_compile
     124+
     125 # ac_fn_c_try_link LINENO
     126 # -----------------------
     127 # Try to link conftest.$ac_ext, and return whether this succeeded.
     128@@ -5314,6 +5364,382 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     129 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     130 ac_compiler_gnu=$ac_cv_c_compiler_gnu
     131 
     132+ac_ext=m
     133+ac_cpp='$OBJCPP $CPPFLAGS'
     134+ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     135+ac_link='$OBJC -o conftest$ac_exeext $OBJCFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     136+ac_compiler_gnu=$ac_cv_objc_compiler_gnu
     137+if test -n "$ac_tool_prefix"; then
     138+  for ac_prog in gcc objcc objc cc CC
     139+  do
     140+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
     141+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
     142+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     143+$as_echo_n "checking for $ac_word... " >&6; }
     144+if test "${ac_cv_prog_OBJC+set}" = set; then :
     145+  $as_echo_n "(cached) " >&6
     146+else
     147+  if test -n "$OBJC"; then
     148+  ac_cv_prog_OBJC="$OBJC" # Let the user override the test.
     149+else
     150+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     151+for as_dir in $PATH
     152+do
     153+  IFS=$as_save_IFS
     154+  test -z "$as_dir" && as_dir=.
     155+    for ac_exec_ext in '' $ac_executable_extensions; do
     156+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     157+    ac_cv_prog_OBJC="$ac_tool_prefix$ac_prog"
     158+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     159+    break 2
     160+  fi
     161+done
     162+  done
     163+IFS=$as_save_IFS
     164+
     165+fi
     166+fi
     167+OBJC=$ac_cv_prog_OBJC
     168+if test -n "$OBJC"; then
     169+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJC" >&5
     170+$as_echo "$OBJC" >&6; }
     171+else
     172+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     173+$as_echo "no" >&6; }
     174+fi
     175+
     176+
     177+    test -n "$OBJC" && break
     178+  done
     179+fi
     180+if test -z "$OBJC"; then
     181+  ac_ct_OBJC=$OBJC
     182+  for ac_prog in gcc objcc objc cc CC
     183+do
     184+  # Extract the first word of "$ac_prog", so it can be a program name with args.
     185+set dummy $ac_prog; ac_word=$2
     186+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     187+$as_echo_n "checking for $ac_word... " >&6; }
     188+if test "${ac_cv_prog_ac_ct_OBJC+set}" = set; then :
     189+  $as_echo_n "(cached) " >&6
     190+else
     191+  if test -n "$ac_ct_OBJC"; then
     192+  ac_cv_prog_ac_ct_OBJC="$ac_ct_OBJC" # Let the user override the test.
     193+else
     194+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     195+for as_dir in $PATH
     196+do
     197+  IFS=$as_save_IFS
     198+  test -z "$as_dir" && as_dir=.
     199+    for ac_exec_ext in '' $ac_executable_extensions; do
     200+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     201+    ac_cv_prog_ac_ct_OBJC="$ac_prog"
     202+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     203+    break 2
     204+  fi
     205+done
     206+  done
     207+IFS=$as_save_IFS
     208+
     209+fi
     210+fi
     211+ac_ct_OBJC=$ac_cv_prog_ac_ct_OBJC
     212+if test -n "$ac_ct_OBJC"; then
     213+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJC" >&5
     214+$as_echo "$ac_ct_OBJC" >&6; }
     215+else
     216+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     217+$as_echo "no" >&6; }
     218+fi
     219+
     220+
     221+  test -n "$ac_ct_OBJC" && break
     222+done
     223+
     224+  if test "x$ac_ct_OBJC" = x; then
     225+    OBJC="gcc"
     226+  else
     227+    case $cross_compiling:$ac_tool_warned in
     228+yes:)
     229+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
     230+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
     231+ac_tool_warned=yes ;;
     232+esac
     233+    OBJC=$ac_ct_OBJC
     234+  fi
     235+fi
     236+
     237+# Provide some information about the compiler.
     238+$as_echo "$as_me:${as_lineno-$LINENO}: checking for Objective C compiler version" >&5
     239+set X $ac_compile
     240+ac_compiler=$2
     241+for ac_option in --version -v -V -qversion; do
     242+  { { ac_try="$ac_compiler $ac_option >&5"
     243+case "(($ac_try" in
     244+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     245+  *) ac_try_echo=$ac_try;;
     246+esac
     247+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     248+$as_echo "$ac_try_echo"; } >&5
     249+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
     250+  ac_status=$?
     251+  if test -s conftest.err; then
     252+    sed '10a\
     253+... rest of stderr output deleted ...
     254+         10q' conftest.err >conftest.er1
     255+    cat conftest.er1 >&5
     256+  fi
     257+  rm -f conftest.er1 conftest.err
     258+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     259+  test $ac_status = 0; }
     260+done
     261+
     262+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Objective C compiler" >&5
     263+$as_echo_n "checking whether we are using the GNU Objective C compiler... " >&6; }
     264+if test "${ac_cv_objc_compiler_gnu+set}" = set; then :
     265+  $as_echo_n "(cached) " >&6
     266+else
     267+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     268+/* end confdefs.h.  */
     269+
     270+int
     271+main ()
     272+{
     273+#ifndef __GNUC__
     274+       choke me
     275+#endif
     276+
     277+  ;
     278+  return 0;
     279+}
     280+_ACEOF
     281+if ac_fn_objc_try_compile "$LINENO"; then :
     282+  ac_compiler_gnu=yes
     283+else
     284+  ac_compiler_gnu=no
     285+fi
     286+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     287+ac_cv_objc_compiler_gnu=$ac_compiler_gnu
     288+
     289+fi
     290+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objc_compiler_gnu" >&5
     291+$as_echo "$ac_cv_objc_compiler_gnu" >&6; }
     292+if test $ac_compiler_gnu = yes; then
     293+  GOBJC=yes
     294+else
     295+  GOBJC=
     296+fi
     297+ac_test_OBJCFLAGS=${OBJCFLAGS+set}
     298+ac_save_OBJCFLAGS=$OBJCFLAGS
     299+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $OBJC accepts -g" >&5
     300+$as_echo_n "checking whether $OBJC accepts -g... " >&6; }
     301+if test "${ac_cv_prog_objc_g+set}" = set; then :
     302+  $as_echo_n "(cached) " >&6
     303+else
     304+  ac_save_objc_werror_flag=$ac_objc_werror_flag
     305+   ac_objc_werror_flag=yes
     306+   ac_cv_prog_objc_g=no
     307+   OBJCFLAGS="-g"
     308+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     309+/* end confdefs.h.  */
     310+
     311+int
     312+main ()
     313+{
     314+
     315+  ;
     316+  return 0;
     317+}
     318+_ACEOF
     319+if ac_fn_objc_try_compile "$LINENO"; then :
     320+  ac_cv_prog_objc_g=yes
     321+else
     322+  OBJCFLAGS=""
     323+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     324+/* end confdefs.h.  */
     325+
     326+int
     327+main ()
     328+{
     329+
     330+  ;
     331+  return 0;
     332+}
     333+_ACEOF
     334+if ac_fn_objc_try_compile "$LINENO"; then :
     335+
     336+else
     337+  ac_objc_werror_flag=$ac_save_objc_werror_flag
     338+        OBJCFLAGS="-g"
     339+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     340+/* end confdefs.h.  */
     341+
     342+int
     343+main ()
     344+{
     345+
     346+  ;
     347+  return 0;
     348+}
     349+_ACEOF
     350+if ac_fn_objc_try_compile "$LINENO"; then :
     351+  ac_cv_prog_objc_g=yes
     352+fi
     353+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     354+fi
     355+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     356+fi
     357+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     358+   ac_objc_werror_flag=$ac_save_objc_werror_flag
     359+fi
     360+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_objc_g" >&5
     361+$as_echo "$ac_cv_prog_objc_g" >&6; }
     362+if test "$ac_test_OBJCFLAGS" = set; then
     363+  OBJCFLAGS=$ac_save_OBJCFLAGS
     364+elif test $ac_cv_prog_objc_g = yes; then
     365+  if test "$GOBJC" = yes; then
     366+    OBJCFLAGS="-g -O2"
     367+  else
     368+    OBJCFLAGS="-g"
     369+  fi
     370+else
     371+  if test "$GOBJC" = yes; then
     372+    OBJCFLAGS="-O2"
     373+  else
     374+    OBJCFLAGS=
     375+  fi
     376+fi
     377+ac_ext=c
     378+ac_cpp='$CPP $CPPFLAGS'
     379+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     380+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     381+ac_compiler_gnu=$ac_cv_c_compiler_gnu
     382+
     383+depcc="$OBJC" am_compiler_list='gcc3 gcc'
     384+
     385+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
     386+$as_echo_n "checking dependency style of $depcc... " >&6; }
     387+if test "${am_cv_OBJC_dependencies_compiler_type+set}" = set; then :
     388+  $as_echo_n "(cached) " >&6
     389+else
     390+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
     391+  # We make a subdir and do the tests there.  Otherwise we can end up
     392+  # making bogus files that we don't know about and never remove.  For
     393+  # instance it was reported that on HP-UX the gcc test will end up
     394+  # making a dummy file named `D' -- because `-MD' means `put the output
     395+  # in D'.
     396+  mkdir conftest.dir
     397+  # Copy depcomp to subdir because otherwise we won't find it if we're
     398+  # using a relative directory.
     399+  cp "$am_depcomp" conftest.dir
     400+  cd conftest.dir
     401+  # We will build objects and dependencies in a subdirectory because
     402+  # it helps to detect inapplicable dependency modes.  For instance
     403+  # both Tru64's cc and ICC support -MD to output dependencies as a
     404+  # side effect of compilation, but ICC will put the dependencies in
     405+  # the current directory while Tru64 will put them in the object
     406+  # directory.
     407+  mkdir sub
     408+
     409+  am_cv_OBJC_dependencies_compiler_type=none
     410+  if test "$am_compiler_list" = ""; then
     411+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
     412+  fi
     413+  am__universal=false
     414+
     415+
     416+  for depmode in $am_compiler_list; do
     417+    # Setup a source with many dependencies, because some compilers
     418+    # like to wrap large dependency lists on column 80 (with \), and
     419+    # we should not choose a depcomp mode which is confused by this.
     420+    #
     421+    # We need to recreate these files for each test, as the compiler may
     422+    # overwrite some of them when testing with obscure command lines.
     423+    # This happens at least with the AIX C compiler.
     424+    : > sub/conftest.c
     425+    for i in 1 2 3 4 5 6; do
     426+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
     427+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
     428+      # Solaris 8's {/usr,}/bin/sh.
     429+      touch sub/conftst$i.h
     430+    done
     431+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
     432+
     433+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
     434+    # mode.  It turns out that the SunPro C++ compiler does not properly
     435+    # handle `-M -o', and we need to detect this.  Also, some Intel
     436+    # versions had trouble with output in subdirs
     437+    am__obj=sub/conftest.${OBJEXT-o}
     438+    am__minus_obj="-o $am__obj"
     439+    case $depmode in
     440+    gcc)
     441+      # This depmode causes a compiler race in universal mode.
     442+      test "$am__universal" = false || continue
     443+      ;;
     444+    nosideeffect)
     445+      # after this tag, mechanisms are not by side-effect, so they'll
     446+      # only be used when explicitly requested
     447+      if test "x$enable_dependency_tracking" = xyes; then
     448+       continue
     449+      else
     450+       break
     451+      fi
     452+      ;;
     453+    msvisualcpp | msvcmsys)
     454+      # This compiler won't grok `-c -o', but also, the minuso test has
     455+      # not run yet.  These depmodes are late enough in the game, and
     456+      # so weak that their functioning should not be impacted.
     457+      am__obj=conftest.${OBJEXT-o}
     458+      am__minus_obj=
     459+      ;;
     460+    none) break ;;
     461+    esac
     462+    if depmode=$depmode \
     463+       source=sub/conftest.c object=$am__obj \
     464+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
     465+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
     466+         >/dev/null 2>conftest.err &&
     467+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
     468+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
     469+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
     470+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
     471+      # icc doesn't choke on unknown options, it will just issue warnings
     472+      # or remarks (even with -Werror).  So we grep stderr for any message
     473+      # that says an option was ignored or not supported.
     474+      # When given -MP, icc 7.0 and 7.1 complain thusly:
     475+      #   icc: Command line warning: ignoring option '-M'; no argument required
     476+      # The diagnosis changed in icc 8.0:
     477+      #   icc: Command line remark: option '-MP' not supported
     478+      if (grep 'ignoring option' conftest.err ||
     479+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
     480+        am_cv_OBJC_dependencies_compiler_type=$depmode
     481+        break
     482+      fi
     483+    fi
     484+  done
     485+
     486+  cd ..
     487+  rm -rf conftest.dir
     488+else
     489+  am_cv_OBJC_dependencies_compiler_type=none
     490+fi
     491+
     492+fi
     493+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_OBJC_dependencies_compiler_type" >&5
     494+$as_echo "$am_cv_OBJC_dependencies_compiler_type" >&6; }
     495+OBJCDEPMODE=depmode=$am_cv_OBJC_dependencies_compiler_type
     496+
     497+ if
     498+  test "x$enable_dependency_tracking" != xno \
     499+  && test "$am_cv_OBJC_dependencies_compiler_type" = gcc3; then
     500+  am__fastdepOBJC_TRUE=
     501+  am__fastdepOBJC_FALSE='#'
     502+else
     503+  am__fastdepOBJC_TRUE='#'
     504+  am__fastdepOBJC_FALSE=
     505+fi
     506+
     507+
     508 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
     509 $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
     510 if test "${ac_cv_c_const+set}" = set; then :
     511@@ -7828,7 +8254,7 @@ else
     512        char b[false == 0 ? 1 : -1];
     513        char c[__bool_true_false_are_defined == 1 ? 1 : -1];
     514        char d[(bool) 0.5 == true ? 1 : -1];
     515-       bool e = &s;
     516+       /* See body of main program for 'e'.  */
     517        char f[(_Bool) 0.0 == false ? 1 : -1];
     518        char g[true];
     519        char h[sizeof (_Bool)];
     520@@ -7839,25 +8265,6 @@ else
     521        _Bool n[m];
     522        char o[sizeof n == m * sizeof n[0] ? 1 : -1];
     523        char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
     524-#      if defined __xlc__ || defined __GNUC__
     525-        /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0
     526-           reported by James Lemley on 2005-10-05; see
     527-           http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html
     528-           This test is not quite right, since xlc is allowed to
     529-           reject this program, as the initializer for xlcbug is
     530-           not one of the forms that C requires support for.
     531-           However, doing the test right would require a runtime
     532-           test, and that would make cross-compilation harder.
     533-           Let us hope that IBM fixes the xlc bug, and also adds
     534-           support for this kind of constant expression.  In the
     535-           meantime, this test will reject xlc, which is OK, since
     536-           our stdbool.h substitute should suffice.  We also test
     537-           this with GCC, where it should work, to detect more
     538-           quickly whether someone messes up the test in the
     539-           future.  */
     540-        char digs[] = "0123456789";
     541-        int xlcbug = 1 / (&(digs + 5)[-2 + (bool) 1] == &digs[4] ? 1 : -1);
     542-#      endif
     543        /* Catch a bug in an HP-UX C compiler.  See
     544           http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
     545           http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
     546@@ -7869,6 +8276,7 @@ int
     547 main ()
     548 {
     549 
     550+       bool e = &s;
     551        *pq |= q;
     552        *pq |= ! q;
     553        /* Refer to every declared value, to avoid compiler optimizations.  */
     554@@ -13010,7 +13418,7 @@ fi
     555   CXXFLAGS="$CXXFLAGS $QT_CXXFLAGS"
     556 
     557     if test "$is_apple" = yes; then
     558-    CXXFLAGS="$CXXFLAGS -ObjC"
     559+    LIBS="$LIBS -framework Cocoa"
     560   fi
     561 
     562   QT4LOC=`$PKG_CONFIG --variable=exec_prefix QtCore`
     563@@ -13056,6 +13464,15 @@ else
     564 fi
     565 
     566 
     567+ if test "${is_apple}" = yes; then
     568+  BUILD_ON_APPLE_TRUE=
     569+  BUILD_ON_APPLE_FALSE='#'
     570+else
     571+  BUILD_ON_APPLE_TRUE='#'
     572+  BUILD_ON_APPLE_FALSE=
     573+fi
     574+
     575+
     576  if test "${LRELEASE}" != no; then
     577   HAVE_LRELEASE_TRUE=
     578   HAVE_LRELEASE_FALSE='#'
     579@@ -13222,6 +13639,10 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
     580   as_fn_error "conditional \"am__fastdepCC\" was never defined.
     581 Usually this means the macro was only invoked conditionally." "$LINENO" 5
     582 fi
     583+if test -z "${am__fastdepOBJC_TRUE}" && test -z "${am__fastdepOBJC_FALSE}"; then
     584+  as_fn_error "conditional \"am__fastdepOBJC\" was never defined.
     585+Usually this means the macro was only invoked conditionally." "$LINENO" 5
     586+fi
     587 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
     588   as_fn_error "conditional \"am__fastdepCC\" was never defined.
     589 Usually this means the macro was only invoked conditionally." "$LINENO" 5
     590@@ -13262,6 +13683,10 @@ if test -z "${BUILD_QT_TRUE}" && test -z "${BUILD_QT_FALSE}"; then
     591   as_fn_error "conditional \"BUILD_QT\" was never defined.
     592 Usually this means the macro was only invoked conditionally." "$LINENO" 5
     593 fi
     594+if test -z "${BUILD_ON_APPLE_TRUE}" && test -z "${BUILD_ON_APPLE_FALSE}"; then
     595+  as_fn_error "conditional \"BUILD_ON_APPLE\" was never defined.
     596+Usually this means the macro was only invoked conditionally." "$LINENO" 5
     597+fi
     598 if test -z "${HAVE_LRELEASE_TRUE}" && test -z "${HAVE_LRELEASE_FALSE}"; then
     599   as_fn_error "conditional \"HAVE_LRELEASE\" was never defined.
     600 Usually this means the macro was only invoked conditionally." "$LINENO" 5
     601--- configure.in.orig
     602+++ configure.in
     603@@ -26,6 +26,7 @@ AC_GNU_SOURCE
     604 AC_PROG_CC
     605 AM_C_PROTOTYPES
     606 AC_PROG_CPP
     607+AC_PROG_OBJC
     608 AC_C_CONST
     609 AC_C_INLINE
     610 AC_C_STRINGIZE
     611@@ -1146,7 +1147,7 @@ if test "${enable_qt_ok}" = yes ; then
     612 
     613   dnl Compile Objective C Cocoa headers on Mac to hide the gnuplot icon from the dock
     614   if test "$is_apple" = yes; then
     615-    CXXFLAGS="$CXXFLAGS -ObjC"
     616+    LIBS="$LIBS -framework Cocoa"
     617   fi
     618 
     619   QT4LOC=`$PKG_CONFIG --variable=exec_prefix QtCore`
     620@@ -1183,6 +1184,8 @@ if test "${enable_qt_ok}" = yes ; then
     621 fi
     622 AM_CONDITIONAL(BUILD_QT, test "${enable_qt_ok}" = yes)
     623 
     624+AM_CONDITIONAL(BUILD_ON_APPLE, test "${is_apple}" = yes)
     625+
     626 dnl translation tools
     627 AM_CONDITIONAL(HAVE_LRELEASE, test "${LRELEASE}" != no)
     628 
     629--- demo/Makefile.in.orig
     630+++ demo/Makefile.in
     631@@ -110,6 +110,9 @@ MAINT = @MAINT@
     632 MAKEINFO = @MAKEINFO@
     633 MKDIR_P = @MKDIR_P@
     634 MOC = @MOC@
     635+OBJC = @OBJC@
     636+OBJCDEPMODE = @OBJCDEPMODE@
     637+OBJCFLAGS = @OBJCFLAGS@
     638 OBJEXT = @OBJEXT@
     639 PACKAGE = @PACKAGE@
     640 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
     641@@ -155,6 +158,7 @@ abs_top_builddir = @abs_top_builddir@
     642 abs_top_srcdir = @abs_top_srcdir@
     643 ac_ct_CC = @ac_ct_CC@
     644 ac_ct_CXX = @ac_ct_CXX@
     645+ac_ct_OBJC = @ac_ct_OBJC@
     646 am__include = @am__include@
     647 am__leading_dot = @am__leading_dot@
     648 am__quote = @am__quote@
     649--- m4/Makefile.in.orig
     650+++ m4/Makefile.in
     651@@ -110,6 +110,9 @@ MAINT = @MAINT@
     652 MAKEINFO = @MAKEINFO@
     653 MKDIR_P = @MKDIR_P@
     654 MOC = @MOC@
     655+OBJC = @OBJC@
     656+OBJCDEPMODE = @OBJCDEPMODE@
     657+OBJCFLAGS = @OBJCFLAGS@
     658 OBJEXT = @OBJEXT@
     659 PACKAGE = @PACKAGE@
     660 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
     661@@ -155,6 +158,7 @@ abs_top_builddir = @abs_top_builddir@
     662 abs_top_srcdir = @abs_top_srcdir@
     663 ac_ct_CC = @ac_ct_CC@
     664 ac_ct_CXX = @ac_ct_CXX@
     665+ac_ct_OBJC = @ac_ct_OBJC@
     666 am__include = @am__include@
     667 am__leading_dot = @am__leading_dot@
     668 am__quote = @am__quote@
     669--- man/Makefile.in.orig
     670+++ man/Makefile.in
     671@@ -135,6 +135,9 @@ MAINT = @MAINT@
     672 MAKEINFO = @MAKEINFO@
     673 MKDIR_P = @MKDIR_P@
     674 MOC = @MOC@
     675+OBJC = @OBJC@
     676+OBJCDEPMODE = @OBJCDEPMODE@
     677+OBJCFLAGS = @OBJCFLAGS@
     678 OBJEXT = @OBJEXT@
     679 PACKAGE = @PACKAGE@
     680 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
     681@@ -180,6 +183,7 @@ abs_top_builddir = @abs_top_builddir@
     682 abs_top_srcdir = @abs_top_srcdir@
     683 ac_ct_CC = @ac_ct_CC@
     684 ac_ct_CXX = @ac_ct_CXX@
     685+ac_ct_OBJC = @ac_ct_OBJC@
     686 am__include = @am__include@
     687 am__leading_dot = @am__leading_dot@
     688 am__quote = @am__quote@
     689--- share/LaTeX/Makefile.in.orig
     690+++ share/LaTeX/Makefile.in
     691@@ -134,6 +134,9 @@ MAINT = @MAINT@
     692 MAKEINFO = @MAKEINFO@
     693 MKDIR_P = @MKDIR_P@
     694 MOC = @MOC@
     695+OBJC = @OBJC@
     696+OBJCDEPMODE = @OBJCDEPMODE@
     697+OBJCFLAGS = @OBJCFLAGS@
     698 OBJEXT = @OBJEXT@
     699 PACKAGE = @PACKAGE@
     700 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
     701@@ -179,6 +182,7 @@ abs_top_builddir = @abs_top_builddir@
     702 abs_top_srcdir = @abs_top_srcdir@
     703 ac_ct_CC = @ac_ct_CC@
     704 ac_ct_CXX = @ac_ct_CXX@
     705+ac_ct_OBJC = @ac_ct_OBJC@
     706 am__include = @am__include@
     707 am__leading_dot = @am__leading_dot@
     708 am__quote = @am__quote@
     709--- share/Makefile.in.orig
     710+++ share/Makefile.in
     711@@ -174,6 +174,9 @@ MAINT = @MAINT@
     712 MAKEINFO = @MAKEINFO@
     713 MKDIR_P = @MKDIR_P@
     714 MOC = @MOC@
     715+OBJC = @OBJC@
     716+OBJCDEPMODE = @OBJCDEPMODE@
     717+OBJCFLAGS = @OBJCFLAGS@
     718 OBJEXT = @OBJEXT@
     719 PACKAGE = @PACKAGE@
     720 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
     721@@ -219,6 +222,7 @@ abs_top_builddir = @abs_top_builddir@
     722 abs_top_srcdir = @abs_top_srcdir@
     723 ac_ct_CC = @ac_ct_CC@
     724 ac_ct_CXX = @ac_ct_CXX@
     725+ac_ct_OBJC = @ac_ct_OBJC@
     726 am__include = @am__include@
     727 am__leading_dot = @am__leading_dot@
     728 am__quote = @am__quote@
     729--- src/Makefile.am.orig
     730+++ src/Makefile.am
     731@@ -143,6 +143,10 @@ clean-local: clean-qt-extra clean-demo
     732 
     733 gnuplot_SOURCES += qtterminal/qt_term.cpp
     734 
     735+if BUILD_ON_APPLE
     736+gnuplot_SOURCES += qtterminal/qt_term_mac.m
     737+endif
     738+
     739 pkglibexec_PROGRAMS += gnuplot_qt
     740 
     741 $(gnuplot_qt_OBJECTS) : ui_QtGnuplotSettings.h
     742--- src/Makefile.in.orig
     743+++ src/Makefile.in
     744@@ -45,7 +45,8 @@ pkglibexec_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
     745 
     746 # Qt terminal sources
     747 @BUILD_QT_TRUE@am__append_6 = qtterminal/qt_term.cpp
     748-@BUILD_QT_TRUE@am__append_7 = gnuplot_qt
     749+@BUILD_ON_APPLE_TRUE@@BUILD_QT_TRUE@am__append_7 = qtterminal/qt_term_mac.m
     750+@BUILD_QT_TRUE@am__append_8 = gnuplot_qt
     751 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
     752        $(srcdir)/makefile.all ansi2knr.1 ansi2knr.c
     753 subdir = src
     754@@ -86,12 +87,14 @@ am__gnuplot_SOURCES_DIST = alloc.c alloc.h ansichek.h axis.c axis.h \
     755        util.c util.h util3d.c util3d.h variable.c variable.h \
     756        version.c version.h wxterminal/wxt_gui.cpp \
     757        wxterminal/gp_cairo.c wxterminal/gp_cairo_helpers.c bitmap.c \
     758-       qtterminal/qt_term.cpp
     759+       qtterminal/qt_term.cpp qtterminal/qt_term_mac.m
     760 @BUILD_WXWIDGETS_TRUE@am__objects_1 = wxt_gui.$(OBJEXT)
     761 @BUILD_GPCAIRO_TRUE@am__objects_2 = gp_cairo$U.$(OBJEXT) \
     762 @BUILD_GPCAIRO_TRUE@   gp_cairo_helpers$U.$(OBJEXT)
     763 @BUILD_BITMAP_TRUE@am__objects_3 = bitmap$U.$(OBJEXT)
     764 @BUILD_QT_TRUE@am__objects_4 = qt_term.$(OBJEXT)
     765+@BUILD_ON_APPLE_TRUE@@BUILD_QT_TRUE@am__objects_5 =  \
     766+@BUILD_ON_APPLE_TRUE@@BUILD_QT_TRUE@   qt_term_mac.$(OBJEXT)
     767 am_gnuplot_OBJECTS = alloc$U.$(OBJEXT) axis$U.$(OBJEXT) \
     768        binary$U.$(OBJEXT) breaders$U.$(OBJEXT) color$U.$(OBJEXT) \
     769        command$U.$(OBJEXT) contour$U.$(OBJEXT) datafile$U.$(OBJEXT) \
     770@@ -108,7 +111,8 @@ am_gnuplot_OBJECTS = alloc$U.$(OBJEXT) axis$U.$(OBJEXT) \
     771        tabulate$U.$(OBJEXT) term$U.$(OBJEXT) time$U.$(OBJEXT) \
     772        unset$U.$(OBJEXT) util$U.$(OBJEXT) util3d$U.$(OBJEXT) \
     773        variable$U.$(OBJEXT) version$U.$(OBJEXT) $(am__objects_1) \
     774-       $(am__objects_2) $(am__objects_3) $(am__objects_4)
     775+       $(am__objects_2) $(am__objects_3) $(am__objects_4) \
     776+       $(am__objects_5)
     777 gnuplot_OBJECTS = $(am_gnuplot_OBJECTS)
     778 am__DEPENDENCIES_1 =
     779 gnuplot_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
     780@@ -156,6 +160,11 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
     781 CXXLD = $(CXX)
     782 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
     783        -o $@
     784+OBJCCOMPILE = $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
     785+       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS)
     786+OBJCLD = $(OBJC)
     787+OBJCLINK = $(OBJCLD) $(AM_OBJCFLAGS) $(OBJCFLAGS) $(AM_LDFLAGS) \
     788+       $(LDFLAGS) -o $@
     789 SOURCES = $(bf_test_SOURCES) $(gnuplot_SOURCES) \
     790        $(EXTRA_gnuplot_SOURCES) $(gnuplot_qt_SOURCES) \
     791        $(nodist_gnuplot_qt_SOURCES) $(gnuplot_x11_SOURCES)
     792@@ -292,6 +301,9 @@ MAINT = @MAINT@
     793 MAKEINFO = @MAKEINFO@
     794 MKDIR_P = @MKDIR_P@
     795 MOC = @MOC@
     796+OBJC = @OBJC@
     797+OBJCDEPMODE = @OBJCDEPMODE@
     798+OBJCFLAGS = @OBJCFLAGS@
     799 OBJEXT = @OBJEXT@
     800 PACKAGE = @PACKAGE@
     801 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
     802@@ -337,6 +349,7 @@ abs_top_builddir = @abs_top_builddir@
     803 abs_top_srcdir = @abs_top_srcdir@
     804 ac_ct_CC = @ac_ct_CC@
     805 ac_ct_CXX = @ac_ct_CXX@
     806+ac_ct_OBJC = @ac_ct_OBJC@
     807 am__include = @am__include@
     808 am__leading_dot = @am__leading_dot@
     809 am__quote = @am__quote@
     810@@ -430,7 +443,7 @@ gnuplot_SOURCES = alloc.c alloc.h ansichek.h axis.c axis.h binary.c \
     811        tabulate.h template.h term_api.h term.c term.h time.c unset.c \
     812        util.c util.h util3d.c util3d.h variable.c variable.h \
     813        version.c version.h $(am__append_2) $(am__append_3) \
     814-       $(am__append_4) $(am__append_6)
     815+       $(am__append_4) $(am__append_6) $(am__append_7)
     816 gnuplot_LDADD = $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS) $(QT_LIBS)
     817 @BUILD_GNUPLOT_X11_TRUE@gnuplot_x11_SOURCES = gplt_x11.c gplt_x11.h gpexecute.c gpexecute.h mousecmn.h version.c version.h
     818 @BUILD_GNUPLOT_X11_TRUE@XLIBS = @LIBRARIES_FOR_X@
     819@@ -510,7 +523,7 @@ $(T)vws.trm $(T)win.trm $(T)wxt.trm $(T)x11.trm $(T)xlib.trm
     820 all: all-recursive
     821 
     822 .SUFFIXES:
     823-.SUFFIXES: .c .cpp .o .obj
     824+.SUFFIXES: .c .cpp .m .o .obj
     825 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/makefile.all $(am__configure_deps)
     826        @for dep in $?; do \
     827          case '$(am__configure_deps)' in \
     828@@ -696,6 +709,7 @@ mostlyclean-kr:
     829 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pm3d$U.Po@am__quote@
     830 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qrc_QtGnuplotResource.Po@am__quote@
     831 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qt_term.Po@am__quote@
     832+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qt_term_mac.Po@am__quote@
     833 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readline$U.Po@am__quote@
     834 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/save$U.Po@am__quote@
     835 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scanner$U.Po@am__quote@
     836@@ -1056,6 +1070,34 @@ QtGnuplotEvent.obj: qtterminal/QtGnuplotEvent.cpp
     837 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='qtterminal/QtGnuplotEvent.cpp' object='QtGnuplotEvent.obj' libtool=no @AMDEPBACKSLASH@
     838 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     839 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o QtGnuplotEvent.obj `if test -f 'qtterminal/QtGnuplotEvent.cpp'; then $(CYGPATH_W) 'qtterminal/QtGnuplotEvent.cpp'; else $(CYGPATH_W) '$(srcdir)/qtterminal/QtGnuplotEvent.cpp'; fi`
     840+
     841+.m.o:
     842+@am__fastdepOBJC_TRUE@ $(OBJCCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
     843+@am__fastdepOBJC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
     844+@AMDEP_TRUE@@am__fastdepOBJC_FALSE@    source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
     845+@AMDEP_TRUE@@am__fastdepOBJC_FALSE@    DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     846+@am__fastdepOBJC_FALSE@        $(OBJCCOMPILE) -c -o $@ $<
     847+
     848+.m.obj:
     849+@am__fastdepOBJC_TRUE@ $(OBJCCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
     850+@am__fastdepOBJC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
     851+@AMDEP_TRUE@@am__fastdepOBJC_FALSE@    source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
     852+@AMDEP_TRUE@@am__fastdepOBJC_FALSE@    DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     853+@am__fastdepOBJC_FALSE@        $(OBJCCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
     854+
     855+qt_term_mac.o: qtterminal/qt_term_mac.m
     856+@am__fastdepOBJC_TRUE@ $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -MT qt_term_mac.o -MD -MP -MF $(DEPDIR)/qt_term_mac.Tpo -c -o qt_term_mac.o `test -f 'qtterminal/qt_term_mac.m' || echo '$(srcdir)/'`qtterminal/qt_term_mac.m
     857+@am__fastdepOBJC_TRUE@ $(am__mv) $(DEPDIR)/qt_term_mac.Tpo $(DEPDIR)/qt_term_mac.Po
     858+@AMDEP_TRUE@@am__fastdepOBJC_FALSE@    source='qtterminal/qt_term_mac.m' object='qt_term_mac.o' libtool=no @AMDEPBACKSLASH@
     859+@AMDEP_TRUE@@am__fastdepOBJC_FALSE@    DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     860+@am__fastdepOBJC_FALSE@        $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -c -o qt_term_mac.o `test -f 'qtterminal/qt_term_mac.m' || echo '$(srcdir)/'`qtterminal/qt_term_mac.m
     861+
     862+qt_term_mac.obj: qtterminal/qt_term_mac.m
     863+@am__fastdepOBJC_TRUE@ $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -MT qt_term_mac.obj -MD -MP -MF $(DEPDIR)/qt_term_mac.Tpo -c -o qt_term_mac.obj `if test -f 'qtterminal/qt_term_mac.m'; then $(CYGPATH_W) 'qtterminal/qt_term_mac.m'; else $(CYGPATH_W) '$(srcdir)/qtterminal/qt_term_mac.m'; fi`
     864+@am__fastdepOBJC_TRUE@ $(am__mv) $(DEPDIR)/qt_term_mac.Tpo $(DEPDIR)/qt_term_mac.Po
     865+@AMDEP_TRUE@@am__fastdepOBJC_FALSE@    source='qtterminal/qt_term_mac.m' object='qt_term_mac.obj' libtool=no @AMDEPBACKSLASH@
     866+@AMDEP_TRUE@@am__fastdepOBJC_FALSE@    DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     867+@am__fastdepOBJC_FALSE@        $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -c -o qt_term_mac.obj `if test -f 'qtterminal/qt_term_mac.m'; then $(CYGPATH_W) 'qtterminal/qt_term_mac.m'; else $(CYGPATH_W) '$(srcdir)/qtterminal/qt_term_mac.m'; fi`
     868 install-qtgnuplotDATA: $(qtgnuplot_DATA)
     869        @$(NORMAL_INSTALL)
     870        test -z "$(qtgnuplotdir)" || $(MKDIR_P) "$(DESTDIR)$(qtgnuplotdir)"
     871--- src/qtterminal/Makefile.in.orig
     872+++ src/qtterminal/Makefile.in
     873@@ -110,6 +110,9 @@ MAINT = @MAINT@
     874 MAKEINFO = @MAKEINFO@
     875 MKDIR_P = @MKDIR_P@
     876 MOC = @MOC@
     877+OBJC = @OBJC@
     878+OBJCDEPMODE = @OBJCDEPMODE@
     879+OBJCFLAGS = @OBJCFLAGS@
     880 OBJEXT = @OBJEXT@
     881 PACKAGE = @PACKAGE@
     882 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
     883@@ -155,6 +158,7 @@ abs_top_builddir = @abs_top_builddir@
     884 abs_top_srcdir = @abs_top_srcdir@
     885 ac_ct_CC = @ac_ct_CC@
     886 ac_ct_CXX = @ac_ct_CXX@
     887+ac_ct_OBJC = @ac_ct_OBJC@
     888 am__include = @am__include@
     889 am__leading_dot = @am__leading_dot@
     890 am__quote = @am__quote@
     891--- src/qtterminal/qt_term.cpp.orig
     892+++ src/qtterminal/qt_term.cpp
     893@@ -45,10 +45,6 @@
     894 #include <QtGui>
     895 #include <QtNetwork>
     896 
     897-#ifdef Q_WS_MAC
     898-       #include <Cocoa/Cocoa.h>
     899-#endif
     900-
     901 extern "C" {
     902        #include "plot.h"      // for interactive
     903        #include "term_api.h"  // for stdfn.h, JUSTIFY, encoding, *term definition, color.h term_interlock
     904@@ -60,6 +56,7 @@ extern "C" {
     905        #include "parse.h"     // for real_expression
     906        #include "axis.h"
     907        #include <signal.h>
     908+       double removeDockIcon();
     909 }
     910 
     911 #include "qt_term.h"
     912@@ -309,9 +306,7 @@ void qt_init()
     913 
     914 #ifdef Q_WS_MAC
     915        // Don't display this application in the MAC OS X dock
     916-       ProcessSerialNumber psn;
     917-       if (GetCurrentProcess(&psn) == noErr)
     918-               TransformProcessType(&psn, kProcessTransformToBackgroundApplication);
     919+       removeDockIcon();
     920 #endif
     921 
     922        // The creation of a QApplication mangled our locale settings
     923--- /dev/null
     924+++ src/qtterminal/qt_term_mac.m
     925@@ -0,0 +1,14 @@
     926+#include <Cocoa/Cocoa.h>
     927+
     928+void removeDockIcon()
     929+{
     930+       #ifdef __MAC_OS_X_VERSION_MIN_REQUIRED
     931+               #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
     932+                       // Don't display this application in the MAC OS X dock
     933+                       // kProcessTransformToBackgroundApplication only works on Mac OS X 10.7 and later
     934+                       ProcessSerialNumber psn;
     935+                       if (GetCurrentProcess(&psn) == noErr)
     936+                               TransformProcessType(&psn, kProcessTransformToBackgroundApplication);
     937+               #endif
     938+       #endif
     939+}
     940--- src/wxterminal/Makefile.in.orig
     941+++ src/wxterminal/Makefile.in
     942@@ -110,6 +110,9 @@ MAINT = @MAINT@
     943 MAKEINFO = @MAKEINFO@
     944 MKDIR_P = @MKDIR_P@
     945 MOC = @MOC@
     946+OBJC = @OBJC@
     947+OBJCDEPMODE = @OBJCDEPMODE@
     948+OBJCFLAGS = @OBJCFLAGS@
     949 OBJEXT = @OBJEXT@
     950 PACKAGE = @PACKAGE@
     951 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
     952@@ -155,6 +158,7 @@ abs_top_builddir = @abs_top_builddir@
     953 abs_top_srcdir = @abs_top_srcdir@
     954 ac_ct_CC = @ac_ct_CC@
     955 ac_ct_CXX = @ac_ct_CXX@
     956+ac_ct_OBJC = @ac_ct_OBJC@
     957 am__include = @am__include@
     958 am__leading_dot = @am__leading_dot@
     959 am__quote = @am__quote@
     960--- term/Makefile.in.orig
     961+++ term/Makefile.in
     962@@ -135,6 +135,9 @@ MAINT = @MAINT@
     963 MAKEINFO = @MAKEINFO@
     964 MKDIR_P = @MKDIR_P@
     965 MOC = @MOC@
     966+OBJC = @OBJC@
     967+OBJCDEPMODE = @OBJCDEPMODE@
     968+OBJCFLAGS = @OBJCFLAGS@
     969 OBJEXT = @OBJEXT@
     970 PACKAGE = @PACKAGE@
     971 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
     972@@ -180,6 +183,7 @@ abs_top_builddir = @abs_top_builddir@
     973 abs_top_srcdir = @abs_top_srcdir@
     974 ac_ct_CC = @ac_ct_CC@
     975 ac_ct_CXX = @ac_ct_CXX@
     976+ac_ct_OBJC = @ac_ct_OBJC@
     977 am__include = @am__include@
     978 am__leading_dot = @am__leading_dot@
     979 am__quote = @am__quote@
     980--- tutorial/Makefile.in.orig
     981+++ tutorial/Makefile.in
     982@@ -110,6 +110,9 @@ MAINT = @MAINT@
     983 MAKEINFO = @MAKEINFO@
     984 MKDIR_P = @MKDIR_P@
     985 MOC = @MOC@
     986+OBJC = @OBJC@
     987+OBJCDEPMODE = @OBJCDEPMODE@
     988+OBJCFLAGS = @OBJCFLAGS@
     989 OBJEXT = @OBJEXT@
     990 PACKAGE = @PACKAGE@
     991 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
     992@@ -155,6 +158,7 @@ abs_top_builddir = @abs_top_builddir@
     993 abs_top_srcdir = @abs_top_srcdir@
     994 ac_ct_CC = @ac_ct_CC@
     995 ac_ct_CXX = @ac_ct_CXX@
     996+ac_ct_OBJC = @ac_ct_OBJC@
     997 am__include = @am__include@
     998 am__leading_dot = @am__leading_dot@
     999 am__quote = @am__quote@

  • files/patch-src-variable_c.diff 

    diff --git a/files/patch-src-variable_c.diff b/files/patch-src-variable_c.diff
index eb2abce..95eae92 100644
    a b  
    1 --- src/variable.c.orig 2010-10-18 15:41:53.000000000 +0200
    2 +++ src/variable.c      2010-10-18 15:42:11.000000000 +0200
    3 @@ -244,13 +244,13 @@
     1--- src/variable.c.orig
     2+++ src/variable.c
     3@@ -250,13 +250,13 @@
    44 };
    55 #endif
    66 

  • new file files/patch-upstream-compilerwarnings.diff 

    diff --git a/files/patch-upstream-compilerwarnings.diff b/files/patch-upstream-compilerwarnings.diff
new file mode 100644
index 0000000..03b8163
    - +  
     1--- src/color.c.orig
     2+++ src/color.c
     3@@ -515,7 +515,7 @@ cbtick_callback(
     4            if (axis_array[axis].manual_justify)
     5                just = axis_array[axis].label.pos;
     6            write_multiline(x2+offsetx, y3+offsety, text,
     7-                           just, CENTRE, hrotate,
     8+                           just, JUST_CENTRE, hrotate,
     9                            axis_array[axis].ticdef.font);
     10            if (hrotate)
     11                (*term->text_angle)(0);
     12@@ -526,7 +526,7 @@ cbtick_callback(
     13            if (axis_array[axis].manual_justify)
     14                just = axis_array[axis].label.pos;         
     15            write_multiline(x3+offsetx, y2+offsety, text,
     16-                           just, CENTRE, 0.0,
     17+                           just, JUST_CENTRE, 0.0,
     18                            axis_array[axis].ticdef.font);
     19        }
     20        term_apply_lp_properties(&border_lp);   /* border linetype */
     21--- src/gplt_x11.c.orig
     22+++ src/gplt_x11.c
     23@@ -2897,22 +2897,22 @@ exec_cmd(plot_struct *plot, char *command)
     24 
     25                    case PseudoColor:
     26                        fprintf(stderr, ERROR_NOTICE("PseudoColor"));
     27-                       fprintf(stderr, display_error_text_after);
     28+                       fprintf(stderr, "%s", display_error_text_after);
     29                        break;
     30 
     31                    case GrayScale:
     32                        fprintf(stderr, ERROR_NOTICE("GrayScale"));
     33-                       fprintf(stderr, display_error_text_after);
     34+                       fprintf(stderr, "%s", display_error_text_after);
     35                        break;
     36 
     37                    case StaticColor:
     38                        fprintf(stderr, ERROR_NOTICE("StaticColor"));
     39-                       fprintf(stderr, display_error_text_after);
     40+                       fprintf(stderr, "%s", display_error_text_after);
     41                        break;
     42 
     43                    case StaticGray:
     44                        fprintf(stderr, ERROR_NOTICE("StaticGray"));
     45-                       fprintf(stderr, display_error_text_after);
     46+                       fprintf(stderr, "%s", display_error_text_after);
     47                        break;
     48 
     49                    case DirectColor:
     50--- src/graphics.c.orig
     51+++ src/graphics.c
     52@@ -1734,7 +1734,7 @@ do_plot(struct curve_points *plots, int pcount)
     53        ignore_enhanced(axis_array[FIRST_X_AXIS].label.noenhanced);
     54        apply_pm3dcolor(&(axis_array[FIRST_X_AXIS].label.textcolor), t);
     55        write_multiline(x, y, axis_array[FIRST_X_AXIS].label.text,
     56-                       JUST_CENTRE, JUST_TOP, 0,
     57+                       CENTRE, JUST_TOP, 0,
     58                        axis_array[FIRST_X_AXIS].label.font);
     59        reset_textcolor(&(axis_array[FIRST_X_AXIS].label.textcolor), t);
     60        ignore_enhanced(FALSE);
     61--- src/plot2d.c.orig
     62+++ src/plot2d.c
     63@@ -2120,7 +2120,7 @@ eval_plots()
     64 
     65                    if (this_plot->labels == NULL) {
     66                        this_plot->labels = new_text_label(-1);
     67-                       this_plot->labels->pos = JUST_CENTRE;
     68+                       this_plot->labels->pos = CENTRE;
     69                        this_plot->labels->layer = LAYER_PLOTLABELS;
     70                    }
     71                    parse_label_options(this_plot->labels);
     72@@ -2309,7 +2309,7 @@ eval_plots()
     73            if (this_plot->plot_style == LABELPOINTS) {
     74                if (this_plot->labels == NULL) {
     75                    this_plot->labels = new_text_label(-1);
     76-                   this_plot->labels->pos = JUST_CENTRE;
     77+                   this_plot->labels->pos = CENTRE;
     78                    this_plot->labels->layer = LAYER_PLOTLABELS;
     79                }
     80                this_plot->labels->place.scalex =
     81--- src/plot3d.c.orig
     82+++ src/plot3d.c
     83@@ -1555,7 +1555,7 @@ eval_3dplots()
     84                    int stored_token = c_token;
     85                    if (this_plot->labels == NULL) {
     86                        this_plot->labels = new_text_label(-1);
     87-                       this_plot->labels->pos = JUST_CENTRE;
     88+                       this_plot->labels->pos = CENTRE;
     89                        this_plot->labels->layer = LAYER_PLOTLABELS;
     90                    }
     91                    parse_label_options(this_plot->labels);

  • new file files/patch-upstream-qt.diff 

    diff --git a/files/patch-upstream-qt.diff b/files/patch-upstream-qt.diff
new file mode 100644
index 0000000..573932c
    - +  
     1--- src/qtterminal/QtGnuplotScene.cpp.orig
     2+++ src/qtterminal/QtGnuplotScene.cpp
     3@@ -56,7 +56,7 @@ QtGnuplotScene::QtGnuplotScene(QtGnuplotEventHandler* eventHandler, QObject* par
     4        m_eventHandler = eventHandler;
     5        m_lastModifierMask = 0;
     6        m_textAngle = 0.;
     7-       m_textAlignment == Qt::AlignLeft;
     8+       m_textAlignment = Qt::AlignLeft;
     9        m_currentZ = 1.;
     10        m_currentPointSize = 1.;
     11        m_enhanced = 0;
     12--- src/qtterminal/QtGnuplotWidget.cpp.orig
     13+++ src/qtterminal/QtGnuplotWidget.cpp
     14@@ -169,6 +169,15 @@ void QtGnuplotWidget::resizeEvent(QResizeEvent* event)
     15        QWidget::resizeEvent(event);
     16 }
     17 
     18+QPainter::RenderHints QtGnuplotWidget::renderHints() const
     19+{
     20+       QPainter::RenderHints hint = QPainter::TextAntialiasing;
     21+       if (m_antialias)
     22+               hint |= QPainter::Antialiasing;
     23+
     24+       return hint;
     25+}
     26+
     27 /////////////////////////////////////////////////
     28 // Slots
     29 
     30@@ -178,7 +187,7 @@ QPixmap QtGnuplotWidget::createPixmap()
     31        pixmap.fill();
     32        QPainter painter(&pixmap);
     33        painter.translate(0.5, 0.5);
     34-       painter.setRenderHint(m_antialias ? QPainter::Antialiasing : QPainter::TextAntialiasing);
     35+       painter.setRenderHints(renderHints());
     36        m_scene->render(&painter);
     37        painter.end();
     38        return pixmap;
     39@@ -195,7 +204,7 @@ void QtGnuplotWidget::print()
     40        if (QPrintDialog(&printer).exec() == QDialog::Accepted)
     41        {
     42                QPainter painter(&printer);
     43-               painter.setRenderHint(m_antialias ? QPainter::Antialiasing : QPainter::TextAntialiasing);
     44+               painter.setRenderHints(renderHints());
     45                m_scene->render(&painter);
     46        }
     47 }
     48@@ -211,8 +220,10 @@ void QtGnuplotWidget::exportToPdf()
     49        QPrinter printer;
     50        printer.setOutputFormat(QPrinter::PdfFormat);
     51        printer.setOutputFileName(fileName);
     52+       printer.setPaperSize(QSizeF(m_scene->width(), m_scene->height()), QPrinter::Point);
     53+       printer.setPageMargins(0, 0, 0, 0, QPrinter::Point);
     54        QPainter painter(&printer);
     55-       painter.setRenderHint(m_antialias ? QPainter::Antialiasing : QPainter::TextAntialiasing);
     56+       painter.setRenderHints(renderHints());
     57        m_scene->render(&painter);
     58 }
     59 
     60@@ -266,7 +277,7 @@ void QtGnuplotWidget::loadSettings()
     61 
     62 void QtGnuplotWidget::applySettings()
     63 {
     64-       m_view->setRenderHints(m_antialias ? QPainter::Antialiasing : QPainter::TextAntialiasing);
     65+       m_view->setRenderHints(renderHints());
     66        m_view->setBackgroundBrush(m_backgroundColor);
     67 }
     68 
     69--- src/qtterminal/QtGnuplotWidget.h.orig
     70+++ src/qtterminal/QtGnuplotWidget.h
     71@@ -47,6 +47,7 @@
     72 #include "QtGnuplotEvent.h"
     73 
     74 #include <QWidget>
     75+#include <QPainter>
     76 
     77 class QtGnuplotScene;
     78 class QGraphicsView;
     79@@ -93,6 +94,7 @@ private:
     80        void loadSettings();
     81        void applySettings();
     82        void saveSettings();
     83+       QPainter::RenderHints renderHints() const;
     84 
     85 private:
     86        int m_id;

  • new file files/patch-upstream-wxt-scroll.diff 

    diff --git a/files/patch-upstream-wxt-scroll.diff b/files/patch-upstream-wxt-scroll.diff
new file mode 100644
index 0000000..212b4f3
    - +  
     1--- src/wxterminal/wxt_gui.cpp.orig
     2+++ src/wxterminal/wxt_gui.cpp
     3@@ -1003,11 +1003,16 @@ void wxtPanel::OnRightUp( wxMouseEvent& event )
     4 /* mouse wheel event */
     5 void wxtPanel::OnMouseWheel( wxMouseEvent& event )
     6 {
     7-       UpdateModifiers(event);
     8+       int mouse_button;
     9 
     10-       wxt_exec_event(GE_buttonpress, 0, 0,
     11-                       event.GetWheelRotation() > 0 ? 4 : 5,
     12-                       0, this->GetId());
     13+       UpdateModifiers(event);
     14+       mouse_button = (event.GetWheelRotation() > 0 ? 4 : 5);
     15+#if wxCHECK_VERSION(2, 9, 0)
     16+       /* GetWheelAxis: 0 is the Y axis, 1 is the X axis. */
     17+       if (event.GetWheelAxis() > 0)
     18+           mouse_button += 2;
     19+#endif
     20+       wxt_exec_event(GE_buttonpress, 0, 0, mouse_button, 0, this->GetId());
     21 }
     22 
     23 /* the state of the modifiers is checked each time a key is pressed instead of