Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 27 Mar 2022 03:32:39 GMT
From:      Neel Chauhan <nc@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 6ff5aee61efc - main - sysutils/gnome-control-center: Unbreak build with base Heimdal Kerberos
Message-ID:  <202203270332.22R3WdaO091333@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by nc:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6ff5aee61efc610134c917ba5d8e12ba4ca4e412

commit 6ff5aee61efc610134c917ba5d8e12ba4ca4e412
Author:     Neel Chauhan <nc@FreeBSD.org>
AuthorDate: 2022-03-27 03:32:35 +0000
Commit:     Neel Chauhan <nc@FreeBSD.org>
CommitDate: 2022-03-27 03:32:35 +0000

    sysutils/gnome-control-center: Unbreak build with base Heimdal Kerberos
---
 sysutils/gnome-control-center/Makefile             |  2 +-
 .../patch-panels_user-accounts_cc-realm-manager.c  | 25 ++++++++++++++++++++++
 sysutils/gnome-control-center/pkg-descr            |  2 +-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 8b73bd6dd1ae..8e78b763bcce 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Control center for GNOME 3 project
+COMMENT=	Control center for the GNOME desktop
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git a/sysutils/gnome-control-center/files/patch-panels_user-accounts_cc-realm-manager.c b/sysutils/gnome-control-center/files/patch-panels_user-accounts_cc-realm-manager.c
new file mode 100644
index 000000000000..10c223ceb15f
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-panels_user-accounts_cc-realm-manager.c
@@ -0,0 +1,25 @@
+Fix for Heimdal (versus MIT).
+
+Index: panels/user-accounts/cc-realm-manager.c
+--- panels/user-accounts/cc-realm-manager.c.orig
++++ panels/user-accounts/cc-realm-manager.c
+@@ -22,7 +22,7 @@
+ 
+ #include "cc-realm-manager.h"
+ 
+-#include <krb5/krb5.h>
++#include <krb5.h>
+ 
+ #include <glib.h>
+ #include <glib/gi18n.h>
+@@ -637,8 +637,10 @@ login_perform_kinit (krb5_context k5,
+         code = krb5_get_init_creds_opt_alloc (k5, &opts);
+         g_return_val_if_fail (code == 0, code);
+ 
++#ifdef HAVE_KRB5_GET_INIT_CREDS_OPT_SET_OUT_CCACHE
+         code = krb5_get_init_creds_opt_set_out_ccache (k5, opts, ccache);
+         g_return_val_if_fail (code == 0, code);
++#endif
+ 
+         code = krb5_get_init_creds_password (k5, &creds, principal,
+                                              (char *)password,
diff --git a/sysutils/gnome-control-center/pkg-descr b/sysutils/gnome-control-center/pkg-descr
index 98b39195a2b9..0f7f031b28bb 100644
--- a/sysutils/gnome-control-center/pkg-descr
+++ b/sysutils/gnome-control-center/pkg-descr
@@ -1,3 +1,3 @@
-Configuration tools tightly integrated within the GNOME 3 desktop.
+Configuration tools tightly integrated within the GNOME desktop.
 
 WWW: https://www.gnome.org/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202203270332.22R3WdaO091333>