[lxlauncher] - Use workaround for build loop again (#661008) - Fix segfault if a window manager returns no data f

[Christoph Wickert]

commit a1fc0c830fe16387216d7829f08009a35bd5e44d
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sun Dec 12 00:29:19 2010 +0100

    - Use workaround for build loop again (#661008)
    - Fix segfault if a window manager returns no data for current desktop

 ...er-0.2.1-fix-segfault-from-window-manager.patch |   29 ++++++++++++++++++++
 lxlauncher.spec                                    |   11 +++++++-
 2 files changed, 39 insertions(+), 1 deletions(-)
---
diff --git a/lxlauncher-0.2.1-fix-segfault-from-window-manager.patch b/lxlauncher-0.2.1-fix-segfault-from-window-manager.patch
new file mode 100644
index 0000000..9b4981d
--- /dev/null
+++ b/lxlauncher-0.2.1-fix-segfault-from-window-manager.patch
@@ -0,0 +1,29 @@
+From 5c74d1d5ee35b527dedbe46f013be19c3ae20abe Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Andrew=20Lee=20(=E6=9D=8E=E5=81=A5=E7=A7=8B)?= <ajqlee at debian.org>
+Date: Mon, 12 Apr 2010 14:43:28 +0800
+Subject: [PATCH] Apply patch from Enrico Zini <enrico at debian.org>
+ Do not segfault if a window manager returns no data for current desktop.
+
+---
+ src/working-area.c |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/src/working-area.c b/src/working-area.c
+index d309558..65eeb0e 100644
+--- a/src/working-area.c
++++ b/src/working-area.c
+@@ -94,7 +94,10 @@ gf_display_get_workarea(GdkScreen* g_screen, GdkRectangle *rect) {
+ 	if(!data)
+ 		return FALSE;
+ 
+-	current = *(guint32 *)data;
++	if (len == 0)
++		current = 0;
++	else
++		current = *(guint32 *)data;
+ 	XFree(data);
+ 
+ 	/* find the _NET_WORKAREA atom */
+-- 
+1.7.0.1
+
diff --git a/lxlauncher.spec b/lxlauncher.spec
index be2fbb0..b6ae733 100644
--- a/lxlauncher.spec
+++ b/lxlauncher.spec
@@ -16,11 +16,13 @@ Patch2:         lxlauncher-0.2.1-dsofix.patch
 # http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxlauncher;a=commit;h=b1ec4b856582467b3c287e443213c9f97a1dc38e
 # fixes https://bugzilla.redhat.com/show_bug.cgi?id=539147
 Patch3:         lxlauncher-0.2.1-fix-build-loop.patch
+# http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxlauncher;a=commit;h=5c74d1d5ee35b527dedbe46f013be19c3ae20abe
+Patch4:         lxlauncher-0.2.1-fix-segfault-from-window-manager.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.12 startup-notification-devel
 BuildRequires:  menu-cache-devel >= 0.3.2
-BuildRequires:  gettext
+BuildRequires:  gettext intltool
 
 %description
 LXLauncher is designed as an open source replacement for the Asus Launcher
@@ -35,10 +37,13 @@ LXLauncher is part of LXDE, the Lightweight X11 Desktop Environment.
 %patch1 -p1 -b .menu-cache-0.3.0
 %patch2 -p1 -b .dsofix
 %patch3 -p1 -b .loop
+%patch4 -p1 -b .fix-segfault-from-window-manager
 
 
 %build
 %configure
+# workaround for FTBFS #539147 and #661008
+touch -r po/Makefile po/stamp-it
 make %{?_smp_mflags}
 
 
@@ -68,6 +73,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 12 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.1-8
+- Use workaround for build loop again (#661008)
+- Fix segfault if a window manager returns no data for current desktop
+
 * Thu Jun 03 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.1-7
 - Proper fix for build loop (#539147)