Ticket #17618: qalculate-gtk-0.9.6_macports.patch

File qalculate-gtk-0.9.6_macports.patch, 1.6 KB (added by jjstickel@…, 16 years ago)

math/qalculate-gtk/files/qalculate-gtk-0.9.6_macports.patch

  • qalculate-gtk-0.9.

    diff -ur qalculate-gtk-0.9.6/configure.in qalculate-gtk-0.9.6_patched/configure.in
    old new  
    6363
    6464AC_LANG([C++])
    6565
    66 AC_PATH_CLN(1.1.0, [
    67         LIBS="$LIBS $CLN_LIBS"
    68         CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS"
    69         AC_DEFINE(HAVE_LIBCLN,1,[If CLN can be used])
    70 ], AC_MSG_ERROR([No suitable installed version of CLN could be found.]))
    71 
    7266PKG_CHECK_MODULES(GLIB, [
    7367        glib-2.0 >= 2.4
    7468        libxml-2.0
     
    9589AC_SUBST(QALCULATE_CFLAGS)
    9690AC_SUBST(QALCULATE_LIBS)
    9791
     92PKG_CHECK_MODULES(CLN, [ cln >= 1.2 ],
     93                  [have_recent_cln=yes], [have_recent_cln=no])
     94AC_SUBST(CLN_CPPFLAGS)
     95AC_SUBST(CLN_LIBS)
     96
     97if test "$have_recent_cln" = "yes" ; then
     98   AC_DEFINE(HAVE_LIBCLN12, 1, [Define if CLN can be used])
     99   LIBS="$LIBS $CLN_LIBS"
     100   CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS"
     101fi
     102
    98103LIBGNOME_REQUIRED=2.0.0
    99104
    100105USE_LIBGNOME="auto"
  • qalculate-gtk-0.9.

    diff -ur qalculate-gtk-0.9.6/src/main.cc qalculate-gtk-0.9.6_patched/src/main.cc
    old new  
    9292                g_free(icon);
    9393        }
    9494       
     95        gtk_init(&argc, &argv);
     96
    9597        g_object_get(G_OBJECT(program), GNOME_PARAM_POPT_CONTEXT, &pctx, NULL);
    9698
    97         gtk_init(&argc, &argv);
    9899
    99100#else
    100101
    101         gtk_window_set_default_icon_from_file(PACKAGE_DATA_DIR "/pixmaps/qalculate.png", NULL);
    102102
    103103        gtk_init(&argc, &argv);
    104104
     105        gtk_window_set_default_icon_from_file(PACKAGE_DATA_DIR "/pixmaps/qalculate.png", NULL);
     106
    105107#endif
    106108
    107109        glade_init();