Attachment 186017 Details for Bug 222015 – patch

[patch] patch

midori.diff (text/plain), 10.71 KB, created by Carlos J. Puga Medina on 2017-09-03 08:00:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos J. Puga Medina

Created: 2017-09-03 08:00:53 UTC

Size: 10.71 KB

patch

obsolete

>Index: www/midori/Makefile
>===================================================================
>--- www/midori/Makefile	(revision 449131)
>+++ www/midori/Makefile	(working copy)
>@@ -27,11 +27,11 @@
> CMAKE_ARGS=	-DUSE_APIDOCS:BOOL=OFF \
> 	-DUSE_GRANITE:BOOL=OFF
> 
>+USES=		cmake desktop-file-utils gettext pkgconfig sqlite tar:bzip2
> USE_GNOME=	glib20 intltool libxml2
> USE_XORG=	xscrnsaver
> INSTALLS_ICONS=	yes
> USE_LDCONFIG=	yes
>-USES=		cmake desktop-file-utils gettext pkgconfig sqlite tar:bzip2
> 
> PLIST_SUB=	VERSION="${PORTVERSION:R}"
> 
>Index: www/midori/files/patch-config__search
>===================================================================
>--- www/midori/files/patch-config__search	(revision 449131)
>+++ www/midori/files/patch-config__search	(working copy)
>@@ -1,6 +1,6 @@
>---- ./config/search.orig	2013-11-20 01:26:52.000000000 +0000
>-+++ ./config/search	2013-11-20 18:03:47.000000000 +0000
>-@@ -16,6 +16,12 @@
>+--- config/search.orig	2015-08-30 11:56:26 UTC
>++++ config/search
>+@@ -16,6 +16,12 @@ text=Web Search
> uri=http://www.google.com/search?q=%s
> token=g
> 
>Index: www/midori/files/patch-extensions__external-download-manager.vala
>===================================================================
>--- www/midori/files/patch-extensions__external-download-manager.vala	(revision 449131)
>+++ www/midori/files/patch-extensions__external-download-manager.vala	(working copy)
>@@ -1,7 +1,7 @@
>---- ./extensions/external-download-manager.vala.orig	2013-03-07 17:44:14.000000000 +0000
>-+++ ./extensions/external-download-manager.vala	2013-03-11 06:50:27.000000000 +0000
>-@@ -16,7 +16,7 @@
>- using WebKit;
>+--- extensions/external-download-manager.vala.orig	2015-08-30 11:56:26 UTC
>++++ extensions/external-download-manager.vala
>+@@ -10,7 +10,7 @@
>+ */
> 
> namespace EDM {
> -#if !HAVE_WIN32
>@@ -9,7 +9,7 @@
> [DBus (name = "net.launchpad.steadyflow.App")]
> interface SteadyflowInterface : GLib.Object {
> public abstract void AddFile (string url) throws IOError;
>-@@ -183,6 +183,7 @@
>+@@ -203,6 +203,7 @@ namespace EDM {
> }
> }
> 
>@@ -17,7 +17,7 @@
> private class SteadyFlow : ExternalDownloadManager {
> public override bool download (DownloadRequest dlReq) {
> try {
>-@@ -210,6 +211,7 @@
>+@@ -230,6 +231,7 @@ namespace EDM {
> }
> }
> #endif
>@@ -24,15 +24,14 @@
> +#endif
> 
> private class CommandLinePreferences : Gtk.Dialog {
>- protected Entry input;
>-@@ -339,8 +341,10 @@
>+ 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
>-+ #endif
> extensions.add_item (new EDM.CommandLine ());
> return extensions;
>- }
>Index: www/midori/files/patch-extensions_adblock_widgets.vala
>===================================================================
>--- www/midori/files/patch-extensions_adblock_widgets.vala	(nonexistent)
>+++ www/midori/files/patch-extensions_adblock_widgets.vala	(working copy)
>@@ -0,0 +1,11 @@
>+--- extensions/adblock/widgets.vala.orig	2015-08-30 11:56:26 UTC
>++++ extensions/adblock/widgets.vala
>+@@ -227,7 +227,7 @@ namespace Adblock {
>+ liststore.get (iter, 0, out sub);
>+ if (sub.mutable) {
>+ config.remove (sub);
>+- liststore.remove (iter);
>++ liststore.remove (ref iter);
>+ return true;
>+ }
>+ }
>
>Property changes on: www/midori/files/patch-extensions_adblock_widgets.vala
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: www/midori/files/patch-extensions_apps.vala
>===================================================================
>--- www/midori/files/patch-extensions_apps.vala	(nonexistent)
>+++ www/midori/files/patch-extensions_apps.vala	(working copy)
>@@ -0,0 +1,11 @@
>+--- extensions/apps.vala.orig	2015-08-30 11:56:26 UTC
>++++ extensions/apps.vala
>+@@ -265,7 +265,7 @@ namespace Apps {
>+ store.get (iter, 0, out launcher);
>+ try {
>+ launcher.file.trash (null);
>+- store.remove (iter);
>++ store.remove (ref iter);
>+ 
>+ string filename = Midori.Download.clean_filename (launcher.name);
>+ #if HAVE_WIN32
>
>Property changes on: www/midori/files/patch-extensions_apps.vala
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: www/midori/files/patch-extensions_history-list.vala
>===================================================================
>--- www/midori/files/patch-extensions_history-list.vala	(nonexistent)
>+++ www/midori/files/patch-extensions_history-list.vala	(working copy)
>@@ -0,0 +1,11 @@
>+--- extensions/history-list.vala.orig	2015-08-30 11:56:26 UTC
>++++ extensions/history-list.vala
>+@@ -223,7 +223,7 @@ 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
>+ */
>+- model.remove (iter);
>++ model.remove (ref iter);
>+ this.browser.close_tab (view);
>+ if (length > 2)
>+ this.resize_treeview ();
>
>Property changes on: www/midori/files/patch-extensions_history-list.vala
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: www/midori/files/patch-extensions_notes.vala
>===================================================================
>--- www/midori/files/patch-extensions_notes.vala	(nonexistent)
>+++ www/midori/files/patch-extensions_notes.vala	(working copy)
>@@ -0,0 +1,11 @@
>+--- extensions/notes.vala.orig	2015-08-30 11:56:26 UTC
>++++ extensions/notes.vala
>+@@ -116,7 +116,7 @@ namespace ClipNotes {
>+ if (current_note == note) {
>+ current_note = null;
>+ }
>+- notes_list_store.remove (iter);
>++ notes_list_store.remove (ref iter);
>+ break;
>+ }
>+ } while (notes_list_store.iter_next (ref iter));
>
>Property changes on: www/midori/files/patch-extensions_notes.vala
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: www/midori/files/patch-extensions_transfers.vala
>===================================================================
>--- www/midori/files/patch-extensions_transfers.vala	(nonexistent)
>+++ www/midori/files/patch-extensions_transfers.vala	(working copy)
>@@ -0,0 +1,20 @@
>+--- extensions/transfers.vala.orig	2015-08-30 11:56:26 UTC
>++++ extensions/transfers.vala
>+@@ -275,7 +275,7 @@ namespace Transfers {
>+ Transfer found;
>+ store.get (iter, 0, out found);
>+ if (transfer == found) {
>+- store.remove (iter);
>++ store.remove (ref iter);
>+ break;
>+ }
>+ } while (store.iter_next (ref iter));
>+@@ -455,7 +455,7 @@ namespace Transfers {
>+ if (notifications.length () == 1)
>+ msg = _("The file '%s' has been downloaded.").printf (filename);
>+ else
>+- msg = _("'%s' and %d other files have been downloaded.").printf (filename, notifications.length ());
>++ msg = _("'%s' and %d other files have been downloaded.").printf (filename, (int) notifications.length ());
>+ get_app ().send_notification (_("Transfer completed"), msg);
>+ notifications = new GLib.List<string> ();
>+ }
>
>Property changes on: www/midori/files/patch-extensions_transfers.vala
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: www/midori/files/patch-midori_midori-notebook.vala
>===================================================================
>--- www/midori/files/patch-midori_midori-notebook.vala	(nonexistent)
>+++ www/midori/files/patch-midori_midori-notebook.vala	(working copy)
>@@ -0,0 +1,29 @@
>+--- midori/midori-notebook.vala.orig	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
>
>Property changes on: www/midori/files/patch-midori_midori-notebook.vala
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 222015: 186017 | 186080