Merge lp:~darkxst/gnome-terminal/shell-search into lp:~ubuntu-desktop/gnome-terminal/ubuntu

[Tim Lunn]

We want the gnome-shell search provider to be built. Rather than requiring a build-dep on gnome-shell, this adds a local copy of the org.gnome.ShellSearchProvider2.xml interface

[lp:~darkxst/gnome-terminal/shell-search]

130. By Iain Lane on 2014-11-04

Remove alternate_screen_scroll patch, the symbol in vte does nothing.

131. By Iain Lane on 2014-11-04

Migrate the transparency settings too

132. By Iain Lane on 2014-11-04

Update changelog

133. By Iain Lane on 2014-11-05

Migrate the "Default" profile by default & add more debugging

134. By Iain Lane on 2014-11-05

Add note

135. By Iain Lane on 2014-11-05

releasing package gnome-terminal version 3.12.2-0ubuntu1

136. By Tim Lunn on 2014-11-07

* Add gnome-shell_search_provider.patch: provide a local copy of the dbus
  interface so can build shell search provider without depending on
  gnome-shell which is in universe
* gnome-terminal-data.install: Install search provider

137. By Tim Lunn on 2014-11-07

add bug ref

=== modified file 'debian/changelog'
--- debian/changelog	2014-11-05 15:55:32 +0000
+++ debian/changelog	2014-11-07 21:04:57 +0000
@@ -1,3 +1,12 @@
+gnome-terminal (3.12.2-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Add gnome-shell_search_provider.patch: provide a local copy of the dbus
+    interface so can build shell search provider without depending on
+    gnome-shell which is in universe (LP: #1390224)
+  * gnome-terminal-data.install: Install search provider
+
+ -- Tim Lunn <[e-mail]>  Sat, 08 Nov 2014 07:53:55 +1100
+
 gnome-terminal (3.12.2-0ubuntu1) vivid; urgency=low
 
   [ Iain Lane ]

=== modified file 'debian/gnome-terminal-data.install'
--- debian/gnome-terminal-data.install	2013-05-23 16:41:13 +0000
+++ debian/gnome-terminal-data.install	2014-11-07 21:04:57 +0000
@@ -1,4 +1,4 @@
 usr/share/locale
 usr/share/help
-
+usr/share/gnome-shell/search-providers
 debian/gnome-terminal.xpm /usr/share/pixmaps

=== added file 'debian/patches/gnome-shell_search_provider.patch'
--- debian/patches/gnome-shell_search_provider.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/gnome-shell_search_provider.patch	2014-11-07 21:04:57 +0000
@@ -0,0 +1,137 @@
+From 8dc68ba1c6299fc9e334d85930a7b26c4a9a80d6 Mon Sep 17 00:00:00 2001
+From: Tim Lunn <[e-mail]>
+Date: Thu, 16 Oct 2014 09:56:46 +1100
+Subject: [PATCH] Provide a copy of Shell SearchProvider interface file, so we
+ can build shell search provider without build-dep on gnome-shell
+
+---
+ configure.ac                           |  3 --
+ src/Makefile.am                        |  2 +-
+ src/org.gnome.ShellSearchProvider2.xml | 87 ++++++++++++++++++++++++++++++++++
+ 3 files changed, 88 insertions(+), 4 deletions(-)
+ create mode 100644 src/org.gnome.ShellSearchProvider2.xml
+
+diff --git a/configure.ac b/configure.ac
+index 68e155a..7878988 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -184,9 +184,6 @@ AC_ARG_ENABLE([search-provider],
+ AC_MSG_RESULT([$enable_search_provider])
+ 
+ if test "$enable_search_provider" = "yes"; then
+-  AC_CHECK_FILE([$(eval echo $(eval echo $(eval echo ${dbusinterfacedir})))/org.gnome.ShellSearchProvider2.xml],[],
+-    [AC_MSG_ERROR([gnome-shell search provider requested but interface definition file not found])])
+-
+   AC_DEFINE([ENABLE_SEARCH_PROVIDER],[1],[Define to enable gnome-shell search provider])
+ fi
+ 
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 8050f06..4d7bfe6 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -327,7 +327,7 @@ gnome_terminal_server_SOURCES += \
+ 	terminal-search-provider.h \
+ 	$(NULL)
+ 
+-terminal-search-provider-gdbus-generated.c terminal-search-provider-gdbus-generated.h: $(dbusinterfacedir)/org.gnome.ShellSearchProvider2.xml Makefile
++terminal-search-provider-gdbus-generated.c terminal-search-provider-gdbus-generated.h: $(srcdir)/org.gnome.ShellSearchProvider2.xml Makefile
+ 	$(AM_V_GEN) $(GDBUS_CODEGEN) \
+ 			--interface-prefix=org.gnome.Shell \
+ 			--c-namespace=Terminal \
+diff --git a/src/org.gnome.ShellSearchProvider2.xml b/src/org.gnome.ShellSearchProvider2.xml
+new file mode 100644
+index 0000000..9502340
+--- /dev/null
++++ b/src/org.gnome.ShellSearchProvider2.xml
+@@ -0,0 +1,87 @@
++<!DOCTYPE node PUBLIC
++'-//freedesktop//DTD D-BUS Object Introspection 1.0//EN'
++'http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd'>
++<node>
++
++  <!--
++      org.gnome.Shell.SearchProvider2:
++      @short_description: Search provider interface
++
++      The interface used for integrating into GNOME Shell's search
++      interface (version 2).
++  -->
++  <interface name="org.gnome.Shell.SearchProvider2">
++
++    <!--
++        GetInitialResultSet:
++        @terms: Array of search terms, which the provider should treat as logical AND.
++        @results: An array of result identifier strings representing items which match the given search terms. Identifiers must be unique within the provider's domain, but other than that may be chosen freely by the provider.
++
++        Called when the user first begins a search.
++    -->
++    <method name="GetInitialResultSet">
++      <arg type="as" name="terms" direction="in" />
++      <arg type="as" name="results" direction="out" />
++    </method>
++
++    <!--
++        GetSubsearchResultSet:
++        @previous_results: Array of results previously returned by GetInitialResultSet().
++        @terms: Array of updated search terms, which the provider should treat as logical AND.
++        @results: An array of result identifier strings representing items which match the given search terms. Identifiers must be unique within the provider's domain, but other than that may be chosen freely by the provider.
++
++        Called when a search is performed which is a "subsearch" of
++        the previous search, e.g. the method may return less results, but
++        not more or different results.
++
++        This allows search providers to only search through the previous
++        result set, rather than possibly performing a full re-query.
++    -->
++    <method name="GetSubsearchResultSet">
++      <arg type="as" name="previous_results" direction="in" />
++      <arg type="as" name="terms" direction="in" />
++      <arg type="as" name="results" direction="out" />
++    </method>
++
++    <!--
++        GetResultMetas:
++        @identifiers: An array of result identifiers as returned by GetInitialResultSet() or GetSubsearchResultSet()
++        @metas: A dictionary describing the given search result, containing a human-readable 'name' (string), along with the result identifier this meta is for, 'id' (string). Optionally, 'icon' (a serialized GIcon as obtained by g_icon_serialize) can be specified if the result can be better served with a thumbnail of the content (such as with images). 'gicon' (a serialized GIcon as obtained by g_icon_to_string) or 'icon-data' (raw image data as (iiibiiay) - width, height, rowstride, has-alpha, bits per sample, channels, data) are deprecated values that can also be used for that purpose. A 'description' field (string) may also be specified if more context would help the user find the desired result.
++
++        Return an array of meta data used to display each given result
++    -->
++    <method name="GetResultMetas">
++      <arg type="as" name="identifiers" direction="in" />
++      <arg type="aa{sv}" name="metas" direction="out" />
++    </method>
++
++    <!--
++        ActivateResult:
++        @identifier: A result identifier as returned by GetInitialResultSet() or GetSubsearchResultSet()
++        @terms: Array of search terms, which the provider should treat as logical AND.
++        @timestamp: A timestamp of the user interaction that triggered this call
++
++        Called when the users chooses a given result. The result should
++        be displayed in the application associated with the corresponding
++        provider. The provided search terms can be used to allow launching a full search in
++        the application.
++    -->
++    <method name="ActivateResult">
++      <arg type="s" name="identifier" direction="in" />
++      <arg type="as" name="terms" direction="in" />
++      <arg type="u" name="timestamp" direction="in" />
++    </method>
++
++    <!--
++        LaunchSearch:
++        @terms: Array of search terms, which the provider should treat as logical AND.
++        @timestamp: A timestamp of the user interaction that triggered this call
++
++        Asks the search provider to launch a full search in the application for the provided terms.
++    -->
++    <method name="LaunchSearch">
++      <arg type="as" name="terms" direction="in" />
++      <arg type="u" name="timestamp" direction="in" />
++    </method>
++  </interface>
++</node>
+-- 
+2.1.0
+
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-11-04 12:48:22 +0000
+++ debian/patches/series	2014-11-07 21:04:57 +0000
@@ -6,3 +6,4 @@
 60_add_lp_handler.patch
 nautilus-x11.patch
 61_cwd_fallback.patch
+gnome-shell_search_provider.patch

=== modified file 'debian/rules'
--- debian/rules	2014-05-16 11:54:11 +0000
+++ debian/rules	2014-11-07 21:04:57 +0000
@@ -11,7 +11,7 @@
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-distro-packaging --disable-search-provider
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-distro-packaging --enable-search-provider
 
 build/gnome-terminal::
 	/usr/bin/docbook-to-man debian/gnome-terminal.sgml > debian/gnome-terminal.1