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

Axe the user-accounts panel for now since it cannot build without kerberos.

Browse Source
This commit is contained in:
ajacoutot 2014-04-21 15:07:52 +00:00
parent c0667cc925
commit 6dbde86522
6 changed files with 82 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
x11/gnome/controlcenter/Makefile
View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.132 2014/04/16 14:33:48 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.133 2014/04/21 15:07:52 ajacoutot Exp $
# XXX remove pre-configure when updating to 3.12.0
# XXX remove hostnames-test.txt hack in pre-configure when updating to 3.12.0
# https://git.gnome.org/browse/gnome-control-center/commit/?id=4736b03ed9e2ae9214117454f70811dbacd78739
# XXX change proxy settings without network-manager?
@ -11,6 +11,7 @@ COMMENT= GNOME control center
GNOME_PROJECT= gnome-control-center
GNOME_VERSION= 3.12.1
REVISION= 0
CATEGORIES= x11
@ -19,24 +20,24 @@ PERMIT_PACKAGE_CDROM= Yes
WANTLIB += EGL FLAC GL ICE SM X11 X11-xcb Xau Xcomposite Xcursor
WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender Xt Xtst
WANTLIB += accountsservice asn1 atk-1.0 atk-bridge-2.0 atspi avahi-common
WANTLIB += accountsservice atk-1.0 atk-bridge-2.0 atspi avahi-common
WANTLIB += c cairo cairo-gobject canberra canberra-gtk3 colord
WANTLIB += colord-gtk colordprivate com_err crack crypto cups
WANTLIB += dbus-1 dbus-glib-1 enchant execinfo expat ffi fontconfig
WANTLIB += freetype gcrypt gdbm gdk-3 gdk_pixbuf-2.0 geoclue gio-2.0
WANTLIB += glib-2.0 gmodule-2.0 gnome-desktop-3 gnome-menu-3 goa-1.0
WANTLIB += goa-backend-1.0 gobject-2.0 gpg-error graphite2 gstapp-1.0
WANTLIB += colord-gtk colordprivate cups dbus-1 dbus-glib-1 enchant
WANTLIB += execinfo expat ffi fontconfig freetype gcrypt gdbm
WANTLIB += gdk-3 gdk_pixbuf-2.0 geoclue gio-2.0 glib-2.0 gmodule-2.0
WANTLIB += gnome-desktop-3 gnome-menu-3 goa-1.0 goa-backend-1.0
WANTLIB += gobject-2.0 gpg-error graphite2 grilo-0.2 gstapp-1.0
WANTLIB += gstaudio-1.0 gstbase-1.0 gstfft-1.0 gstpbutils-1.0
WANTLIB += gstreamer-1.0 gsttag-1.0 gstvideo-1.0 gthread-2.0 gtk-3
WANTLIB += gtop-2.0 harfbuzz harfbuzz-icu heimbase ibus-1.0 icudata
WANTLIB += icui18n icuuc javascriptcoregtk-3.0 jpeg json-c json-glib-1.0
WANTLIB += krb5 kvm lcms2 ltdl m ogg orc-0.4 pango-1.0 pangocairo-1.0
WANTLIB += gtop-2.0 harfbuzz harfbuzz-icu ibus-1.0 icudata icui18n
WANTLIB += icuuc javascriptcoregtk-3.0 jpeg json-c json-glib-1.0
WANTLIB += kvm lcms2 ltdl m ogg orc-0.4 pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 png polkit-gobject-1 pthread
WANTLIB += pthread-stubs pulse pulse-mainloop-glib pwquality rest-0.7
WANTLIB += roken secret-1 smbclient sndfile soup-2.4 soup-gnome-2.4
WANTLIB += sqlite3 stdc++ telepathy-glib upower-glib vorbis vorbisenc
WANTLIB += vorbisfile webkitgtk-3.0 webp wind xcb xcb-render xcb-shm
WANTLIB += xml2 xslt z grilo-0.2
WANTLIB += pthread-stubs pulse pulse-mainloop-glib rest-0.7 secret-1
WANTLIB += smbclient sndfile soup-2.4 soup-gnome-2.4 sqlite3 stdc++
WANTLIB += telepathy-glib upower-glib vorbis vorbisenc vorbisfile
WANTLIB += webkitgtk-3.0 webp xcb xcb-render xcb-shm xml2 xslt
WANTLIB += z
MODULES= devel/gettext \
x11/gnome
@ -47,7 +48,6 @@ LIB_DEPENDS= audio/pulseaudio \
graphics/colord-gtk \
net/samba \
print/cups,-libs \
security/libpwquality \
sysutils/accountsservice \
sysutils/upower \
x11/gnome/desktop \
@ -92,6 +92,9 @@ MODGNOME_LDFLAGS= -L${X11BASE}/lib
FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/gnome-control-center
pre-configure:
# disable user account panel (requires kerberos)
# patch-panels_Makefile_in, patch-shell_Makefile_in, patch-shell_cc-panel-loader_c
ln -sf /usr/bin/true ${WRKDIR}/bin/krb5-config
echo >${WRKSRC}/shell/hostnames-test.txt
.include <bsd.port.mk>

