From: aflinta <aflinta@pld-linux.org>
Date: Wed, 18 Dec 2002 23:02:28 +0000 (+0000)
Subject: new
X-Git-Tag: balsa-2_0_11-1~25
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=949a454a571c758189bb9a19a4af12ecea18ad45;hp=35f3bdc7820851f03d0d5e3ba41810bcceca057e;p=packages%2Fbalsa.git

new

Changed files:
    balsa-aspell.patch -> 1.1
    balsa-libgnomeprint.patch -> 1.1
---

diff --git a/balsa-aspell.patch b/balsa-aspell.patch
new file mode 100644
index 0000000..dee1623
--- /dev/null
+++ b/balsa-aspell.patch
@@ -0,0 +1,15 @@
+diff -urN balsa-2.0.3.orig/configure.in balsa-2.0.3/configure.in
+--- balsa-2.0.3.orig/configure.in	Wed Dec 18 21:01:37 2002
++++ balsa-2.0.3/configure.in	Wed Dec 18 21:27:06 2002
+@@ -88,9 +88,9 @@
+ AC_CONFIG_SUBDIRS(libmutt)
+ 
+ 
+-AC_CHECK_LIB(pspell, new_pspell_manager,,[
++AC_CHECK_LIB(pspell, new_aspell_speller,,[
+ 	AC_MSG_ERROR([*** libpspell(-devel) not found.  Please check http://www.balsa.net for information on the required files.])
+-], -lstdc++ -lpspell-modules)
++], -lstdc++)
+ 
+ dnl Reset
+ # LDFLAGS="$balsa_save_LDFLAGS"
diff --git a/balsa-libgnomeprint.patch b/balsa-libgnomeprint.patch
new file mode 100644
index 0000000..cef9925
--- /dev/null
+++ b/balsa-libgnomeprint.patch
@@ -0,0 +1,119 @@
+diff -urN balsa-2.0.3.orig/configure.in balsa-2.0.3/configure.in
+--- balsa-2.0.3.orig/configure.in	Wed Dec 18 21:01:37 2002
++++ balsa-2.0.3/configure.in	Wed Dec 18 22:10:00 2002
+@@ -64,8 +64,8 @@
+ gtk+-2.0
+ gnome-vfs-2.0
+ gnome-vfs-module-2.0
+-libgnomeprint-2.0 >= 1.106.0
+-libgnomeprintui-2.0 >= 1.106.0
++libgnomeprint-2.2 >= 2.1.5
++libgnomeprintui-2.2 >= 2.1.5
+ $gnome_extras
+ ])
+ AC_SUBST(BALSA_CFLAGS)
+diff -urN balsa-2.0.3.orig/src/print.c balsa-2.0.3/src/print.c
+--- balsa-2.0.3.orig/src/print.c	Wed Dec 18 21:01:37 2002
++++ balsa-2.0.3/src/print.c	Wed Dec 18 22:20:13 2002
+@@ -30,10 +30,10 @@
+ #include <ctype.h>
+ #include <libgnomeprint/gnome-print.h>
+ #include <libgnomeprint/gnome-font.h>
+-#include <libgnomeprint/gnome-print-master.h>
++#include <libgnomeprint/gnome-print-job.h>
+ #include <libgnomeprint/gnome-print-paper.h>
+ #include <libgnomeprintui/gnome-print-dialog.h>
+-#include <libgnomeprintui/gnome-print-master-preview.h>
++#include <libgnomeprintui/gnome-print-job-preview.h>
+ #include <libbalsa.h>
+ #ifdef HAVE_PCRE
+ #  include <pcreposix.h>
+@@ -990,18 +990,18 @@
+ }
+ 
+ static PrintInfo *
+-print_info_new(LibBalsaMessage * msg, GnomePrintMaster * master,
++print_info_new(LibBalsaMessage * msg, GnomePrintJob * master,
+                CommonInfo * ci)
+ {
+     GnomePrintConfig* config;
+     PrintInfo *pi = g_new0(PrintInfo, 1);
+ 
+-    config = gnome_print_master_get_config(master);
+-    gnome_print_master_get_page_size_from_config(config, &pi->page_width,
++    config = gnome_print_job_get_config(master);
++    gnome_print_job_get_page_size_from_config(config, &pi->page_width,
+                                                  &pi->page_height);
+     gnome_print_config_unref(config);
+ 
+-    pi->pc = gnome_print_master_get_context(master);
++    pi->pc = gnome_print_job_get_context(master);
+     pi->margin_top = 0.75 * 72;
+     pi->margin_bottom = 0.75 * 72;
+     pi->margin_left = 0.75 * 72;
+@@ -1162,7 +1162,7 @@
+  * creates the print dialog, and adds a page for fonts
+  */
+ static GtkWidget *
+-print_dialog(GnomePrintMaster * master, CommonInfo * ci)
++print_dialog(GnomePrintJob * master, CommonInfo * ci)
+ {
+     GtkWidget  *dialog;
+     GtkWidget  *frame;
+@@ -1173,8 +1173,8 @@
+     GtkWidget  *chkbut;
+     GList      *childList;
+ 
+-    dialog = gnome_print_dialog_new_from_master(master, _("Print message"),
+-				                GNOME_PRINT_DIALOG_COPIES);
++    dialog = gnome_print_dialog_new(master, _("Print message"),
++				    GNOME_PRINT_DIALOG_COPIES);
+     gtk_window_set_wmclass(GTK_WINDOW(dialog), "print", "Balsa");
+     dlgVbox = GTK_DIALOG(dialog)->vbox;
+     childList = gtk_container_get_children(GTK_CONTAINER(dlgVbox));
+@@ -1290,7 +1290,7 @@
+ message_print(LibBalsaMessage * msg)
+ {
+     CommonInfo ci;
+-    GnomePrintMaster *master;
++    GnomePrintJob *master;
+     GnomePrintConfig* config;
+     PrintInfo *pi;
+     gboolean preview;
+@@ -1299,14 +1299,14 @@
+ 
+     common_info_setup(&ci);
+ 
+-    master = gnome_print_master_new();
++    master = gnome_print_job_new(NULL);
+ 
+     /* FIXME: this sets the paper size in the GnomePrintConfig. We can
+      * change it in the Paper page of the GnomePrintDialog, and retrieve
+      * it from the GnomePrintConfig. However, it doesn't get set as the
+      * initial value in the Paper page. Is there some Gnome-2-wide
+      * repository for data like this? */
+-    config = gnome_print_master_get_config(master);
++    config = gnome_print_job_get_config(master);
+     gnome_print_config_set(config, GNOME_PRINT_KEY_PAPER_SIZE, 
+                            balsa_app.paper_size);
+     
+@@ -1334,16 +1334,16 @@
+ 
+     /* do the Real Job */
+     print_message(pi);
+-    gnome_print_master_close(master);
++    gnome_print_job_close(master);
+     if (preview) {
+ 	GtkWidget *preview_widget =
+-	    gnome_print_master_preview_new(master,
++	    gnome_print_job_preview_new(master,
+ 		 			   _("Balsa: message print preview"));
+         gtk_window_set_wmclass(GTK_WINDOW(preview_widget), "print-preview",
+                                "Balsa");
+ 	gtk_widget_show(preview_widget);
+     } else
+-	gnome_print_master_print(master);
++	gnome_print_job_print(master);
+ 
+     print_info_destroy(pi);
+     common_info_cleanup(&ci);