GNOME.org
 

[evolution-patches] Patch to fix versioning issues in GtkHTML to handle ABI/API Stability requirements

This patch fixes the GtkHTML build environment to handle the
requirements for API/ABI stability that we need to start standing
by for gnome. Particularly, this is an issue since we want to do
the 3.2/3.4 thing, where 3.4 will just be a drop in replacement for
3.2, but with the better printing support.

-- dobey


? autom4te.cache
? stamp-h1
Index: configure.in
===================================================================
RCS file: /cvs/gnome/gtkhtml/configure.in,v
retrieving revision 1.251
diff -u -r1.251 configure.in
--- configure.in	19 Jul 2004 20:42:10 -0000	1.251
+++ configure.in	21 Jul 2004 19:02:42 -0000
@@ -5,11 +5,15 @@
 
 PACKAGE=gtkhtml
 
-GTKHTML_RELEASE=3.1
-AC_DEFINE_UNQUOTED(GTKHTML_RELEASE, "${GTKHTML_RELEASE}", [GtkHTML Release])
-AC_SUBST(GTKHTML_RELEASE)
+GTKHTML_API_VERSION=3.1
+AC_DEFINE_UNQUOTED(GTKHTML_API_VERSION, "${GTKHTML_API_VERSION}", [GtkHTML API Version])
+AC_SUBST(GTKHTML_API_VERSION)
 
-GTKHTML_RELEASE_STRING=${PACKAGE}-${GTKHTML_RELEASE}
+EDITOR_API_VERSION=3.1
+AC_DEFINE_UNQUOTED(EDITOR_API_VERSION, "${EDITOR_API_VERSION}", [Editor API Version])
+AC_SUBST(EDITOR_API_VERSION)
+
+GTKHTML_RELEASE_STRING=${PACKAGE}-${GTKHTML_API_VERSION}
 AC_DEFINE_UNQUOTED(GTKHTML_RELEASE_STRING, "${GTKHTML_RELEASE_STRING}",
 					   [GtkHTML Release String])
 AC_SUBST(GTKHTML_RELEASE_STRING)
@@ -21,11 +25,7 @@
 GNOME_EXPLICIT_TRANSLATION_DOMAIN=${GTKHTML_RELEASE_STRING}
 AC_DEFINE_UNQUOTED(GNOME_EXPLICIT_TRANSLATION_DOMAIN, "${GNOME_EXPLICIT_TRANSLATION_DOMAIN}", [Gnome Explicit Translation Domain])
 
-AM_INIT_AUTOMAKE($PACKAGE, $GTKHTML_RELEASE.18)
-
-EDITOR_API_VERSION=3.1
-AC_DEFINE_UNQUOTED(EDITOR_API_VERSION, "${EDITOR_API_VERSION}", [Editor API Version])
-AC_SUBST(EDITOR_API_VERSION)
+AM_INIT_AUTOMAKE($PACKAGE, 3.1.18)
 
 AM_MAINTAINER_MODE
 
@@ -33,7 +33,7 @@
 dnl Due to the sed scripts being split on 90 line
 dnl blocks, this macro needs to be right at the beggining.
 dnl
-AC_PROG_INTLTOOL([0.27.1])
+AC_PROG_INTLTOOL([0.30])
 
 AC_ISC_POSIX
 AC_PROG_CC
@@ -91,14 +91,6 @@
 dnl * Gnome Icon Theme
 dnl **************************************************
 PKG_CHECK_MODULES(GIT, gnome-icon-theme >= 1.2.0)
-
-dnl **********************************
-dnl Editor component
-dnl **********************************
-
-EDITOR_API_VERSION=3.1
-AC_DEFINE_UNQUOTED(EDITOR_API_VERSION, "${EDITOR_API_VERSION}")
-AC_SUBST(EDITOR_API_VERSION)
 
 dnl ******************************
 dnl shlib factory
Index: art/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtkhtml/art/Makefile.am,v
retrieving revision 1.28
diff -u -r1.28 Makefile.am
--- art/Makefile.am	21 May 2004 13:32:48 -0000	1.28
+++ art/Makefile.am	21 Jul 2004 19:02:42 -0000
@@ -1,4 +1,4 @@
-iconsdir = $(datadir)/gtkhtml- GTKHTML_RELEASE@/icons
+iconsdir = $(datadir)/gtkhtml- GTKHTML_API_VERSION@/icons
 icons_DATA = \
 	16_cut.png			\
 	24_cut.png			\
