Version 0.46.0

3 files changed, 111 insertions, 66 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f4248b3e95a1..98a5a819a11c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,36 +1,37 @@
 # Generated by mksrcinfo v8
-# Sat Jul  2 09:08:04 UTC 2016
+# Sun Oct 30 16:59:20 UTC 2016
 pkgbase = vte3-notification
 	pkgdesc = Virtual Terminal Emulator widget for use with GTK3 with Fedora patches
-	pkgver = 0.44.2
-	pkgrel = 2
+	pkgver = 0.46.0
+	pkgrel = 1
 	url = https://wiki.gnome.org/Apps/Terminal/VTE
 	arch = i686
 	arch = x86_64
 	license = LGPL
 	makedepends = intltool
 	makedepends = gobject-introspection
-	makedepends = gtk3
 	makedepends = vala
 	makedepends = gperf
 	makedepends = glade
+	depends = gtk3
+	depends = pcre2
 	options = !emptydirs
-	source = https://download.gnome.org/sources/vte/0.44/vte-0.44.2.tar.xz
+	source = https://download.gnome.org/sources/vte/0.46/vte-0.46.0.tar.xz
 	source = vte291-command-notify-scroll-speed.patch
 	source = add-zsh-notfication-support.patch
-	sha256sums = a1ea594814bb136a3a9a6c7656b46240571f6a198825c1111007fe99194b0949
-	sha256sums = ad9c9cd940426e9beb81ab40d4e6936662ccf49f86de56509b51047cb8bd17b1
+	sha256sums = 5f7122e7860eb2470d310fc63df91d3ee32bab233729c2dc181a0cbc9b3249d7
+	sha256sums = 8143306bed082e7fe14c742675bd10e000d92fa9b135491ff121a5078b5a9ebe
 	sha256sums = 150a151404ca565f70259044661b2ef5cda43142ca677e7da324614eef8cf45a
 
 pkgname = vte3-notification
 	depends = gtk3
 	depends = vte-notification-common
-	provides = vte3=0.44.2
+	provides = vte3=0.46.0
 	conflicts = vte3
 
 pkgname = vte-notification-common
 	pkgdesc = Common files used by vte and vte3
 	arch = any
-	provides = vte-common=0.44.2
+	provides = vte-common=0.46.0
 	conflicts = vte-common
 
diff --git a/PKGBUILD b/PKGBUILD
index 655781bf5415..e93984c45f3c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,13 +4,14 @@
 
 pkgbase='vte3-notification'
 pkgname=("${pkgbase}" 'vte-notification-common')
-pkgver=0.44.2
-pkgrel=2
+pkgver=0.46.0
+pkgrel=1
 pkgdesc='Virtual Terminal Emulator widget for use with GTK3 with Fedora patches'
 arch=('i686' 'x86_64')
 url='https://wiki.gnome.org/Apps/Terminal/VTE'
 license=('LGPL')
