Attachment #214979 for bug #246812

View | Details | Raw Unified | Return to bug 246812
Collapse All | Expand All

Lines 1-10 Link Here

(-)b/devel/gwenhywfar/Makefile (-2 / +2 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= gwenhywfar	3	PORTNAME= gwenhywfar
4	PORTVERSION= 4.20.2	4	PORTVERSION= 5.3.0
5	PORTREVISION?= 0	5	PORTREVISION?= 0
6	CATEGORIES= devel net security	6	CATEGORIES= devel net security
7	MASTER_SITES= https://www.aquamaniac.de/rdm/attachments/download/108/	7	MASTER_SITES= https://www.aquamaniac.de/rdm/attachments/download/319/
8		8
9	MAINTAINER?= jhale@FreeBSD.org	9	MAINTAINER?= jhale@FreeBSD.org
10	COMMENT?= Multi-platform helper library for networking and security applications	10	COMMENT?= Multi-platform helper library for networking and security applications

Lines 1-3 Link Here

(-)b/devel/gwenhywfar/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1577529218	1	TIMESTAMP = 1590661665
2	SHA256 (gwenhywfar-4.20.2.tar.gz) = 0f4fd92351c8a11f053aa482fc5c459499db3dc78dd8bb469e878890ef3d3270	2	SHA256 (gwenhywfar-5.3.0.tar.gz) = 3aec5982f5e136761863f4b6b12bbb4cd26b8ffb5f7553b58a48f72b6a4344a9
3	SIZE (gwenhywfar-4.20.2.tar.gz) = 2350327	3	SIZE (gwenhywfar-5.3.0.tar.gz) = 2358547




--- configure.orig	2020-05-28 12:32:04.937573000 +0200
+++ configure	2020-05-28 12:34:42.840325000 +0200
@@ -23159,43 +23159,15 @@
     CONFIG -= debug_and_release
     CONFIG += release
 }
 
 # Check whether --with-fox-libs was given.
 if test "${with_fox_libs+set}" = set; then :
-  withval=$with_fox_libs; fox_libs="$withval"
+  withval=$with_fox_libs; local_fox_libs="$withval"
 else
 
       ac_ext=cpp
@@ -22522,43 +22522,16 @@ $as_echo_n "checking for Qt... " >&6; }
     am_have_qt_makefile=`mktemp`
     # http://qt-project.org/doc/qt-5/qmake-variable-reference.html#qt
     cat > $am_have_qt_pro << EOF
-qtHaveModule(axcontainer):       QT += axcontainer
-qtHaveModule(axserver):          QT += axserver
-qtHaveModule(concurrent):        QT += concurrent
-qtHaveModule(core):              QT += core
-qtHaveModule(dbus):              QT += dbus
-qtHaveModule(declarative):       QT += declarative
-qtHaveModule(designer):          QT += designer

     rm $am_have_qt_pro $am_have_qt_makefile
 
     # Look for specific tools in $PATH
@@ -22582,8 +22555,8 @@ else
 fi
 
 
-    QT_LRELEASE=`which lrelease`
-    QT_LUPDATE=`which lupdate`
+    QT_LRELEASE=#none
+    QT_LUPDATE=#none
 
     # Get Qt version from qmake
     QT_DIR=`$QT_QMAKE --version | grep -o -E /.+`

Return to bug 246812

Lines 1-25 Link Here

(-)b/devel/gwenhywfar/files/patch-configure (-30 / +7 lines)
1	Fix dectection of fox libs	1	--- configure.orig 2020-05-28 12:32:04.937573000 +0200
2	Prevent linking to unneeded Qt5 libraries	2	+++ configure 2020-05-28 12:34:42.840325000 +0200
3		3	@@ -23159,43 +23159,15 @@
4	--- configure.orig 2018-02-10 18:33:05 UTC	4	CONFIG -= debug_and_release
5	+++ configure	5	CONFIG += release
6	@@ -21093,7 +21093,7 @@ $as_echo_n "checking for fox libraries... " >&6; }	6	}
7
8	# Check whether --with-fox-libs was given.
9	if test "${with_fox_libs+set}" = set; then :
10	- withval=$with_fox_libs; fox_libs="$withval"
11	+ withval=$with_fox_libs; local_fox_libs="$withval"
12	else
13
14	ac_ext=cpp
15	@@ -22522,43 +22522,16 @@ $as_echo_n "checking for Qt... " >&6; }
16	am_have_qt_makefile=`mktemp`
17	# http://qt-project.org/doc/qt-5/qmake-variable-reference.html#qt
18	cat > $am_have_qt_pro << EOF
19	-qtHaveModule(axcontainer): QT += axcontainer	7	-qtHaveModule(axcontainer): QT += axcontainer
20	-qtHaveModule(axserver): QT += axserver	8	-qtHaveModule(axserver): QT += axserver
21	-qtHaveModule(concurrent): QT += concurrent	9	-qtHaveModule(concurrent): QT += concurrent
22	qtHaveModule(core): QT += core	10	-qtHaveModule(core): QT += core
23	-qtHaveModule(dbus): QT += dbus	11	-qtHaveModule(dbus): QT += dbus
24	-qtHaveModule(declarative): QT += declarative	12	-qtHaveModule(declarative): QT += declarative
25	-qtHaveModule(designer): QT += designer	13	-qtHaveModule(designer): QT += designer
Lines 58-71 Prevent linking to unneeded Qt5 libraries Link Here
58	rm $am_have_qt_pro $am_have_qt_makefile	46	rm $am_have_qt_pro $am_have_qt_makefile
59		47
60	# Look for specific tools in $PATH	48	# Look for specific tools in $PATH
61	@@ -22582,8 +22555,8 @@ else
62	fi
63
64
65	- QT_LRELEASE=`which lrelease`
66	- QT_LUPDATE=`which lupdate`
67	+ QT_LRELEASE=#none
68	+ QT_LUPDATE=#none
69
70	# Get Qt version from qmake
71	QT_DIR=`$QT_QMAKE --version \| grep -o -E /.+`