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

Remove / tweak obsolete patches.

Browse Source
This commit is contained in:
ajacoutot 2010-04-30 11:24:12 +00:00
parent dd6c0b25bb
commit bc4e4500b1
5 changed files with 13 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
x11/gnome/session/Makefile
View File

@ -1,19 +1,13 @@
# $OpenBSD: Makefile,v 1.104 2010/04/29 07:49:27 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.105 2010/04/30 11:24:12 ajacoutot Exp $
COMMENT= GNOME session
GNOME_PROJECT= gnome-session
GNOME_VERSION= 2.30.0
PKGNAME= ${DISTNAME}p3
PKGNAME= ${DISTNAME}p4
CATEGORIES= x11
# Add session saving capability in gnome-session
# Bugzilla #575544
MASTER_SITES0= http://www.bsdfrog.org/OpenBSD/distfiles/
PATCHFILES= gnome-panel-2.28.0-0.save_session.patch:0
PATCH_DIST_STRIP= -p1
# GPLv2/LGPLv2/GFDLv1.1
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes

5
x11/gnome/session/distinfo
View File

@ -1,10 +1,5 @@
MD5 (gnome/gnome-panel-2.28.0-0.save_session.patch) = oTXq5RdFovcDwC7DRr1/jA==
MD5 (gnome/gnome-session-2.30.0.tar.bz2) = 0V/dEg88fQHko4ikoOc5Mg==
RMD160 (gnome/gnome-panel-2.28.0-0.save_session.patch) = 59s5384gIcCvAeBlhCz06VtBlTs=
RMD160 (gnome/gnome-session-2.30.0.tar.bz2) = uLcPos2Hr4GdDUKF+EjhXzYJHL0=
SHA1 (gnome/gnome-panel-2.28.0-0.save_session.patch) = 49K+u+nt1Dz+vSvlcik2EmmbcVE=
SHA1 (gnome/gnome-session-2.30.0.tar.bz2) = 07vKWLx4XMEpYquX6w5CJ5ok7G8=
SHA256 (gnome/gnome-panel-2.28.0-0.save_session.patch) = QCeTrXgonhpNFaKiBLVQwG8UUduvCewcVxQyeyMU580=
SHA256 (gnome/gnome-session-2.30.0.tar.bz2) = 7+tFMZQDVG+mDmywNeTeXodzHqZy/TdjV0mvSdD9TYQ=
SIZE (gnome/gnome-panel-2.28.0-0.save_session.patch) = 21748
SIZE (gnome/gnome-session-2.30.0.tar.bz2) = 827745

37
x11/gnome/session/patches/patch-gnome-session_gsm-manager_c
View File

