cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to gnome-desktop-3.2.1.

Browse Source
This commit is contained in:
ajacoutot 2011-10-16 14:56:47 +00:00
parent d235ed0139
commit 75fc46fb33
3 changed files with 8 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
x11/gnome/desktop/Makefile
View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.81 2011/10/04 05:35:26 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.82 2011/10/16 14:56:47 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= components for the GNOME desktop
GNOME_PROJECT= gnome-desktop
GNOME_VERSION= 3.2.0
REVISION= 0
GNOME_VERSION= 3.2.1
SHARED_LIBS += gnome-desktop-3 1.0 # 2.1
@ -22,7 +21,7 @@ WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 cairo cairo-gobject
WANTLIB += drm expat ffi fontconfig freetype gdk-3 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
WANTLIB += gtk-3 kvm m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
WANTLIB += gtk-3 m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
WANTLIB += pixman-1 png pthread-stubs xcb xcb-render xcb-shm z
MODULES= devel/gettext \

10
x11/gnome/desktop/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gnome/gnome-desktop-3.2.0.tar.xz) = n2eOqEuQ1CUyjwEZhVx0CA==
RMD160 (gnome/gnome-desktop-3.2.0.tar.xz) = /YWloKyn/W/BDpmlZ2oN/Y9aUzQ=
SHA1 (gnome/gnome-desktop-3.2.0.tar.xz) = Cjz9DqzuglzzPszIVnw1lZaw2Eo=
SHA256 (gnome/gnome-desktop-3.2.0.tar.xz) = xei6CPPHuhK19AYsm1vO9YOD0ePsJhYeuLz0nf6mL/U=
SIZE (gnome/gnome-desktop-3.2.0.tar.xz) = 923400
MD5 (gnome/gnome-desktop-3.2.1.tar.xz) = bQmuMqwfEvsluNMFcqAzpg==
RMD160 (gnome/gnome-desktop-3.2.1.tar.xz) = Vc2LwvQSz1Wq6YKE6hrS3bDs+94=
SHA1 (gnome/gnome-desktop-3.2.1.tar.xz) = bd/q+RSdBYgTc+NyanccvTX9UD0=
SHA256 (gnome/gnome-desktop-3.2.1.tar.xz) = TLANIjYPmuS8P7ee/nho/VT8v81PcFDHH8l2mew6hqI=
SIZE (gnome/gnome-desktop-3.2.1.tar.xz) = 924000

35
x11/gnome/desktop/patches/patch-libgnome-desktop_gnome-datetime-source_c
View File

@ -1,35 +0,0 @@
$OpenBSD: patch-libgnome-desktop_gnome-datetime-source_c,v 1.1 2011/10/04 05:35:26 ajacoutot Exp $
From 7033804a455ccd39997632c164b5fae3e4fedac4 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 03 Oct 2011 20:35:20 +0000
Subject: GnomeWallClock: Fix non-Linux fallback code
--- libgnome-desktop/gnome-datetime-source.c.orig Mon Sep 5 08:54:41 2011
+++ libgnome-desktop/gnome-datetime-source.c Tue Oct 4 07:29:59 2011
@@ -57,8 +57,10 @@ static gboolean
g_datetime_source_is_expired (GDateTimeSource *datetime_source)
{
gint64 real_now;
+ gint64 monotonic_now;
real_now = g_get_real_time ();
+ monotonic_now = g_source_get_time ((GSource*)datetime_source);
if (datetime_source->initially_expired)
return TRUE;
@@ -66,10 +68,11 @@ g_datetime_source_is_expired (GDateTimeSource *datetim
if (datetime_source->real_expiration <= real_now)
return TRUE;
- /* We can't really detect without system support when things change;
- * so just trigger every second.
+ /* We can't really detect without system support when things
+ * change; so just trigger every second (i.e. our wakeup
+ * expiration)
*/
- if (datetime_source->cancel_on_set)
+ if (datetime_source->cancel_on_set && monotonic_now >= datetime_source->wakeup_expiration)
return TRUE;
return FALSE;