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

act-user: Use G_DECLARE_FINAL_TYPE to declare ActUser: merge from upstream.

Browse Source 
Required by the upcoming gnome-control-center update.
This commit is contained in:
ajacoutot 2020-05-14 12:21:34 +00:00
parent c68126aca7
commit 64c4c9730f
3 changed files with 72 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sysutils/accountsservice/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.67 2019/07/12 20:49:39 sthen Exp $
# $OpenBSD: Makefile,v 1.68 2020/05/14 12:21:34 ajacoutot Exp $
# XXX fix change password (gnome-cc run-passwd.c: argv[0])
@ -8,6 +8,8 @@ COMMENT= D-Bus interface for user account query and manipulation
DISTNAME= accountsservice-0.6.42
EXTRACT_SUFX= .tar.xz
REVISION= 0
SHARED_LIBS += accountsservice 0.0 # 0.0
CATEGORIES= sysutils
@ -44,6 +46,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
CONFIGURE_ARGS= --enable-introspection \
--disable-systemd
DEBUG_PACKAGES= ${BUILD_PACKAGES}
FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/accountsservice
pre-configure:

33
sysutils/accountsservice/patches/patch-src_libaccountsservice_act-user_c Normal file
View File

@ -0,0 +1,33 @@
$OpenBSD: patch-src_libaccountsservice_act-user_c,v 1.3 2020/05/14 12:21:34 ajacoutot Exp $
From 8ba5a67f1d0fe867ef5569ec22e236db4d228631 Mon Sep 17 00:00:00 2001
From: Philip Withnall <withnall@endlessm.com>
Date: Tue, 18 Feb 2020 11:33:24 +0000
Subject: act-user: Use G_DECLARE_FINAL_TYPE to declare ActUser
Index: src/libaccountsservice/act-user.c
--- src/libaccountsservice/act-user.c.orig
+++ src/libaccountsservice/act-user.c
@@ -64,10 +64,6 @@
* Mode for setting the user's password.
*/
-#define ACT_USER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ACT_TYPE_USER, ActUserClass))
-#define ACT_IS_USER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ACT_TYPE_USER))
-#define ACT_USER_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS ((object), ACT_TYPE_USER, ActUserClass))
-
#define ACCOUNTS_NAME "org.freedesktop.Accounts"
#define ACCOUNTS_USER_INTERFACE "org.freedesktop.Accounts.User"
@@ -140,11 +136,6 @@ struct _ActUser {
guint system_account : 1;
guint local_account : 1;
guint nonexistent : 1;
-};
-
-struct _ActUserClass
-{
- GObjectClass parent_class;
};
static void act_user_finalize (GObject *object);

34
sysutils/accountsservice/patches/patch-src_libaccountsservice_act-user_h Normal file
View File

@ -0,0 +1,34 @@
$OpenBSD: patch-src_libaccountsservice_act-user_h,v 1.1 2020/05/14 12:21:34 ajacoutot Exp $
From 8ba5a67f1d0fe867ef5569ec22e236db4d228631 Mon Sep 17 00:00:00 2001
From: Philip Withnall <withnall@endlessm.com>
Date: Tue, 18 Feb 2020 11:33:24 +0000
Subject: act-user: Use G_DECLARE_FINAL_TYPE to declare ActUser
Index: src/libaccountsservice/act-user.h
--- src/libaccountsservice/act-user.h.orig
+++ src/libaccountsservice/act-user.h
@@ -31,9 +31,8 @@
G_BEGIN_DECLS
-#define ACT_TYPE_USER (act_user_get_type ())
-#define ACT_USER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), ACT_TYPE_USER, ActUser))
-#define ACT_IS_USER(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), ACT_TYPE_USER))
+#define ACT_TYPE_USER (act_user_get_type())
+G_DECLARE_FINAL_TYPE (ActUser, act_user, ACT, USER, GObject)
typedef enum {
ACT_USER_ACCOUNT_TYPE_STANDARD,
@@ -45,11 +44,6 @@ typedef enum {
ACT_USER_PASSWORD_MODE_SET_AT_LOGIN,
ACT_USER_PASSWORD_MODE_NONE,
} ActUserPasswordMode;
-
-typedef struct _ActUser ActUser;
-typedef struct _ActUserClass ActUserClass;
-
-GType act_user_get_type (void) G_GNUC_CONST;
const char *act_user_get_object_path (ActUser *user);