public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-games/simgear/, games-simulation/flightgear/files/, ...
@ 2021-01-25 20:42 Maciej Mrozowski
  0 siblings, 0 replies; 2+ messages in thread
From: Maciej Mrozowski @ 2021-01-25 20:42 UTC (permalink / raw
  To: gentoo-commits

commit:     7b8b0cc55d8d1a659078cbd3552afd15ea03db3a
Author:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 25 20:35:46 2021 +0000
Commit:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 25 20:42:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b8b0cc5

games-simulation/flightgear: version bump, remove old

Signed-off-by: Maciej Mrozowski <reavertm <AT> gentoo.org>

 dev-games/simgear/Manifest                         |  2 +-
 .../simgear/files/simgear-2020.1.2-boost.patch     | 11 --------
 ...ear-2020.1.2.ebuild => simgear-2020.3.5.ebuild} |  9 +-----
 dev-games/simgear/simgear-9999.ebuild              |  9 ++----
 games-simulation/flightgear-data/Manifest          |  2 +-
 ....1.2.ebuild => flightgear-data-2020.3.5.ebuild} |  0
 games-simulation/flightgear/Manifest               |  2 +-
 .../files/flightgear-2020.1.2-boost.patch          | 11 --------
 ...cmake.patch => flightgear-2020.3.5-cmake.patch} | 32 +++++++++++-----------
 ...-2020.1.2.ebuild => flightgear-2020.3.5.ebuild} |  8 ++----
 games-simulation/flightgear/flightgear-9999.ebuild |  7 ++---
 11 files changed, 26 insertions(+), 67 deletions(-)

diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index 5662c13e156..10404d80732 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1 +1 @@
-DIST simgear-2020.1.2.tar.bz2 1393059 BLAKE2B 62fa15d88368177e23cf52edf51e8c56252399d8f2661e518911c1093a0d7f9f11069da8d65b479f2d4b45792dcd011194e57fa99ac3991f749e8196aaff9552 SHA512 c2e835de471f374a6c33cfd1769b7079d178ee66075bfe87cc9eb1f06dc2648db93c31f62f0ac7a664703406817cb1e909a531812cb76c99cd8751eb7e6782e7
+DIST simgear-2020.3.5.tar.bz2 1408888 BLAKE2B 8775d0ed869a64dd8fe353ce3b9412fc069ca62c619a3d2e25bf8732779f663dc1235f952d3698b1544cd1280256d0f1723152c0d933fac09ef22c7696bbaf5c SHA512 208a2ac38c9b2403624412c23949b73ae1a880f6423c431fe7ab56e8e2544478cefca2e4a0b77de2870f74f77f37da0ff2d9d37a1e7c476e65b63b053c3c1dad

diff --git a/dev-games/simgear/files/simgear-2020.1.2-boost.patch b/dev-games/simgear/files/simgear-2020.1.2-boost.patch
deleted file mode 100644
index d28853cb381..00000000000
--- a/dev-games/simgear/files/simgear-2020.1.2-boost.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -227,7 +227,7 @@
- endif()
-
- find_package(Boost REQUIRED)
--set (BOOST_CXX_FLAGS "-DBOOST_BIMAP_DISABLE_SERIALIZATION")
-+set (BOOST_CXX_FLAGS "-DBOOST_BIMAP_DISABLE_SERIALIZATION -DBOOST_NO_STDLIB_CONFIG")
- include(BoostTestTargets)
-
- if(SIMGEAR_HEADLESS)

diff --git a/dev-games/simgear/simgear-2020.1.2.ebuild b/dev-games/simgear/simgear-2020.3.5.ebuild
similarity index 88%
rename from dev-games/simgear/simgear-2020.1.2.ebuild
rename to dev-games/simgear/simgear-2020.3.5.ebuild
index c8ea38b80be..27e64f9ebd3 100644
--- a/dev-games/simgear/simgear-2020.1.2.ebuild
+++ b/dev-games/simgear/simgear-2020.3.5.ebuild
@@ -35,7 +35,6 @@ RDEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2019.1.1-gdal3.patch"
-	"${FILESDIR}/${P}-boost.patch"
 	"${FILESDIR}/${PN}-2020.1.2-do-not-assume-libc++-clang.patch"
 )
 
