Re: gnome-terminal: FTBFS on kfreebsd & hurd archs

[Pino Toscano <pino@debian.org>]

tag 749888 + patch
thanks

Hi,

On 2014-05-31 15:43, Robert Millan wrote:
> Which makes me wonder: Does gnome-terminal actually work without
> gnome-shell?

It seems (just looking at the sources, I'm not a GNOME guy)
gnome-shell is needed to integrate gnome-terminal as search provider
for gnome-shell; OTOH the feature seems optional, and passing
--disable-search-provider indeed disables it.

Attached a first version of patch for it; the changes to control.in
and rules should be fine, while most probably the .install files
could need few tricks (since gnome-terminal-search-provider.ini is
not installed). GNOME team: if you could help on this, that would be
great.

Thanks,
--
Pino Toscano

--- a/debian/control.in
+++ b/debian/control.in
@@ -26,7 +26,7 @@ Build-Depends: cdbs (>= 0.4.41),
                desktop-file-utils,
                appdata-tools,
                gsettings-desktop-schemas-dev (>= 0.1.0),
-               gnome-shell,
+               gnome-shell [linux-any],
                libnautilus-extension-dev
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-terminal/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-terminal/
--- a/debian/rules
+++ b/debian/rules
@@ -9,10 +9,16 @@ include /usr/share/gnome-pkg-tools/1/rul
 include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-distro-packaging
 
+ifneq ($(DEB_HOST_ARCH_OS),linux)
+    DEB_CONFIGURE_EXTRA_FLAGS += --disable-search-provider
+endif
+
 build/gnome-terminal::
 	/usr/bin/docbook-to-man debian/gnome-terminal.sgml > debian/gnome-terminal.1
 
--- a/debian/gnome-terminal.install
+++ b/debian/gnome-terminal.install
@@ -5,6 +5,5 @@ usr/share/applications
 usr/share/dbus-1/services
 usr/share/glib-2.0/schemas
 usr/lib/nautilus/extensions-3.0/libterminal-nautilus.so
-usr/share/gnome-shell/search-providers/gnome-terminal-search-provider.ini
 
 debian/gnome-terminal.wrapper /usr/bin
--- /dev/null
+++ b/debian/gnome-terminal.install.linux
@@ -0,0 +1,10 @@
+usr/bin
+usr/lib/gnome-terminal
+usr/share/appdata
+usr/share/applications
+usr/share/dbus-1/services
+usr/share/glib-2.0/schemas
+usr/lib/nautilus/extensions-3.0/libterminal-nautilus.so
+usr/share/gnome-shell/search-providers/gnome-terminal-search-provider.ini
+
+debian/gnome-terminal.wrapper /usr/bin