GNOME.org
 

[dia/zbrown/remove-libgnome: 3/3] Update build to remove libgnome dep

commit 0c104e68e150ab4c146b2e0b7433e337ca0f5940
Author: Zander Brown <zbrown gnome org>
Date:   Thu Dec 6 00:29:14 2018 +0000

    Update build to remove libgnome dep

 NEWS                             |  5 +++++
 app/app_procs.c                  |  8 --------
 app/recent_files.c               |  5 -----
 app/sheets.h                     |  4 ----
 app/sheets_dialog_callbacks.h    |  4 ----
 configure.ac                     | 34 ++++------------------------------
 doc/Makefile.am                  |  4 ----
 hardcopies.make                  | 15 ---------------
 lib/Makefile.am                  |  2 +-
 objects/AADL/Makefile.am         |  2 +-
 objects/ER/Makefile.am           |  2 +-
 objects/UML/Makefile.am          |  2 +-
 objects/chronogram/Makefile.am   |  2 +-
 objects/custom/Makefile.am       |  2 +-
 objects/custom_lines/Makefile.am |  2 +-
 plug-ins/pixbuf/Makefile.am      |  2 +-
 plug-ins/vdx/Makefile.am         |  2 +-
 plug-ins/xfig/Makefile.am        |  2 +-
 plug-ins/xslt/Makefile.am        |  2 +-
 xmldocs.make                     |  5 -----
 20 files changed, 20 insertions(+), 86 deletions(-)
---
diff --git a/NEWS b/NEWS
index d292ea19..0d0522f0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+
+  * Removal of libgnome dependency
+
+  -------
+
   * overhaul of the renderer infrastructure
     The renderer interface now allows to transport fill and stroke color
     in one step. All export formats supporting both colors with one object
diff --git a/app/app_procs.c b/app/app_procs.c
index a55692e3..dfd84e9c 100644
--- a/app/app_procs.c
+++ b/app/app_procs.c
@@ -460,14 +460,6 @@ dump_dependencies(void)
   g_print ("gtk+    : %d.%d.%d (%d.%d.%d)\n",
            gtk_major_version, gtk_minor_version, gtk_micro_version,
            GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
-
-#if 0
-  /* we could read $PREFIX/share/gnome-about/gnome-version.xml 
-   * but is it worth the effort ? */
-  g_print ("gnome   : %d.%d.%d (%d.%d.%d)\n"
-           gnome_major_version, gnome_minor_version, gnome_micro_version,
-           GNOME_MAJOR_VERSION, GNOME_MINOR_VERSION, GNOME_MICRO_VERSION);
-#endif
 }
 
 gboolean
diff --git a/app/recent_files.c b/app/recent_files.c
index feb0da70..d8a5e0cd 100644
--- a/app/recent_files.c
+++ b/app/recent_files.c
@@ -23,12 +23,7 @@
 #include <config.h>
 #endif
 
-#ifdef GNOME
-#undef GTK_DISABLE_DEPRECATED /* gnome */
-#include <gnome.h>
-#else
 #include <gdk/gdkkeysyms.h>
-#endif
 
 #include <glib.h>
 #include <gtk/gtk.h>
diff --git a/app/sheets.h b/app/sheets.h
index ebaf233d..6d6d4817 100644
--- a/app/sheets.h
+++ b/app/sheets.h
@@ -22,11 +22,7 @@
 
 #ifndef SHEETS_H
 
-#ifdef GNOME
-#include <gnome.h>
-#else
 #include <gtk/gtk.h>
-#endif
 
 #include "../lib/sheet.h"
 
diff --git a/app/sheets_dialog_callbacks.h b/app/sheets_dialog_callbacks.h
index 7ea2e2d1..948f3c18 100644
--- a/app/sheets_dialog_callbacks.h
+++ b/app/sheets_dialog_callbacks.h
@@ -20,11 +20,7 @@
  *
  */
 
-#ifdef GNOME
-#include <gnome.h>
-#else
 #include <gtk/gtk.h>
