Switch yelp to xulrunner 1.9.2.

ok ajacoutot@ jasper@
This commit is contained in:
landry 2010-06-14 08:08:55 +00:00
parent fea6517bed
commit e834218de0
2 changed files with 21 additions and 5 deletions

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.53 2010/04/26 16:05:07 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.54 2010/06/14 08:08:55 landry Exp $
COMMENT= GNOME help browser
GNOME_PROJECT= yelp
GNOME_VERSION= 2.30.1
PKGNAME= ${DISTNAME}p0
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
@ -25,14 +26,14 @@ MODULES= devel/gettext \
x11/gnome \
devel/gconf2
BUILD_DEPENDS= :xulrunner-devel->=1.8,<1.9:devel/xulrunner/1.8,-devel \
BUILD_DEPENDS= :xulrunner-devel->=1.9.2:devel/xulrunner/1.9,-devel \
::x11/gnome/doc-utils
RUN_DEPENDS= ::misc/shared-mime-info \
::textproc/docbook-dsssl \
::x11/gnome/users-guide \
::x11/gnome/doc-utils
LIB_DEPENDS= startup-notification-1::devel/startup-notification \
xulrunner/gtkembedmoz,xulrunner/xpcom,xulrunner/xul:xulrunner->=1.8,<1.9:devel/xulrunner/1.8,-main \
xulrunner1.9/xpcom,xulrunner1.9/xul:xulrunner->=1.9.2:devel/xulrunner/1.9,-main \
exslt,xslt::textproc/libxslt \
rarian::textproc/rarian
@ -41,9 +42,10 @@ MODGCONF2_SCHEMAS_DIR= yelp
DESKTOP_FILES= Yes
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--with-gecko=xulrunner \
--with-gecko=libxul \
--with-gecko-home=${LOCALBASE}/xulrunner1.9 \
--with-search=basic
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/xulrunner/include/" \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/xulrunner1.9/include/" \
LDFLAGS="-L${LOCALBASE}/lib" \
ac_cv_lib_lzmadec_lzmadec_open=no

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_yelp-gecko-utils_cpp,v 1.1 2010/06/14 08:08:55 landry Exp $
From FreeBSD
--- src/yelp-gecko-utils.cpp.orig Fri Mar 19 15:11:01 2010
+++ src/yelp-gecko-utils.cpp Sun Jun 13 20:03:01 2010
@@ -28,7 +28,9 @@
#include <nsStringAPI.h>
#ifdef HAVE_GECKO_1_9
+#ifdef XPCOM_GLUE
#include <gtkmozembed_glue.cpp>
+#endif
#endif
#include <gtkmozembed.h>