[neon/qt6/qt6-virtualkeyboard/Neon/release] debian: Disable non-DFSG plugins.
Lu YaNing
null at kde.org
Thu Dec 16 15:54:14 GMT 2021
Git commit 67598a45741159737b8e6f12cc0520573e73e80f by Lu YaNing.
Committed on 05/12/2021 at 12:43.
Pushed by jriddell into branch 'Neon/release'.
Disable non-DFSG plugins.
M +1 -1 debian/changelog
M +1 -1 debian/control
M +137 -32 debian/copyright
M +0 -3 debian/libqt6virtualkeyboard6-dev.install
A +53 -0 debian/patches/disable_non_dfsg_modules.patch
A +1 -0 debian/patches/series
M +0 -3 debian/qt6-virtualkeyboard-plugin.install
M +1 -0 debian/watch
https://invent.kde.org/neon/qt6/qt6-virtualkeyboard/commit/67598a45741159737b8e6f12cc0520573e73e80f
diff --git a/debian/changelog b/debian/changelog
index 10ab1d8..b50e8e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-qt6-virtualkeyboard (6.2.1-1) experimental; urgency=medium
+qt6-virtualkeyboard (6.2.1+dfsg-1) experimental; urgency=medium
* Initial release (Closes: #999897)
diff --git a/debian/control b/debian/control
index 02f45a5..7d0ac60 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends: cmake (>= 3.18~),
libgl-dev,
libhunspell-dev,
libqt6opengl6-dev (>= 6.2.1+dfsg~),
+ libqt6svg6-dev (>= 6.2.1~),
libssl-dev,
libvulkan-dev [linux-any],
libxcb-xfixes0-dev,
@@ -21,7 +22,6 @@ Build-Depends: cmake (>= 3.18~),
qt6-base-private-dev (>= 6.2.1+dfsg~),
qt6-declarative-dev (>= 6.2.1+dfsg~),
qt6-declarative-private-dev (>= 6.2.1+dfsg~),
- qt6-svg-dev (>= 6.2.1~),
xauth <!nocheck>,
xvfb <!nocheck>,
Standards-Version: 4.6.0
diff --git a/debian/copyright b/debian/copyright
index 87c9538..862646a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,43 +1,148 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: qt6-virtualkeyboard
-Upstream-Contact: <preferred name and address to reach the upstream project>
-Source: <url://example.com>
+Upstream-Name: qtvirtualkeyboard-everywhere-src
+Source: https://download.qt.io/official_releases/qt/*/submodules/
+Files-Excluded: src/plugins/tcime/3rdparty
+ src/plugins/openwnn/3rdparty
+ src/plugins/pinyin/3rdparty
+
+#Comment:
+# The following files are binary blobs and mostly not in the preferred form
+# of modification, so we cannot ship them:
+# .
+# - tcime/data/java/*.dat
+# - tcime/data/qt/*.dat
+# - openwnn/wnnEngine/predef_table.h
+# - openwnn/wnnEngine/WnnJpnDic.c
+# - pinyin/data/dict_pinyin.dat
+# .
+# If someone needs this functionality in Qt Virtual Keyboard, we recommend
+# them to package the modules in question so we can use them as system
+# libraries.
Files: *
-Copyright: <years> <put author's name and email here>
- <years> <likewise for another author>
-License: <special license>
- <Put the license of the package here indented by 1 space>
- <This follows the format of Description: lines in control file>
- .
- <Including paragraphs>
+Copyright: 2016-2021 The Qt Company Ltd.
+License: GPL-3+
-# If you want to use GPL v2 or later for the /debian/* files use
-# the following clauses, or change it to suit. Delete these two lines
Files: debian/*
-Copyright: 2021 Patrick Franz <deltaone at debian.org>
-License: GPL-2+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
+Copyright: 2021 Patrick Franz <deltaone at debian.org>,
+ 2021 Lu YaNing <dluyaning at gmail.com>
+License: GPL-3+
+
+Files: *.qdoc
+ src/virtualkeyboard/doc/snippets/qtvirtualkeyboard-custom-language-popup.qml
+Copyright: 2016-2021 The Qt Company Ltd.
+License: GFDL-NIV-1.3
+
+Files: tests/auto/layoutfilesystem/data/layouts/en_GB/main.qml
+ tests/auto/layoutfilesystem/tst_layoutfilesystem.cpp
+ tests/auto/layoutresources/data/layouts/en_GB/main.qml
+ tests/auto/layoutresources/tst_layoutresources.cpp
+ tests/auto/shared/layouttesthelper.cpp
+ tests/auto/shared/layouttesthelper.h
+Copyright: 2016 Pelagicore AB
+License: GPL-3+
+
+Files: tests/auto/styles/data/QtQuick/VirtualKeyboard/Styles/test/style.qml
+ tests/auto/styles/data/tst_styles.qml
+ tests/auto/styles/tst_styles.cpp
+Copyright: 2016 Jeremy Katz
+License: GPL-3+
+
+Files: src/plugins/myscript/plugin/myscriptinputmethod*
+Copyright: 2017 MyScript
+ 2017 Klarälvdalens Datakonsult AB (KDAB)
+ 2017 The Qt Company Ltd.
+License: GPL-3+
+
+Files: conanfile.py
+Copyright: 2021 The Qt Company Ltd.
+License: GPL-3 with Qt-1.0 exception
+
+Files: config.tests/hunspell/main.cpp
+ src/virtualkeyboard/qvirtualkeyboard_global_p.h
+Copyright: 2020 The Qt Company Ltd.
+License: LGPL-3 or GPL-2
+
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 3 or (at
+ your option) any later version approved by the KDE Free Qt Foundation.
+ The licenses are as published by the Free Software Foundation.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License version 3 can be found in /usr/share/common-licenses/GPL-3.
+
+License: GFDL-NIV-1.3
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.3
+ or any later version published by the Free Software Foundation;
+ with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+ .
+ On Debian systems, the complete text of the GNU Free Documentation
+ License version 1.3 can be found in /usr/share/common-licenses/GFDL-1.3.
+
+License: GPL-3 with Qt-1.0 exception
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 3 as
+ published by the Free Software Foundation.
+ .
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>
+ On Debian systems, the complete text of the GNU General Public License
+ version 3 can be found in /usr/share/common-licenses/GPL-3.
+ .
+ The Qt Company GPL Exception 1.0
+ .
+ Exception 1:
+ .
+ As a special exception you may create a larger work which contains the
+ output of this application and distribute that work under terms of your
+ choice, so long as the work is not otherwise derived from or based on
+ this application and so long as the work does not in itself generate
+ output that contains the output from this application in its original
+ or modified form.
.
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+ Exception 2:
+ .
+ As a special exception, you have permission to combine this application
+ with Plugins licensed under the terms of your choice, to produce an
+ executable, and to copy and distribute the resulting executable under
+ the terms of your choice. However, the executable must be accompanied
+ by a prominent notice offering all users of the executable the entire
+ source code to this application, excluding the source code of the
+ independent modules, but including any changes you have made to this
+ application, under the terms of this license.
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
-# Please avoid picking licenses with terms that are more restrictive than the
-# packaged work, as it may make Debian's contributions unacceptable upstream.
-#
-# If you need, there are some extra license texts available in two places:
-# /usr/share/debhelper/dh_make/licenses/
-# /usr/share/common-licenses/
+License: LGPL-3
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License version 3
+ as published by the Free Software Foundation.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Lesser General Public License for more details.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public
+ License version 3 can be found in /usr/share/common-licenses/LGPL-3.
+
+License: GPL-2
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License version 2 can be found in /usr/share/common-licenses/GPL-2.
diff --git a/debian/libqt6virtualkeyboard6-dev.install b/debian/libqt6virtualkeyboard6-dev.install
index 774f2d1..5b26497 100644
--- a/debian/libqt6virtualkeyboard6-dev.install
+++ b/debian/libqt6virtualkeyboard6-dev.install
@@ -29,9 +29,6 @@ usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/FindCerenceXt9.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/FindHunspell.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/FindMyScript.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BuildInternals/StandaloneTests/QtVirtualKeyboardTestsConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BundledOpenwnn/Qt6BundledOpenwnnDependencies.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BundledPinyin/Qt6BundledPinyinDependencies.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BundledTcime/Qt6BundledTcimeDependencies.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6VirtualKeyboard/Qt6VirtualKeyboardAdditionalTargetInfo.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6VirtualKeyboard/Qt6VirtualKeyboardConfig.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6VirtualKeyboard/Qt6VirtualKeyboardConfigVersion.cmake
diff --git a/debian/patches/disable_non_dfsg_modules.patch b/debian/patches/disable_non_dfsg_modules.patch
new file mode 100644
index 0000000..7f7f8d7
--- /dev/null
+++ b/debian/patches/disable_non_dfsg_modules.patch
@@ -0,0 +1,53 @@
+Description: disable building plugins requiring non-DFSG compliant 3rdparty code
+
+Author: Lu YaNing <dluyaning at gmail.com>
+Last-Update: 2021-12-2
+
+
+Index: qtvirtualkeyboard-everywhere-src-6.2.1/src/plugins/CMakeLists.txt
+===================================================================
+--- qtvirtualkeyboard-everywhere-src-6.2.1.orig/src/plugins/CMakeLists.txt
++++ qtvirtualkeyboard-everywhere-src-6.2.1/src/plugins/CMakeLists.txt
+@@ -9,15 +9,6 @@ endif()
+ if(QT_FEATURE_hunspell)
+ add_subdirectory(hunspell)
+ endif()
+-if(QT_FEATURE_openwnn)
+- add_subdirectory(openwnn)
+-endif()
+-if(QT_FEATURE_pinyin AND NOT QT_FEATURE_cerence_xt9)
+- add_subdirectory(pinyin)
+-endif()
+-if(QT_FEATURE_tcime)
+- add_subdirectory(tcime)
+-endif()
+ if(QT_FEATURE_myscript)
+ add_subdirectory(myscript)
+ endif()
+Index: qtvirtualkeyboard-everywhere-src-6.2.1/src/plugins/openwnn/CMakeLists.txt
+===================================================================
+--- qtvirtualkeyboard-everywhere-src-6.2.1.orig/src/plugins/openwnn/CMakeLists.txt
++++ qtvirtualkeyboard-everywhere-src-6.2.1/src/plugins/openwnn/CMakeLists.txt
+@@ -1,4 +1,3 @@
+ # Generated from openwnn.pro.
+
+-add_subdirectory(3rdparty/openwnn)
+ add_subdirectory(plugin)
+Index: qtvirtualkeyboard-everywhere-src-6.2.1/src/plugins/pinyin/CMakeLists.txt
+===================================================================
+--- qtvirtualkeyboard-everywhere-src-6.2.1.orig/src/plugins/pinyin/CMakeLists.txt
++++ qtvirtualkeyboard-everywhere-src-6.2.1/src/plugins/pinyin/CMakeLists.txt
+@@ -1,4 +1,3 @@
+ # Generated from pinyin.pro.
+
+-add_subdirectory(3rdparty/pinyin)
+ add_subdirectory(plugin)
+Index: qtvirtualkeyboard-everywhere-src-6.2.1/src/plugins/tcime/CMakeLists.txt
+===================================================================
+--- qtvirtualkeyboard-everywhere-src-6.2.1.orig/src/plugins/tcime/CMakeLists.txt
++++ qtvirtualkeyboard-everywhere-src-6.2.1/src/plugins/tcime/CMakeLists.txt
+@@ -1,4 +1,3 @@
+ # Generated from tcime.pro.
+
+-add_subdirectory(3rdparty/tcime)
+ add_subdirectory(plugin)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7447a3c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+disable_non_dfsg_modules.patch
diff --git a/debian/qt6-virtualkeyboard-plugin.install b/debian/qt6-virtualkeyboard-plugin.install
index 05c1716..8149fb7 100644
--- a/debian/qt6-virtualkeyboard-plugin.install
+++ b/debian/qt6-virtualkeyboard-plugin.install
@@ -1,7 +1,4 @@
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/virtualkeyboard/libqtvirtualkeyboard_hangul.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/virtualkeyboard/libqtvirtualkeyboard_hunspell.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/virtualkeyboard/libqtvirtualkeyboard_openwnn.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/virtualkeyboard/libqtvirtualkeyboard_pinyin.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/virtualkeyboard/libqtvirtualkeyboard_tcime.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/virtualkeyboard/libqtvirtualkeyboard_thai.so
diff --git a/debian/watch b/debian/watch
index c0ac4ab..45ff6cc 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
version=4
+opts=uversionmangle=s/-/~/,dversionmangle=s/\+dfsg//,repacksuffix=+dfsg \
https://download.qt.io/archive/qt/([\d\.]*)/([\d\.]*)/submodules/qtvirtualkeyboard-everywhere-src-(.*)\.tar\.xz
More information about the Neon-commits
mailing list