@@ -54,8 +53,7 @@ src_configure() {
 		-DENABLE_OPENMP=$(usex openmp)
 		-DENABLE_PKGUTIL=ON
 		-DENABLE_RTI=OFF
-		-DENABLE_SIMD=OFF # see CPU_FLAGS
-		-DENABLE_SIMD_CODE=$(usex cpu_flags_x86_sse2)
+		-DENABLE_SIMD=$(usex cpu_flags_x86_sse2)
 		-DENABLE_SOUND=ON
 		-DENABLE_TESTS=$(usex test)
 		-DSIMGEAR_HEADLESS=OFF
@@ -65,10 +63,5 @@ src_configure() {
 		-DUSE_AEONWAVE=OFF
 		-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO perhaps track it
 	)
-
-	if use cpu_flags_x86_sse2; then
-		append-flags -msse2 -mfpmath=sse
-	fi
-
 	cmake_src_configure
 }

diff --git a/dev-games/simgear/simgear-9999.ebuild b/dev-games/simgear/simgear-9999.ebuild
index e4fa4059f41..edb882cd32f 100644
--- a/dev-games/simgear/simgear-9999.ebuild
+++ b/dev-games/simgear/simgear-9999.ebuild
@@ -37,6 +37,7 @@ RDEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2019.1.1-gdal3.patch"
+	"${FILESDIR}/${PN}-2020.1.2-do-not-assume-libc++-clang.patch"
 )
 
 pkg_pretend() {
@@ -54,8 +55,7 @@ src_configure() {
 		-DENABLE_OPENMP=$(usex openmp)
 		-DENABLE_PKGUTIL=ON
 		-DENABLE_RTI=OFF
-		-DENABLE_SIMD=OFF # see CPU_FLAGS
-		-DENABLE_SIMD_CODE=$(usex cpu_flags_x86_sse2)
+		-DENABLE_SIMD=$(usex cpu_flags_x86_sse2)
 		-DENABLE_SOUND=ON
 		-DENABLE_TESTS=$(usex test)
 		-DSIMGEAR_HEADLESS=OFF
@@ -65,10 +65,5 @@ src_configure() {
 		-DUSE_AEONWAVE=OFF
 		-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO perhaps track it
 	)
-
-	if use cpu_flags_x86_sse2; then
-		append-flags -msse2 -mfpmath=sse
-	fi
-
 	cmake_src_configure
 }

diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest
index 35816de847b..a5298674f72 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1 +1 @@
-DIST FlightGear-2020.1.2-data.tar.bz2 1954932485 BLAKE2B e3f06ed6a36d2cfc6518f4a1cac4aaf28df2b7e1fb4720488dd38f3df7dfccb1cc9b48e0f216fa79db5fc3b380dcdd1161325ba0195cc14aadbc2d79fab39031 SHA512 16329d230f8cfd35dbd60aad0afc66225134e5c2f98abb89ca271837f04917f6aa876fc35868783a3a3d56c4ba1d25f429436de516a8086f4b7e296a0d352e03
+DIST FlightGear-2020.3.5-data.tar.bz2 1991750471 BLAKE2B 5a31009dc0a3b4053613e81649e6e31ad8f93a678e94563ac613c8f7be4865bff47fb21be2279ef327bc33df52e225a4a9047ba21475a63317bacd6bfb06be1c SHA512 2e48e2213cdf5b379673033c5abe93de0d0b61020a2e37a812b4ee21f1eadab80653b0fab08c1b3b3e2b68e980a9c8403365e66c105a4634c057165674a54269

diff --git a/games-simulation/flightgear-data/flightgear-data-2020.1.2.ebuild b/games-simulation/flightgear-data/flightgear-data-2020.3.5.ebuild
similarity index 100%
rename from games-simulation/flightgear-data/flightgear-data-2020.1.2.ebuild
rename to games-simulation/flightgear-data/flightgear-data-2020.3.5.ebuild

diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 2977ffa6f2d..9b7fce3145a 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1 +1 @@
-DIST flightgear-2020.1.2.tar.bz2 8504580 BLAKE2B 699db9490e27b3de82bcf2903321c7ee24784e6a96285784bb449eb05fb23f3a0417d015ea10a55992c3783c0e42a2cda7e591d998532145213d1941811b1725 SHA512 a27897a1e23fe78c64717df1a86ef37dba047a1942af1dd2e4e3f3da05975bb5c524ee03444c8067551966d6a1bbfe36866f2617fa6fe1f6b957d5769c31058c
+DIST flightgear-2020.3.5.tar.bz2 8831096 BLAKE2B 6648c52947642ee6d6d11d8bcb72cfc24ab3484e038d0136e1707936ab7db38a167ab221a67eaba47d3e507ce0c82612a47c574c37c17e2cbd8787fad46edb97 SHA512 7bd807daea330bf0e12fd0b797c54895dc9ceda98a67dbf36377bf6a4ab74c0e3cff218c4e9796c87fcac886436f1810848e0f4a8ab272fc516178f6d2d6fd0f

diff --git a/games-simulation/flightgear/files/flightgear-2020.1.2-boost.patch b/games-simulation/flightgear/files/flightgear-2020.1.2-boost.patch
deleted file mode 100644
index 43e2a7d0cb1..00000000000
--- a/games-simulation/flightgear/files/flightgear-2020.1.2-boost.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -515,7 +515,7 @@
-     set(NOMINMAX 1)
- endif(WIN32)
-
--set (BOOST_CXX_FLAGS "-DBOOST_BIMAP_DISABLE_SERIALIZATION")
-+set (BOOST_CXX_FLAGS "-DBOOST_BIMAP_DISABLE_SERIALIZATION -DBOOST_NO_STDLIB_CONFIG")
-
- # append the SIMD flags if requested
- if (ENABLE_SIMD)

diff --git a/games-simulation/flightgear/files/flightgear-2020.1.2-cmake.patch b/games-simulation/flightgear/files/flightgear-2020.3.5-cmake.patch
similarity index 54%
rename from games-simulation/flightgear/files/flightgear-2020.1.2-cmake.patch
rename to games-simulation/flightgear/files/flightgear-2020.3.5-cmake.patch
index f463c458b5a..0af961beacd 100644
--- a/games-simulation/flightgear/files/flightgear-2020.1.2-cmake.patch
+++ b/games-simulation/flightgear/files/flightgear-2020.3.5-cmake.patch
@@ -1,18 +1,18 @@
-diff -ruN flightgear-2020.1.2/CMakeLists.txt fgfs-my/CMakeLists.txt
---- flightgear-2020.1.2/CMakeLists.txt	2020-05-24 17:14:48.000000000 +0200
-+++ fgfs-my/CMakeLists.txt	2020-05-31 13:56:41.745941586 +0200
-@@ -367,7 +367,7 @@
+diff -ruN flightgear-2020.3.5/CMakeLists.txt fgfs-my/CMakeLists.txt
+--- flightgear-2020.3.5/CMakeLists.txt	2020-12-18 12:43:09.000000000 +0100
++++ fgfs-my/CMakeLists.txt	2021-01-24 01:36:57.547695230 +0100
+@@ -373,7 +373,7 @@
  ## Qt5 setup setup
  if (ENABLE_QT)
      message(STATUS "Qt launcher enabled, checking for Qt >= 5.4 / qmake")
--    find_package(Qt5 5.4 COMPONENTS Widgets Network Qml Quick Svg)
-+    find_package(Qt5 5.4 COMPONENTS Widgets Network Qml Quick)
+-    find_package(Qt5 5.4 COMPONENTS Widgets Gui Network Qml Quick Svg)
++    find_package(Qt5 5.4 COMPONENTS Widgets Gui Network Qml Quick)
      if (Qt5Widgets_FOUND)
          message(STATUS "Will enable Qt launcher GUI")
          set(HAVE_QT 1)
-diff -ruN flightgear-2020.1.2/CMakeModules/SetupFGFSLibraries.cmake fgfs-my/CMakeModules/SetupFGFSLibraries.cmake
---- flightgear-2020.1.2/CMakeModules/SetupFGFSLibraries.cmake	2020-05-24 17:14:48.000000000 +0200
-+++ fgfs-my/CMakeModules/SetupFGFSLibraries.cmake	2020-05-31 13:55:33.484421108 +0200
+diff -ruN flightgear-2020.3.5/CMakeModules/SetupFGFSLibraries.cmake fgfs-my/CMakeModules/SetupFGFSLibraries.cmake
+--- flightgear-2020.3.5/CMakeModules/SetupFGFSLibraries.cmake	2020-12-18 12:43:09.000000000 +0100
++++ fgfs-my/CMakeModules/SetupFGFSLibraries.cmake	2021-01-24 01:35:31.298263659 +0100
 @@ -33,15 +33,8 @@
  
      # PkgConfig::DBUS target
@@ -31,15 +31,15 @@ diff -ruN flightgear-2020.1.2/CMakeModules/SetupFGFSLibraries.cmake fgfs-my/CMak
      endif()
  
      if(FG_HAVE_GPERFTOOLS)
-diff -ruN flightgear-2020.1.2/src/GUI/CMakeLists.txt fgfs-my/src/GUI/CMakeLists.txt
---- flightgear-2020.1.2/src/GUI/CMakeLists.txt	2020-05-24 17:14:48.000000000 +0200
-+++ fgfs-my/src/GUI/CMakeLists.txt	2020-05-31 13:56:41.745941586 +0200
-@@ -137,7 +137,7 @@
-                             ${qml_sources})
+diff -ruN flightgear-2020.3.5/src/GUI/CMakeLists.txt fgfs-my/src/GUI/CMakeLists.txt
+--- flightgear-2020.3.5/src/GUI/CMakeLists.txt	2020-12-18 12:43:09.000000000 +0100
++++ fgfs-my/src/GUI/CMakeLists.txt	2021-01-24 01:40:02.008618256 +0100
+@@ -142,7 +142,7 @@
  
      set_property(TARGET fglauncher PROPERTY AUTOMOC ON)
