[ANN] CRUX 3.3-rc1 available for testing

Fredrik Rinnestam fredrik at rinnestam.se
Thu Dec 22 18:28:19 UTC 2016


On Thu, Dec 22, 2016 at 06:54:06PM +0100, Xavier wrote:
> I did after that a big install of all the ports I have on my current
> CRUX 3.2. I had a few signature mismatch errors (new feature of CRUX
> 3.3)...
> The only ports from opt / xorg which failed to build are: qt4,
> spidermonkey and clisp. If needed, I can post the log files.

I've sent a patch to the qt4 maintainer (sepen) last month. Attaching it
for your reference

-- 

Fredrik Rinnestam
-------------- next part --------------
>From 1757c22349ab122f8a1c2fff3cf605df008c98cc Mon Sep 17 00:00:00 2001
From: Fredrik Rinnestam <fredrik at crux.nu>
Date: Sun, 20 Nov 2016 18:03:36 +0100
Subject: [PATCH] qt4: fix gcc6 build

Signed-off-by: Fredrik Rinnestam <fredrik at crux.nu>
---
 qt4/.md5sum                                       |  1 +
 qt4/.signature                                    |  5 ++--
 qt4/Pkgfile                                       |  8 +++--
 qt4/boost-1.48.patch                              | 15 ----------
 qt4/qt-everywhere-opensource-src-4.8.7-gcc6.patch | 36 +++++++++++++++++++++++
 5 files changed, 46 insertions(+), 19 deletions(-)
 delete mode 100644 qt4/boost-1.48.patch
 create mode 100644 qt4/qt-everywhere-opensource-src-4.8.7-gcc6.patch

diff --git a/qt4/.md5sum b/qt4/.md5sum
index 4f45226..07d0cdb 100644
--- a/qt4/.md5sum
+++ b/qt4/.md5sum
@@ -1 +1,2 @@
+e10fad1c1b0c5e958ec51fd69b792d7a  qt-everywhere-opensource-src-4.8.7-gcc6.patch
 d990ee66bf7ab0c785589776f35ba6ad  qt-everywhere-opensource-src-4.8.7.tar.gz
diff --git a/qt4/.signature b/qt4/.signature
index 031bca8..bc10148 100644
--- a/qt4/.signature
+++ b/qt4/.signature
@@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/TKHtval9arFCODcmuW/5Qz6SjkR56dtb42cQwMM/R+O7HBrK8ZulS3NuzdJVZNThVEtnNjI6iqRYkdbEHyHLgY=
-SHA256 (Pkgfile) = 5ef6dcf80f67e16548e923ab17c835219ba495565f53596cb7e96290046be0ea
+RWSE3ohX2g5d/VGEs8r7kUtSTdGM5YMc4mc/9eIr3jE+mEEf/ybgTK0nB9lAjkX/pNjkd3s0OWdORVWa7SKTn7UpO8YQZvssbAE=
+SHA256 (Pkgfile) = 07d820d256a609e8c9e49bfe23b7aeb14c7fea221b7a355a16a5b9fc41090d69
 SHA256 (.footprint) = 254ff8e725593951bbef43fd94bf7755726daedbacdf7fdc6df9f82d4b50e4c9
 SHA256 (qt-everywhere-opensource-src-4.8.7.tar.gz) = e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
+SHA256 (qt-everywhere-opensource-src-4.8.7-gcc6.patch) = 57b67e6c860f11a876aaf93111728d67842dccaa23cb919826038b4fd88fd6ca
diff --git a/qt4/Pkgfile b/qt4/Pkgfile
index 882123b..f298d26 100644
--- a/qt4/Pkgfile
+++ b/qt4/Pkgfile
@@ -6,8 +6,9 @@
 
 name=qt4
 version=4.8.7
