From 87aa2a17f27da941a62e47b38f9c6f0321e84771 Mon Sep 17 00:00:00 2001 From: landry Date: Mon, 26 Jan 2009 19:52:49 +0000 Subject: [PATCH] Update to midori 0.1.2. Enable gio support, now uses libsoup,ssl for some http/https access, and uses waf 1.5.2 update i just commited. --- www/midori/Makefile | 17 ++++++++--------- www/midori/distinfo | 10 +++++----- www/midori/patches/patch-wscript | 18 ++++++++++-------- www/midori/pkg/PLIST | 18 +++++++++++++++++- 4 files changed, 40 insertions(+), 23 deletions(-) diff --git a/www/midori/Makefile b/www/midori/Makefile index 2f655a791f0..6bf30c70d24 100644 --- a/www/midori/Makefile +++ b/www/midori/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.3 2008/10/26 13:06:29 landry Exp $ +# $OpenBSD: Makefile,v 1.4 2009/01/26 19:52:49 landry Exp $ COMMENT = lightweight web browser -XFCE_VERSION = 0.1.0 +XFCE_VERSION = 0.1.2 XFCE_GOODIE = midori MAINTAINER = Landry Breuil @@ -20,22 +20,21 @@ USE_X11 = Yes DESKTOP_FILES = Yes LIB_DEPENDS = webkit-1.0::www/webkit \ - gtksourceview-2.0::x11/gtksourceview \ sqlite3::databases/sqlite3 \ - unique-1.0::devel/libunique + unique-1.0::devel/libunique \ + soup-2.4:libsoup-*-ssl:devel/libsoup,ssl # pick sqlite CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" -# disable gio/gvfs atm, still young -CONFIGURE_ARGS+=--disable-gio BUILD_DEPENDS = ::textproc/py-docutils \ ::x11/gnome/librsvg WANTLIB = X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ Xi Xinerama Xrandr Xrender atk-1.0 c expat fontconfig \ - freetype gdk-x11-2.0 gdk_pixbuf-2.0 glib-2.0 glitz \ - gmodule-2.0 gobject-2.0 gtk-x11-2.0 intl m pango-1.0 \ - pangocairo-1.0 pangoft2-1.0 sqlite3 z cairo pixman-1 png xml2 + freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 glitz \ + gmodule-2.0 gnutls gobject-2.0 gthread-2.0 gtk-x11-2.0 intl \ + m pango-1.0 pangocairo-1.0 pangoft2-1.0 pthread sqlite3 z \ + cairo pixman-1 png xml2 .include diff --git a/www/midori/distinfo b/www/midori/distinfo index dbe36b2184d..8cf1ff2be0f 100644 --- a/www/midori/distinfo +++ b/www/midori/distinfo @@ -1,5 +1,5 @@ -MD5 (midori-0.1.0.tar.bz2) = sDFqiG3CLHZv9oAyS1m5lA== -RMD160 (midori-0.1.0.tar.bz2) = Y5Sb9cD9a9tGVOxjLFmw2aNL0IE= -SHA1 (midori-0.1.0.tar.bz2) = AGZTFJfiQV89EPfN7GMob7O9mbc= -SHA256 (midori-0.1.0.tar.bz2) = QdYTAUqhg4dEd/w9C9ROe2b7OZ5s2XFDGTOi7lFkcCk= -SIZE (midori-0.1.0.tar.bz2) = 273058 +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 diff --git a/www/midori/patches/patch-wscript b/www/midori/patches/patch-wscript index 2e319e8313b..870fe42ad47 100644 --- a/www/midori/patches/patch-wscript +++ b/www/midori/patches/patch-wscript @@ -1,13 +1,15 @@ -$OpenBSD: patch-wscript,v 1.1 2008/10/26 13:06:29 landry Exp $ +$OpenBSD: patch-wscript,v 1.2 2009/01/26 19:52:49 landry Exp $ We don't need those files installed.. ---- wscript.orig Sat Oct 25 13:18:15 2008 -+++ wscript Sat Oct 25 13:18:32 2008 -@@ -175,8 +175,6 @@ def build (bld): +--- wscript.orig Mon Jan 19 00:18:58 2009 ++++ wscript Mon Jan 19 00:19:05 2009 +@@ -267,10 +267,6 @@ def build (bld): + if option_enabled ('addons'): + bld.add_subdirs ('extensions') - bld.add_subdirs ('katze midori icons') - -- install_files ('DOCDIR', '/midori/', 'AUTHORS ChangeLog COPYING README') +- if option_enabled ('docs'): +- bld.install_files ('${DOCDIR}/' + APPNAME + '/', \ +- 'AUTHORS ChangeLog COPYING EXPAT README TRANSLATE') - - if bld.env ()['RST2HTML']: + if bld.env['RST2HTML']: # FIXME: Build only if needed if not os.access (blddir, os.F_OK): diff --git a/www/midori/pkg/PLIST b/www/midori/pkg/PLIST index 4c095295b98..81ce20a0f07 100644 --- a/www/midori/pkg/PLIST +++ b/www/midori/pkg/PLIST @@ -1,5 +1,9 @@ -@comment $OpenBSD: PLIST,v 1.2 2008/10/26 13:06:29 landry Exp $ +@comment $OpenBSD: PLIST,v 1.3 2009/01/26 19:52:49 landry Exp $ @bin bin/midori +lib/midori/ +lib/midori/libpage-holder.so +lib/midori/libstatusbar-features.so +lib/midori/libtab-panel.so share/applications/midori.desktop share/doc/midori/ share/doc/midori/user/ @@ -16,15 +20,27 @@ share/icons/hicolor/32x32/status/news-feed.png share/icons/hicolor/48x48/apps/midori.png share/icons/hicolor/48x48/categories/extension.png share/icons/hicolor/48x48/status/news-feed.png +share/locale/da/LC_MESSAGES/midori.mo share/locale/de/LC_MESSAGES/midori.mo +share/locale/el/LC_MESSAGES/midori.mo +share/locale/en_GB/LC_MESSAGES/midori.mo share/locale/es/LC_MESSAGES/midori.mo share/locale/et/LC_MESSAGES/midori.mo +share/locale/fi/LC_MESSAGES/midori.mo share/locale/fr/LC_MESSAGES/midori.mo share/locale/gl/LC_MESSAGES/midori.mo share/locale/hu/LC_MESSAGES/midori.mo +share/locale/id/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 +share/locale/pt_PT/ +share/locale/pt_PT/LC_MESSAGES/ +share/locale/pt_PT/LC_MESSAGES/midori.mo share/locale/ru/LC_MESSAGES/midori.mo share/locale/sv/LC_MESSAGES/midori.mo +share/locale/tr/LC_MESSAGES/midori.mo +share/locale/uk/LC_MESSAGES/midori.mo share/midori/ share/midori/logo-shade.png @exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true