diff --git a/geeqie-1.0alpha2-float-layout.patch b/geeqie-1.0alpha2-float-layout.patch new file mode 100644 index 0000000..e70137e --- /dev/null +++ b/geeqie-1.0alpha2-float-layout.patch @@ -0,0 +1,14 @@ +diff -Nur geeqie-1.0alpha2-orig/src/filedata.c geeqie-1.0alpha2/src/filedata.c +--- geeqie-1.0alpha2-orig/src/filedata.c 2008-07-30 22:01:32.000000000 +0200 ++++ geeqie-1.0alpha2/src/filedata.c 2008-08-12 10:45:35.000000000 +0200 +@@ -2083,7 +2083,9 @@ + { + gint count; + +- g_assert(file_data_monitor_pool); ++ if (!file_data_monitor_pool) { ++ return FALSE; ++ } + + count = GPOINTER_TO_INT(g_hash_table_lookup(file_data_monitor_pool, fd)); + diff --git a/geeqie.spec b/geeqie.spec index ac829e3..5cca53f 100644 --- a/geeqie.spec +++ b/geeqie.spec @@ -3,7 +3,7 @@ Summary: Image browser and viewer Name: geeqie Version: 1.0 -Release: 0.7.alpha2%{?dist} +Release: 0.8.alpha2%{?dist} License: GPLv3 Group: User Interface/X Source: http://dl.sf.net/sourceforge/geeqie/%{name}-%{upstreamversion}.tar.gz @@ -13,6 +13,7 @@ Patch2: geeqie-1.0alpha2-editors.patch Patch3: geeqie-1.0alpha1-print-pagesize.patch Patch4: geeqie-1.0alpha2-gcc-warn.patch Patch5: geeqie-1.0alpha2-remote-blank.patch +Patch6: geeqie-1.0alpha2-float-layout.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) URL: http://geeqie.sourceforge.net/ BuildRequires: gtk2-devel >= 2.4.0 @@ -44,6 +45,7 @@ and zoom. %patch3 -p1 -b .print-pagesize %patch4 -p1 -b .gcc-warn %patch5 -p1 -b .remote-blank +%patch6 -p1 -b .float-layout %build @@ -92,6 +94,9 @@ update-desktop-database &> /dev/null || : %changelog +* Tue Aug 12 2008 Michael Schwendt - 1.0-0.8.alpha2 +- fix float layout for --blank mode + * Mon Aug 11 2008 Michael Schwendt - 1.0-0.7.alpha2 - fix options --blank and -r file: