From 35231fe5b5b2d3343f6e4193acad800cfb7c48b4 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Thu, 21 Feb 2019 00:18:34 +0100
Subject: Make PyQt4 and QScintilla compile again

---
 deps/QScintilla/.url                               |   2 +-
 deps/QScintilla/QScintilla.SlackBuild              | 112 +++++++++++----------
 .../patches/QScintilla_qsciscintillabase_qurl.diff |  11 ++
 3 files changed, 70 insertions(+), 55 deletions(-)
 create mode 100644 deps/QScintilla/patches/QScintilla_qsciscintillabase_qurl.diff

(limited to 'deps/QScintilla')

diff --git a/deps/QScintilla/.url b/deps/QScintilla/.url
index 83e87e6..66849ec 100644
--- a/deps/QScintilla/.url
+++ b/deps/QScintilla/.url
@@ -1 +1 @@
-https://www.riverbankcomputing.com/static/Downloads/QScintilla/QScintilla_gpl-2.11.tar.gz
+https://www.riverbankcomputing.com/static/Downloads/QScintilla/QScintilla_gpl-2.11.1.tar.gz
diff --git a/deps/QScintilla/QScintilla.SlackBuild b/deps/QScintilla/QScintilla.SlackBuild
index 339b62b..1ddc363 100755
--- a/deps/QScintilla/QScintilla.SlackBuild
+++ b/deps/QScintilla/QScintilla.SlackBuild
@@ -28,8 +28,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=QScintilla
-VERSION=${VERSION:-2.11}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.11.1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j$(nproc) "}
 
@@ -78,6 +78,10 @@ cd $TMP
 rm -rf ${PKGNAM}_gpl-$VERSION
 tar xvf $CWD/${PKGNAM}_gpl-$VERSION.tar.?z || exit 1
 cd ${PKGNAM}_gpl-$VERSION || exit 1
+
+# Fix compilation:
+cat $CWD/patches/QScintilla_qsciscintillabase_qurl.diff | patch -p1 --verbose || exit 1
+
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -147,58 +151,58 @@ fi
 
 # QT4 SUPPORT CURRENTLY DOES NOT COMPILE...
 # /usr/lib64/qt/include/QtCore/qglobal.h:2242:20: error: invalid application of 'sizeof' to incomplete type 'QUrl'
-## QT4 support:
-#echo "-- Compiling Qt4 support --"
-#cd Qt4Qt5
-#  echo "-- >> Qt4Qt5 --"
-#  qmake \
-#    -o Makefile \
-#    QMAKE_CFLAGS+="$SLKCFLAGS" \
-#    QMAKE_CXXFLAGS+="$SLKCFLAGS -std=c++11" \
-#    qscintilla.pro || exit 1
-#  make $NUMJOBS || exit 1
-#  make install INSTALL_ROOT=$PKG || exit 1
-#cd -
-#
-#cd designer-Qt4Qt5
-#  echo "-- >> designer-Qt4Qt5 --"
-#  qmake \
-#    -o Makefile \
-#    INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 \
-#    QMAKE_CFLAGS+="$SLKCFLAGS" \
-#    QMAKE_CXXFLAGS+="$SLKCFLAGS -std=c++11" \
-#    designer.pro || exit 1
-#  make $NUMJOBS || exit 1
-#  make install INSTALL_ROOT=$PKG || exit 1
-#cd -
-#
-#cd Python
-#  echo "-- >> Python --"
-#  python3 configure.py \
-#      --verbose \
-#      --qmake /usr/bin/qmake \
-#      -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c \
-#      || exit 1
-#  make -j1 || exit 1
-#  make -j1 install INSTALL_ROOT=$PKG || exit 1
-#
-#  make clean || exit 1
-#
-#  python2 configure.py \
-#      --verbose \
-#      --qmake /usr/bin/qmake \
-#      -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c \
-#      || exit 1
-#  make -j1 || exit 1
-#  make -j1 install INSTALL_ROOT=$PKG || exit 1
-#cd -
-#
-## Link the shared qt4 libraries into /usr/lib${LIBDIRSUFFIX}:
-#( cd $PKG/usr/lib${LIBDIRSUFFIX}
-#  for file in $(ls -1 qt/lib/*.so* 2>/dev/null) ; do
-#    ln -sf $file .
-#  done
-#)
+# QT4 support:
+echo "-- Compiling Qt4 support --"
+cd Qt4Qt5
+  echo "-- >> Qt4Qt5 --"
+  qmake \
+    -o Makefile \
+    QMAKE_CFLAGS+="$SLKCFLAGS" \
+    QMAKE_CXXFLAGS+="$SLKCFLAGS -std=c++11" \
+    qscintilla.pro || exit 1
+  make $NUMJOBS || exit 1
+  make install INSTALL_ROOT=$PKG || exit 1
+cd -
+
+cd designer-Qt4Qt5
+  echo "-- >> designer-Qt4Qt5 --"
+  qmake \
+    -o Makefile \
+    INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 \
+    QMAKE_CFLAGS+="$SLKCFLAGS" \
+    QMAKE_CXXFLAGS+="$SLKCFLAGS -std=c++11" \
+    designer.pro || exit 1
+  make $NUMJOBS || exit 1
+  make install INSTALL_ROOT=$PKG || exit 1
+cd -
+
+cd Python
+  echo "-- >> Python --"
+  python3 configure.py \
+      --verbose \
+      --qmake /usr/bin/qmake \
+      -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c \
+      || exit 1
+  make -j1 || exit 1
+  make -j1 install INSTALL_ROOT=$PKG || exit 1
+
+  make clean || exit 1
+
+  python2 configure.py \
+      --verbose \
+      --qmake /usr/bin/qmake \
+      -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c \
+      || exit 1
+  make -j1 || exit 1
+  make -j1 install INSTALL_ROOT=$PKG || exit 1
+cd -
+
+# Link the shared qt4 libraries into /usr/lib${LIBDIRSUFFIX}:
+( cd $PKG/usr/lib${LIBDIRSUFFIX}
+  for file in $(ls -1 qt/lib/*.so* 2>/dev/null) ; do
+    ln -sf $file .
+  done
+)
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
diff --git a/deps/QScintilla/patches/QScintilla_qsciscintillabase_qurl.diff b/deps/QScintilla/patches/QScintilla_qsciscintillabase_qurl.diff
new file mode 100644
index 0000000..9720a4b
--- /dev/null
+++ b/deps/QScintilla/patches/QScintilla_qsciscintillabase_qurl.diff
@@ -0,0 +1,11 @@
+--- QScintilla_gpl-2.11.1/Qt4Qt5/qsciscintillabase.cpp.orig
++++ QScintilla_gpl-2.11.1/Qt4Qt5/qsciscintillabase.cpp
+@@ -37,6 +37,7 @@
+ #include <QScrollBar>
+ #include <QStyle>
+ #include <QTextCodec>
++#include <QUrl>
+ 
+ #include "SciAccessibility.h"
+ #include "ScintillaQt.h"
+
-- 
cgit v1.2.3