- updated for 1.2.0.

Changed files:
    balsa-am15.patch -> 1.2

diff --git a/balsa-am15.patch b/balsa-am15.patch
index 95a47b2fe46ac3f5ae231c3fb0885444d9e610fe..db64c617dc9f0b9fa9628a9f02658848005e07c3 100644 (file)
--- a/balsa-am15.patch
+++ b/balsa-am15.patch
@@ -38,19 +38,67 @@
  
  INCLUDES=-I. -I$(top_srcdir) \
        -I$(top_builddir)/libmutt \
---- balsa-1.1.7.new/src/Makefile.am~   Thu Jul 12 09:08:46 2001
-+++ balsa-1.1.7.new/src/Makefile.am    Sun Sep  9 21:35:34 2001
+--- balsa-1.1.7.new/libbalsa/Makefile.am~      Thu Jul 12 09:08:46 2001
++++ balsa-1.1.7.new/libbalsa/Makefile.am       Sun Sep  9 21:38:13 2001
+@@ -62,8 +62,5 @@
+       server.h                \
+       threads.h
+ 
+-
+-libbalsa_a_LIBADD = @LIBOBJS@
+-
+ INCLUDES=-I. -I${top_srcdir} -I${top_builddir}/libmutt \
+       $(GNOME_INCLUDEDIR)
+--- balsa-1.1.7/images/Makefile.am~    Wed Mar 29 05:14:44 2000
++++ balsa-1.1.7/images/Makefile.am     Sun Sep  9 21:54:08 2001
+@@ -2,7 +2,7 @@
+ 
+ EXTRA_DIST =  $(balsa_BITMAPS)
+ 
+-balsabitmapsdir = @gnomedatadir@/pixmaps/balsa
++balsabitmapsdir = $(gnomedatadir)/pixmaps/balsa
+ 
+ balsabitmaps_DATA = $(balsa_BITMAPS)
+ 
+--- balsa-1.1.7/sounds/Makefile.am~    Thu Apr 13 19:38:24 2000
++++ balsa-1.1.7/sounds/Makefile.am     Sun Sep  9 21:56:54 2001
+@@ -3,8 +3,8 @@
+ 
+ EXTRA_DIST = $(balsa_SOUNDS) $(balsa_SOUNDLISTS)
+ 
+-balsasoundsdir = @gnomedatadir@/sounds/balsa
++balsasoundsdir = $(gnomedatadir)/sounds/balsa
+ balsasounds_DATA = $(balsa_SOUNDS)
+ 
+-soundlistdir = @gnomeconfdir@/sound/events
++soundlistdir = $(gnomeconfdir)/sound/events
+ soundlist_DATA = $(balsa_SOUNDLISTS)
+--- balsa-1.2.0/configure.in~  Tue Sep 18 15:28:58 2001
++++ balsa-1.2.0/configure.in   Wed Sep 19 22:13:03 2001
+@@ -113,10 +113,6 @@
+ dnl Substitutions, defines, part I
+ dnl ###########################################################################
+ 
+-AC_SUBST(CFLAGS)
+-AC_SUBST(CPPFLAGS)
+-AC_SUBST(LDFLAGS)
+-
+ dnl No choice about this
+ gnome_cv_use_gnome=yes
+ 
+--- balsa-1.2.0/src/Makefile.am.orig   Thu Sep  6 10:59:38 2001
++++ balsa-1.2.0/src/Makefile.am        Wed Sep 19 22:41:30 2001
 @@ -1,6 +1,6 @@
  bin_PROGRAMS = balsa
  
 -balsa_BASE_SOURCES =  \
-+balsa_SOURCES =               \
++balsa_SOURCES =       \
        address-book.c          \
        address-book.h          \
        address-book-config.c   \
-@@ -52,14 +52,6 @@
-       spell-check.c           \
-       spell-check.h           
+@@ -55,21 +55,12 @@
+       toolbar-factory.c       \
+       toolbar-factory.h
  
 -balsa_IDL_SOURCES = \
 -      balsa-common.c          \
@@ -63,27 +111,17 @@
  INCLUDES = \
        -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
        -I$(top_srcdir) \
