From 77bcfd62bf7efac3b79dd8589b9e423dbd025b4b Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Fri, 27 Mar 2020 18:24:57 +0300 Subject: [PATCH] libqt4: decommission Qt4 It reached end of life on 19th December 2015 --- dev-qt/libqt4/libqt4-4.8.7.recipe | 219 -------------------- dev-qt/libqt4/patches/libqt4-4.8.7.patchset | 99 --------- 2 files changed, 318 deletions(-) delete mode 100644 dev-qt/libqt4/libqt4-4.8.7.recipe delete mode 100644 dev-qt/libqt4/patches/libqt4-4.8.7.patchset diff --git a/dev-qt/libqt4/libqt4-4.8.7.recipe b/dev-qt/libqt4/libqt4-4.8.7.recipe deleted file mode 100644 index b16dc6536..000000000 --- a/dev-qt/libqt4/libqt4-4.8.7.recipe +++ /dev/null @@ -1,219 +0,0 @@ -SUMMARY="A comprehensive C++ application development framework" -DESCRIPTION="Qt is a cross-platform application framework that is widely \ -used for developing software with a graphical user interface, and also used \ -for developing non-GUI programs such as command-line tools and consoles for \ -servers." -HOMEPAGE="https://github.com/qt-haiku/qt4" -SOURCE_URI="https://github.com/qt-haiku/qt4/archive/v$portVersion-haiku-1.tar.gz" -CHECKSUM_SHA256="dc5c24bed30b7d14cb9c981a50a4ea5d3587be9a8f4f69fc2d5e6c49ed31065a" -SOURCE_DIR="qt4-$portVersion-haiku-1" -LICENSE="GNU LGPL v2.1" -COPYRIGHT="2015 Digia Plc and/or its subsidiary(-ies)." -REVISION="11" -ARCHITECTURES="!x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86" - -PATCHES=" - libqt4-$portVersion.patchset - " - -PROVIDES=" - libqt4$secondaryArchSuffix = $portVersion compat >= 4.8 - cmd:qtconfig$secondaryArchSuffix = $portVersion compat >= 4.8 - cmd:qdbus$secondaryArchSuffix = $portVersion compat >= 4.8 - lib:libphonon$secondaryArchSuffix = 4.4.0 compat >= 4 - lib:libQt3Support$secondaryArchSuffix = $portVersion compat >= 4.8 - lib:libQtCLucene$secondaryArchSuffix = $portVersion compat >= 4.8 - lib:libQtCore$secondaryArchSuffix = $portVersion compat >= 4.8 - lib:libQtDBus$secondaryArchSuffix = $portVersion compat >= 4.8 - lib:libQtDeclarative$secondaryArchSuffix = $portVersion compat >= 4.8 - lib:libQtDesigner$secondaryArchSuffix = $portVersion compat >= 4.8 - lib:libQtDesignerComponents$secondaryArchSuffix = $portVersion compat >= 4.8 - lib:libQtGui$secondaryArchSuffix = $portVersion compat >= 4.8 - lib:libQtHelp$secondaryArchSuffix = $portVersion compat >= 4.8 - lib:libQtMultimedia$secondaryArchSuffix = $portVersion compat >= 4.8 - lib:libQtNetwork$secondaryArchSuffix = $portVersion compat >= 4.8 - lib:libQtScript$secondaryArchSuffix = $portVersion compat >= 4.8 - lib:libQtScriptTools$secondaryArchSuffix = $portVersion compat >= 4.8 - lib:libQtSql$secondaryArchSuffix = $portVersion compat >= 4.8 - lib:libQtSvg$secondaryArchSuffix = $portVersion compat >= 4.8 - lib:libQtTest$secondaryArchSuffix = $portVersion compat >= 4.8 - lib:libQtXml$secondaryArchSuffix = $portVersion compat >= 4.8 - lib:libQtXmlPatterns$secondaryArchSuffix = $portVersion compat >= 4.8 - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libz$secondaryArchSuffix - lib:libcrypto$secondaryArchSuffix - lib:libssl$secondaryArchSuffix - lib:libicuuc$secondaryArchSuffix - lib:libjpeg$secondaryArchSuffix - lib:libpng16$secondaryArchSuffix - lib:libtiff$secondaryArchSuffix - cmd:qsystray - " - -BUILD_REQUIRES=" - icu${secondaryArchSuffix}_devel - devel:libz$secondaryArchSuffix - devel:libcrypto$secondaryArchSuffix - devel:libssl$secondaryArchSuffix >= 1.0.0 - devel:libjpeg$secondaryArchSuffix - devel:libpng$secondaryArchSuffix - devel:libtiff$secondaryArchSuffix - dbus${secondaryArchSuffix}_devel - " -BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel - cmd:cmp - cmd:pkg_config$secondaryArchSuffix - cmd:which - cmd:make - cmd:g++$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:perl - cmd:find - cmd:awk - " - -PROVIDES_devel=" - libqt4${secondaryArchSuffix}_devel = $portVersion compat >= 4.8 - cmd:assistant$secondaryArchSuffix = $portVersion compat >= 4.8 - cmd:designer$secondaryArchSuffix = $portVersion compat >= 4.8 - cmd:lconvert$secondaryArchSuffix = $portVersion compat >= 4.8 - cmd:linguist$secondaryArchSuffix = $portVersion compat >= 4.8 - cmd:lrelease$secondaryArchSuffix = $portVersion compat >= 4.8 - cmd:lupdate$secondaryArchSuffix = $portVersion compat >= 4.8 - cmd:moc$secondaryArchSuffix = $portVersion compat >= 4.8 - cmd:pixeltool$secondaryArchSuffix = $portVersion compat >= 4.8 - cmd:qcollectiongenerator$secondaryArchSuffix = $portVersion compat >= 4.8 - cmd:qdbuscpp2xml$secondaryArchSuffix = $portVersion compat >= 4.8 - cmd:qdbusviewer$secondaryArchSuffix = $portVersion compat >= 4.8 - cmd:qdbusxml2cpp$secondaryArchSuffix = $portVersion compat >= 4.8 - cmd:qdoc3$secondaryArchSuffix = $portVersion compat >= 4.8 - cmd:qhelpconverter$secondaryArchSuffix = $portVersion compat >= 4.8 - cmd:qhelpgenerator$secondaryArchSuffix = $portVersion compat >= 4.8 - cmd:qmake$secondaryArchSuffix = $portVersion compat >= 4.8 - cmd:qmlplugindump$secondaryArchSuffix = $portVersion compat >= 4.8 - cmd:qmlviewer$secondaryArchSuffix = $portVersion compat >= 4.8 - cmd:qt3to4$secondaryArchSuffix = $portVersion compat >= 4.8 - cmd:qttracereplay$secondaryArchSuffix = $portVersion compat >= 4.8 - cmd:rcc$secondaryArchSuffix = $portVersion compat >= 4.8 - cmd:uic$secondaryArchSuffix = $portVersion compat >= 4.8 - cmd:uic3$secondaryArchSuffix = $portVersion compat >= 4.8 - cmd:xmlpatterns$secondaryArchSuffix = $portVersion compat >= 4.8 - cmd:xmlpatternsvalidator$secondaryArchSuffix = $portVersion compat >= 4.8 - devel:libphonon$secondaryArchSuffix = 4.4.0 compat >= 4 - devel:libQt3Support$secondaryArchSuffix = $portVersion compat >= 4.8 - devel:libQtCLucene$secondaryArchSuffix = $portVersion compat >= 4.8 - devel:libQtCore$secondaryArchSuffix = $portVersion compat >= 4.8 - devel:libQtDBus$secondaryArchSuffix = $portVersion compat >= 4.8 - devel:libQtDeclarative$secondaryArchSuffix = $portVersion compat >= 4.8 - devel:libQtDesigner$secondaryArchSuffix = $portVersion compat >= 4.8 - devel:libQtDesignerComponents$secondaryArchSuffix = $portVersion compat >= 4.8 - devel:libQtGui$secondaryArchSuffix = $portVersion compat >= 4.8 - devel:libQtHelp$secondaryArchSuffix = $portVersion compat >= 4.8 - devel:libQtMultimedia$secondaryArchSuffix = $portVersion compat >= 4.8 - devel:libQtNetwork$secondaryArchSuffix = $portVersion compat >= 4.8 - devel:libQtScript$secondaryArchSuffix = $portVersion compat >= 4.8 - devel:libQtScriptTools$secondaryArchSuffix = $portVersion compat >= 4.8 - devel:libQtSql$secondaryArchSuffix = $portVersion compat >= 4.8 - devel:libQtSvg$secondaryArchSuffix = $portVersion compat >= 4.8 - devel:libQtTest$secondaryArchSuffix = $portVersion compat >= 4.8 - devel:libQtXml$secondaryArchSuffix = $portVersion compat >= 4.8 - devel:libQtXmlPatterns$secondaryArchSuffix = $portVersion compat >= 4.8 - devel:libQtUiTools$secondaryArchSuffix = $portVersion compat >= 4.8 - " -# if libssl and libcrypto are not in REQUIRES_devel, -# qmake will decide that there is no system OpenSSL support -# and thus build Qt apps without any SSL support. -REQUIRES_devel=" - libqt4$secondaryArchSuffix == $portVersion base - haiku$secondaryArchSuffix - lib:libz$secondaryArchSuffix - lib:libssl$secondaryArchSuffix - lib:libcrypto$secondaryArchSuffix - " - -BUILD() -{ - # not an autotools configure - chmod +x ./configure - CFLAGS=-D_BSD_SOURCE CXXFLAGS=-D_BSD_SOURCE ./configure \ - -prefix $prefix \ - -bindir $binDir \ - -libdir $libDir \ - -headerdir $includeDir \ - -docdir $docDir/Qt \ - -datadir $dataDir/Qt \ - -translationdir $dataDir/Qt/translations \ - -sysconfdir $settingsDir \ - -demosdir $dataDir/Qt/demos \ - -examplesdir $dataDir/Qt/examples \ - -importdir $dataDir/Qt/imports \ - -plugindir $addOnsDir/Qt \ - -no-pch -no-opengl -no-largefile \ - -fast -nomake examples -nomake demos -release -opensource \ - -confirm-license -no-iconv -phonon -no-phonon-backend \ - -multimedia -no-audio-backend -dbus -no-webkit - - make $jobArgs - - pushd haiku - ./do-res.sh - popd -} - -INSTALL() -{ - make install - fixPkgconfig strict - mv -f $libDir/libQtDBus.la $developLibDir - - prepareInstalledDevelLibs libphonon \ - libQt3Support libQtCLucene \ - libQtCore libQtDeclarative \ - libQtDesigner libQtDesignerComponents \ - libQtGui libQtHelp \ - libQtMultimedia libQtNetwork \ - libQtScript libQtScriptTools \ - libQtSql libQtSvg \ - libQtTest \ - libQtXml libQtXmlPatterns \ - libQtUiTools - - # UGLY HACK -- REMOVE ME WHEN QMAKE/CMAKE/ETC IS FIXED - cd $libDir - for i in lib*.so.4.*;do - ln -fs $i $(echo $i | cut -f1,2 -d.) - done - - devCommands="assistant designer lconvert linguist lrelease lupdate - moc pixeltool qdbuscpp2xml qdbusviewer qdbusxml2cpp - qcollectiongenerator qdoc3 qhelpconverter qhelpgenerator qmake - qmlplugindump qmlviewer qt3to4 qttracereplay rcc uic uic3 xmlpatterns - xmlpatternsvalidator" - - for i in $devCommands; do - devPackageCommands="$devPackageCommands $binDir/$i" - done - - DIR_QT_DEVELOP_DESKBAR="${dataDir}/deskbar/menu/Applications/Qt" - mkdir -p ${DIR_QT_DEVELOP_DESKBAR} - addAppDeskbarSymlink $binDir/assistant "Qt/Qt Assistant" - addAppDeskbarSymlink $binDir/designer "Qt/Qt Designer" - addAppDeskbarSymlink $binDir/qdbusviewer "Qt/Qt D-Bus Viewer" - addAppDeskbarSymlink $binDir/linguist "Qt/Qt Lingist" - addAppDeskbarSymlink $binDir/qmlviewer "Qt/QML Viewer" - addAppDeskbarSymlink $binDir/qhelpconverter "Qt/Qt Help Converter" - - packageEntries devel \ - $developDir \ - $devPackageCommands \ - ${DIR_QT_DEVELOP_DESKBAR} \ - $dataDir/Qt/mkspecs - - # move tests to demo/example package when it exists - rm -rf $prefix/tests - rm -rf $dataDir/Qt/demos $dataDir/Qt/examples -} diff --git a/dev-qt/libqt4/patches/libqt4-4.8.7.patchset b/dev-qt/libqt4/patches/libqt4-4.8.7.patchset deleted file mode 100644 index 850dad2c2..000000000 --- a/dev-qt/libqt4/patches/libqt4-4.8.7.patchset +++ /dev/null @@ -1,99 +0,0 @@ -From 7286faf7c2cbeea757946050fa7ac9c3064cd67a Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Sun, 25 Nov 2018 11:10:17 +0100 -Subject: applying patch libqt4-4.8.7.patch - - -diff --git a/src/gui/kernel/qclipboard_haiku.cpp b/src/gui/kernel/qclipboard_haiku.cpp -index 761ba29..e5df7af 100644 ---- a/src/gui/kernel/qclipboard_haiku.cpp -+++ b/src/gui/kernel/qclipboard_haiku.cpp -@@ -37,7 +37,7 @@ const QMimeData *QClipboard::mimeData(Mode mode) const - - for ( int i = 0; msg->GetInfo(B_MIME_TYPE, i, &name, &type, &count) == B_OK; i++ ) { - const void *data; -- int32 dataLen = 0; -+ ssize_t dataLen = 0; - qDebug() << "mimeData " << name; - status_t stat = msg->FindData(name,B_MIME_TYPE,&data,&dataLen); - if(dataLen && stat==B_OK) { --- -2.19.1 - - -From 6b0cbd139e5e6aac71259c092b8b64532f76c115 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Sun, 25 Nov 2018 11:59:24 +0100 -Subject: gcc7 fix - - -diff --git a/configure b/configure -index 2a93bbd..3961f1f 100755 ---- a/configure -+++ b/configure -@@ -7762,7 +7762,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" -@@ -8078,7 +8078,7 @@ g++*) - 3.*) - COMPILER_VERSION="3.*" - ;; -- 5*|4.*) -+ 8*|7*|6*|5*|4.*) - COMPILER_VERSION="4" - ;; - *) -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri -index 847f69c..2360f62 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri -@@ -234,3 +234,4 @@ SOURCES += \ - SOURCES += wtf/TCSystemAlloc.cpp - } - -+QMAKE_CXXFLAGS += -std=gnu++98 -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h -index 9e2e638..0825cdb 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h -@@ -27,7 +27,6 @@ - #define WTF_MathExtras_h - - #include --#include - #include - - #if OS(SOLARIS) -diff --git a/src/plugins/accessible/qaccessiblebase.pri b/src/plugins/accessible/qaccessiblebase.pri -index 95c1fad..a28f289 100644 ---- a/src/plugins/accessible/qaccessiblebase.pri -+++ b/src/plugins/accessible/qaccessiblebase.pri -@@ -1,2 +1,4 @@ - target.path += $$[QT_INSTALL_PLUGINS]/accessible - INSTALLS += target -+ -+QMAKE_CXXFLAGS += -std=gnu++98 -diff --git a/src/xmlpatterns/api/qcoloroutput_p.h b/src/xmlpatterns/api/qcoloroutput_p.h -index 7911e89..be284d1 100644 ---- a/src/xmlpatterns/api/qcoloroutput_p.h -+++ b/src/xmlpatterns/api/qcoloroutput_p.h -@@ -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.19.1 -