[evolution-patches] Re: gal cygwin patch

[Mike Kestner <mkestner ximian com>]

Masahiro,

Thanks for the patch.  We're in patch review mode for evolution right
now, so I'm posting your patch for our review process.  It looks okay to
me.  Obviously we need a real fix for the gal-a11y-e-cell-text.c
bandaid. I opened bug #42207 to make sure those functions get added to
e-cell-text eventually, but your #defines are okay for now.

Please hold off for 24 hours to see if anyone else has feedback before
committing.

Thanks,
Mike

On Wed, 2003-04-23 at 13:23, Masahiro Sakai wrote:
> Hi Mike,
> 
> I made a patch for compiling gal on cygwin.
> http://web.sfc.keio.ac.jp/~s01397ms/cygwin/gal-1.99.2-2.patch
> 
> The -no-undefined stuff is what we want to be using, and
> addition/re-ordering of LIBADD is good to have for several
> platforms.
> 
> May I commit this patch?
> 
> Changes:
> 
> 	* configure.in: call AC_LIBTOOL_WIN32_DLL which is necessary for
> 	building DLL on win32 platform.
> 
> 	* gal/Makefile.am: (libgal_2_0_la_LDFLAGS):
> 	* gal/a11y/Makefile.am (libgal_a11y_2_0_la_LDFLAGS): add -no-undefined
> 	which is necessary for building DLL on win32 platform.
> 
> 	* gal/a11y/e-table/gal-a11y-e-cell-text.c: stop calling undefined
> 	functions e_cell_text_get_selection() and e_cell_text_set_selection().
> 
> 	* gal/a11y/Makefile.am (libgal_a11y_2_0_la_LIBADD):
> 	add $(top_builddir)/gal/libgal-2.0.la and $(EXTRA_GNOME_LIBS).
> 
> 	* gal/Makefile.am: 
> 	(libgal_2_0_la_LIBADD): add $(EXTRA_GNOME_LIBS).
> 	(ui_subdirs): add "." ahead of "a11y". because above change make
> 	a11y/libgal-a11y-2.0.la to depend on libgal-2.0.la.
> 
> 	* gal/widgets/Makefile.am (test_color_LDADD,
> 	test_e_font_LDADD, test_font_loading_LDADD): fix ordering.
> 	$(EXTRA_GNOME_LIBS) should be behind other libraries that depend on it.
> 
> Thanks,
> 
> -- Masahiro Sakai

diff -urp gal-1.99.2.orig/configure.in gal-1.99.2/configure.in
--- gal-1.99.2.orig/configure.in	2003-03-04 16:23:41.000000000 +0900
+++ gal-1.99.2/configure.in	2003-04-24 00:07:53.000000000 +0900
@@ -44,6 +44,7 @@ AC_SUBST(GAL_AGE)
 AC_ISC_POSIX
 AC_PROG_CC
 AC_PROG_YACC
+AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 AC_PROG_INTLTOOL
 AC_STDC_HEADERS
diff -urp gal-1.99.2.orig/gal/Makefile.am gal-1.99.2/gal/Makefile.am
--- gal-1.99.2.orig/gal/Makefile.am	2003-02-05 15:03:04.000000000 +0900
+++ gal-1.99.2/gal/Makefile.am	2003-04-24 02:22:27.000000000 +0900
@@ -1,11 +1,12 @@
 nonui_subdirs = util
-ui_subdirs    = widgets e-paned e-table e-text menus shortcut-bar a11y
+ui_subdirs    = widgets e-paned e-table e-text menus shortcut-bar . a11y
 
 SUBDIRS = $(nonui_subdirs) $(ui_subdirs) 
 
 lib_LTLIBRARIES = libgal-2.0.la
 
 libgal_2_0_la_LDFLAGS = -version-info $(GAL_CURRENT):$(GAL_REVISION):$(GAL_AGE) \
+		    -no-undefined \
 		    $(ICONV_LIBS)
 libgal_2_0_la_SOURCES = bogus_automake_hack.c
 
