pool/ghex
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 155837 from home:sbrabec:branches:GNOME:Apps

Browse Source 
- Removed obsolete ghex-empty-search-crash.patch. (bgo#473208)

OBS-URL: https://build.opensuse.org/request/show/155837
OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/ghex?expand=0&rev=30
This commit is contained in:
Dominique Leuenberger 2013-02-19 20:12:59 +00:00 committed by Git OBS Bridge
parent f6ba4176b1
commit a06c8cc4c1
3 changed files with 6 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ghex-empty-search-crash.patch
View File

@ -1,38 +0,0 @@
http://bugzilla.gnome.org/show_bug.cgi?id=473208
================================================================================
--- src/accessiblegtkhex.c
+++ src/accessiblegtkhex.c
@@ -299,11 +299,13 @@
format_xblock (gtk_hex, str, 0,gtk_hex->document->file_size);
}
- utf8 = g_locale_to_utf8 (str, -1, NULL, NULL, NULL);
- gail_text_util_text_setup (access_gtk_hex->textutil, utf8);
+ if (str) {
+ utf8 = g_locale_to_utf8 (str, -1, NULL, NULL, NULL);
+ gail_text_util_text_setup (access_gtk_hex->textutil, utf8);
+ g_free (utf8);
+ }
g_free (str);
- g_free (utf8);
return gail_text_util_get_substring (access_gtk_hex->textutil,
start_pos, end_pos);
@@ -494,11 +496,13 @@
format_xblock (gtkhex, str, 0, gtkhex->document->file_size);
}
- utf8 = g_locale_to_utf8 (str, -1, NULL, NULL, NULL);
- gail_text_util_text_setup (accessible_gtk_hex->textutil, str);
+ if (str) {
+ utf8 = g_locale_to_utf8 (str, -1, NULL, NULL, NULL);
+ gail_text_util_text_setup (accessible_gtk_hex->textutil, str);
+ g_free (utf8);
+ }
g_free (str);
- g_free (utf8);
}

5
ghex.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Feb 19 17:17:47 CET 2013 - sbrabec@suse.cz
- Removed obsolete ghex-empty-search-crash.patch. (bgo#473208)
-------------------------------------------------------------------
Tue Oct 16 16:01:53 UTC 2012 - zaitor@opensuse.org

5
ghex.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package ghex
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -24,8 +24,6 @@ License: GPL-2.0+
Group: Development/Tools/Other
Url: http://www.gnome.org/
Source: http://download.gnome.org/sources/ghex/3.6/%{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM ghex-empty-search-crash.patch bgo#473208
Patch7: ghex-empty-search-crash.patch
BuildRequires: fdupes
BuildRequires: gnome-doc-utils-devel
BuildRequires: intltool
@ -67,7 +65,6 @@ a non-ASCII format for saving.
%prep
%setup -n ghex-%{version}
translation-update-upstream
%patch7
%build
%configure --with-pic\