[Libreoffice-commits] core.git: bin/distro-install-file-lists config_host/config_vclplug.h.in config_host.mk.in configure.ac connectivity/Configuration_kab.mk connectivity/Library_kab1.mk connectivity/Library_kabdrv1.mk connectivity/Module_connectivity.mk connectivity/registry connectivity/source cui/Library_cui.mk cui/source desktop/Pagein_common.mk distro-configs/LibreOfficeLinux.conf distro-configs/OxygenOfficeLinux.conf postprocess/CustomTarget_registry.mk postprocess/Rdb_services.mk RepositoryExternal.mk Repository.mk scp2/InstallModule_ooo.mk scp2/InstallScript_setup_osl.mk scp2/Module_scp2.mk shell/Library_kdebe.mk shell/Module_shell.mk shell/Package_scripts_kde.mk shell/source solenv/gbuild sysui/CustomTarget_share.mk vcl/CustomTarget_kde_moc.mk vcl/Executable_kdefilepicker.mk vcl/Library_vclplug_kde.mk vcl/Module_vcl.mk vcl/unx
Michael Stahl
mstahl at redhat.com
Thu Sep 3 01:18:24 PDT 2015
Repository.mk | 10
RepositoryExternal.mk | 32 -
bin/distro-install-file-lists | 12
config_host.mk.in | 4
config_host/config_vclplug.h.in | 1
configure.ac | 196 ----------
connectivity/Configuration_kab.mk | 20 -
connectivity/Library_kab1.mk | 43 --
connectivity/Library_kabdrv1.mk | 56 --
connectivity/Module_connectivity.mk | 8
connectivity/registry/kab/org/openoffice/Office/DataAccess/Drivers.xcu | 37 -
connectivity/source/drivers/kab/kab1.component | 25 -
cui/Library_cui.mk | 1
cui/source/options/optgdlg.cxx | 8
desktop/Pagein_common.mk | 1
distro-configs/LibreOfficeLinux.conf | 1
distro-configs/OxygenOfficeLinux.conf | 1
postprocess/CustomTarget_registry.mk | 4
postprocess/Rdb_services.mk | 6
scp2/InstallModule_ooo.mk | 1
scp2/InstallScript_setup_osl.mk | 2
scp2/Module_scp2.mk | 2
shell/Library_kdebe.mk | 36 -
shell/Module_shell.mk | 11
shell/Package_scripts_kde.mk | 4
shell/source/backends/kdebe/kdebe1.component | 25 -
shell/source/unix/misc/kde-open-url.sh | 25 -
solenv/gbuild/CppunitTest.mk | 1
sysui/CustomTarget_share.mk | 2
vcl/CustomTarget_kde_moc.mk | 21 -
vcl/Executable_kdefilepicker.mk | 42 --
vcl/Library_vclplug_kde.mk | 81 ----
vcl/Module_vcl.mk | 7
vcl/unx/generic/plugadapt/salplug.cxx | 12
34 files changed, 5 insertions(+), 733 deletions(-)
New commits:
commit 72699595aaa3ecb8975050b6dfc6fde437770493
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Sep 2 14:37:23 2015 +0200
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 at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/Repository.mk b/Repository.mk
index 07336f7..9a7c31d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -251,20 +251,12 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,gnome, \
))
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,kde, \
- $(if $(ENABLE_KDE),kdebe1) \
$(if $(ENABLE_KDE4),kde4be1) \
$(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \
- $(if $(ENABLE_KDE),vclplug_kde) \
$(if $(ENABLE_KDE4),vclplug_kde4) \
) \
))
-$(eval $(call gb_Helper_register_executables_for_install,OOO,kde, \
- $(if $(filter $(GUIBASE)$(ENABLE_KDE),unxTRUE), \
- kdefilepicker \
- ) \
-))
-
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,math, \
sm \
smd \
@@ -363,8 +355,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
itg \
iti \
$(if $(ENABLE_JAVA),jdbc) \
- $(if $(ENABLE_KAB),kab1) \
- $(if $(ENABLE_KAB),kabdrv1) \
ldapbe2 \
localebe1 \
log \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f5e6cef..781c800 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3010,38 +3010,6 @@ endef
endif # WITH_MOZAB4WIN
-ifeq ($(ENABLE_KDE),TRUE)
-
-define gb_LinkTarget__use_kde
-$(call gb_LinkTarget_set_include,$(1),\
- $(subst -isystem/,-isystem /,$(filter -I% -isystem%,$(subst -isystem /,-isystem/,$(KDE_CFLAGS)))) \
- $$(INCLUDE) \
-)
-
-$(call gb_LinkTarget_add_defs,$(1),\
- $(filter-out -I% -isystem%,$(subst -isystem /,-isystem/,$(KDE_CFLAGS))) \
-)
-
-$(call gb_LinkTarget_add_libs,$(1),\
- $(KDE_LIBS) \
-)
-
-ifeq ($(COM),GCC)
-$(call gb_LinkTarget_add_cxxflags,$(1),\
- -Wno-shadow \
-)
-endif
-
-endef
-
-else # !ENABLE_KDE
-
-define gb_LinkTarget__use_kde
-
-endef
-
-endif # ENABLE_KDE
-
ifeq ($(ENABLE_KDE4),TRUE)
diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists
index f011c0c..988e8f0 100755
--- a/bin/distro-install-file-lists
+++ b/bin/distro-install-file-lists
@@ -226,15 +226,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
mv_file_between_flists tde_list.txt common_list.txt $INSTALLDIR/program/libtdeabdrv1l..so
add_used_directories tde_list.txt common_list.txt
- # kde subpackage
- test -f $DESTDIR/gid_Module_Optional_Kde && cp $DESTDIR/gid_Module_Optional_Kde kde_list.txt || :
- mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/kdefilepicker
- mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/fps_kdelo.so
- mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/libvclplug_kdel..so
- mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/libkab1l..so
- mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/libkabdrv1l..so
- add_used_directories kde_list.txt common_list.txt
-
# create kde4 subpackage
mv_file_between_flists kde4_list.txt kde_list.txt $INSTALLDIR/program/kde4be1lo.so
mv_file_between_flists kde4_list.txt common_list.txt $INSTALLDIR/program/libvclplug_kde4l..so
@@ -421,7 +412,6 @@ else
create_package_directory gid_Module_Pyuno pkg/python-uno
create_package_directory gid_Module_Optional_Gnome pkg/libreoffice-gnome
create_package_directory gid_Module_Optional_Tde pkg/libreoffice-tde
- create_package_directory gid_Module_Optional_Kde pkg/libreoffice-kde
create_package_directory gid_Module_Root_Files_2 pkg/libreoffice-common
create_package_directory gid_Module_Root_Files_3 pkg/libreoffice-common
@@ -493,7 +483,7 @@ else
fi &&
( cd pkg/libreoffice-common/$d
find -maxdepth 1 \
- -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|tdefilepicker\|kdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|uri-encode\)' \
+ -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|tdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|uri-encode\)' \
-exec mv {} $DESTDIR/pkg/libreoffice-core/$d \;
); \
done
diff --git a/config_host.mk.in b/config_host.mk.in
index 7d3cc12..a88bdae 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -147,9 +147,7 @@ export ENABLE_GTK=@ENABLE_GTK@
export ENABLE_GTK_PRINT=@ENABLE_GTK_PRINT@
export ENABLE_HEADLESS=@ENABLE_HEADLESS@
export ENABLE_JAVA=@ENABLE_JAVA@
-export ENABLE_KAB=@ENABLE_KAB@
export ENABLE_KDE4=@ENABLE_KDE4@
-export ENABLE_KDE=@ENABLE_KDE@
export ENABLE_LIBLANGTAG=@ENABLE_LIBLANGTAG@
export ENABLE_LOCKDOWN=@ENABLE_LOCKDOWN@
export ENABLE_LPSOLVE=@ENABLE_LPSOLVE@
@@ -312,11 +310,9 @@ export JITC_PROCESSOR_TYPE=@JITC_PROCESSOR_TYPE@
export JVM_ONE_PATH_CHECK=@JVM_ONE_PATH_CHECK@
export KDE4_CFLAGS=$(gb_SPACE)@KDE4_CFLAGS@
export KDE4_LIBS=$(gb_SPACE)@KDE4_LIBS@
-export KDE_CFLAGS=$(gb_SPACE)@KDE_CFLAGS@
export KDE_GLIB_CFLAGS=$(gb_SPACE)@KDE_GLIB_CFLAGS@
export KDE_GLIB_LIBS=$(gb_SPACE)@KDE_GLIB_LIBS@
export KDE_HAVE_GLIB=@KDE_HAVE_GLIB@
-export KDE_LIBS=$(gb_SPACE)@KDE_LIBS@
export KRB5_LIBS=@KRB5_LIBS@
export LCMS2_CFLAGS=$(gb_SPACE)@LCMS2_CFLAGS@
export LCMS2_LIBS=$(gb_SPACE)@LCMS2_LIBS@
diff --git a/config_host/config_vclplug.h.in b/config_host/config_vclplug.h.in
index b9ee530..ae17474 100644
--- a/config_host/config_vclplug.h.in
+++ b/config_host/config_vclplug.h.in
@@ -8,7 +8,6 @@ Settings about which X11 desktops have support enabled.
#define CONFIG_VCLPLUG_H
#define ENABLE_GTK 0
-#define ENABLE_KDE 0
#define ENABLE_KDE4 0
#define ENABLE_TDE 0
#define ENABLE_GIO 0
diff --git a/configure.ac b/configure.ac
index 8d832f1c..65a313a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -586,7 +586,6 @@ solaris*)
build_gstreamer_1_0=yes
build_gstreamer_0_10=yes
test_tde=yes
- test_kde=yes
test_freetype=yes
_os=SunOS
@@ -615,7 +614,6 @@ linux-gnu*|k*bsd*-gnu*)
build_gstreamer_1_0=yes
build_gstreamer_0_10=yes
test_tde=yes
- test_kde=yes
test_kde4=yes
test_freetype=yes
_os=Linux
@@ -712,7 +710,6 @@ freebsd*)
build_gstreamer_1_0=yes
build_gstreamer_0_10=yes
test_tde=yes
- test_kde=yes
test_kde4=yes
test_freetype=yes
AC_MSG_CHECKING([the FreeBSD operating system release])
@@ -742,7 +739,6 @@ freebsd*)
build_gstreamer_1_0=yes
build_gstreamer_0_10=yes
test_tde=no
- test_kde=no
test_kde4=yes
test_freetype=yes
PTHREAD_LIBS="-pthread -lpthread"
@@ -759,7 +755,6 @@ aix*)
openbsd*)
test_gtk=yes
test_tde=yes
- test_kde=yes
test_freetype=yes
PTHREAD_CFLAGS="-D_THREAD_SAFE"
PTHREAD_LIBS="-pthread"
@@ -771,7 +766,6 @@ dragonfly*)
build_gstreamer_1_0=yes
build_gstreamer_0_10=yes
test_tde=yes
- test_kde=yes
test_kde4=yes
test_freetype=yes
PTHREAD_LIBS="-pthread"
@@ -793,7 +787,6 @@ linux-android*)
test_freetype=no
test_gtk=no
test_tde=no
- test_kde=no
test_kde4=no
test_randr=no
test_xrender=no
@@ -1191,26 +1184,10 @@ AC_ARG_ENABLE(tdeab,
fi
)
-AC_ARG_ENABLE(kde,
- AS_HELP_STRING([--enable-kde],
- [Determines whether to use Qt3/KDE3 vclplug on platforms where Qt3 and
- KDE3 are available.]),
-,)
-
-AC_ARG_ENABLE(kdeab,
- AS_HELP_STRING([--disable-kdeab],
- [Disable the KDE3 address book support.]),
-,
- if test "$enable_kde" = "yes"; then
- enable_kdeab=yes
- fi
-)
-
AC_ARG_ENABLE(kde4,
AS_HELP_STRING([--enable-kde4],
[Determines whether to use Qt4/KDE4 vclplug on platforms where Qt4 and
- KDE4 are available. May be used with --enable-kde if you want to support
- both KDE3 and KDE4.]),
+ KDE4 are available.]),
,)
AC_ARG_ENABLE(randr,
@@ -4707,7 +4684,6 @@ if test "$with_x" = "no"; then
build_gstreamer_1_0=no
build_gstreamer_0_10=no
test_tde=no
- test_kde=no
test_kde4=no
enable_cairo_canvas=no
enable_gnome_vfs=no
@@ -10004,25 +9980,12 @@ AC_SUBST(ENABLE_GTK)
ENABLE_TDE=""
if test "x$enable_tde" = "xyes"; then
- # Libs kab and tdeab in connectivity and kdeab and tdeab in shell
- # are built from the same sources. So we only allow one of them.
- if test "x$enable_kde" = "xyes"; then
- AC_MSG_ERROR([enabling both KDE and TDE is not supported])
- fi
ENABLE_TDE="TRUE"
AC_DEFINE(ENABLE_TDE)
R="$R tde"
fi
AC_SUBST(ENABLE_TDE)
-ENABLE_KDE=""
-if test "x$enable_kde" = "xyes"; then
- ENABLE_KDE="TRUE"
- AC_DEFINE(ENABLE_KDE)
- R="$R kde"
-fi
-AC_SUBST(ENABLE_KDE)
-
ENABLE_KDE4=""
if test "x$enable_kde4" = "xyes"; then
ENABLE_KDE4="TRUE"
@@ -11062,136 +11025,6 @@ AC_SUBST(TDE_LIBS)
AC_SUBST(MOC)
dnl ===================================================================
-dnl Check whether the Qt3 and KDE3 libraries are available.
-dnl ===================================================================
-
-KDE_CFLAGS=""
-KDE_LIBS=""
-if test "$_os" != "OpenBSD"; then
- MOC="moc"
-fi
-if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE"; then
- dnl Search paths for Qt3 and KDE3
- if test -z "$supports_multilib"; then
- qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include /usr/local/include/X11/qt3 $x_includes"
- qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib /usr/local/lib/qt3 $x_libraries"
- else
- qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib64/qt3/include /usr/lib64/qt/include /usr/share/qt3/include /usr/lib/qt3/include /usr/lib/qt/include /usr/local/include/X11/qt3 $x_includes"
- qt_libdirs="$QTLIB /usr/local/qt/lib64 /usr/lib64/qt /usr/lib64 /usr/X11R6/lib64/X11/qt /usr/X11R6/lib64/qt /usr/lib64/qt3/lib64 /usr/lib64/qt/lib64 /usr/share/qt3/lib64 /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib /usr/local/lib/qt3 $x_libraries"
- fi
- if test -n "$QTDIR"; then
- qt_incdirs="$QTDIR/include $qt_incdirs"
- if test -z "$supports_multilib"; then
- qt_libdirs="$QTDIR/lib $qt_libdirs"
- else
- qt_libdirs="$QTDIR/lib64 $QTDIR/lib $qt_libdirs"
- fi
- fi
- if test -z "$supports_multilib"; then
- kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /opt/kde3/include /opt/kde/include $x_includes"
- kde_libdirs="/usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib /usr/lib $x_libraries"
- else
- kde_incdirs="/usr/lib64/kde/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /opt/kde3/include /opt/kde/include $x_includes"
- kde_libdirs="/usr/lib64/kde/lib64 /usr/local/kde/lib64 /usr/kde/lib64 /usr/lib64/kde /usr/lib64/kde3 /usr/X11R6/lib64 /usr/local/lib64 /opt/kde3/lib64 /opt/kde/lib64 /usr/X11R6/kde/lib64 /usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib /usr/lib64 $x_libraries"
- fi
- if test -n "$KDEDIR"; then
- kde_incdirs="$KDEDIR/include $kde_incdirs"
- if test -z "$supports_multilib"; then
- kde_libdirs="$KDEDIR/lib $kde_libdirs"
- else
- kde_libdirs="$KDEDIR/lib64 $KDEDIR/lib $kde_libdirs"
- fi
- fi
-
- dnl What to test
- qt_test_include="qstyle.h"
- kde_test_include="kapp.h"
-
- if test "$_os" != "OpenBSD"; then
- qt_test_library="libqt-mt.so"
- kde_test_library="libDCOP.so"
- else
- qt_test_library="libqt-mt.so*"
- kde_test_library="libDCOP.so*"
- fi
-
- dnl Check for Qt3 headers
- AC_MSG_CHECKING([for Qt3 headers])
- qt_incdir="no"
- for kde_check in $qt_incdirs; do
- if test -r "$kde_check/$qt_test_include"; then
- qt_incdir="$kde_check"
- break
- fi
- done
- AC_MSG_RESULT([$qt_incdir])
- if test "x$qt_incdir" = "xno"; then
- AC_MSG_ERROR([Qt3 headers not found. Please specify the root of
-your Qt3 installation by exporting QTDIR before running "configure".])
- fi
-
- dnl Check for Qt3 libraries
- AC_MSG_CHECKING([for Qt3 libraries])
- qt_libdir="no"
- for qt_check in $qt_libdirs; do
- if test -r "`ls $qt_check/$qt_test_library 2>/dev/null | head -1`"; then
- qt_libdir="$qt_check"
- break
- fi
- done
- AC_MSG_RESULT([$qt_libdir])
- if test "x$qt_libdir" = "xno"; then
- AC_MSG_ERROR([Qt3 libraries not found. Please specify the root of
-your Qt3 installation by exporting QTDIR before running "configure".])
- fi
-
- dnl Check for Meta Object Compiler
- AC_PATH_PROG( MOC, moc, no, [`dirname $qt_libdir`/bin:$QTDIR/bin:$PATH] )
- if test "$MOC" = "no"; then
- AC_MSG_ERROR([Qt3 Meta Object Compiler not found. Please specify
-the root of your Qt3 installation by exporting QTDIR before running "configure".])
- fi
-
- dnl Check for KDE3 headers
- AC_MSG_CHECKING([for KDE3 headers])
- kde_incdir="no"
- for kde_check in $kde_incdirs; do
- if test -r "$kde_check/$kde_test_include"; then
- kde_incdir="$kde_check"
- break
- fi
- done
- AC_MSG_RESULT([$kde_incdir])
- if test "x$kde_incdir" = "xno"; then
- AC_MSG_ERROR([KDE3 headers not found. Please specify the root of
-your KDE3 installation by exporting KDEDIR before running "configure".])
- fi
-
- dnl Check for KDE3 libraries
- AC_MSG_CHECKING([for KDE3 libraries])
- kde_libdir="no"
- for kde_check in $kde_libdirs; do
- if test -r "`ls $kde_check/$kde_test_library 2>/dev/null | head -1`"; then
- kde_libdir="$kde_check"
- break
- fi
- done
- AC_MSG_RESULT([$kde_libdir])
- if test "x$kde_libdir" = "xno"; then
- AC_MSG_ERROR([KDE3 libraries not found. Please specify the root of
-your KDE3 installation by exporting KDEDIR before running "configure".])
- fi
-
- dnl Set the variables
- KDE_CFLAGS="-I$qt_incdir -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
- KDE_LIBS="-L$kde_libdir -L$qt_libdir -lkdeui -lkdecore -lqt-mt"
- KDE_CFLAGS=$(printf '%s' "$KDE_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
-fi
-AC_SUBST(KDE_CFLAGS)
-AC_SUBST(KDE_LIBS)
-AC_SUBST(MOC)
-
-dnl ===================================================================
dnl KDE4 Integration
dnl ===================================================================
@@ -11521,33 +11354,6 @@ fi
AC_SUBST(ENABLE_TDEAB)
dnl ===================================================================
-dnl Test whether to include KDE AB support
-dnl ===================================================================
-AC_MSG_CHECKING([whether to enable KDE address book support])
-if test "$enable_kdeab" = "yes" -a "$enable_kde" = "yes"; then
- AC_MSG_RESULT([yes])
- AC_LANG_PUSH([C++])
- save_CXXFLAGS=$CXXFLAGS
- CXXFLAGS="$CXXFLAGS $KDE_CFLAGS"
- AC_MSG_CHECKING([whether KDE is between 3.2 and 3.6])
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
-#include <kdeversion.h>
-
-int main(int argc, char **argv) {
- if (KDE_VERSION_MAJOR == 3 && 2 <= KDE_VERSION_MINOR && KDE_VERSION_MINOR <= 6) return 0;
- else return 1;
-}
- ]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([KDE version too old or too recent, please use another version of KDE or disable KDE address book support])],[])
- CXXFLAGS=$save_CXXFLAGS
- AC_LANG_POP([C++])
- ENABLE_KAB=TRUE
-else
- AC_MSG_RESULT([no])
- ENABLE_KAB=
-fi
-AC_SUBST(ENABLE_KAB)
-
-dnl ===================================================================
dnl Test which themes to include
dnl ===================================================================
AC_MSG_CHECKING([which themes to include])
diff --git a/connectivity/Configuration_kab.mk b/connectivity/Configuration_kab.mk
deleted file mode 100644
index 1f04d68..0000000
--- a/connectivity/Configuration_kab.mk
+++ /dev/null
@@ -1,20 +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_Configuration_Configuration,driver_kab))
-
-$(eval $(call gb_Configuration_add_spool_modules,driver_kab,connectivity/registry/kab,\
- org/openoffice/Office/DataAccess/Drivers-kab.xcu \
-))
-
-$(eval $(call gb_Configuration_add_localized_datas,driver_kab,connectivity/registry/kab,\
- org/openoffice/Office/DataAccess/Drivers.xcu \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Library_kab1.mk b/connectivity/Library_kab1.mk
deleted file mode 100644
index 4a301b6..0000000
--- a/connectivity/Library_kab1.mk
+++ /dev/null
@@ -1,43 +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,kab1))
-
-$(eval $(call gb_Library_use_externals,kab1, \
- boost_headers \
- kde \
-))
-
-$(eval $(call gb_Library_set_componentfile,kab1,connectivity/source/drivers/kab/kab1))
-
-$(eval $(call gb_Library_use_sdk_api,kab1))
-
-$(eval $(call gb_Library_set_include,kab1,\
- -I$(SRCDIR)/connectivity/source/inc \
- $$(INCLUDE) \
- -I$(WORKDIR)/YaccTarget/connectivity/source/parse \
-))
-
-$(eval $(call gb_Library_use_libraries,kab1,\
- comphelper \
- cppu \
- cppuhelper \
- dbtools \
- sal \
- salhelper \
- tl \
-))
-
-$(eval $(call gb_Library_add_exception_objects,kab1,\
- connectivity/source/drivers/kab/KDriver \
- connectivity/source/drivers/kab/KServices \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Library_kabdrv1.mk b/connectivity/Library_kabdrv1.mk
deleted file mode 100644
index dee91e3..0000000
--- a/connectivity/Library_kabdrv1.mk
+++ /dev/null
@@ -1,56 +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,kabdrv1))
-
-$(eval $(call gb_Library_use_sdk_api,kabdrv1))
-
-$(eval $(call gb_Library_use_externals,kabdrv1,\
- boost_headers \
- kde \
-))
-
-$(eval $(call gb_Library_set_include,kabdrv1,\
- -I$(SRCDIR)/connectivity/source/inc \
- $$(INCLUDE) \
- -I$(WORKDIR)/YaccTarget/connectivity/source/parse \
-))
-
-$(eval $(call gb_Library_add_libs,kabdrv1,\
- -lkabc \
-))
-
-$(eval $(call gb_Library_use_libraries,kabdrv1,\
- cppu \
- cppuhelper \
- sal \
- salhelper \
- dbtools \
- comphelper \
-))
-
-$(eval $(call gb_Library_add_exception_objects,kabdrv1,\
- connectivity/source/drivers/kab/KColumns \
- connectivity/source/drivers/kab/KTable \
- connectivity/source/drivers/kab/KTables \
- connectivity/source/drivers/kab/KCatalog \
- connectivity/source/drivers/kab/KResultSet \
- connectivity/source/drivers/kab/KStatement \
- connectivity/source/drivers/kab/KPreparedStatement \
- connectivity/source/drivers/kab/KDatabaseMetaData \
- connectivity/source/drivers/kab/KConnection \
- connectivity/source/drivers/kab/KResultSetMetaData \
- connectivity/source/drivers/kab/kcondition \
- connectivity/source/drivers/kab/korder \
- connectivity/source/drivers/kab/kfields \
- connectivity/source/drivers/kab/KDEInit \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index 4616eb3..b45ca5c 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -45,14 +45,6 @@ endif
ifneq ($(OS),WNT)
-ifeq ($(ENABLE_KAB),TRUE)
-$(eval $(call gb_Module_add_targets,connectivity,\
- Configuration_kab \
- Library_kab1 \
- Library_kabdrv1 \
-))
-endif
-
ifeq ($(ENABLE_TDEAB),TRUE)
$(eval $(call gb_Module_add_targets,connectivity,\
Configuration_tdeab \
diff --git a/connectivity/registry/kab/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/kab/org/openoffice/Office/DataAccess/Drivers.xcu
deleted file mode 100644
index bc0fd521..0000000
--- a/connectivity/registry/kab/org/openoffice/Office/DataAccess/Drivers.xcu
+++ /dev/null
@@ -1,37 +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 .
- -->
-<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <node oor:name="Installed" install:module="kab">
- <node oor:name="sdbc:address:kab" oor:op="replace">
- <prop oor:name="Driver">
- <value>com.sun.star.comp.sdbc.kab.Driver</value>
- </prop>
- <prop oor:name="DriverTypeDisplayName" oor:type="xs:string">
- <value xml:lang="en-US">KDE Address Book</value>
- </prop>
- <node oor:name="Features">
- <node oor:name="EscapeDateTime" oor:op="replace">
- <prop oor:name="Value" oor:type="xs:boolean">
- <value>true</value>
- </prop>
- </node>
- </node>
- </node>
- </node>
-</oor:component-data>
diff --git a/connectivity/source/drivers/kab/kab1.component b/connectivity/source/drivers/kab/kab1.component
deleted file mode 100644
index 1bde060..0000000
--- a/connectivity/source/drivers/kab/kab1.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="kab" xmlns="http://openoffice.org/2010/uno-components">
- <implementation name="com.sun.star.comp.sdbc.kab.Driver">
- <service name="com.sun.star.sdbc.Driver"/>
- </implementation>
-</component>
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 64f75aa..85a9bf0 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -21,7 +21,6 @@ $(eval $(call gb_Library_set_precompiled_header,cui,$(SRCDIR)/cui/inc/pch/precom
$(eval $(call gb_Library_add_defs,cui,\
$(if $(filter TRUE,$(ENABLE_GTK)),-DENABLE_GTK) \
$(if $(filter TRUE,$(ENABLE_TDE)),-DENABLE_TDE) \
- $(if $(filter TRUE,$(ENABLE_KDE)),-DENABLE_KDE) \
$(if $(filter TRUE,$(ENABLE_KDE4)),-DENABLE_KDE4) \
))
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 02926c8..1a29276 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -205,14 +205,6 @@ namespace
return OUString();
#endif
}
- else if ( rDesktopEnvironment.equalsIgnoreAsciiCase("kde") )
- {
- #if ENABLE_KDE
- return OUString("com.sun.star.ui.dialogs.KDEFilePicker");
- #else
- return OUString();
- #endif
- }
else if ( rDesktopEnvironment.equalsIgnoreAsciiCase("tde") )
{
#if ENABLE_TDE
diff --git a/desktop/Pagein_common.mk b/desktop/Pagein_common.mk
index fbd7f55..8a43f2e 100644
--- a/desktop/Pagein_common.mk
+++ b/desktop/Pagein_common.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Pagein_add_objects,common,\
vclplug_gen \
$(if $(findstring TRUE,$(ENABLE_GTK)),vclplug_gtk) \
$(if $(findstring TRUE,$(ENABLE_TDE)),vclplug_tde) \
- $(if $(findstring TRUE,$(ENABLE_KDE)),vclplug_kde) \
basegfx \
sot \
xmlscript \
diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf
index 288f64d..8969911 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -21,7 +21,6 @@
--enable-extension-integration
--enable-odk
--enable-lockdown
---enable-kde
--enable-kde4
--disable-gtk3
--enable-gstreamer-0-10
diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf
index 6e0f105..6ebf011 100644
--- a/distro-configs/OxygenOfficeLinux.conf
+++ b/distro-configs/OxygenOfficeLinux.conf
@@ -14,7 +14,6 @@
--enable-split-opt-features
--with-linker-hash-style=both
--enable-systray
---enable-kde
--disable-kde4
--enable-gtk
--enable-evolution2
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index eec7449..510b444 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -349,10 +349,6 @@ endif
ifeq ($(ENABLE_TDEAB),TRUE)
postprocess_FILES_main += $(call gb_XcuModuleTarget_get_target,connectivity/registry/tdeab)/org/openoffice/Office/DataAccess/Drivers-tdeab.xcu
endif
-ifeq ($(ENABLE_KAB),TRUE)
-postprocess_FILES_main += $(call gb_XcuModuleTarget_get_target,connectivity/registry/kab)/org/openoffice/Office/DataAccess/Drivers-kab.xcu
-postprocess_DRIVERS += kab
-endif
ifneq (,$(SYSTEM_LIBEXTTEXTCAT_DATA))
postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/Paths-externallibexttextcatdata.xcu
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 07b4a97..c9d6e0e 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -208,9 +208,6 @@ $(eval $(call gb_Rdb_add_components,services,\
$(if $(ENABLE_VLC), \
avmedia/source/vlc/avmediavlc \
) \
- $(if $(ENABLE_KDE), \
- shell/source/backends/kdebe/kdebe1 \
- ) \
$(if $(ENABLE_KDE4), \
shell/source/backends/kde4be/kde4be1 \
) \
@@ -259,9 +256,6 @@ $(eval $(call gb_Rdb_add_components,services,\
connectivity/source/drivers/firebird/firebird_sdbc \
) \
connectivity/source/drivers/flat/flat \
- $(if $(ENABLE_KAB), \
- connectivity/source/drivers/kab/kab1 \
- ) \
connectivity/source/drivers/mysql/mysql \
$(if $(filter MACOSX,$(OS)), \
connectivity/source/drivers/macab/macab1 \
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index b74dad3..112a653 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -19,7 +19,6 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ooo,\
$(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
ENABLE_GTK \
- ENABLE_KDE \
ENABLE_MACOSX_SANDBOX \
ENABLE_NPAPI_FROM_BROWSER \
ENABLE_ONLINE_UPDATE \
diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk
index 0464d35..68acb561 100644
--- a/scp2/InstallScript_setup_osl.mk
+++ b/scp2/InstallScript_setup_osl.mk
@@ -36,7 +36,7 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\
$(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GCONF) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\
scp2/gnome \
) \
- $(if $(filter TRUE,$(ENABLE_KDE) $(ENABLE_KDE4)),\
+ $(if $(filter TRUE,$(ENABLE_KDE4)),\
scp2/kde \
) \
$(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index 5b8ad47..c577a10 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_Module_add_targets,scp2,\
$(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GCONF) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\
InstallModule_gnome \
) \
- $(if $(filter TRUE,$(ENABLE_KDE) $(ENABLE_KDE4)),\
+ $(if $(filter TRUE,$(ENABLE_KDE4)),\
InstallModule_kde \
) \
$(if $(filter TRUE,$(ENABLE_TDE)),\
diff --git a/shell/Library_kdebe.mk b/shell/Library_kdebe.mk
deleted file mode 100644
index edd5f3a..0000000
--- 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 de906ac..3659c51 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 162bcc5..b9168d6 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 f2c2bc5..0000000
--- 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 b0eac27..0000000
--- 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
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 01ae4d5..11b4732 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -178,7 +178,6 @@ $(call gb_CppunitTest_get_target,$(1)) : $(if $(filter $(2),$(true)), \
$(call gb_Library_get_target,vclplug_gen) \
$(if $(ENABLE_GTK),$(call gb_Library_get_target,vclplug_gtk)) \
$(if $(ENABLE_GTK3),$(call gb_Library_get_target,vclplug_gtk3)) \
- $(if $(ENABLE_KDE),$(call gb_Library_get_target,vclplug_kde)) \
$(if $(ENABLE_KDE4),$(call gb_Library_get_target,vclplug_kde4)) \
$(if $(ENABLE_TDE),$(call gb_Library_get_target,vclplug_tde)))
endif
diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk
index d58bacc..2236e68 100644
--- a/sysui/CustomTarget_share.mk
+++ b/sysui/CustomTarget_share.mk
@@ -14,8 +14,6 @@ ifeq ($(ENABLE_GIO),TRUE)
brand_URIPARAM := --urls
else ifeq ($(ENABLE_TDE),TRUE)
brand_URIPARAM := --urls
-else ifeq ($(ENABLE_KDE),TRUE)
- brand_URIPARAM := --urls
else ifeq ($(ENABLE_KDE4),TRUE)
brand_URIPARAM := --urls
else
diff --git a/vcl/CustomTarget_kde_moc.mk b/vcl/CustomTarget_kde_moc.mk
deleted file mode 100644
index 4301186..0000000
--- a/vcl/CustomTarget_kde_moc.mk
+++ /dev/null
@@ -1,21 +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_CustomTarget_CustomTarget,vcl/unx/kde/fpicker))
-
-$(call gb_CustomTarget_get_target,vcl/unx/kde/fpicker) : \
- $(call gb_CustomTarget_get_workdir,vcl/unx/kde/fpicker)/kdefilepicker.moc.cxx
-
-$(call gb_CustomTarget_get_workdir,vcl/unx/kde/fpicker)/kdefilepicker.moc.cxx :\
- $(SRCDIR)/vcl/unx/kde/fpicker/kdefilepicker.hxx \
- | $(call gb_CustomTarget_get_workdir,vcl/unx/kde/fpicker)/.dir
- $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MOC,1)
- cat $< | grep -v 'FILTER_OUT_TDE' | $(MOC) -o $@ -f$<
-
-# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/vcl/Executable_kdefilepicker.mk b/vcl/Executable_kdefilepicker.mk
deleted file mode 100644
index 1fd01b2..0000000
--- a/vcl/Executable_kdefilepicker.mk
+++ /dev/null
@@ -1,42 +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_Executable_Executable,kdefilepicker))
-
-$(eval $(call gb_Executable_add_defs,kdefilepicker,\
- $(KDE_CFLAGS) \
-))
-
-$(eval $(call gb_Executable_use_libraries,kdefilepicker,\
- sal \
-))
-
-$(eval $(call gb_Executable_add_libs,kdefilepicker,\
- $(KDE_LIBS) \
- -lkio -lX11 \
-))
-
-$(eval $(call gb_Executable_add_exception_objects,kdefilepicker,\
- vcl/unx/kde/fpicker/kdecommandthread \
- vcl/unx/kde/fpicker/kdefilepicker \
- vcl/unx/kde/fpicker/kdefpmain \
- vcl/unx/kde/fpicker/kdemodalityfilter \
-))
-
-$(eval $(call gb_Executable_add_generated_cxxobjects,kdefilepicker,\
- CustomTarget/vcl/unx/kde/fpicker/kdefilepicker.moc \
-))
-
-# KDE/Qt consider -Wshadow more trouble than benefit
-$(eval $(call gb_Executable_add_cxxflags,kdefilepicker,\
- -Wno-shadow \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk
deleted file mode 100644
index 4071422..0000000
--- a/vcl/Library_vclplug_kde.mk
+++ /dev/null
@@ -1,81 +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/.
-#
-# 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 .
-#
-
-$(eval $(call gb_Library_Library,vclplug_kde))
-
-$(eval $(call gb_Library_set_include,vclplug_kde,\
- $$(INCLUDE) \
- -I$(SRCDIR)/vcl/inc \
-))
-
-$(eval $(call gb_Library_add_defs,vclplug_kde,\
- -DVCLPLUG_KDE_IMPLEMENTATION \
-))
-
-$(eval $(call gb_Library_use_sdk_api,vclplug_kde))
-
-$(eval $(call gb_Library_use_libraries,vclplug_kde,\
- vclplug_gen \
- vcl \
- tl \
- utl \
- sot \
- ucbhelper \
- basegfx \
- comphelper \
- cppuhelper \
- i18nlangtag \
- i18nutil \
- $(if $(ENABLE_JAVA), \
- jvmaccess) \
- cppu \
- sal \
-))
-
-$(eval $(call gb_Library_use_externals,vclplug_kde,\
- boost_headers \
- icuuc \
- kde \
- glew \
-))
-
-$(eval $(call gb_Library_add_libs,vclplug_kde,\
- -lX11 \
- -lXext \
- -lSM \
- -lICE \
-))
-
-$(eval $(call gb_Library_add_exception_objects,vclplug_kde,\
- vcl/unx/kde/kdedata \
- vcl/unx/kde/salnativewidgets-kde \
- vcl/unx/kde/UnxCommandThread \
- vcl/unx/kde/UnxFilePicker \
- vcl/unx/kde/UnxNotifyThread \
-))
-
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_libs,vclplug_kde,\
- -lm \
- -ldl \
- -lpthread \
-))
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index c949f42..1d54172 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -73,13 +73,6 @@ $(eval $(call gb_Module_add_targets,vcl,\
Library_vclplug_tde \
))
endif
-ifneq ($(ENABLE_KDE),)
-$(eval $(call gb_Module_add_targets,vcl,\
- CustomTarget_kde_moc \
- Executable_kdefilepicker \
- Library_vclplug_kde \
-))
-endif
ifneq ($(ENABLE_KDE4),)
$(eval $(call gb_Module_add_targets,vcl,\
CustomTarget_kde4_moc \
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx
index 20fa9e8..337e4d4 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -171,9 +171,6 @@ static SalInstance* autodetect_plugin()
#if ENABLE_KDE4
"kde4",
#endif
-#if ENABLE_KDE
- "kde",
-#endif
"gtk3", "gtk", "gen", 0
};
@@ -182,9 +179,6 @@ static SalInstance* autodetect_plugin()
#if ENABLE_KDE4
"kde4",
#endif
-#if ENABLE_KDE
- "kde",
-#endif
"gtk3", "gtk", "gen", 0
};
@@ -208,15 +202,11 @@ static SalInstance* autodetect_plugin()
else if ( desktop == DESKTOP_GNOME ||
desktop == DESKTOP_UNITY ||
desktop == DESKTOP_XFCE ||
+ desktop == DESKTOP_KDE3 ||
desktop == DESKTOP_MATE )
pList = pStandardFallbackList;
else if( desktop == DESKTOP_TDE )
pList = pTDEFallbackList;
- else if( desktop == DESKTOP_KDE3 )
- {
- pList = pKDEFallbackList;
- nListEntry = 1;
- }
else if( desktop == DESKTOP_KDE4 || desktop == DESKTOP_KDE5 )
pList = pKDEFallbackList;
More information about the Libreoffice-commits
mailing list