From 3d08c654cd00154c4147e5d4e8f4aa0c2602d5de Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Wed, 16 Nov 2011 19:25:51 +0000 Subject: [PATCH] Remove this patch; it's wrong and introduced a segfault at logout. --- x11/gnome/settings-daemon/Makefile | 4 ++-- .../patches/patch-plugins_color_gcm-dmi_c | 22 ------------------- 2 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 x11/gnome/settings-daemon/patches/patch-plugins_color_gcm-dmi_c diff --git a/x11/gnome/settings-daemon/Makefile b/x11/gnome/settings-daemon/Makefile index 88f6e152c6e..3967615b29d 100755 --- a/x11/gnome/settings-daemon/Makefile +++ b/x11/gnome/settings-daemon/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.66 2011/11/11 09:32:07 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.67 2011/11/16 19:25:51 ajacoutot Exp $ SHARED_ONLY= Yes @@ -6,7 +6,7 @@ COMMENT= GNOME settings daemon GNOME_PROJECT= gnome-settings-daemon GNOME_VERSION= 3.2.2 -REVISION= 0 +REVISION= 1 # GPLv3 PERMIT_PACKAGE_CDROM= Yes diff --git a/x11/gnome/settings-daemon/patches/patch-plugins_color_gcm-dmi_c b/x11/gnome/settings-daemon/patches/patch-plugins_color_gcm-dmi_c deleted file mode 100644 index fb7c6b3cbad..00000000000 --- a/x11/gnome/settings-daemon/patches/patch-plugins_color_gcm-dmi_c +++ /dev/null @@ -1,22 +0,0 @@ -$OpenBSD: patch-plugins_color_gcm-dmi_c,v 1.1 2011/11/11 09:32:07 ajacoutot Exp $ - -No sysfs on OpenBSD. - ---- plugins/color/gcm-dmi.c.orig Fri Nov 11 10:25:42 2011 -+++ plugins/color/gcm-dmi.c Fri Nov 11 10:26:24 2011 -@@ -122,6 +122,7 @@ gcm_dmi_class_init (GcmDmiClass *klass) - static void - gcm_dmi_init (GcmDmi *dmi) - { -+#ifdef __linux__ - const gchar *sysfs_name[] = { - "/sys/class/dmi/id/product_name", - "/sys/class/dmi/id/board_name", -@@ -143,6 +144,7 @@ gcm_dmi_init (GcmDmi *dmi) - dmi->priv->name = gcm_dmi_get_from_filenames (sysfs_name); - dmi->priv->version = gcm_dmi_get_from_filenames (sysfs_version); - dmi->priv->vendor = gcm_dmi_get_from_filenames (sysfs_vendor); -+#endif - } - - static void