rpms/wallpapoz/F-13 daemon_wallpapoz-wrapper, 1.3, 1.4 wallpapoz-0.4.1-rev92-delete-first-in-desktop-mode.patch, NONE, 1.1 wallpapoz.spec, 1.39, 1.40

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/wallpapoz/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv15428/F-13

Modified Files:
	wallpapoz.spec 
Added Files:
	daemon_wallpapoz-wrapper 
	wallpapoz-0.4.1-rev92-delete-first-in-desktop-mode.patch 
Log Message:
* Tue Jun 15 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-24.svn92_trunk
- Fix backtrace when deleting first element in desktop (not workspace) mode
  (bug 597959)
- Install daemon_wallpapoz wrapper script to check if xprop really works before
  launching daemon (may fix 584980, 597687??)



Index: daemon_wallpapoz-wrapper
===================================================================
RCS file: daemon_wallpapoz-wrapper
diff -N daemon_wallpapoz-wrapper
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ daemon_wallpapoz-wrapper	14 Jun 2010 18:42:38 -0000	1.4
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+which xprop &>/dev/null || exit 1
+sleep 2
+
+TRIAL=0
+PROGNAME=$0
+while true ; do
+	RESULT=$(xprop -root _NET_DESKTOP_GEOMETRY 2>/dev/null)
+	RESULT=${RESULT:34}
+	WIDTH=$(echo $RESULT | sed -e 's|,.*$||')
+	HEIGHT=$(echo $RESULT | sed -e 's|^.*,||' | sed -e 's|^[ \t][ \t]*||')
+	if [[ ( -z $WIDTH ) || ( -z $WIDTH ) ]] ; then
+		# xprop failed
+		TRIAL=$((TRIAL+1))
+		echo "$PROGNAME: xprop returned unexpected result for $TRIAL times"
+		if test $TRIAL -ge 4 ; then
+			echo "$PROGNAME: not lauching daemon_wallpapoz"
+			exit 1
+		fi
+		sleep 3
+	else
+		# xprop succeeded
+		break
+	fi
+done
+
+exec /usr/libexec/daemon_wallpapoz "$@"
+exit 1

wallpapoz-0.4.1-rev92-delete-first-in-desktop-mode.patch:
 wallpapoz |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE wallpapoz-0.4.1-rev92-delete-first-in-desktop-mode.patch ---
--- wallpapoz-0.4.1-svn92_trunk/src/wallpapoz.deletefirst	2010-06-15 01:45:58.000000000 +0900
+++ wallpapoz-0.4.1-svn92_trunk/src/wallpapoz	2010-06-15 02:09:59.000000000 +0900
@@ -1070,13 +1070,13 @@
 	lowest_iter = self.store.get_iter((path_iter-1,))
       else:
 	index_temp = 0
+	before_path_iter = 0
 	for single_iter in self.selected_iter[1:]:
 	  path_iter = self.store.get_path(single_iter)[0]
 	  if path_iter == (index_temp + 1):
 	    index_temp = index_temp + 1
 	    before_path_iter = path_iter
-	  else:
-	    lowest_iter = self.store.get_iter((before_path_iter+1,))
+	lowest_iter = self.store.get_iter((before_path_iter+1,))
 	    
       # remove the iter
       for single_iter in self.selected_iter:


Index: wallpapoz.spec
===================================================================
RCS file: /cvs/extras/rpms/wallpapoz/F-13/wallpapoz.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- wallpapoz.spec	13 Jun 2010 08:50:57 -0000	1.39
+++ wallpapoz.spec	14 Jun 2010 18:42:39 -0000	1.40
@@ -8,7 +8,7 @@
 %define         mainver         0.4.1
 %undefine         betaver
 %define         svnver          svn92_trunk
-%define         fedorarel       23
+%define         fedorarel       24
 
 %define         rel             %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver}
 
@@ -24,6 +24,9 @@ Source0:        %{srcurl}files/%{name}-%
 %if 0%{?fedora} >= 12
 Source11:       wallpapoz-autostart.desktop
 %endif
+# Install daemon_wallpapoz wrapper script, which may
+# fix 584980, 597687?
+Source12:	daemon_wallpapoz-wrapper
 # Misc fixes for daemon_wallpapoz under compiz working,
 # containing fix for bug 531342, 542244, bug 567437, bug 573642
 Patch0:         wallpapoz-0.4.1-rev92-compiz-respawn.patch
@@ -52,6 +55,9 @@ Patch8:		wallpapoz-0.4.1-rev92-nonutf8-d
 # Also some fixes about gtk menu sensitive issue (after doing some movement
 # for wallpapers)
 Patch9:		wallpapoz-0.4.1-rev92-delete-one-wallpaper.patch
+# Fix backtrace when deleting first element in desktop (not workspace) mode
+# bug 597959
+Patch10:	wallpapoz-0.4.1-rev92-delete-first-in-desktop-mode.patch
 
 BuildArch:      noarch
 
@@ -88,7 +94,8 @@ wallpapers for different workspaces or v
 %patch6 -p1 -b .kill_multi
 %patch7 -p1 -b .anime
 %patch8 -p1 -b .nonutf8
-%patch9 -p1 -b .deleteone
+%patch9 -p1 -b .deletelastone
+%patch10 -p1 -b .deletefirst
 
 %build
 
@@ -108,12 +115,19 @@ desktop-file-install \
 
 # Install desktop application autostart stuff
 %if 0%{?fedora} >= 12
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart
 desktop-file-install \
 	--dir ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart \
 	%{SOURCE11}
 %endif
 
+# Install daemon_wallpapoz wrapper script
+pushd ${RPM_BUILD_ROOT}
+%{__mkdir_p} ./%{_libexecdir}
+%{__mv} ./%{_bindir}/daemon_wallpapoz ./%{_libexecdir}
+%{__install} -cp -m 0755 %{SOURCE12} ./%{_bindir}/daemon_wallpapoz
+popd
+
 %{find_lang} %{name}
 
 %clean
@@ -123,6 +137,7 @@ desktop-file-install \
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_bindir}/*%{name}
+%{_libexecdir}/daemon_wallpapoz
 
 %if 0%{?fedora} >= 12
 %{_sysconfdir}/xdg/autostart/wallpapoz-autostart.desktop
@@ -135,6 +150,12 @@ desktop-file-install \
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Tue Jun 15 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-24.svn92_trunk
+- Fix backtrace when deleting first element in desktop (not workspace) mode
+  (bug 597959)
+- Install daemon_wallpapoz wrapper script to check if xprop really works before
+  launching daemon (may fix 584980, 597687??)
+
 * Sun Jun 13 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-23.svn92_trunk
 - Don't remove a wallpaper from workspace when only one wallpaper is left
   (bug 567136)