Index: capplet/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtkhtml/capplet/Makefile.am,v
retrieving revision 1.22
diff -u -r1.22 Makefile.am
--- capplet/Makefile.am	1 Nov 2002 15:06:12 -0000	1.22
+++ capplet/Makefile.am	21 Jul 2004 19:02:42 -0000
@@ -1,4 +1,4 @@
-gladedir = $(datadir)/gtkhtml- GTKHTML_RELEASE@
+gladedir = $(datadir)/gtkhtml- GTKHTML_API_VERSION@
 glade_DATA = gtkhtml-capplet.glade
 
 INCLUDES =					\
@@ -19,8 +19,8 @@
 
 LDADD = 					\
 	$(CAPPLET_LIBS)				\
-	$(top_builddir)/src/libgtkhtml- GTKHTML_RELEASE@.la	\
-	$(top_builddir)/a11y/libgtkhtml-a11y- GTKHTML_RELEASE@.la
+	$(top_builddir)/src/libgtkhtml- GTKHTML_API_VERSION@.la	\
+	$(top_builddir)/a11y/libgtkhtml-a11y- GTKHTML_API_VERSION@.la
 
 @INTLTOOL_DESKTOP_RULE@
 
Index: capplet/main.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/capplet/main.c,v
retrieving revision 1.26
diff -u -r1.26 main.c
--- capplet/main.c	1 Nov 2002 15:06:12 -0000	1.26
+++ capplet/main.c	21 Jul 2004 19:02:42 -0000
@@ -265,7 +265,7 @@
 	g_signal_connect (button_cfg_spell, "clicked", G_CALLBACK (cfg_spell), NULL);
 
 #define LOAD(x) \
-	base = g_strconcat ("gtkhtml-" GTKHTML_RELEASE  "/keybindingsrc.", x, NULL); \
+	base = g_strconcat (GTKHTML_RELEASE_STRING  "/keybindingsrc.", x, NULL); \
 	rcfile = gnome_unconditional_datadir_file (base); \
         gtk_rc_parse (rcfile); \
         g_free (base); \
Index: components/html-editor/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/Makefile.am,v
retrieving revision 1.97
diff -u -r1.97 Makefile.am
--- components/html-editor/Makefile.am	12 Mar 2004 20:16:58 -0000	1.97
+++ components/html-editor/Makefile.am	21 Jul 2004 19:02:42 -0000
@@ -1,6 +1,6 @@
 # Basic setup
 
-gtkhtml_data = $(datadir)/gtkhtml- GTKHTML_RELEASE@
+gtkhtml_data = $(datadir)/gtkhtml- GTKHTML_API_VERSION@
 
 gladedir = $(gtkhtml_data)
 glade_DATA = gtkhtml-editor-properties.glade
@@ -53,7 +53,7 @@
 
 
 LDADD =	\
-	$(top_builddir)/src/libgtkhtml- GTKHTML_RELEASE@.la	\
+	$(top_builddir)/src/libgtkhtml- GTKHTML_API_VERSION@.la	\
 	$(EDITOR_LIBS)
 
 # -lpspell-modules -lpspell_aspell -laspell -lpspell -lstdc++
Index: src/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/Makefile.am,v
retrieving revision 1.147
diff -u -r1.147 Makefile.am
--- src/Makefile.am	7 Jun 2004 18:07:15 -0000	1.147
+++ src/Makefile.am	21 Jul 2004 19:02:42 -0000
@@ -11,7 +11,7 @@
 	-DPREFIX=\"$(prefix)\"
 
 AM_CFLAGS = 								\
-	-DICONDIR=\"$(datadir)/gtkhtml- GTKHTML_RELEASE@/icons\"	\
+	-DICONDIR=\"$(datadir)/gtkhtml- GTKHTML_API_VERSION@/icons\"	\
 	-DGDK_DISABLE_DEPRECATED=1					\
 	-DG_DISABLE_DEPRECATED=1					\
 	-DGNOME_DISABLE_DEPRECATED=1
@@ -19,7 +19,7 @@
 
 lib_LTLIBRARIES = libgtkhtml-3.1.la
 
