rpms/jd/F-8 jd-2.1.0-issue-jd6-868.patch, NONE, 1.1 jd.spec, 1.371, 1.372

Mamoru Tasaka mtasaka at fedoraproject.org
Tue Dec 30 02:13:52 UTC 2008


Author: mtasaka

Update of /cvs/extras/rpms/jd/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26461/F-8

Modified Files:
	jd.spec 
Added Files:
	jd-2.1.0-issue-jd6-868.patch 
Log Message:
* Tue Dec 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.0-2
- Workaround for the issue on res 868 in JD 6 thread (segv when
  bookmarking when bookmark is empty)


jd-2.1.0-issue-jd6-868.patch:

--- NEW FILE jd-2.1.0-issue-jd6-868.patch ---
--- src/skeleton/edittreeview.cpp.debug	2008-12-21 23:13:30.000000000 +0900
+++ src/skeleton/edittreeview.cpp	2008-12-30 11:06:19.000000000 +0900
@@ -852,8 +852,14 @@
     Gtk::TreePath path = path_dest;
 
     if( path.empty() ){
-        path = get_model()->get_path( *( get_model()->children().rbegin() ) );
-        path.next();
+        Gtk::TreeModel::Children children = get_model()->children();
+
+        if( ! children.empty() )
+         {
+            path = get_model()->get_path( *( children.rbegin() ) );
+            path.next();
+         }
+        else return;
     }
 
     else if( before );


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/jd.spec,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -r1.371 -r1.372
--- jd.spec	28 Dec 2008 15:37:58 -0000	1.371
+++ jd.spec	30 Dec 2008 02:13:22 -0000	1.372
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    1
+%define         vendor_rel    2
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -53,6 +53,7 @@
 URL:            http://jd4linux.sourceforge.jp/
 Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
+Patch0:		jd-2.1.0-issue-jd6-868.patch 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -78,6 +79,7 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
+%patch0 -p0 -b .issue868
 #find . -name .svn | sort -r | xargs %{__rm} -rf
 
 sh autogen.sh
@@ -133,6 +135,10 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Tue Dec 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.0-2
+- Workaround for the issue on res 868 in JD 6 thread (segv when
+  bookmarking when bookmark is empty)
+
 * Mon Dec 29 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.0-1
 - 2.1.0
 




More information about the fedora-extras-commits mailing list