-release=1
-source=(http://download.qt-project.org/official_releases/qt/${version%.*}/$version/qt-everywhere-opensource-src-$version.tar.gz)
+release=2
+source=(http://download.qt-project.org/official_releases/qt/${version%.*}/$version/qt-everywhere-opensource-src-$version.tar.gz \
+	qt-everywhere-opensource-src-4.8.7-gcc6.patch)
 
 build () {
     cd qt-everywhere-opensource-src-$version
@@ -18,6 +19,9 @@ build () {
     sed -i "s|INSTALLS += translations||" projects.pro
     sed -i 's|"$COMPILER" -c|$COMPILER -c|' config.tests/unix/fvisibility.test
 
+    patch -p1 -i $SRC/qt-everywhere-opensource-src-4.8.7-gcc6.patch
+    export CXXFLAGS="$CXXFLAGS -std=gnu++98 -Wno-deprecated"
+
     ./configure -prefix /usr/share/qt4 \
                 -bindir /usr/share/qt4/bin \
                 -headerdir /usr/share/qt4/include \
diff --git a/qt4/boost-1.48.patch b/qt4/boost-1.48.patch
deleted file mode 100644
index fa82334..0000000
--- a/qt4/boost-1.48.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp.moc-boost148 qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp
---- qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp.moc-boost148	2012-11-23 04:09:53.000000000 -0600
-+++ qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp	2013-02-11 07:07:18.942748176 -0600
-@@ -187,6 +187,11 @@ int runMoc(int _argc, char **_argv)
-     Moc moc;
-     pp.macros["Q_MOC_RUN"];
-     pp.macros["__cplusplus"];
-+
-+    // Workaround a bugs while parsing some boost headers. See QTBUG-22829
-+    pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
-+    pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
-+
-     QByteArray filename;
-     QByteArray output;
-     FILE *in = 0;
diff --git a/qt4/qt-everywhere-opensource-src-4.8.7-gcc6.patch b/qt4/qt-everywhere-opensource-src-4.8.7-gcc6.patch
new file mode 100644
index 0000000..85b9185
--- /dev/null
+++ b/qt4/qt-everywhere-opensource-src-4.8.7-gcc6.patch
@@ -0,0 +1,36 @@
+diff -up qt-everywhere-opensource-src-4.8.7/configure.gcc6 qt-everywhere-opensource-src-4.8.7/configure
+--- qt-everywhere-opensource-src-4.8.7/configure.gcc6	2016-04-15 07:04:19.430268222 -0500
++++ qt-everywhere-opensource-src-4.8.7/configure	2016-04-15 07:05:22.157568689 -0500
+@@ -7744,7 +7744,7 @@ case "$XPLATFORM" in
+     *-g++*)
+ 	# Check gcc's version
+ 	case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
+-	    5*|4*|3.4*)
++	    8*|7*|6*|5*|4*|3.4*)
+ 		;;
+             3.3*)
+                 canBuildWebKit="no"
+@@ -8060,7 +8060,7 @@ g++*)
+     3.*)
+         COMPILER_VERSION="3.*"
+         ;;
+-    5*|4.*)
++    8*|7*|6*|5*|4.*)
+         COMPILER_VERSION="4"
+         ;;
+     *)
+diff -up qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.gcc6 qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h
+--- qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.gcc6	2015-05-07 09:14:48.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h	2016-04-15 07:04:19.431268227 -0500
+@@ -70,8 +70,8 @@ namespace QPatternist
+             ForegroundShift = 10,
+             BackgroundShift = 20,
+             SpecialShift    = 20,
+-            ForegroundMask  = ((1 << ForegroundShift) - 1) << ForegroundShift,
+-            BackgroundMask  = ((1 << BackgroundShift) - 1) << BackgroundShift
++            ForegroundMask  = 0x1f << ForegroundShift,
++            BackgroundMask  = 0x7 << BackgroundShift
+         };
+ 
+     public:
+
-- 
2.10.2



More information about the CRUX mailing list