-libgtkhtmldir = $(includedir)/libgtkhtml- GTKHTML_RELEASE@/gtkhtml
+libgtkhtmldir = $(includedir)/libgtkhtml- GTKHTML_API_VERSION@/gtkhtml
 
 # FIXME not all the stuff should be installed!
 
@@ -209,20 +209,20 @@
 	htmlurl.c
 #testgtkhtml_LDFLAGS = -static
 testgtkhtml_LDADD =					\
-	libgtkhtml- GTKHTML_RELEASE@.la			\
+	libgtkhtml- GTKHTML_API_VERSION@.la			\
 	$(SOUP_LIBS)
 
 gtest_SOURCES = \
 	test.c
 gtest_LDFLAGS =
 gtest_LDADD =	\
-	libgtkhtml- GTKHTML_RELEASE@.la
+	libgtkhtml- GTKHTML_API_VERSION@.la
 
 pkgconfig_in_files = libgtkhtml.pc.in
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = $(pkgconfig_in_files:.pc.in=.pc)
 
-keybindingsdir = $(datadir)/gtkhtml- GTKHTML_RELEASE@
+keybindingsdir = $(datadir)/gtkhtml- GTKHTML_API_VERSION@
 keybindings_DATA =		\
 	keybindingsrc.emacs
 
@@ -232,10 +232,10 @@
 	$(NULL)
 
 install-data-hook:
-	mv $(DESTDIR)$(libdir)/pkgconfig/libgtkhtml.pc $(DESTDIR)$(libdir)/pkgconfig/libgtkhtml- GTKHTML_RELEASE@.pc
+	mv $(DESTDIR)$(libdir)/pkgconfig/libgtkhtml.pc $(DESTDIR)$(libdir)/pkgconfig/libgtkhtml- GTKHTML_API_VERSION@.pc
 
 uninstall-hook:
-	rm -f $(DESTDIR)$(libdir)/pkgconfig/libgtkhtml- GTKHTML_RELEASE@.pc	
+	rm -f $(DESTDIR)$(libdir)/pkgconfig/libgtkhtml- GTKHTML_API_VERSION@.pc	
 
 htmlmarshal.h:	htmlclosures.list
 	glib-genmarshal --header --prefix=html_g_cclosure_marshal $< > $@
Index: src/gtkhtml.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/gtkhtml.c,v
retrieving revision 1.571
diff -u -r1.571 gtkhtml.c
--- src/gtkhtml.c	21 Jun 2004 16:38:54 -0000	1.571
+++ src/gtkhtml.c	21 Jul 2004 19:02:43 -0000
@@ -2917,7 +2917,7 @@
 	add_bindings (klass);
 	gtk_html_accessibility_init ();
 
-	gtk_rc_parse (PREFIX "/share/gtkhtml-" GTKHTML_RELEASE "/keybindingsrc.emacs");
+	gtk_rc_parse (PREFIX "/share/" GTKHTML_RELEASE_STRING "/keybindingsrc.emacs");
 	html_class->emacs_bindings = gtk_binding_set_find ("gtkhtml-bindings-emacs");
 	read_key_theme (html_class);
 	gconf_client_notify_add (gconf_client_get_default (), "/desktop/gnome/interface/gtk_key_theme",
Index: src/libgtkhtml.pc.in
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/libgtkhtml.pc.in,v
retrieving revision 1.5
diff -u -r1.5 libgtkhtml.pc.in
--- src/libgtkhtml.pc.in	22 Sep 2003 21:46:00 -0000	1.5
+++ src/libgtkhtml.pc.in	21 Jul 2004 19:02:43 -0000
@@ -2,11 +2,11 @@
 exec_prefix= exec_prefix@
 libdir= libdir@
 includedir= includedir@
-gtkhtml_datadir= datadir@/gtkhtml- GTKHTML_RELEASE@
+gtkhtml_datadir= datadir@/gtkhtml- GTKHTML_API_VERSION@
 
 Name: libgtkhtml
 Description: libgtkhtml
 Requires: @GTKHTML_MODULES@
 Version: @VERSION@
-Libs: -L${libdir} -lgtkhtml- GTKHTML_RELEASE@
-Cflags: -I${includedir}/libgtkhtml- GTKHTML_RELEASE@
+Libs: -L${libdir} -lgtkhtml- GTKHTML_API_VERSION@
+Cflags: -I${includedir}/libgtkhtml- GTKHTML_API_VERSION@
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]