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

Update to gdm-3.8.3.1.

Browse Source
This commit is contained in:
ajacoutot 2013-06-17 13:22:50 +00:00
parent 55f2c463d8
commit 11fb4e65a1
9 changed files with 88 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
x11/gnome/gdm/Makefile
View File

@ -1,16 +1,16 @@
# $OpenBSD: Makefile,v 1.167 2013/06/15 11:53:41 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.168 2013/06/17 13:22:50 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= GNOME display manager
GNOME_PROJECT= gdm
GNOME_VERSION= 3.8.3
REVISION= 0
GNOME_VERSION= 3.8.3.1
HOMEPAGE= http://projects.gnome.org/gdm/
SHARED_LIBS += gdm 0.0 # 1.0
SHARED_LIBS += gdmsimplegreeter 0.0 # 1.0
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
@ -18,12 +18,13 @@ PERMIT_PACKAGE_CDROM= Yes
WANTLIB += ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext
WANTLIB += Xfixes Xi Xinerama Xrandr Xrender accountsservice atk-1.0
WANTLIB += atk-bridge-2.0 atspi c cairo cairo-gobject canberra
WANTLIB += canberra-gtk3 dbus-1 expat ffi fontconfig freetype
WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
WANTLIB += graphite2 gthread-2.0 gtk-3 harfbuzz ltdl m ogg pam
WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
WANTLIB += png pthread pthread-stubs util vorbis vorbisfile xcb
WANTLIB += xcb-render xcb-shm z
WANTLIB += canberra-gtk3 dbus-1 dbus-glib-1 expat ffi fontconfig
WANTLIB += freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
WANTLIB += gobject-2.0 graphite2 gthread-2.0 gtk-3 harfbuzz ltdl
WANTLIB += m nspr4 nss3 nssutil3 ogg pam pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 plc4 plds4 png pthread pthread-stubs
WANTLIB += smime3 softokn3 sqlite3 ssl3 upower-glib util vorbis
WANTLIB += vorbisfile xcb xcb-render xcb-shm z
MODULES= devel/gettext \
x11/gnome \
@ -39,8 +40,10 @@ BUILD_DEPENDS= devel/check
RUN_DEPENDS += x11/gnome/orca
LIB_DEPENDS= audio/libcanberra,-gtk3 \
security/nss \
security/openpam \
sysutils/accountsservice
sysutils/accountsservice \
sysutils/upower
LIBTOOL_FLAGS= --tag=disable-static
@ -49,9 +52,6 @@ MODGNOME_ICON_CACHE= Yes
MODGNOME_CPPFLAGS= -I${X11BASE}/include -DHAS_SA_LEN
MODGNOME_LDFLAGS= -L${X11BASE}/lib
AUTOCONF_VERSION= 2.69
CONFIGURE_STYLE= autoconf
CONFIGURE_ARGS= --disable-static \
--mandir=${PREFIX}/man \
--with-lang-file=${SYSCONFDIR}/gdm/i18n \
@ -80,6 +80,7 @@ pre-configure:
${WRKSRC}/daemon/gdm-session-worker.c
post-install:
rm ${PREFIX}/lib/gdm/simple-greeter/extensions/*.la
rm -rf ${WRKINST}/var/run/gdm
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gdm/{etc/pam.d,var/db}
${INSTALL_DATA} ${FILESDIR}/gdm-* \

4
x11/gnome/gdm/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gnome/gdm-3.8.3.tar.xz) = HQ7WGsKxhMYqyw0JpbfAN5O1eTWZ27aIjX/o0ftujaI=
SIZE (gnome/gdm-3.8.3.tar.xz) = 1559952
SHA256 (gnome/gdm-3.8.3.1.tar.xz) = qMijKAPjLF0IfHXGvoFgz+TRWEOVPwe1mdZTusRxMg4=
SIZE (gnome/gdm-3.8.3.1.tar.xz) = 1677900

48
x11/gnome/gdm/patches/patch-configure_ac
View File

@ -1,48 +0,0 @@
$OpenBSD: patch-configure_ac,v 1.1 2013/06/15 11:53:41 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=702329
--- configure.ac.orig Sat Jun 15 09:59:58 2013
+++ configure.ac Sat Jun 15 10:00:41 2013
@@ -72,9 +72,7 @@ GNOME_PANEL_REQUIRED_VERSION=2.0.0
LIBCANBERRA_GTK_REQUIRED_VERSION=0.4
#FONTCONFIG_REQUIRED_VERSION=2.6.0
FONTCONFIG_REQUIRED_VERSION=2.5.0
-UPOWER_REQUIRED_VERSION=0.9.0
ACCOUNTS_SERVICE_REQUIRED_VERSION=0.6.12
-NSS_REQUIRED_VERSION=3.11.1
EXTRA_COMPILE_WARNINGS(yes)
@@ -101,12 +99,6 @@ AC_SUBST(DAEMON_LIBS)
GLIB_GSETTINGS
-PKG_CHECK_MODULES(NSS,
- nss >= $NSS_REQUIRED_VERSION
-)
-AC_SUBST(NSS_CFLAGS)
-AC_SUBST(NSS_LIBS)
-
PKG_CHECK_MODULES(XLIB, x11 xau xrandr, ,
[AC_PATH_XTRA
if test "x$no_x" = xyes; then
@@ -129,18 +121,6 @@ PKG_CHECK_MODULES(CANBERRA_GTK,
)
AC_SUBST(CANBERRA_GTK_CFLAGS)
AC_SUBST(CANBERRA_GTK_LIBS)
-
-PKG_CHECK_MODULES(UPOWER,
- upower-glib >= $UPOWER_REQUIRED_VERSION,
- have_upower=yes,
- have_upower=no
-)
-if test "x$have_upower" = "xyes" ; then
- AC_DEFINE(HAVE_UPOWER, [], [Define if we have UPower])
-fi
-AC_SUBST(UPOWER)
-AC_SUBST(UPOWER_CFLAGS)
-AC_SUBST(UPOWER_LIBS)
PKG_CHECK_MODULES(LIBSELINUX, libselinux, have_selinux=yes, have_selinux=no)

8
x11/gnome/gdm/patches/patch-daemon_Makefile_in
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-daemon_Makefile_in,v 1.7 2013/06/14 18:18:38 ajacoutot Exp $
$OpenBSD: patch-daemon_Makefile_in,v 1.8 2013/06/17 13:22:51 ajacoutot Exp $
undefined reference to `logwtmp'...
--- daemon/Makefile.in.orig Fri Jun 14 19:06:05 2013
+++ daemon/Makefile.in Fri Jun 14 19:23:02 2013
@@ -784,6 +784,7 @@ gdm_session_worker_LDFLAGS = \
--- daemon/Makefile.in.orig Mon Jun 17 14:29:20 2013
+++ daemon/Makefile.in Mon Jun 17 14:49:54 2013
@@ -787,6 +787,7 @@ gdm_session_worker_LDFLAGS = \
gdm_session_worker_LDADD = \
$(top_builddir)/common/libgdmcommon.la \
$(DAEMON_LIBS) \

8
x11/gnome/gdm/patches/patch-data_Makefile_in
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-data_Makefile_in,v 1.4 2013/06/14 18:18:38 ajacoutot Exp $
$OpenBSD: patch-data_Makefile_in,v 1.5 2013/06/17 13:22:51 ajacoutot Exp $
XXX push upstream
--- data/Makefile.in.orig Fri Jun 14 19:06:06 2013
+++ data/Makefile.in Fri Jun 14 19:23:02 2013
@@ -989,6 +989,7 @@ uninstall-am: uninstall-dbusconfDATA uninstall-localea
--- data/Makefile.in.orig Mon Jun 17 14:29:20 2013
+++ data/Makefile.in Mon Jun 17 14:49:54 2013
@@ -995,6 +995,7 @@ uninstall-am: uninstall-dbusconfDATA uninstall-localea
Xsession: $(srcdir)/Xsession.in
sed -e 's,[@]XSESSION_SHELL[@],$(XSESSION_SHELL),g' \
-e 's,[@]libexecdir[@],$(libexecdir),g' \

10
x11/gnome/gdm/patches/patch-data_gdm-shell-with-fallback_session_in Normal file
View File

@ -0,0 +1,10 @@
$OpenBSD: patch-data_gdm-shell-with-fallback_session_in,v 1.3 2013/06/17 13:22:51 ajacoutot Exp $
--- data/gdm-shell-with-fallback.session.in.orig Tue Mar 19 17:11:52 2013
+++ data/gdm-shell-with-fallback.session.in Mon Jun 17 14:50:35 2013
@@ -1,5 +1,5 @@
[GNOME Session]
Name=Display Manager
RequiredComponents=gnome-shell;gnome-settings-daemon;
-IsRunnableHelper=bash -c 'type -p gnome-shell >& /dev/null && @CHECK_ACCELERATED_DIR@/gnome-session-check-accelerated'
+IsRunnableHelper=sh -c 'type -p gnome-shell >/dev/null && @CHECK_ACCELERATED_DIR@/gnome-session-check-accelerated'
FallbackSession=gdm-fallback

13
x11/gnome/gdm/patches/patch-gui_simple-greeter_extensions_smartcard_gdm-smartcard-worker_c Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-gui_simple-greeter_extensions_smartcard_gdm-smartcard-worker_c,v 1.3 2013/06/17 13:22:51 ajacoutot Exp $
--- gui/simple-greeter/extensions/smartcard/gdm-smartcard-worker.c.orig Mon Jun 17 14:02:18 2013
+++ gui/simple-greeter/extensions/smartcard/gdm-smartcard-worker.c Mon Jun 17 14:50:38 2013
@@ -2,7 +2,9 @@
#include <fcntl.h>
#include <locale.h>
+#ifdef __linux__
#include <sys/prctl.h>
+#endif
#include <stdlib.h>
#include <unistd.h>

11
x11/gnome/gdm/patches/patch-gui_simple-greeter_gdm-remote-login-window_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-gui_simple-greeter_gdm-remote-login-window_c,v 1.3 2013/06/17 13:22:51 ajacoutot Exp $
--- gui/simple-greeter/gdm-remote-login-window.c.orig Mon Jun 17 14:02:18 2013
+++ gui/simple-greeter/gdm-remote-login-window.c Mon Jun 17 14:50:41 2013
@@ -25,6 +25,7 @@
#include <unistd.h>
#include <sys/types.h>
#include <sys/wait.h>
+#include <sys/signal.h>
#include <errno.h>
#include <glib.h>

31
x11/gnome/gdm/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.65 2013/06/14 18:18:38 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.66 2013/06/17 13:22:51 ajacoutot Exp $
@comment starts a full gnome-session as _gdm which requires a valid homedir
@newgroup _gdm:676
@newuser _gdm:676:_gdm:daemon:GNOME Display Manager:/var/db/gdm:/sbin/nologin
@ -22,14 +22,27 @@ include/gdm/gdm-client-glue.h
include/gdm/gdm-client.h
include/gdm/gdm-sessions.h
include/gdm/gdm-user-switching.h
include/gdm/simple-greeter/
include/gdm/simple-greeter/gdm-login-extension.h
lib/gdm/
lib/gdm/simple-greeter/
lib/gdm/simple-greeter/extensions/
lib/gdm/simple-greeter/extensions/libfingerprint.so
lib/gdm/simple-greeter/extensions/libpassword.so
lib/gdm/simple-greeter/extensions/libsmartcard.so
lib/girepository-1.0/Gdm-1.0.typelib
lib/libgdm.la
@lib lib/libgdm.so.${LIBgdm_VERSION}
lib/libgdmsimplegreeter.la
@lib lib/libgdmsimplegreeter.so.${LIBgdmsimplegreeter_VERSION}
lib/pkgconfig/gdm.pc
lib/pkgconfig/gdmsimplegreeter.pc
@bin libexec/gdm-host-chooser
@bin libexec/gdm-session-worker
@bin libexec/gdm-simple-chooser
@bin libexec/gdm-simple-greeter
@bin libexec/gdm-simple-slave
@bin libexec/gdm-smartcard-worker
@bin libexec/gdm-xdmcp-chooser-slave
@bin sbin/gdm
share/examples/gdm/
@ -119,6 +132,7 @@ share/examples/gdm/var/db/gdm/.pulse/client.conf
@owner
@group
share/gdm/gdb-cmd
share/gdm/gdm-greeter-login-window.ui
share/gdm/gdm.schemas
share/gdm/greeter/
share/gdm/greeter/applications/
@ -130,11 +144,22 @@ share/gdm/greeter/applications/polkit-gnome-authentication-agent-1.desktop
share/gdm/greeter/autostart/
share/gdm/greeter/autostart/orca-autostart.desktop
share/gdm/locale.alias
share/gdm/simple-greeter/
share/gdm/simple-greeter/extensions/
share/gdm/simple-greeter/extensions/fingerprint/
share/gdm/simple-greeter/extensions/fingerprint/page.ui
share/gdm/simple-greeter/extensions/password/
share/gdm/simple-greeter/extensions/password/page.ui
share/gdm/simple-greeter/extensions/smartcard/
share/gdm/simple-greeter/extensions/smartcard/page.ui
share/gdm/simple-greeter/extensions/unified/
share/gdm/simple-greeter/extensions/unified/page.ui
share/gir-1.0/Gdm-1.0.gir
share/glib-2.0/schemas/10_org.gnome.login-screen.gschema.override
share/glib-2.0/schemas/org.gnome.login-screen.gschema.xml
share/gnome-session/
share/gnome-session/sessions/
share/gnome-session/sessions/gdm-fallback.session
share/gnome-session/sessions/gdm-shell.session
share/help/C/gdm/
share/help/C/gdm/index.docbook
@ -201,9 +226,13 @@ share/help/zh_CN/
share/help/zh_CN/gdm/
share/help/zh_CN/gdm/index.docbook
share/help/zh_CN/gdm/legal.xml
share/icons/hicolor/16x16/apps/gdm-fingerprint.png
share/icons/hicolor/16x16/apps/gdm-smartcard.png
share/icons/hicolor/16x16/apps/gdm-xnest.png
share/icons/hicolor/32x32/apps/gdm-setup.png
share/icons/hicolor/32x32/apps/gdm-xnest.png
share/icons/hicolor/48x48/apps/gdm-fingerprint.png
share/icons/hicolor/48x48/apps/gdm-smartcard.png
share/locale/af/LC_MESSAGES/gdm.mo
share/locale/am/LC_MESSAGES/gdm.mo
share/locale/an/LC_MESSAGES/gdm.mo