[sumo] 02/04: Refresh patches.
Anton Gladky
gladk at moszumanska.debian.org
Sun Jul 23 14:24:00 UTC 2017
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository sumo.
commit 07cc5b1ada5e85d83133c8c0d9fd3097acada439
Author: Anton Gladky <gladk at debian.org>
Date: Sun Jul 23 14:22:05 2017 +0200
Refresh patches.
---
debian/patches/10_remove_embedded_gl2ps.patch | 120 ++++++++++++------------
debian/patches/20_fix_scripts_headers.patch | 10 ++
debian/patches/30_add_missing_link.patch | 14 +--
debian/patches/40_drop_some_buildflags.patch | 8 +-
debian/patches/50_use_system_openlayers.patch | 6 +-
debian/patches/60_fix_format_not_a_string.patch | 48 ----------
debian/patches/series | 1 -
7 files changed, 83 insertions(+), 124 deletions(-)
diff --git a/debian/patches/10_remove_embedded_gl2ps.patch b/debian/patches/10_remove_embedded_gl2ps.patch
index 730b496..d0b450f 100644
--- a/debian/patches/10_remove_embedded_gl2ps.patch
+++ b/debian/patches/10_remove_embedded_gl2ps.patch
@@ -2,11 +2,11 @@ Description: Remove from compilation embedded copy of gl2ps, use packaged versio
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-04-16
-Index: sumo-0.28.0/src/Makefile.am
+Index: sumo-0.30.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 \
+--- sumo-0.30.0.orig/src/Makefile.am
++++ sumo-0.30.0/src/Makefile.am
+@@ -85,7 +85,6 @@ sumo_gui_LDADD = ./gui/libgui.a \
./mesogui/libmesogui.a \
./osgview/libosgview.a \
$(sumo_LDADD) \
@@ -14,11 +14,11 @@ Index: sumo-0.28.0/src/Makefile.am
./foreign/polyfonts/libpolyfonts.a \
./gui/GUIManipulator.o \
./gui/GUITLLogicPhasesTrackerWindow.o \
-Index: sumo-0.28.0/src/Makefile.in
+Index: sumo-0.30.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
+--- sumo-0.30.0.orig/src/Makefile.in
++++ sumo-0.30.0/src/Makefile.in
+@@ -169,7 +169,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) \
@@ -26,7 +26,7 @@ Index: sumo-0.28.0/src/Makefile.in
@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
+@@ -495,7 +494,6 @@ $(XERCES_LDFLAGS) $(GDAL_LDFLAGS) $(PROJ
@WITH_GUI_TRUE at ./mesogui/libmesogui.a \
@WITH_GUI_TRUE at ./osgview/libosgview.a \
@WITH_GUI_TRUE@$(sumo_LDADD) \
@@ -34,45 +34,10 @@ Index: sumo-0.28.0/src/Makefile.in
@WITH_GUI_TRUE at ./foreign/polyfonts/libpolyfonts.a \
@WITH_GUI_TRUE at ./gui/GUIManipulator.o \
@WITH_GUI_TRUE at ./gui/GUITLLogicPhasesTrackerWindow.o \
-Index: sumo-0.28.0/src/foreign/Makefile.am
+Index: sumo-0.30.0/src/utils/gui/windows/GUISUMOAbstractView.cpp
===================================================================
---- 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 at MEMDIRS = nvwa
-- at WITH_GUI_TRUE@GUIDIRS = gl2ps polyfonts rtree
-+ at 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
+--- sumo-0.30.0.orig/src/utils/gui/windows/GUISUMOAbstractView.cpp
++++ sumo-0.30.0/src/utils/gui/windows/GUISUMOAbstractView.cpp
@@ -39,7 +39,7 @@
#include <limits>
#include <fxkeys.h>
@@ -82,23 +47,23 @@ Index: sumo-0.28.0/src/utils/gui/windows/GUISUMOAbstractView.cpp
#include <utils/foxtools/FXSingleEventThread.h>
#include <utils/foxtools/MFXCheckableButton.h>
#include <utils/foxtools/MFXImageHelper.h>
-Index: sumo-0.28.0/configure.ac
+Index: sumo-0.30.0/configure.ac
===================================================================
---- sumo-0.28.0.orig/configure.ac
-+++ sumo-0.28.0/configure.ac
-@@ -475,7 +475,6 @@ src/activitygen/activities/Makefile
+--- sumo-0.30.0.orig/configure.ac
++++ sumo-0.30.0/configure.ac
+@@ -440,7 +440,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
+ src/foreign/PHEMlight/cpp/Makefile
+Index: sumo-0.30.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
+--- sumo-0.30.0.orig/src/netedit/Makefile.am
++++ sumo-0.30.0/src/netedit/Makefile.am
+@@ -107,7 +107,6 @@ netedit_LDADD = ../netimport/libnetimpor
../utils/gui/tracker/libguiutilstracker.a \
../utils/foxtools/libfoxtools.a \
../utils/distribution/libdistribution.a \
@@ -106,11 +71,11 @@ Index: sumo-0.28.0/src/netedit/Makefile.am
../foreign/polyfonts/libpolyfonts.a \
../foreign/eulerspiral/libeulerspiral.a \
../utils/geom/libgeom.a \
-Index: sumo-0.28.0/src/netedit/Makefile.in
+Index: sumo-0.30.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 =
+--- sumo-0.30.0.orig/src/netedit/Makefile.in
++++ sumo-0.30.0/src/netedit/Makefile.in
+@@ -232,7 +232,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 \
@@ -118,7 +83,7 @@ Index: sumo-0.28.0/src/netedit/Makefile.in
@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
+@@ -570,7 +569,6 @@ EXTRA_DIST = netedit64.ico netedit.rc
@WITH_GUI_TRUE at ../utils/gui/tracker/libguiutilstracker.a \
@WITH_GUI_TRUE at ../utils/foxtools/libfoxtools.a \
@WITH_GUI_TRUE at ../utils/distribution/libdistribution.a \
@@ -126,3 +91,36 @@ Index: sumo-0.28.0/src/netedit/Makefile.in
@WITH_GUI_TRUE at ../foreign/polyfonts/libpolyfonts.a \
@WITH_GUI_TRUE at ../foreign/eulerspiral/libeulerspiral.a \
@WITH_GUI_TRUE at ../utils/geom/libgeom.a \
+Index: sumo-0.30.0/src/foreign/Makefile.am
+===================================================================
+--- sumo-0.30.0.orig/src/foreign/Makefile.am
++++ sumo-0.30.0/src/foreign/Makefile.am
+@@ -1,5 +1,5 @@
+ if WITH_GUI
+-GUIDIRS = gl2ps polyfonts rtree
++GUIDIRS = polyfonts rtree
+ endif
+
+ SUBDIRS = eulerspiral mersenne tcpip PHEMlight $(GUIDIRS)
+Index: sumo-0.30.0/src/foreign/Makefile.in
+===================================================================
+--- sumo-0.30.0.orig/src/foreign/Makefile.in
++++ sumo-0.30.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 gl2ps polyfonts \
++DIST_SUBDIRS = eulerspiral mersenne tcpip PHEMlight polyfonts \
+ rtree
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ am__relativize = \
+@@ -313,7 +313,7 @@ target_vendor = @target_vendor@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+- at WITH_GUI_TRUE@GUIDIRS = gl2ps polyfonts rtree
++ at WITH_GUI_TRUE@GUIDIRS = polyfonts rtree
+ SUBDIRS = eulerspiral mersenne tcpip PHEMlight $(GUIDIRS)
+ all: all-recursive
+
diff --git a/debian/patches/20_fix_scripts_headers.patch b/debian/patches/20_fix_scripts_headers.patch
index 162953e..2138613 100644
--- a/debian/patches/20_fix_scripts_headers.patch
+++ b/debian/patches/20_fix_scripts_headers.patch
@@ -815,3 +815,13 @@ Index: sumo/docs/examples/sumo/vehicle_stops/vehroutes.xml
+
+<routes>
+</routes>
+Index: sumo/tools/contributed/sumopy/agilepy/lib_wx/ogleditor.py
+===================================================================
+--- sumo.orig/tools/contributed/sumopy/agilepy/lib_wx/ogleditor.py
++++ sumo/tools/contributed/sumopy/agilepy/lib_wx/ogleditor.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python;
++#!/usr/bin/env python
+ """OpenGL editor"""
+ if __name__ == '__main__':
+ __version__ = "0.1a"
diff --git a/debian/patches/30_add_missing_link.patch b/debian/patches/30_add_missing_link.patch
index cac8552..9bca05c 100644
--- a/debian/patches/30_add_missing_link.patch
+++ b/debian/patches/30_add_missing_link.patch
@@ -4,21 +4,21 @@ Author: Daniel T Chen <crimsun at ubuntu.com>, Julian Taylor <jtaylor.debian at google
Origin: https://launchpadlibrarian.net/137511659/sumo_0.16.0~dfsg-1~exp1_0.16.0~dfsg-1~exp1ubuntu1.diff.gz
Reviewed-by: Anton Gladky <gladk at debian.org>
Last-Update: 2015-04-16
-Index: sumo-0.28.0/src/Makefile.am
+Index: sumo-0.30.0/src/Makefile.am
===================================================================
---- sumo-0.28.0.orig/src/Makefile.am
-+++ sumo-0.28.0/src/Makefile.am
+--- sumo-0.30.0.orig/src/Makefile.am
++++ sumo-0.30.0/src/Makefile.am
@@ -1,4 +1,4 @@
-XERCES_LIBS = -l$(LIB_XERCES)
+XERCES_LIBS = -l$(LIB_XERCES) -lpthread -lGLU -lGL
if WITH_GUI
GUI_APPS = sumo-gui
-Index: sumo-0.28.0/src/Makefile.in
+Index: sumo-0.30.0/src/Makefile.in
===================================================================
---- sumo-0.28.0.orig/src/Makefile.in
-+++ sumo-0.28.0/src/Makefile.in
-@@ -372,7 +372,7 @@ STRIP = @STRIP@
+--- sumo-0.30.0.orig/src/Makefile.in
++++ sumo-0.30.0/src/Makefile.in
+@@ -368,7 +368,7 @@ STRIP = @STRIP@
VERSION = @VERSION@
XERCES_CFLAGS = @XERCES_CFLAGS@
XERCES_LDFLAGS = @XERCES_LDFLAGS@
diff --git a/debian/patches/40_drop_some_buildflags.patch b/debian/patches/40_drop_some_buildflags.patch
index 25596fb..5b20512 100644
--- a/debian/patches/40_drop_some_buildflags.patch
+++ b/debian/patches/40_drop_some_buildflags.patch
@@ -2,11 +2,11 @@ Description: drop msse2 buildfpags, unsupported by some platforms
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-04-20
-Index: sumo-0.28.0/configure.ac
+Index: sumo-0.30.0/configure.ac
===================================================================
---- sumo-0.28.0.orig/configure.ac
-+++ sumo-0.28.0/configure.ac
-@@ -125,11 +125,6 @@ dnl - - - - - - - - - - - - - - - - - -
+--- sumo-0.30.0.orig/configure.ac
++++ sumo-0.30.0/configure.ac
+@@ -90,11 +90,6 @@ dnl - - - - - - - - - - - - - - - - - -
case "$host" in
x86-*-linux* | ia64-*-linux* | i586-*-linux* | i686-*-linux* | x86_64-*-linux*)
dnl Make sure we are on architecture that supports SIMD
diff --git a/debian/patches/50_use_system_openlayers.patch b/debian/patches/50_use_system_openlayers.patch
index 1990a3e..28ab8b9 100644
--- a/debian/patches/50_use_system_openlayers.patch
+++ b/debian/patches/50_use_system_openlayers.patch
@@ -2,10 +2,10 @@ Description: Use system packaged OpenLayers.js
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-01-12
-Index: sumo-0.28.0/tools/webWizard/index.html
+Index: sumo-0.30.0/tools/webWizard/index.html
===================================================================
---- sumo-0.28.0.orig/tools/webWizard/index.html
-+++ sumo-0.28.0/tools/webWizard/index.html
+--- sumo-0.30.0.orig/tools/webWizard/index.html
++++ sumo-0.30.0/tools/webWizard/index.html
@@ -5,7 +5,7 @@
<meta charset="utf-8" />
<link rel="stylesheet" href="style.css" />
diff --git a/debian/patches/60_fix_format_not_a_string.patch b/debian/patches/60_fix_format_not_a_string.patch
deleted file mode 100644
index 7b46b36..0000000
--- a/debian/patches/60_fix_format_not_a_string.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Description: Fix "format not a string" error
-Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2016-11-05
-
---- sumo-0.28.0+dfsg1.orig/src/netedit/GNEViewNet.cpp
-+++ sumo-0.28.0+dfsg1/src/netedit/GNEViewNet.cpp
-@@ -1213,7 +1213,7 @@ GNEViewNet::restrictLane(SUMOVehicleClas
- // Throw warning dialog if there hare multiple lanes selected in the same edge
- if (mapOfEdgesAndLanes.size() != lanes.size()) {
- FXMessageBox::information(getApp(), MBOX_OK,
-- ("Multiple lane in the same edge selected"),
-+ ("Multiple lane in the same edge selected"), "%s",
- ("There are selected lanes that belong to the same edge.\n Only one lane pro edge will be restricted for " + toString(vclass) + ".").c_str());
- }
- // If we handeln a set of lanes
-@@ -1228,8 +1228,8 @@ GNEViewNet::restrictLane(SUMOVehicleClas
- }
- // if all edges parent own a Sidewalk, stop function
- if (counter == (int)mapOfEdgesAndLanes.size()) {
-- FXMessageBox::information(getApp(), MBOX_OK,
-- ("Set vclass for " + toString(vclass) + " to selected lanes").c_str(),
-+ FXMessageBox::information(getApp(), MBOX_OK, "%s",
-+ ("Set vclass for " + toString(vclass) + " to selected lanes").c_str(), "%s",
- ("All lanes own already another lane in the same edge with a restriction for " + toString(vclass)).c_str());
- return 0;
- } else {
-@@ -1295,8 +1295,8 @@ GNEViewNet::addRestrictedLane(SUMOVehicl
- }
- // if all lanes own a Sidewalk, stop function
- if (counter == (int)setOfEdges.size()) {
-- FXMessageBox::information(getApp(), MBOX_OK,
-- ("Add vclass for" + toString(vclass) + " to selected lanes").c_str(),
-+ FXMessageBox::information(getApp(), MBOX_OK, "%s",
-+ ("Add vclass for" + toString(vclass) + " to selected lanes").c_str(), "%s",
- ("All lanes own already another lane in the same edge with a restriction for " + toString(vclass)).c_str());
- return 0;
- } else {
-@@ -1362,8 +1362,8 @@ GNEViewNet::removeRestrictedLane(SUMOVeh
- }
- // if all lanes don't own a Sidewalk, stop function
- if (counter == 0) {
-- FXMessageBox::information(getApp(), MBOX_OK,
-- ("Remove vclass for " + toString(vclass) + " to selected lanes").c_str(),
-+ FXMessageBox::information(getApp(), MBOX_OK, "%s",
-+ ("Remove vclass for " + toString(vclass) + " to selected lanes").c_str(), "%s",
- ("Selected lanes and edges haven't a restriction for " + toString(vclass)).c_str());
- return 0;
- } else {
diff --git a/debian/patches/series b/debian/patches/series
index 3c9b7bf..c6f0819 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@
30_add_missing_link.patch
40_drop_some_buildflags.patch
50_use_system_openlayers.patch
-60_fix_format_not_a_string.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sumo.git
More information about the debian-science-commits
mailing list