Add a patch to build on FreeBSD and rekeyword it; bug #256859

(Portage version: 2.2_rc23/cvs/Linux x86_64)

3 files changed, 34 insertions, 3 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index 99a62ca378a6..fb404b2e493a 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-panel
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.267 2009/02/01 11:08:16 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.268 2009/02/05 19:25:25 aballier Exp $
+
+  05 Feb 2009; Alexis Ballier <aballier@gentoo.org>
+  +files/gnome-panel-2.24.3-daylight.patch, gnome-panel-2.24.3.ebuild:
+  Add a patch to build on FreeBSD and rekeyword it; bug #256859
 
   01 Feb 2009; Gilles Dartiguelongue <eva@gentoo.org>
   gnome-panel-2.20.3.ebuild, -gnome-panel-2.24.1.ebuild,
diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.24.3-daylight.patch b/gnome-base/gnome-panel/files/gnome-panel-2.24.3-daylight.patch
new file mode 100644
index 000000000000..508aa0d6cdf5
--- /dev/null
+++ b/gnome-base/gnome-panel/files/gnome-panel-2.24.3-daylight.patch
@@ -0,0 +1,25 @@
+http://bugzilla.gnome.org/show_bug.cgi?id=569737
+https://bugs.gentoo.org/show_bug.cgi?id=256859
+
+--- gnome-panel-2.24.3/applets/clock/clock.c.old	2009-01-29 21:59:18 +0000
++++ gnome-panel-2.24.3/applets/clock/clock.c	2009-01-29 21:59:29 +0000
+@@ -653,7 +653,7 @@
+                 time (&now_t);
+                 localtime_r (&now_t, &now);
+ 
+-                if (daylight && now.tm_isdst) {
++                if (now.tm_isdst>0) {
+                         zone = tzname[1];
+                 } else {
+                         zone = tzname[0];
+--- gnome-panel-2.24.3/applets/clock/clock-location.c.old	2009-01-29 22:00:15 +0000
++++ gnome-panel-2.24.3/applets/clock/clock-location.c	2009-01-29 22:00:29 +0000
+@@ -337,7 +337,7 @@
+         now_t = time (NULL);
+         localtime_r (&now_t, &now);
+ 
+-        if (daylight && now.tm_isdst) {
++        if (now.tm_isdst>0) {
+                 clock_location_set_tzname (this, tzname[1]);
+         } else {
+                 clock_location_set_tzname (this, tzname[0]);
diff --git a/gnome-base/gnome-panel/gnome-panel-2.24.3.ebuild b/gnome-base/gnome-panel/gnome-panel-2.24.3.ebuild
index 2576bc91ef29..a2093f082419 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.24.3.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.24.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.24.3.ebuild,v 1.2 2009/02/01 11:08:16 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.24.3.ebuild,v 1.3 2009/02/05 19:25:25 aballier Exp $
 
 GCONF_DEBUG="no"
 
@@ -14,7 +14,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="GPL-2 FDL-1.1 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc eds networkmanager"
 
 RDEPEND=">=gnome-base/gnome-desktop-2.12
@@ -66,6 +66,8 @@ src_unpack() {
 	# Allow logout/shutdown without gnome-session 2.24, bug #246170
 	epatch "${WORKDIR}/${MY_P}-logout.patch"
 	epatch "${WORKDIR}/${MY_P}-po.patch"
+	# Fixes build on BSD, bug #256859
+	epatch "${FILESDIR}/${P}-daylight.patch"
 
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautomake