CVS commit: pkgsrc/www/midori

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Tue Dec 11 12:40:18 UTC 2018

Modified Files:
        pkgsrc/www/midori: DESCR Makefile PLIST distinfo
Removed Files:
        pkgsrc/www/midori: options.mk
        pkgsrc/www/midori/patches: patch-CMakeLists.txt
            patch-config_CMakeLists.txt patch-extensions_adblock_widgets.vala
            patch-extensions_apps.vala
            patch-extensions_external-download-manager.vala
            patch-extensions_history-list.vala patch-extensions_notes.vala
            patch-extensions_open-with.vala patch-extensions_transfers.vala
            patch-katze_midori-paths.vala patch-midori_midori-notebook.vala

Log Message:
midori: Update www/midori to 7.0

Changes:
7.0
---
 Fixed YouTube rendering issue due to custom user agent
 Fixed invisible cursor in text fields
 Restored behavior of " " and "." in urlbar completion
 Download/ web notifications for background window/ tab
 Highlight in toolbar for finished downloads
 Re-introduced proxy server UX
 Multiple processes for indivdual tabs
 Adaptive toolbar layout for smaller screens

6.0
---
 Revamped Vala-only core based on GTK+3 and WebKit2
 App based on Gtk.Application, supporting global/ window app menu
 Tabs on top with a custom stack switcher and Gtk.Stack
 Url completion with GLib.ListModel and Gtk.ListBox
 Peas-based extensions, also available in Private Browsing
 New fullscreen mode with auto-revealing toolbar

Based on www/midori and updated in pkgsrc-wip by <bsiegert> and <leot>.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/www/midori/DESCR
cvs rdiff -u -r1.114 -r1.115 pkgsrc/www/midori/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/www/midori/PLIST
cvs rdiff -u -r1.26 -r1.27 pkgsrc/www/midori/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/www/midori/options.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/www/midori/patches/patch-CMakeLists.txt \
    pkgsrc/www/midori/patches/patch-config_CMakeLists.txt \
    pkgsrc/www/midori/patches/patch-extensions_adblock_widgets.vala \
    pkgsrc/www/midori/patches/patch-extensions_apps.vala \
    pkgsrc/www/midori/patches/patch-extensions_external-download-manager.vala \
    pkgsrc/www/midori/patches/patch-extensions_notes.vala \
    pkgsrc/www/midori/patches/patch-extensions_open-with.vala \
    pkgsrc/www/midori/patches/patch-extensions_transfers.vala \
    pkgsrc/www/midori/patches/patch-katze_midori-paths.vala \
    pkgsrc/www/midori/patches/patch-midori_midori-notebook.vala
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/www/midori/patches/patch-extensions_history-list.vala

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/midori/DESCR
diff -u pkgsrc/www/midori/DESCR:1.1.1.1 pkgsrc/www/midori/DESCR:1.2
--- pkgsrc/www/midori/DESCR:1.1.1.1     Thu Dec 11 20:15:49 2008
+++ pkgsrc/www/midori/DESCR     Tue Dec 11 12:40:18 2018
@@ -1,7 +1,7 @@
 Midori is a lightweight web browser.
 
 Features
-       Full integration with GTK+ 2
+       Full integration with GTK+ 3
        Fast rendering with WebKit
        Tabs, windows and session management
        Bookmarks with XBEL and token support

Index: pkgsrc/www/midori/Makefile
diff -u pkgsrc/www/midori/Makefile:1.114 pkgsrc/www/midori/Makefile:1.115
--- pkgsrc/www/midori/Makefile:1.114    Sun Dec  9 18:52:49 2018
+++ pkgsrc/www/midori/Makefile  Tue Dec 11 12:40:18 2018
@@ -1,66 +1,37 @@
-# $NetBSD: Makefile,v 1.114 2018/12/09 18:52:49 adam Exp $
+# $NetBSD: Makefile,v 1.115 2018/12/11 12:40:18 bsiegert Exp $
 
