Thu Jul 13 13:38:59 2017 UTC ()
Honor LDFLAGS for qt frontend. Fixes RELRO build.


(wiz)
diff -r1.11 -r1.12 pkgsrc/net/transmission/distinfo
diff -r1.4 -r1.5 pkgsrc/net/transmission/patches/patch-qt_qtr.pro
cvs diff -r1.11 -r1.12 pkgsrc/net/transmission/distinfo (expand / switch to unified diff)

--- pkgsrc/net/transmission/distinfo 2017/06/19 13:33:46 1.11
+++ pkgsrc/net/transmission/distinfo 2017/07/13 13:38:59 1.12
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.11 2017/06/19 13:33:46 maya Exp $ 1$NetBSD: distinfo,v 1.12 2017/07/13 13:38:59 wiz Exp $
2 2
3SHA1 (transmission-2.92.tar.xz) = 2140feba45c4471392033d21b86b6f3ef780d88e 3SHA1 (transmission-2.92.tar.xz) = 2140feba45c4471392033d21b86b6f3ef780d88e
4RMD160 (transmission-2.92.tar.xz) = 6da78ce333fa2ea69aa4954c3b052a818ce7c93e 4RMD160 (transmission-2.92.tar.xz) = 6da78ce333fa2ea69aa4954c3b052a818ce7c93e
5SHA512 (transmission-2.92.tar.xz) = 4d99476bee88cedcc4238a0eee64a4089016933cbfc1cfb1cca023ad4ebcfe46375c9e7651a17af4aeaaf1feb19cbd8166aa56ef7992d9e745a7bbcbe8efca11 5SHA512 (transmission-2.92.tar.xz) = 4d99476bee88cedcc4238a0eee64a4089016933cbfc1cfb1cca023ad4ebcfe46375c9e7651a17af4aeaaf1feb19cbd8166aa56ef7992d9e745a7bbcbe8efca11
6Size (transmission-2.92.tar.xz) = 3378116 bytes 6Size (transmission-2.92.tar.xz) = 3378116 bytes
7SHA1 (patch-ab) = 796faa7c61762dc3ffe563748e55160c827149d2 7SHA1 (patch-ab) = 796faa7c61762dc3ffe563748e55160c827149d2
8SHA1 (patch-libtransmission_platform-quota.c) = 2d9758d24c4329021e0774ac9f8bb3dd94592965 8SHA1 (patch-libtransmission_platform-quota.c) = 2d9758d24c4329021e0774ac9f8bb3dd94592965
9SHA1 (patch-qt_qtr.pro) = 8d83709175fb4b9a88c3766b130b39160aeadaa3 9SHA1 (patch-qt_qtr.pro) = 982c76669f41f154470a91b4b7c9cb5dcc41132c
cvs diff -r1.4 -r1.5 pkgsrc/net/transmission/patches/Attic/patch-qt_qtr.pro (expand / switch to unified diff)

--- pkgsrc/net/transmission/patches/Attic/patch-qt_qtr.pro 2016/04/15 09:28:40 1.4
+++ pkgsrc/net/transmission/patches/Attic/patch-qt_qtr.pro 2017/07/13 13:38:59 1.5
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1$NetBSD: patch-qt_qtr.pro,v 1.4 2016/04/15 09:28:40 wiz Exp $ 1$NetBSD: patch-qt_qtr.pro,v 1.5 2017/07/13 13:38:59 wiz Exp $
2 2
3--- qt/qtr.pro.orig 2015-12-29 00:47:32.464150631 +0000 3--- qt/qtr.pro.orig 2015-12-29 00:47:32.464150631 +0000
4+++ qt/qtr.pro 4+++ qt/qtr.pro
5@@ -8,7 +8,8 @@ target.path = /bin 5@@ -8,7 +8,8 @@ target.path = /bin
6 INSTALLS += target 6 INSTALLS += target
7  7
8 unix: INSTALLS += man 8 unix: INSTALLS += man
9-man.path = /share/man/man1/ 9-man.path = /share/man/man1/
10+man.path = /man/man1/ 10+man.path = /man/man1/
11+ 11+
12 man.files = transmission-qt.1 12 man.files = transmission-qt.1
13  13
14 CONFIG += qt thread debug link_pkgconfig c++11 warn_on 14 CONFIG += qt thread debug link_pkgconfig c++11 warn_on
15@@ -28,12 +29,14 @@ include(config.pri) 15@@ -28,12 +29,14 @@ include(config.pri)
16  16
17 INCLUDEPATH = $${EVENT_TOP}/include $${INCLUDEPATH} 17 INCLUDEPATH = $${EVENT_TOP}/include $${INCLUDEPATH}
18 INCLUDEPATH += $${TRANSMISSION_TOP} 18 INCLUDEPATH += $${TRANSMISSION_TOP}
19+INCLUDEPATH += $${OPENSSL_CFLAGS} 19+INCLUDEPATH += $${OPENSSL_CFLAGS}
20 LIBS += $${TRANSMISSION_TOP}/libtransmission/libtransmission.a 20 LIBS += $${TRANSMISSION_TOP}/libtransmission/libtransmission.a
21 LIBS += $${LIBUTP_LIBS} 21 LIBS += $${LIBUTP_LIBS}
22 LIBS += $${DHT_LIBS} 22 LIBS += $${DHT_LIBS}
23 LIBS += $${LIBB64_LIBS} 23 LIBS += $${LIBB64_LIBS}
24 LIBS += $${LIBUPNP_LIBS} 24 LIBS += $${LIBUPNP_LIBS}
25 LIBS += $${LIBNATPMP_LIBS} 25 LIBS += $${LIBNATPMP_LIBS}
26+LIBS += $${OPENSSL_LIBS} 26+LIBS += $${OPENSSL_LIBS} ${LDFLAGS}
27 unix: LIBS += -L$${EVENT_TOP}/lib -lz -lrt 27 unix: LIBS += -L$${EVENT_TOP}/lib -lz -lrt
28 win32:LIBS += -levent-2.0 -lws2_32 -lintl 28 win32:LIBS += -levent-2.0 -lws2_32 -lintl
29 win32:LIBS += -lidn -liconv -lwldap32 -liphlpapi 29 win32:LIBS += -lidn -liconv -lwldap32 -liphlpapi