-#endif
 
 gboolean
 on_sheets_main_dialog_delete_event     (GtkWidget       *widget,
diff --git a/configure.ac b/configure.ac
index 7f062c65..c99fc3f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -116,21 +116,6 @@ if test "$have_poppler" = "yes" ; then
 fi
 AM_CONDITIONAL(HAVE_POPPLER, test "x$have_poppler" != "xno")
 
-AC_MSG_CHECKING([whether GNOME specific code should be used])
-AC_ARG_ENABLE(gnome,
-             AC_HELP_STRING([--enable-gnome],[enable gnome code]),,
-              enable_gnome=no)
-if test x"$enable_gnome" = "xyes" ; then
-    GTK_MODULES="$GTK_MODULES libgnome-2.0 libgnomeui-2.0"
-    AC_DEFINE(HAVE_GNOME,1,[Define if building with GNOME support])
-    AC_DEFINE_UNQUOTED(GNOME_ICONDIR, "${prefix}/share/pixmaps", [GNOME icon directory])
-    have_gnome=yes
-else
-    have_gnome=no
-fi
-AM_CONDITIONAL(HAVE_GNOME, [test "x$have_gnome" != "xno"])
-AC_MSG_RESULT($GNOME)
-
 dnl GTK2:     libgnomecanvas-2.0 ?
 
 PKG_CHECK_MODULES(GTK,$GTK_MODULES)
@@ -394,16 +379,6 @@ if test $found_libxml = false; then
       found_libxml=true
       XML_LIBS="`$XML2_CONFIG --libs`"
       XML_CFLAGS="`$XML2_CONFIG --cflags`"
-
-      if test "$enable_gnome_print" = "yes"; then
-          gnome-config --cflags print | \
-          grep gnome-xml 2>&1 >/dev/null && \
-          AC_MSG_ERROR(libxml2 found but gnome-print uses libxml1 ; this is a conflict.\nPlease do either 
provide libxml1 or disable gnome-print.)
-      fi
-      echo $GNOME_CFLAGS | \
-      grep gnome-xml 2>&1 >/dev/null && \
-      AC_MSG_ERROR(libxml2 found but one GNOME component uses libxml1 ; this is a conflict.\nPlease do 
either provide libxml1 or disable the offending GNOME component.)
-        
     else
       AC_MSG_RESULT(not found)
     fi
@@ -754,11 +729,10 @@ Configuration:
        Compiler:               ${CC}
        can C++:                ${cxx_ok}
 
-       Gnome support:                           ${have_gnome}
-       Python support:                          ${with_python}
-       Libart support (PNG export):             ${have_libart}
-       Cairo support (PNG, PDF, print):         ${with_cairo}
-       Dia Python bindings with SWIG            ${with_swig}
+       Python support:                          ${with_python}
+       Libart support (PNG export):             ${have_libart}
+       Cairo support (PNG, PDF, print):         ${with_cairo}
+       Dia Python bindings with SWIG            ${with_swig}
        PDF import with poppler (experimental)   ${have_poppler}
        WMF plug-in with libEMF:                 ${emf_ok}
        Layout plug-in with OGDF:                ${ogdf_ok}
diff --git a/doc/Makefile.am b/doc/Makefile.am
index d1b0bf24..72e0d64c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -8,11 +8,7 @@ EXTRA_DIST = \
        shape.dtd \
        sheet.dtd
 
-if HAVE_GNOME
-helpdir = $(datadir)/gnome/help/$(docname)
-else
 helpdir = $(pkgdatadir)/help
-endif
 
 sysdoc = $(DESTDIR)$(docdir)
 
diff --git a/hardcopies.make b/hardcopies.make
index 114f134f..77151ec6 100644
--- a/hardcopies.make
+++ b/hardcopies.make
@@ -42,20 +42,6 @@ psdoc = $(progname).ps
 ps_install = install-ps
 endif
 
-if HAVE_GNOME
-all: omf $(htmldoc) $(pdfdoc) $(psdoc)
-
-install-data-local: install-data-xml \
-       $(html_install) $(pdf_install) $(ps_install) install-examples
-
-uninstall-local: uninstall-local-xml  \
-       $(html_install) uninstall-pdf uninstall-ps uninstall-examples
-
-clean-local: clean-local-xml \
-       clean-html clean-ps clean-pdf
-
-else
- 
 if HAVE_XSLTPROC
 all: $(htmldoc) $(pdfdoc) $(psdoc)
 
@@ -74,7 +60,6 @@ endif
 
 clean-local: clean-local-xml \
        clean-html clean-ps clean-pdf
-endif
 
 $(progname)_html: $(progname).xml $(xml_files) $(htmlstyle) $(pngfigures)
        $(mkinstalldirs) $(srcdir)/$(progname)_html
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 17ee9873..48bfccc7 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -243,7 +243,7 @@ AM_CPPFLAGS = \
 sheetdir = $(pkgdatadir)/sheets
 
 AM_CPPFLAGS += -I$(top_srcdir)/intl $(DEBUG_FLAGS) $(GDK_PIXBUF_CFLAGS) \
-  $(XML_CFLAGS) $(GNOME_CFLAGS) $(GTK_CFLAGS) \
+  $(XML_CFLAGS) $(GTK_CFLAGS) \
   -DDIA_SHEETDIR=\"$(sheetdir)\" \
   $(PANGOFT2_CFLAGS) $(LIBART_CFLAGS) $(UNICODE_CFLAGS)
 
diff --git a/objects/AADL/Makefile.am b/objects/AADL/Makefile.am
index 608eff2f..10e0dcdc 100755
--- a/objects/AADL/Makefile.am
+++ b/objects/AADL/Makefile.am
@@ -26,7 +26,7 @@ libaadl_objects_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFIN
 libaadl_objects_la_LIBADD = $(top_builddir)/lib/libdia.la
 
 AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
-       $(DEBUG_FLAGS) $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
+       $(DEBUG_FLAGS) $(GTK_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST =   pixmaps/aadlbus.xpm                \
                pixmaps/aadldata.xpm              \
diff --git a/objects/ER/Makefile.am b/objects/ER/Makefile.am
index db72211c..5bea06e6 100644
--- a/objects/ER/Makefile.am
+++ b/objects/ER/Makefile.am
@@ -13,7 +13,7 @@ liber_objects_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED
 liber_objects_la_LIBADD = $(top_builddir)/lib/libdia.la
 
 AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
-       $(DEBUG_FLAGS) $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
+       $(DEBUG_FLAGS) $(GTK_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST = \
        pixmaps/attribute.xpm \
diff --git a/objects/UML/Makefile.am b/objects/UML/Makefile.am
index 2e2533aa..1ea8e5e0 100644
--- a/objects/UML/Makefile.am
+++ b/objects/UML/Makefile.am
@@ -46,7 +46,7 @@ libuml_objects_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINE
 libuml_objects_la_LIBADD = $(CAIRO_LIBS) $(top_builddir)/lib/libdia.la
 
 AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
-       $(DEBUG_FLAGS) $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
+       $(DEBUG_FLAGS) $(GTK_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST = \
        pixmaps/actor.xpm \
diff --git a/objects/chronogram/Makefile.am b/objects/chronogram/Makefile.am
index b2174d4d..ebe8799e 100644
--- a/objects/chronogram/Makefile.am
+++ b/objects/chronogram/Makefile.am
@@ -15,7 +15,7 @@ libchronogram_objects_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_U
 libchronogram_objects_la_LIBADD = $(top_builddir)/lib/libdia.la
 
 AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
-       $(DEBUG_FLAGS) $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
+       $(DEBUG_FLAGS) $(GTK_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST = \
        pixmaps/chronoref.xpm \
diff --git a/objects/custom/Makefile.am b/objects/custom/Makefile.am
index 48847593..f2bd9901 100644
--- a/objects/custom/Makefile.am
+++ b/objects/custom/Makefile.am
@@ -19,7 +19,7 @@ shapedir = $(pkgdatadir)/shapes
 
 # add -DDEBUG_CUSTOM here to get extra debugging info.
 AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(top_srcdir)/lib $(DEBUG_FLAGS) $(GTK_CFLAGS) \
-       $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(XML_CFLAGS) $(UNICODE_CFLAGS) \
+       $(PANGOFT2_CFLAGS) $(XML_CFLAGS) $(UNICODE_CFLAGS) \
        -DDIA_SHAPEDIR=\""$(shapedir)"\"
 
 EXTRA_DIST = \
diff --git a/objects/custom_lines/Makefile.am b/objects/custom_lines/Makefile.am
index 14b07cf3..8523d516 100644
--- a/objects/custom_lines/Makefile.am
+++ b/objects/custom_lines/Makefile.am
@@ -14,7 +14,7 @@ libcustom_lines_objects_la_LIBADD = $(top_builddir)/lib/libdia.la
 
 AM_CPPFLAGS = \
        -I$(srcdir)/../../lib \
-       $(DEBUG_FLAGS) $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
+       $(DEBUG_FLAGS) $(GTK_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST = \
        pixmaps/default.xpm 
diff --git a/plug-ins/pixbuf/Makefile.am b/plug-ins/pixbuf/Makefile.am
index 279ba27c..6c250eb1 100644
--- a/plug-ins/pixbuf/Makefile.am
+++ b/plug-ins/pixbuf/Makefile.am
@@ -9,4 +9,4 @@ libpixbuf_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFI
 
 libpixbuf_filter_la_LIBADD = $(top_builddir)/lib/libdia.la
 
-AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(DEBUG_FLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(DEBUG_FLAGS)
diff --git a/plug-ins/vdx/Makefile.am b/plug-ins/vdx/Makefile.am
index e4d8ec57..963ac283 100644
--- a/plug-ins/vdx/Makefile.am
+++ b/plug-ins/vdx/Makefile.am
@@ -15,4 +15,4 @@ libvdx_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED
 
 libvdx_filter_la_LIBADD = $(top_builddir)/lib/libdia.la
 
-AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) 
$(XML_CFLAGS) $(UNICODE_CFLAGS) $(DEBUG_FLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(PANGOFT2_CFLAGS) $(XML_CFLAGS) 
$(UNICODE_CFLAGS) $(DEBUG_FLAGS)
diff --git a/plug-ins/xfig/Makefile.am b/plug-ins/xfig/Makefile.am
index ee6e92b5..be9af982 100644
--- a/plug-ins/xfig/Makefile.am
+++ b/plug-ins/xfig/Makefile.am
@@ -13,4 +13,4 @@ libxfig_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINE
 
 libxfig_filter_la_LIBADD = $(top_builddir)/lib/libdia.la
 
-AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) 
$(XML_CFLAGS) $(UNICODE_CFLAGS) $(DEBUG_FLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(PANGOFT2_CFLAGS) $(XML_CFLAGS) 
$(UNICODE_CFLAGS) $(DEBUG_FLAGS)
diff --git a/plug-ins/xslt/Makefile.am b/plug-ins/xslt/Makefile.am
index 2fd38966..344d2071 100644
--- a/plug-ins/xslt/Makefile.am
+++ b/plug-ins/xslt/Makefile.am
@@ -25,7 +25,7 @@ libxslt_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINE
 
 libxslt_filter_la_LIBADD = $(XSLT_LIBS) $(top_builddir)/lib/libdia.la
 
-AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) 
$(XML_CFLAGS) $(UNICODE_CFLAGS) $(DEBUG_FLAGS) $(XSLT_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(PANGOFT2_CFLAGS) $(XML_CFLAGS) 
$(UNICODE_CFLAGS) $(DEBUG_FLAGS) $(XSLT_CFLAGS)
 
 if !HAVE_XSLT  
 # Prevent installation
diff --git a/xmldocs.make b/xmldocs.make
index caa54ff6..0225ac04 100644
--- a/xmldocs.make
+++ b/xmldocs.make
@@ -36,13 +36,8 @@
 # **********  Begin of section some packagers may need to modify  **********
 # This variable (helpdocdir) specifies where the documents should be installed.
 # This default value should work for most packages.
-if HAVE_GNOME
-helpdocdir = $(datadir)/gnome/help/$(docname)/$(lang)
-install-data-hook: install-data-hook-omf
-else
 helpdocdir = $(datadir)/$(docname)/help/$(lang)
 install-data-hook:
-endif
 
 # **********  You should not have to edit below this line  **********
 xml_files = $(entities) $(docname).xml
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]