GNOME.org
 

[evolution-patches] resend of branching patches

trying again in 1.4

-- 
Mike Kestner <mkestner ximian com>

Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution/configure.in,v
retrieving revision 1.599
diff -u -p -r1.599 configure.in
--- configure.in	1 Aug 2003 21:09:39 -0000	1.599
+++ configure.in	12 Aug 2003 19:16:42 -0000
@@ -1064,7 +1064,7 @@ AC_DEFUN(EVO_SET_COMPILE_FLAGS, [
 
 dnl --- Required version numbers
 
-GAL_REQUIRED=1.99.8
+GAL_REQUIRED=2.1.0
 GTKHTML_REQUIRED=3.1.0
 
 AC_SUBST(GAL_REQUIRED)
@@ -1072,7 +1072,7 @@ AC_SUBST(GTKHTML_REQUIRED)
 
 dnl --- Flags to get all the GNOME stuff
 
-FULL_GNOME_DEPS="libbonoboui-2.0 gnome-vfs-2.0 libgnomeui-2.0 libglade-2.0 libgnomecanvas-2.0 libxml-2.0 gconf-2.0 gal-2.0 >= $GAL_REQUIRED"
+FULL_GNOME_DEPS="libbonoboui-2.0 gnome-vfs-2.0 libgnomeui-2.0 libglade-2.0 libgnomecanvas-2.0 libxml-2.0 gconf-2.0 gal-2.2 >= $GAL_REQUIRED"
 
 EVO_SET_COMPILE_FLAGS(GNOME_FULL, $FULL_GNOME_DEPS)
 AC_SUBST(GNOME_FULL_CFLAGS)
@@ -1085,17 +1085,17 @@ CPPFLAGS="$CPPFLAGS_save"
 
 dnl --- Flags for the various libraries we build
 
-EVO_SET_COMPILE_FLAGS(CAMEL, glib-2.0 gthread-2.0 gal-2.0 >= $GAL_REQUIRED $mozilla_nss,
+EVO_SET_COMPILE_FLAGS(CAMEL, glib-2.0 gthread-2.0 gal-2.2 >= $GAL_REQUIRED $mozilla_nss,
 		      $THREADS_CFLAGS $KRB4_CFLAGS $KRB5_CFLAGS $MANUAL_NSS_CFLAGS $OPENSSL_CFLAGS,
 	              $THREADS_LIBS $KRB4_LDFLAGS $KRB5_LDFLAGS $MANUAL_NSS_LIBS $OPENSSL_LDFLAGS)
 AC_SUBST(CAMEL_CFLAGS)
 AC_SUBST(CAMEL_LIBS)
 
-EVO_SET_COMPILE_FLAGS(E_NAME, libgnomeui-2.0 libbonoboui-2.0 gal-2.0 >= $GAL_REQUIRED)
+EVO_SET_COMPILE_FLAGS(E_NAME, libgnomeui-2.0 libbonoboui-2.0 gal-2.2 >= $GAL_REQUIRED)
 AC_SUBST(E_NAME_CFLAGS)
 AC_SUBST(E_NAME_LIBS)
 
-EVO_SET_COMPILE_FLAGS(E_UTIL, gthread-2.0 gconf-2.0 libxml-2.0 libbonoboui-2.0 libglade-2.0 gal-2.0 >= $GAL_REQUIRED libgnomeui-2.0 libgnome-2.0 libgnomecanvas-2.0 soup-2.0 $mozilla_nspr, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS)
+EVO_SET_COMPILE_FLAGS(E_UTIL, gthread-2.0 gconf-2.0 libxml-2.0 libbonoboui-2.0 libglade-2.0 gal-2.2 >= $GAL_REQUIRED libgnomeui-2.0 libgnome-2.0 libgnomecanvas-2.0 soup-2.0 $mozilla_nspr, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS)
 AC_SUBST(E_UTIL_CFLAGS)
 AC_SUBST(E_UTIL_LIBS)
 
@@ -1108,19 +1108,19 @@ EVO_SET_COMPILE_FLAGS(IMPORTERS, gconf-2
 AC_SUBST(IMPORTERS_CFLAGS)
 AC_SUBST(IMPORTERS_LIBS)
 
-EVO_SET_COMPILE_FLAGS(LIBFILTER, libgnome-2.0 libgnomeui-2.0 libglade-2.0 libxml-2.0 gconf-2.0 gal-2.0 >= $GAL_REQUIRED)
+EVO_SET_COMPILE_FLAGS(LIBFILTER, libgnome-2.0 libgnomeui-2.0 libglade-2.0 libxml-2.0 gconf-2.0 gal-2.2 >= $GAL_REQUIRED)
 AC_SUBST(LIBFILTER_CFLAGS)
 AC_SUBST(LIBFILTER_LIBS)
 
 dnl --- evolution (shell) flags
 
-EVO_SET_COMPILE_FLAGS(SHELL, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 gal-2.0 >= $GAL_REQUIRED libglade-2.0 gnome-vfs-2.0 libgtkhtml-3.1 >= $GTKHTML_REQUIRED)
+EVO_SET_COMPILE_FLAGS(SHELL, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 gal-2.2 >= $GAL_REQUIRED libglade-2.0 gnome-vfs-2.0 libgtkhtml-3.1 >= $GTKHTML_REQUIRED)
 AC_SUBST(SHELL_CFLAGS)
 AC_SUBST(SHELL_LIBS)
 
 dnl --- evolution-addressbook flags
 
-EVOLUTION_ADDRESSBOOK_DEPS="gconf-2.0 libbonoboui-2.0 libglade-2.0 gal-2.0 >= $GAL_REQUIRED libgnomeui-2.0 libgnome-2.0 libgnomecanvas-2.0 gnome-vfs-2.0 libgnomeprintui-2.2"
+EVOLUTION_ADDRESSBOOK_DEPS="gconf-2.0 libbonoboui-2.0 libglade-2.0 gal-2.2 >= $GAL_REQUIRED libgnomeui-2.0 libgnome-2.0 libgnomecanvas-2.0 gnome-vfs-2.0 libgnomeprintui-2.2"
 
 EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS)
 AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
@@ -1134,13 +1134,13 @@ fi
 
 dnl -- evolution-executive-summary flags
 
-EVO_SET_COMPILE_FLAGS(EVOLUTION_EXECUTIVE_SUMMARY, libbonoboui-2.0 libbonoboui-2.0 gal-2.0 >= $GAL_REQUIRED libgnomeui-2.0 libglade-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 soup-2.0 libgtkhtml-3.1 >= $GTKHTML_REQUIRED)
+EVO_SET_COMPILE_FLAGS(EVOLUTION_EXECUTIVE_SUMMARY, libbonoboui-2.0 libbonoboui-2.0 gal-2.2 >= $GAL_REQUIRED libgnomeui-2.0 libglade-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 soup-2.0 libgtkhtml-3.1 >= $GTKHTML_REQUIRED)
 AC_SUBST(EVOLUTION_EXECUTIVE_SUMMARY_CFLAGS)
 AC_SUBST(EVOLUTION_EXECUTIVE_SUMMARY_LIBS)
 
 dnl --- evolution-calendar flags
 
-EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 gal-2.0 >= $GAL_REQUIRED libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-3.1 >= $GTKHTML_REQUIRED, ${GTKHTML_CFLAGS}, ${GTKHTML_LIBS})
+EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 gal-2.2 >= $GAL_REQUIRED libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-3.1 >= $GTKHTML_REQUIRED, ${GTKHTML_CFLAGS}, ${GTKHTML_LIBS})
 AC_SUBST(EVOLUTION_CALENDAR_CFLAGS)
 AC_SUBST(EVOLUTION_CALENDAR_LIBS)
 
@@ -1152,13 +1152,13 @@ fi
 
 dnl --- evolution-mail flags
 
-EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 gal-2.0 >= $GAL_REQUIRED libglade-2.0 gnome-vfs-module-2.0 soup-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-3.1 >= $GTKHTML_REQUIRED libxml-2.0 bonobo-activation-2.0 gthread-2.0 gconf-2.0 $mozilla_nss)
+EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 gal-2.2 >= $GAL_REQUIRED libglade-2.0 gnome-vfs-module-2.0 soup-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-3.1 >= $GTKHTML_REQUIRED libxml-2.0 bonobo-activation-2.0 gthread-2.0 gconf-2.0 $mozilla_nss)
 AC_SUBST(EVOLUTION_MAIL_CFLAGS)
 AC_SUBST(EVOLUTION_MAIL_LIBS)
 
 dnl -- wombat flags
 
