[Libreoffice-commits] core.git: scp2/source shell/Module_shell.mk shell/Package_scripts_gnome.mk shell/source sysui/desktop

[Bryan Quigley]

 scp2/source/ooo/file_ooo.scp               |    7 -------
 shell/Module_shell.mk                      |    1 -
 shell/Package_scripts_gnome.mk             |   14 --------------
 shell/source/unix/misc/gnome-open-url.sh   |    4 ----
 shell/source/unix/misc/senddoc.sh          |    2 --
 sysui/desktop/apparmor/program.senddoc     |    1 -
 sysui/desktop/apparmor/program.soffice.bin |    1 -
 7 files changed, 30 deletions(-)

New commits:
commit eaa7f30102df4df01171e5daf83cdddae1bb0cda
Author: Bryan Quigley <gquigs at gmail.com>
Date:   Wed Dec 2 00:02:59 2015 -0500

    Remove gnome-open support
    
    Gnome-open has been deprecate for some time.  xdg-open replaces it.
    
    Change-Id: I7fc0f32a1f2fbadbe3d1cee58d0089213665c3a5
    Reviewed-on: https://gerrit.libreoffice.org/20347
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 9dc5038..ad78407 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -61,13 +61,6 @@ End
 
 #if defined UNX && ! defined MACOSX && ! defined LIBO_HEADLESS
 
-File gid_File_Bin_Gnome_Open_Url
-    BIN_FILE_BODY;
-    Dir = FILELIST_DIR;
-    Name = "shell_scripts_gnome.filelist";
-    Styles = (FILELIST, PACKED);
-End
-
 File gid_File_shell_scripts
     BIN_FILE_BODY;
     Dir = FILELIST_DIR;
diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index 44d0a61..d0a3318 100644
--- a/shell/Module_shell.mk
+++ b/shell/Module_shell.mk
@@ -106,7 +106,6 @@ ifeq ($(USING_X11),TRUE)
 $(eval $(call gb_Module_add_targets,shell,\
 	Library_recentfile \
 	Package_scripts \
-	Package_scripts_gnome \
 	Package_scripts_kde \
 	Package_scripts_tde \
 ))
diff --git a/shell/Package_scripts_gnome.mk b/shell/Package_scripts_gnome.mk
deleted file mode 100644
index 794ed87..0000000
--- a/shell/Package_scripts_gnome.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,shell_scripts_gnome,$(SRCDIR)/shell/source/unix/misc))
-
-$(eval $(call gb_Package_add_file,shell_scripts_gnome,$(LIBO_BIN_FOLDER)/gnome-open-url,gnome-open-url.sh))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/shell/source/unix/misc/gnome-open-url.sh b/shell/source/unix/misc/gnome-open-url.sh
deleted file mode 100755
index bffe6f2..0000000
--- a/shell/source/unix/misc/gnome-open-url.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# use xdg-open or gnome-open if available, falling back to our own open-url
-xdg-open "$1" 2>/dev/null || gnome-open "$1" 2>/dev/null || `dirname "$0"`/open-url "$1" 2>/dev/null
diff --git a/shell/source/unix/misc/senddoc.sh b/shell/source/unix/misc/senddoc.sh
index a642546..169af25 100755
--- a/shell/source/unix/misc/senddoc.sh
+++ b/shell/source/unix/misc/senddoc.sh
@@ -389,8 +389,6 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
             MAILER=${DESKTOP_LAUNCH}
         elif [ -n "$KDE_FULL_SESSION" -a -x /usr/bin/kde-open ] ; then
             MAILER=/usr/bin/kde-open
-        elif [ -n "$GNOME_DESKTOP_SESSION_ID" -a -x /usr/bin/gnome-open ] ; then
-            MAILER=/usr/bin/gnome-open
         elif [ -x /usr/bin/xdg-open ] ; then
             MAILER=/usr/bin/xdg-open
         else
diff --git a/sysui/desktop/apparmor/program.senddoc b/sysui/desktop/apparmor/program.senddoc
index deb1fff..f258114 100644
--- a/sysui/desktop/apparmor/program.senddoc
+++ b/sysui/desktop/apparmor/program.senddoc
@@ -26,7 +26,6 @@ profile libreoffice-senddoc INSTDIR-/usr/lib{,32,64}/libreoffice/program/senddoc
   /bin/grep             rmix,
   /bin/uname            rmix,
   /usr/bin/xdg-open     Cxr -> sanitized_helper,
-  /usr/bin/gnome-open   Cxr -> sanitized_helper,
   /dev/null             rw,
   INSTDIR-program/uri-encode rmPUx,
   /usr/share/libreoffice/share/config/* r,
diff --git a/sysui/desktop/apparmor/program.soffice.bin b/sysui/desktop/apparmor/program.soffice.bin
index c74fcc6..bbb0100 100644
--- a/sysui/desktop/apparmor/program.soffice.bin
+++ b/sysui/desktop/apparmor/program.soffice.bin
@@ -122,7 +122,6 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
   /usr/lib{,32,64}/jvm/**                       r,
   INSTDIR-**                        ra,
   INSTDIR-**.so                     rm,
-  INSTDIR-program/gnome-open-url    rmPUx,  #This doesn't seem to be used on my install
   INSTDIR-program/soffice.bin       rmix,
   INSTDIR-program/xpdfimport        rPx,
   INSTDIR-program/open-url          rPx,