Hi,
as usual, the monthly webkit update to latest svn snap (the future ones
requires libsoup unstable versions 2.5.x, i'll wait for 2.6 to update
again). The http backend is now libsoup instead of curl.
Midori gains a bunch of features, have a look at the Changelog at the
author's homepage: http://software.twotoasts.de/
A standalone webkit-qt port is being worked on, which will permit to
port arora soon. I still have to dig into webkit on sparc64 to find the
source of the SIGBUS..
Please test, comment and ok.
Landry
? bigbuild.log
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/webkit/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile 18 Feb 2009 22:09:47 -0000 1.8
+++ Makefile 3 Mar 2009 08:21:04 -0000
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2009/02/18 22:09:47 landry Exp $
+# $OpenBSD: Makefile,v 1.7 2009/01/25 22:16:40 landry Exp $
COMMENT = open source web browser engine
-V = 40000
+V = 41121
DISTNAME = WebKit-r${V}
-PKGNAME = webkit-${V}p0
+PKGNAME = webkit-${V}
CATEGORIES = www
EXTRACT_SUFX = .tar.bz2
@@ -31,6 +31,7 @@
MODULES = converters/libiconv \
textproc/intltool \
gcc4
+
MODGCC4_ARCHES =*
MODGCC4_LANGS = c c++
@@ -38,22 +39,23 @@
AUTOCONF_VERSION = 2.59
CONFIGURE_STYLE = gnu
-CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include/libpng
-I${X11BASE}/include" \
- LDFLAGS="-L${X11BASE}/lib -lX11"
+CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include/libpng
-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -lX11"
MAKE_FILE = GNUmakefile
WANTLIB = ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
- Xfixes Xi Xinerama Xrandr Xrender Xt atk-1.0 c crypto \
- expat fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0 \
- gobject-2.0 gthread-2.0 idn intl jpeg m pango-1.0
pangocairo-1.0 \
- pangoft2-1.0 pcre pthread ssl z cairo pixman-1 png xml2
+ Xfixes Xi Xinerama Xrandr Xrender Xt atk-1.0 c \
+ expat fontconfig freetype gcrypt gio-2.0 glib-2.0 glitz
gmodule-2.0 \
+ gnutls gobject-2.0 gpg-error gthread-2.0 intl jpeg m \
+ pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pthread \
+ tasn1 z cairo pixman-1 png xml2
LIB_DEPENDS = gtk-x11-2.0,gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2,-main \
icudata,icui18n,icuuc::textproc/icu4c \
sqlite3::databases/sqlite3 \
xslt::textproc/libxslt \
- curl::net/curl
+ soup-2.4::devel/libsoup
BUILD_DEPENDS = ::devel/bison \
@@ -63,8 +65,6 @@
pre-configure:
cd ${WRKSRC} && AUTOCONF_VERSION=${AUTOCONF_VERSION} \
- AUTOMAKE_VERSION=${AUTOMAKE_VERSION} autoreconf --install
- cd ${WRKSRC} && AUTOCONF_VERSION=${AUTOCONF_VERSION} \
- AUTOMAKE_VERSION=${AUTOMAKE_VERSION} automake --add-missing
--copy
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/webkit/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo 25 Jan 2009 22:16:40 -0000 1.3
+++ distinfo 3 Mar 2009 08:21:04 -0000
@@ -1,5 +1,5 @@
-MD5 (WebKit-r40000.tar.bz2) = pi5aeR01LnRVhpY/RQOAnA==
-RMD160 (WebKit-r40000.tar.bz2) = vMqUAmgtkpGeXufBWm/KBcTVHc8=
-SHA1 (WebKit-r40000.tar.bz2) = SLzLz1Cab/HRiWYe5K6RsQnruTE=
-SHA256 (WebKit-r40000.tar.bz2) = 6SqJcRDkoHDYxZV8xfOd23KPaQJRHsVQ242S6wyJVGU=
-SIZE (WebKit-r40000.tar.bz2) = 10232349
+MD5 (WebKit-r41121.tar.bz2) = CRtjKulXZbPbjS6nqE37Ow==
+RMD160 (WebKit-r41121.tar.bz2) = 89Xq1YuVy6uMpLO/veJSRoe1t4o=
+SHA1 (WebKit-r41121.tar.bz2) = f2i+JKKXDGAzZaClFV1fn+wF3gw=
+SHA256 (WebKit-r41121.tar.bz2) = tUE85qqk/ZBEIQ/a6IUnaFXmRZm7vxVVEKwwBzUlIL4=
+SIZE (WebKit-r41121.tar.bz2) = 10435553
Index: patches/patch-GNUmakefile_am
===================================================================
RCS file: /cvs/ports/www/webkit/patches/patch-GNUmakefile_am,v
retrieving revision 1.1
diff -u -r1.1 patch-GNUmakefile_am
--- patches/patch-GNUmakefile_am 25 Jan 2009 22:16:40 -0000 1.1
+++ patches/patch-GNUmakefile_am 3 Mar 2009 08:21:04 -0000
@@ -1,26 +1,26 @@
$OpenBSD: patch-GNUmakefile_am,v 1.1 2009/01/25 22:16:40 landry Exp $
---- GNUmakefile.am.orig Mon Dec 22 06:55:15 2008
-+++ GNUmakefile.am Wed Jan 21 21:24:49 2009
+--- GNUmakefile.am.orig Sat Feb 21 04:38:12 2009
++++ GNUmakefile.am Sun Feb 22 15:16:23 2009
@@ -121,9 +121,10 @@ libJavaScriptCore_la_SOURCES = \
libJavaScriptCore_la_LIBADD = \
$(UNICODE_LIBS) \
-- $(GLOBALDEPS_LIBS) \
+- $(GLIB_LIBS) \
- -lpthread
-+ $(GLOBALDEPS_LIBS)
++ $(GLIB_LIBS)
+libJavaScriptCore_la_LDFLAGS = -pthread
+
libJavaScriptCore_la_CXXFLAGS = \
$(global_cxxflags) \
$(libJavaScriptCore_la_CFLAGS)
-@@ -209,8 +210,9 @@ libWebCore_la_LIBADD = \
- $(LIBXSLT_LIBS) \
+@@ -211,8 +212,9 @@ libWebCore_la_LIBADD = \
$(HILDON_LIBS) \
$(JPEG_LIBS) \
-- $(PNG_LIBS) \
+ $(PNG_LIBS) \
+- $(GEOCLUE_LIBS) \
- -lpthread
-+ $(PNG_LIBS)
++ $(GEOCLUE_LIBS)
+
+libWebCore_la_LDFLAGS = -pthread
Index: patches/patch-JavaScriptCore_GNUmakefile_am
===================================================================
RCS file: /cvs/ports/www/webkit/patches/patch-JavaScriptCore_GNUmakefile_am,v
retrieving revision 1.3
diff -u -r1.3 patch-JavaScriptCore_GNUmakefile_am
--- patches/patch-JavaScriptCore_GNUmakefile_am 25 Jan 2009 22:16:40 -0000
1.3
+++ patches/patch-JavaScriptCore_GNUmakefile_am 3 Mar 2009 08:21:04 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-JavaScriptCore_GNUmakefile_am,v 1.3 2009/01/25 22:16:40 landry
Exp $
---- JavaScriptCore/GNUmakefile.am.orig Tue Jan 13 00:58:11 2009
-+++ JavaScriptCore/GNUmakefile.am Mon Jan 19 10:09:55 2009
-@@ -487,7 +487,7 @@ Programs_minidom_CFLAGS = \
+--- JavaScriptCore/GNUmakefile.am.orig Thu Feb 26 07:17:57 2009
++++ JavaScriptCore/GNUmakefile.am Mon Mar 2 22:11:58 2009
+@@ -495,7 +495,7 @@ Programs_minidom_CFLAGS = \
Programs_minidom_LDADD = \
libJavaScriptCore.la \
-lm \
Index: patches/patch-JavaScriptCore_wtf_Threading_h
===================================================================
RCS file: /cvs/ports/www/webkit/patches/patch-JavaScriptCore_wtf_Threading_h,v
retrieving revision 1.1
diff -u -r1.1 patch-JavaScriptCore_wtf_Threading_h
--- patches/patch-JavaScriptCore_wtf_Threading_h 18 Feb 2009 22:09:48
-0000 1.1
+++ patches/patch-JavaScriptCore_wtf_Threading_h 3 Mar 2009 08:21:04
-0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-JavaScriptCore_wtf_Threading_h,v 1.1 2009/02/18 22:09:48
landry Exp $
Sparc64 definitely doesn't like __gnu_cxx::__atomic_add.
---- JavaScriptCore/wtf/Threading.h.orig Thu Jan 22 10:13:09 2009
-+++ JavaScriptCore/wtf/Threading.h Thu Jan 22 10:16:37 2009
-@@ -194,7 +194,7 @@ inline int atomicDecrement(int volatile* addend) { ret
+--- JavaScriptCore/wtf/Threading.h.orig Sun Jan 25 03:24:37 2009
++++ JavaScriptCore/wtf/Threading.h Sun Feb 22 22:38:46 2009
+@@ -197,7 +197,7 @@ inline int atomicDecrement(int volatile* addend) { ret
inline void atomicIncrement(int volatile* addend) {
OSAtomicIncrement32Barrier(const_cast<int*>(addend)); }
inline int atomicDecrement(int volatile* addend) { return
OSAtomicDecrement32Barrier(const_cast<int*>(addend)); }
Index: patches/patch-autogen_sh
===================================================================
RCS file: patches/patch-autogen_sh
diff -N patches/patch-autogen_sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-autogen_sh 3 Mar 2009 08:21:04 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+--- autogen.sh.orig Sun Feb 15 09:48:56 2009
++++ autogen.sh Mon Feb 23 19:21:15 2009
+@@ -46,8 +46,6 @@ if test "$DIE" -eq 1; then
+ exit 1
+ fi
+
+-rm -rf $top_srcdir/autom4te.cache
+-
+ touch README INSTALL
+
+ aclocal $ACLOCAL_FLAGS || exit $?
+@@ -57,5 +55,3 @@ automake $AUTOMAKE_FLAGS || exit $?
+ autoconf || exit $?
+
+ cd $ORIGDIR || exit 1
+-
+-$srcdir/configure $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/webkit/pkg/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- pkg/PLIST 25 Jan 2009 22:16:40 -0000 1.3
+++ pkg/PLIST 3 Mar 2009 08:21:04 -0000
@@ -38,6 +38,8 @@
share/webkit-1.0/webinspector/BreakpointsSidebarPane.js
share/webkit-1.0/webinspector/CallStackSidebarPane.js
share/webkit-1.0/webinspector/Console.js
+share/webkit-1.0/webinspector/DOMStorage.js
+share/webkit-1.0/webinspector/DOMStorageItemsView.js
share/webkit-1.0/webinspector/DataGrid.js
share/webkit-1.0/webinspector/Database.js
share/webkit-1.0/webinspector/DatabaseQueryView.js
@@ -71,6 +73,7 @@
share/webkit-1.0/webinspector/Images/disclosureTriangleSmallRightDownWhite.png
share/webkit-1.0/webinspector/Images/disclosureTriangleSmallRightWhite.png
share/webkit-1.0/webinspector/Images/dockButtons.png
+share/webkit-1.0/webinspector/Images/domStorage.png
share/webkit-1.0/webinspector/Images/elementsIcon.png
share/webkit-1.0/webinspector/Images/enableButtons.png
share/webkit-1.0/webinspector/Images/errorIcon.png
? patch-wscript
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/midori/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile 29 Jan 2009 20:08:42 -0000 1.5
+++ Makefile 5 Mar 2009 20:43:49 -0000
@@ -2,9 +2,8 @@
COMMENT = lightweight web browser
-XFCE_VERSION = 0.1.2
+XFCE_VERSION = 0.1.4
XFCE_GOODIE = midori
-PKGNAME = ${DISTNAME}p0
MAINTAINER = Landry Breuil <[email protected]>
CATEGORIES = www
@@ -19,8 +18,10 @@
USE_X11 = Yes
DESKTOP_FILES = Yes
+NO_REGRESS = Yes
LIB_DEPENDS = webkit-1.0::www/webkit \
+ idn::devel/libidn \
sqlite3::databases/sqlite3 \
unique-1.0::devel/libunique \
soup-2.4:libsoup->=2.24.3p0:devel/libsoup
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/midori/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo 26 Jan 2009 19:52:49 -0000 1.3
+++ distinfo 5 Mar 2009 20:43:49 -0000
@@ -1,5 +1,5 @@
-MD5 (midori-0.1.2.tar.bz2) = UWnq1ng/N0zt8/ib85m9dQ==
-RMD160 (midori-0.1.2.tar.bz2) = 13ViMb2GrqX1U10QvtDapxKOP+c=
-SHA1 (midori-0.1.2.tar.bz2) = e8rOS3ZtpY4xK0lCILFeiKmDuKw=
-SHA256 (midori-0.1.2.tar.bz2) = qWZkHPG24Y5PWKo1hammOQXtUCUog4BMAGoyY2dKMuw=
-SIZE (midori-0.1.2.tar.bz2) = 311182
+MD5 (midori-0.1.4.tar.bz2) = qbIQJ7qJT+0wVdcHTF8HPQ==
+RMD160 (midori-0.1.4.tar.bz2) = nUie8XAoHZuSSZh2afE220PQ7bM=
+SHA1 (midori-0.1.4.tar.bz2) = axjZ9VzjSJy8aSLwvpujSxk/5pY=
+SHA256 (midori-0.1.4.tar.bz2) = SoRCLCcGJRYvbp4eToFR2VRkV9ZMYcKzyJbL9D+1TOU=
+SIZE (midori-0.1.4.tar.bz2) = 352409
Index: patches/patch-wscript
===================================================================
RCS file: /cvs/ports/www/midori/patches/patch-wscript,v
retrieving revision 1.2
diff -u -r1.2 patch-wscript
--- patches/patch-wscript 26 Jan 2009 19:52:49 -0000 1.2
+++ patches/patch-wscript 5 Mar 2009 20:43:49 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-wscript,v 1.2 2009/01/26 19:52:49 landry Exp $
We don't need those files installed..
---- wscript.orig Mon Jan 19 00:18:58 2009
-+++ wscript Mon Jan 19 00:19:05 2009
-@@ -267,10 +267,6 @@ def build (bld):
+--- wscript.orig Mon Feb 23 14:08:30 2009
++++ wscript Mon Feb 23 14:08:50 2009
+@@ -303,12 +303,8 @@ def build (bld):
if option_enabled ('addons'):
bld.add_subdirs ('extensions')
@@ -10,6 +10,9 @@
- bld.install_files ('${DOCDIR}/' + APPNAME + '/', \
- 'AUTHORS ChangeLog COPYING EXPAT README TRANSLATE')
-
+ # Install default configuration
+- bld.install_files ('${SYSCONFDIR}/xdg/' + APPNAME + '/', 'data/search')
++ bld.install_files ('${DATADIR}/examples/' + APPNAME + '/', 'data/search')
+
if bld.env['RST2HTML']:
# FIXME: Build only if needed
- if not os.access (blddir, os.F_OK):
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/midori/pkg/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- pkg/PLIST 26 Jan 2009 19:52:49 -0000 1.3
+++ pkg/PLIST 5 Mar 2009 20:43:49 -0000
@@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.3 2009/01/26 19:52:49 landry Exp $
@bin bin/midori
lib/midori/
+lib/midori/libmouse-gestures.so
lib/midori/libpage-holder.so
lib/midori/libstatusbar-features.so
lib/midori/libtab-panel.so
@@ -8,6 +9,11 @@
share/doc/midori/
share/doc/midori/user/
share/doc/midori/user/midori.html
+share/examples/midori/
+...@sample ${SYSCONFDIR}/xdg/
+...@sample ${SYSCONFDIR}/xdg/midori/
+share/examples/midori/search
+...@sample ${SYSCONFDIR}/xdg/midori/search
share/icons/hicolor/16x16/apps/midori.png
share/icons/hicolor/16x16/categories/extension.png
share/icons/hicolor/16x16/status/news-feed.png
@@ -31,6 +37,7 @@
share/locale/gl/LC_MESSAGES/midori.mo
share/locale/hu/LC_MESSAGES/midori.mo
share/locale/id/LC_MESSAGES/midori.mo
+share/locale/it/LC_MESSAGES/midori.mo
share/locale/ja/LC_MESSAGES/midori.mo
share/locale/nl/LC_MESSAGES/midori.mo
share/locale/pl/LC_MESSAGES/midori.mo
