Author: megabajt Date: Wed Feb 7 13:17:14 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 1.0.7
---- Files affected:
SOURCES:
bluefish-desktop.patch (1.6 -> 1.7) , bluefish-home_etc.patch (1.1 -> 1.2) ,
bluefish-locales.patch (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SOURCES/bluefish-desktop.patch
diff -u SOURCES/bluefish-desktop.patch:1.6 SOURCES/bluefish-desktop.patch:1.7
--- SOURCES/bluefish-desktop.patch:1.6 Sat Oct 8 10:41:00 2005
+++ SOURCES/bluefish-desktop.patch Wed Feb 7 14:17:09 2007
@@ -1,13 +1,14 @@
-diff -aurN bluefish-1.0.4.orig/data/bluefish.desktop.in
bluefish-1.0.4/data/bluefish.desktop.in
---- bluefish-1.0.4.orig/data/bluefish.desktop.in 2005-08-25
05:33:20.000000000 +0200
-+++ bluefish-1.0.4/data/bluefish.desktop.in 2005-10-08 10:38:31.000000000
+0200
-@@ -1,13 +1,15 @@
- [Desktop Entry]
+diff -urN bluefish-1.0.7/data/bluefish.desktop.in
bluefish-1.0.7.new/data/bluefish.desktop.in
+--- bluefish-1.0.7/data/bluefish.desktop.in 2006-01-31 07:23:18.000000000
+0100
++++ bluefish-1.0.7.new/data/bluefish.desktop.in 2007-02-07
12:13:49.000000000 +0100
+@@ -2,14 +2,16 @@
Name=Bluefish Editor
Name[de]=Bluefish Editor
+ Name[fr]=Ăditeur Bluefish
+Name[pl]=Edytor Bluefish
- Comment=Web Development Editor
- Comment[de]=Editor fĂźr Web-Entwickler
+ Comment=Create web pages
+ Comment[de]=Webseiten erstellen
+ Comment[fr]=Ăditeur pour dĂŠveloppeurs web
+Comment[pl]=Edytor do tworzenia stron internetowych
Exec=bluefish %F
-Icon=ICONDIR/bluefish-icon.png
================================================================
Index: SOURCES/bluefish-home_etc.patch
diff -u SOURCES/bluefish-home_etc.patch:1.1 SOURCES/bluefish-home_etc.patch:1.2
--- SOURCES/bluefish-home_etc.patch:1.1 Thu Nov 20 00:09:04 2003
+++ SOURCES/bluefish-home_etc.patch Wed Feb 7 14:17:09 2007
@@ -1,193 +1,173 @@
-diff -Nru bluefish-0.11.orig/src/bluefish.c bluefish-0.11/src/bluefish.c
---- bluefish-0.11.orig/src/bluefish.c 2003-07-27 17:26:58.000000000 +0200
-+++ bluefish-0.11/src/bluefish.c 2003-11-19 12:48:08.000000000 +0100
-@@ -110,7 +110,8 @@
- #ifndef NOSPLASH
- GtkWidget *splash_window;
- #endif /* #ifndef NOSPLASH */
--
-+ gchar *home_etc = getenv("HOME_ETC");
-+
- #ifdef ENABLE_NLS
- setlocale(LC_ALL,"");
- bindtextdomain(PACKAGE,LOCALEDIR);
-@@ -139,7 +140,7 @@
+diff -urN bluefish-1.0.7/src/bluefish.c bluefish-1.0.7.new/src/bluefish.c
+--- bluefish-1.0.7/src/bluefish.c 2006-02-10 14:24:35.000000000 +0100
++++ bluefish-1.0.7.new/src/bluefish.c 2007-02-07 12:41:03.000000000 +0100
+@@ -186,7 +186,7 @@
#endif /* #ifndef NOSPLASH */
{
- gchar *filename = g_strconcat(g_get_home_dir(),
"/.bluefish/dir_history", NULL);
-+ gchar *filename = g_strconcat(home_etc ? home_etc :
g_get_home_dir(), "/.bluefish/dir_history", NULL);
++ gchar *filename = g_strconcat(_HEdir, "/.bluefish/dir_history",
NULL);
main_v->recent_directories = get_stringlist(filename, NULL);
g_free(filename);
}
-@@ -171,7 +172,7 @@
+@@ -230,7 +230,7 @@
gchar *shortcutfilename;
GtkSettings* gtksettings = gtk_settings_get_default();
g_object_set(G_OBJECT(gtksettings), "gtk-can-change-accels",
TRUE, NULL);
- shortcutfilename = g_strconcat(g_get_home_dir(),
"/.bluefish/menudump_2", NULL);
-+ shortcutfilename = g_strconcat(home_etc ? home_etc :
g_get_home_dir(), "/.bluefish/menudump_2", NULL);
++ shortcutfilename = g_strconcat(_HEdir, "/.bluefish/menudump_2",
NULL);
gtk_accel_map_load(shortcutfilename);
g_free(shortcutfilename);
}
-@@ -218,7 +219,8 @@
+@@ -347,7 +347,7 @@
rcfile_save_all();
{
- gchar *filename = g_strconcat(g_get_home_dir(),
"/.bluefish/dir_history", NULL);
-+ gchar *home_etc = getenv("HOME_ETC");
-+ gchar *filename = g_strconcat(home_etc ? home_etc :
g_get_home_dir(), "/.bluefish/dir_history", NULL);
++ gchar *filename = g_strconcat(_HEdir, "/.bluefish/dir_history",
NULL);
put_stringlist_limited(filename, main_v->recent_directories,
main_v->props.max_dir_history);
g_free(filename);
}
-diff -Nru bluefish-0.11.orig/src/fref.c bluefish-0.11/src/fref.c
---- bluefish-0.11.orig/src/fref.c 2003-07-27 17:26:58.000000000 +0200
-+++ bluefish-0.11/src/fref.c 2003-11-19 12:45:04.000000000 +0100
-@@ -1456,7 +1456,8 @@
-
+diff -urN bluefish-1.0.7/src/bluefish.h bluefish-1.0.7.new/src/bluefish.h
+--- bluefish-1.0.7/src/bluefish.h 2006-01-18 10:18:08.000000000 +0100
++++ bluefish-1.0.7.new/src/bluefish.h 2007-02-07 12:40:12.000000000 +0100
+@@ -72,6 +72,7 @@
+ #include <libgnomevfs/gnome-vfs.h>
+ #endif
+
++#include <home_etc.h>
+
+ /*********************/
+ /* undo/redo structs */
+diff -urN bluefish-1.0.7/src/fref.c bluefish-1.0.7.new/src/fref.c
+--- bluefish-1.0.7/src/fref.c 2006-08-22 06:06:56.000000000 +0200
++++ bluefish-1.0.7.new/src/fref.c 2007-02-07 12:47:57.000000000 +0100
+@@ -1814,7 +1814,7 @@
- static void fref_popup_menu_rescan_lcb(GtkWidget *widget,gpointer user_data) {
+ static void fref_popup_menu_rescan_lcb(GtkWidget * widget, gpointer user_data)
+ {
- gchar *userdir = g_strconcat(g_get_home_dir(), "/.bluefish/", NULL);
-+ gchar *home_etc = getenv("HOME_ETC");
-+ gchar *userdir = g_strconcat(home_etc ? home_etc : g_get_home_dir(),
"/.bluefish/", NULL);
++ gchar *userdir = g_strconcat(_HEdir, "/.bluefish/", NULL);
DEBUG_MSG("fref_popup_menu_rescan_lcb, started\n");
fref_rescan_dir(PKGDATADIR);
fref_rescan_dir(userdir);
-diff -Nru bluefish-0.11.orig/src/menu.c bluefish-0.11/src/menu.c
---- bluefish-0.11.orig/src/menu.c 2003-07-27 17:26:58.000000000 +0200
-+++ bluefish-0.11/src/menu.c 2003-11-19 12:49:55.000000000 +0100
-@@ -796,11 +796,12 @@
-
- void recent_menu_init() {
- gchar *recentfile;
-+ gchar *home_etc = getenv("HOME_ETC");
- GList *filenames=NULL, *tmp, *tmp2, *newlist=NULL;
- gint recent_file_count=0;
-
- DEBUG_MSG("open_recent_list, started\n");
-- recentfile = g_strconcat(g_get_home_dir(), "/.bluefish/recentlist",
NULL);
-+ recentfile = g_strconcat(home_etc ? home_etc : g_get_home_dir(),
"/.bluefish/recentlist", NULL);
- filenames = get_stringlist(recentfile, filenames);
- if (!filenames) {
- filenames = add_to_stringlist(menus.recent_files, _("(none)"));
-@@ -862,7 +863,8 @@
-
- } else {
- gchar *tmpfilename, *recentfile;
-- recentfile = g_strconcat(g_get_home_dir(),
"/.bluefish/recentlist", NULL);
-+ gchar *home_etc = getenv("HOME_ETC");
-+ recentfile = g_strconcat(home_etc ? home_etc :
g_get_home_dir(), "/.bluefish/recentlist", NULL);
- /* save the new list */
- tmpfilename = g_strconcat(filename, "\n", NULL);
- DEBUG_MSG("add_to_recent_list, trying to append to %s\n",
recentfile);
-diff -Nru bluefish-0.11.orig/src/rcfile.c bluefish-0.11/src/rcfile.c
---- bluefish-0.11.orig/src/rcfile.c 2003-07-27 18:19:58.000000000 +0200
-+++ bluefish-0.11/src/rcfile.c 2003-11-19 12:56:12.000000000 +0100
-@@ -469,6 +469,7 @@
- void rcfile_parse_main(void)
- {
- gchar *filename;
-+ gchar *home_etc = getenv("HOME_ETC");
-
- DEBUG_MSG("rcfile_parse_main, started\n");
-
-@@ -478,7 +479,7 @@
+diff -urN bluefish-1.0.7/src/Makefile.in bluefish-1.0.7.new/src/Makefile.in
+--- bluefish-1.0.7/src/Makefile.in 2006-10-21 18:36:18.000000000 +0200
++++ bluefish-1.0.7.new/src/Makefile.in 2007-02-07 12:49:57.000000000 +0100
+@@ -36,7 +36,7 @@
+ CC = @CC@
+ CFLAGS = @CFLAGS@
+ LDFLAGS = @LDFLAGS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ -lhome_etc
+ INSTALL = @INSTALL@
+ INSTALL_DIR = $(INSTALL) -d -m 755
+ INSTALL_PROGRAM = $(INSTALL) -s -m 755
+diff -urN bluefish-1.0.7/src/rcfile.c bluefish-1.0.7.new/src/rcfile.c
+--- bluefish-1.0.7/src/rcfile.c 2006-10-08 17:51:07.000000000 +0200
++++ bluefish-1.0.7.new/src/rcfile.c 2007-02-07 12:52:19.000000000 +0100
+@@ -491,7 +491,7 @@
/*Make the config_rc list ready for filling with data and set default
values */
main_configlist = props_init_main(NULL);
- filename = g_strconcat(g_get_home_dir(), "/.bluefish/rcfile_v2", NULL);
-+ filename = g_strconcat(home_etc ? home_etc : g_get_home_dir(),
"/.bluefish/rcfile_v2", NULL);
++ filename = g_strconcat(_HEdir, "/.bluefish/rcfile_v2", NULL);
if (!parse_config_file(main_configlist, filename)) {
/* should we initialize some things ?? */
}
-@@ -567,7 +568,7 @@
+@@ -582,7 +582,7 @@
main_v->props.filefilters =
g_list_append(main_v->props.filefilters, arr);
}
if (main_v->props.reference_files == NULL) {
- gchar *userdir = g_strconcat(g_get_home_dir(), "/.bluefish/",
NULL);
-+ gchar *userdir = g_strconcat(home_etc ? home_etc :
g_get_home_dir(), "/.bluefish/", NULL);
++ gchar *userdir = g_strconcat(_HEdir, "/.bluefish/", NULL);
/* if the user does not yet have any function reference files,
set them to default values */
fref_rescan_dir(PKGDATADIR);
fref_rescan_dir(userdir);
-@@ -589,7 +590,8 @@
+@@ -616,7 +616,7 @@
}
static gint rcfile_save_main(void) {
- gchar *filename = g_strconcat(g_get_home_dir(), "/.bluefish/rcfile_v2",
NULL);
-+ gchar *home_etc = getenv("HOME_ETC");
-+ gchar *filename = g_strconcat(home_etc ? home_etc : g_get_home_dir(),
"/.bluefish/rcfile_v2", NULL);
++ gchar *filename = g_strconcat(_HEdir, "/.bluefish/rcfile_v2", NULL);
return save_config_file(main_configlist, filename);
}
/*
-@@ -607,13 +609,14 @@
- void rcfile_parse_highlighting(void) {
- gchar *filename;
- gchar *defaultfile;
-+ gchar *home_etc = getenv("HOME_ETC");
-
- DEBUG_MSG("rcfile_parse_highlighting, started\n");
-
+@@ -640,7 +640,7 @@
highlighting_configlist = NULL;
- init_prop_arraylist(&highlighting_configlist,
&main_v->props.highlight_patterns, "patterns:", 0);
+ init_prop_arraylist(&highlighting_configlist,
&main_v->props.highlight_patterns, "patterns:", 0, TRUE);
- filename = g_strconcat(g_get_home_dir(), "/.bluefish/highlighting",
NULL);
-+ filename = g_strconcat(home_etc ? home_etc : g_get_home_dir(),
"/.bluefish/highlighting", NULL);
++ filename = g_strconcat(_HEdir, "/.bluefish/highlighting", NULL);
defaultfile =
return_first_existing_filename(PKGDATADIR"highlighting.default",
"data/highlighting.default",
"../data/highlighting.default",NULL);
-@@ -638,7 +641,8 @@
+@@ -666,7 +666,7 @@
static gint rcfile_save_highlighting(void) {
gint retval;
- gchar *filename = g_strconcat(g_get_home_dir(),
"/.bluefish/highlighting", NULL);
-+ gchar *home_etc = getenv("HOME_ETC");
-+ gchar *filename = g_strconcat(home_etc ? home_etc : g_get_home_dir(),
"/.bluefish/highlighting", NULL);
++ gchar *filename = g_strconcat(_HEdir, "/.bluefish/highlighting", NULL);
retval = save_config_file(highlighting_configlist, filename);
g_free(filename);
return retval;
-@@ -647,6 +651,7 @@
- void rcfile_parse_custom_menu(void) {
- gchar *filename;
- gchar *defaultfile;
-+ gchar *home_etc = getenv("HOME_ETC");
- DEBUG_MSG("rcfile_parse_custom_menu, started\n");
-
- custom_menu_configlist = NULL;
-@@ -654,7 +659,7 @@
- init_prop_arraylist(&custom_menu_configlist,
&main_v->props.cmenu_insert, "cmenu_insert:", 0);
- init_prop_arraylist(&custom_menu_configlist,
&main_v->props.cmenu_replace, "cmenu_replace:", 0);
+@@ -694,7 +694,7 @@
+ init_prop_arraylist(&custom_menu_configlist,
&main_v->props.cmenu_insert, "cmenu_insert:", 0, TRUE);
+ init_prop_arraylist(&custom_menu_configlist,
&main_v->props.cmenu_replace, "cmenu_replace:", 0, TRUE);
- filename = g_strconcat(g_get_home_dir(), "/.bluefish/custom_menu",
NULL);
-+ filename = g_strconcat(home_etc ? home_etc : g_get_home_dir(),
"/.bluefish/custom_menu", NULL);
- defaultfile =
return_first_existing_filename(PKGDATADIR"custom_menu.default",
-
"data/custom_menu.default",
-
"../data/custom_menu.default",NULL);
-@@ -771,7 +776,8 @@
++ filename = g_strconcat(_HEdir, "/.bluefish/custom_menu", NULL);
+
+ if (full_reset || !parse_config_file(custom_menu_configlist, filename)
|| (main_v->props.cust_menu==NULL && main_v->props.cmenu_insert==NULL &&
main_v->props.cmenu_replace==NULL )) {
+ DEBUG_MSG("error parsing the custom menu file, or full_reset is
set\n");
+@@ -815,7 +815,7 @@
}
static gint rcfile_save_custom_menu(void) {
gint retval;
- gchar *filename = g_strconcat(g_get_home_dir(),
"/.bluefish/custom_menu", NULL);
-+ gchar *home_etc = getenv("HOME_ETC");
-+ gchar *filename = g_strconcat(home_etc ? home_etc : g_get_home_dir(),
"/.bluefish/custom_menu", NULL);
++ gchar *filename = g_strconcat(_HEdir, "/.bluefish/custom_menu", NULL);
retval = save_config_file(custom_menu_configlist, filename);
g_free(filename);
return retval;
-@@ -779,7 +785,8 @@
+@@ -823,7 +823,7 @@
#define DIR_MODE (S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) /* same
as 0755 */
void rcfile_check_directory(void) {
- gchar *rcdir = g_strconcat(g_get_home_dir(), "/.bluefish", NULL);
-+ gchar *home_etc = getenv("HOME_ETC");
-+ gchar *rcdir = g_strconcat(home_etc ? home_etc : g_get_home_dir(),
"/.bluefish", NULL);
++ gchar *rcdir = g_strconcat(_HEdir, "/.bluefish", NULL);
if (!g_file_test(rcdir, G_FILE_TEST_IS_DIR)) {
mkdir(rcdir, DIR_MODE);
}
-@@ -799,7 +806,8 @@
+@@ -843,7 +843,7 @@
break;
case 3:
{
- gchar *shortcutfilename = g_strconcat(g_get_home_dir(),
"/.bluefish/menudump_2", NULL);
-+ gchar *home_etc = getenv("HOME_ETC");
-+ gchar *shortcutfilename = g_strconcat(home_etc ?
home_etc : g_get_home_dir(), "/.bluefish/menudump_2", NULL);
++ gchar *shortcutfilename = g_strconcat(_HEdir,
"/.bluefish/menudump_2", NULL);
gtk_accel_map_save(shortcutfilename);
g_free(shortcutfilename);
}
+@@ -935,7 +935,7 @@
+
+ gboolean rcfile_save_global_session(void) {
+ gboolean retval;
+- gchar *filename = g_strconcat(g_get_home_dir(), "/.bluefish/session",
NULL);
++ gchar *filename = g_strconcat(_HEdir, "/.bluefish/session", NULL);
+ GList *configlist = return_globalsession_configlist(FALSE);
+ configlist = return_session_configlist(configlist, main_v->session);
+ DEBUG_MSG("rcfile_save_global_session, saving global session to
%s\n",filename);
+@@ -954,12 +954,12 @@
+ gchar *filename;
+ GList *configlist = return_globalsession_configlist(TRUE);
+ configlist = return_session_configlist(configlist, main_v->session);
+- filename = g_strconcat(g_get_home_dir(), "/.bluefish/session", NULL);
++ filename = g_strconcat(_HEdir, "/.bluefish/session", NULL);
+ if (!file_exists_and_readable(filename)) {
+ /* versions before 0.13 did not have a separate session file,
so
+ we'll try to load these items from rcfile_v2 */
+ g_free(filename);
+- filename = g_strconcat(g_get_home_dir(),
"/.bluefish/rcfile_v2", NULL);
++ filename = g_strconcat(_HEdir, "/.bluefish/rcfile_v2", NULL);
+ }
+ retval = parse_config_file(configlist, filename);
+ free_configlist(configlist);
================================================================
Index: SOURCES/bluefish-locales.patch
diff -u SOURCES/bluefish-locales.patch:1.4 SOURCES/bluefish-locales.patch:1.5
--- SOURCES/bluefish-locales.patch:1.4 Mon Jun 13 20:10:19 2005
+++ SOURCES/bluefish-locales.patch Wed Feb 7 14:17:09 2007
@@ -1,24 +1,24 @@
-diff -aurN bluefish-1.0.1.orig/configure.ac bluefish-1.0.1/configure.ac
---- bluefish-1.0.1.orig/configure.ac 2005-05-08 22:05:16.000000000 +0200
-+++ bluefish-1.0.1/configure.ac 2005-06-13 19:35:05.810785848 +0200
+diff -urN bluefish-1.0.7/configure.ac bluefish-1.0.7.new/configure.ac
+--- bluefish-1.0.7/configure.ac 2007-02-07 11:33:01.000000000 +0100
++++ bluefish-1.0.7.new/configure.ac 2007-02-07 11:36:56.000000000 +0100
@@ -30,7 +30,7 @@
AC_DEFINE_UNQUOTED(CONFIGURE_OPTIONS, "$0 $*")
# these are the languages that will be installed, so these should be finished
--ALL_LINGUAS="bg cs da de es fi fr hu it ja no pl pt pt_BR ru sr sv ta tr
zh_CN zh_TW"
-+ALL_LINGUAS="bg cs da de es fi fr hu it ja nb nl pl pt pt_BR ru [EMAIL
PROTECTED] sv ta tr zh_CN zh_TW"
+-ALL_LINGUAS="bg cs da de es eu fi fr hu it ja no pl pt pt_BR ru sk sr sv ta
tr zh_CN zh_TW"
++ALL_LINGUAS="bg cs da de es eu fi fr hu it ja nb nl pl pt pt_BR ru sk [EMAIL
PROTECTED] sv ta tr zh_CN zh_TW"
AC_SUBST(ALL_LINGUAS)
dnl ************************
-diff -aurN bluefish-1.0.1.orig/po/Makefile.in bluefish-1.0.1/po/Makefile.in
---- bluefish-1.0.1.orig/po/Makefile.in 2005-04-12 04:32:33.000000000 +0200
-+++ bluefish-1.0.1/po/Makefile.in 2005-06-13 19:43:29.564203688 +0200
-@@ -25,7 +25,7 @@
+diff -urN bluefish-1.0.7/po/Makefile.in bluefish-1.0.7.new/po/Makefile.in
+--- bluefish-1.0.7/po/Makefile.in 2007-02-07 11:33:01.000000000 +0100
++++ bluefish-1.0.7.new/po/Makefile.in 2007-02-07 11:37:42.000000000 +0100
+@@ -26,7 +26,7 @@
XGETTEXT = @XGETTEXT@
MSGMERGE = @MSGMERGE@
--SRCS = bg.po cs.po da.po de.po el.po es.po fi.po fr.po hu.po it.po ja.po
nl.po no.po pl.po pt.po pt_BR.po ro.po ru.po sr.po sv.po ta.po tr.po zh_CN.po
zh_TW.po
-+SRCS = bg.po cs.po da.po de.po el.po es.po fi.po fr.po hu.po it.po ja.po
nb.po nl.po pl.po pt.po pt_BR.po ro.po ru.po [EMAIL PROTECTED] sv.po ta.po
tr.po zh_CN.po zh_TW.po
+-SRCS = bg.po cs.po da.po de.po el.po es.po eu.po fi.po fr.po hu.po it.po
ja.po nl.po no.po pl.po pt.po pt_BR.po ro.po ru.po sk.po sr.po sv.po ta.po
tr.po zh_CN.po zh_TW.po
++SRCS = bg.po cs.po da.po de.po el.po es.po eu.po fi.po fr.po hu.po it.po
ja.po nl.po nb.po pl.po pt.po pt_BR.po ro.po ru.po sk.po [EMAIL PROTECTED]
sv.po ta.po tr.po zh_CN.po zh_TW.po
.SUFFIXES: .po .gmo
OBJS = $(SRCS:.po=.gmo)
-
\ No newline at end of file
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/bluefish-desktop.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/SOURCES/bluefish-home_etc.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/bluefish-locales.patch?r1=1.4&r2=1.5&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
