I wrote:
> Rhialto wrote:
>>> There are Midori and surf, both WebKit-based browsers, and have
>>> JavaScript, and both are fairly small. I use NetSurf, don't browse
>>> JS-filled net and quite happy with it.
>> www/midori fails to build for me:
> Maybe we should use FreeBSD patches?
Hi,
Attaching the patch. Midori seems to compile and work now. Please
check it out.
--
caóc
Subject: [PATCH] www/midori: adopt FreeBSD patches
---
www/midori/Makefile | 14 +++++---
www/midori/distinfo | 10 +++++-
www/midori/patches/patch-CMakeLists.txt | 8 +++++
.../patches/patch-extensions_adblock-widgets | 14 ++++++++
www/midori/patches/patch-extensions_apps | 14 ++++++++
.../patch-extensions_external-download-manager | 37 ++++++++++++++++++++++
www/midori/patches/patch-extensions_history-list | 14 ++++++++
www/midori/patches/patch-extensions_notes | 14 ++++++++
www/midori/patches/patch-extensions_transfers | 27 ++++++++++++++++
www/midori/patches/patch-midori_midori-notebook | 29 +++++++++++++++++
www/midori/patches/patch-midori_midori-stock | 18 +++++++++++
11 files changed, 194 insertions(+), 5 deletions(-)
create mode 100644 www/midori/patches/patch-extensions_adblock-widgets
create mode 100644 www/midori/patches/patch-extensions_apps
create mode 100644
www/midori/patches/patch-extensions_external-download-manager
create mode 100644 www/midori/patches/patch-extensions_history-list
create mode 100644 www/midori/patches/patch-extensions_notes
create mode 100644 www/midori/patches/patch-extensions_transfers
create mode 100644 www/midori/patches/patch-midori_midori-notebook
create mode 100644 www/midori/patches/patch-midori_midori-stock
diff --git a/www/midori/Makefile b/www/midori/Makefile
index 8e298f195e7..0d80a258d0b 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.107 2018/04/17 04:25:32 wiz Exp $
+# $NetBSD: Makefile,v 1.104 2018/03/12 11:17:47 wiz Exp $
DISTNAME= midori_0.5.11_all_
PKGNAME= ${DISTNAME:S/_all_//:S/_/-/}
-PKGREVISION= 22
+PKGREVISION= 20
CATEGORIES= www
MASTER_SITES= http://midori-browser.org/downloads/
@@ -28,7 +28,7 @@ CHECK_PORTABILITY_SKIP+= win32/makedist/makedist.midori
BUILD_DEPENDS+= librsvg>=2.18:../../graphics/librsvg
-DEPENDS+= gnome-themes-[0-9]*:../../x11/gnome-themes
+#DEPENDS+= gnome-themes-[0-9]*:../../x11/gnome-themes
EGDIR= ${PREFIX}/share/examples/midori
OWN_DIRS= ${PKG_SYSCONFDIR}/xdg/midori
@@ -44,13 +44,19 @@ CONFIGURE_ENV= VALAC=${VALAC}
NOT_PAX_MPROTECT_SAFE+= bin/midori
+# Avoid errors for CMake
+post-patch:
+.for dir in config extensions
+ @${RM} ${WRKSRC}/${dir}/*.orig
+.endfor
+
.include "options.mk"
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libidn/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../graphics/gnome-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"
diff --git a/www/midori/distinfo b/www/midori/distinfo
index bf49b25d666..96c26521cc9 100644
--- a/www/midori/distinfo
+++ b/www/midori/distinfo
@@ -4,5 +4,13 @@ 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-CMakeLists.txt) = 88b75128680c139ac208ac54a5e885f955c262c7
SHA1 (patch-config_CMakeLists.txt) = 5ac4af9f980749659058fb55e7fd25ad6226861f
+SHA1 (patch-extensions_adblock-widgets) =
a3e73709a0d073ff63b29a3db972e385a2a83ca8
+SHA1 (patch-extensions_apps) = 0627c1c911718f6a1009c7246d1542a91901989a
+SHA1 (patch-extensions_external-download-manager) =
f287fdc248bda76185b6e158f6ac7e3a783d2bff
+SHA1 (patch-extensions_history-list) = c8f3e33313c09bc1e92f6a88c9b0da47f36b5c5a
+SHA1 (patch-extensions_notes) = 4715e1ac59d5812359f7151aaa8bb076d038b2c0
+SHA1 (patch-extensions_transfers) = f34d87256c235cc7cb73c956744f55aa58096011
+SHA1 (patch-midori_midori-notebook) = ad235add4351e62af377cab8533b92d1a2ddf84d
+SHA1 (patch-midori_midori-stock) = 9e2a1388d52625aca2cb3ae1f5f672e944ddaec9
diff --git a/www/midori/patches/patch-CMakeLists.txt
b/www/midori/patches/patch-CMakeLists.txt
index 2304a02b6db..e20465658e6 100644
--- a/www/midori/patches/patch-CMakeLists.txt
+++ b/www/midori/patches/patch-CMakeLists.txt
@@ -43,3 +43,11 @@ $NetBSD: patch-CMakeLists.txt,v 1.1 2015/10/25 13:50:22
jmcneill Exp $
endif ()
if (HALF_BRO_INCOM_WEBKIT2)
+@@ -263,7 +263,6 @@ if ((CMAKE_C_COMPILER_ID STREQUAL "GNU"
+ OR (CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_C_COMPILER_VERSION
VERSION_GREATER "3.0.0"))
+ set(VALA_CFLAGS "${VALA_CFLAGS} -Werror=implicit-function-declaration")
+ set(VALA_CFLAGS "${VALA_CFLAGS} -Wno-incompatible-pointer-types")
+- set(VALA_CFLAGS "${VALA_CFLAGS} -Wno-discarded-qualifiers")
+ set(VALA_CFLAGS "${VALA_CFLAGS} -Wno-deprecated-declarations")
+ else ()
+ set(VALA_CFLAGS "${VALA_CFLAGS} -w")
diff --git a/www/midori/patches/patch-extensions_adblock-widgets
b/www/midori/patches/patch-extensions_adblock-widgets
new file mode 100644
index 00000000000..7e80735355f
--- /dev/null
+++ b/www/midori/patches/patch-extensions_adblock-widgets
@@ -0,0 +1,14 @@
+--- extensions/adblock/widgets.vala 2015-08-30 11:56:26 UTC
++++ extensions/adblock/widgets.vala
+@@ -227,7 +227,11 @@ namespace Adblock {
+ liststore.get (iter, 0, out sub);
+ if (sub.mutable) {
+ config.remove (sub);
++#if VALA_0_36
++ liststore.remove (ref iter);
++#else
+ liststore.remove (iter);
++#endif
+ return true;
+ }
+ }
diff --git a/www/midori/patches/patch-extensions_apps
b/www/midori/patches/patch-extensions_apps
new file mode 100644
index 00000000000..e539b12e0c8
--- /dev/null
+++ b/www/midori/patches/patch-extensions_apps
@@ -0,0 +1,14 @@
+--- extensions/apps.vala 2015-08-30 11:56:26 UTC
++++ extensions/apps.vala
+@@ -265,7 +265,11 @@ namespace Apps {
+ store.get (iter, 0, out launcher);
+ try {
+ launcher.file.trash (null);
++#if VALA_0_36
++ store.remove (ref iter);
++#else
+ store.remove (iter);
++#endif
+
+ string filename =
Midori.Download.clean_filename (launcher.name);
+ #if HAVE_WIN32
diff --git a/www/midori/patches/patch-extensions_external-download-manager
b/www/midori/patches/patch-extensions_external-download-manager
new file mode 100644
index 00000000000..e280659a1ff
--- /dev/null
+++ b/www/midori/patches/patch-extensions_external-download-manager
@@ -0,0 +1,37 @@
+--- extensions/external-download-manager.vala 2015-08-30 11:56:26 UTC
++++ extensions/external-download-manager.vala
+@@ -10,7 +10,7 @@
+ */
+
+ namespace EDM {
+-#if !HAVE_WIN32
++#if !HAVE_WIN32 || HAVE_GTK3
+ [DBus (name = "net.launchpad.steadyflow.App")]
+ interface SteadyflowInterface : GLib.Object {
+ public abstract void AddFile (string url) throws IOError;
+@@ -203,6 +203,7 @@ namespace EDM {
+ }
+ }
+
++#if HAVE_GTK3
+ private class SteadyFlow : ExternalDownloadManager {
+ public override bool download (DownloadRequest dlReq) {
+ try {
+@@ -230,6 +231,7 @@ namespace EDM {
+ }
+ }
+ #endif
++#endif
+
+ private class CommandLinePreferences : Gtk.Dialog {
+ protected Gtk.Entry input;
+@@ -359,7 +361,9 @@ public Katze.Array extension_init () {
+ var extensions = new Katze.Array( typeof (Midori.Extension));
+ #if !HAVE_WIN32
+ extensions.add_item (new EDM.Aria2 ());
++ #if HAVE_GTK3
+ extensions.add_item (new EDM.SteadyFlow ());
++ #endif
+ #endif
+ extensions.add_item (new EDM.CommandLine ());
+ return extensions;
diff --git a/www/midori/patches/patch-extensions_history-list
b/www/midori/patches/patch-extensions_history-list
new file mode 100644
index 00000000000..98ad0d678e7
--- /dev/null
+++ b/www/midori/patches/patch-extensions_history-list
@@ -0,0 +1,14 @@
+--- extensions/history-list.vala 2015-08-30 11:56:26 UTC
++++ extensions/history-list.vala
+@@ -223,7 +223,11 @@ namespace HistoryList {
+ FixMe: the retrun value of `Gtk.ListStore.remove` should
be checked
+ Note: in some cases the return value of
`Gtk.ListStore.remove` is wrong
+ */
++#if VALA_0_36
++ model.remove (ref iter);
++#else
+ model.remove (iter);
++#endif
+ this.browser.close_tab (view);
+ if (length > 2)
+ this.resize_treeview ();
diff --git a/www/midori/patches/patch-extensions_notes
b/www/midori/patches/patch-extensions_notes
new file mode 100644
index 00000000000..4491d391454
--- /dev/null
+++ b/www/midori/patches/patch-extensions_notes
@@ -0,0 +1,14 @@
+--- extensions/notes.vala 2015-08-30 11:56:26 UTC
++++ extensions/notes.vala
+@@ -116,7 +116,11 @@ namespace ClipNotes {
+ if (current_note == note) {
+ current_note = null;
+ }
++#if VALA_0_36
++ notes_list_store.remove (ref iter);
++#else
+ notes_list_store.remove (iter);
++#endif
+ break;
+ }
+ } while (notes_list_store.iter_next (ref iter));
diff --git a/www/midori/patches/patch-extensions_transfers
b/www/midori/patches/patch-extensions_transfers
new file mode 100644
index 00000000000..79d07a21d50
--- /dev/null
+++ b/www/midori/patches/patch-extensions_transfers
@@ -0,0 +1,27 @@
+--- extensions/transfers.vala 2015-08-30 11:56:26 UTC
++++ extensions/transfers.vala
+@@ -275,7 +275,11 @@ namespace Transfers {
+ Transfer found;
+ store.get (iter, 0, out found);
+ if (transfer == found) {
++#if VALA_0_36
++ store.remove (ref iter);
++#else
+ store.remove (iter);
++#endif
+ break;
+ }
+ } while (store.iter_next (ref iter));
+@@ -455,7 +459,11 @@ namespace Transfers {
+ if (notifications.length () == 1)
+ msg = _("The file '<b>%s</b>' has been
downloaded.").printf (filename);
+ else
+- msg = _("'<b>%s</b>' and %d other files have been
downloaded.").printf (filename, notifications.length ());
++#if VALA_0_36
++ msg = _("'<b>%s</b>' and %d other files have been
downloaded.").printf (filename, (int) notifications.length ());
++#else
++ msg = _("'<b>%s</b>' and %d other files have been
downloaded.").printf (filename, notifications.length ());
++#endif
+ get_app ().send_notification (_("Transfer completed"), msg);
+ notifications = new GLib.List<string> ();
+ }
diff --git a/www/midori/patches/patch-midori_midori-notebook
b/www/midori/patches/patch-midori_midori-notebook
new file mode 100644
index 00000000000..8a68002fa3f
--- /dev/null
+++ b/www/midori/patches/patch-midori_midori-notebook
@@ -0,0 +1,29 @@
+--- midori/midori-notebook.vala 2015-08-30 11:56:26 UTC
++++ midori/midori-notebook.vala
+@@ -10,7 +10,7 @@
+ */
+
+ namespace Midori {
+- protected class Tally : Gtk.EventBox {
++ internal class Tally : Gtk.EventBox {
+ public Midori.Tab tab { get; set; }
+ Gtk.Spinner spinner;
+ public Gtk.Label label;
+@@ -22,7 +22,7 @@ namespace Midori {
+ public bool close_button_left { get; set; default = false; }
+ public bool close_button_visible { get; set; default = false; }
+
+- protected Tally (Midori.Tab tab) {
++ internal Tally (Midori.Tab tab) {
+ this.tab = tab;
+ box = new Gtk.HBox (false, 1);
+ add (box);
+@@ -155,7 +155,7 @@ namespace Midori {
+ int last_tab_size = 0;
+
+ #if !HAVE_GTK3
+- static const string style_fixup = """
++ const string style_fixup = """
+ style "midori-close-button-style"
+ {
+ GtkWidget::focus-padding = 0
diff --git a/www/midori/patches/patch-midori_midori-stock
b/www/midori/patches/patch-midori_midori-stock
new file mode 100644
index 00000000000..4574d5466ff
--- /dev/null
+++ b/www/midori/patches/patch-midori_midori-stock
@@ -0,0 +1,18 @@
+--- midori/midori-stock.h 2015-08-30 11:56:26 UTC
++++ midori/midori-stock.h
+@@ -20,12 +20,12 @@
+ #define MIDORI_STOCK_WEB_BROWSER "web-browser"
+ #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_TRANSFER "package-x-generic"
++#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"
+-#define STOCK_SCRIPT "text-x-javascript"
++#define STOCK_SCRIPT "text-x-script"
+ #define STOCK_SEND "mail-send"
+ #define STOCK_TAB_NEW "tab-new"
+ #define STOCK_USER_TRASH "user-trash"
--
2.16.3
