View | Details | Raw Unified | Return to bug 233811 | Differences between
and this patch

Collapse All | Expand All

(-)games/flightgear/Makefile (-3 / +2 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	flightgear
4
PORTNAME=	flightgear
5
PORTVERSION=	2018.2.2
5
PORTVERSION=	2018.3.1
6
PORTREVISION=	2
7
CATEGORIES=	games
6
CATEGORIES=	games
8
MASTER_SITES=	SF/flightgear/release-${PORTVERSION:R}
7
MASTER_SITES=	SF/flightgear/release-${PORTVERSION:R}
9
8
Lines 49-55 Link Here
49
QT5_CMAKE_ON=	-DENABLE_QT:BOOL=ON
48
QT5_CMAKE_ON=	-DENABLE_QT:BOOL=ON
50
QT5_CMAKE_OFF=	-DENABLE_QT:BOOL=OFF
49
QT5_CMAKE_OFF=	-DENABLE_QT:BOOL=OFF
51
QT5_USES=	qt:5
50
QT5_USES=	qt:5
52
QT5_USE=	QT=core,buildtools,gui,declarative,network,qmake,widgets
51
QT5_USE=	QT=core,buildtools,gui,declarative,network,qmake,widgets,svg
53
52
54
.include <bsd.port.pre.mk>
53
.include <bsd.port.pre.mk>
55
54
(-)games/flightgear/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1535914762
1
TIMESTAMP = 1544037940
2
SHA256 (flightgear-2018.2.2.tar.bz2) = 61f809ef0a3f6908d156f0c483ed5313d31b5a6ac74761955d0b266751718147
2
SHA256 (flightgear-2018.3.1.tar.bz2) = 3d4a1f37e4d5cb376c16f02c111aac9d3e6b05529015c7d068ce2c00ecb5a640
3
SIZE (flightgear-2018.2.2.tar.bz2) = 8346698
3
SIZE (flightgear-2018.3.1.tar.bz2) = 8404294
(-)games/flightgear/files/patch-3rdparty-joystick-js.h (-25 lines)
Lines 1-25 Link Here
1
Add missing defines and includes from removed ul.h
2
3
--- 3rdparty/joystick/js.h.orig	2018-05-30 23:24:08.180090000 +0200
4
+++ 3rdparty/joystick/js.h	2018-05-30 23:32:04.841896000 +0200
5
@@ -25,10 +25,20 @@
6
 #define __INCLUDED_JS_H__ 1
7
 #define JS_NEW
8
 
9
+#ifndef TRUE
10
+#define TRUE  1
11
+#define FALSE 0
12
+#endif
13
+
14
+#include <fcntl.h>
15
+#include <sys/param.h>
16
+
17
 #include <string>
18
 #include <cstring>
19
 #include <cstdlib>
20
 
21
+#include <simgear/props/props.hxx> /* for jsSetError and SG_WARN */
22
+
23
 #define _JS_MAX_AXES 16
24
 #define _JS_MAX_BUTTONS 32
25
 #define _JS_MAX_HATS 4
(-)games/flightgear/files/patch-3rdparty-joystick-jsBSD.cxx (-15 lines)
Lines 1-15 Link Here
1
jsSetError() takes only two arguments (unlike ulSetError())
2
3
--- 3rdparty/joystick/jsBSD.cxx.orig	2018-05-28 23:22:56.449679000 +0200
4
+++ 3rdparty/joystick/jsBSD.cxx	2018-05-28 23:50:32.852422000 +0200
5
@@ -326,8 +289,8 @@
6
     error = ( joyfile == NULL ) ;
7
     if ( error )
8
     {
9
-      jsSetError ( SG_WARN, "unable to open calibration file %s (%s), joystick %i disabled (you can generate the calibration file with the plib-jscal utility)",
10
-		   joyfname, strerror ( errno ), id + 1 );
11
+      jsSetError ( SG_WARN, "unable to open calibration file, you can generate "
12
+        "the calibration file with the plib-jscal utility" );
13
       return ;
14
     }
15
 
(-)games/flightgear/files/patch-CMakeModules-SetupFGFSLibraries.cmake (-13 lines)
Lines 1-13 Link Here
1
Use all linker flags from pkgconf, including library path
2
3
--- CMakeModules/SetupFGFSLibraries.cmake.orig	2018-05-29 23:46:55.859412000 +0200
4
+++ CMakeModules/SetupFGFSLibraries.cmake	2018-05-29 23:47:59.869522000 +0200
5
@@ -27,7 +27,7 @@
6
     endif()
7
 
8
     if(USE_DBUS)
9
-        target_link_libraries(${target} ${DBUS_LIBRARIES})
10
+        target_link_libraries(${target} ${DBUS_LDFLAGS})
11
     endif()
12
 
13
     if(FG_HAVE_GPERFTOOLS)
(-)games/flightgear/files/patch-clang7-src-AIModel-AIFlightPlanCreatePushBack.cxx (-15 lines)
Lines 1-15 Link Here
1
Fix build with clang 7:
2
3
src/AIModel/AIFlightPlanCreatePushBack.cxx:96:48: error: ordered comparison between pointer and zero ('FGTaxiNode *' and 'int')
4
5
--- src/AIModel/AIFlightPlanCreatePushBack.cxx.orig	2018-08-17 19:14:25.768512000 +0200
6
+++ src/AIModel/AIFlightPlanCreatePushBack.cxx	2018-08-17 19:14:44.343865000 +0200
7
@@ -93,7 +93,7 @@
8
   
9
     FGGroundNetwork* groundNet = dep->groundNetwork();
10
     FGParking *parking = gate.parking();
11
-    if (parking && parking->getPushBackPoint() > 0) {
12
+    if (parking && parking->getPushBackPoint() != nullptr) {
13
         FGTaxiRoute route = groundNet->findShortestRoute(parking, parking->getPushBackPoint(), false);
14
       
15
         int size = route.size();
(-)games/flightgear/files/patch-clang7-stack_scope.diff (-46 lines)
Lines 1-46 Link Here
1
Fix scope of 'stack' when building with clang 7:
2
3
error: reference to 'stack' is ambiguous
4
5
--- src/FDM/UIUCModel/uiuc_aircraft.h.orig	2018-08-31 19:26:14.641298000 +0200
6
+++ src/FDM/UIUCModel/uiuc_aircraft.h	2018-08-31 19:50:35.444961000 +0200
7
@@ -150,7 +150,7 @@
8
 #include "uiuc_parsefile.h"
9
 #include "uiuc_flapdata.h"
10
 
11
-typedef stack :: iterator LIST;
12
+typedef ::stack :: iterator LIST;
13
 
14
 /* Add more keywords here if required*/
15
 enum {init_flag = 1000, geometry_flag, controlSurface_flag, controlsMixer_flag, 
16
--- src/FDM/UIUCModel/uiuc_parsefile.h.orig	2018-08-31 19:34:45.641135000 +0200
17
+++ src/FDM/UIUCModel/uiuc_parsefile.h	2018-08-31 19:35:35.903930000 +0200
18
@@ -23,7 +23,7 @@
19
 {
20
         private:
21
                 
22
-                stack commands;
23
+                ::stack commands;
24
                 ifstream file;
25
                 void readFile();
26
 
27
@@ -37,7 +37,7 @@
28
                 void removeComments(string& inputLine);
29
                 string getToken(string inputLine, int tokenNo);
30
                 void storeCommands(string inputLine);
31
-                stack getCommands();
32
+                ::stack getCommands();
33
 };
34
 
35
 #endif  // _PARSE_FILE_H_
36
--- src/FDM/UIUCModel/uiuc_recorder.cpp.orig	2018-08-31 19:16:32.680030000 +0200
37
+++ src/FDM/UIUCModel/uiuc_recorder.cpp	2018-08-31 19:16:57.872109000 +0200
38
@@ -102,7 +102,7 @@
39
 
40
 void uiuc_recorder( double dt )
41
 {
42
-  stack command_list;
43
+  ::stack command_list;
44
   string linetoken;
45
   // static int init = 0;
46
   static int recordStep = 0;

Return to bug 233811