summaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-09-02 14:37:23 +0200
committerCaolán McNamara <caolanm@redhat.com>2015-09-03 08:18:03 +0000
commit72699595aaa3ecb8975050b6dfc6fde437770493 (patch)
tree11f1d8416f7d5e7fec2dc0c1cb4f196ea0a290fc /shell
parentd465e8273f1ee54450f0bf59c41bda93c54b3db4 (diff)
remove KDE3 support, --enable-kde and --enable-kdeab
With the new RHEL6-era baseline TDF can finally ship KDE4 support. Change-Id: I227278b576a3ed2f2aaa751d41b469ca92dc78b3 Reviewed-on: https://gerrit.libreoffice.org/18267 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'shell')
-rw-r--r--shell/Library_kdebe.mk36
-rw-r--r--shell/Module_shell.mk11
-rw-r--r--shell/Package_scripts_kde.mk4
-rw-r--r--shell/source/backends/kdebe/kdebe1.component25
-rwxr-xr-xshell/source/unix/misc/kde-open-url.sh25
5 files changed, 0 insertions, 101 deletions
diff --git a/shell/Library_kdebe.mk b/shell/Library_kdebe.mk
deleted file mode 100644
index edd5f3ae967a..000000000000
--- a/shell/Library_kdebe.mk
+++ /dev/null
@@ -1,36 +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_Library_Library,kdebe1))
-
-$(eval $(call gb_Library_add_libs,kdebe1,\
- -lkio \
-))
-
-$(eval $(call gb_Library_use_sdk_api,kdebe1))
-
-$(eval $(call gb_Library_use_externals,kdebe1,\
- boost_headers \
- kde \
-))
-
-$(eval $(call gb_Library_use_libraries,kdebe1,\
- cppu \
- cppuhelper \
- sal \
-))
-
-$(eval $(call gb_Library_set_componentfile,kdebe1,shell/source/backends/kdebe/kdebe1))
-
-$(eval $(call gb_Library_add_exception_objects,kdebe1,\
- shell/source/backends/kdebe/kdeaccess \
- shell/source/backends/kdebe/kdebackend \
-))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index de906accd710..3659c51c9aef 100644
--- a/shell/Module_shell.mk
+++ b/shell/Module_shell.mk
@@ -42,23 +42,12 @@ $(eval $(call gb_Module_add_targets,shell,\
))
endif
-ifeq ($(ENABLE_KDE),TRUE)
-$(eval $(call gb_Module_add_targets,shell,\
- Library_kdebe \
-))
-endif
-
ifeq ($(ENABLE_TDE),TRUE)
$(eval $(call gb_Module_add_targets,shell,\
Library_tdebe \
))
endif
-ifneq ($(filter TRUE,$(ENABLE_KDE) $(ENABLE_TDE)),)
-$(eval $(call gb_Module_add_targets,shell,\
-))
-endif
-
ifeq ($(OS),WNT)
$(eval $(call gb_Module_add_targets,shell,\
diff --git a/shell/Package_scripts_kde.mk b/shell/Package_scripts_kde.mk
index 162bcc59ae7f..b9168d63c0e0 100644
--- a/shell/Package_scripts_kde.mk
+++ b/shell/Package_scripts_kde.mk
@@ -9,10 +9,6 @@
$(eval $(call gb_Package_Package,shell_scripts_kde,$(SRCDIR)/shell/source/unix/misc))
-ifeq ($(ENABLE_KDE),TRUE)
-$(eval $(call gb_Package_add_file,shell_scripts_kde,$(LIBO_BIN_FOLDER)/kde-open-url,kde-open-url.sh))
-endif
-
ifeq ($(ENABLE_KDE4),TRUE)
$(eval $(call gb_Package_add_file,shell_scripts_kde,$(LIBO_BIN_FOLDER)/kde4-open-url,kde4-open-url.sh))
endif
diff --git a/shell/source/backends/kdebe/kdebe1.component b/shell/source/backends/kdebe/kdebe1.component
deleted file mode 100644
index f2c2bc5c4972..000000000000
--- a/shell/source/backends/kdebe/kdebe1.component
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-
-<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
- prefix="kdebe1" xmlns="http://openoffice.org/2010/uno-components">
- <implementation name="com.sun.star.comp.configuration.backend.KDEBackend">
- <service name="com.sun.star.configuration.backend.KDEBackend"/>
- </implementation>
-</component>
diff --git a/shell/source/unix/misc/kde-open-url.sh b/shell/source/unix/misc/kde-open-url.sh
deleted file mode 100755
index b0eac27963df..000000000000
--- a/shell/source/unix/misc/kde-open-url.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# 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/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-# special handling for mailto: uris
-if echo $1 | grep '^mailto:' > /dev/null; then
- kmailservice "$1" &
-else
- kfmclient openURL "$1" &
-fi