-DISTNAME=      midori_0.5.11_all_
-PKGNAME=       ${DISTNAME:S/_all_//:S/_/-/}
-PKGREVISION=   29
+DISTNAME=      midori-v7.0
+PKGNAME=       ${DISTNAME:S/v//}
 CATEGORIES=    www
-MASTER_SITES=  http://midori-browser.org/downloads/
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=midori-browser/}
+GITHUB_PROJECT=        core
+GITHUB_RELEASE=        v7
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://midori-browser.org/
 COMMENT=       Lightweight web browser using WebKit
 LICENSE=       gnu-lgpl-v2.1
-EXTRACT_SUFX=  .tar.bz2
 
-WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV}
-
-HAS_CONFIGURE= yes
 USE_CMAKE=     yes
-USE_TOOLS+=    gmake intltool msgfmt pkg-config
-
-CONFIGURE_ARGS+=       --prefix=${PREFIX}
-CONFIGURE_ARGS+=       --disable-zeitgeist
-CMAKE_ARGS+=           -DUSE_ZEITGEIST=OFF
-CMAKE_ARGS+=           -DPREFIX=${PREFIX}
-
-CHECK_PORTABILITY_SKIP+=       win32/old/x86-mingw32-opensuse/install.sh
-CHECK_PORTABILITY_SKIP+=       win32/makedist/makedist.midori
-
-BUILD_DEPENDS+=                librsvg>=2.18:../../graphics/librsvg
-
-DEPENDS+=              gnome-themes-standard-[0-9]*:../../graphics/gnome-themes-standard
-
-EGDIR=                 ${PREFIX}/share/examples/midori
-OWN_DIRS=              ${PKG_SYSCONFDIR}/xdg/midori
-CONF_FILES=            ${EGDIR}/search ${PKG_SYSCONFDIR}/xdg/midori/search
-
-# Otherwise build chokes on .orig files
-pre-configure:
-       ${FIND} ${WRKSRC} -name "*.orig*" -exec ${RM} -f {} \;
-
-.include "../../mk/bsd.prefs.mk"
-
-OWN_DIRS+=     ${PKG_SYSCONFDIR}/xdg/midori/extensions/adblock
-CONF_FILES+=   ${EGDIR}/extensions/adblock/config \
-               ${PKG_SYSCONFDIR}/xdg/midori/extensions/adblock/config
-
-CONFIGURE_ENV= VALAC=${VALAC}
+USE_TOOLS+=    intltool msgfmt pkg-config
 
-NOT_PAX_MPROTECT_SAFE+=        bin/midori
+BUILDLINK_TRANSFORM+=  rm:-Werror
 
-.include "options.mk"
+CONFIGURE_ENV+=        VALAC=${VALAC}
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libidn/buildlink3.mk"
+.include "../../devel/libpeas/buildlink3.mk"
+.include "../../graphics/adwaita-icon-theme/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../net/libsoup/buildlink3.mk"
-#.include "../../security/gnome-keyring/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../x11/libXScrnSaver/buildlink3.mk"
+.include "../../www/webkit-gtk/buildlink3.mk"
 BUILDLINK_DEPMETHOD.vala= build
 .include "../../lang/vala/buildlink3.mk"
+.include "../../security/gcr/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/midori/PLIST
diff -u pkgsrc/www/midori/PLIST:1.27 pkgsrc/www/midori/PLIST:1.28
--- pkgsrc/www/midori/PLIST:1.27        Sun Oct 25 13:50:22 2015
+++ pkgsrc/www/midori/PLIST     Tue Dec 11 12:40:18 2018
@@ -1,66 +1,35 @@
-@comment $NetBSD: PLIST,v 1.27 2015/10/25 13:50:22 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.28 2018/12/11 12:40:18 bsiegert Exp $
 bin/midori
+lib/girepository-1.0/Midori-0.6.typelib
 lib/libmidori-core.so
