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

- explicitely disable Xevie(3) support for now

Browse Source 
there is a nasty bug somewhere that makes the app crash with the
(in)famous "X Windows System Error..." which disables accessibility in
GNOME

ok jasper@
This commit is contained in:
ajacoutot 2009-01-13 18:08:20 +00:00
parent 62cf59b910
commit a6786d6e7b
4 changed files with 19 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
x11/gnome/at-spi/Makefile
View File

@ -1,9 +1,11 @@
# $OpenBSD: Makefile,v 1.9 2008/12/19 08:34:50 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.10 2009/01/13 18:08:20 ajacoutot Exp $
COMMENT= GNOME accessibility interface
GNOME_PROJECT= at-spi
GNOME_VERSION= 1.24.1
PKGNAME= ${DISTNAME}p0
SHARED_LIBS += spi 0.0 # .10.11
SHARED_LIBS += loginhelper 0.0 # .0.0
SHARED_LIBS += cspi 0.0 # .10.11
@ -17,7 +19,7 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \
Xcursor Xdamage Xdmcp Xevie Xext Xfixes Xi Xinerama \
Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama \
Xrandr Xrender Xtst atk-1.0 c cairo expat fontconfig \
freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 \
gthread-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \
@ -32,8 +34,9 @@ LIB_DEPENDS= bonobo-2.>=1,bonobo-activation.>=5::x11/gnome/libbonobo \
USE_X11= Yes
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/at-spi \
--enable-xevie
--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/at-spi
# XXX X Window System Error ('BadLenght...')
CONFIGURE_ARGS+= --disable-xevie
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
PYTHON=${MODPY_BIN}

7
x11/gnome/gdm/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.43 2009/01/01 12:01:19 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.44 2009/01/13 18:08:20 ajacoutot Exp $
COMMENT= GNOME display manager
GNOME_PROJECT= gdm
GNOME_VERSION= 2.20.8
PKGNAME= ${DISTNAME}p7
PKGNAME= ${DISTNAME}p8
HOMEPAGE= http://www.gnome.org/projects/gdm/
@ -46,9 +46,10 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--enable-secureremote=yes \
--enable-console-helper=no \
--disable-scrollkeeper \
--with-xevie=yes \
--with-console-kit=no \
--with-libaudit=no
# XXX X Window System Error ('BadLenght...')
CONFIGURE_ARGS+= --with-xevie=no
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"

16
x11/gnome/gok/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.8 2008/12/17 18:47:57 jasper Exp $
# $OpenBSD: Makefile,v 1.9 2009/01/13 18:08:20 ajacoutot Exp $
COMMENT= GNOME on-screen keyboard
GNOME_PROJECT= gok
GNOME_VERSION= 2.24.0
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
HOMEPAGE= http://live.gnome.org/Gok
@ -15,7 +15,7 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 XRes Xau Xcomposite \
Xcursor Xdamage Xdmcp Xevie Xext Xfixes Xi Xinerama \
Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama \
Xrandr Xrender Xtst art_lgpl_2 atk-1.0 audiofile bonobo-2 \
bonobo-activation bonoboui-2 c cairo crypto dbus-1 \
dbus-glib-1 esd expat fontconfig freetype gailutil \
@ -23,7 +23,7 @@ WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 XRes Xau Xcomposite \
glib-2.0 glitz gmodule-2.0 gnome-2 gnome-keyring gnomecanvas-2 \
gnomevfs-2 gobject-2.0 gthread-2.0 gtk-x11-2.0 m pango-1.0 \
pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png popt \
pthread ssl startup-notification-1 util xml2 z
pthread ssl startup-notification-1 util xml2 z sndio
MODULES= devel/gettext \
x11/gnome
@ -41,11 +41,11 @@ DESKTOP_FILES= Yes
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/gok \
--disable-schemas-install \
--disable-scrollkeeper \
--enable-xevie
--disable-scrollkeeper
# XXX X Window System Error ('BadLenght...')
CONFIGURE_ARGS+= --disable-xevie
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
XEVIE_LIBS="-lXext -lXevie"
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
# The regression tests require a running instance of X.
# You will also need to set the XAUTHORITY environment variable to point

21
x11/gnome/gok/patches/patch-configure
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-configure,v 1.2 2008/11/21 18:27:05 jasper Exp $
--- configure.orig Fri Nov 14 17:22:21 2008
+++ configure Fri Nov 14 17:22:25 2008
@@ -14986,7 +14986,7 @@ if test "${ac_cv_lib_Xext_XevieStart+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lXext $LIBS"
+LIBS="-lXext -lXevie $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -15047,7 +15047,7 @@ fi
if test "x$have_xevie" = "xyes"; then
- XEVIE_LIBS="-lXext"
+ XEVIE_LIBS="-lXext -lXevie"
cat >>confdefs.h <<\_ACEOF
#define HAVE_XEVIE 1