-makedepends=('intltool' 'gobject-introspection' 'gtk3' 'vala' 'gperf' 'glade')
+depends=('gtk3' 'pcre2')
+makedepends=('intltool' 'gobject-introspection' 'vala' 'gperf' 'glade')
 options=('!emptydirs')
 source=(
 	"https://download.gnome.org/sources/vte/${pkgver::4}/vte-${pkgver}.tar.xz"
@@ -18,8 +19,8 @@ source=(
 	'add-zsh-notfication-support.patch'
 )
 sha256sums=(
-	'a1ea594814bb136a3a9a6c7656b46240571f6a198825c1111007fe99194b0949'
-	'ad9c9cd940426e9beb81ab40d4e6936662ccf49f86de56509b51047cb8bd17b1'
+	'5f7122e7860eb2470d310fc63df91d3ee32bab233729c2dc181a0cbc9b3249d7'
+	'8143306bed082e7fe14c742675bd10e000d92fa9b135491ff121a5078b5a9ebe'
 	'150a151404ca565f70259044661b2ef5cda43142ca677e7da324614eef8cf45a'
 )
 
@@ -35,7 +36,7 @@ build() {
 	./configure --prefix='/usr' --sysconfdir='/etc' \
 		--libexecdir='/usr/lib/vte' \
 		--localstatedir='/var' --disable-static \
-		--enable-introspection --enable-glade-catalogue
+		--enable-introspection --enable-glade-catalogue --enable-gtk-doc
 	sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
 	make
 }
diff --git a/vte291-command-notify-scroll-speed.patch b/vte291-command-notify-scroll-speed.patch
index a4ed9f836ccf..45e9ba8f4bcd 100644
--- a/vte291-command-notify-scroll-speed.patch
+++ b/vte291-command-notify-scroll-speed.patch
@@ -1,7 +1,8 @@
-From f9e12ac88768a60b095e0966dacc8c791ec65d46 Mon Sep 17 00:00:00 2001
+From 4f4d8b52b9e8db40513cb9b928218ae571e7ec79 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Wed, 7 Jan 2015 16:01:00 +0100
-Subject: [PATCH 1/5] Add sequences and signals for desktop notification
+Subject: [PATCH 1/6] emulation: Add sequences and signals for desktop
+ notification
 
 Add sequences
   OSC 777 ; notify ; SUMMARY ; BODY BEL
@@ -20,16 +21,16 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711059
  src/caps.cc           |  4 +++
  src/marshal.list      |  1 +
  src/vte.cc            | 12 +++++++
- src/vte/vteterminal.h |  4 ++-
+ src/vte/vteterminal.h |  3 +-
  src/vtegtk.cc         | 21 ++++++++++++
  src/vtegtk.hh         |  1 +
  src/vteinternal.hh    |  5 +++
  src/vteseq-n.gperf    |  1 +
  src/vteseq.cc         | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++
- 9 files changed, 138 insertions(+), 1 deletion(-)
+ 9 files changed, 137 insertions(+), 1 deletion(-)
 
 diff --git a/src/caps.cc b/src/caps.cc
-index f5ad64a1c7b2..d74971870955 100644
+index 47571269b883..3e496ff33194 100644
 --- a/src/caps.cc
 +++ b/src/caps.cc
 @@ -255,6 +255,8 @@ const char _vte_xterm_capability_strings[] =
@@ -38,18 +39,18 @@ index f5ad64a1c7b2..d74971870955 100644
          ENTRY(OSC "777;%s" BEL, "urxvt-777")
 +        ENTRY(OSC "777;%s;%s;%s" BEL, "send-notification")
 +        ENTRY(OSC "777;%s;%s" BEL, "send-notification")
+         ENTRY(OSC "1337;%s" BEL, "iterm2-1337")
  
          COMMENT(/* Set text parameters, ST-terminated versions. */)
-         ENTRY(OSC ";%s" ST, "set-icon-and-window-title") COMMENT(/* undocumented default */)
-@@ -291,6 +293,8 @@ const char _vte_xterm_capability_strings[] =
+@@ -292,6 +294,8 @@ const char _vte_xterm_capability_strings[] =
          ENTRY(OSC "118" ST, "reset-tek-cursor-color")
          ENTRY(OSC "119" ST, "reset-highlight-foreground-color")
          ENTRY(OSC "777;%s" ST, "urxvt-777")
 +        ENTRY(OSC "777;%s;%s;%s" ST, "send-notification")
 +        ENTRY(OSC "777;%s;%s" ST, "send-notification")
+         ENTRY(OSC "1337;%s" ST, "iterm2-1337")
  
          COMMENT(/* These may be bogus, I can't find docs for them anywhere (#104154). */)
-         ENTRY(OSC "21;%s" BEL, "set-text-property-21")
 diff --git a/src/marshal.list b/src/marshal.list
 index 0276422ec6d4..2c35c685930a 100644
 --- a/src/marshal.list
@@ -61,10 +62,10 @@ index 0276422ec6d4..2c35c685930a 100644
  VOID:STRING,UINT
  VOID:UINT,UINT
 diff --git a/src/vte.cc b/src/vte.cc
-index d3ff12a34249..bba5447af888 100644
+index 609d4e2e5d55..1c8cd2edc73e 100644
 --- a/src/vte.cc
 +++ b/src/vte.cc
-@@ -8538,6 +8538,9 @@ VteTerminalPrivate::~VteTerminalPrivate()
+@@ -8292,6 +8292,9 @@ VteTerminalPrivate::~VteTerminalPrivate()
  
  	remove_update_timeout(this);
  
@@ -74,7 +75,7 @@ index d3ff12a34249..bba5447af888 100644
  	/* discard title updates */
          g_free(m_window_title);
          g_free(m_window_title_changed);
-@@ -10574,6 +10577,15 @@ VteTerminalPrivate::emit_pending_signals()
+@@ -10328,6 +10331,15 @@ VteTerminalPrivate::emit_pending_signals()
  
  	emit_adjustment_changed();
  
@@ -91,15 +92,20 @@ index d3ff12a34249..bba5447af888 100644
  		g_free (m_window_title);
  		m_window_title = m_window_title_changed;
 diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h
-index 7836271db108..f514c3b227f9 100644
+index 7836271db108..efed7bf5dab8 100644
 --- a/src/vte/vteterminal.h
 +++ b/src/vte/vteterminal.h
-@@ -104,8 +104,10 @@ struct _VteTerminalClass {
- 
+@@ -72,6 +72,7 @@ struct _VteTerminalClass {
+ 	void (*child_exited)(VteTerminal* terminal, int status);
+ 	void (*encoding_changed)(VteTerminal* terminal);
+ 	void (*char_size_changed)(VteTerminal* terminal, guint char_width, guint char_height);
++	void (*notification_received)(VteTerminal* terminal, const gchar *summary, const gchar *body);
+ 	void (*window_title_changed)(VteTerminal* terminal);
+ 	void (*icon_title_changed)(VteTerminal* terminal);
+ 	void (*selection_changed)(VteTerminal* terminal);
+@@ -105,7 +106,7 @@ struct _VteTerminalClass {
  	void (*bell)(VteTerminal* terminal);
  
-+	void (*notification_received)(VteTerminal* terminal, const gchar *summary, const gchar *body);
-+
          /* Padding for future expansion. */
 -        gpointer padding[16];
 +        gpointer padding[15];
@@ -107,7 +113,7 @@ index 7836271db108..f514c3b227f9 100644
          VteTerminalClassPrivate *priv;
  };
 diff --git a/src/vtegtk.cc b/src/vtegtk.cc
-index 5ecec5e28a20..e394a3690f2e 100644
+index 924b5a084dd3..a65a2a98b44a 100644
 --- a/src/vtegtk.cc
 +++ b/src/vtegtk.cc
 @@ -657,6 +657,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
@@ -158,10 +164,10 @@ index 5340725d374c..f8a83525b18c 100644
          LAST_SIGNAL
  };
 diff --git a/src/vteinternal.hh b/src/vteinternal.hh
-index 7292c3332eb3..5ecb1cbf8e28 100644
+index cff2157cc0d0..31636f0bc56b 100644
 --- a/src/vteinternal.hh
 +++ b/src/vteinternal.hh
-@@ -511,6 +511,11 @@ public:
+@@ -493,6 +493,11 @@ public:
          gboolean m_cursor_moved_pending;
          gboolean m_contents_changed_pending;
  
@@ -174,16 +180,17 @@ index 7292c3332eb3..5ecb1cbf8e28 100644
          char* m_window_title;
          char* m_window_title_changed;
 diff --git a/src/vteseq-n.gperf b/src/vteseq-n.gperf
-index e58dd9475a22..2788d541d3ef 100644
+index f060c98200dd..b530e3194eac 100644
 --- a/src/vteseq-n.gperf
 +++ b/src/vteseq-n.gperf
-@@ -169,3 +169,4 @@ struct vteseq_n_struct {
+@@ -169,4 +169,5 @@ struct vteseq_n_struct {
  "set-current-directory-uri", VTE_SEQUENCE_HANDLER(vte_sequence_handler_set_current_directory_uri)
  "set-current-file-uri", VTE_SEQUENCE_HANDLER(vte_sequence_handler_set_current_file_uri)
  "urxvt-777", VTE_SEQUENCE_HANDLER(vte_sequence_handler_urxvt_777)
 +"send-notification", VTE_SEQUENCE_HANDLER(vte_sequence_handler_send_notification)
+ "iterm2-1337", VTE_SEQUENCE_HANDLER(vte_sequence_handler_iterm2_1337)
 diff --git a/src/vteseq.cc b/src/vteseq.cc
-index c83391c7dc0f..0152c1a55ecb 100644
+index 2330939d8068..53ade2e3d4ad 100644
 --- a/src/vteseq.cc
 +++ b/src/vteseq.cc
 @@ -2322,6 +2322,96 @@ vte_sequence_handler_return_terminal_id (VteTerminalPrivate *that, GValueArray *
@@ -284,13 +291,13 @@ index c83391c7dc0f..0152c1a55ecb 100644
  static void
  vte_sequence_handler_send_secondary_device_attributes (VteTerminalPrivate *that, GValueArray *params)
 -- 
-2.5.5
+2.7.4
 
 
-From 19455f3dadf2a8430aab1cfa11047c73b9033d2f Mon Sep 17 00:00:00 2001
+From 0779d12dc97b05959da0d73f34ad3e2907484224 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Thu, 29 Jan 2015 13:09:17 +0100
-Subject: [PATCH 2/5] vte.sh: Emit OSC 777 from PROMPT_COMMAND
+Subject: [PATCH 2/6] vte.sh: Emit OSC 777 from PROMPT_COMMAND
 
 https://bugzilla.gnome.org/show_bug.cgi?id=711059
 ---
@@ -315,23 +322,23 @@ index 2d211caa2f17..1c0543bd9d26 100644
  
  case "$TERM" in
 -- 
-2.5.5
+2.7.4
 
 
-From 4237ca5f7e6bf191c65231446af71d3d100d7acd Mon Sep 17 00:00:00 2001
+From cd48fc069c16f5128b21d3f0a4d24f53c4a12630 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Thu, 22 Jan 2015 16:37:10 +0100
-Subject: [PATCH 3/5] vteapp: Add a test for the notification-received signal
+Subject: [PATCH 3/6] vteapp: Add a test for the notification-received signal
 
 ---
  src/app.vala | 7 +++++++
  1 file changed, 7 insertions(+)
 
 diff --git a/src/app.vala b/src/app.vala
-index 275ae3a6eb25..a0a728786b5c 100644
+index 4fef74999693..0da18339ed58 100644
 --- a/src/app.vala
 +++ b/src/app.vala
-@@ -332,6 +332,8 @@ class Window : Gtk.ApplicationWindow
+@@ -316,6 +316,8 @@ class Window : Gtk.ApplicationWindow
      if (App.Options.object_notifications)
        terminal.notify.connect(notify_cb);
  
@@ -340,7 +347,7 @@ index 275ae3a6eb25..a0a728786b5c 100644
      /* Settings */
      if (App.Options.no_double_buffer)
        terminal.set_double_buffered(false);
-@@ -797,6 +799,11 @@ class Window : Gtk.ApplicationWindow
+@@ -779,6 +781,11 @@ class Window : Gtk.ApplicationWindow
      set_title(terminal.get_window_title());
    }
  
@@ -353,13 +360,49 @@ index 275ae3a6eb25..a0a728786b5c 100644
  
  class App : Gtk.Application
 -- 
-2.5.5
+2.7.4
+
+
+From c1d1f4f1b754169af1c64875ad76533775575072 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir@gnome.org>
+Date: Mon, 9 May 2016 12:48:46 +0200
+Subject: [PATCH 4/6] Fix the order of vfunc pointers in VteTerminalClass to
+ undo ABI break
+
+https://bugzilla.gnome.org/show_bug.cgi?id=711059
+---
+ src/vte/vteterminal.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h
+index efed7bf5dab8..f514c3b227f9 100644
+--- a/src/vte/vteterminal.h
++++ b/src/vte/vteterminal.h
+@@ -72,7 +72,6 @@ struct _VteTerminalClass {
+ 	void (*child_exited)(VteTerminal* terminal, int status);
+ 	void (*encoding_changed)(VteTerminal* terminal);
+ 	void (*char_size_changed)(VteTerminal* terminal, guint char_width, guint char_height);
+-	void (*notification_received)(VteTerminal* terminal, const gchar *summary, const gchar *body);
+ 	void (*window_title_changed)(VteTerminal* terminal);
+ 	void (*icon_title_changed)(VteTerminal* terminal);
+ 	void (*selection_changed)(VteTerminal* terminal);
+@@ -105,6 +104,8 @@ struct _VteTerminalClass {
+ 
+ 	void (*bell)(VteTerminal* terminal);
+ 
++	void (*notification_received)(VteTerminal* terminal, const gchar *summary, const gchar *body);
++
+         /* Padding for future expansion. */
+         gpointer padding[15];
+ 
+-- 
+2.7.4
 
 
-From d79520b1ce6497ec7538a866a700b715f6519c6d Mon Sep 17 00:00:00 2001
+From 2e4a7740e70f755fe5635262691f6c26f68b9e0b Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Fri, 13 May 2016 17:53:54 +0200
-Subject: [PATCH 4/5] Add a property to configure the scroll speed
+Subject: [PATCH 5/6] Add a property to configure the scroll speed
 
 By default, it is set to zero which gives the current behaviour of
 moving the buffer by a function of the number of visible rows.
@@ -387,10 +430,10 @@ index 56ae7754491d..58ce6c2c5c23 100644
  vte_terminal_set_font
  vte_terminal_get_font
 diff --git a/src/vte.cc b/src/vte.cc
-index bba5447af888..6194368ea5df 100644
+index 1c8cd2edc73e..20dc6fb82e88 100644
 --- a/src/vte.cc
 +++ b/src/vte.cc
-@@ -9857,6 +9857,7 @@ void
+@@ -9611,6 +9611,7 @@ void
  VteTerminalPrivate::widget_scroll(GdkEventScroll *event)
  {
  	gdouble delta_x, delta_y;
@@ -398,7 +441,7 @@ index bba5447af888..6194368ea5df 100644
  	gdouble v;
  	gint cnt, i;
  	int button;
-@@ -9910,7 +9911,13 @@ VteTerminalPrivate::widget_scroll(GdkEventScroll *event)
+@@ -9664,7 +9665,13 @@ VteTerminalPrivate::widget_scroll(GdkEventScroll *event)
  		return;
  	}
  
@@ -413,7 +456,7 @@ index bba5447af888..6194368ea5df 100644
  	_vte_debug_print(VTE_DEBUG_EVENTS,
  			"Scroll speed is %d lines per non-smooth scroll unit\n",
  			(int) v);
-@@ -10127,6 +10134,16 @@ VteTerminalPrivate::decscusr_cursor_shape()
+@@ -9881,6 +9888,16 @@ VteTerminalPrivate::decscusr_cursor_shape()
  }
  
  bool
@@ -446,7 +489,7 @@ index f514c3b227f9..89c267555cf9 100644
  _VTE_PUBLIC
  void vte_terminal_set_scrollback_lines(VteTerminal *terminal,
 diff --git a/src/vtegtk.cc b/src/vtegtk.cc
-index e394a3690f2e..953b76fe074f 100644
+index a65a2a98b44a..20d36449368c 100644
 --- a/src/vtegtk.cc
 +++ b/src/vtegtk.cc
 @@ -464,6 +464,9 @@ vte_terminal_get_property (GObject *object,
@@ -491,7 +534,7 @@ index e394a3690f2e..953b76fe074f 100644
           * VteTerminal:scrollback-lines:
           *
           * The length of the scrollback buffer used by the terminal.  The size of
-@@ -3462,6 +3483,30 @@ vte_terminal_get_row_count(VteTerminal *terminal)
+@@ -3448,6 +3469,30 @@ vte_terminal_get_row_count(VteTerminal *terminal)
  }
  
  /**
@@ -535,10 +578,10 @@ index f8a83525b18c..98c616f54de6 100644
          PROP_SCROLL_ON_KEYSTROKE,
          PROP_SCROLL_ON_OUTPUT,
 diff --git a/src/vteinternal.hh b/src/vteinternal.hh
-index 5ecb1cbf8e28..cfe39fc92301 100644
+index 31636f0bc56b..e38176cb3ff5 100644
 --- a/src/vteinternal.hh
 +++ b/src/vteinternal.hh
-@@ -402,6 +402,7 @@ public:
+@@ -385,6 +385,7 @@ public:
          gboolean m_scroll_on_output;
          gboolean m_scroll_on_keystroke;
          gboolean m_alternate_screen_scroll;
@@ -546,7 +589,7 @@ index 5ecb1cbf8e28..cfe39fc92301 100644
          vte::grid::row_t m_scrollback_lines;
  
          /* Restricted scrolling */
-@@ -1142,6 +1143,7 @@ public:
+@@ -1093,6 +1094,7 @@ public:
          bool set_mouse_autohide(bool autohide);
          bool set_pty(VtePty *pty);
          bool set_rewrap_on_resize(bool rewrap);
@@ -555,13 +598,13 @@ index 5ecb1cbf8e28..cfe39fc92301 100644
          bool set_scroll_on_keystroke(bool scroll);
          bool set_scroll_on_output(bool scroll);
 -- 
-2.5.5
+2.7.4
 
 
-From 2ea58047d01a58c9e4f18559dc23cb1ccd76dc48 Mon Sep 17 00:00:00 2001
+From 3b2d52fdc61b89e88e65e90f08965e903d2edc08 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Fri, 13 May 2016 17:54:57 +0200
-Subject: [PATCH 5/5] vteapp: Add a test for the scroll-speed property
+Subject: [PATCH 6/6] vteapp: Add a test for the scroll-speed property
 
 https://bugzilla.redhat.com/show_bug.cgi?id=1103380
 ---
@@ -569,10 +612,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1103380
  1 file changed, 4 insertions(+)
 
 diff --git a/src/app.vala b/src/app.vala
-index a0a728786b5c..3d0ab8b41513 100644
+index 0da18339ed58..de9d174570bd 100644
 --- a/src/app.vala
 +++ b/src/app.vala
-@@ -357,6 +357,7 @@ class Window : Gtk.ApplicationWindow
+@@ -341,6 +341,7 @@ class Window : Gtk.ApplicationWindow
      terminal.set_rewrap_on_resize(!App.Options.no_rewrap);
      terminal.set_scroll_on_output(false);
      terminal.set_scroll_on_keystroke(true);
@@ -580,7 +623,7 @@ index a0a728786b5c..3d0ab8b41513 100644
      terminal.set_scrollback_lines(App.Options.scrollback_lines);
  
      /* Style */
-@@ -872,6 +873,7 @@ class App : Gtk.Application
+@@ -854,6 +855,7 @@ class App : Gtk.Application
      public static bool object_notifications = false;
      public static string? output_filename = null;
      public static bool reverse = false;
@@ -588,7 +631,7 @@ index a0a728786b5c..3d0ab8b41513 100644
      public static int scrollback_lines = 512;
      public static int transparency_percent = 0;
      public static bool version = false;
-@@ -1063,6 +1065,8 @@ class App : Gtk.Application
+@@ -1045,6 +1047,8 @@ class App : Gtk.Application
          "Save terminal contents to file at exit", null },
        { "reverse", 0, 0, OptionArg.NONE, ref reverse,
          "Reverse foreground/background colors", null },
@@ -598,5 +641,5 @@ index a0a728786b5c..3d0ab8b41513 100644
          "Specify the number of scrollback-lines", null },
        { "transparent", 'T', 0, OptionArg.INT, ref transparency_percent,
 -- 
-2.5.5
+2.7.4