-lib/libmidori-core.so.0.0.0
-lib/libmidori-core.so.1
-lib/midori/libabout.so
+lib/libmidori-core.so.0
+lib/libmidori-core.so.0.6
+lib/midori/adblock.plugin
+lib/midori/bookmarks.plugin
+lib/midori/colorful-tabs.plugin
+lib/midori/libactivatable.so
 lib/midori/libadblock.so
-lib/midori/libaddons.so
-lib/midori/libapps.so
+lib/midori/libbookmarks.so
 lib/midori/libcolorful-tabs.so
-lib/midori/libcookie-manager.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
-lib/midori/libexternal-download-manager.so
-lib/midori/libfeed-panel.so
-lib/midori/libflummi.so
-lib/midori/libformhistory.so
-lib/midori/libhistory-list.so
-lib/midori/libmouse-gestures.so
-lib/midori/libnojs.so
-lib/midori/libnotes.so
-lib/midori/libnsplugin-manager.so
-lib/midori/libopen-with.so
-lib/midori/libshortcuts.so
+lib/midori/libsession.so
 lib/midori/libstatus-clock.so
 lib/midori/libstatusbar-features.so
-lib/midori/libtab-panel.so
-lib/midori/libtabby.so
-lib/midori/libtabs-minimized.so
-lib/midori/libtoolbar-editor.so
-lib/midori/libtransfers.so
-lib/midori/libwebmedia-now-playing.so
+lib/midori/session.plugin
+lib/midori/status-clock.plugin
+lib/midori/statusbar-features.plugin
 share/appdata/midori.appdata.xml
-share/applications/midori-private.desktop
-share/applications/midori.desktop
-share/doc/midori/AUTHORS
+share/applications/org.midori_browser.Midori.desktop
 share/doc/midori/COPYING
-share/doc/midori/ChangeLog
-share/doc/midori/EXPAT
-share/doc/midori/README
-share/doc/midori/faq.css
-share/doc/midori/faq.html
-share/examples/midori/extensions/adblock/config
-share/examples/midori/search
+share/doc/midori/README.md
+share/gir-1.0/Midori-0.6.gir
 share/icons/hicolor/16x16/apps/midori.png
-share/icons/hicolor/16x16/categories/extension.png
-share/icons/hicolor/16x16/status/internet-news-reader.png
 share/icons/hicolor/22x22/apps/midori.png
-share/icons/hicolor/22x22/categories/extension.png
-share/icons/hicolor/22x22/status/internet-news-reader.png
-share/icons/hicolor/24x24/status/adblock-blocked.svg
-share/icons/hicolor/24x24/status/adblock-disabled.svg
-share/icons/hicolor/24x24/status/adblock-enabled.svg
 share/icons/hicolor/scalable/apps/midori.svg
-share/icons/hicolor/scalable/categories/extension.svg
-share/icons/hicolor/scalable/status/internet-news-reader.svg
 share/locale/af/LC_MESSAGES/midori.mo
 share/locale/am/LC_MESSAGES/midori.mo
 share/locale/ar/LC_MESSAGES/midori.mo
 share/locale/ast/LC_MESSAGES/midori.mo
+share/locale/az/LC_MESSAGES/midori.mo
 share/locale/be/LC_MESSAGES/midori.mo
 share/locale/bg/LC_MESSAGES/midori.mo
 share/locale/bn/LC_MESSAGES/midori.mo
@@ -120,9 +89,11 @@ share/locale/sq/LC_MESSAGES/midori.mo
 share/locale/sr/LC_MESSAGES/midori.mo
 share/locale/sr@latin/LC_MESSAGES/midori.mo
 share/locale/sv/LC_MESSAGES/midori.mo
+share/locale/szl/LC_MESSAGES/midori.mo
 share/locale/ta/LC_MESSAGES/midori.mo
 share/locale/te/LC_MESSAGES/midori.mo
 share/locale/th/LC_MESSAGES/midori.mo
