Hello community,
here is the log from the commit of package FlightGear for openSUSE:Factory checked in at 2020-06-30 21:58:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/FlightGear (Old)
and /work/SRC/openSUSE:Factory/.FlightGear.new.3060 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "FlightGear"
Tue Jun 30 21:58:02 2020 rev:12 rq:817778 version:2020.1.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/FlightGear/FlightGear.changes 2020-06-14 18:35:26.918568643 +0200
+++ /work/SRC/openSUSE:Factory/.FlightGear.new.3060/FlightGear.changes 2020-06-30 21:58:51.403202970 +0200
@@ -1,0 +2,8 @@
+Sat Jun 27 16:58:53 UTC 2020 - Stefan Brüns
+
+- Update to 2020.1.3
+ * http://wiki.flightgear.org/Changelog_2020.1#2020.1.3_point_release
+- Add Fix_language_detection.patch
+- Use system libspeex
+
+-------------------------------------------------------------------
Old:
----
flightgear-2020.1.2.tar.bz2
New:
----
Fix_language_detection.patch
flightgear-2020.1.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ FlightGear.spec ++++++
--- /var/tmp/diff_new_pack.3MaBWj/_old 2020-06-30 21:58:53.123208293 +0200
+++ /var/tmp/diff_new_pack.3MaBWj/_new 2020-06-30 21:58:53.123208293 +0200
@@ -18,13 +18,15 @@
%define main_version 2020.1
Name: FlightGear
-Version: %{main_version}.2
+Version: %{main_version}.3
Release: 0
Summary: Flight Simulator
License: GPL-2.0-only
Group: Amusements/Games/3D/Simulation
URL: https://www.flightgear.org/
Source0: https://sourceforge.net/projects/flightgear/files/release-%{main_version}/flightgear-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM
+Patch0: Fix_language_detection.patch
BuildRequires: SimGear-devel = %{version}
BuildRequires: cmake
@@ -32,6 +34,7 @@
BuildRequires: gcc-c++
BuildRequires: hicolor-icon-theme
BuildRequires: libboost_headers-devel
+BuildRequires: libevent-devel
BuildRequires: pkgconfig
BuildRequires: plib-devel
BuildRequires: sqlite3-devel
@@ -42,6 +45,8 @@
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(libudev)
+BuildRequires: pkgconfig(speex)
+BuildRequires: pkgconfig(speexdsp)
# Additional dependencies to enable FlightGear's new Qt launcher interface
BuildRequires: cmake(Qt5Network)
@@ -60,6 +65,7 @@
%prep
%setup -q -n flightgear-%{version}
+%patch0 -p1
# remove some unneeded doc files
for ext in Cygwin IRIX Joystick Linux MSVC MSVC8 MacOS SimGear Unix Win32-X autoconf mingw plib src xmlsyntax; do
@@ -76,7 +82,8 @@
-DENABLE_GPSSMOOTH:BOOL=OFF \
-DENABLE_FGVIEWER:BOOL=OFF \
-DENABLE_FGELEV:BOOL=OFF \
- -DENABLE_METAR:BOOL=OFF
+ -DOpenGL_GL_PREFERENCE=GLVND \
+ -DENABLE_METAR:BOOL=ON
%cmake_build
%install
++++++ Fix_language_detection.patch ++++++
CMake translations: don’t break no-translation builds
Move all the relevant pieces inside the do_translate guard, so we
don’t break compilation when translation is disabled.
--- a/CMakeModules/Translations.cmake 2020-06-28 05:18:26.819214997 +0200
+++ b/CMakeModules/Translations.cmake 2020-06-28 05:19:02.043619306 +0200
@@ -35,10 +35,10 @@
set(${result} ${dirlist} PARENT_SCOPE)
endfunction()
-translation_dir_list(LANGUAGES ${TRANSLATIONS_SRC_DIR})
-message(STATUS "Detected language files: ${LANGUAGES}")
-
if (${do_translate})
+ translation_dir_list(LANGUAGES ${TRANSLATIONS_SRC_DIR})
+ message(STATUS "Detected language files: ${LANGUAGES}")
+
set(translation_res "${PROJECT_BINARY_DIR}/translations.qrc")
add_custom_target(fgfs_qm_files ALL)
@@ -72,15 +72,15 @@
# set this so config.h can detect it
set(HAVE_QRC_TRANSLATIONS TRUE)
-endif() # of do translate
-add_custom_target(ts)
-foreach(lang ${LANGUAGES})
- add_custom_target(
- ts_${lang}
- COMMAND Qt5::lupdate ${CMAKE_SOURCE_DIR}/src/GUI
- -locations relative -no-ui-lines -ts ${TRANSLATIONS_SRC_DIR}/${lang}/FlightGear-Qt.xlf
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
- )
- add_dependencies(ts ts_${lang})
-endforeach()
\ Kein Zeilenumbruch am Dateiende.
+ add_custom_target(ts)
+ foreach(lang ${LANGUAGES})
+ add_custom_target(
+ ts_${lang}
+ COMMAND Qt5::lupdate ${CMAKE_SOURCE_DIR}/src/GUI
+ -locations relative -no-ui-lines -ts ${TRANSLATIONS_SRC_DIR}/${lang}/FlightGear-Qt.xlf
+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+ )
+ add_dependencies(ts ts_${lang})
+ endforeach()
+endif() # of do translate
++++++ flightgear-2020.1.2.tar.bz2 -> flightgear-2020.1.3.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/FlightGear/flightgear-2020.1.2.tar.bz2 /work/SRC/openSUSE:Factory/.FlightGear.new.3060/flightgear-2020.1.3.tar.bz2 differ: char 11, line 1