15
x11/gnome/controlcenter/patches/patch-panels_Makefile_in Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-panels_Makefile_in,v 1.8 2014/04/21 15:07:52 ajacoutot Exp $
XXX disable user-accounts panel (requires kerberos)
--- panels/Makefile.in.orig Mon Apr 21 16:33:09 2014
+++ panels/Makefile.in Mon Apr 21 16:33:24 2014
@@ -410,7 +410,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = common background power color display mouse notifications \
online-accounts region info sound keyboard universal-access \
- user-accounts datetime search privacy sharing $(am__append_1) \
+ datetime search privacy sharing $(am__append_1) \
$(am__append_2) $(am__append_3) $(am__append_4)
all: all-recursive

26
x11/gnome/controlcenter/patches/patch-panels_user-accounts_um-realm-manager_c
View File

@ -1,26 +0,0 @@
$OpenBSD: patch-panels_user-accounts_um-realm-manager_c,v 1.2 2014/03/27 12:41:07 ajacoutot Exp $
XXX push upsteam: fix build with Heimdal.
--- panels/user-accounts/um-realm-manager.c.orig Mon Mar 3 12:55:25 2014
+++ panels/user-accounts/um-realm-manager.c Thu Mar 27 13:00:03 2014
@@ -22,7 +22,7 @@
#include "um-realm-manager.h"
-#include <krb5/krb5.h>
+#include <krb5.h>
#include <glib.h>
#include <glib/gi18n.h>
@@ -739,8 +739,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,

22
x11/gnome/controlcenter/patches/patch-shell_Makefile_in Normal file
View File