+share/locale/tl/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
@@ -132,24 +103,3 @@ 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
-share/midori/res/about.css
-share/midori/res/adblock.list
-share/midori/res/adblock/element_hider.js
-share/midori/res/autosuggestcontrol.css
-share/midori/res/autosuggestcontrol.js
-share/midori/res/bookmarks/Create.sql
-share/midori/res/bookmarks/Import_old_db_bookmarks.sql
-share/midori/res/error.html
-share/midori/res/flummi/Create.sql
-share/midori/res/forms/Create.sql
-share/midori/res/gtk3.css
-share/midori/res/history/Create.sql
-share/midori/res/history/Day.sql
-share/midori/res/logo-shade.png
-share/midori/res/nojs/nojs-statusicon-allowed.png
-share/midori/res/nojs/nojs-statusicon-denied.png
-share/midori/res/nojs/nojs-statusicon-mixed.png
-share/midori/res/notes/Create.sql
-share/midori/res/speeddial-head.html
-share/midori/res/tabby/Create.sql
-share/midori/res/tabby/Update1.sql

Index: pkgsrc/www/midori/distinfo
diff -u pkgsrc/www/midori/distinfo:1.26 pkgsrc/www/midori/distinfo:1.27
--- pkgsrc/www/midori/distinfo:1.26     Fri Nov  9 09:17:07 2018
+++ pkgsrc/www/midori/distinfo  Tue Dec 11 12:40:18 2018
@@ -1,17 +1,6 @@
-$NetBSD: distinfo,v 1.26 2018/11/09 09:17:07 abs Exp $
+$NetBSD: distinfo,v 1.27 2018/12/11 12:40:18 bsiegert Exp $
 
-SHA1 (midori_0.5.11_all_.tar.bz2) = 64c86935028feb5f89d799c2acacaad67764da6f
-RMD160 (midori_0.5.11_all_.tar.bz2) = 66aaf624d39fbb86c1bec42972fba7998965ef50
-SHA512 (midori_0.5.11_all_.tar.bz2) = 237310d1f0bf70796474b9ec5be6755927e66acd2b527d04db39696c5e2f7ea2d11f7deb51ba3f5c151a450ab71e642282a1386e34253aaea1d8602ce76ac87d
-Size (midori_0.5.11_all_.tar.bz2) = 1428791 bytes
-SHA1 (patch-CMakeLists.txt) = 68d0232b254e4094118b7f029162bf669f096d45
-SHA1 (patch-config_CMakeLists.txt) = 5ac4af9f980749659058fb55e7fd25ad6226861f
-SHA1 (patch-extensions_adblock_widgets.vala) = 076a3e9bcc33b20bde4df0ae5f89efd950260087
-SHA1 (patch-extensions_apps.vala) = 77b4e5ed86809446b2d63cbf248fd5a9dddd159f
-SHA1 (patch-extensions_external-download-manager.vala) = 3ccd1a11828849ddc2e6007f52b3549bdb34418f
-SHA1 (patch-extensions_history-list.vala) = e17c5b8ff0bbbaec41b64c813138b564cf555b56
-SHA1 (patch-extensions_notes.vala) = 7869734d57377b713b4e78029fc2d12f3d6e7ab5
-SHA1 (patch-extensions_open-with.vala) = bb07507b64b73ae7c68aedb7e1f704ba00c323d2
-SHA1 (patch-extensions_transfers.vala) = bea6a7789cbda64f8a950360e87b2a256e70d83d
-SHA1 (patch-katze_midori-paths.vala) = f304804f39fc47d5c5591c9712a4b98ace3e1b26
-SHA1 (patch-midori_midori-notebook.vala) = c117d382af224af05241daaa7ccf991e702098a0
+SHA1 (midori-v7.0.tar.gz) = 802ceb76483bf6b9d1dfe94561fb42568e398200
+RMD160 (midori-v7.0.tar.gz) = c9b2bb0734db3ddabd5d5f71ab610e4b788804cf
+SHA512 (midori-v7.0.tar.gz) = 4110d1566ba8b0979c29f1c3a95af3da4cba884f44a1305403d8951f7f2dfb17946c3c7326eebafc111738950c907d06cc6c54ce670cde321da890d8b9ced051
+Size (midori-v7.0.tar.gz) = 1827341 bytes