rpms/gnome-commander/devel gnome-commander-rev1874-hexmode-display.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 gnome-commander.spec, 1.21, 1.22 sources, 1.7, 1.8

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/gnome-commander/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6436

Modified Files:
	.cvsignore gnome-commander.spec sources 
Added Files:
	gnome-commander-rev1874-hexmode-display.patch 
Log Message:
* Mon Jul 14 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 1874
- Workaround for Decimal offset mode in Hexdump display mode


gnome-commander-rev1874-hexmode-display.patch:

--- NEW FILE gnome-commander-rev1874-hexmode-display.patch ---
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);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Jul 2008 04:12:33 -0000	1.7
+++ .cvsignore	13 Jul 2008 18:05:38 -0000	1.8
@@ -1 +1 @@
-gnome-commander-1.2.7-svn1870_trunk.tar.bz2
+gnome-commander-1.2.7-svn1874_trunk.tar.bz2


Index: gnome-commander.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/devel/gnome-commander.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gnome-commander.spec	11 Jul 2008 04:12:33 -0000	1.21
+++ gnome-commander.spec	13 Jul 2008 18:05:38 -0000	1.22
@@ -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 @@
 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 @@
 
 %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 @@
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
+* Mon Jul 14 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 1874
+- Workaround for Decimal offset mode in Hexdump display mode
+
 * Fri Jul 11 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - try rev 1870
 - ja.po is merged upstream


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	11 Jul 2008 04:12:33 -0000	1.7
+++ sources	13 Jul 2008 18:05:38 -0000	1.8
@@ -1 +1 @@
-bde0598ff6c183b478bf67f086140cbc  gnome-commander-1.2.7-svn1870_trunk.tar.bz2
+b8dfb30331a73ce16d0d92427aa05186  gnome-commander-1.2.7-svn1874_trunk.tar.bz2