Date: Mon, 20 Apr 2015 16:39:54 +0000 (UTC) From: Olivier Duchateau <olivierd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r384366 - in head/www/midori: . files Message-ID: <201504201639.t3KGdssJ035584@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olivierd Date: Mon Apr 20 16:39:53 2015 New Revision: 384366 URL: https://svnweb.freebsd.org/changeset/ports/384366 Log: - Update to 0.5.10 - Adjust dependencies - Remove GRANITE option (appearance seems broken) - Remove support of WebKit2 API (still experimental) [1] Requested by: <phryk@commander1024.de> (via freebsd-xfce@ list, in February 2015 thread) [1] Modified: head/www/midori/Makefile head/www/midori/distinfo head/www/midori/files/patch-midori__midori-stock.h head/www/midori/pkg-plist Modified: head/www/midori/Makefile ============================================================================== --- head/www/midori/Makefile Mon Apr 20 16:34:00 2015 (r384365) +++ head/www/midori/Makefile Mon Apr 20 16:39:53 2015 (r384366) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= midori -PORTVERSION= 0.5.9 -PORTREVISION= 3 +PORTVERSION= 0.5.10 CATEGORIES= www xfce MASTER_SITES= http://www.midori-browser.org/downloads/ DISTNAME= ${PORTNAME}_${PORTVERSION}_all_ @@ -18,15 +17,17 @@ LICENSE_COMB= multi BUILD_DEPENDS= rsvg-convert:${PORTSDIR}/graphics/librsvg2 \ valac:${PORTSDIR}/lang/vala LIB_DEPENDS= libnotify.so:${PORTSDIR}/devel/libnotify \ - libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome + libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome \ + libgcr-3.so:${PORTSDIR}/security/gcr RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -Wno-return-type -CMAKE_ARGS= -DUSE_APIDOCS:BOOL=OFF +CMAKE_ARGS= -DUSE_APIDOCS:BOOL=OFF \ + -DUSE_GRANITE:BOOL=OFF -WRKSRC= ${WRKDIR}/${DISTNAME:C/([a-z]*)_([0-9\.]*)(_all_)/\1-\2/} +#WRKSRC= ${WRKDIR}/${DISTNAME:C/([a-z]*)_([0-9\.]*)(_all_)/\1-\2/} NO_WRKSUBDIR= yes USE_GNOME= glib20 intltool libxml2 USE_XORG= xscrnsaver @@ -37,14 +38,11 @@ USE_SQLITE= yes PLIST_SUB= VERSION="${PORTVERSION:R}" -OPTIONS_DEFINE= GIR GRANITE ZEITGEIST +OPTIONS_DEFINE= GIR ZEITGEIST OPTIONS_SINGLE= GTK OPTIONS_SINGLE_GTK= GTK2 GTK3 OPTIONS_DEFAULT= GTK2 -# Need x11-toolkits/granite >= 0.3 (Granite.Widgets.LightWindow is deprecated) -OPTIONS_EXCLUDE= GRANITE GIR_DESC= GObject Introspection -GRANITE_DESC= Additional GTK widgets (require GTK3) ZEITGEIST_DESC= User logs activities .include <bsd.port.options.mk> @@ -52,34 +50,14 @@ ZEITGEIST_DESC= User logs activities .if ${PORT_OPTIONS:MGTK2} LIB_DEPENDS+= libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2 USE_GNOME+= gtk20 -CMAKE_ARGS+= -DUSE_GTK3:BOOL=OFF \ - -DUSE_GCR:BOOL=OFF -PLIST_SUB+= ONLY_WEBKIT1="" +CMAKE_ARGS+= -DUSE_GTK3:BOOL=OFF .endif .if ${PORT_OPTIONS:MGTK3} -LIB_DEPENDS+= libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3 \ - libgcr-3.so:${PORTSDIR}/security/gcr +LIB_DEPENDS+= libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3 USE_GNOME+= gtk30 CMAKE_ARGS+= -DUSE_GTK3:BOOL=ON \ - -DUSE_GCR:BOOL=ON - -# Support the new WebKit2 API (>= 1.11.91) -.if exists(${LOCALBASE}/libdata/pkgconfig/webkit2gtk-3.0.pc) -CMAKE_ARGS+= -DHALF_BRO_INCOM_WEBKIT2:BOOL=ON -# Some extensions are not yet ported to the new API (WebKit2) -PLIST_SUB+= ONLY_WEBKIT1="@comment " -.else -CMAKE_ARGS+= -DHALF_BRO_INCOM_WEBKIT2:BOOL=OFF -PLIST_SUB+= ONLY_WEBKIT1="" -.endif - -.if ${PORT_OPTIONS:MGRANITE} -LIB_DEPENDS+= libgranite.so:${PORTSDIR}/x11-toolkits/granite -CMAKE_ARGS+= -DUSE_GRANITE:BOOL=ON -.else -CMAKE_ARGS+= -DUSE_GRANITE:BOOL=OFF -.endif + -DHALF_BRO_INCOM_WEBKIT2:BOOL=OFF .endif .if ${PORT_OPTIONS:MZEITGEIST} Modified: head/www/midori/distinfo ============================================================================== --- head/www/midori/distinfo Mon Apr 20 16:34:00 2015 (r384365) +++ head/www/midori/distinfo Mon Apr 20 16:39:53 2015 (r384366) @@ -1,2 +1,2 @@ -SHA256 (xfce4/midori_0.5.9_all_.tar.bz2) = b1a5309d926ea4e394f4a39552023b0427cf23053793d325e3daefceed282ec0 -SIZE (xfce4/midori_0.5.9_all_.tar.bz2) = 1332192 +SHA256 (xfce4/midori_0.5.10_all_.tar.bz2) = 702344f68d7f034866a46398e35b3c16a5a5f3e431a5d916ea5efc3eaaa3e46f +SIZE (xfce4/midori_0.5.10_all_.tar.bz2) = 1379519 Modified: head/www/midori/files/patch-midori__midori-stock.h ============================================================================== --- head/www/midori/files/patch-midori__midori-stock.h Mon Apr 20 16:34:00 2015 (r384365) +++ head/www/midori/files/patch-midori__midori-stock.h Mon Apr 20 16:39:53 2015 (r384366) @@ -1,6 +1,11 @@ ---- ./midori/midori-stock.h.orig 2013-02-05 23:28:05.000000000 +0000 -+++ ./midori/midori-stock.h 2013-02-08 09:07:30.000000000 +0000 -@@ -25,7 +25,7 @@ +--- midori/midori-stock.h.orig 2015-04-19 23:50:25 UTC ++++ midori/midori-stock.h +@@ -21,11 +21,11 @@ + #define STOCK_NEWS_FEED "internet-news-reader" + #define STOCK_STYLE "preferences-desktop-theme" + #define MIDORI_STOCK_TRANSFER "package" +-#define MIDORI_STOCK_PLUGINS "application-x-shockwave-flash" ++#define MIDORI_STOCK_PLUGINS "application-x-addon" #define STOCK_BOOKMARK_ADD "bookmark-new" #define STOCK_IMAGE "image-x-generic" #define STOCK_NETWORK_OFFLINE "network-offline" Modified: head/www/midori/pkg-plist ============================================================================== --- head/www/midori/pkg-plist Mon Apr 20 16:34:00 2015 (r384365) +++ head/www/midori/pkg-plist Mon Apr 20 16:39:53 2015 (r384366) @@ -6,24 +6,24 @@ lib/libmidori-core.so.0.0.0 lib/libmidori-core.so.1 lib/midori/libabout.so lib/midori/libadblock.so -%%ONLY_WEBKIT1%%lib/midori/libaddons.so +lib/midori/libaddons.so lib/midori/libapps.so lib/midori/libcolorful-tabs.so lib/midori/libcookie-manager.so -%%ONLY_WEBKIT1%%lib/midori/libcookie-permissions.so +lib/midori/libcookie-permissions.so lib/midori/libcopy-tabs.so lib/midori/libdelayed-load.so lib/midori/libdevpet.so lib/midori/libdomain-keys.so -%%ONLY_WEBKIT1%%lib/midori/libexternal-download-manager.so +lib/midori/libexternal-download-manager.so lib/midori/libfeed-panel.so lib/midori/libflummi.so -%%ONLY_WEBKIT1%%lib/midori/libformhistory.so +lib/midori/libformhistory.so lib/midori/libhistory-list.so lib/midori/libmouse-gestures.so -%%ONLY_WEBKIT1%%lib/midori/libnojs.so +lib/midori/libnojs.so lib/midori/libnotes.so -%%ONLY_WEBKIT1%%lib/midori/libnsplugin-manager.so +lib/midori/libnsplugin-manager.so lib/midori/libopen-with.so lib/midori/libshortcuts.so lib/midori/libstatus-clock.so @@ -95,6 +95,7 @@ share/locale/kk/LC_MESSAGES/midori.mo share/locale/km/LC_MESSAGES/midori.mo share/locale/ko/LC_MESSAGES/midori.mo share/locale/ky/LC_MESSAGES/midori.mo +share/locale/lb/LC_MESSAGES/midori.mo share/locale/lt/LC_MESSAGES/midori.mo share/locale/lv/LC_MESSAGES/midori.mo share/locale/ml/LC_MESSAGES/midori.mo @@ -122,8 +123,11 @@ share/locale/th/LC_MESSAGES/midori.mo share/locale/tr/LC_MESSAGES/midori.mo share/locale/ug/LC_MESSAGES/midori.mo share/locale/uk/LC_MESSAGES/midori.mo +share/locale/ur/LC_MESSAGES/midori.mo +share/locale/uz/LC_MESSAGES/midori.mo share/locale/vi/LC_MESSAGES/midori.mo share/locale/zh_CN/LC_MESSAGES/midori.mo +share/locale/zh_HK/LC_MESSAGES/midori.mo share/locale/zh_TW/LC_MESSAGES/midori.mo %%DATADIR%%/res/about.css %%DATADIR%%/res/adblock.list
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504201639.t3KGdssJ035584>