+     target_include_directories(fglauncher PRIVATE ${PROJECT_BINARY_DIR}/src/GUI)
 -    target_link_libraries(fglauncher Qt5::Core Qt5::Widgets Qt5::Network Qt5::Qml Qt5::Quick Qt5::Svg SimGearCore)
 +    target_link_libraries(fglauncher Qt5::Core Qt5::Widgets Qt5::Network Qt5::Qml Qt5::Quick SimGearCore)
-     target_include_directories(fglauncher PRIVATE ${PROJECT_BINARY_DIR}/src/GUI)
  
-     add_library(fgqmlui QQuickDrawable.cxx
+     if (ENABLE_QQ_UI)
+       set(QQUI_SOURCES 

diff --git a/games-simulation/flightgear/flightgear-2020.1.2.ebuild b/games-simulation/flightgear/flightgear-2020.3.5.ebuild
similarity index 95%
rename from games-simulation/flightgear/flightgear-2020.1.2.ebuild
rename to games-simulation/flightgear/flightgear-2020.3.5.ebuild
index c472dcc0fa5..23f6c894ed3 100644
--- a/games-simulation/flightgear/flightgear-2020.1.2.ebuild
+++ b/games-simulation/flightgear/flightgear-2020.3.5.ebuild
@@ -64,8 +64,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2020.1.2-cmake.patch"
-	"${FILESDIR}/${P}-boost.patch"
+	"${FILESDIR}/${PN}-2020.3.5-cmake.patch"
 )
 
 DOCS=(AUTHORS ChangeLog NEWS README Thanks)
@@ -95,7 +94,7 @@ src_configure() {
 		-DENABLE_PROFILE=OFF
 		-DENABLE_QT=$(usex qt5)
 		-DENABLE_RTI=OFF
-		-DENABLE_SIMD=OFF # see CPU_FLAGS
+		-DENABLE_SIMD=$(usex cpu_flags_x86_sse2)
 		-DENABLE_STGMERGE=ON
 		-DENABLE_SWIFT=OFF # swift pilot client not packaged yet
 		-DENABLE_TERRASYNC=$(usex utils)
@@ -118,9 +117,6 @@ src_configure() {
 		-DUSE_DBUS=$(usex dbus)
 		-DWITH_FGPANEL=$(usex utils)
 	)
-	if use cpu_flags_x86_sse2; then
-		append-flags -msse2 -mfpmath=sse
-	fi
 	if use gdal && use utils; then
 		mycmakeargs+=(-DENABLE_DEMCONVERT=ON)
 	else

diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
index 2eea53f95a8..551102d90c5 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-9999.ebuild
@@ -66,7 +66,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 PATCHES=(
-#	"${FILESDIR}/${PN}-2020.1.2-cmake.patch"
+	"${FILESDIR}/${PN}-2020.3.5-cmake.patch"
 )
 
 DOCS=(AUTHORS ChangeLog NEWS README Thanks)
@@ -96,7 +96,7 @@ src_configure() {
 		-DENABLE_PROFILE=OFF
 		-DENABLE_QT=$(usex qt5)
 		-DENABLE_RTI=OFF
-		-DENABLE_SIMD=OFF # see CPU_FLAGS
+		-DENABLE_SIMD=$(usex cpu_flags_x86_sse2)
 		-DENABLE_STGMERGE=ON
 		-DENABLE_SWIFT=OFF # swift pilot client not packaged yet
 		-DENABLE_TERRASYNC=$(usex utils)
@@ -119,9 +119,6 @@ src_configure() {
 		-DUSE_DBUS=$(usex dbus)
 		-DWITH_FGPANEL=$(usex utils)
 	)
-	if use cpu_flags_x86_sse2; then
-		append-flags -msse2 -mfpmath=sse
-	fi
 	if use gdal && use utils; then
 		mycmakeargs+=(-DENABLE_DEMCONVERT=ON)
 	else


^ permalink raw reply related	[flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-games/simgear/, games-simulation/flightgear/files/, ...
@ 2022-04-10 21:33 Maciej Mrozowski
  0 siblings, 0 replies; 2+ messages in thread
From: Maciej Mrozowski @ 2022-04-10 21:33 UTC (permalink / raw
  To: gentoo-commits

commit:     b851f9ff0e05369d2ae65e51e5878c19d8839d01
Author:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 20:05:56 2022 +0000
Commit:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 21:33:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b851f9ff

games-simulation/flightgear: version bump 2020.3.12, remove old

Signed-off-by: Maciej Mrozowski <reavertm <AT> gentoo.org>

 dev-games/simgear/Manifest                                   |  2 +-
 .../{simgear-2020.3.11.ebuild => simgear-2020.3.12.ebuild}   |  0
 games-simulation/flightgear-data/Manifest                    |  2 +-
 ...ata-2020.3.11.ebuild => flightgear-data-2020.3.12.ebuild} |  0
 games-simulation/flightgear/Manifest                         |  2 +-
 .../flightgear/files/flightgear-2020.3.11-fix-assert.patch   | 12 ------------
 ...ightgear-2020.3.11.ebuild => flightgear-2020.3.12.ebuild} |  1 -
 7 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index e7fd9ec900ce..f1368969e3dd 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1 +1 @@
-DIST simgear-2020.3.11.tar.bz2 1415047 BLAKE2B f41391d6d018e7c5bc00897fdbd7ce431b02b0e925a62a2ec8f09a217a79efc3d2a20f247b61c8164f0d154b1202620bd68e76847acfba0c41bdb0b56f284d30 SHA512 e7b7c73a574012f9ee33cc751eca9dc968339d0f8f5ec005386ed6863d96af6d17423dd68eb5180f1c6bf3b05a422de10ce03ea5e745029445edac7919fc1c99
+DIST simgear-2020.3.12.tar.bz2 1415062 BLAKE2B bed00dabb8d2ac937cb2fa7a8782c32568dc106d857dd2e9a7f3d2c99ad1372ffcd3c571b899920122e711ce1e561a9895762fb199f1cac947bb68769066b555 SHA512 2292c5c43b485fdf4b814b25eae8caa2ed16e043a159328aa5e35a27f9a4fd250219e8b506da1361916bd1d314bb857d3bd1343b1b6b34890bf06c63705c8dbc

diff --git a/dev-games/simgear/simgear-2020.3.11.ebuild b/dev-games/simgear/simgear-2020.3.12.ebuild
similarity index 100%
rename from dev-games/simgear/simgear-2020.3.11.ebuild
rename to dev-games/simgear/simgear-2020.3.12.ebuild

diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest
index 7466237eb0db..dc86542310ac 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1 +1 @@
-DIST FlightGear-2020.3.11-data.txz 1736954520 BLAKE2B d5f3fd8facc93fab140171fad04ee0c331c4ab35c893ee762bb0b6250ee632c820e7570de57d2dfd6348fb9aaefdba209e845d00f67737b24eff17b025b30aa4 SHA512 b46193d4e9138ec58da048d9c3a36d47ae7204673fb9524f23b3d52dab02db8ef52fe8d67b7fd648222aac8585dd7e2fa5484317fdd07e07a58f3816f1378702
+DIST FlightGear-2020.3.12-data.txz 1787955196 BLAKE2B 648994bb8a70416d9fbf9fbb71c91d6652db4f915ce39938ad870f6de4a745c7f6df36025726fe29d67a598f1ce64718d12b7be5b81ebb83318246cd991fac1a SHA512 7bb97c0b2ee59b300a95f331bfd12e39aaaa7d3320e33cc4e72ea3c5fae196af52e97d9ed7f6af274162ecdd00642e729d96165df5dcbcb95e2853cf7c1df463

diff --git a/games-simulation/flightgear-data/flightgear-data-2020.3.11.ebuild b/games-simulation/flightgear-data/flightgear-data-2020.3.12.ebuild
similarity index 100%
rename from games-simulation/flightgear-data/flightgear-data-2020.3.11.ebuild
rename to games-simulation/flightgear-data/flightgear-data-2020.3.12.ebuild

diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 0d9ca261c9e9..50074be20454 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1 +1 @@
-DIST flightgear-2020.3.11.tar.bz2 8926212 BLAKE2B 03b3203fb688fe842247f8ac11957f438f02154cbc992bb98076ab3dd6fcac5f3241509cc1c621f3b647487b772257763d154c756792ce8ff738ff5396fe07ef SHA512 9a7c6f262da8daf3d954df7a2a8a96e555f3212c1d949211d0dbddd08a8f7380fa8f4986d60f48e17db563154d250184ee772b79b10277a2c5819fabec3930ee
+DIST flightgear-2020.3.12.tar.bz2 8929319 BLAKE2B e84b0519d69f46d5951372deed59f9b1219739710b3374d0bc0041127f8e4b7869c43b20169a9ac3a89d4e121f9da27d01c6db98e683bc3f80da6b1930e1a7c0 SHA512 91e04ae6dc5d12e799bab10b3c4321e77f8d995469453453fdff26a9858f40056dbe8c095423397fcbef307994042c377eb37532af2732674f39e5624c950e9c

diff --git a/games-simulation/flightgear/files/flightgear-2020.3.11-fix-assert.patch b/games-simulation/flightgear/files/flightgear-2020.3.11-fix-assert.patch
deleted file mode 100644
index f35cf2c426a4..000000000000
--- a/games-simulation/flightgear/files/flightgear-2020.3.11-fix-assert.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN flightgear-2020.3.11/src/Navaids/PositionedOctree.cxx fgfs-my/src/Navaids/PositionedOctree.cxx
---- flightgear-2020.3.11/src/Navaids/PositionedOctree.cxx	2021-07-29 11:35:40.000000000 +0200
-+++ fgfs-my/src/Navaids/PositionedOctree.cxx	2021-09-16 23:01:20.989931176 +0200
-@@ -148,7 +148,7 @@
- 
- void Leaf::insertChild(FGPositioned::Type ty, PositionedID id)
- {
--  assert(childrenLoaded);
-+  assert(_childrenLoaded);
-   children.insert(children.end(), TypedPositioned(ty, id));
- }
- 

diff --git a/games-simulation/flightgear/flightgear-2020.3.11.ebuild b/games-simulation/flightgear/flightgear-2020.3.12.ebuild
similarity index 98%
rename from games-simulation/flightgear/flightgear-2020.3.11.ebuild
rename to games-simulation/flightgear/flightgear-2020.3.12.ebuild
index 5467dd59b859..baafbbda8846 100644
--- a/games-simulation/flightgear/flightgear-2020.3.11.ebuild
+++ b/games-simulation/flightgear/flightgear-2020.3.12.ebuild
@@ -65,7 +65,6 @@ RDEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2020.3.8-cmake.patch"
-	"${FILESDIR}/${PN}-2020.3.11-fix-assert.patch"
 )
 
 DOCS=(AUTHORS ChangeLog NEWS README Thanks)


^ permalink raw reply related	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-04-10 21:33 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-25 20:42 [gentoo-commits] repo/gentoo:master commit in: dev-games/simgear/, games-simulation/flightgear/files/, Maciej Mrozowski
  -- strict thread matches above, loose matches on Subject: below --
2022-04-10 21:33 Maciej Mrozowski

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox