cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net-im/ricochet: Unbroke the build. ${OPENSSLDIR}/include coflicted with the STL headers logic; Fixed order

Browse Source 
Approved by:	tcberner (mentor)
Differential Revision:	https://reviews.freebsd.org/D13204
This commit is contained in:
Yuri Victorovich 2017-11-28 21:37:15 +00:00
parent 37c548a46e
commit 4269b6b1c0
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=455079
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
net-im/ricochet/Makefile
View File

@ -17,10 +17,6 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
LIB_DEPENDS= libprotobuf.so:devel/protobuf
OPTIONS_DEFINE= TOR
OPTIONS_DEFAULT= TOR
TOR_DESC= Install Tor: it is required for ${PORTNAME} to run
USES= compiler:c++11-lib gmake pkgconfig qmake ssl
USE_GITHUB= yes
GH_ACCOUNT= ricochet-im
@ -29,17 +25,19 @@ USE_QT5= core gui multimedia network qml quick quickcontrols widgets \
USE_GL= gl
QMAKE_ARGS+= DEFINES+=RICOCHET_NO_PORTABLE OPENSSLDIR=${OPENSSLBASE}
OPTIONS_DEFINE= TOR
OPTIONS_DEFAULT= TOR
TOR_DESC= Install Tor: it is required for ${PORTNAME} to run
TOR_RUN_DEPENDS= tor:security/tor
PLIST_FILES= bin/ricochet \
share/applications/ricochet.desktop \
share/icons/hicolor/48x48/apps/ricochet.png \
share/icons/hicolor/scalable/apps/ricochet.svg
TOR_RUN_DEPENDS= tor:security/tor
.include <bsd.port.pre.mk>
post-patch:
@${REINPLACE_CMD} -E 's| -fsanitize=[a-z-]+| |g' \
${WRKSRC}/hardened.pri
.include <bsd.port.post.mk>
.include <bsd.port.mk>

16
net-im/ricochet/files/patch-ricochet.pro
View File

@ -1,6 +1,6 @@
--- ricochet.pro.orig 2015-06-17 04:00:47 UTC
--- ricochet.pro.orig 2016-11-04 22:05:33 UTC
+++ ricochet.pro
@@ -46,18 +46,18 @@ CONFIG(release,debug|release):DEFINES +=
@@ -52,18 +52,18 @@ CONFIG(release,debug|release):DEFINES +=
contains(DEFINES, RICOCHET_NO_PORTABLE) {
unix:!macx {
@ -24,3 +24,15 @@
bundletor.files = tor/*
INSTALLS += bundletor
DEFINES += BUNDLED_TOR_PATH=\\\"/usr/lib/ricochet/tor/\\\"
@@ -108,7 +108,10 @@ INCLUDEPATH += src
unix {
!isEmpty(OPENSSLDIR) {
- INCLUDEPATH += $${OPENSSLDIR}/include
+ !equals(OPENSSLDIR, "/usr") {
+ # adding /usr/include to INCLUDEPATH breaks STL's include logic
+ INCLUDEPATH += $${OPENSSLDIR}/include
+ }
LIBS += -L$${OPENSSLDIR}/lib -lcrypto
} else:macx:!packagesExist(libcrypto) {
# Fall back to the OS-provided 0.9.8 if no other libcrypto is present