[neon/qt/qtdeclarative/Neon/experimental] debian/patches: refresh patch including updated python3 foo

Jonathan Riddell null at kde.org
Wed Oct 21 14:36:04 BST 2020


Git commit 2f193a9c04ce2e22cfc57747e29dc8a292682e8e by Jonathan Riddell.
Committed on 21/10/2020 at 13:35.
Pushed by jriddell into branch 'Neon/experimental'.

refresh patch including updated python3 foo

M  +13   -21   debian/patches/disableopengltests.patch
M  +18   -48   debian/patches/python3.patch
M  +27   -31   debian/patches/qtdeclarative.git-3e47ac319b0f53c43cc02a8356c2dec4f0daeef4.patch
M  +4    -6    debian/patches/riscv64-latomic.patch

https://invent.kde.org/neon/qt/qtdeclarative/commit/2f193a9c04ce2e22cfc57747e29dc8a292682e8e

diff --git a/debian/patches/disableopengltests.patch b/debian/patches/disableopengltests.patch
index c762ad9..dfefe9b 100644
--- a/debian/patches/disableopengltests.patch
+++ b/debian/patches/disableopengltests.patch
@@ -5,12 +5,10 @@ Origin: Debian
 Forwarded: not-needed - it is a limitation so far inside Debian
 Last-Update: 2019-03-14
 
-Index: qtdeclarative/tests/auto/auto.pro
+Index: qtdeclarative-everywhere-src-5.15.1/tests/auto/auto.pro
 ===================================================================
-diff --git a/.pc/disableopengltests.patch/tests/auto/auto.pro b/tests/auto/auto.pro
-index 1e80f1bf65..591fe27258 100644
---- a/.pc/disableopengltests.patch/tests/auto/auto.pro
-+++ b/tests/auto/auto.pro
+--- qtdeclarative-everywhere-src-5.15.1.orig/tests/auto/auto.pro
++++ qtdeclarative-everywhere-src-5.15.1/tests/auto/auto.pro
 @@ -11,7 +11,6 @@ SUBDIRS=\
  
  qtHaveModule(gui):qtConfig(opengl(es1|es2)?) {
@@ -19,13 +17,11 @@ index 1e80f1bf65..591fe27258 100644
  
  }
  
-Index: qtdeclarative/tests/auto/qml/debugger/debugger.pro
+Index: qtdeclarative-everywhere-src-5.15.1/tests/auto/qml/debugger/debugger.pro
 ===================================================================
-diff --git a/.pc/disableopengltests.patch/tests/auto/qml/debugger/debugger.pro b/tests/auto/qml/debugger/debugger.pro
-index 5c328fbfcc..9da4ac4232 100644
---- a/.pc/disableopengltests.patch/tests/auto/qml/debugger/debugger.pro
-+++ b/tests/auto/qml/debugger/debugger.pro
-@@ -7,7 +7,6 @@ PUBLICTESTS += \
+--- qtdeclarative-everywhere-src-5.15.1.orig/tests/auto/qml/debugger/debugger.pro
++++ qtdeclarative-everywhere-src-5.15.1/tests/auto/qml/debugger/debugger.pro
+@@ -8,7 +8,6 @@ PUBLICTESTS += \
      qqmlenginedebugservice \
      qqmldebugjs \
      qqmlinspector \
@@ -33,12 +29,10 @@ index 5c328fbfcc..9da4ac4232 100644
      qpacketprotocol \
      qqmlenginedebuginspectorintegrationtest \
      qqmlenginecontrol \
-Index: qtdeclarative/tests/auto/qml/qml.pro
+Index: qtdeclarative-everywhere-src-5.15.1/tests/auto/qml/qml.pro
 ===================================================================
-diff --git a/.pc/disableopengltests.patch/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro
-index db9bb52010..3c74333c69 100644
---- a/.pc/disableopengltests.patch/tests/auto/qml/qml.pro
-+++ b/tests/auto/qml/qml.pro
+--- qtdeclarative-everywhere-src-5.15.1.orig/tests/auto/qml/qml.pro
++++ qtdeclarative-everywhere-src-5.15.1/tests/auto/qml/qml.pro
 @@ -25,7 +25,6 @@ PUBLICTESTS += \
      qqmlmoduleplugin \
      qqmlnotifier \
@@ -58,12 +52,10 @@ index db9bb52010..3c74333c69 100644
  qtConfig(private_tests): \
      SUBDIRS += $$PRIVATETESTS
  
-Index: qtdeclarative/tests/auto/quick/quick.pro
+Index: qtdeclarative-everywhere-src-5.15.1/tests/auto/quick/quick.pro
 ===================================================================
-diff --git a/.pc/disableopengltests.patch/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro
-index b6ffdc0f7e..6cee6b75a5 100644
---- a/.pc/disableopengltests.patch/tests/auto/quick/quick.pro
-+++ b/tests/auto/quick/quick.pro
+--- qtdeclarative-everywhere-src-5.15.1.orig/tests/auto/quick/quick.pro
++++ qtdeclarative-everywhere-src-5.15.1/tests/auto/quick/quick.pro
 @@ -6,9 +6,7 @@ PUBLICTESTS += \
  
  qtConfig(opengl(es1|es2)?) {
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index 9c6c696..2b3180a 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -5,28 +5,11 @@ Author: Antonio Larrosa <alarrosa at suse.com>
 Forwarded: not-yet
 Last-Update: 2020-01-01
 
-Index: qtdeclarative/qtdeclarative.pro
+Index: qtdeclarative-everywhere-src-5.15.1/src/3rdparty/masm/disassembler/udis86/itab.py
 ===================================================================
-diff --git a/.pc/python3.patch/qtdeclarative.pro b/qtdeclarative.pro
-index 5b94da9b69..0e3496ce80 100644
---- a/.pc/python3.patch/qtdeclarative.pro
-+++ b/qtdeclarative.pro
-@@ -2,7 +2,7 @@ CONFIG += tests_need_tools examples_need_tools
- load(qt_parts)
- 
- !python_available {
--    py_out = $$system('python -c "print(1)"')
-+    py_out = $$system('python3 -c "print(1)"')
-     !equals(py_out, 1): error("Building QtQml requires Python.")
-     tmp = python_available
-     CONFIG += $$tmp
-Index: qtdeclarative/src/3rdparty/masm/disassembler/udis86/itab.py
-===================================================================
-diff --git a/.pc/python3.patch/src/3rdparty/masm/disassembler/udis86/itab.py b/src/3rdparty/masm/disassembler/udis86/itab.py
-index 07e20a6e10..3d50ad0619 100644
---- a/.pc/python3.patch/src/3rdparty/masm/disassembler/udis86/itab.py
-+++ b/src/3rdparty/masm/disassembler/udis86/itab.py
-@@ -268,13 +268,13 @@ class UdItabGenerator( ud_opcode.UdOpcodeTables ):
+--- qtdeclarative-everywhere-src-5.15.1.orig/src/3rdparty/masm/disassembler/udis86/itab.py
++++ qtdeclarative-everywhere-src-5.15.1/src/3rdparty/masm/disassembler/udis86/itab.py
+@@ -268,13 +268,13 @@ class UdItabGenerator( ud_opcode.UdOpcod
              opr   = e[ 'operands' ]
              for i in range(len(opr)): 
                  if not (opr[i] in self.OperandDict.keys()):
@@ -42,12 +25,10 @@ index 07e20a6e10..3d50ad0619 100644
                  pfx_c.append( self.PrefixDict[p] )
              if len(e['prefixes']) == 0:
                  pfx_c.append( "P_none" )
-Index: qtdeclarative/src/3rdparty/masm/disassembler/udis86/ud_optable.py
+Index: qtdeclarative-everywhere-src-5.15.1/src/3rdparty/masm/disassembler/udis86/ud_optable.py
 ===================================================================
-diff --git a/.pc/python3.patch/src/3rdparty/masm/disassembler/udis86/ud_optable.py b/src/3rdparty/masm/disassembler/udis86/ud_optable.py
-index 5b5c55d3b8..3a246c7be7 100644
---- a/.pc/python3.patch/src/3rdparty/masm/disassembler/udis86/ud_optable.py
-+++ b/src/3rdparty/masm/disassembler/udis86/ud_optable.py
+--- qtdeclarative-everywhere-src-5.15.1.orig/src/3rdparty/masm/disassembler/udis86/ud_optable.py
++++ qtdeclarative-everywhere-src-5.15.1/src/3rdparty/masm/disassembler/udis86/ud_optable.py
 @@ -50,7 +50,7 @@ class UdOptableXmlParser:
              elif def_node.localName == 'vendor':
                  ven = ( def_node.firstChild.data );
@@ -82,27 +63,16 @@ index 5b5c55d3b8..3a246c7be7 100644
  
  
  def parse( xml, callback ):
-Index: qtdeclarative/src/3rdparty/masm/masm.pri
+Index: qtdeclarative-everywhere-src-5.15.1/src/qml/configure.pri
 ===================================================================
-diff --git a/.pc/python3.patch/src/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri
-index 1df4585aae..00038104ec 100644
---- a/.pc/python3.patch/src/3rdparty/masm/masm.pri
-+++ b/src/3rdparty/masm/masm.pri
-@@ -58,7 +58,7 @@ contains(DEFINES, WTF_USE_UDIS86=1) {
-     udis86.output = udis86_itab.h
-     udis86.input = ITAB
-     udis86.CONFIG += no_link
--    udis86.commands = python $$PWD/disassembler/udis86/itab.py ${QMAKE_FILE_IN}
-+    udis86.commands = python3 $$PWD/disassembler/udis86/itab.py ${QMAKE_FILE_IN}
-     QMAKE_EXTRA_COMPILERS += udis86
- 
-     udis86_tab_cfile.target = $$OUT_PWD/udis86_itab.c
-@@ -111,7 +111,7 @@ retgen.output = $$GENERATEDDIR/RegExpJit
- retgen.script = $$PWD/yarr/create_regex_tables
- retgen.input = retgen.script
- retgen.CONFIG += no_link
--retgen.commands = python $$retgen.script > ${QMAKE_FILE_OUT}
-+retgen.commands = python3 $$retgen.script > ${QMAKE_FILE_OUT}
- QMAKE_EXTRA_COMPILERS += retgen
+--- qtdeclarative-everywhere-src-5.15.1.orig/src/qml/configure.pri
++++ qtdeclarative-everywhere-src-5.15.1/src/qml/configure.pri
+@@ -1,7 +1,7 @@
+ equals(QMAKE_HOST.os, Windows): EXE_SUFFIX = .exe
  
- # Taken from WebKit/Tools/qmake/mkspecs/features/unix/default_post.prf
+ defineTest(qtConfTest_detectPython) {
+-    PYTHON_NAMES = python$$EXE_SUFFIX python2$${EXE_SUFFIX} python3$${EXE_SUFFIX} py$${EXE_SUFFIX}
++    PYTHON_NAMES = python3$${EXE_SUFFIX} python$$EXE_SUFFIX python2$${EXE_SUFFIX} python3$${EXE_SUFFIX} py$${EXE_SUFFIX}
+     for (name, PYTHON_NAMES) {
+         python_path = $$qtConfFindInPath("$$name")
+         !isEmpty(python_path): \
diff --git a/debian/patches/qtdeclarative.git-3e47ac319b0f53c43cc02a8356c2dec4f0daeef4.patch b/debian/patches/qtdeclarative.git-3e47ac319b0f53c43cc02a8356c2dec4f0daeef4.patch
index a8c2e01..c0df07a 100644
--- a/debian/patches/qtdeclarative.git-3e47ac319b0f53c43cc02a8356c2dec4f0daeef4.patch
+++ b/debian/patches/qtdeclarative.git-3e47ac319b0f53c43cc02a8356c2dec4f0daeef4.patch
@@ -22,10 +22,10 @@ Pick-to: 5.15
 Change-Id: I7f4060c2f46ae07611bedceca0d322c5f7f6affb
 ---
 
-diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp
-index d75247afdd7..6107128599e 100644
---- a/src/quick/items/qquickitemview.cpp
-+++ b/src/quick/items/qquickitemview.cpp
+Index: qtdeclarative-everywhere-src-5.15.1/src/quick/items/qquickitemview.cpp
+===================================================================
+--- qtdeclarative-everywhere-src-5.15.1.orig/src/quick/items/qquickitemview.cpp
++++ qtdeclarative-everywhere-src-5.15.1/src/quick/items/qquickitemview.cpp
 @@ -1393,7 +1393,7 @@ qreal QQuickItemView::maxYExtent() const
  {
      Q_D(const QQuickItemView);
@@ -44,10 +44,10 @@ index d75247afdd7..6107128599e 100644
  
      if (d->hData.maxExtentDirty) {
          d->maxExtent = d->maxExtentForAxis(d->hData, true);
-diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
-index 229850f2853..15deeb0b601 100644
---- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
-+++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+Index: qtdeclarative-everywhere-src-5.15.1/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+===================================================================
+--- qtdeclarative-everywhere-src-5.15.1.orig/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
++++ qtdeclarative-everywhere-src-5.15.1/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
 @@ -73,6 +73,8 @@ public:
      tst_QQuickListView();
  
@@ -57,7 +57,7 @@ index 229850f2853..15deeb0b601 100644
      void init();
      void cleanupTestCase();
      // Test QAbstractItemModel model types
-@@ -297,6 +299,8 @@ private slots:
+@@ -298,6 +300,8 @@ private slots:
  
      void requiredObjectListModel();
  
@@ -66,7 +66,7 @@ index 229850f2853..15deeb0b601 100644
  private:
      template <class T> void items(const QUrl &source);
      template <class T> void changed(const QUrl &source);
-@@ -10042,6 +10046,8 @@ void tst_QQuickListView::requiredObjectListModel()
+@@ -10067,6 +10071,8 @@ void tst_QQuickListView::requiredObjectL
      }
  }
  
@@ -75,11 +75,10 @@ index 229850f2853..15deeb0b601 100644
  QTEST_MAIN(tst_QQuickListView)
  
  #include "tst_qquicklistview.moc"
-diff --git a/tests/auto/quick/qquicklistview2/data/maxXExtent.qml b/tests/auto/quick/qquicklistview2/data/maxXExtent.qml
-new file mode 100644
-index 00000000000..3a50ae9eddb
+Index: qtdeclarative-everywhere-src-5.15.1/tests/auto/quick/qquicklistview2/data/maxXExtent.qml
+===================================================================
 --- /dev/null
-+++ b/tests/auto/quick/qquicklistview2/data/maxXExtent.qml
++++ qtdeclarative-everywhere-src-5.15.1/tests/auto/quick/qquicklistview2/data/maxXExtent.qml
 @@ -0,0 +1,54 @@
 +/****************************************************************************
 +**
@@ -135,11 +134,10 @@ index 00000000000..3a50ae9eddb
 +        }
 +    }
 +}
-diff --git a/tests/auto/quick/qquicklistview2/data/maxYExtent.qml b/tests/auto/quick/qquicklistview2/data/maxYExtent.qml
-new file mode 100644
-index 00000000000..2c73092aad6
+Index: qtdeclarative-everywhere-src-5.15.1/tests/auto/quick/qquicklistview2/data/maxYExtent.qml
+===================================================================
 --- /dev/null
-+++ b/tests/auto/quick/qquicklistview2/data/maxYExtent.qml
++++ qtdeclarative-everywhere-src-5.15.1/tests/auto/quick/qquicklistview2/data/maxYExtent.qml
 @@ -0,0 +1,55 @@
 +/****************************************************************************
 +**
@@ -196,11 +194,10 @@ index 00000000000..2c73092aad6
 +        }
 +    }
 +}
-diff --git a/tests/auto/quick/qquicklistview2/qquicklistview2.pro b/tests/auto/quick/qquicklistview2/qquicklistview2.pro
-new file mode 100644
-index 00000000000..1128c242c7d
+Index: qtdeclarative-everywhere-src-5.15.1/tests/auto/quick/qquicklistview2/qquicklistview2.pro
+===================================================================
 --- /dev/null
-+++ b/tests/auto/quick/qquicklistview2/qquicklistview2.pro
++++ qtdeclarative-everywhere-src-5.15.1/tests/auto/quick/qquicklistview2/qquicklistview2.pro
 @@ -0,0 +1,12 @@
 +CONFIG += testcase
 +TARGET = tst_qquicklistview2
@@ -214,11 +211,10 @@ index 00000000000..1128c242c7d
 +TESTDATA = data/*
 +
 +QT += core-private gui-private qml-private quick-private testlib qmltest
-diff --git a/tests/auto/quick/qquicklistview2/tst_qquicklistview2.cpp b/tests/auto/quick/qquicklistview2/tst_qquicklistview2.cpp
-new file mode 100644
-index 00000000000..916c8730f4f
+Index: qtdeclarative-everywhere-src-5.15.1/tests/auto/quick/qquicklistview2/tst_qquicklistview2.cpp
+===================================================================
 --- /dev/null
-+++ b/tests/auto/quick/qquicklistview2/tst_qquicklistview2.cpp
++++ qtdeclarative-everywhere-src-5.15.1/tests/auto/quick/qquicklistview2/tst_qquicklistview2.cpp
 @@ -0,0 +1,114 @@
 +/****************************************************************************
 +**
@@ -334,11 +330,11 @@ index 00000000000..916c8730f4f
 +QTEST_MAIN(tst_QQuickListView2)
 +
 +#include "tst_qquicklistview2.moc"
-diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro
-index da119c8b270..3c2e20f1735 100644
---- a/tests/auto/quick/quick.pro
-+++ b/tests/auto/quick/quick.pro
-@@ -68,6 +68,7 @@ QUICKTESTS += \
+Index: qtdeclarative-everywhere-src-5.15.1/tests/auto/quick/quick.pro
+===================================================================
+--- qtdeclarative-everywhere-src-5.15.1.orig/tests/auto/quick/quick.pro
++++ qtdeclarative-everywhere-src-5.15.1/tests/auto/quick/quick.pro
+@@ -64,6 +64,7 @@ QUICKTESTS += \
      qquickitem2 \
      qquickitemlayer \
      qquicklistview \
diff --git a/debian/patches/riscv64-latomic.patch b/debian/patches/riscv64-latomic.patch
index 31aa45a..ab86ed6 100644
--- a/debian/patches/riscv64-latomic.patch
+++ b/debian/patches/riscv64-latomic.patch
@@ -3,13 +3,11 @@ Author: Aurelien Jarno <aurel32 at debian.org>
 Forwarded: no
 Last-Update: 2020-01-01
 
-Index: qtdeclarative/src/qml/qml.pro
+Index: qtdeclarative-everywhere-src-5.15.1/src/qml/qml.pro
 ===================================================================
-diff --git a/.pc/riscv64-latomic.patch/src/qml/qml.pro b/src/qml/qml.pro
-index 2cbe8ec564..dc98f4f16d 100644
---- a/.pc/riscv64-latomic.patch/src/qml/qml.pro
-+++ b/src/qml/qml.pro
-@@ -17,6 +17,9 @@ solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
+--- qtdeclarative-everywhere-src-5.15.1.orig/src/qml/qml.pro
++++ qtdeclarative-everywhere-src-5.15.1/src/qml/qml.pro
+@@ -20,6 +20,9 @@ solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O
  # Ensure this gcc optimization is switched off for mips platforms to avoid trouble with JIT.
  gcc:isEqual(QT_ARCH, "mips"): QMAKE_CXXFLAGS += -fno-reorder-blocks
  


More information about the Neon-commits mailing list