rpms/bluefish/devel bluefish-2.0.0-rc3-projects.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 bluefish.spec, 1.32, 1.33 sources, 1.11, 1.12 bluefish-2.0.0-rc2-snippets.patch, 1.1, NONE
Paul Howarth
pghmcfc at fedoraproject.org
Mon Feb 1 10:52:19 UTC 2010
Author: pghmcfc
Update of /cvs/pkgs/rpms/bluefish/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25494
Modified Files:
.cvsignore bluefish.spec sources
Added Files:
bluefish-2.0.0-rc3-projects.patch
Removed Files:
bluefish-2.0.0-rc2-snippets.patch
Log Message:
* Sun Jan 31 2010 Paul Howarth <paul at city-fan.org> - 2.0.0-0.3.rc3
- Update to 2.0.0-rc3
- Drop snippets patch
- Add upstream patch resolving some project-related issues (#549552)
bluefish-2.0.0-rc3-projects.patch:
data/bflang/diff.bflang2 | 29 +++++++++++++++--------------
data/bflang/xml.bflang2 | 13 ++++++++++---
src/filebrowser2.c | 12 +++++++++++-
src/project.c | 22 +++++++++++++---------
4 files changed, 49 insertions(+), 27 deletions(-)
--- NEW FILE bluefish-2.0.0-rc3-projects.patch ---
Index: src/project.c
===================================================================
--- src/project.c (revision 5723)
+++ src/project.c (working copy)
@@ -321,15 +321,19 @@
prwin = gui_new_window(prj);
}
tmplist = g_list_last(prj->files);
- while (tmplist) {
- GFile *uri;
- if (strstr ((gchar *) tmplist->data, "://") == NULL)
- uri = g_file_new_for_path((gchar *) tmplist->data);
- else
- uri = g_file_new_for_uri((gchar *) tmplist->data);
- doc_new_from_uri(prwin, uri, NULL, (prj->files->next==NULL), TRUE, -1, -1);
- g_object_unref(uri);
- tmplist = g_list_previous(tmplist);
+ if (tmplist) {
+ while (tmplist) {
+ GFile *uri;
+ if (strstr ((gchar *) tmplist->data, "://") == NULL)
+ uri = g_file_new_for_path((gchar *) tmplist->data);
+ else
+ uri = g_file_new_for_uri((gchar *) tmplist->data);
+ doc_new_from_uri(prwin, uri, NULL, !(prj->files->prev==NULL), TRUE, -1, -1);
+ g_object_unref(uri);
+ tmplist = g_list_previous(tmplist);
+ }
+ } else {
+ doc_new(bfwin, FALSE);
}
DEBUG_MSG("project_open_from_file, new window with files ready at prwin=%p\n",prwin);
setup_bfwin_for_project(prwin);
Index: src/filebrowser2.c
===================================================================
--- src/filebrowser2.c (revision 5723)
+++ src/filebrowser2.c (working copy)
@@ -1762,11 +1762,21 @@
case 8:
{
GtkTreePath *fs_path;
+ GtkTreeIter iter;
+
fs_path = fb2_fspath_from_dir_selection(fb2);
DEBUG_MSG("fb2rpopup_rpopup_action_lcb, fs_path=%p\n", fs_path);
refilter_dirlist(fb2, fs_path);
gtk_tree_path_free(fs_path);
- fb2_focus_document(fb2->bfwin, fb2->bfwin->current_document);
+ if (fb2->bfwin->session->filebrowser_focus_follow) {
+ fb2_focus_document(fb2->bfwin, fb2->bfwin->current_document);
+ }
+ gtk_tree_model_get_iter_first(fb2->dir_tsort, &iter);
+ fs_path = gtk_tree_model_get_path(fb2->dir_tsort, &iter);
+ if(!gtk_tree_view_row_expanded(GTK_TREE_VIEW(fb2->dir_v), fs_path)) {
+ gtk_tree_view_expand_row(GTK_TREE_VIEW(fb2->dir_v), fs_path, FALSE);
+ }
+ gtk_tree_path_free(fs_path);
}
break;
case 9:
Index: data/bflang/diff.bflang2
===================================================================
--- data/bflang/diff.bflang2 (revision 5723)
+++ data/bflang/diff.bflang2 (working copy)
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<!--
Bluefish HTML Editor
- shell.bflang2 $Revision: 5464 $
+ diff.bflang2 $Revision: 5464 $
- Copyright (C) 2008,2009 Olivier Sessink
+ Copyright (C) 2008-2010 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
@@ -20,27 +20,28 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-->
-<bflang name="Diff/Patch" version="2.0">
+<bflang name="Diff/Patch" version="2.0" table="27" contexts="2" matches="6">
<header>
<mime type="text/x-diff"/>
<mime type="text/x-patch"/>
- <highlight name="added" style="special-value" />
- <highlight name="fileinfo" style="warning" />
- <highlight name="removed" style="value" />
- <highlight name="line" style="comment" />
+ <highlight name="added" style="special-function" />
+ <highlight name="comment" style="comment" />
+ <highlight name="fileinfo" style="operator" />
<highlight name="index" style="keyword" />
+ <highlight name="line" style="tag" />
+ <highlight name="removed" style="function" />
</header>
<properties>
- <comment type="line" start="#" />
+ <comment type="comment" start="#" />
</properties>
<definition>
-<context symbols=" $;(){}[]:\"\\',><*&^%!+=-|/?#	 ">
-<element pattern=" Index:[^ ]+" is_regex="1" highlight="index" /><!-- doesn't catch first line! -->
-<element pattern=" \+\+\+[^ ]+" is_regex="1" highlight="fileinfo" />
-<element pattern=" ---[^ ]+" is_regex="1" highlight="fileinfo" />
-<element pattern=" \+[^ ]*" is_regex="1" highlight="added" />
-<element pattern=" -[^ ]*" is_regex="1" highlight="removed" />
+<context symbols=" $;(){}[]:\"\\',><*&^%!+=-|/?#	 -">
+<element pattern="[ ]?Index:[^ ]+" is_regex="1" highlight="index" />
+<element pattern=" (\+\+\+ |--- )[^ ]+" is_regex="1" highlight="fileinfo" />
+<element pattern=" (>|\+)[^\+ ]*" is_regex="1" highlight="added" />
+<element pattern=" (<|-)[^- ]*" is_regex="1" highlight="removed" />
+<element pattern=" (@@|[0-9])[^ ]*" is_regex="1" highlight="line"/>
<!-- <element id="e.diff.removed" pattern=" -" starts_block="1" mayfold="0" highlight="removed"/>
<element pattern=" [^-]" is_regex="1" ends_block="1" blockstartelement="e.diff.removed" highlight="removed"/>
Index: data/bflang/xml.bflang2
===================================================================
--- data/bflang/xml.bflang2 (revision 5726)
+++ data/bflang/xml.bflang2 (working copy)
@@ -3,7 +3,7 @@
Bluefish HTML Editor
xml.bflang2 $Revision: 5466 $
- Copyright (C) 2008 Olivier Sessink
+ Copyright (C) 2008-2010 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
@@ -20,7 +20,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-->
-<bflang name="XML" version="2.0" table="55" contexts="7" matches="16">
+<bflang name="XML" version="2.0" table="60" contexts="8" matches="18">
<header>
<mime type="text/xml"/>
<mime type="application/xml"/>
@@ -48,6 +48,12 @@
<element pattern=""" highlight="string" ends_context="1"/>
</context>
</element>
+ <element id="e.xml.stringstart2" pattern="'" highlight="string">
+ <context symbols="&;\'" highlight="string" >
+ <element id="e.xml.entity" pattern="&[a-z0-9#]+;" is_regex="1" highlight="entity" />
+ <element pattern="'" highlight="string" ends_context="1"/>
+ </context>
+ </element>
</context>
</element>
<element id="e.xml.lcomment" pattern="<!--" highlight="comment" starts_block="1">
@@ -60,7 +66,8 @@
<element pattern="[_a-zA-Z0-9:-]+" is_regex="1" highlight="attribute" />
<element pattern="=" highlight="assignment" />
<element idref="e.xml.stringstart"/>
- <element pattern="'[^']+'" highlight="string" is_regex="1" />
+<!-- <element pattern="'[^']+'" highlight="string" is_regex="1" />-->
+ <element idref="e.xml.stringstart2"/>
<element pattern="/>" highlight="tag" ends_context="1" ends_block="1" blockstartelement="e.xml.tag.open" />
<element pattern=">" highlight="tag">
<context symbols="><&; 	 ">
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluefish/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore 27 Jan 2010 21:57:14 -0000 1.11
+++ .cvsignore 1 Feb 2010 10:52:19 -0000 1.12
@@ -1 +1 @@
-bluefish-2.0.0-rc2.tar.bz2
+bluefish-2.0.0-rc3.tar.bz2
Index: bluefish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluefish/devel/bluefish.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- bluefish.spec 27 Jan 2010 21:57:14 -0000 1.32
+++ bluefish.spec 1 Feb 2010 10:52:19 -0000 1.33
@@ -1,6 +1,6 @@
%global pkgver 2.0.0
-%global prerel rc2
-%global rpmrel 2
+%global prerel rc3
+%global rpmrel 3
Name: bluefish
Version: %{pkgver}
@@ -10,7 +10,7 @@ Group: Development/Tools
License: GPLv2+
URL: http://bluefish.openoffice.nl/
Source0: http://www.bennewitz.com/bluefish/stable/source/bluefish-%{version}%{?prerel:-%{prerel}}.tar.bz2
-Patch0: bluefish-2.0.0-rc2-snippets.patch
+Patch0: bluefish-2.0.0-rc3-projects.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
BuildRequires: enchant-devel >= 1.4.2
@@ -65,8 +65,8 @@ Files common to every architecture versi
%prep
%setup -q -n %{name}-%{version}%{?prerel:-%{prerel}}
-# Apply upstream patch to re-enable snippets menu
-%patch0 -p2
+# Upstream patch resolving some project-related issues (#549552)
+%patch0 -p0
%build
%configure --disable-dependency-tracking \
@@ -144,6 +144,11 @@ fi
%{_mandir}/man1/%{name}.1*
%changelog
+* Sun Jan 31 2010 Paul Howarth <paul at city-fan.org> - 2.0.0-0.3.rc3
+- Update to 2.0.0-rc3
+- Drop snippets patch
+- Add upstream patch resolving some project-related issues (#549552)
+
* Wed Jan 27 2010 Paul Howarth <paul at city-fan.org> - 2.0.0-0.2.rc2
- Update to 2.0.0-rc2
- Apply upstream patch to re-enable snippets menu
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluefish/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources 27 Jan 2010 21:57:14 -0000 1.11
+++ sources 1 Feb 2010 10:52:19 -0000 1.12
@@ -1 +1 @@
-4ca324ef5b1885876b5112668654577d bluefish-2.0.0-rc2.tar.bz2
+e42c346da4b232b2ea0469819f4baad2 bluefish-2.0.0-rc3.tar.bz2
--- bluefish-2.0.0-rc2-snippets.patch DELETED ---
More information about the scm-commits
mailing list