@ -1,12 +1,9 @@
$OpenBSD: patch-gnome-session_gsm-manager_c,v 1.3 2010/04/22 22:38:51 ajacoutot Exp $
$OpenBSD: patch-gnome-session_gsm-manager_c,v 1.4 2010/04/30 11:24:12 ajacoutot Exp $
OpenBSD does not have DeviceKit.
GNOME Bugzilla #598211
Do not keep zombie clients.
--- gnome-session/gsm-manager.c.orig Fri Apr 23 00:33:12 2010
+++ gnome-session/gsm-manager.c Fri Apr 23 00:33:12 2010
--- gnome-session/gsm-manager.c.orig Thu Mar 4 17:50:11 2010
+++ gnome-session/gsm-manager.c Fri Apr 30 12:12:11 2010
@@ -38,7 +38,9 @@
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
@ -17,7 +14,7 @@ Do not keep zombie clients.
#include <gtk/gtk.h> /* for logout dialog */
#include <gconf/gconf-client.h>
@@ -135,8 +137,10 @@ struct GsmManagerPrivate
@@ -134,8 +136,10 @@ struct GsmManagerPrivate
DBusGProxy *bus_proxy;
DBusGConnection *connection;
@ -28,7 +25,7 @@ Do not keep zombie clients.
};
enum {
@@ -984,6 +988,7 @@ manager_perhaps_lock (GsmManager *manager)
@@ -983,6 +987,7 @@ manager_perhaps_lock (GsmManager *manager)
static void
manager_attempt_hibernate (GsmManager *manager)
{
@ -36,7 +33,7 @@ Do not keep zombie clients.
gboolean can_hibernate;
GError *error;
gboolean ret;
@@ -1005,11 +1010,13 @@ manager_attempt_hibernate (GsmManager *manager)
@@ -1004,11 +1009,13 @@ manager_attempt_hibernate (GsmManager *manager)
g_error_free (error);
}
}
@ -50,7 +47,7 @@ Do not keep zombie clients.
gboolean can_suspend;
GError *error;
gboolean ret;
@@ -1031,6 +1038,7 @@ manager_attempt_suspend (GsmManager *manager)
@@ -1030,6 +1037,7 @@ manager_attempt_suspend (GsmManager *manager)
g_error_free (error);
}
}
@ -58,21 +55,7 @@ Do not keep zombie clients.
}
static void
@@ -2111,9 +2119,11 @@ on_store_client_added (GsmStore *store,
"end-session-response",
G_CALLBACK (on_client_end_session_response),
manager);
-
+ g_signal_connect (client,
+ "disconnected",
+ G_CALLBACK (on_client_disconnected),
+ manager);
g_signal_emit (manager, signals [CLIENT_ADDED], 0, id);
- /* FIXME: disconnect signal handler */
}
static void
@@ -2313,10 +2323,12 @@ gsm_manager_dispose (GObject *object)
@@ -2202,10 +2210,12 @@ gsm_manager_dispose (GObject *object)
manager->priv->gconf_client = NULL;
}
@ -85,7 +68,7 @@ Do not keep zombie clients.
G_OBJECT_CLASS (gsm_manager_parent_class)->dispose (object);
}
@@ -2546,7 +2558,9 @@ gsm_manager_init (GsmManager *manager)
@@ -2435,7 +2445,9 @@ gsm_manager_init (GsmManager *manager)
G_CALLBACK (on_presence_status_changed),
manager);
@ -95,7 +78,7 @@ Do not keep zombie clients.
/* GConf setup */
gconf_client_add_dir (manager->priv->gconf_client,
@@ -3105,10 +3119,12 @@ gsm_manager_can_shutdown (GsmManager *manager,
@@ -2959,10 +2971,12 @@ gsm_manager_can_shutdown (GsmManager *manager,
gboolean can_suspend;
gboolean can_hibernate;

24
x11/gnome/session/patches/patch-gnome-session_gsm-xsmp-client_c
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-gnome-session_gsm-xsmp-client_c,v 1.2 2010/04/22 22:38:51 ajacoutot Exp $
GNOME Bugzilla #598211
Fix SIGSEGV in SmsDie(): throw an error in xsmp_stop() when
client->priv->conn is NULL.
--- gnome-session/gsm-xsmp-client.c.orig Fri Apr 23 00:33:12 2010
+++ gnome-session/gsm-xsmp-client.c Fri Apr 23 00:33:12 2010
@@ -725,6 +725,15 @@ xsmp_stop (GsmClient *client,
return FALSE;
}
+ /*FIXME: What do we do if the client can't be stoped ?
+ * (probably a cleaner solution exists...) */
+ if (xsmp->priv->conn == NULL) {
+ g_set_error (error,
+ GSM_CLIENT_ERROR,
+ GSM_CLIENT_ERROR_NOT_REGISTERED,
+ "Client is not registered");
+ return FALSE;
+ }
SmsDie (xsmp->priv->conn);
return TRUE;

4
x11/gnome/session/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.26 2010/04/22 22:44:28 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.27 2010/04/30 11:24:12 ajacoutot Exp $
@bin bin/gnome-session
@bin bin/gnome-session-properties
@bin bin/gnome-session-save
@ -51,8 +51,6 @@ share/locale/br/LC_MESSAGES/gnome-session-2.0.mo
share/locale/bs/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ca/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ca@valencia/LC_MESSAGES/gnome-session-2.0.mo
share/locale/crh/
share/locale/crh/LC_MESSAGES/
share/locale/crh/LC_MESSAGES/gnome-session-2.0.mo
share/locale/cs/LC_MESSAGES/gnome-session-2.0.mo
share/locale/cy/LC_MESSAGES/gnome-session-2.0.mo