-EVO_SET_COMPILE_FLAGS(WOMBAT, gal-2.0 libgnome-2.0, $LDAP_CFLAGS, $LDAP_LIBS)
+EVO_SET_COMPILE_FLAGS(WOMBAT, gal-2.2 libgnome-2.0, $LDAP_CFLAGS, $LDAP_LIBS)
 AC_SUBST(WOMBAT_CFLAGS)
 AC_SUBST(WOMBAT_LIBS)
 
@@ -1275,7 +1275,7 @@ dnl ******************
 AC_ARG_WITH(sub-version, [  --with-sub-version=VERSION Specify a sub-version string])
 AC_DEFINE_UNQUOTED(SUB_VERSION, "$with_sub_version", [Version substring, for packagers])
 
-AC_ARG_ENABLE(default-binary, [  --disable-default-binary Do not install as the default "evolution" binary  ], , enable_default_binary=yes)
+AC_ARG_ENABLE(default-binary, [  --disable-default-binary Do not install as the default "evolution" binary  ], , enable_default_binary=no)
 AM_CONDITIONAL(DEFAULT_BINARY, test x$enable_default_binary = xyes)

Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/gal/Makefile.am,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile.am
--- Makefile.am	19 May 2003 18:37:06 -0000	1.17
+++ Makefile.am	12 Aug 2003 19:20:37 -0000
@@ -1,10 +1,10 @@
 SUBDIRS = po gal tests docs art
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gal-2.0.pc
+pkgconfig_DATA = gal-2.2.pc
 
 EXTRA_DIST = 			\
