v1.3.1; remove DESTDIR prefix and root patch (patch merged upstream)

3 files changed, 7 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f3a5e094406f..103cd55fe0be 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = sumo
 	pkgdesc = Traffic simulation modelling road vehicles, public transport and pedestrians.
-	pkgver = 1.2.0
+	pkgver = 1.3.1
 	pkgrel = 2
 	url = http://sumo.dlr.de
 	arch = i686
@@ -17,12 +17,10 @@ pkgbase = sumo
 	depends = xerces-c
 	depends = gdal
 	depends = gl2ps
-	source = https://github.com/eclipse/sumo/archive/v1_2_0.tar.gz
+	source = https://github.com/eclipse/sumo/archive/v1_3_1.tar.gz
 	source = sumo.desktop
-	source = 0001-Properly-use-DESTDIR-prefix-and-root.patch
-	sha256sums = 2f749ece251ca1e0c9b77535faaadd77efcf8aa14e0eb9c72fe0e29a4ab16d50
+	sha256sums = a1c1f62792b8024fd3ba7a7c6b86cc6196922720c65ee50eed67ac7e2b79c6e0
 	sha256sums = d9ec82a1b56ebeaf31c6382f6d903baf0767e440b640a713e587d7e09f72d213
-	sha256sums = 2dc86272997f898908afab9136bb423e378f60c34bfa92cdbd2fbb2a6b0d6c25
 
 pkgname = sumo
 	optdepends = java-runtime-common: for executing Jar files like TraCI4J
diff --git a/0001-Properly-use-DESTDIR-prefix-and-root.patch b/0001-Properly-use-DESTDIR-prefix-and-root.patch
deleted file mode 100644
index a7803bdcda37..000000000000
--- a/0001-Properly-use-DESTDIR-prefix-and-root.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From fcc94af8081fbac8eca4d15e40c3abc7ebdcb265 Mon Sep 17 00:00:00 2001
-From: Aleksandar Trifunovic <akstrfn@gmail.com>
-Date: Thu, 20 Dec 2018 12:09:23 +0100
-Subject: [PATCH] Properly use DESTDIR, --prefix and --root
-
-DESTDIR is not properly expanded during the make install phase.
---prefix is separated into --prefix and --root for python.
----
- CMakeLists.txt             | 7 ++++---
- src/libsumo/CMakeLists.txt | 3 +--
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2bfa5baab6..4058e90e21 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -300,10 +300,11 @@ install(DIRECTORY tools/ DESTINATION share/sumo/tools
-         PATTERN "traas" EXCLUDE
-         PATTERN "traci4matlab/src" EXCLUDE
-         PATTERN ".git" EXCLUDE)
--install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ../../bin $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/sumo/bin)")
--install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/build/setup-sumolib.py clean --all install --prefix $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX})"
-+
-+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ../../bin \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/sumo/bin)")
-+install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/build/setup-sumolib.py clean --all install --prefix=${CMAKE_INSTALL_PREFIX} --root=\$ENV{DESTDIR} --optimize=1)"
-         COMPONENT pysumolib)
--install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/build/setup-traci.py clean --all install --prefix $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX})"
-+install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/build/setup-traci.py clean --all install --prefix=${CMAKE_INSTALL_PREFIX} --root=\$ENV{DESTDIR} --optimize=1)"
-         COMPONENT pytraci)
- 
- string(REPLACE "${SUMO_LIBRARIES}" "" SUMO_LIBRARIES_DLL "${SUMO_LIBRARIES_DLL}")
-diff --git a/src/libsumo/CMakeLists.txt b/src/libsumo/CMakeLists.txt
-index e7500d7e29..ae38495f07 100644
---- a/src/libsumo/CMakeLists.txt
-+++ b/src/libsumo/CMakeLists.txt
-@@ -108,8 +108,7 @@ if(SWIG_FOUND)
-             else()
-                 swig_link_libraries(libsumo -Wl,--whole-archive ${sumolibs} -Wl,--no-whole-archive ${PYTHON_LIBRARIES})
-             endif()
--            install(
--                CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/build/setup-libsumo.py clean --all install --prefix $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX})"
-+            install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/build/setup-libsumo.py clean --all install --prefix=${CMAKE_INSTALL_PREFIX} --root=\$ENV{DESTDIR} --optimize=1)"
-                 COMPONENT pylibsumo)
-         else()
-             message(WARNING "ENABLE_PYTHON_BINDINGS is set but python libraries were not found.")
--- 
-2.20.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 1dbfa808c447..fc4060b281b3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 SUMO_HOME='/usr/share/sumo'
 pkgname=('sumo' 'sumo-doc')
 pkgbase=sumo
-pkgver=1.2.0
+pkgver=1.3.1
 _pkgver="${pkgver//./_}"
 pkgrel=2
 pkgdesc="Traffic simulation modelling road vehicles, public transport and pedestrians."
@@ -16,19 +16,15 @@ license=('GPL')
 depends=('openscenegraph' 'python' 'proj' 'fox' 'xerces-c' 'gdal' 'gl2ps')
 makedepends=('cmake' 'help2man' 'swig' 'gtest')
 source=("https://github.com/eclipse/sumo/archive/v${_pkgver}.tar.gz"
-        "${pkgbase}.desktop"
-        "0001-Properly-use-DESTDIR-prefix-and-root.patch")
+        "${pkgbase}.desktop")
 
-sha256sums=('2f749ece251ca1e0c9b77535faaadd77efcf8aa14e0eb9c72fe0e29a4ab16d50'
-            'd9ec82a1b56ebeaf31c6382f6d903baf0767e440b640a713e587d7e09f72d213'
-            '2dc86272997f898908afab9136bb423e378f60c34bfa92cdbd2fbb2a6b0d6c25')
+sha256sums=('a1c1f62792b8024fd3ba7a7c6b86cc6196922720c65ee50eed67ac7e2b79c6e0'
+            'd9ec82a1b56ebeaf31c6382f6d903baf0767e440b640a713e587d7e09f72d213')
 
 prepare() {
     cd ${pkgbase}-${_pkgver}
     sed -i "/^Version=/ s/$/${pkgver}/" "${srcdir}/${pkgbase}.desktop"
 
-    patch -Np1 -i "${srcdir}/0001-Properly-use-DESTDIR-prefix-and-root.patch"
-
     cmake -H. -Bbuild \
         -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \
         -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \