Package: sumo / 0.28.0+dfsg1-1~bpo8+1

10_remove_embedded_gl2ps.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
Description: Remove from compilation embedded copy of gl2ps, use packaged version instead.
Author: Anton Gladky <gladk@debian.org>
Last-Update: 2015-04-16

Index: sumo-0.28.0/src/Makefile.am
===================================================================
--- sumo-0.28.0.orig/src/Makefile.am
+++ sumo-0.28.0/src/Makefile.am
@@ -94,7 +94,6 @@ sumo_gui_LDADD =  ./gui/libgui.a \
 ./mesogui/libmesogui.a \
 ./osgview/libosgview.a \
 $(sumo_LDADD) \
-./foreign/gl2ps/libgl2ps.a \
 ./foreign/polyfonts/libpolyfonts.a \
 ./gui/GUIManipulator.o \
 ./gui/GUITLLogicPhasesTrackerWindow.o \
Index: sumo-0.28.0/src/Makefile.in
===================================================================
--- sumo-0.28.0.orig/src/Makefile.in
+++ sumo-0.28.0/src/Makefile.in
@@ -173,7 +173,6 @@ am__DEPENDENCIES_3 = ./netload/libnetloa
 @WITH_GUI_TRUE@	./utils/foxtools/libfoxtools.a \
 @WITH_GUI_TRUE@	./mesogui/libmesogui.a ./osgview/libosgview.a \
 @WITH_GUI_TRUE@	$(am__DEPENDENCIES_3) \
-@WITH_GUI_TRUE@	./foreign/gl2ps/libgl2ps.a \
 @WITH_GUI_TRUE@	./foreign/polyfonts/libpolyfonts.a \
 @WITH_GUI_TRUE@	./gui/GUIManipulator.o \
 @WITH_GUI_TRUE@	./gui/GUITLLogicPhasesTrackerWindow.o \
@@ -505,7 +504,6 @@ $(XERCES_LDFLAGS) $(GDAL_LDFLAGS) $(PROJ
 @WITH_GUI_TRUE@./mesogui/libmesogui.a \
 @WITH_GUI_TRUE@./osgview/libosgview.a \
 @WITH_GUI_TRUE@$(sumo_LDADD) \
-@WITH_GUI_TRUE@./foreign/gl2ps/libgl2ps.a \
 @WITH_GUI_TRUE@./foreign/polyfonts/libpolyfonts.a \
 @WITH_GUI_TRUE@./gui/GUIManipulator.o \
 @WITH_GUI_TRUE@./gui/GUITLLogicPhasesTrackerWindow.o \
Index: sumo-0.28.0/src/foreign/Makefile.am
===================================================================
--- sumo-0.28.0.orig/src/foreign/Makefile.am
+++ sumo-0.28.0/src/foreign/Makefile.am
@@ -3,7 +3,7 @@ MEMDIRS = nvwa
 endif
 
 if WITH_GUI
-GUIDIRS = gl2ps polyfonts rtree
+GUIDIRS = polyfonts rtree
 endif
 
 SUBDIRS = eulerspiral mersenne tcpip PHEMlight $(MEMDIRS) $(GUIDIRS) 
Index: sumo-0.28.0/src/foreign/Makefile.in
===================================================================
--- sumo-0.28.0.orig/src/foreign/Makefile.in
+++ sumo-0.28.0/src/foreign/Makefile.in
@@ -142,7 +142,7 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = eulerspiral mersenne tcpip PHEMlight nvwa gl2ps \
+DIST_SUBDIRS = eulerspiral mersenne tcpip PHEMlight nvwa \
 	polyfonts rtree
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
@@ -314,7 +314,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 @CHECK_MEMORY_LEAKS_TRUE@MEMDIRS = nvwa
-@WITH_GUI_TRUE@GUIDIRS = gl2ps polyfonts rtree
+@WITH_GUI_TRUE@GUIDIRS = polyfonts rtree
 SUBDIRS = eulerspiral mersenne tcpip PHEMlight $(MEMDIRS) $(GUIDIRS) 
 all: all-recursive
 
Index: sumo-0.28.0/src/utils/gui/windows/GUISUMOAbstractView.cpp
===================================================================
--- sumo-0.28.0.orig/src/utils/gui/windows/GUISUMOAbstractView.cpp
+++ sumo-0.28.0/src/utils/gui/windows/GUISUMOAbstractView.cpp
@@ -39,7 +39,7 @@
 #include <limits>
 #include <fxkeys.h>
 #include <foreign/polyfonts/polyfonts.h>
-#include <foreign/gl2ps/gl2ps.h>
+#include <gl2ps.h>
 #include <utils/foxtools/FXSingleEventThread.h>
 #include <utils/foxtools/MFXCheckableButton.h>
 #include <utils/foxtools/MFXImageHelper.h>
Index: sumo-0.28.0/configure.ac
===================================================================
--- sumo-0.28.0.orig/configure.ac
+++ sumo-0.28.0/configure.ac
@@ -475,7 +475,6 @@ src/activitygen/activities/Makefile
 src/activitygen/city/Makefile
 src/foreign/Makefile
 src/foreign/eulerspiral/Makefile
-src/foreign/gl2ps/Makefile
 src/foreign/mersenne/Makefile
 src/foreign/nvwa/Makefile
 src/foreign/PHEMlight/Makefile
Index: sumo-0.28.0/src/netedit/Makefile.am
===================================================================
--- sumo-0.28.0.orig/src/netedit/Makefile.am
+++ sumo-0.28.0/src/netedit/Makefile.am
@@ -94,7 +94,6 @@ netedit_LDADD = ../netimport/libnetimpor
 ../utils/gui/tracker/libguiutilstracker.a \
 ../utils/foxtools/libfoxtools.a \
 ../utils/distribution/libdistribution.a \
-../foreign/gl2ps/libgl2ps.a \
 ../foreign/polyfonts/libpolyfonts.a \
 ../foreign/eulerspiral/libeulerspiral.a \
 ../utils/geom/libgeom.a \
Index: sumo-0.28.0/src/netedit/Makefile.in
===================================================================
--- sumo-0.28.0.orig/src/netedit/Makefile.in
+++ sumo-0.28.0/src/netedit/Makefile.in
@@ -196,7 +196,6 @@ am__DEPENDENCIES_1 =
 @WITH_GUI_TRUE@	../utils/gui/tracker/libguiutilstracker.a \
 @WITH_GUI_TRUE@	../utils/foxtools/libfoxtools.a \
 @WITH_GUI_TRUE@	../utils/distribution/libdistribution.a \
-@WITH_GUI_TRUE@	../foreign/gl2ps/libgl2ps.a \
 @WITH_GUI_TRUE@	../foreign/polyfonts/libpolyfonts.a \
 @WITH_GUI_TRUE@	../foreign/eulerspiral/libeulerspiral.a \
 @WITH_GUI_TRUE@	../utils/geom/libgeom.a \
@@ -517,7 +516,6 @@ EXTRA_DIST = netedit64.ico netedit.rc
 @WITH_GUI_TRUE@../utils/gui/tracker/libguiutilstracker.a \
 @WITH_GUI_TRUE@../utils/foxtools/libfoxtools.a \
 @WITH_GUI_TRUE@../utils/distribution/libdistribution.a \
-@WITH_GUI_TRUE@../foreign/gl2ps/libgl2ps.a \
 @WITH_GUI_TRUE@../foreign/polyfonts/libpolyfonts.a \
 @WITH_GUI_TRUE@../foreign/eulerspiral/libeulerspiral.a \
 @WITH_GUI_TRUE@../utils/geom/libgeom.a \