-	gal-2.0.pc.in		\
+	gal-2.2.pc.in		\
 	gal.spec.in		\
 	MAINTAINERS		\
 	AUTHORS			\
@@ -16,4 +16,4 @@ EXTRA_DIST = 			\
 dist-hook: gal.spec
 	cp gal.spec $(distdir)
 
-CLEANFILES = gal-2.0.pc 
+CLEANFILES = gal-2.2.pc 
Index: configure.in
===================================================================
RCS file: /cvs/gnome/gal/configure.in,v
retrieving revision 1.274
diff -u -p -r1.274 configure.in
--- configure.in	12 Aug 2003 07:56:12 -0000	1.274
+++ configure.in	12 Aug 2003 19:20:37 -0000
@@ -1,6 +1,6 @@
 -*- mode: m4 -*-
 AC_PREREQ(2.52)
-AC_INIT(gal, 1.99.9.99,
+AC_INIT(gal, 2.1.0.99,
 	http://bugzilla.ximian.com/enter_bug.cgi?product=GAL)
 
 AM_CONFIG_HEADER(config.h)
@@ -17,24 +17,24 @@ AC_PROG_INTLTOOL([0.27.1])
 
 dnl if you change this you need to change the GETTEXT_PACKAGE
 dnl string below as well due to a bug in intltool.
-GAL_API_VERSION=2.0
+GAL_API_VERSION=2.2
 
 dnl libtool versioning
 
-dnl gal-1.99.9 = 0
+dnl gal-2.1.1 = 0
 dnl increment if any interfaces have been added; set to 0
 dnl  if any interfaces have been removed. removal has 
 dnl  precedence over adding, so set to 0 if both happened.
 GAL_AGE=0
 
-dnl gal-1.99.9 = 0
+dnl gal-2.1.1 = 0
 dnl increment any time the source changes; set to 
 dnl  0 if you increment CURRENT
 GAL_REVISION=0
 
-dnl gal-1.99.9 = 5
+dnl gal-2.1.1 = 0
 dnl increment if the interface has additions, changes, removals.
-GAL_CURRENT=5
+GAL_CURRENT=0
 
 AC_SUBST(GAL_API_VERSION)
 AC_SUBST(GAL_CURRENT)
@@ -72,9 +72,6 @@ AC_SUBST(LDFLAGS)
 
 ALL_LINGUAS="am az be ca cs da de el en_GB es eu fi fr gl hu it ja ko lt lv ms nl nn no pl pt pt_BR ro ru sk sl sr sr Latn sv ta tr uk vi zh_CN zh_TW" 
 
-dnl we have to work around a intltool bug here so we must define GETTEXT_PACKAGE
-dnl as a simple string instead of trying to do variable substition.  See
-dnl http://bugzilla.ximian.com/show_bug.cgi?id=37784
 GETTEXT_PACKAGE=gal-${GAL_API_VERSION}
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
@@ -256,7 +253,7 @@ dnl
 GAL_LIBDIR='-L${libdir}'
 PKG_CHECK_MODULES(GAL, libgnomeprint-2.2 >= 2.2.0 libgnomeprintui-2.2 >= 2.2.1 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0)
 GAL_CFLAGS="$GAL_CFLAGS $ICONV_CFLAGS"
-GAL_LIBS="$GAL_LIBS -lgal-2.0 $ICONV_LIBS"
+GAL_LIBS="$GAL_LIBS -lgal-${GAL_API_VERSION} $ICONV_LIBS"
 AC_SUBST(GAL_LIBDIR)
 AC_SUBST(GAL_CFLAGS)
 AC_SUBST(GAL_LIBS)
@@ -296,6 +293,6 @@ docs/Makefile
 art/Makefile
 po/Makefile.in
 gal.spec
-gal-2.0.pc
+gal-${GAL_API_VERSION}.pc
 stamp.h
 ])
