Remove references to htmlinfo examples.
This commit is contained in:
parent
a9a49226da
commit
5a9ee9002c
1
debian/changelog
vendored
1
debian/changelog
vendored
@ -3,6 +3,7 @@ qt6-base (6.6.0+dfsg-1) UNRELEASED; urgency=medium
|
|||||||
[ Patrick Franz ]
|
[ Patrick Franz ]
|
||||||
* New upstream release (6.6.0).
|
* New upstream release (6.6.0).
|
||||||
* Update ABI to 6.6.0.
|
* Update ABI to 6.6.0.
|
||||||
|
* Remove references to htmlinfo examples.
|
||||||
|
|
||||||
-- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Tue, 10 Oct 2023 17:54:32 +0200
|
-- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Tue, 10 Oct 2023 17:54:32 +0200
|
||||||
|
|
||||||
|
4
debian/copyright
vendored
4
debian/copyright
vendored
@ -1,8 +1,7 @@
|
|||||||
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
|
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
|
||||||
Upstream-Name: qtbase-everywhere-src
|
Upstream-Name: qtbase-everywhere-src
|
||||||
Source: https://download.qt.io/archive/qt/*/submodules/
|
Source: https://download.qt.io/archive/qt/*/submodules/
|
||||||
Files-Excluded: examples/xml/htmlinfo
|
Files-Excluded: src/3rdparty/gradle/gradle/wrapper/gradle-wrapper.jar
|
||||||
src/3rdparty/gradle/gradle/wrapper/gradle-wrapper.jar
|
|
||||||
src/3rdparty/iaccessible2
|
src/3rdparty/iaccessible2
|
||||||
src/3rdparty/sqlite
|
src/3rdparty/sqlite
|
||||||
src/3rdparty/wintab
|
src/3rdparty/wintab
|
||||||
@ -17,7 +16,6 @@ Files-Excluded: examples/xml/htmlinfo
|
|||||||
|
|
||||||
# Removed non-free files:
|
# Removed non-free files:
|
||||||
# * RFCs (see QTBUG-30544 and QTBUG-30545)
|
# * RFCs (see QTBUG-30544 and QTBUG-30545)
|
||||||
# * htmlinfo example which contains non-free websites snapshots
|
|
||||||
# * src/3rdparty/gradle — built .jar file without source code
|
# * src/3rdparty/gradle — built .jar file without source code
|
||||||
# * src/3rdparty/iaccessible2 — not preferred form of modification
|
# * src/3rdparty/iaccessible2 — not preferred form of modification
|
||||||
# * src/3rdparty/sqlite — not preferred form of modification
|
# * src/3rdparty/sqlite — not preferred form of modification
|
||||||
|
30
debian/patches/no_htmlinfo_example.patch
vendored
30
debian/patches/no_htmlinfo_example.patch
vendored
@ -1,30 +0,0 @@
|
|||||||
Description: Avoid trying to build the htmlinfo example
|
|
||||||
This example uses non-free images, so we had to remove it from the original
|
|
||||||
tarball.
|
|
||||||
.
|
|
||||||
This patch avoid building this example.
|
|
||||||
Author: Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>
|
|
||||||
Forwarded: not-needed
|
|
||||||
|
|
||||||
---
|
|
||||||
examples/xml/CMakeLists.txt | 1 -
|
|
||||||
examples/xml/xml.pro | 3 +--
|
|
||||||
2 files changed, 1 insertion(+), 3 deletions(-)
|
|
||||||
|
|
||||||
--- a/examples/xml/CMakeLists.txt
|
|
||||||
+++ b/examples/xml/CMakeLists.txt
|
|
||||||
@@ -1,4 +1,3 @@
|
|
||||||
-qt_internal_add_example(htmlinfo)
|
|
||||||
qt_internal_add_example(xmlstreamlint)
|
|
||||||
if(TARGET Qt::Widgets)
|
|
||||||
qt_internal_add_example(dombookmarks)
|
|
||||||
--- a/examples/xml/xml.pro
|
|
||||||
+++ b/examples/xml/xml.pro
|
|
||||||
@@ -1,6 +1,5 @@
|
|
||||||
TEMPLATE = subdirs
|
|
||||||
-SUBDIRS = htmlinfo \
|
|
||||||
- xmlstreamlint
|
|
||||||
+SUBDIRS = xmlstreamlint
|
|
||||||
|
|
||||||
qtHaveModule(widgets) {
|
|
||||||
SUBDIRS += dombookmarks \
|
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
@ -21,7 +21,6 @@ remove_privacy_breaches.diff
|
|||||||
build_path_embedded_qtbuildinternalsextra_cmake.patch
|
build_path_embedded_qtbuildinternalsextra_cmake.patch
|
||||||
cross.patch
|
cross.patch
|
||||||
force_shared_libzstd.patch
|
force_shared_libzstd.patch
|
||||||
no_htmlinfo_example.patch
|
|
||||||
remove_rpath_from_examples.patch
|
remove_rpath_from_examples.patch
|
||||||
forkfd_grow_stack_upwards_on_hppa.patch
|
forkfd_grow_stack_upwards_on_hppa.patch
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user