Unbreak.
Since this is still not fully functional, do not enforce dependency.
This commit is contained in:
ajacoutot
parent
3ec3499d3c
commit
49f93e74fb
@ -1,16 +1,29 @@
|
||||
# $OpenBSD: Makefile,v 1.7 2014/04/21 14:57:02 ajacoutot Exp $
|
||||
|
||||
BROKEN= temporary for the kerberos removal
|
||||
# $OpenBSD: Makefile,v 1.8 2014/04/26 17:08:12 ajacoutot Exp $
|
||||
|
||||
COMMENT= initial-setup firstboot-like tool
|
||||
|
||||
GNOME_PROJECT= gnome-initial-setup
|
||||
GNOME_VERSION= 3.12.0
|
||||
REVISION= 1
|
||||
REVISION= 2
|
||||
|
||||
# GPLv2+
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
|
||||
WANTLIB += EGL GL ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes
|
||||
WANTLIB += Xi Xinerama Xrandr Xrender Xt accountsservice atk-1.0
|
||||
WANTLIB += atk-bridge-2.0 atspi c cairo cairo-gobject crack dbus-1
|
||||
WANTLIB += dbus-glib-1 enchant expat ffi fontconfig freetype gcrypt
|
||||
WANTLIB += gdk-3 gdk_pixbuf-2.0 gdm geoclue gio-2.0 glib-2.0 gmodule-2.0
|
||||
WANTLIB += gnome-desktop-3 goa-1.0 goa-backend-1.0 gobject-2.0
|
||||
WANTLIB += gpg-error graphite2 gstapp-1.0 gstaudio-1.0 gstbase-1.0
|
||||
WANTLIB += gstfft-1.0 gstpbutils-1.0 gstreamer-1.0 gsttag-1.0
|
||||
WANTLIB += gstvideo-1.0 gthread-2.0 gtk-3 gweather-3 harfbuzz
|
||||
WANTLIB += harfbuzz-icu ibus-1.0 icudata icui18n icuuc javascriptcoregtk-3.0
|
||||
WANTLIB += jpeg json-glib-1.0 m orc-0.4 pango-1.0 pangocairo-1.0
|
||||
WANTLIB += pangoft2-1.0 pcre pixman-1 png polkit-gobject-1 pthread
|
||||
WANTLIB += pthread-stubs pwquality rest-0.7 secret-1 soup-2.4
|
||||
WANTLIB += soup-gnome-2.4 sqlite3 stdc++ telepathy-glib webkitgtk-3.0
|
||||
WANTLIB += webp xcb xcb-render xcb-shm xml2 xslt z
|
||||
|
||||
MODULES= x11/gnome \
|
||||
devel/dconf \
|
||||
@ -38,8 +51,9 @@ CONFIGURE_STYLE= autoconf
|
||||
|
||||
FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/gnome-initial-setup
|
||||
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=728879
|
||||
# (upstream will _not_ accept --disable-kerberos patches)
|
||||
pre-configure:
|
||||
# disable user account panel (requires kerberos)
|
||||
ln -sf /usr/bin/true ${WRKDIR}/bin/krb5-config
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,4 +1,7 @@
|
||||
$OpenBSD: patch-configure_ac,v 1.2 2014/03/27 19:41:05 ajacoutot Exp $
|
||||
$OpenBSD: patch-configure_ac,v 1.3 2014/04/26 17:08:12 ajacoutot Exp $
|
||||
|
||||
Disable NetworkManager.
|
||||
|
||||
--- configure.ac.orig Tue Mar 25 05:28:07 2014
|
||||
+++ configure.ac Thu Mar 27 20:20:44 2014
|
||||
@@ -28,10 +28,6 @@ POLKIT_REQUIRED_VERSION=0.103
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
$OpenBSD: patch-gnome-initial-setup_Makefile_in,v 1.4 2014/04/07 10:30:32 ajacoutot Exp $
|
||||
$OpenBSD: patch-gnome-initial-setup_Makefile_in,v 1.5 2014/04/26 17:08:12 ajacoutot Exp $
|
||||
|
||||
Disable NetworkManager.
|
||||
|
||||
XXX fix+push upstream
|
||||
|
||||
|
||||
@ -1,4 +1,7 @@
|
||||
$OpenBSD: patch-gnome-initial-setup_gnome-initial-setup_c,v 1.2 2014/03/27 19:41:05 ajacoutot Exp $
|
||||
$OpenBSD: patch-gnome-initial-setup_gnome-initial-setup_c,v 1.3 2014/04/26 17:08:12 ajacoutot Exp $
|
||||
|
||||
Disable NetworkManager.
|
||||
|
||||
--- gnome-initial-setup/gnome-initial-setup.c.orig Mon Mar 10 05:47:29 2014
|
||||
+++ gnome-initial-setup/gnome-initial-setup.c Thu Mar 27 20:22:54 2014
|
||||
@@ -40,7 +40,6 @@
|
||||
|
||||
@ -1,4 +1,7 @@
|
||||
$OpenBSD: patch-gnome-initial-setup_pages_Makefile_in,v 1.2 2014/03/27 19:41:05 ajacoutot Exp $
|
||||
$OpenBSD: patch-gnome-initial-setup_pages_Makefile_in,v 1.3 2014/04/26 17:08:12 ajacoutot Exp $
|
||||
|
||||
Disable NetworkManager.
|
||||
|
||||
--- gnome-initial-setup/pages/Makefile.in.orig Tue Mar 25 05:28:41 2014
|
||||
+++ gnome-initial-setup/pages/Makefile.in Thu Mar 27 20:21:26 2014
|
||||
@@ -339,7 +339,6 @@ SUBDIRS = \
|
||||
|
||||
@ -1,10 +1,29 @@
|
||||
$OpenBSD: patch-gnome-initial-setup_pages_account_Makefile_in,v 1.2 2014/03/27 19:41:05 ajacoutot Exp $
|
||||
$OpenBSD: patch-gnome-initial-setup_pages_account_Makefile_in,v 1.3 2014/04/26 17:08:12 ajacoutot Exp $
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=728879
|
||||
(upstream will _not_ accept --disable-kerberos patches)
|
||||
|
||||
XXX push upstream: on OpenBSD, crypt() is part of libc, create a proper configure check
|
||||
|
||||
--- gnome-initial-setup/pages/account/Makefile.in.orig Tue Mar 25 05:28:41 2014
|
||||
+++ gnome-initial-setup/pages/account/Makefile.in Thu Mar 27 20:20:44 2014
|
||||
@@ -356,7 +356,7 @@ libgisaccount_la_SOURCES = \
|
||||
+++ gnome-initial-setup/pages/account/Makefile.in Sat Apr 26 18:27:28 2014
|
||||
@@ -102,8 +102,6 @@ am_libgisaccount_la_OBJECTS = $(am__objects_1) \
|
||||
libgisaccount_la-gis-account-page.lo \
|
||||
libgisaccount_la-gis-account-pages.lo \
|
||||
libgisaccount_la-gis-account-page-local.lo \
|
||||
- libgisaccount_la-gis-account-page-enterprise.lo \
|
||||
- libgisaccount_la-um-realm-manager.lo \
|
||||
libgisaccount_la-um-utils.lo \
|
||||
libgisaccount_la-um-photo-dialog.lo $(am__objects_2)
|
||||
libgisaccount_la_OBJECTS = $(am_libgisaccount_la_OBJECTS)
|
||||
@@ -349,14 +347,12 @@ libgisaccount_la_SOURCES = \
|
||||
gis-account-page.c gis-account-page.h \
|
||||
gis-account-pages.c gis-account-pages.h \
|
||||
gis-account-page-local.c gis-account-page-local.h \
|
||||
- gis-account-page-enterprise.c gis-account-page-enterprise.h \
|
||||
- um-realm-manager.c um-realm-manager.h \
|
||||
um-utils.c um-utils.h \
|
||||
um-photo-dialog.c um-photo-dialog.h \
|
||||
$(NULL)
|
||||
|
||||
libgisaccount_la_CFLAGS = $(INITIAL_SETUP_CFLAGS) -I "$(srcdir)/../.."
|
||||
@ -13,3 +32,17 @@ XXX push upstream: on OpenBSD, crypt() is part of libc, create a proper configur
|
||||
libgisaccount_la_LDFLAGS = -export_dynamic -avoid-version -module -no-undefined
|
||||
EXTRA_DIST = \
|
||||
org.freedesktop.realmd.xml \
|
||||
@@ -420,13 +416,11 @@ distclean-compile:
|
||||
-rm -f *.tab.c
|
||||
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgisaccount_la-account-resources.Plo@am__quote@
|
||||
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgisaccount_la-gis-account-page-enterprise.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgisaccount_la-gis-account-page-local.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgisaccount_la-gis-account-page.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgisaccount_la-gis-account-pages.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgisaccount_la-um-photo-dialog.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgisaccount_la-um-realm-generated.Plo@am__quote@
|
||||
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgisaccount_la-um-realm-manager.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgisaccount_la-um-utils.Plo@am__quote@
|
||||
|
||||
.c.o:
|
||||
|
||||
@ -0,0 +1,90 @@
|
||||
$OpenBSD: patch-gnome-initial-setup_pages_account_gis-account-page_c,v 1.1 2014/04/26 17:08:12 ajacoutot Exp $
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=728879
|
||||
(upstream will _not_ accept --disable-kerberos patches)
|
||||
|
||||
--- gnome-initial-setup/pages/account/gis-account-page.c.orig Mon Mar 10 05:47:29 2014
|
||||
+++ gnome-initial-setup/pages/account/gis-account-page.c Sat Apr 26 19:04:19 2014
|
||||
@@ -41,7 +41,9 @@ typedef enum {
|
||||
struct _GisAccountPagePrivate
|
||||
{
|
||||
GtkWidget *page_local;
|
||||
+#if 0
|
||||
GtkWidget *page_enterprise;
|
||||
+#endif
|
||||
|
||||
GtkWidget *page_toggle;
|
||||
GtkWidget *stack;
|
||||
@@ -70,8 +72,10 @@ page_validate (GisAccountPage *page)
|
||||
switch (priv->mode) {
|
||||
case UM_LOCAL:
|
||||
return gis_account_page_local_validate (GIS_ACCOUNT_PAGE_LOCAL (priv->page_local));
|
||||
+#if 0
|
||||
case UM_ENTERPRISE:
|
||||
return gis_account_page_enterprise_validate (GIS_ACCOUNT_PAGE_ENTERPRISE (priv->page_enterprise));
|
||||
+#endif
|
||||
default:
|
||||
g_assert_not_reached ();
|
||||
}
|
||||
@@ -102,7 +106,10 @@ set_mode (GisAccountPage *page,
|
||||
|
||||
priv->mode = mode;
|
||||
|
||||
+#if 0
|
||||
visible_child = (mode == UM_LOCAL) ? priv->page_local : priv->page_enterprise;
|
||||
+#endif
|
||||
+ visible_child = priv->page_local;
|
||||
gtk_stack_set_visible_child (GTK_STACK (priv->stack), visible_child);
|
||||
|
||||
update_page_validation (page);
|
||||
@@ -126,9 +133,11 @@ gis_account_page_apply (GisPage *gis_page,
|
||||
switch (priv->mode) {
|
||||
case UM_LOCAL:
|
||||
return gis_account_page_local_apply (GIS_ACCOUNT_PAGE_LOCAL (priv->page_local), gis_page);
|
||||
+#if 0
|
||||
case UM_ENTERPRISE:
|
||||
return gis_account_page_enterprise_apply (GIS_ACCOUNT_PAGE_ENTERPRISE (priv->page_enterprise), cancellable,
|
||||
enterprise_apply_complete, page);
|
||||
+#endif
|
||||
default:
|
||||
g_assert_not_reached ();
|
||||
break;
|
||||
@@ -180,14 +189,18 @@ gis_account_page_constructed (GObject *object)
|
||||
g_signal_connect (priv->page_local, "user-created",
|
||||
G_CALLBACK (on_local_user_created), page);
|
||||
|
||||
+#if 0
|
||||
g_signal_connect (priv->page_enterprise, "validation-changed",
|
||||
G_CALLBACK (on_validation_changed), page);
|
||||
+#endif
|
||||
|
||||
update_page_validation (page);
|
||||
|
||||
g_signal_connect (priv->page_toggle, "toggled", G_CALLBACK (toggle_mode), page);
|
||||
g_object_bind_property (page, "applying", priv->page_toggle, "sensitive", G_BINDING_INVERT_BOOLEAN);
|
||||
+#if 0
|
||||
g_object_bind_property (priv->page_enterprise, "visible", priv->page_toggle, "visible", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
|
||||
+#endif
|
||||
|
||||
/* force a refresh by setting to an invalid value */
|
||||
priv->mode = NUM_MODES;
|
||||
@@ -211,7 +224,9 @@ gis_account_page_class_init (GisAccountPageClass *klas
|
||||
gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/initial-setup/gis-account-page.ui");
|
||||
|
||||
gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisAccountPage, page_local);
|
||||
+#if 0
|
||||
gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisAccountPage, page_enterprise);
|
||||
+#endif
|
||||
|
||||
gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisAccountPage, page_toggle);
|
||||
gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisAccountPage, stack);
|
||||
@@ -228,7 +243,9 @@ gis_account_page_init (GisAccountPage *page)
|
||||
{
|
||||
g_resources_register (account_get_resource ());
|
||||
g_type_ensure (GIS_TYPE_ACCOUNT_PAGE_LOCAL);
|
||||
+#if 0
|
||||
g_type_ensure (GIS_TYPE_ACCOUNT_PAGE_ENTERPRISE);
|
||||
+#endif
|
||||
|
||||
gtk_widget_init_template (GTK_WIDGET (page));
|
||||
}
|
||||
@ -0,0 +1,21 @@
|
||||
$OpenBSD: patch-gnome-initial-setup_pages_account_gis-account-page_ui,v 1.1 2014/04/26 17:08:12 ajacoutot Exp $
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=728879
|
||||
(upstream will _not_ accept --disable-kerberos patches)
|
||||
|
||||
--- gnome-initial-setup/pages/account/gis-account-page.ui.orig Sat Apr 26 18:43:02 2014
|
||||
+++ gnome-initial-setup/pages/account/gis-account-page.ui Sat Apr 26 18:44:09 2014
|
||||
@@ -18,11 +18,13 @@
|
||||
<property name="visible">True</property>
|
||||
</object>
|
||||
</child>
|
||||
+<!--
|
||||
<child>
|
||||
<object class="GisAccountPageEnterprise" id="page_enterprise">
|
||||
<property name="visible">True</property>
|
||||
</object>
|
||||
</child>
|
||||
+-->
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
@ -1,22 +0,0 @@
|
||||
$OpenBSD: patch-gnome-initial-setup_pages_account_um-realm-manager_c,v 1.2 2014/03/27 19:41:05 ajacoutot Exp $
|
||||
--- gnome-initial-setup/pages/account/um-realm-manager.c.orig Mon Mar 10 05:47:29 2014
|
||||
+++ gnome-initial-setup/pages/account/um-realm-manager.c Thu Mar 27 20:20:44 2014
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
#include "um-realm-manager.h"
|
||||
|
||||
-#include <krb5/krb5.h>
|
||||
+#include <krb5.h>
|
||||
|
||||
#include <glib.h>
|
||||
#include <glib/gi18n.h>
|
||||
@@ -702,9 +702,6 @@ login_perform_kinit (krb5_context k5,
|
||||
}
|
||||
|
||||
code = krb5_get_init_creds_opt_alloc (k5, &opts);
|
||||
- g_return_val_if_fail (code == 0, code);
|
||||
-
|
||||
- code = krb5_get_init_creds_opt_set_out_ccache (k5, opts, ccache);
|
||||
g_return_val_if_fail (code == 0, code);
|
||||
|
||||
code = krb5_get_init_creds_password (k5, &creds, principal,
|
||||
@ -1,10 +1,29 @@
|
||||
$OpenBSD: patch-gnome-initial-setup_pages_password_Makefile_in,v 1.1 2014/03/27 19:41:05 ajacoutot Exp $
|
||||
$OpenBSD: patch-gnome-initial-setup_pages_password_Makefile_in,v 1.2 2014/04/26 17:08:12 ajacoutot Exp $
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=728879
|
||||
(upstream will _not_ accept --disable-kerberos patches)
|
||||
|
||||
XXX push upstream: on OpenBSD, crypt() is part of libc, create a proper configure check
|
||||
|
||||
--- gnome-initial-setup/pages/password/Makefile.in.orig Thu Mar 27 20:31:14 2014
|
||||
+++ gnome-initial-setup/pages/password/Makefile.in Thu Mar 27 20:31:21 2014
|
||||
@@ -354,7 +354,7 @@ libgispassword_la_SOURCES = \
|
||||
--- gnome-initial-setup/pages/password/Makefile.in.orig Tue Mar 25 05:28:42 2014
|
||||
+++ gnome-initial-setup/pages/password/Makefile.in Sat Apr 26 18:27:42 2014
|
||||
@@ -101,8 +101,6 @@ am__objects_2 =
|
||||
am_libgispassword_la_OBJECTS = $(am__objects_1) \
|
||||
libgispassword_la-gis-password-page.lo \
|
||||
libgispassword_la-gis-account-page-local.lo \
|
||||
- libgispassword_la-gis-account-page-enterprise.lo \
|
||||
- libgispassword_la-um-realm-manager.lo \
|
||||
libgispassword_la-um-utils.lo libgispassword_la-pw-utils.lo \
|
||||
$(am__objects_2)
|
||||
libgispassword_la_OBJECTS = $(am_libgispassword_la_OBJECTS)
|
||||
@@ -347,14 +345,12 @@ libgispassword_la_SOURCES = \
|
||||
$(BUILT_SOURCES) \
|
||||
gis-password-page.c gis-password-page.h \
|
||||
gis-account-page-local.c gis-account-page-local.h \
|
||||
- gis-account-page-enterprise.c gis-account-page-enterprise.h \
|
||||
- um-realm-manager.c um-realm-manager.h \
|
||||
um-utils.c um-utils.h \
|
||||
pw-utils.c pw-utils.h \
|
||||
$(NULL)
|
||||
|
||||
libgispassword_la_CFLAGS = $(INITIAL_SETUP_CFLAGS) -I "$(srcdir)/../.."
|
||||
@ -13,3 +32,17 @@ XXX push upstream: on OpenBSD, crypt() is part of libc, create a proper configur
|
||||
libgispassword_la_LDFLAGS = -export_dynamic -avoid-version -module -no-undefined
|
||||
EXTRA_DIST = \
|
||||
org.freedesktop.realmd.xml \
|
||||
@@ -417,13 +413,11 @@ mostlyclean-compile:
|
||||
distclean-compile:
|
||||
-rm -f *.tab.c
|
||||
|
||||
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgispassword_la-gis-account-page-enterprise.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgispassword_la-gis-account-page-local.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgispassword_la-gis-password-page.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgispassword_la-password-resources.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgispassword_la-pw-utils.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgispassword_la-um-realm-generated.Plo@am__quote@
|
||||
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgispassword_la-um-realm-manager.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgispassword_la-um-utils.Plo@am__quote@
|
||||
|
||||
.c.o:
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
$OpenBSD: patch-gnome-initial-setup_pages_password_um-realm-manager_c,v 1.1 2014/03/27 19:41:05 ajacoutot Exp $
|
||||
|
||||
XXX rework and push upstream
|
||||
|
||||
--- gnome-initial-setup/pages/password/um-realm-manager.c.orig Thu Mar 27 20:30:37 2014
|
||||
+++ gnome-initial-setup/pages/password/um-realm-manager.c Thu Mar 27 20:30:09 2014
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
#include "um-realm-manager.h"
|
||||
|
||||
-#include <krb5/krb5.h>
|
||||
+#include <krb5.h>
|
||||
|
||||
#include <glib.h>
|
||||
#include <glib/gi18n.h>
|
||||
Loading…
Reference in New Issue
Block a user