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

So, our linker does not hide private symbols... which results in a big

Browse Source 
amount of crashes because gcr, libgnome-keyring and gnome-keyring share
some common (private) symbol names.
Miod says there is no workaround...

For gnome-shell, just stop linking to libgnome-keyring which we don't
need anyway since it is only needed by the network-manager functionnality
that is obviously disabled for us.
This commit is contained in:
ajacoutot 2012-07-13 08:03:53 +00:00
parent cf56c00b44
commit 19e32bae7f
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/gnome/shell/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.4 2012/07/09 18:01:16 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.5 2012/07/13 08:03:53 ajacoutot Exp $
COMMENT= next generation GNOME shell
GNOME_PROJECT= gnome-shell
GNOME_VERSION= 3.4.1
REVISION= 2
REVISION= 3
HOMEPAGE= http://live.gnome.org/GnomeShell

9
x11/gnome/shell/patches/patch-configure_ac
View File

@ -1,16 +1,15 @@
$OpenBSD: patch-configure_ac,v 1.2 2012/07/08 15:39:11 ajacoutot Exp $
$OpenBSD: patch-configure_ac,v 1.3 2012/07/13 08:03:53 ajacoutot Exp $
Remove network-related functionality, as this requires NetworkManager.
(XXX make a patch committable upstream)
--- configure.ac.orig Sun Jul 8 14:18:23 2012
+++ configure.ac Sun Jul 8 14:19:03 2012
@@ -94,7 +94,7 @@ PKG_CHECK_MODULES(GNOME_SHELL, gio-unix-2.0 >= $GIO_MI
--- configure.ac.orig Tue Apr 17 19:20:06 2012
+++ configure.ac Fri Jul 13 09:42:16 2012
@@ -94,7 +94,6 @@ PKG_CHECK_MODULES(GNOME_SHELL, gio-unix-2.0 >= $GIO_MI
telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
telepathy-logger-0.2 >= $TELEPATHY_LOGGER_MIN_VERSION
polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
- libnm-glib libnm-util gnome-keyring-1
+ gnome-keyring-1
gcr-3 >= $GCR_MIN_VERSION)
PKG_CHECK_MODULES(SHELL_PERF_HELPER, gtk+-3.0 gio-2.0)