From 11e410cd831dfb68777e444ff071bc9f105d6574 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 14 May 2017 23:59:13 +0200 Subject: [PATCH] icq: fix build with newer boost, disable on x86. * doesn't build out of the box. --- .../{icq-10_git.recipe => icq-10~git.recipe} | 24 +++++-- ...cq-10_git.patchset => icq-10~git.patchset} | 69 +++++++++++++++++-- 2 files changed, 82 insertions(+), 11 deletions(-) rename net-im/icq/{icq-10_git.recipe => icq-10~git.recipe} (77%) rename net-im/icq/patches/{icq-10_git.patchset => icq-10~git.patchset} (87%) diff --git a/net-im/icq/icq-10_git.recipe b/net-im/icq/icq-10~git.recipe similarity index 77% rename from net-im/icq/icq-10_git.recipe rename to net-im/icq/icq-10~git.recipe index dc1db7a2c..97aa2fb05 100644 --- a/net-im/icq/icq-10_git.recipe +++ b/net-im/icq/icq-10~git.recipe @@ -4,10 +4,11 @@ HOMEPAGE="http://www.icq.com" COPYRIGHT="2016 ICQ LLC (Mail.Ru Group)" LICENSE="Apache v2" REVISION="1" -SOURCE_URI="https://github.com/mailru/icqdesktop/archive/fad5b8b0412aae4b23554ba7f63e0dcee92d16a7.zip" +gitCommit="fad5b8b0412aae4b23554ba7f63e0dcee92d16a7" +SOURCE_URI="https://github.com/mailru/icqdesktop/archive/$gitCommit.zip" CHECKSUM_SHA256="7416858d72937c8dd427dcff593226356b1bfa00cdc162f8368aadb1928ae53a" -SOURCE_DIR="icqdesktop-fad5b8b0412aae4b23554ba7f63e0dcee92d16a7" -PATCHES="icq-10_git.patchset" +SOURCE_DIR="icqdesktop-$gitCommit" +PATCHES="icq-$portVersion.patchset" ADDITIONAL_FILES="icq.rdef" ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64" @@ -18,7 +19,11 @@ PROVIDES=" app:ICQ$secondaryArchSuffix " REQUIRES=" - haiku${secondaryArchSuffix} + haiku$secondaryArchSuffix + lib:libavcodec$secondaryArchSuffix + lib:libavfilter$secondaryArchSuffix + lib:libavformat$secondaryArchSuffix + lib:libavutil$secondaryArchSuffix lib:libidn$secondaryArchSuffix lib:libboost_system$secondaryArchSuffix lib:libcurl$secondaryArchSuffix @@ -31,9 +36,14 @@ REQUIRES=" lib:libgpg_error$secondaryArchSuffix lib:libopenal$secondaryArchSuffix lib:libpcre$secondaryArchSuffix - lib:libqt5$secondaryArchSuffix - lib:librtmp$secondaryArchSuffix + lib:libQt5Core$secondaryArchSuffix + lib:libQt5Gui$secondaryArchSuffix + lib:libQt5Multimedia$secondaryArchSuffix + lib:libQt5Network$secondaryArchSuffix + lib:libQt5Widgets$secondaryArchSuffix + lib:librtmp.1$secondaryArchSuffix lib:libssl$secondaryArchSuffix + lib:libswresample$secondaryArchSuffix lib:libtasn1$secondaryArchSuffix lib:libz$secondaryArchSuffix " @@ -81,7 +91,7 @@ BUILD() INSTALL() { - mkdir $appsDir/ICQ/lib + mkdir -p $appsDir/ICQ/lib cp gui/icq $appsDir/ICQ/ICQ cp corelib/corelib/libcorelib.so* $appsDir/ICQ/lib ln -s $addOnsDir/Qt5/platforms $appsDir/ICQ/plugins diff --git a/net-im/icq/patches/icq-10_git.patchset b/net-im/icq/patches/icq-10~git.patchset similarity index 87% rename from net-im/icq/patches/icq-10_git.patchset rename to net-im/icq/patches/icq-10~git.patchset index 62d897de1..692148c2d 100644 --- a/net-im/icq/patches/icq-10_git.patchset +++ b/net-im/icq/patches/icq-10~git.patchset @@ -1,4 +1,4 @@ -From a6bdc20b64cd8b2555ad338219531bd66d1ebb0a Mon Sep 17 00:00:00 2001 +From bee081a9ff1f7279773f7fa00073916408fc5ca1 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Thu, 31 Mar 2016 11:08:17 +0300 Subject: build fixes for boost 1.55.0 @@ -103,10 +103,10 @@ index e146ff1..1382be7 100644 return logs_dir; } -- -2.7.0 +2.12.2 -From 356e673e8cd1c90dd5b896b2a77a99c8c1d852c1 Mon Sep 17 00:00:00 2001 +From 41737fd51f33a60735dc6142830e2a633066a264 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Thu, 31 Mar 2016 11:09:34 +0300 Subject: initial Haiku support @@ -389,5 +389,66 @@ index 4562567..35151d2 100644 setWindowIcon(icon); -- -2.7.0 +2.12.2 + + +From 5a7ce418f5eb30631a96f4fb85bc949c4359424d Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Sun, 14 May 2017 23:38:17 +0200 +Subject: needs cmath, fix with newer boost. + + +diff --git a/corelib/corelib/corelib.pro b/corelib/corelib/corelib.pro +index d7a26d1..83c27b3 100644 +--- a/corelib/corelib/corelib.pro ++++ b/corelib/corelib/corelib.pro +@@ -298,7 +298,7 @@ HEADERS += \ + + DEFINES += STRIP_VOIP + +-QMAKE_CXXFLAGS += -std=c++0x ++QMAKE_CXXFLAGS += -std=c++0x -DBOOST_NO_CXX11_CONSTEXPR + + QMAKE_LFLAGS += -static-libgcc -static-libstdc++ + +diff --git a/gui/gui.pro b/gui/gui.pro +index ad54b08..85f8b4b 100644 +--- a/gui/gui.pro ++++ b/gui/gui.pro +@@ -319,7 +319,7 @@ HEADERS += \ + main_window/settings/themes/ThemeWidget.h + + DEFINES += STRIP_VOIP +-QMAKE_CXXFLAGS += -std=c++0x ++QMAKE_CXXFLAGS += -std=c++0x -DBOOST_NO_CXX11_CONSTEXPR + QMAKE_LIBS += -lopenal -lavformat -lavcodec -lswresample -lavfilter -lavutil -lcorelib -lboost_system -lcurl -lssl -lcrypto -lboost_filesystem -lidn -lrtmp -lgcrypt -lgnutls -lgpg-error -ltasn1 -lz -lstdc++ + CONFIG(32, 64|32) { + QMAKE_LIBS += -lp11-kit +diff --git a/gui/stdafx.h b/gui/stdafx.h +index 91ecb85..07cdf32 100644 +--- a/gui/stdafx.h ++++ b/gui/stdafx.h +@@ -290,6 +290,7 @@ + #include + #include + #include ++#include + + #include + +diff --git a/installer/installer.pro b/installer/installer.pro +index 7a1f7ee..d5fb315 100644 +--- a/installer/installer.pro ++++ b/installer/installer.pro +@@ -14,7 +14,7 @@ SOURCES += main.cpp + CONFIG += 64 + + QMAKE_LFLAGS += -Wl,-Bstatic -static-libgcc -static-libstdc++ +-QMAKE_CXXFLAGS += -std=c++0x ++QMAKE_CXXFLAGS += -std=c++0x -DBOOST_NO_CXX11_CONSTEXPR + + CONFIG(64, 64|32) { + QMAKE_LFLAGS += -L/x64 +-- +2.12.2