[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#897667: marked as done (qt4-x11: Please add support for new architecture "riscv64")

Your message dated Sun, 06 May 2018 17:24:52 +0000
with message-id <E1fFNP2-000D7q-EF@fasolo.debian.org>
and subject line Bug#897667: fixed in qt4-x11 4:4.8.7+dfsg-16
has caused the Debian Bug report #897667,
regarding qt4-x11: Please add support for new architecture "riscv64"
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
897667: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=897667
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Source: qt4-x11
Version: 4:4.8.7+dfsg-15
Severity: normal
Tags: patch upstream
User: debian-riscv@lists.debian.org
Usertags: riscv64

Hello,

We need support in this package to bootstrap the riscv64 architecture.

Yes, I know that you want to get rid of Qt4 once and for all and ASAP, and I
fully agree with the goal.  However, a bazillion of packages depend on qt4-x11
indirectly, for example libsdl2 needs it (through fcitx, then
cmake-extra-modules, then qt5-qmake, then qtchooser that depends on Qt4 stuff);
many package still need it directly; etc.

So without support in this package, progress becomes impossible at an early
stage.


I am attaching a patch that adds support for the architecture.  AFAIK (please
confirm) upstream doesn't accept patches since long ago, so no point in sending
it there.  For Qt5 we're already sending it upstream, e.g. webkit stuff.

It would be great if you could include these changes and release a new version
for unstable, for the time being the patched version lives in "unreleased".


Thanks and cheers.
--
Manuel A. Fernandez Montecelo <mafm@debian.org>

diff -Nru qt4-x11-4.8.7+dfsg/debian/changelog qt4-x11-4.8.7+dfsg/debian/changelog
--- qt4-x11-4.8.7+dfsg/debian/changelog	2018-04-18 22:45:31.000000000 +0200
+++ qt4-x11-4.8.7+dfsg/debian/changelog	2018-04-27 21:01:58.000000000 +0200
@@ -1,3 +1,10 @@
+qt4-x11 (4:4.8.7+dfsg-15+0.riscv64.1) unreleased; urgency=medium
+
+  * Non-maintainer upload.
+  * riscv64 support
+
+ -- Manuel A. Fernandez Montecelo <mafm@debian.org>  Fri, 27 Apr 2018 21:01:58 +0200
+
 qt4-x11 (4:4.8.7+dfsg-15) unstable; urgency=medium
 
   * Actually upload it to unstable.
diff -Nru qt4-x11-4.8.7+dfsg/debian/patches/riscv64-support.patch qt4-x11-4.8.7+dfsg/debian/patches/riscv64-support.patch
--- qt4-x11-4.8.7+dfsg/debian/patches/riscv64-support.patch	1970-01-01 01:00:00.000000000 +0100
+++ qt4-x11-4.8.7+dfsg/debian/patches/riscv64-support.patch	2018-04-27 21:01:58.000000000 +0200
@@ -0,0 +1,86 @@
+--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
++++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+@@ -167,6 +167,15 @@
+ #define WTF_CPU_BIG_ENDIAN 1
+ #endif
+ 
++/* CPU(RISCV64) - RISC-V 64-bit */
++#if defined(__riscv)
++#if (__riscv_xlen == 64)
++#define WTF_CPU_RISCV64 1
++#elif (__riscv_xlen == 32)
++#define WTF_CPU_RISCV32 1
++#endif
++#endif
++
+ /* CPU(SH4) - SuperH SH-4 */
+ #if defined(__SH4__)
+ #define WTF_CPU_SH4 1
+@@ -919,7 +928,7 @@
+ #endif
+ 
+ #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
+-#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) || CPU(S390X)
++#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) || CPU(S390X) || CPU(RISCV64)
+ #define WTF_USE_JSVALUE64 1
+ #elif CPU(ARM) || CPU(PPC64)
+ #define WTF_USE_JSVALUE32 1
+--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
++++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
+@@ -187,6 +187,15 @@
+ #define WTF_CPU_BIG_ENDIAN 1
+ #endif
+ 
++/* CPU(RISCV64) - RISC-V 64-bit */
++#if defined(__riscv)
++#if (__riscv_xlen == 64)
++#define WTF_CPU_RISCV64 1
++#elif (__riscv_xlen == 32)
++#define WTF_CPU_RISCV32 1
++#endif
++#endif
++
+ /* CPU(SH4) - SuperH SH-4 */
+ #if defined(__SH4__)
+ #define WTF_CPU_SH4 1
+@@ -1000,6 +1009,7 @@
+ #if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \
+     || (CPU(IA64) && !CPU(IA64_32)) \
+     || CPU(ALPHA) \
++    || CPU(RISCV64) \
+     || CPU(SPARC64) \
+     || CPU(S390X) \
+     || CPU(PPC64) \
+--- a/src/corelib/arch/qatomic_arch.h
++++ b/src/corelib/arch/qatomic_arch.h
+@@ -76,6 +76,8 @@
+ #  include "QtCore/qatomic_parisc.h"
+ #elif defined(QT_ARCH_POWERPC)
+ #  include "QtCore/qatomic_powerpc.h"
++#elif defined(QT_ARCH_RISCV64)
++#  include "QtCore/qatomic_generic.h"
+ #elif defined(QT_ARCH_S390)
+ #  include "QtCore/qatomic_s390.h"
+ #elif defined(QT_ARCH_SPARC)
+--- /dev/null
++++ b/src/corelib/arch/riscv64/arch.pri
+@@ -0,0 +1,8 @@
++#
++# RISC-V 64 architecture
++#
++
++unix:SOURCES += ../generic/qatomic_generic_unix.cpp
++win32:SOURCES += ../generic/qatomic_generic_windows.cpp
++
++QMAKE_CXXFLAGS += -fpermissive
+--- a/src/dbus/qdbusintegrator.cpp
++++ b/src/dbus/qdbusintegrator.cpp
+@@ -73,7 +73,7 @@
+ static bool isDebugging;
+ #define qDBusDebug              if (!::isDebugging); else qDebug
+ 
+-Q_GLOBAL_STATIC_WITH_ARGS(const QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
++Q_GLOBAL_STATIC_WITH_ARGS(QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
+ 
+ static inline QString dbusServiceString()
+ { return *orgFreedesktopDBusString(); }
diff -Nru qt4-x11-4.8.7+dfsg/debian/patches/series qt4-x11-4.8.7+dfsg/debian/patches/series
--- qt4-x11-4.8.7+dfsg/debian/patches/series	2017-08-15 20:11:06.000000000 +0200
+++ qt4-x11-4.8.7+dfsg/debian/patches/series	2018-04-27 20:46:10.000000000 +0200
@@ -64,3 +64,4 @@
 add-mate-support.patch
 add-lxde-support.patch
 openssl_1.1.patch
+riscv64-support.patch
diff -Nru qt4-x11-4.8.7+dfsg/debian/rules qt4-x11-4.8.7+dfsg/debian/rules
--- qt4-x11-4.8.7+dfsg/debian/rules	2017-08-15 20:11:06.000000000 +0200
+++ qt4-x11-4.8.7+dfsg/debian/rules	2018-04-27 20:36:19.000000000 +0200
@@ -69,8 +69,8 @@
 ifeq ($(DEB_HOST_ARCH_OS),linux)
   ifneq (,$(filter $(DEB_HOST_ARCH),alpha ia64 mips64 mips64el))
 	platform_arg = linux-g++
-  else ifeq ($(DEB_HOST_ARCH),arm64)
-	# arm64 does not uses -m64, so avoid linux-g++-64.
+  else ifneq (,$(filter $(DEB_HOST_ARCH),arm64 riscv64))
+	# arm64 and riscv64 do not use -m64, so avoid linux-g++-64.
 	platform_arg = linux-g++
   else ifeq ($(DEB_HOST_ARCH_BITS),64)
 	platform_arg = linux-g++-64
@@ -85,7 +85,7 @@
   endif
 endif
 
-no_pch_architectures := arm64 armhf ia64 powerpc powerpcspe ppc64 ppc64el
+no_pch_architectures := arm64 armhf ia64 powerpc powerpcspe ppc64 ppc64el riscv64
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(no_pch_architectures)))
 	extra_configure_opts += -no-pch
 endif

--- End Message ---
--- Begin Message --- 
Source: qt4-x11
Source-Version: 4:4.8.7+dfsg-16

We believe that the bug you reported is fixed in the latest version of
qt4-x11, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 897667@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> (supplier of updated qt4-x11 package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Format: 1.8
Date: Fri, 04 May 2018 22:53:17 -0300
Source: qt4-x11
Binary: libqtcore4 qtcore4-l10n libqtgui4 libqt4-network libqt4-opengl libqt4-script libqt4-scripttools libqt4-sql libqt4-sql-ibase libqt4-sql-mysql libqt4-sql-odbc libqt4-sql-psql libqt4-sql-sqlite libqt4-sql-sqlite2 libqt4-sql-tds libqt4-svg libqt4-xml libqt4-xmlpatterns libqt4-dbus libqtdbus4 libqt4-qt3support libqt4-designer libqt4-help libqt4-test libqt4-phonon libqt4-declarative libqt4-declarative-folderlistmodel libqt4-declarative-gestures libqt4-declarative-particles libqt4-declarative-shaders libqt4-dev libqt4-dev-bin libqt4-opengl-dev libqt4-dbg libqt4-designer-dbg libqt4-qt3support-dbg libqt4-script-dbg libqt4-xmlpatterns-dbg qt4-bin-dbg qt4-demos-dbg qt4-designer qt4-dev-tools qt4-qmake qt4-qtconfig qt4-demos qt4-qmlviewer qt4-linguist-tools qdbus qt4-doc qt4-doc-html qt4-default
Architecture: source
Version: 4:4.8.7+dfsg-16
Distribution: unstable
Urgency: medium
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Changed-By: Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>
Description:
 libqt4-dbg - Qt 4 library debugging symbols
 libqt4-dbus - Qt 4 D-Bus module
 libqt4-declarative - Qt 4 Declarative module
 libqt4-declarative-folderlistmodel - Qt 4 folderlistmodel QML plugin
 libqt4-declarative-gestures - Qt 4 gestures QML plugin
 libqt4-declarative-particles - Qt 4 particles QML plugin
 libqt4-declarative-shaders - Qt 4 shaders QML plugin
 libqt4-designer - Qt 4 designer module
 libqt4-designer-dbg - Qt 4 designer library debugging symbols
 libqt4-dev - Qt 4 development files
 libqt4-dev-bin - Qt 4 development programs
 libqt4-help - Qt 4 help module
 libqt4-network - Qt 4 network module
 libqt4-opengl - Qt 4 OpenGL module
 libqt4-opengl-dev - Qt 4 OpenGL library development files
 libqt4-phonon - Qt 4 Phonon module
 libqt4-qt3support - Qt 3 compatibility library for Qt 4
 libqt4-qt3support-dbg - Qt 3 compatibility library for Qt 4 debugging symbols
 libqt4-script - Qt 4 script module
 libqt4-script-dbg - Qt 4 script library debugging symbols
 libqt4-scripttools - Qt 4 script tools module
 libqt4-sql - Qt 4 SQL module
 libqt4-sql-ibase - Qt 4 InterBase/FireBird database driver
 libqt4-sql-mysql - Qt 4 MySQL database driver
 libqt4-sql-odbc - Qt 4 ODBC database driver
 libqt4-sql-psql - Qt 4 PostgreSQL database driver
 libqt4-sql-sqlite - Qt 4 SQLite 3 database driver
 libqt4-sql-sqlite2 - Qt 4 SQLite 2 database driver
 libqt4-sql-tds - Qt 4 FreeTDS database driver
 libqt4-svg - Qt 4 SVG module
 libqt4-test - Qt 4 test module
 libqt4-xml - Qt 4 XML module
 libqt4-xmlpatterns - Qt 4 XML patterns module
 libqt4-xmlpatterns-dbg - Qt 4 XML patterns library debugging symbols
 libqtcore4 - Qt 4 core module
 libqtdbus4 - Qt 4 D-Bus module library
 libqtgui4  - Qt 4 GUI module
 qdbus      - Qt 4 D-Bus tool
 qt4-bin-dbg - Qt 4 binaries debugging symbols
 qt4-default - Qt 4 development defaults package
 qt4-demos  - Qt 4 examples and demos
 qt4-demos-dbg - Qt 4 examples and demos debugging symbols
 qt4-designer - graphical designer for Qt 4 applications
 qt4-dev-tools - Qt 4 development tools
 qt4-doc    - Qt 4 API documentation
 qt4-doc-html - Qt 4 API documentation (HTML format)
 qt4-linguist-tools - Qt 4 Linguist tools
 qt4-qmake  - Qt 4 qmake Makefile generator tool
 qt4-qmlviewer - Qt 4 QML viewer
 qt4-qtconfig - Qt 4 configuration tool
 qtcore4-l10n - Qt 4 core module translations
Closes: 897667
Changes:
 qt4-x11 (4:4.8.7+dfsg-16) unstable; urgency=medium
 .
   * Update symbols files with buildds' logs.
   * Add a patch by Manuel A. Fernandez Montecelo to provide riscv64 support
    (Closes: #897667).
Checksums-Sha1:
 80658e372d5d1388b56687fd3cd4d502d75d4d24 5959 qt4-x11_4.8.7+dfsg-16.dsc
 fd1bfd39893b50ffdfa4561eb0cdfd75b3d583d1 325704 qt4-x11_4.8.7+dfsg-16.debian.tar.xz
 3fda2bf4c974ad30f8225c2c80c9c50d59795167 9809 qt4-x11_4.8.7+dfsg-16_source.buildinfo
Checksums-Sha256:
 0f27f25fc55c59139c9d776305587d21b707ef9b664fa20ad2a15c8dc81dddf4 5959 qt4-x11_4.8.7+dfsg-16.dsc
 4eb20d24fe44a99ec7b868f7c3747d7325bb0a00dc560eca0e3917a2c526a778 325704 qt4-x11_4.8.7+dfsg-16.debian.tar.xz
 99be8af9eb915b5ece786dfd437f124bc7c4eb5c8357463fbac8bf254ddc3480 9809 qt4-x11_4.8.7+dfsg-16_source.buildinfo
Files:
 909ace7c5db033f794efd3f1555c3678 5959 libs optional qt4-x11_4.8.7+dfsg-16.dsc
 15a624ccb00014ace940d099105ef2c2 325704 libs optional qt4-x11_4.8.7+dfsg-16.debian.tar.xz
 5794922bc2d276d7602604ddc224c757 9809 libs optional qt4-x11_4.8.7+dfsg-16_source.buildinfo

-----BEGIN PGP SIGNATURE-----

iQJIBAEBCAAyFiEEEt36hKwjsrvwSzE8q2RfQGKGp9AFAlrvMnQUHGxpc2FuZHJv
QGRlYmlhbi5vcmcACgkQq2RfQGKGp9CUGA//b9ExH3cyhAdZfJgAKMlmPH+5VeQf
cpZIAzJCzPBD+IDD9akQsiSOIjDVuJZWLBUSBshA5ttBnek6r0lUYJybhVTjjGDX
C5WOR/eaggkBuG+CvtGpRCDPgh9ugQCKhowEsbXsiVjZ6INxKVaSvirubzRcrxoY
kdz0CYvqYeZv32qgH5U+/mxEmjbsUN/18Nb+42HLWBVd+BL5Yh4otSIE7iNzErA7
P6yaU8cgxnKiOL//vF8eWxIdu7gYASpeMQ/33YZ/IfeSIHLNlrV3nQgPPAHRLVNF
rGlc8ygKhvh1O5JZe37v6xJc72+LiRUVfy5SNP3s1HCPXjlET5sPRhXPjgsijALS
LwrVgZg6cPDikp970pw0WA63fcNU4dpDusx76fFbVjt+7KqUFGlRjlJEV3J5lcbi
Hcx1vhlK3n/vegBKEH20lzcbWH5uU32hM2wQVrttr1NIIJYDNQ8ju//7hiszVmZZ
iAFtPs5XGOnnrU52jXeQyQD8jFABg82xY8ILSbgRo23FAGBQwNHXcMO/jY2mhUj5
csEJrUIr4snvR3tma/HcFsHPh2ksEdULlL0dgy/B7IvuP2vrSn/wXiQQ0P+XWgtu
8lM7jH0vhMkF2KmaE0GB9T6QP54g2rJ9Q1WZPuQCCeSIFdRgyiMT1SfbvsMZYHDb
KbaIGBh7jqborls=
=jYIt
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: