From 8ddc3903582299325abc6212818e324e07f4301d46914d208111254d6d0113df Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Fri, 11 Sep 2020 06:29:59 +0000 Subject: [PATCH] Qt 5.15.1 - not built yet OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtdoc?expand=0&rev=12 --- libqt5-qtdoc.changes | 10 +++ libqt5-qtdoc.spec | 8 +-- qt-everywhere-src-5.15.0.tar.xz | 3 - qt-everywhere-src-5.15.1.tar.xz | 3 + qtdeclarative-switch-to-python3.patch | 96 --------------------------- 5 files changed, 16 insertions(+), 104 deletions(-) delete mode 100644 qt-everywhere-src-5.15.0.tar.xz create mode 100644 qt-everywhere-src-5.15.1.tar.xz delete mode 100644 qtdeclarative-switch-to-python3.patch diff --git a/libqt5-qtdoc.changes b/libqt5-qtdoc.changes index 7008043..f46177e 100644 --- a/libqt5-qtdoc.changes +++ b/libqt5-qtdoc.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 10 07:57:11 UTC 2020 - Fabian Vogt + +- Update to 5.15.1: + * New bugfix release + * For more details please see: + http://code.qt.io/cgit/qt/qt.git/plain/dist/changes-5.15.1/?h=5.15.1 +- Drop patches, now upstream: + * qtdeclarative-switch-to-python3.patch + ------------------------------------------------------------------- Mon Aug 21 11:11:52 UTC 2020 - Michel Normand diff --git a/libqt5-qtdoc.spec b/libqt5-qtdoc.spec index d7f2ada..fe3fd07 100644 --- a/libqt5-qtdoc.spec +++ b/libqt5-qtdoc.spec @@ -17,18 +17,16 @@ # nodebuginfo -%define real_version 5.15.0 -%define tar_version qt-everywhere-src-5.15.0 +%define real_version 5.15.1 +%define tar_version qt-everywhere-src-5.15.1 Name: libqt5-qtdoc -Version: 5.15.0 +Version: 5.15.1 Release: 0 Summary: Qt 5 API Documentation License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only Group: Documentation/Other URL: https://www.qt.io Source: https://download.qt.io/official_releases/qt/5.15/%{real_version}/single/%{tar_version}.tar.xz -# PATCH-FIX-OPENSUSE -Patch101: qtdeclarative-switch-to-python3.patch # Breaks make_jobs #!BuildIgnore: cmake BuildRequires: alsa-devel diff --git a/qt-everywhere-src-5.15.0.tar.xz b/qt-everywhere-src-5.15.0.tar.xz deleted file mode 100644 index e61d48e..0000000 --- a/qt-everywhere-src-5.15.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:22b63d7a7a45183865cc4141124f12b673e7a17b1fe2b91e433f6547c5d548c3 -size 592401236 diff --git a/qt-everywhere-src-5.15.1.tar.xz b/qt-everywhere-src-5.15.1.tar.xz new file mode 100644 index 0000000..d08948f --- /dev/null +++ b/qt-everywhere-src-5.15.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:44da876057e21e1be42de31facd99be7d5f9f07893e1ea762359bcee0ef64ee9 +size 581305680 diff --git a/qtdeclarative-switch-to-python3.patch b/qtdeclarative-switch-to-python3.patch deleted file mode 100644 index d3c08be..0000000 --- a/qtdeclarative-switch-to-python3.patch +++ /dev/null @@ -1,96 +0,0 @@ -Subject: Make qtdeclarative build with python3 -From: Max Lin -From: Antonio Larrosa -Index: qtdeclarative-everywhere-src-5.12.0-alpha/qtdeclarative/qtdeclarative.pro -=================================================================== ---- qtdeclarative-everywhere-src-5.12.0-alpha.orig/qtdeclarative/qtdeclarative.pro -+++ qtdeclarative-everywhere-src-5.12.0-alpha/qtdeclarative/qtdeclarative.pro -@@ -2,7 +2,7 @@ CONFIG += tests_need_tools examples_need - 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-everywhere-src-5.12.0-alpha/qtdeclarative/src/3rdparty/masm/masm.pri -=================================================================== ---- qtdeclarative-everywhere-src-5.12.0-alpha.orig/qtdeclarative/src/3rdparty/masm/masm.pri -+++ qtdeclarative-everywhere-src-5.12.0-alpha/qtdeclarative/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 -@@ -113,7 +113,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 - - # Taken from WebKit/Tools/qmake/mkspecs/features/unix/default_post.prf -Index: qtdeclarative-everywhere-src-5.12.0-alpha/qtdeclarative/src/3rdparty/masm/disassembler/udis86/itab.py -=================================================================== ---- qtdeclarative-everywhere-src-5.12.0-alpha.orig/qtdeclarative/src/3rdparty/masm/disassembler/udis86/itab.py -+++ qtdeclarative-everywhere-src-5.12.0-alpha/qtdeclarative/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()): -- print "error: invalid operand declaration: %s\n" % opr[i] -+ print("error: invalid operand declaration: %s\n" % opr[i]) - opr_c[i] = "O_" + opr[i] - opr = "%s %s %s" % (opr_c[0] + ",", opr_c[1] + ",", opr_c[2]) - - for p in e['prefixes']: - if not ( p in self.PrefixDict.keys() ): -- print "error: invalid prefix specification: %s \n" % pfx -+ print("error: invalid prefix specification: %s \n" % pfx) - pfx_c.append( self.PrefixDict[p] ) - if len(e['prefixes']) == 0: - pfx_c.append( "P_none" ) -Index: qtdeclarative-everywhere-src-5.12.0-alpha/qtdeclarative/src/3rdparty/masm/disassembler/udis86/ud_optable.py -=================================================================== ---- qtdeclarative-everywhere-src-5.12.0-alpha.orig/qtdeclarative/src/3rdparty/masm/disassembler/udis86/ud_optable.py -+++ qtdeclarative-everywhere-src-5.12.0-alpha/qtdeclarative/src/3rdparty/masm/disassembler/udis86/ud_optable.py -@@ -50,7 +50,7 @@ class UdOptableXmlParser: - elif def_node.localName == 'vendor': - ven = ( def_node.firstChild.data ); - else: -- print "warning: invalid node - %s" % def_node.localName -+ print("warning: invalid node - %s" % def_node.localName) - continue - return ( pfx, opc, opr, ven ) - -@@ -65,7 +65,7 @@ class UdOptableXmlParser: - if not insnNode.localName: - continue - if insnNode.localName != "instruction": -- print "warning: invalid insn node - %s" % insnNode.localName -+ print("warning: invalid insn node - %s" % insnNode.localName) - continue - - mnemonic = insnNode.getElementsByTagName( 'mnemonic' )[ 0 ].firstChild.data -@@ -84,11 +84,11 @@ class UdOptableXmlParser: - - - def printFn( pfx, mnm, opc, opr, ven ): -- print 'def: ', -+ print('def: ', end='') - if len( pfx ): -- print ' '.join( pfx ), -- print "%s %s %s %s" % \ -- ( mnm, ' '.join( opc ), ' '.join( opr ), ven ) -+ print(' '.join( pfx ), end='') -+ print("%s %s %s %s" % \ -+ ( mnm, ' '.join( opc ), ' '.join( opr ), ven )) - - - def parse( xml, callback ):