From bfa94c24f601ce76ff8e087a59ae2fde0071736d Mon Sep 17 00:00:00 2001
From: Mamoru Tasaka <mtasaka@fedoraproject.org>
Date: Sun, 13 Jul 2008 18:05:38 +0000
Subject: [PATCH] - rev 1874 - Workaround for Decimal offset mode in Hexdump
 display mode

---
 .cvsignore                                    |  2 +-
 gnome-commander-rev1874-hexmode-display.patch | 18 ++++++++++++++++++
 gnome-commander.spec                          |  8 +++++++-
 sources                                       |  2 +-
 4 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 gnome-commander-rev1874-hexmode-display.patch

diff --git a/.cvsignore b/.cvsignore
index 22f4c38..fdd8857 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-commander-1.2.7-svn1870_trunk.tar.bz2
+gnome-commander-1.2.7-svn1874_trunk.tar.bz2
diff --git a/gnome-commander-rev1874-hexmode-display.patch b/gnome-commander-rev1874-hexmode-display.patch
new file mode 100644
index 0000000..07d6f25
--- /dev/null
+++ b/gnome-commander-rev1874-hexmode-display.patch
@@ -0,0 +1,18 @@
+Index: src/intviewer/text-render.cc
+===================================================================
+--- src/intviewer/text-render.cc	(revision 1874)
++++ src/intviewer/text-render.cc	(working copy)
+@@ -1954,7 +1954,12 @@
+     show_marker = (marker_start!=marker_end);
+     text_render_utf8_clear_buf(w);
+ 
+-    if (w->priv->hex_offset_display)
++    //  Temporary workaround
++    //  Currently when "_Decimal Offset in Hexdump" is set,
++    //  hex_offset_display is set, however at this state offset must
++    //  be displayed in decimal!!
++
++    if (!(w->priv->hex_offset_display))
+         text_render_utf8_printf(w, "%08lx  ", (unsigned long)start_of_line);
+     else
+         text_render_utf8_printf(w, "%09lu ", (unsigned long)start_of_line);
diff --git a/gnome-commander.spec b/gnome-commander.spec
index 05823bf..0395cda 100644
--- a/gnome-commander.spec
+++ b/gnome-commander.spec
@@ -11,7 +11,7 @@
 %define        use_autotool          0
 %define        if_pre                1
 %define        main_release          1
-%define        extratag              svn1870_trunk
+%define        extratag              svn1874_trunk
 
 %if 0%{?if_pre} > 0
 %define        use_autotool          1
@@ -30,6 +30,7 @@ Group:         Applications/File
 License:       GPLv2+
 URL:           http://www.nongnu.org/gcmd/
 Source0:       ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.2/%{name}-%{version}%{?extratag:-%extratag}.tar.bz2
+Patch0:        gnome-commander-rev1874-hexmode-display.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: desktop-file-utils
@@ -92,6 +93,7 @@ ansluta till FTP-servrar och SMB-nätverk.
 
 %prep
 %setup -q -n %{name}-%{version}%{?extratag:-%extratag}
+%patch0 -p0 -b .hexdumpmode
 %if 0%{use_autotool} > 0
 %{__sed} -i.conf '$s|^\(.*\)|NOCONFIGURE=1 \1|' autogen.sh
 sh autogen.sh
@@ -159,6 +161,10 @@ scrollkeeper-update -q || :
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
+* Mon Jul 14 2008 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp>
+- rev 1874
+- Workaround for Decimal offset mode in Hexdump display mode
+
 * Fri Jul 11 2008 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp>
 - try rev 1870
 - ja.po is merged upstream
diff --git a/sources b/sources
index 5fdc75a..18e9225 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bde0598ff6c183b478bf67f086140cbc  gnome-commander-1.2.7-svn1870_trunk.tar.bz2
+b8dfb30331a73ce16d0d92427aa05186  gnome-commander-1.2.7-svn1874_trunk.tar.bz2