summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorevorster2020-07-12 07:44:32 +0200
committerevorster2020-07-12 07:44:32 +0200
commitc3a23ca76ce4208ed0e4baf0418b7653dc75234e (patch)
tree52232e81aa4b528792af866fa6900a690049638a
parentf991602e09e566fa38ef6365f85196715d9ce268 (diff)
downloadaur-c3a23ca76ce4208ed0e4baf0418b7653dc75234e.tar.gz
removed some un-neccesary patches
-rw-r--r--.SRCINFO2
-rw-r--r--Boost_lib_detection.patch15
-rw-r--r--PKGBUILD5
-rw-r--r--vegasettings_install.patch11
-rw-r--r--vegastrike_install.patch11
5 files changed, 2 insertions, 42 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c3feb45a03e9..edb040124172 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = vegastrike-engine-git
pkgdesc = A spaceflight simulator in massive universe
- pkgver = rev.13933
+ pkgver = rev.13951
pkgrel = 1
url = www.vega-strike.org
arch = i686
diff --git a/Boost_lib_detection.patch b/Boost_lib_detection.patch
deleted file mode 100644
index 92846afa378a..000000000000
--- a/Boost_lib_detection.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/Vega-Strike-Engine-Source/engine/CMakeLists.txt.orig 2020-06-23 13:28:02.931169600 +0200
-+++ src/Vega-Strike-Engine-Source/engine/CMakeLists.txt 2020-06-23 13:26:33.149153133 +0200
-@@ -720,10 +720,10 @@
- UNSET(Boost_python_FOUND CACHE)
- IF (USE_PYTHON_3)
- MESSAGE("++ Looking for System Boost::python3")
-- FIND_PACKAGE(Boost COMPONENTS python3 log log_setup REQUIRED)
-+ FIND_PACKAGE(Boost COMPONENTS python log log_setup REQUIRED)
- ELSE (USE_PYTHON_3)
- MESSAGE("++ Looking for System Boost::python (py2)")
-- FIND_PACKAGE(Boost COMPONENTS python log log_setup REQUIRED)
-+ FIND_PACKAGE(Boost COMPONENTS python27 log log_setup REQUIRED)
- ENDIF (USE_PYTHON_3)
-
- IF (Boost_FOUND)
diff --git a/PKGBUILD b/PKGBUILD
index 7919e3c3a96c..42b6fcb09ac7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
#Maintainer: Evert Vorster <evorster@gmail.com>
pkgname=vegastrike-engine-git
-pkgver=rev.13933
+pkgver=rev.13951
pkgrel=1
pkgdesc="A spaceflight simulator in massive universe"
arch=('i686' 'x86_64')
@@ -34,9 +34,6 @@ cd ..
pwd
mkdir -p build
-patch -Np1 -i ../Boost_lib_detection.patch
-patch -Np1 -i ../vegastrike_install.patch
-patch -Np1 -i ../vegasettings_install.patch
patch -Np1 -i ../mesh_tool_install.patch
}
diff --git a/vegasettings_install.patch b/vegasettings_install.patch
deleted file mode 100644
index 502808ffacec..000000000000
--- a/vegasettings_install.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Vega-Strike-Engine-Source/engine/setup/CMakeLists.txt.orig 2020-06-17 09:28:36.348748984 +0200
-+++ src/Vega-Strike-Engine-Source/engine/setup/CMakeLists.txt 2020-06-17 09:41:47.556144351 +0200
-@@ -12,6 +12,8 @@
-
- ADD_EXECUTABLE(vegasettings ${VEGASETTINGS_SOURCES})
-
-+ INSTALL(TARGETS vegasettings DESTINATION bin)
-+
- #find GTK2
- FIND_PACKAGE(GTK2 REQUIRED)
- IF (GTK2_FOUND)
diff --git a/vegastrike_install.patch b/vegastrike_install.patch
deleted file mode 100644
index acf6da002ead..000000000000
--- a/vegastrike_install.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Vega-Strike-Engine-Source/engine/CMakeLists.txt.orig 2020-06-17 08:18:19.562336282 +0200
-+++ src/Vega-Strike-Engine-Source/engine/CMakeLists.txt 2020-06-17 08:20:30.666476756 +0200
-@@ -1070,6 +1070,8 @@
- vorbisfile_LIBRARY
- )
-
-+INSTALL(TARGETS vegastrike DESTINATION bin)
-+
- SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "3D OpenGL spaceflight simulator")
- SET(CPACK_PACKAGE_VENDOR "Vega Strike")
- SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../README.md")