From 7755419ee9eb150d86b04b44dd1ddd5d7cacd49c Mon Sep 17 00:00:00 2001 From: martynas Date: Wed, 23 Jan 2008 16:32:04 +0000 Subject: [PATCH] enable cookie and permissions extensions for applications such as epiphany and galeon. improvements, testing and ok kurt@ and naddy@ --- devel/xulrunner/Makefile | 15 ++++++++------- devel/xulrunner/pkg/PFRAG.shared-main | 4 +++- devel/xulrunner/pkg/PLIST-devel | 9 ++++++++- devel/xulrunner/pkg/PLIST-main | 14 +++++++------- 4 files changed, 26 insertions(+), 16 deletions(-) diff --git a/devel/xulrunner/Makefile b/devel/xulrunner/Makefile index c15750742cf..256dc8da6a9 100644 --- a/devel/xulrunner/Makefile +++ b/devel/xulrunner/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2007/12/07 22:10:28 martynas Exp $ +# $OpenBSD: Makefile,v 1.16 2008/01/23 16:32:04 martynas Exp $ ONLY_FOR_ARCHS= alpha amd64 i386 powerpc sparc sparc64 @@ -8,14 +8,14 @@ COMMENT-devel= devel files for Gecko VER= 1.8.1.11 DISTNAME= mozilla PKGNAME= xulrunner-${VER} -PKGNAME-main= xulrunner-${VER} -PKGNAME-devel= xulrunner-devel-${VER} +PKGNAME-main= xulrunner-${VER}p0 +PKGNAME-devel= xulrunner-devel-${VER}p0 SO_VERSION= 2.0 # NOTE: Must bump minor version if any shlib's are removed from the # components dir to avoid pkg_add -r issues. -.for _lib in auth autoconfig fileview gtkembedmoz mozjs nullplugin \ - pipboot pipnss pippki system-pref transformiix universalchardet \ - unixprintplugin websrvcs xmlextras xpcom xul xulutil +.for _lib in auth autoconfig cookie fileview gtkembedmoz mozjs nullplugin \ + permissions pipboot pipnss pippki system-pref transformiix \ + universalchardet unixprintplugin websrvcs xmlextras xpcom xul xulutil SHARED_LIBS+= ${_lib} ${SO_VERSION} .endfor @@ -85,7 +85,8 @@ CONFIGURE_ARGS= --with-system-jpeg=${LOCALBASE} \ --enable-svg-renderer=cairo \ --enable-system-cairo \ --enable-canvas \ - --enable-application=xulrunner + --enable-application=xulrunner \ + --enable-extensions=default,cookie,permissions MAKE_ENV= MOZ_CO_PROJECT=xulrunner \ LD_LIBRARY_PATH="${WRKSRC}/dist/bin" \ diff --git a/devel/xulrunner/pkg/PFRAG.shared-main b/devel/xulrunner/pkg/PFRAG.shared-main index 5621eb0382f..ed78602a209 100644 --- a/devel/xulrunner/pkg/PFRAG.shared-main +++ b/devel/xulrunner/pkg/PFRAG.shared-main @@ -1,7 +1,9 @@ -@comment $OpenBSD: PFRAG.shared-main,v 1.2 2007/06/28 19:50:05 martynas Exp $ +@comment $OpenBSD: PFRAG.shared-main,v 1.3 2008/01/23 16:32:04 martynas Exp $ @lib xulrunner/components/libauth.so.${LIBauth_VERSION} @lib xulrunner/components/libautoconfig.so.${LIBautoconfig_VERSION} +@lib xulrunner/components/libcookie.so.${LIBcookie_VERSION} @lib xulrunner/components/libfileview.so.${LIBfileview_VERSION} +@lib xulrunner/components/libpermissions.so.${LIBpermissions_VERSION} @lib xulrunner/components/libpipboot.so.${LIBpipboot_VERSION} @lib xulrunner/components/libpipnss.so.${LIBpipnss_VERSION} @lib xulrunner/components/libpippki.so.${LIBpippki_VERSION} diff --git a/devel/xulrunner/pkg/PLIST-devel b/devel/xulrunner/pkg/PLIST-devel index ef98d3cc14d..d5d84b296f6 100644 --- a/devel/xulrunner/pkg/PLIST-devel +++ b/devel/xulrunner/pkg/PLIST-devel @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-devel,v 1.4 2007/08/08 17:11:48 martynas Exp $ +@comment $OpenBSD: PLIST-devel,v 1.5 2008/01/23 16:32:04 martynas Exp $ @conflict xulrunner-<1.8.0.4p0 lib/pkgconfig/ lib/pkgconfig/xulrunner-gtkmozembed.pc @@ -181,10 +181,12 @@ xulrunner/idl/nsIConverterInputStream.idl xulrunner/idl/nsIConverterOutputStream.idl xulrunner/idl/nsICookie.idl xulrunner/idl/nsICookie2.idl +xulrunner/idl/nsICookieAcceptDialog.idl xulrunner/idl/nsICookieConsent.idl xulrunner/idl/nsICookieManager.idl xulrunner/idl/nsICookieManager2.idl xulrunner/idl/nsICookiePermission.idl +xulrunner/idl/nsICookiePromptService.idl xulrunner/idl/nsICookieService.idl xulrunner/idl/nsICookieStorage.idl xulrunner/idl/nsICryptoFIPSInfo.idl @@ -681,6 +683,7 @@ xulrunner/idl/nsIPassword.idl xulrunner/idl/nsIPasswordInternal.idl xulrunner/idl/nsIPasswordManager.idl xulrunner/idl/nsIPasswordManagerInternal.idl +xulrunner/idl/nsIPermission.idl xulrunner/idl/nsIPermissionManager.idl xulrunner/idl/nsIPersistentProperties2.idl xulrunner/idl/nsIPhonetic.idl @@ -1309,6 +1312,10 @@ xulrunner/include/content/nsTextFragment.h xulrunner/include/content/nsXBLAtomList.h xulrunner/include/content/nsXBLAtoms.h xulrunner/include/content/nsXMLNameSpaceMap.h +xulrunner/include/cookie/ +xulrunner/include/cookie/nsICookieAcceptDialog.h +xulrunner/include/cookie/nsICookiePromptService.h +xulrunner/include/cookie/nsIPermission.h xulrunner/include/dbm/ xulrunner/include/dbm/cdefs.h xulrunner/include/dbm/mcom_db.h diff --git a/devel/xulrunner/pkg/PLIST-main b/devel/xulrunner/pkg/PLIST-main index 5bb137c7d7a..4949231326c 100644 --- a/devel/xulrunner/pkg/PLIST-main +++ b/devel/xulrunner/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.4 2007/08/06 14:43:48 kurt Exp $ +@comment $OpenBSD: PLIST-main,v 1.5 2008/01/23 16:32:04 martynas Exp $ @unexec xulrunner --unregister-global %%SHARED%% bin/xulrunner @@ -42,6 +42,7 @@ xulrunner/components/content_htmldoc.xpt xulrunner/components/content_xmldoc.xpt xulrunner/components/content_xslt.xpt xulrunner/components/content_xtf.xpt +xulrunner/components/cookie.xpt xulrunner/components/directory.xpt xulrunner/components/docshell.xpt xulrunner/components/dom.xpt @@ -362,11 +363,10 @@ xulrunner/xulrunner-bin xulrunner/xulrunner-stub @sample ${SYSCONFDIR}/gre.d/ @exec xulrunner --register-global -@cwd ${LOCALBASE}/xulrunner @exec rm -rf /tmp/.mozilla -@exec cd %D && env HOME=/tmp LD_LIBRARY_PATH=%D ./regxpcom +@exec cd %D/xulrunner && env HOME=/tmp LD_LIBRARY_PATH=%D/xulrunner ./regxpcom @exec rm -rf /tmp/.mozilla -@unexec rm -f %D/components/compreg.dat -@unexec rm -f %D/components/xpti.dat -@unexec rm -rf %D/extensions -@unexec rm -rf %D/updates +@unexec rm -f %D/xulrunner/components/compreg.dat +@unexec rm -f %D/xulrunner/components/xpti.dat +@unexec rm -rf %D/xulrunner/extensions +@unexec rm -rf %D/xulrunner/updates