On Mon, May 02, 2011 at 10:26:31AM +0200, Landry Breuil wrote:
> Hi,
>
> Here's an update to the just-released midori 0.3.5.
> If you use and like it, please test it, works fine here @amd64.
updated diff removing REVISION and reupdating PLIST, after feedback from
rpointel@.
Landry
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/midori/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- Makefile 26 Apr 2011 15:01:17 -0000 1.33
+++ Makefile 2 May 2011 08:55:58 -0000
@@ -2,11 +2,9 @@
COMMENT = lightweight web browser
-XFCE_VERSION = 0.3.3
+XFCE_VERSION = 0.3.5
XFCE_GOODIE = midori
-REVISION = 1
-
MAINTAINER = Landry Breuil <lan...@openbsd.org>
CATEGORIES = www
@@ -43,7 +41,7 @@
m pango-1.0 pangocairo-1.0 pangoft2-1.0 pthread sqlite3 z \
cairo pixman-1 png pthread-stubs xcb xml2 \
Xss xcb-render webkit-1.0 notify sqlite3 unique-1.0 soup-2.4 \
- GL Xxf86vm drm xcb-shm
+ GL Xxf86vm drm xcb-shm tasn1
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/midori/distinfo,v
retrieving revision 1.21
diff -u -r1.21 distinfo
--- distinfo 14 Mar 2011 18:57:22 -0000 1.21
+++ distinfo 2 May 2011 08:55:58 -0000
@@ -1,5 +1,5 @@
-MD5 (midori-0.3.3.tar.bz2) = 4SYsx8wMF3PDMat5RIDwNw==
-RMD160 (midori-0.3.3.tar.bz2) = 8jgCUPMkajp8Mu2z66iE08jtlG8=
-SHA1 (midori-0.3.3.tar.bz2) = Abr2JD97AK9eW062rF0yM+YLyZM=
-SHA256 (midori-0.3.3.tar.bz2) = I2dw0TTi65xEd24jOQP8Cvp2DNO4uH0SMW4bJa/i0/4=
-SIZE (midori-0.3.3.tar.bz2) = 848720
+MD5 (midori-0.3.5.tar.bz2) = +S8PESdtYxUP0yHcCNV1+w==
+RMD160 (midori-0.3.5.tar.bz2) = nf5TRIeJVAhnrKfYEUXG5cSVc6A=
+SHA1 (midori-0.3.5.tar.bz2) = aZQASeqYwGsqZETpqDfiv0crqUk=
+SHA256 (midori-0.3.5.tar.bz2) = dIBZuQ1IzViX13bYj1XRVAgeo46shzXKOT7RxDFzg6w=
+SIZE (midori-0.3.5.tar.bz2) = 871235
Index: patches/patch-midori_main_c
===================================================================
RCS file: /cvs/ports/www/midori/patches/patch-midori_main_c,v
retrieving revision 1.6
diff -u -r1.6 patch-midori_main_c
--- patches/patch-midori_main_c 14 Mar 2011 18:57:22 -0000 1.6
+++ patches/patch-midori_main_c 2 May 2011 08:55:58 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-midori_main_c,v 1.6 2011/03/14 18:57:22 landry Exp $
use path to our root ca list for ssl cert validation
---- midori/main.c.orig Sun Mar 13 23:03:35 2011
-+++ midori/main.c Mon Mar 14 09:40:25 2011
-@@ -907,10 +907,7 @@ midori_soup_session_prepare (SoupSession* sessio
+--- midori/main.c.orig Mon May 2 02:06:21 2011
++++ midori/main.c Mon May 2 10:04:08 2011
+@@ -1038,10 +1038,7 @@ midori_load_soup_session (gpointer settings)
#if WEBKIT_CHECK_VERSION (1, 1, 14) && defined (HAVE_LIBSOUP_2_29_91)
const gchar* certificate_files[] =
{
Index: patches/patch-wscript
===================================================================
RCS file: /cvs/ports/www/midori/patches/patch-wscript,v
retrieving revision 1.14
diff -u -r1.14 patch-wscript
--- patches/patch-wscript 14 Mar 2011 18:57:22 -0000 1.14
+++ patches/patch-wscript 2 May 2011 08:55:58 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-wscript,v 1.14 2011/03/14 18:57:22 landry Exp $
We don't need those files installed..
---- wscript.orig Sun Mar 13 23:03:35 2011
-+++ wscript Mon Mar 14 10:26:08 2011
+--- wscript.orig Mon May 2 02:06:21 2011
++++ wscript Mon May 2 10:04:08 2011
@@ -68,7 +68,7 @@ def rc_file(self, node):
self.compiled_tasks.append (rctask)
rc_file = extension ('.rc')(rc_file)
@@ -11,7 +11,7 @@
def configure (conf):
def option_checkfatal (option, desc):
-@@ -407,7 +407,7 @@ def build (bld):
+@@ -408,7 +408,7 @@ def build (bld):
'AUTHORS COPYING ChangeLog EXPAT README data/faq.html
data/faq.css')
# Install default configuration
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/midori/pkg/PLIST,v
retrieving revision 1.21
diff -u -r1.21 PLIST
--- pkg/PLIST 14 Mar 2011 18:57:22 -0000 1.21
+++ pkg/PLIST 2 May 2011 08:55:58 -0000
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.21 2011/03/14 18:57:22 landry Exp $
+@comment $OpenBSD$
@bin bin/midori
include/midori-0.3/
include/midori-0.3/extensions/
@@ -13,7 +13,6 @@
lib/midori/libformhistory.so
lib/midori/libhistory-list.so
lib/midori/libmouse-gestures.so
-lib/midori/libpage-holder.so
lib/midori/libshortcuts.so
lib/midori/libstatus-clock.so
lib/midori/libstatusbar-features.so
@@ -31,11 +30,7 @@
share/doc/midori/faq.css
share/doc/midori/faq.html
share/examples/midori/
-@sample ${SYSCONFDIR}/xdg/
-@sample ${SYSCONFDIR}/xdg/midori/
share/examples/midori/search
-@sample ${SYSCONFDIR}/xdg/midori/search
-share/gir-1.0/
share/icons/hicolor/16x16/apps/midori.png
share/icons/hicolor/16x16/categories/extension.png
share/icons/hicolor/16x16/status/news-feed.png
@@ -100,9 +95,6 @@
share/midori/res/logo-shade.png
share/midori/res/mootools.js
share/midori/res/speeddial-head.html
-share/midori/res/speeddial.json
-share/vala/
-share/vala/vapi/
share/vala/vapi/history-list.deps
share/vala/vapi/history-list.vapi
@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2>
/dev/null || true