@ -0,0 +1,22 @@
$OpenBSD: patch-shell_Makefile_in,v 1.1 2014/04/21 15:07:52 ajacoutot Exp $
XXX disable user-accounts panel (requires kerberos)
--- shell/Makefile.in.orig Mon Apr 21 16:39:52 2014
+++ shell/Makefile.in Mon Apr 21 16:40:06 2014
@@ -141,7 +141,6 @@ gnome_control_center_DEPENDENCIES = libshell.la $(am__
$(top_builddir)/panels/sharing/libsharing.la \
$(top_builddir)/panels/sound/libsound.la \
$(top_builddir)/panels/universal-access/libuniversal-access.la \
- $(top_builddir)/panels/user-accounts/libuser-accounts.la \
$(am__append_1) $(am__append_2) $(am__append_3) \
$(am__append_4)
gnome_control_center_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@@ -536,7 +535,6 @@ gnome_control_center_LDADD = libshell.la $(SHELL_LIBS)
$(top_builddir)/panels/sharing/libsharing.la \
$(top_builddir)/panels/sound/libsound.la \
$(top_builddir)/panels/universal-access/libuniversal-access.la \
- $(top_builddir)/panels/user-accounts/libuser-accounts.la \
$(am__append_1) $(am__append_2) $(am__append_3) \
$(am__append_4)
AM_CPPFLAGS = -DGNOMELOCALEDIR="\"$(datadir)/locale\""

22
x11/gnome/controlcenter/patches/patch-shell_cc-panel-loader_c Normal file
View File

@ -0,0 +1,22 @@
$OpenBSD: patch-shell_cc-panel-loader_c,v 1.4 2014/04/21 15:07:52 ajacoutot Exp $
XXX disable user-accounts panel (requires kerberos)
--- shell/cc-panel-loader.c.orig Mon Apr 21 16:45:33 2014
+++ shell/cc-panel-loader.c Mon Apr 21 16:45:51 2014
@@ -54,7 +54,6 @@ extern GType cc_search_panel_get_type (void);
extern GType cc_sharing_panel_get_type (void);
extern GType cc_sound_panel_get_type (void);
extern GType cc_ua_panel_get_type (void);
-extern GType cc_user_panel_get_type (void);
#ifdef BUILD_WACOM
extern GType cc_wacom_panel_get_type (void);
#endif /* BUILD_WACOM */
@@ -98,7 +97,6 @@ static struct {
PANEL_TYPE("sharing", cc_sharing_panel_get_type ),
PANEL_TYPE("sound", cc_sound_panel_get_type ),
PANEL_TYPE("universal-access", cc_ua_panel_get_type ),
- PANEL_TYPE("user-accounts", cc_user_panel_get_type ),
#ifdef BUILD_WACOM
PANEL_TYPE("wacom", cc_wacom_panel_get_type ),
#endif

32
x11/gnome/controlcenter/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.31 2013/09/26 17:14:17 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.32 2014/04/21 15:07:52 ajacoutot Exp $
@conflict control-center-1*
@conflict control-center2-*
@conflict gnome-media-<2.91.2p3
@ -26,7 +26,6 @@ share/applications/gnome-search-panel.desktop
share/applications/gnome-sharing-panel.desktop
share/applications/gnome-sound-panel.desktop
share/applications/gnome-universal-access-panel.desktop
share/applications/gnome-user-accounts-panel.desktop
share/bash-completion/completions/gnome-control-center
share/dbus-1/services/org.gnome.ControlCenter.SearchProvider.service
share/dbus-1/services/org.gnome.ControlCenter.service
@ -236,6 +235,8 @@ share/locale/ko/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/ku/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
share/locale/ku/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/ky/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/lo/
share/locale/lo/LC_MESSAGES/
share/locale/lo/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
share/locale/lt/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
share/locale/lt/LC_MESSAGES/gnome-control-center-2.0.mo
@ -318,36 +319,9 @@ share/locale/zh_HK/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
share/locale/zh_TW/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/zu/LC_MESSAGES/gnome-control-center-2.0.mo
share/pixmaps/
share/pixmaps/faces/
share/pixmaps/faces/astronaut.jpg
share/pixmaps/faces/baseball.png
share/pixmaps/faces/butterfly.png
share/pixmaps/faces/cat-eye.jpg
share/pixmaps/faces/chess.jpg
share/pixmaps/faces/coffee.jpg
share/pixmaps/faces/dice.jpg
share/pixmaps/faces/energy-arc.jpg
share/pixmaps/faces/fish.jpg
share/pixmaps/faces/flake.jpg
share/pixmaps/faces/flower.jpg
share/pixmaps/faces/grapes.jpg
share/pixmaps/faces/guitar.jpg
share/pixmaps/faces/launch.jpg
share/pixmaps/faces/leaf.jpg
share/pixmaps/faces/lightning.jpg
share/pixmaps/faces/penguin.jpg
share/pixmaps/faces/puppy.jpg
share/pixmaps/faces/sky.jpg
share/pixmaps/faces/soccerball.png
share/pixmaps/faces/sunflower.jpg
share/pixmaps/faces/sunset.jpg
share/pixmaps/faces/tennis-ball.png
share/pixmaps/faces/yellow-rose.jpg
share/pkgconfig/gnome-keybindings.pc
share/polkit-1/actions/org.gnome.controlcenter.datetime.policy
share/polkit-1/actions/org.gnome.controlcenter.remote-login-helper.policy
share/polkit-1/actions/org.gnome.controlcenter.user-accounts.policy
share/polkit-1/rules.d/gnome-control-center.rules
share/sounds/gnome/
share/sounds/gnome/default/