Index: gal-2.2.pc.in
===================================================================
RCS file: gal-2.2.pc.in
diff -N gal-2.2.pc.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gal-2.2.pc.in	12 Aug 2003 19:20:37 -0000
@@ -0,0 +1,12 @@
+prefix= prefix@
+exec_prefix= exec_prefix@
+libdir= libdir@
+includedir= includedir@
+
+Name: GAL
+Description: GNOME Application Library
+Version: @VERSION@
+Requires: gtk+-2.0 libxml-2.0 libglade-2.0 libgnomeprint-2.2
+
+Libs: -L${libdir} -lgal-2.2 -lgal-a11y-2.2
+Cflags: -I${includedir}/gal-2.2
Index: gal/Makefile.am
===================================================================
RCS file: /cvs/gnome/gal/gal/Makefile.am,v
retrieving revision 1.68
diff -u -p -r1.68 Makefile.am
--- gal/Makefile.am	31 Jul 2003 04:04:04 -0000	1.68
+++ gal/Makefile.am	12 Aug 2003 19:20:37 -0000
@@ -3,18 +3,18 @@ ui_subdirs    = widgets e-table e-text m
 
 SUBDIRS = $(nonui_subdirs) $(ui_subdirs) 
 
-lib_LTLIBRARIES = libgal-2.0.la
+lib_LTLIBRARIES = libgal-2.2.la
 
