Update of /cvsroot/fink/dists/10.3/stable/main/finkinfo/editors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30551
Modified Files:
bluefish.info bluefish.patch
Log Message:
Backported patch from cvs to delete backup project file on close depending on
preferences, as for normal files
Index: bluefish.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/editors/bluefish.info,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- bluefish.info 19 Feb 2006 08:39:42 -0000 1.17
+++ bluefish.info 21 Feb 2006 08:11:51 -0000 1.18
@@ -2,7 +2,7 @@
Package: bluefish%type_pkg[bluefish]
Type: bluefish (. -gnome2 -gnomevfs2)
Version: 1.0.4
-Revision: 2
+Revision: 3
Source: http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/bluefish-%v.tar.bz2
Source-MD5: 8d5c1b7315cdc935aa024954093d2b32
Depends: aspell-shlibs (>= 0.50.5-1), default-icon-theme, gettext (>=
0.10.40-19), glib2 (>= 2.4.6-7), glib2-shlibs (>= 2.4.6-7), gnome-icon-theme
(>= 1.2.3-5), libjpeg-shlibs (>= 6b-16), libtiff-shlibs (>= 3.6.1-4),
pango1-xft2 (>= 1.6.0-1), pango1-xft2-shlibs (>= 1.6.0-1), pcre-shlibs (>=
4.5-1), popt-shlibs (>= 1.7-5), libxml2-shlibs (>= 2.6.22-1), libxml2-bin (>=
2.6.22-1), shared-mime-info (>= 0.14-6), atk1-shlibs (>= 1.6.1-3),
libpng3-shlibs (>= 1:1.2.8), gtk+2 (>= 2.4.9-8), gtk+2-shlibs (>= 2.4.9-8),
libiconv (>= 1.9.1-11), x11, (%type_raw[bluefish] = -gnomevfs2) gnome-base (>=
2.4.1-1), (%type_raw[bluefish] = -gnome2) gnome-base (>= 2.4.1-1),
(%type_raw[bluefish] = -gnomevfs2) gnome-mime-data (>= 2.4.1-4),
(%type_raw[bluefish] = -gnome2) gnome-mime-data (>= 2.4.1-4),
(%type_raw[bluefish] = -gnomevfs2) libidl2-shlibs (>= 0.8.3-2),
(%type_raw[bluefish] = -gnome2) libidl2-shlibs (>= 0.8.3-2),
(%type_raw[bluefish] = -gnomevfs2) orbit2 (>= 2.10.3-9), (%type_raw[bluefish]
= -gnome2) orbit2 (>= 2.10.3-9), (%type_raw[bluefish] = -gnomevfs2)
orbit2-shlibs (>= 2.10.3-9), (%type_raw[bluefish] = -gnome2) orbit2-shlibs (>=
2.10.3-9), (%type_raw[bluefish] = -gnomevfs2) gconf2 (>= 2.6.3-10),
(%type_raw[bluefish] = -gnome2) gconf2 (>= 2.6.3-10), (%type_raw[bluefish] =
-gnomevfs2) gconf2-shlibs (>= 2.6.3-10), (%type_raw[bluefish] = -gnome2)
gconf2-shlibs (>= 2.6.3-10), (%type_raw[bluefish] = -gnomevfs2) libbonobo2 (>=
2.6.2-9), (%type_raw[bluefish] = -gnome2) libbonobo2 (>= 2.6.2-9),
(%type_raw[bluefish] = -gnomevfs2) libbonobo2-shlibs (>= 2.6.2-9),
(%type_raw[bluefish] = -gnome2) libbonobo2-shlibs (>= 2.6.2-9),
(%type_raw[bluefish] = -gnomevfs2) gnome-vfs2 (>= 2.6.1.1-17) |
(%type_raw[bluefish] = -gnomevfs2) gnome-vfs2-ssl (>= 2.6.1.1-15),
(%type_raw[bluefish] = -gnome2) gnome-vfs2 (>= 2.6.1.1-17) |
(%type_raw[bluefish] = -gnome2) gnome-vfs2-ssl (>= 2.6.1.1-15),
(%type_raw[bluefish] = -gnomevfs2) gnome-vfs2-shlibs (>= 2.6.1.1-17) |
(%type_raw[bluefish]
= -gnomevfs2) gnome-vfs2-ssl-shlibs (>= 2.6.1.1-15), (%type_raw[bluefish] =
-gnome2) gnome-vfs2-shlibs (>= 2.6.1.1-17) | (%type_raw[bluefish] = -gnome2)
gnome-vfs2-ssl-shlibs (>= 2.6.1.1-15), (%type_raw[bluefish] = -gnome2)
audiofile-shlibs, (%type_raw[bluefish] = -gnome2) audiofile-bin,
(%type_raw[bluefish] = -gnome2) esound, (%type_raw[bluefish] = -gnome2)
esound-bin, (%type_raw[bluefish] = -gnome2) esound-common, (%type_raw[bluefish]
= -gnome2) esound-shlibs, (%type_raw[bluefish] = -gnome2) libart2-shlibs (>=
2.3.16-2), (%type_raw[bluefish] = -gnome2) libgnome2 (>= 2.6.1.2-21),
(%type_raw[bluefish] = -gnome2) libgnome2-shlibs (>= 2.6.1.2-21),
(%type_raw[bluefish] = -gnome2) libglade2-shlibs (>= 2.3.6-17),
(%type_raw[bluefish] = -gnome2) libgnomecanvas2 (>= 2.6.1.1-7),
(%type_raw[bluefish] = -gnome2) libgnomecanvas2-shlibs (>= 2.6.1.1-7),
(%type_raw[bluefish] = -gnome2) gnome-keyring-shlibs (>= 0.2.1-4),
(%type_raw[bluefish] = -gnome2) gnome-keyring (>= 0.2.1-4), (%type
_raw[bluefish] = -gnome2) libbonoboui2 (>= 2.6.1-10), (%type_raw[bluefish] =
-gnome2) libbonoboui2-shlibs (>= 2.6.1-10), (%type_raw[bluefish] = -gnome2)
libgnomeui2 (>= 2.6.1.1-9), (%type_raw[bluefish] = -gnome2) libgnomeui2-shlibs
(>= 2.6.1.1-9)
@@ -83,11 +83,17 @@
Update share-mime-database in PostInstScript and PostRmScript.
<<
DescPort: <<
+ Previous versions by Christoph Pfisterer and Matt Stephenson.
+ Use of pkgconfig
+ Use of variant to handle no gnome, gnomevfs2, and gnome2
+ installation
Patch for #define POSIX_C_SOURCE in src/document.c which
impedes the recognition of ctime_r() function.
Patch for size of files in src/document.c which was not
correct on Mac. (Dirty hack at the moment, will b improved
for the next release.
+ Patch for initialisation of aspell dictionary
+ Patch for deletion of backup project file on close.
Added bind-at-load flag for libiconv-libintl conflicts.
Patching fr.po file (upstream version is bogus)
<<
Index: bluefish.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/editors/bluefish.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- bluefish.patch 18 Feb 2006 01:13:24 -0000 1.7
+++ bluefish.patch 21 Feb 2006 08:11:51 -0000 1.8
@@ -46,6 +46,81 @@
DEBUG_MSG("spell_start, default
lang=%s\n",main_v->props.spell_default_lang);
/*
* it is unclear from the manual if aspell supports utf-8 in the
+diff -Naur bluefish-1.0.4/src/project.c bluefish-1.0.4-new/src/project.c
+--- bluefish-1.0.4/src/project.c 2005-05-30 22:48:41.000000000 +0200
++++ bluefish-1.0.4-new/src/project.c 2006-02-21 08:31:06.000000000 +0100
+@@ -1,7 +1,7 @@
+ /* Bluefish HTML Editor
+ * project.c - project functionality
+ *
+- * Copyright (C) 2003-2004 Olivier Sessink
++ * Copyright (C) 2003-2006 Olivier Sessink
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+@@ -15,25 +15,27 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA.
+ */
++
+ /* #define DEBUG */
+
+ #include <gtk/gtk.h>
+-#include <string.h>
+ #include <stdlib.h>
++#include <string.h>
++#include <unistd.h> /* unlink() */
+
+ #include "bluefish.h"
+ #include "project.h"
+-#include "stringlist.h"
+-#include "gui.h"
+-#include "document.h"
+-#include "gtk_easy.h"
+-#include "rcfile.h"
+ #include "bf_lib.h"
++#include "bookmark.h"
++#include "document.h"
+ #include "filebrowser.h"
++#include "gtk_easy.h"
++#include "gui.h"
+ #include "menu.h"
+-#include "bookmark.h"
++#include "rcfile.h"
++#include "stringlist.h"
+
+ static void free_session(Tsessionvars *session) {
+ free_stringlist(session->classlist);
+@@ -390,11 +392,26 @@
+ }
+ /* test if we should save */
+ if (!dont_save) {
++ gchar *backupfile = NULL;
+ if (!project_save(bfwin, FALSE)) {
+ DEBUG_MSG("project_save failed, returning\n");
+ return FALSE;
+ }
+ add_to_recent_list(bfwin,bfwin->project->filename, TRUE, TRUE);
++
++ if (main_v->props.backup_cleanuponclose) {
++ backupfile = g_strconcat (bfwin->project->filename,
main_v->props.backup_filestring, NULL);
++ if (file_exists_and_readable(backupfile)) {
++ gchar * ondiskencodingbckup =
get_filename_on_disk_encoding(backupfile);
++#ifdef HAVE_GNOME_VFS
++ gnome_vfs_unlink(ondiskencodingbckup);
++#else
++ unlink(ondiskencodingbckup);
++#endif
++ g_free (ondiskencodingbckup);
++ }
++ g_free (backupfile);
++ }
+ }
+ bfwin_close_all_documents(bfwin, TRUE);
+ if (!test_only_empty_doc_left(bfwin->documentlist)) {
diff -Naur bluefish-1.0.4/po/fr.po bluefish-1.0.4-new/po/fr.po
--- bluefish-1.0.4/po/fr.po 2005-08-28 18:28:49.000000000 +0200
+++ bluefish-1.0.4-new//po/fr.po 2006-02-17 23:15:43.000000000 +0100
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
