mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove gnome-open support

Browse Source 
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@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
This commit is contained in:
Bryan Quigley
2015-12-02 00:02:59 -05:00
committed by Michael Stahl
parent b7842c93dc
commit eaa7f30102
7 changed files with 0 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scp2/source/ooo/file_ooo.scp
View File

@@ -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;

1
shell/Module_shell.mk
View File

@@ -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 \
))

14
shell/Package_scripts_gnome.mk
View File

@@ -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:

4
shell/source/unix/misc/gnome-open-url.sh
View File

@@ -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

2
shell/source/unix/misc/senddoc.sh
View File

@@ -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

1
sysui/desktop/apparmor/program.senddoc
View File

@@ -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,

1
sysui/desktop/apparmor/program.soffice.bin
View File

@@ -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,