-@@ -67,8 +59,6 @@
-       -I$(top_srcdir)/libmutt \
-        $(GNOME_INCLUDEDIR)
+       -I$(top_srcdir)/libbalsa
  
--CFLAGS += $(GTKHTML_CFLAGS) $(PIXBUF_FLAGS)
+-CFLAGS += $(PCRE_CFLAGS) 
 -
++blsa_CFLAGS = $(PCRE_CFLAGS)
  balsa_LDADD = \
        $(top_builddir)/libbalsa/libbalsa.a     \
        $(top_builddir)/libmutt/imap/libimap.a  \
-@@ -76,7 +66,7 @@
-       $(top_builddir)/libinit_balsa/libinit_balsa.a \
-       -lpspell \
-       -lltdl \
--      @LIBESD_LIB@ \
-+      $(LIBESD_LIB) \
-       $(GNOME_LIBDIR) \
-       $(GNOMEUI_LIBS) \
-       $(INTLLIBS) \
-@@ -85,27 +75,9 @@
-       $(GTKHTML_LIBS) \
-       $(PIXBUF_LIBS)
+@@ -81,26 +72,6 @@
+       $(PCRE_LIBS) \
+       $(PTHREAD_LIB)
  
 -balsa_DEPENDENCIES = \
 -      $(top_builddir)/libbalsa/libbalsa.a     \
@@ -91,12 +129,11 @@
 -        $(top_builddir)/libmutt/imap/libimap.a        \
 -      $(top_builddir)/libmutt/libmutt.a       \
 -      $(top_builddir)/libinit_balsa/libinit_balsa.a
-+balsa_CFLAGS = $(GTKHTML_CFLAGS) $(PIXBUF_FLAGS)
- 
+-
  dist-hook:
        mkdir $(distdir)/pixmaps
        cp $(srcdir)/pixmaps/*.xpm $(distdir)/pixmaps
- 
+-
 -idldir = $(datadir)/idl
 -
 -idl_DATA = #../idl/balsa.idl
@@ -104,44 +141,8 @@
 -CORBA_SRCLIST = balsa-common.c balsa-skels.c balsa-stubs.c \
 -                balsa.h
 -
--
 -BALSA_ORB_SRCLIST = orbit-glue.c 
 -
 -
 -$(CORBA_SRCLIST): $(idl_DATA)
 -              $(ORBIT_IDL) $(idl_DATA)
---- balsa-1.1.7.new/libbalsa/Makefile.am~      Thu Jul 12 09:08:46 2001
-+++ balsa-1.1.7.new/libbalsa/Makefile.am       Sun Sep  9 21:38:13 2001
-@@ -62,8 +62,5 @@
-       server.h                \
-       threads.h
- 
--
--libbalsa_a_LIBADD = @LIBOBJS@
--
- INCLUDES=-I. -I${top_srcdir} -I${top_builddir}/libmutt \
-       $(GNOME_INCLUDEDIR)
---- balsa-1.1.7/images/Makefile.am~    Wed Mar 29 05:14:44 2000
-+++ balsa-1.1.7/images/Makefile.am     Sun Sep  9 21:54:08 2001
-@@ -2,7 +2,7 @@
- 
- EXTRA_DIST =  $(balsa_BITMAPS)
- 
--balsabitmapsdir = @gnomedatadir@/pixmaps/balsa
-+balsabitmapsdir = $(gnomedatadir)/pixmaps/balsa
- 
- balsabitmaps_DATA = $(balsa_BITMAPS)
- 
---- balsa-1.1.7/sounds/Makefile.am~    Thu Apr 13 19:38:24 2000
-+++ balsa-1.1.7/sounds/Makefile.am     Sun Sep  9 21:56:54 2001
-@@ -3,8 +3,8 @@
- 
- EXTRA_DIST = $(balsa_SOUNDS) $(balsa_SOUNDLISTS)
- 
--balsasoundsdir = @gnomedatadir@/sounds/balsa
-+balsasoundsdir = $(gnomedatadir)/sounds/balsa
- balsasounds_DATA = $(balsa_SOUNDS)
- 
--soundlistdir = @gnomeconfdir@/sound/events
-+soundlistdir = $(gnomeconfdir)/sound/events
- soundlist_DATA = $(balsa_SOUNDLISTS)