vcl/Library_vclplug_gtk3_kde5.mk | 1 -
vcl/Library_vclplug_gtk4.mk | 1 -
vcl/Library_vclplug_qt6.mk | 1 -
vcl/qt6/QtSvpSurface.cxx | 12 ------------
vcl/unx/gtk3_kde5/gtk3_kde5_cairo.cxx | 22 ----------------------
vcl/unx/gtk4/gtkcairo.cxx | 12 ------------
vcl/unx/gtk4/gtkcairo.hxx | 12 ------------
7 files changed, 61 deletions(-)
New commits:
commit 595354ab7e01546765d84103aaf2bc38e5d3c9b3
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Wed Feb 19 21:13:49 2025 +0100
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Thu Feb 20 08:23:40 2025 +0100
Remove also canvas/cairo in gtk4, qt6 and gtk3_kde5
Change-Id: Ic70ee92011ee04a4d4246c8c9ba81ce7832596f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181919
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/vcl/Library_vclplug_gtk3_kde5.mk b/vcl/Library_vclplug_gtk3_kde5.mk
index c0c428955a65..de5209e8bb97 100644
--- a/vcl/Library_vclplug_gtk3_kde5.mk
+++ b/vcl/Library_vclplug_gtk3_kde5.mk
@@ -110,7 +110,6 @@ $(eval $(call
gb_Library_add_exception_objects,vclplug_gtk3_kde5,\
vcl/unx/gtk3_kde5/gtk3_kde5_filepicker \
vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc \
vcl/unx/gtk3_kde5/gtk3_kde5_folderpicker \
- vcl/unx/gtk3_kde5/gtk3_kde5_cairo \
vcl/unx/gtk3_kde5/gtk3_kde5_salnativewidgets-gtk \
vcl/unx/gtk3_kde5/gtk3_kde5_gtkframe \
vcl/unx/gtk3_kde5/gtk3_kde5_gtkobject \
diff --git a/vcl/Library_vclplug_gtk4.mk b/vcl/Library_vclplug_gtk4.mk
index 6d7dfec6b2aa..0997906740e9 100644
--- a/vcl/Library_vclplug_gtk4.mk
+++ b/vcl/Library_vclplug_gtk4.mk
@@ -94,7 +94,6 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gtk4,\
vcl/unx/gtk4/gtkdata \
vcl/unx/gtk4/gtkinst \
vcl/unx/gtk4/gtksys \
- vcl/unx/gtk4/gtkcairo \
vcl/unx/gtk4/custom-theme \
vcl/unx/gtk4/salnativewidgets-gtk \
vcl/unx/gtk4/gtkframe \
diff --git a/vcl/Library_vclplug_qt6.mk b/vcl/Library_vclplug_qt6.mk
index 17ee2027ee92..eb3235b1084b 100644
--- a/vcl/Library_vclplug_qt6.mk
+++ b/vcl/Library_vclplug_qt6.mk
@@ -140,7 +140,6 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_qt6,\
vcl/qt6/QtPainter \
vcl/qt6/QtPrinter \
vcl/qt6/QtSvpGraphics \
- vcl/qt6/QtSvpSurface \
vcl/qt6/QtSystem \
vcl/qt6/QtTimer \
vcl/qt6/QtTools \
diff --git a/vcl/qt6/QtSvpSurface.cxx b/vcl/qt6/QtSvpSurface.cxx
deleted file mode 100644
index 4f6ec38c4329..000000000000
--- a/vcl/qt6/QtSvpSurface.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
-/*
- * 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/.
- */
-
-#include "../qt5/QtSvpSurface.cxx"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_cairo.cxx
b/vcl/unx/gtk3_kde5/gtk3_kde5_cairo.cxx
deleted file mode 100644
index ed8780447f96..000000000000
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_cairo.cxx
+++ /dev/null
@@ -1,22 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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 .
- */
-
-#include "../gtk3/gtkcairo.cxx"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk4/gtkcairo.cxx b/vcl/unx/gtk4/gtkcairo.cxx
deleted file mode 100644
index 3178fdea0245..000000000000
--- a/vcl/unx/gtk4/gtkcairo.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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/.
- */
-
-#include "../gtk3/gtkcairo.cxx"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk4/gtkcairo.hxx b/vcl/unx/gtk4/gtkcairo.hxx
deleted file mode 100644
index 97f63101ddd6..000000000000
--- a/vcl/unx/gtk4/gtkcairo.hxx
+++ /dev/null
@@ -1,12 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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/.
- */
-
-#include "../../gtk3/gtkdata.cxx"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
