On Thu, Sep 09, 2010 at 09:50:02AM +0200, Landry Breuil wrote:
> On Thu, Sep 09, 2010 at 09:32:26AM +0200, David Coppa wrote:
> > On Thu, Sep 9, 2010 at 9:20 AM, Landry Breuil <[email protected]> wrote:
> >
> > > Now two options :
> > > - fallback to internal sqlite (bah!)
> > > - build systemwide sqlite with this option (bah!)
> > >
> > > Opinions on that ?
> > > New diffs fallbacks to internal sqlite, as it seems the more
> > > 'reasonable' option.
> >
> > First, libpng with "non-standard" apng support and now this...
> > Bah, i'm puzzled...
>
> "We're mozilla, we're special"..
>
> For the record, seamonkey and thunderbird already use the internal
> sqlite copy, as it also requires being built with SQLITE_ENABLE_FTS3 for
> fulltext indexing/search. https://wiki.mozilla.org/Places:Full_Text_Indexing
>
> Oh, and btw firefox 4 adds a requirement on SQLITE_ENABLE_UNLOCK_NOTIFY.
>
> So that seems like a lost battle... and after all, sqlite was meant to
> be embedded in other projects. Just hope there are not too many security
> issues.
And here's a new diff for xulrunner, fixing the same failure as pointed
out by nigel taylor. Shuffles position of --enable-system-sqlite to only
apply for the old, deprecated and crusty xl 1.8 ...
t...@netbsd does an interesting hack for secure_delete in pkgsrc-wip, i
might have a look at it..
http://cia.vc/stats/project/pkgsrc-wip/.message/fb9957
Landry
? 1.9/build.log
? 1.9/build3
? 1.9/build4
? 1.9/build5
? 1.9/todo
? 1.9/xul
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/devel/xulrunner/Makefile.inc,v
retrieving revision 1.7
diff -u -r1.7 Makefile.inc
--- Makefile.inc 11 Jul 2010 14:55:56 -0000 1.7
+++ Makefile.inc 9 Sep 2010 09:24:21 -0000
@@ -87,7 +87,6 @@
--enable-svg \
--enable-svg-renderer=cairo \
--enable-system-cairo \
- --enable-system-sqlite \
--enable-canvas \
--enable-application=xulrunner \
--enable-extensions=default,cookie,permissions
Index: 1.8/Makefile
===================================================================
RCS file: /cvs/ports/devel/xulrunner/1.8/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- 1.8/Makefile 11 Jul 2010 14:55:56 -0000 1.4
+++ 1.8/Makefile 9 Sep 2010 09:24:21 -0000
@@ -15,6 +15,7 @@
.endfor
CONFIGURE_ARGS+= --with-system-png=${LOCALBASE} \
+ --enable-system-sqlite \
--enable-default-toolkit=gtk2
MOB= ${WRKSRC}/dist/bin
Index: 1.9/Makefile
===================================================================
RCS file: /cvs/ports/devel/xulrunner/1.9/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- 1.9/Makefile 25 Jul 2010 21:39:20 -0000 1.20
+++ 1.9/Makefile 9 Sep 2010 09:24:21 -0000
@@ -2,8 +2,8 @@
ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc sparc64
-VERSION= 1.9.2.8
-FFX_VERSION= 3.6.8
+VERSION= 1.9.2.9
+FFX_VERSION= 3.6.9
DIRECTORY= xulrunner1.9
# needed for mozilla.port.mk
MOZILLA_PROJECT= xulrunner1.9
@@ -39,9 +39,10 @@
--disable-ipc \
--disable-libnotify \
--disable-necko-wifi
-LIB_DEPENDS+= :sqlite3->=3.6.10:databases/sqlite3
+#LIB_DEPENDS+= :sqlite3->=3.6.10:databases/sqlite3
WANTLIB-devel+= gthread-2.0 gobject-2.0
-WANTLIB-main+= sndio sqlite3.>=13.0
+WANTLIB-main+= sndio
+# sqlite3.>=13.0
MOB= ${WRKSRC}/dist/bin
MOZ= ${PREFIX}/${DIRECTORY}
Index: 1.9/distinfo
===================================================================
RCS file: /cvs/ports/devel/xulrunner/1.9/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- 1.9/distinfo 25 Jul 2010 21:39:20 -0000 1.9
+++ 1.9/distinfo 9 Sep 2010 09:24:21 -0000
@@ -1,5 +1,5 @@
-MD5 (firefox-3.6.8.source.tar.bz2) = DuXxT9i+B1E9FhMQJ+vLYQ==
-RMD160 (firefox-3.6.8.source.tar.bz2) = FOJFxkPUGh2iX+TbwV1q5Gahnls=
-SHA1 (firefox-3.6.8.source.tar.bz2) = STblQ/bHSSxZVMvVsw3dprION5c=
-SHA256 (firefox-3.6.8.source.tar.bz2) =
/GCcxqDdqiqevYUR7DmuSkBOEQehLgeyM+KvylHZoQ4=
-SIZE (firefox-3.6.8.source.tar.bz2) = 51238976
+MD5 (firefox-3.6.9.source.tar.bz2) = EA7K/WxsUGK8A7svtlH8Fw==
+RMD160 (firefox-3.6.9.source.tar.bz2) = UwsdZMwCugQzw6OdHJfFadrQkO8=
+SHA1 (firefox-3.6.9.source.tar.bz2) = JCkVTI1Qu17u+AIztW+ybc9yfqM=
+SHA256 (firefox-3.6.9.source.tar.bz2) =
n38J4tBkpYNdcZzLWacNLTKhhg9ny5zIjEtpNmhYBQM=
+SIZE (firefox-3.6.9.source.tar.bz2) = 51240588
Index: 1.9/pkg/PLIST-devel
===================================================================
RCS file: /cvs/ports/devel/xulrunner/1.9/pkg/PLIST-devel,v
retrieving revision 1.8
diff -u -r1.8 PLIST-devel
--- 1.9/pkg/PLIST-devel 22 Jul 2010 21:43:01 -0000 1.8
+++ 1.9/pkg/PLIST-devel 9 Sep 2010 09:24:24 -0000
@@ -1657,6 +1657,7 @@
${MOZILLA_PROJECT}/include/nsIContentSink.h
${MOZILLA_PROJECT}/include/nsIContentSniffer.h
${MOZILLA_PROJECT}/include/nsIContentURIGrouper.h
+${MOZILLA_PROJECT}/include/nsIContentUtils.h
${MOZILLA_PROJECT}/include/nsIContentViewer.h
${MOZILLA_PROJECT}/include/nsIContentViewerContainer.h
${MOZILLA_PROJECT}/include/nsIContentViewerEdit.h
