From 5b09f56cb23e55cbb0fcf7df058433df4955a264b3085d8414582f98d013ab41 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 31 Dec 2018 08:46:15 +0000 Subject: [PATCH] Accepting request 656556 from KDE:Qt5 Qt 5.12.0 final OBS-URL: https://build.opensuse.org/request/show/656556 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtdoc?expand=0&rev=30 --- libqt5-qtdoc.changes | 66 ++++++++++++++++++ libqt5-qtdoc.spec | 10 +-- qt-everywhere-src-5.11.2.tar.xz | 3 - qt-everywhere-src-5.12.0.tar.xz | 3 + qtdeclarative-switch-to-python3.patch | 96 +++++++++++++++++++++++++++ 5 files changed, 171 insertions(+), 7 deletions(-) delete mode 100644 qt-everywhere-src-5.11.2.tar.xz create mode 100644 qt-everywhere-src-5.12.0.tar.xz create mode 100644 qtdeclarative-switch-to-python3.patch diff --git a/libqt5-qtdoc.changes b/libqt5-qtdoc.changes index 03c3335..5141a9c 100644 --- a/libqt5-qtdoc.changes +++ b/libqt5-qtdoc.changes @@ -1,3 +1,69 @@ +------------------------------------------------------------------- +Thu Dec 6 13:36:34 UTC 2018 - fabian@ritter-vogt.de + +- Update to 5.12.0: + * New feature release + * For more details please see: + * http://code.qt.io/cgit/qt/qt.git/plain/dist/changes-5.12.0/?h=v5.12.0 + +------------------------------------------------------------------- +Mon Dec 3 08:16:44 UTC 2018 - fabian@ritter-vogt.de + +- Update to 5.12.0-rc2: + * New bugfix release + * Only important bugfixes +- Changelog for Qt 5.12.0: + * http://code.qt.io/cgit/qt/qt.git/plain/dist/changes-5.12.0/?h=5.12.0 + +------------------------------------------------------------------- +Tue Nov 27 15:41:53 UTC 2018 - Fabian Vogt + +- Add patch from libqt5-qtdeclarative: + * qtdeclarative-switch-to-python3.patch + +------------------------------------------------------------------- +Thu Nov 22 13:39:21 UTC 2018 - fabian@ritter-vogt.de + +- Update to 5.12.0-rc: + * New bugfix release + * No changelog available + +------------------------------------------------------------------- +Thu Nov 8 15:25:01 UTC 2018 - fabian@ritter-vogt.de + +- Update to 5.12.0-beta4: + * New bugfix release + * No changelog available + +------------------------------------------------------------------- +Fri Oct 26 07:20:45 UTC 2018 - fabian@ritter-vogt.de + +- Update to 5.12.0-beta3: + * New bugfix release + * No changelog available + +------------------------------------------------------------------- +Wed Oct 17 08:23:21 UTC 2018 - fabian@ritter-vogt.de + +- Update to 5.12.0-beta2: + * New bugfix release + * No changelog available + +------------------------------------------------------------------- +Fri Oct 5 19:22:33 UTC 2018 - fabian@ritter-vogt.de + +- Update to 5.12.0-beta1: + * New bugfix release + * No changelog available + +------------------------------------------------------------------- +Tue Oct 2 07:33:57 UTC 2018 - fabian@ritter-vogt.de + +- Update to 5.12.0-alpha: + * New feature release + * For more details please see: + * http://wiki.qt.io/New_Features_in_Qt_5.12 + ------------------------------------------------------------------- Fri Sep 21 07:59:12 UTC 2018 - fabian@ritter-vogt.de diff --git a/libqt5-qtdoc.spec b/libqt5-qtdoc.spec index b49aa54..ddca819 100644 --- a/libqt5-qtdoc.spec +++ b/libqt5-qtdoc.spec @@ -17,18 +17,20 @@ # nodebuginfo -%define real_version 5.11.2 -%define tar_version qt-everywhere-src-5.11.2 +%define real_version 5.12.0 +%define tar_version qt-everywhere-src-5.12.0 Name: libqt5-qtdoc -Version: 5.11.2 +Version: 5.12.0 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.11/%{real_version}/single/%{tar_version}.tar.xz +Source: https://download.qt.io/official_releases/qt/5.12/%{real_version}/single/%{tar_version}.tar.xz # PATCH-FIX-OPENSUSE Patch100: workaround-qdoc-failure.patch +# PATCH-FIX-OPENSUSE +Patch101: qtdeclarative-switch-to-python3.patch BuildRequires: alsa-devel BuildRequires: bison BuildRequires: clang diff --git a/qt-everywhere-src-5.11.2.tar.xz b/qt-everywhere-src-5.11.2.tar.xz deleted file mode 100644 index f2e7e34..0000000 --- a/qt-everywhere-src-5.11.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c6104b840b6caee596fa9a35bc5f57f67ed5a99d6a36497b6fe66f990a53ca81 -size 489621768 diff --git a/qt-everywhere-src-5.12.0.tar.xz b/qt-everywhere-src-5.12.0.tar.xz new file mode 100644 index 0000000..d4a5590 --- /dev/null +++ b/qt-everywhere-src-5.12.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:356f42d9087718f22f03d13d0c2cdfb308f91dc3cf0c6318bed33f2094cd9d6c +size 510292820 diff --git a/qtdeclarative-switch-to-python3.patch b/qtdeclarative-switch-to-python3.patch new file mode 100644 index 0000000..d3c08be --- /dev/null +++ b/qtdeclarative-switch-to-python3.patch @@ -0,0 +1,96 @@ +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 ):