[neon/qt/qtwebengine/Neon/testing] debian: Merge tag 'debian/5.15.2+dfsg-3' into Neon/testing

Neon CI null at kde.org
Wed May 19 11:53:43 BST 2021


Git commit 416a78cc5a176487ee71abd2513af6557cf568fa by Neon CI.
Committed on 19/05/2021 at 08:39.
Pushed by sitter into branch 'Neon/testing'.

Merge tag 'debian/5.15.2+dfsg-3' into Neon/testing

5.15.2+dfsg-3 unstable; urgency=medium

M  +109  -35   debian/control
M  +1    -0    debian/patches/series
M  +6    -16   debian/rules

https://invent.kde.org/neon/qt/qtwebengine/commit/416a78cc5a176487ee71abd2513af6557cf568fa

diff --cc debian/control
index b5fd024,097294e..2f45407
--- a/debian/control
+++ b/debian/control
@@@ -122,6 -124,21 +124,23 @@@ Description: Web content engine librar
   This package contains the private development files needed to build
   Qt 5 applications using QtWebEngine library.
  
+ Package: qtpdf5-dev
+ Architecture: amd64 arm64 armhf i386 mipsel
+ Multi-Arch: same
+ Section: libdevel
+ Depends: libqt5pdf5 (= ${binary:Version}),
+          libqt5pdfwidgets5 (= ${binary:Version}),
+          qtbase5-dev,
+          ${misc:Depends},
+          ${shlibs:Depends}
++Breaks: qtwebengine5-dev (<< ${binary:Version}~ciBuild)
++Replaces: qtwebengine5-dev (<< ${binary:Version}~ciBuild)
+ Description: Qt 5 PDF library - development files
+  The Qt PDF module contains classes and functions for rendering PDF documents.
+  .
+  This package contains the development files needed to build Qt 5 applications
+  using Qt PDF library.
+ 
  Package: libqt5webengine5
  Architecture: amd64 arm64 armhf i386 mipsel
  Multi-Arch: same
@@@ -196,6 -210,16 +212,18 @@@ Description: Web content engine librar
   .
   This package contains the arch independent parts of QtWebEngine libraries.
  
+ Package: qt5-image-formats-plugin-pdf
+ Architecture: amd64 arm64 armhf i386 mipsel
+ Multi-Arch: same
+ Depends: ${misc:Depends}, ${shlibs:Depends}
++Breaks: libqt5pdfwidgets5 (<< ${binary:Version}~ciBuild)
++Replaces: libqt5pdfwidgets5 (<< ${binary:Version}~ciBuild)
+ Description: Qt 5 PDF image format plugin
+  The Qt PDF module contains classes and functions for rendering PDF documents.
+  .
+  This package provides an image plugin that allows image-viewing applications
+  to view PDF files (the first page of PDF will be shown).
+ 
  Package: qml-module-qtwebengine
  Architecture: amd64 arm64 armhf i386 mipsel
  Multi-Arch: same
@@@ -251,6 -281,17 +285,19 @@@ Description: Qt WebEngine - Example
   .
   This package contains the WebEngine examples.
  
+ Package: qtpdf5-examples
+ Architecture: amd64 arm64 armhf i386 mipsel
+ Multi-Arch: same
+ Depends: qml-module-qtquick-pdf (= ${binary:Version}),
+          ${misc:Depends},
+          ${shlibs:Depends}
++Breaks: qtwebengine5-examples (<< ${binary:Version}~ciBuild)
++Replaces: qtwebengine5-examples (<< ${binary:Version}~ciBuild)
+ Description: Qt PDF - examples
+  The Qt PDF module contains classes and functions for rendering PDF documents.
+  .
+  This package contains the PDF examples.
+ 
  Package: qtwebengine5-doc
  Build-Profiles: <!nodoc>
  Architecture: all
@@@ -275,3 -316,26 +322,30 @@@ Description: Qt 5 webengine HTML docume
   .
   This package contains the HTML documentation for the Qt 5 webengine
   libraries.
+ 
+ Package: qtpdf5-doc
+ Build-Profiles: <!nodoc>
+ Architecture: all
+ Multi-Arch: foreign
+ Section: doc
+ Depends: ${misc:Depends}
++Breaks: qtwebengine5-doc (<< ${binary:Version}~ciBuild)
++Replaces: qtwebengine5-doc (<< ${binary:Version}~ciBuild)
+ Description: Qt 5 PDF documentation
+  The Qt PDF module contains classes and functions for rendering PDF documents.
+  .
+  This package contains the documentation in QCH format, which can be
+  viewed using Qt Assistant from qttools5-dev-tools package.
+ 
+ Package: qtpdf5-doc-html
+ Build-Profiles: <!nodoc>
+ Architecture: all
+ Multi-Arch: foreign
+ Section: doc
+ Depends: ${misc:Depends}
++Breaks: qtwebengine5-doc-html (<< ${binary:Version}~ciBuild)
++Replaces: qtwebengine5-doc-html (<< ${binary:Version}~ciBuild)
+ Description: Qt 5 PDF HTML documentation
+  The Qt PDF module contains classes and functions for rendering PDF documents.
+  .
+  This package contains the HTML documentation.
diff --cc debian/patches/series
index e0d0020,02ebedf..eab55cf
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,11 +1,6 @@@
 -run-unbundling-script.patch
 -system-lcms2.patch
 +#run-unbundling-script.patch
 +#system-lcms2.patch
  system-nspr-prtime.patch
 -system-icu-utf.patch
  verbose-gn-bootstrap.patch
 -mipsel-linux-5.patch
 -mipsel-ptrace-include.patch
 -mipsel-no-dav1d.patch
 -mipsel-link-atomic.patch
  sandbox-time64-syscalls.patch
+ mipsel-code-range-size.patch
diff --cc debian/rules
index 6852df9,f65c26f..9f737fe
--- a/debian/rules
+++ b/debian/rules
@@@ -33,17 -39,16 +33,14 @@@ small_architectures := armhf mipse
  no_gold_architectures := arm64 armhf mipsel
  
  config_args = -proprietary-codecs \
 -              -feature-webengine-system-libvpx \
                -system-ffmpeg \
                -system-opus \
 -              -system-webp \
 -              -system-webengine-icu
 +              -system-webp
  
- touch_files = src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/audits_worker/lighthouse/lighthouse-dt-bundle.js \
- 	      src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/audits/lighthouse/report-generator.js \
- 	      src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/diff/diff_match_patch.js \
- 	      src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/formatter_worker/acorn/acorn.js \
- 	      src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/network/NetworkConfigView.js \
- 	      src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/terminal/xterm.js/build/xterm.css \
- 	      src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/terminal/xterm.js/build/xterm.js \
+ touch_files = src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/lighthouse-dt-bundle.js \
+ 	      src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/report-assets/report-generator.js \
+ 	      src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/diff/diff_match_patch.js \
+ 	      src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/formatter_worker/acorn/acorn.js \
  	      src/3rdparty/chromium/third_party/polymer/v3_0/components-chromium/polymer/polymer_bundled.min.js \
  	      src/3rdparty/chromium/third_party/web-animations-js/sources/web-animations-next-lite.min.js
  



More information about the Neon-commits mailing list