rpms/gnomesword/devel gnomesword-2.1.6-svn1213-kjvot.patch, NONE, 1.1 gnomesword.spec, 1.9, 1.10
Michael A. Peters (mpeters)
fedora-extras-commits at redhat.com
Tue May 2 15:50:25 UTC 2006
Author: mpeters
Update of /cvs/extras/rpms/gnomesword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13886/devel
Modified Files:
gnomesword.spec
Added Files:
gnomesword-2.1.6-svn1213-kjvot.patch
Log Message:
Fixes bug 190413
gnomesword-2.1.6-svn1213-kjvot.patch:
--- NEW FILE gnomesword-2.1.6-svn1213-kjvot.patch ---
diff -ur gnomesword-2.1.6/src/backend/gs_osishtmlhref.cpp gnomesword-2.1.6-patched/src/backend/gs_osishtmlhref.cpp
--- gnomesword-2.1.6/src/backend/gs_osishtmlhref.cpp 2006-04-04 10:16:30.000000000 -0700
+++ gnomesword-2.1.6-patched/src/backend/gs_osishtmlhref.cpp 2006-05-02 08:29:36.000000000 -0700
@@ -408,7 +408,10 @@
// <milestone type="x-p" marker="¶"/>
else if (!strcmp(tag.getName(), "milestone")&& tag.getAttribute("type")) {
if(!strcmp(tag.getAttribute("type"),"x-p"))
- buf += tag.getAttribute("marker");
+ if( tag.getAttribute("marker"))
+ buf += tag.getAttribute("marker");
+ else
+ buf += "<!p>";
else if(!strcmp(tag.getAttribute("type"), "line")) {
buf += "<br />";
//g_message("\ntoken: %s\ntag: %s\ntype: %s",token,tag.getName(),tag.getAttribute("type"));
@@ -437,7 +440,7 @@
if(u->inName) {
char firstChar = *u->lastTextNode.c_str();
const char *name = u->lastTextNode.c_str();
- g_message("\nverse: %s\ntoken: %s\nname: %s",(char*)u->key->getText(), token,name);
+ //g_message("\nverse: %s\ntoken: %s\nname: %s",(char*)u->key->getText(), token,name);
++name;
buf += firstChar;
buf += "<font size=\"-1\">";
diff -ur gnomesword-2.1.6/src/backend/sword_main.cc gnomesword-2.1.6-patched/src/backend/sword_main.cc
--- gnomesword-2.1.6/src/backend/sword_main.cc 2006-04-04 13:46:50.000000000 -0700
+++ gnomesword-2.1.6-patched/src/backend/sword_main.cc 2006-05-02 08:29:36.000000000 -0700
@@ -486,7 +486,8 @@
vkey.AutoNormalize(1);
vkey = mykey;
g_free(mykey);
- mykey = g_convert((char*)vkey.getText(),
+
+ mykey = g_convert((char*)vkey.getShortText(),
-1,
UTF_8,
OLD_CODESET,
diff -ur gnomesword-2.1.6/src/gnome2/main_window.c gnomesword-2.1.6-patched/src/gnome2/main_window.c
--- gnomesword-2.1.6/src/gnome2/main_window.c 2006-04-12 11:17:31.000000000 -0700
+++ gnomesword-2.1.6-patched/src/gnome2/main_window.c 2006-05-02 08:29:36.000000000 -0700
@@ -806,6 +806,24 @@
settings.gs_hight);
}
+/*
+void new_main_window(void)
+{
+ gchar *glade_file;
+ GladeXML *gxml;
+
+ glade_file =
+ gui_general_user_file("main-window.glade", FALSE);
+ g_return_if_fail(glade_file != NULL);
+ g_message(glade_file);
+
+ // ** build the widget **
+ gxml = glade_xml_new(glade_file, "main-window", NULL);
+
+
+
+}
+
/******************************************************************************
* Name
diff -ur gnomesword-2.1.6/src/gnome2/search_dialog.c gnomesword-2.1.6-patched/src/gnome2/search_dialog.c
--- gnomesword-2.1.6/src/gnome2/search_dialog.c 2006-03-29 08:27:16.000000000 -0800
+++ gnomesword-2.1.6-patched/src/gnome2/search_dialog.c 2006-05-02 08:29:36.000000000 -0700
@@ -22,7 +22,7 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
-
+
#include <gnome.h>
#include <glade/glade-xml.h>
diff -ur gnomesword-2.1.6/src/main/display.cc gnomesword-2.1.6-patched/src/main/display.cc
--- gnomesword-2.1.6/src/main/display.cc 2006-04-02 20:08:46.000000000 -0700
+++ gnomesword-2.1.6-patched/src/main/display.cc 2006-05-02 08:29:36.000000000 -0700
@@ -400,21 +400,20 @@
main_set_strongs_morphs_off(ops);
}
#endif
-/* if (newparagraph && settings.versestyle) {
+ if (newparagraph && settings.versestyle) {
newparagraph = FALSE;
swbuf += paragraphMark;;
}
-*/
+
swbuf += (const char *)imodule;
buf = g_strdup_printf("%s",(const char *)imodule);
if (settings.versestyle) {
- /*if(g_strstr_len(buf,strlen(buf),"<!p>")||
- g_strstr_len(buf,strlen(buf),"<p>")) {
+ if(g_strstr_len(buf,strlen(buf),"<!p>")) {
newparagraph = TRUE;
} else {
newparagraph = FALSE;
- }*/
+ }
swbuf.append("</font><br>");
} else {
swbuf.append("</font>");
diff -ur gnomesword-2.1.6/src/main/navbar.cc gnomesword-2.1.6-patched/src/main/navbar.cc
--- gnomesword-2.1.6/src/main/navbar.cc 2006-03-14 13:41:21.000000000 -0800
+++ gnomesword-2.1.6-patched/src/main/navbar.cc 2006-05-02 08:29:36.000000000 -0700
@@ -137,6 +137,7 @@
void main_navbar_fill_book_combo(NAVBAR navbar)
{
VerseKey key;
+ VerseKey key_abrev;
gsize bytes_read;
gsize bytes_written;
GError *error = NULL;
@@ -155,15 +156,16 @@
GTK_COMBO_BOX(navbar.comboboxentry_book));
gtk_list_store_clear(GTK_LIST_STORE(book_model));
if (backend->module_has_testament(navbar.module_name, 1)) {
- while(i < key.BMAX[0]) {
-
- book = g_convert((const char *)key.books[0][i].name,
+ while(i < key.BMAX[0]) {
+ key_abrev = key.books[0][i].name;
+ book = g_convert((const char *)key_abrev.getBookAbbrev(),
-1,
UTF_8,
OLD_CODESET,
&bytes_read,
&bytes_written,
&error);
+
if(book == NULL) {
g_print ("error: %s\n", error->message);
g_error_free (error);
@@ -181,9 +183,9 @@
}
i = 0;
if (backend->module_has_testament(navbar.module_name, 2)) {
- while(i < key.BMAX[1]) {
- //g_message((const char *)key.books[1][i].name);
- book = g_convert((const char *)key.books[1][i].name,
+ while(i < key.BMAX[1]) {
+ key_abrev = key.books[1][i].name;
+ book = g_convert((const char *)key_abrev.getBookAbbrev(),
-1,
UTF_8,
OLD_CODESET,
Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/gnomesword.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnomesword.spec 25 Apr 2006 07:41:35 -0000 1.9
+++ gnomesword.spec 2 May 2006 15:50:25 -0000 1.10
@@ -1,12 +1,13 @@
Name: gnomesword
Version: 2.1.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: GNOME-based Bible research tool
Group: Applications/Text
License: GPL
URL: http://gnomesword.sourceforge.net/
Source0: http://easynews.dl.sourceforge.net/sourceforge/gnomesword/gnomesword-%{version}.tar.gz
+Patch0: gnomesword-2.1.6-svn1213-kjvot.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: sed >= 3.95
@@ -32,6 +33,7 @@
%prep
%setup -q
+%patch0 -p1
%{__sed} -i 's?\r??' doc/help/C/legal.xml
%{__sed} -i 's?\r??' doc/help/fr/legal.xml
@@ -80,6 +82,10 @@
%changelog
+* Tue May 02 2006 Michael A. Peters <mpeters at mac.com> - 2.1.6-2
+- Fixed crash when viewing OT using KJV module (Patch0)
+- Closes bug 190413
+
* Tue Apr 25 2006 Michael A. Peters <mpeters at mac.com> - 2.1.6-1
- New upstream version
- removed commented out fixes for since upstream fixed 64-bit issues
More information about the fedora-extras-commits
mailing list