-libgal_2_0_la_LDFLAGS = -version-info $(GAL_CURRENT):$(GAL_REVISION):$(GAL_AGE) \
+libgal_2_2_la_LDFLAGS = -version-info $(GAL_CURRENT):$(GAL_REVISION):$(GAL_AGE) \
 		    -no-undefined \
 		    $(ICONV_LIBS)
-libgal_2_0_la_SOURCES = bogus_automake_hack.c
+libgal_2_2_la_SOURCES = bogus_automake_hack.c
 
-libgal_2_0_la_LIBADD = util/libutil.la \
+libgal_2_2_la_LIBADD = util/libutil.la \
 		   widgets/libwidgets.la \
 		   e-table/libetable.la \
 		   e-text/libetext.la \
 		   menus/libgalmenus.la \
 		   shortcut-bar/libshortcut-bar.la \
-		   a11y/libgal-a11y-2.0.la		\
+		   a11y/libgal-a11y-2.2.la		\
 		   $(EXTRA_GNOME_LIBS)
Index: gal/a11y/Makefile.am
===================================================================
RCS file: /cvs/gnome/gal/gal/a11y/Makefile.am,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile.am
--- gal/a11y/Makefile.am	11 Aug 2003 21:25:42 -0000	1.6
+++ gal/a11y/Makefile.am	12 Aug 2003 19:20:37 -0000
@@ -14,21 +14,21 @@ INCLUDES =					\
 	-DG_LOG_DOMAIN=\"gal-a11y\"
 
 
-lib_LTLIBRARIES = libgal-a11y-2.0.la
+lib_LTLIBRARIES = libgal-a11y-2.2.la
 
-libgal_a11y_2_0_la_LDFLAGS =    \
+libgal_a11y_2_2_la_LDFLAGS =    \
 	-version-info $(GAL_CURRENT):$(GAL_REVISION):$(GAL_AGE) 
 
-libgal_a11y_2_0_la_SOURCES =	\
+libgal_a11y_2_2_la_SOURCES =	\
 	gal-a11y-util.c
 
-libgal_a11y_2_0includedir = $(includedir)/gal-$(GAL_API_VERSION)/gal/a11y
+libgal_a11y_2_2includedir = $(includedir)/gal-$(GAL_API_VERSION)/gal/a11y
 
-libgal_a11y_2_0include_HEADERS =		\
+libgal_a11y_2_2include_HEADERS =		\
 	gal-a11y-util.h			\
 	gal-a11y-factory.h
 
 
-libgal_a11y_2_0_la_LIBADD =		\
+libgal_a11y_2_2_la_LIBADD =		\
 	e-text/libgal-a11y-etext.la	\
 	$(EXTRA_GNOME_LIBS)

Index: configure.in
===================================================================
RCS file: /cvs/gnome/gtkhtml/configure.in,v
retrieving revision 1.218
diff -u -p -r1.218 configure.in
--- configure.in	12 Aug 2003 08:00:12 -0000	1.218
+++ configure.in	12 Aug 2003 19:02:53 -0000
@@ -52,7 +52,7 @@ AC_SUBST(GAIL_CFLAGS)
 AC_SUBST(GAIL_LIBS)
 AC_SUBST(GAIL_MODULES)
 
-GTKHTML_MODULES="libgnomeui-2.0 >= 1.112.1 libgnomeprint-2.2 >= 2.2.0 libgnomeprintui-2.2 >= 2.2.1 libglade-2.0 >= 2.0.0 gal-2.0 >= 0.0.2"
+GTKHTML_MODULES="libgnomeui-2.0 >= 1.112.1 libgnomeprint-2.2 >= 2.2.0 libgnomeprintui-2.2 >= 2.2.1 libglade-2.0 >= 2.0.0 gal-2.2 >= 2.1.0"
 PKG_CHECK_MODULES(GTKHTML, $GTKHTML_MODULES)
 AC_SUBST(GTKHTML_CFLAGS)
 AC_SUBST(GTKHTML_LIBS)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]