@@ -15,4 +16,5 @@ libgal_2_0_la_LIBADD = util/libutil.la \
 		   e-table/libetable.la \
 		   e-text/libetext.la \
 		   menus/libgalmenus.la \
-		   shortcut-bar/libshortcut-bar.la
+		   shortcut-bar/libshortcut-bar.la \
+		   $(EXTRA_GNOME_LIBS)
diff -urp gal-1.99.2.orig/gal/a11y/Makefile.am gal-1.99.2/gal/a11y/Makefile.am
--- gal-1.99.2.orig/gal/a11y/Makefile.am	2003-01-09 04:16:14.000000000 +0900
+++ gal-1.99.2/gal/a11y/Makefile.am	2003-04-24 00:19:42.000000000 +0900
@@ -14,7 +14,7 @@ module_LTLIBRARIES = libgal-a11y-2.0.la
 moduledir = $(libdir)/gtk-2.0/modules
 
 libgal_a11y_2_0_la_LDFLAGS =    \
-	-rpath $(moduledir) -module -avoid-version \
+	-rpath $(moduledir) -module -avoid-version -no-undefined \
         @LDFLAGS@
 
 libgal_a11y_2_0_la_SOURCES =	\
@@ -29,4 +29,6 @@ libgal_a11y_2_0include_HEADERS =		\
 
 libgal_a11y_2_0_la_LIBADD =		\
 	e-table/libgal-a11y-etable.la	\
-	e-text/libgal-a11y-etext.la
+	e-text/libgal-a11y-etext.la	\
+	$(top_builddir)/gal/libgal-2.0.la	\
+	$(EXTRA_GNOME_LIBS)
diff -urp gal-1.99.2.orig/gal/a11y/e-table/gal-a11y-e-cell-text.c gal-1.99.2/gal/a11y/e-table/gal-a11y-e-cell-text.c
--- gal-1.99.2.orig/gal/a11y/e-table/gal-a11y-e-cell-text.c	2002-11-30 16:54:15.000000000 +0900
+++ gal-1.99.2/gal/a11y/e-table/gal-a11y-e-cell-text.c	2003-04-23 22:45:13.000000000 +0900
@@ -18,6 +18,10 @@
 static AtkObjectClass *parent_class;
 #define PARENT_TYPE (gal_a11y_e_cell_get_type ())
 
+/* XXX: these functions are undefined */
+#define e_cell_text_get_selection(a,b,c,d,e) NULL
+#define e_cell_text_set_selection(a,b,c,d,e) FALSE
+
 /* Static functions */
 static gchar *
 ect_get_text (AtkText *text,
diff -urp gal-1.99.2.orig/gal/widgets/Makefile.am gal-1.99.2/gal/widgets/Makefile.am
--- gal-1.99.2.orig/gal/widgets/Makefile.am	2003-02-05 04:16:55.000000000 +0900
+++ gal-1.99.2/gal/widgets/Makefile.am	2003-04-23 22:45:13.000000000 +0900
@@ -100,26 +100,26 @@ test_color_SOURCES = \
 	test-color.c
 
 test_color_LDADD = \
-	$(EXTRA_GNOME_LIBS) \
 	$(top_builddir)/gal/widgets/libwidgets.la \
-	$(top_builddir)/gal/util/libutil.la
+	$(top_builddir)/gal/util/libutil.la \
+	$(EXTRA_GNOME_LIBS)
 
 test_e_font_SOURCES = \
 	test-e-font.c test-e-font.h
 
 test_e_font_LDADD = \
-	$(EXTRA_GNOME_LIBS) \
 	$(top_builddir)/gal/widgets/libwidgets.la \
 	$(top_builddir)/gal/util/libutil.la \
+	$(EXTRA_GNOME_LIBS) \
 	$(ICONV_LIBS)
 
 test_font_loading_SOURCES = \
 	test-font-loading.c
 
 test_font_loading_LDADD = \
-	$(EXTRA_GNOME_LIBS) \
 	$(top_builddir)/gal/widgets/libwidgets.la \
 	$(top_builddir)/gal/util/libutil.la \
+	$(EXTRA_GNOME_LIBS) \
 	$(ICONV_LIBS)
 
 dist-hook: