--- graphviz-2.20.3/configure.ac.gnomeui 2008-10-07 20:40:07.000000000 +0200
+++ graphviz-2.20.3/configure.ac 2008-12-24 16:33:45.000000000 +0100
@@ -2095,28 +2095,6 @@
AM_CONDITIONAL(WITH_GLADE, [test "x$use_glade" = "xYes"])
dnl -----------------------------------
-dnl INCLUDES and LIBS for GNOMEUI.
-
-AC_ARG_WITH(gnomeui,
- [AC_HELP_STRING([--with-gnomeui=yes], [gnomeui library])],
- [], [with_gnomeui=yes])
-
-if test "x$with_gnomeui" != "xyes"; then
- use_gnomeui="No (disabled)"
-else
- PKG_CHECK_MODULES(GNOMEUI, [libgnomeui-2.0],[
- use_gnomeui="Yes"
- AC_DEFINE_UNQUOTED(HAVE_GNOMEUI,1,
- [Define if you have the gnomeui library])
- AC_SUBST(GNOMEUI_CFLAGS)
- AC_SUBST(GNOMEUI_LIBS)
- ],[
- use_gnomeui="No (gnomeui library not available)"
- ])
-fi
-AM_CONDITIONAL(WITH_GNOMEUI, [test "x$use_gnomeui" = "xYes"])
-
-dnl -----------------------------------
dnl INCLUDES and LIBS for GETTEXT.
GETTEXT_PACKAGE=glade-2.0
--- graphviz-2.20.3/graphviz.spec.in.gnomeui 2008-10-07 20:40:07.000000000 +0200
+++ graphviz-2.20.3/graphviz.spec.in 2008-12-24 16:33:45.000000000 +0100
@@ -88,7 +88,7 @@
%define PANGOCAIRO 1
%define RSVG 1
BuildRequires: libtool-ltdl libtool-ltdl-devel libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel java-devel
-BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel gtk2-devel libgnomeui-devel
+BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel gtk2-devel
BuildRequires: librsvg2-devel
%endif
%if %rhel >= 6
@@ -130,7 +130,7 @@
%define RSVG 1
%define SFDP 1
BuildRequires: libtool-ltdl libtool-ltdl-devel libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel java-devel
-BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel gtk2-devel libgnomeui-devel
+BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel gtk2-devel
BuildRequires: librsvg2-devel
%endif
%if %att_rhel >= 6
@@ -179,7 +179,7 @@
%define LUA 1
%define PANGOCAIRO 1
%define RSVG 1
-BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel lua-devel gtk2-devel libgnomeui-devel
+BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel lua-devel gtk2-devel
BuildRequires: librsvg2-devel
%endif
%if %fedora >= 7
@@ -241,7 +241,7 @@
%define LUA 1
%define PANGOCAIRO 1
%define RSVG 1
-BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel lua-devel gtk2-devel libgnomeui-devel
+BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel lua-devel gtk2-devel
BuildRequires: librsvg2-devel
%endif
%if %att_fedora >= 7
--- graphviz-2.20.3/plugin/glitz/gvdevice_glitz.c.gnomeui 2008-03-11 19:55:46.000000000 +0100
+++ graphviz-2.20.3/plugin/glitz/gvdevice_glitz.c 2008-12-24 16:33:45.000000000 +0100
@@ -71,20 +71,8 @@
#include <X11/extensions/Xrender.h>
#endif
-/* Don't load up the glitz plugin with all that gnome stuff */
-/* - OTOH now we are dependent on a firefox installation */
-/* */
-/* This undef must follow gvplugin_device.h because */
-/* config.h is reincluded via: */
-/* types.h->cdt.h->ast_common.h */
-/* FIXME */
-#undef HAVE_GNOMEUI
#define BROWSER "firefox"
-#ifdef HAVE_GNOMEUI
-#include <libgnome/libgnome.h>
-#endif
-
typedef struct window_glitz_s {
Window win;
unsigned long event_mask;
@@ -180,9 +168,6 @@
static void browser_show(GVJ_t *job)
{
-#ifdef HAVE_GNOMEUI
- gnome_url_show(job->selected_href, NULL);
-#else
#if defined HAVE_SYS_TYPES_H && defined HAVE_UNISTD_H && defined HAVE_ERRNO_H
char *exec_argv[3] = {BROWSER, NULL, NULL};
pid_t pid;
@@ -201,7 +186,6 @@
#else
fprintf(stdout,"browser_show: %s\n", job->selected_href);
#endif
-#endif
}
static int handle_glitz_events (GVJ_t *firstjob, Display *dpy)
--- graphviz-2.20.3/plugin/gtk/Makefile.am.gnomeui 2008-05-21 22:37:40.000000000 +0200
+++ graphviz-2.20.3/plugin/gtk/Makefile.am 2008-12-24 16:33:45.000000000 +0100
@@ -8,7 +8,7 @@
-I$(top_srcdir)/lib/gvc \
-I$(top_srcdir)/lib/graph \
-I$(top_srcdir)/lib/cdt \
- $(GTK_CFLAGS) $(GNOMEUI_CFLAGS)
+ $(GTK_CFLAGS)
if WITH_PANGOCAIRO
if WITH_GTK
@@ -31,7 +31,7 @@
libgvplugin_gtk_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
libgvplugin_gtk_la_SOURCES = $(libgvplugin_gtk_C_la_SOURCES)
-libgvplugin_gtk_la_LIBADD = $(GTK_LIBS) $(GNOMEUI_LIBS)
+libgvplugin_gtk_la_LIBADD = $(GTK_LIBS)
if WITH_WIN32
libgvplugin_gtk_la_LDFLAGS += -no-undefined
--- graphviz-2.20.3/plugin/xlib/gvdevice_xlib.c.gnomeui 2007-11-05 20:11:53.000000000 +0100
+++ graphviz-2.20.3/plugin/xlib/gvdevice_xlib.c 2008-12-24 16:33:45.000000000 +0100
@@ -55,20 +55,8 @@
#include <X11/Xutil.h>
#include <X11/extensions/Xrender.h>
-/* Don't load up the xlib plugin with all that gnome stuff */
-/* - OTOH now we are dependent on a firefox installation */
-/* */
-/* This undef must follow gvplugin_device.h because */
-/* config.h is reincluded via: */
-/* types.h->cdt.h->ast_common.h */
-/* FIXME */
-#undef HAVE_GNOMEUI
#define BROWSER "firefox"
-#ifdef HAVE_GNOMEUI
-#include <libgnome/libgnome.h>
-#endif
-
typedef struct window_xlib_s {
Window win;
unsigned long event_mask;
@@ -164,9 +152,6 @@
static void browser_show(GVJ_t *job)
{
-#ifdef HAVE_GNOMEUI
- gnome_url_show(job->selected_href, NULL);
-#else
#if defined HAVE_SYS_TYPES_H && defined HAVE_UNISTD_H && defined HAVE_ERRNO_H
char *exec_argv[3] = {BROWSER, NULL, NULL};
pid_t pid;
@@ -185,7 +170,6 @@
#else
fprintf(stdout,"browser_show: %s\n", job->selected_href);
#endif
-#endif
}
static int handle_xlib_events (GVJ_t *firstjob, Display *dpy)
