From f247ecc9019a73f8955b36ae615c010cee2107bf Mon Sep 17 00:00:00 2001 From: ryoon Date: Wed, 21 Mar 2012 20:10:11 +0000 Subject: [PATCH] * Adjust required sqlite version (follow configure.in) * Remove patch-xulrunner_app_Makefile.in, suggested by drochner@ --- devel/xulrunner/distinfo | 3 +-- devel/xulrunner/mozilla-common.mk | 4 ++-- .../patches/patch-xulrunner_app_Makefile.in | 15 --------------- 3 files changed, 3 insertions(+), 19 deletions(-) delete mode 100644 devel/xulrunner/patches/patch-xulrunner_app_Makefile.in diff --git a/devel/xulrunner/distinfo b/devel/xulrunner/distinfo index 0c8e6eec754ad..1a9d01104d002 100644 --- a/devel/xulrunner/distinfo +++ b/devel/xulrunner/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.64 2012/03/21 10:40:25 drochner Exp $ +$NetBSD: distinfo,v 1.65 2012/03/21 20:10:11 ryoon Exp $ SHA1 (firefox-11.0.source.tar.bz2) = 0b05f91b81803010502cf89f54c3d0187fb63d7e RMD160 (firefox-11.0.source.tar.bz2) = 13b7c7327063625904d00b58a6d6f15c04918e92 @@ -105,4 +105,3 @@ SHA1 (patch-xn) = b0d0943b2bc39d8395055550c0fedfa447a5de01 SHA1 (patch-xo) = 437cbc7e0ed8777ae2313165f8754759d8eee01d SHA1 (patch-xpcom_Makefile.in) = ad9c0ed4347b0ed4f51a6f0f34ac48c65d2152c8 SHA1 (patch-xpcom_idl-parser_header.py) = cd14f4056a31f15066aebb85e5c14fba2aa37f13 -SHA1 (patch-xulrunner_app_Makefile.in) = 488485373747f79a73393a06c797ed1141e69759 diff --git a/devel/xulrunner/mozilla-common.mk b/devel/xulrunner/mozilla-common.mk index 88b59371a070e..4c757ec4c3d4d 100644 --- a/devel/xulrunner/mozilla-common.mk +++ b/devel/xulrunner/mozilla-common.mk @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.31 2012/03/10 03:08:25 ryoon Exp $ +# $NetBSD: mozilla-common.mk,v 1.32 2012/03/21 20:10:11 ryoon Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # @@ -84,7 +84,7 @@ PREFER.bzip2?= pkgsrc .include "../../audio/alsa-lib/buildlink3.mk" .endif .include "../../archivers/bzip2/buildlink3.mk" -BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.7.5 +BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.7.7.1 CONFIGURE_ENV+= ac_cv_sqlite_secure_delete=yes # c.f. patches/patch-al .include "../../databases/sqlite3/buildlink3.mk" BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1 diff --git a/devel/xulrunner/patches/patch-xulrunner_app_Makefile.in b/devel/xulrunner/patches/patch-xulrunner_app_Makefile.in deleted file mode 100644 index 2349e08dbdb37..0000000000000 --- a/devel/xulrunner/patches/patch-xulrunner_app_Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-xulrunner_app_Makefile.in,v 1.1 2012/03/06 12:34:09 ryoon Exp $ - ---- xulrunner/app/Makefile.in.orig 2011-12-21 00:28:44.000000000 +0100 -+++ xulrunner/app/Makefile.in 2012-01-30 11:24:22.000000000 +0100 -@@ -130,6 +130,10 @@ - RCFLAGS += -DXULRUNNER_ICO=\"$(DIST)/branding/xulrunner.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\" - endif - -+ifeq ($(OS_ARCH),NetBSD) -+OS_LIBS += $(call EXPAND_LIBNAME,kvm) -+endif -+ - include $(topsrcdir)/config/rules.mk - - DEFINES += -DXULRUNNER_ICO=\"$(DIST)/branding/xulrunner.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"