[chromium-browser-privacy/f32] Add rawhide fix and add ability to manually apply patches for ifdef patches
by Leigh Scott
commit 78298fdc49de2ebf44d175233cc7202ecc29ed87
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Mar 30 12:30:03 2021 +0100
Add rawhide fix and add ability to manually apply patches for ifdef patches
chromium-browser-privacy.spec | 24 +++++++++++++++++-------
chromium-rawhide-gcc-std-max-fix.patch | 24 ++++++++++++++++++++++++
2 files changed, 41 insertions(+), 7 deletions(-)
---
diff --git a/chromium-browser-privacy.spec b/chromium-browser-privacy.spec
index 53e81aa..d18efef 100644
--- a/chromium-browser-privacy.spec
+++ b/chromium-browser-privacy.spec
@@ -150,6 +150,10 @@ ExclusiveArch: x86_64
# Fedora patches:
Patch300: chromium-py2-bootstrap.patch
Patch320: chromium-widevine-locations.patch
+Patch321: chromium-fstatfix.patch
+Patch322: chromium-gcc11.patch
+# Manually applied patches:
+Patch701: chromium-rawhide-gcc-std-max-fix.patch
# RPM Fusion patches [free/chromium-freeworld]:
Patch400: chromium-hw-accel-mjpeg.patch
@@ -158,11 +162,8 @@ Patch402: chromium-enable-widevine.patch
Patch403: chromium-manpage.patch
Patch404: chromium-md5-based-build-id.patch
Patch405: chromium-names.patch
-Patch406: chromium-fstatfix.patch
-Patch407: chromium-gcc11.patch
-%if %{freeworld}
-Patch420: chromium-rpm-fusion-brand.patch
-%endif
+# Manually applied patches:
+Patch700: chromium-rpm-fusion-brand.patch
# RPM Fusion patches [free/chromium-browser-privacy]:
Patch500: chromium-default-user-data-dir.patch
@@ -207,8 +208,17 @@ browser, ungoogled-chromium is essentially a drop-in replacement for Chromium.
python3 -B %{ungoogled_chromium_root}/utils/prune_binaries.py . \
%{ungoogled_chromium_root}/pruning.list
-# Apply patches from this spec.
-%autopatch -p1
+# Apply patches up to #600 from this spec.
+%autopatch -M600 -p1
+
+# Manually apply patches that need an ifdef
+%if %{freeworld}
+%patch700 -p1
+%endif
+
+%if 0%{?fedora} >= 35
+%patch701 -p1
+%endif
#Let's change the default shebang of python files.
find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(python\|env python\)[23]\?=#!%{__python2}=' {} +
diff --git a/chromium-rawhide-gcc-std-max-fix.patch b/chromium-rawhide-gcc-std-max-fix.patch
new file mode 100644
index 0000000..d63c00a
--- /dev/null
+++ b/chromium-rawhide-gcc-std-max-fix.patch
@@ -0,0 +1,24 @@
+diff -up chromium-88.0.4324.182/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc.stdmaxfix chromium-88.0.4324.182/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc
+--- chromium-88.0.4324.182/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc.stdmaxfix 2021-02-17 13:16:27.120283969 -0500
++++ chromium-88.0.4324.182/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc 2021-02-17 13:17:37.951617295 -0500
+@@ -135,7 +135,7 @@ static bool SetupAlternateStackOnce() {
+ #else
+ const size_t page_mask = sysconf(_SC_PAGESIZE) - 1;
+ #endif
+- size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
++ size_t stack_size = (std::max(SIGSTKSZ, static_cast<long>(65536)) + page_mask) & ~page_mask;
+ #if defined(ABSL_HAVE_ADDRESS_SANITIZER) || \
+ defined(ABSL_HAVE_MEMORY_SANITIZER) || defined(ABSL_HAVE_THREAD_SANITIZER)
+ // Account for sanitizer instrumentation requiring additional stack space.
+diff -up chromium-88.0.4324.182/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.stdmaxfix chromium-88.0.4324.182/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+--- chromium-88.0.4324.182/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.stdmaxfix 2021-02-17 14:39:04.556382532 -0500
++++ chromium-88.0.4324.182/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc 2021-02-17 14:39:34.002519173 -0500
+@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() {
+ // SIGSTKSZ may be too small to prevent the signal handlers from overrunning
+ // the alternative stack. Ensure that the size of the alternative stack is
+ // large enough.
+- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
++ static const unsigned kSigStackSize = std::max(static_cast<long>(16384), SIGSTKSZ);
+
+ // Only set an alternative stack if there isn't already one, or if the current
+ // one is too small.
3 years
[chromium-browser-privacy/f32] Fix F34 glibc font render and gcc11 issues
by Leigh Scott
commit 3d064f23199cbbecacc2dc6573e6758a1407911a
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Mar 30 12:19:57 2021 +0100
Fix F34 glibc font render and gcc11 issues
chromium-browser-privacy.spec | 2 +
chromium-fstatfix.patch | 141 ++++++++++++++++++++++++++++++++++++++++++
chromium-gcc11.patch | 127 +++++++++++++++++++++++++++++++++++++
3 files changed, 270 insertions(+)
---
diff --git a/chromium-browser-privacy.spec b/chromium-browser-privacy.spec
index 55509d8..53e81aa 100644
--- a/chromium-browser-privacy.spec
+++ b/chromium-browser-privacy.spec
@@ -158,6 +158,8 @@ Patch402: chromium-enable-widevine.patch
Patch403: chromium-manpage.patch
Patch404: chromium-md5-based-build-id.patch
Patch405: chromium-names.patch
+Patch406: chromium-fstatfix.patch
+Patch407: chromium-gcc11.patch
%if %{freeworld}
Patch420: chromium-rpm-fusion-brand.patch
%endif
diff --git a/chromium-fstatfix.patch b/chromium-fstatfix.patch
new file mode 100644
index 0000000..26e8003
--- /dev/null
+++ b/chromium-fstatfix.patch
@@ -0,0 +1,141 @@
+diff -up chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc.fstatfix chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+--- chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc.fstatfix 2021-01-25 10:11:45.427436398 -0500
++++ chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc 2021-01-25 10:12:51.337699003 -0500
+@@ -257,6 +257,18 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+ return RestrictKillTarget(current_pid, sysno);
+ }
+
++#if defined(__NR_newfstatat)
++ if (sysno == __NR_newfstatat) {
++ return RewriteFstatatSIGSYS();
++ }
++#endif
++
++#if defined(__NR_fstatat64)
++ if (sysno == __NR_fstatat64) {
++ return RewriteFstatatSIGSYS();
++ }
++#endif
++
+ if (SyscallSets::IsFileSystem(sysno) ||
+ SyscallSets::IsCurrentDirectory(sysno)) {
+ return Error(fs_denied_errno);
+diff -up chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc.fstatfix chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
+--- chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc.fstatfix 2021-01-25 10:13:10.179774081 -0500
++++ chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc 2021-01-25 10:16:18.790525746 -0500
+@@ -6,6 +6,8 @@
+
+ #include "sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h"
+
++#include <errno.h>
++#include <fcntl.h>
+ #include <stddef.h>
+ #include <stdint.h>
+ #include <string.h>
+@@ -355,6 +357,35 @@ intptr_t SIGSYSSchedHandler(const struct
+ return -ENOSYS;
+ }
+
++intptr_t SIGSYSFstatatHandler(const struct arch_seccomp_data& args,
++ void* aux) {
++ switch (args.nr) {
++#if defined(__NR_newfstatat)
++ case __NR_newfstatat:
++#endif
++#if defined(__NR_fstatat64)
++ case __NR_fstatat64:
++#endif
++#if defined(__NR_newfstatat) || defined(__NR_fstatat64)
++ if (*reinterpret_cast<const char *>(args.args[1]) == '\0'
++ && args.args[3] == static_cast<uint64_t>(AT_EMPTY_PATH)) {
++ return sandbox::sys_fstat64(static_cast<int>(args.args[0]),
++ reinterpret_cast<struct stat64 *>(args.args[2]));
++ } else {
++ errno = EACCES;
++ return -1;
++ }
++ break;
++#endif
++ }
++
++ CrashSIGSYS_Handler(args, aux);
++
++ // Should never be reached.
++ RAW_CHECK(false);
++ return -ENOSYS;
++}
++
+ bpf_dsl::ResultExpr CrashSIGSYS() {
+ return bpf_dsl::Trap(CrashSIGSYS_Handler, NULL);
+ }
+@@ -387,6 +418,10 @@ bpf_dsl::ResultExpr RewriteSchedSIGSYS()
+ return bpf_dsl::Trap(SIGSYSSchedHandler, NULL);
+ }
+
++bpf_dsl::ResultExpr RewriteFstatatSIGSYS() {
++ return bpf_dsl::Trap(SIGSYSFstatatHandler, NULL);
++}
++
+ void AllocateCrashKeys() {
+ #if !defined(OS_NACL_NONSFI)
+ if (seccomp_crash_key)
+diff -up chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h.fstatfix chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h
+--- chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h.fstatfix 2021-01-25 10:16:36.982598236 -0500
++++ chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h 2021-01-25 10:18:45.705111027 -0500
+@@ -62,6 +62,10 @@ SANDBOX_EXPORT intptr_t SIGSYSPtraceFail
+ // sched_setparam(), sched_setscheduler()
+ SANDBOX_EXPORT intptr_t SIGSYSSchedHandler(const arch_seccomp_data& args,
+ void* aux);
++// If the fstatat syscall is actually a disguised fstat, calls the regular fstat
++// syscall, otherwise, crashes in the same way as CrashSIGSYS_Handler.
++SANDBOX_EXPORT intptr_t SIGSYSFstatatHandler(const struct arch_seccomp_data& args,
++ void* aux);
+
+ // Variants of the above functions for use with bpf_dsl.
+ SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYS();
+@@ -72,6 +76,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Crash
+ SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYSFutex();
+ SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYSPtrace();
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RewriteSchedSIGSYS();
++SANDBOX_EXPORT bpf_dsl::ResultExpr RewriteFstatatSIGSYS();
+
+ // Allocates a crash key so that Seccomp information can be recorded.
+ void AllocateCrashKeys();
+diff -up chromium-88.0.4324.96/sandbox/linux/services/syscall_wrappers.cc.fstatfix chromium-88.0.4324.96/sandbox/linux/services/syscall_wrappers.cc
+--- chromium-88.0.4324.96/sandbox/linux/services/syscall_wrappers.cc.fstatfix 2021-01-25 10:18:53.307141311 -0500
++++ chromium-88.0.4324.96/sandbox/linux/services/syscall_wrappers.cc 2021-01-25 10:19:46.982355293 -0500
+@@ -261,4 +261,13 @@ int sys_sigaction(int signum,
+
+ #endif // defined(MEMORY_SANITIZER)
+
++SANDBOX_EXPORT int sys_fstat64(int fd, struct stat64 *buf)
++{
++#if defined(__NR_fstat64)
++ return syscall(__NR_fstat64, fd, buf);
++#else
++ return syscall(__NR_fstat, fd, buf);
++#endif
++}
++
+ } // namespace sandbox
+diff -up chromium-88.0.4324.96/sandbox/linux/services/syscall_wrappers.h.fstatfix chromium-88.0.4324.96/sandbox/linux/services/syscall_wrappers.h
+--- chromium-88.0.4324.96/sandbox/linux/services/syscall_wrappers.h.fstatfix 2021-01-25 10:19:53.115379741 -0500
++++ chromium-88.0.4324.96/sandbox/linux/services/syscall_wrappers.h 2021-01-25 10:20:45.485588421 -0500
+@@ -17,6 +17,7 @@ struct sock_fprog;
+ struct rlimit64;
+ struct cap_hdr;
+ struct cap_data;
++struct stat64;
+
+ namespace sandbox {
+
+@@ -84,6 +85,9 @@ SANDBOX_EXPORT int sys_sigaction(int sig
+ const struct sigaction* act,
+ struct sigaction* oldact);
+
++// Recent glibc rewrites fstat to fstatat.
++SANDBOX_EXPORT int sys_fstat64(int fd, struct stat64 *buf);
++
+ } // namespace sandbox
+
+ #endif // SANDBOX_LINUX_SERVICES_SYSCALL_WRAPPERS_H_
diff --git a/chromium-gcc11.patch b/chromium-gcc11.patch
new file mode 100644
index 0000000..75f2299
--- /dev/null
+++ b/chromium-gcc11.patch
@@ -0,0 +1,127 @@
+diff --git a/third_party/angle/src/libANGLE/HandleAllocator.cpp b/third_party/angle/src/libANGLE/HandleAllocator.cpp
+index 013f1dfb2..3ce63c192 100644
+--- a/third_party/angle/src/libANGLE/HandleAllocator.cpp
++++ b/third_party/angle/src/libANGLE/HandleAllocator.cpp
+@@ -9,6 +9,7 @@
+
+ #include "libANGLE/HandleAllocator.h"
+
++#include <limits>
+ #include <algorithm>
+ #include <functional>
+
+diff --git a/third_party/perfetto/src/trace_processor/containers/string_pool.cc b/third_party/perfetto/src/trace_processor/containers/string_pool.cc
+index fd651958f..1e8d0606c 100644
+--- a/third_party/perfetto/src/trace_processor/containers/string_pool.cc
++++ b/third_party/perfetto/src/trace_processor/containers/string_pool.cc
+@@ -14,9 +14,9 @@
+ * limitations under the License.
+ */
+
++#include <limits>
+ #include "src/trace_processor/containers/string_pool.h"
+
+-#include <limits>
+
+ #include "perfetto/base/logging.h"
+ #include "perfetto/ext/base/utils.h"
+diff --git a/third_party/perfetto/src/trace_processor/db/column.cc b/third_party/perfetto/src/trace_processor/db/column.cc
+index 00496b335..0dccfeb8a 100644
+--- a/third_party/perfetto/src/trace_processor/db/column.cc
++++ b/third_party/perfetto/src/trace_processor/db/column.cc
+@@ -14,6 +14,7 @@
+ * limitations under the License.
+ */
+
++#include <limits>
+ #include "src/trace_processor/db/column.h"
+
+ #include "src/trace_processor/db/compare.h"
+diff --git a/third_party/perfetto/src/trace_processor/types/variadic.cc b/third_party/perfetto/src/trace_processor/types/variadic.cc
+index 837bfeba9..cdd56817d 100644
+--- a/third_party/perfetto/src/trace_processor/types/variadic.cc
++++ b/third_party/perfetto/src/trace_processor/types/variadic.cc
+@@ -14,6 +14,7 @@
+ * limitations under the License.
+ */
+
++#include <limits>
+ #include "src/trace_processor/types/variadic.h"
+
+ namespace perfetto {
+diff --git a/ui/accessibility/platform/ax_platform_atk_hyperlink.cc b/ui/accessibility/platform/ax_platform_atk_hyperlink.cc
+index be91def6b..73f202356 100644
+--- a/ui/accessibility/platform/ax_platform_atk_hyperlink.cc
++++ b/ui/accessibility/platform/ax_platform_atk_hyperlink.cc
+@@ -245,7 +245,7 @@ static void AXPlatformAtkHyperlinkInit(AXPlatformAtkHyperlink* self, gpointer) {
+ }
+
+ GType ax_platform_atk_hyperlink_get_type() {
+- static volatile gsize type_volatile = 0;
++ static gsize type_volatile = 0;
+
+ AXPlatformNodeAuraLinux::EnsureGTypeInit();
+
+diff --git a/ui/accessibility/platform/ax_platform_node_auralinux.cc b/ui/accessibility/platform/ax_platform_node_auralinux.cc
+index 04125c6fd..6c64e5d8e 100644
+--- a/ui/accessibility/platform/ax_platform_node_auralinux.cc
++++ b/ui/accessibility/platform/ax_platform_node_auralinux.cc
+@@ -2274,7 +2274,7 @@ void ClassInit(gpointer class_pointer, gpointer /* class_data */) {
+ GType GetType() {
+ AXPlatformNodeAuraLinux::EnsureGTypeInit();
+
+- static volatile gsize type_volatile = 0;
++ static gsize type_volatile = 0;
+ if (g_once_init_enter(&type_volatile)) {
+ static const GTypeInfo type_info = {
+ sizeof(AXPlatformNodeAuraLinuxClass), // class_size
+diff --git a/ui/gtk/gtk_key_bindings_handler.cc b/ui/gtk/gtk_key_bindings_handler.cc
+index c663a2074..38a342484 100644
+--- a/ui/gtk/gtk_key_bindings_handler.cc
++++ b/ui/gtk/gtk_key_bindings_handler.cc
+@@ -141,7 +141,7 @@ void GtkKeyBindingsHandler::HandlerClassInit(HandlerClass* klass) {
+ }
+
+ GType GtkKeyBindingsHandler::HandlerGetType() {
+- static volatile gsize type_id_volatile = 0;
++ static gsize type_id_volatile = 0;
+ if (g_once_init_enter(&type_id_volatile)) {
+ GType type_id = g_type_register_static_simple(
+ GTK_TYPE_TEXT_VIEW, g_intern_static_string("GtkKeyBindingsHandler"),
+diff --git a/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc b/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc
+index c0b5a805b..e6f921926 100644
+--- a/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc
++++ b/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc
+@@ -2,6 +2,7 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+
++#include <cstddef>
+ #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
+
+ #include "base/observer_list.h"
+diff --git a/components/bookmarks/browser/bookmark_expanded_state_tracker.cc b/components/bookmarks/browser/bookmark_expanded_state_tracker.cc
+index 4ad2afa1f..5c4596e12 100644
+--- a/components/bookmarks/browser/bookmark_expanded_state_tracker.cc
++++ b/components/bookmarks/browser/bookmark_expanded_state_tracker.cc
+@@ -2,6 +2,7 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+
++#include <cstddef>
+ #include "components/bookmarks/browser/bookmark_expanded_state_tracker.h"
+
+ #include <stdint.h>
+diff --git a/components/bookmarks/browser/base_bookmark_model_observer.cc b/components/bookmarks/browser/base_bookmark_model_observer.cc
+index 657a3c96b..ad641a082 100644
+--- a/components/bookmarks/browser/base_bookmark_model_observer.cc
++++ b/components/bookmarks/browser/base_bookmark_model_observer.cc
+@@ -2,6 +2,8 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+
++#include <cstddef>
++
+ #include "components/bookmarks/browser/base_bookmark_model_observer.h"
+
+ namespace bookmarks {
3 years
[EmptyEpsilon/f32] Revert "Add a bunch of custom patches" This reverts commit 845c2754d4e897cdc58e4f3f2009648e57f90426.
by Michal Schorm
commit 97b926b3464b91084a706b519b0568a7bfc0f33e
Author: Michal Schorm <mschorm(a)redhat.com>
Date: Mon Mar 29 02:56:16 2021 +0200
Revert "Add a bunch of custom patches"
This reverts commit 845c2754d4e897cdc58e4f3f2009648e57f90426.
This commit was meant for a private developement repository, from which I propose features upstream.
.gitignore | 2 -
EmptyEpsilon.spec | 14 +--
WIP_relay_long_range_v1.patch | 86 ---------------
WIP_relay_long_range_v2.patch | 47 --------
WIP_relay_visibility_range.patch | 11 --
WIP_science_scanner_box.patch | 11 --
WIP_science_scanner_box_alternative.patch | 33 ------
relay_add_info_selected_target.patch | 147 --------------------------
relay_show_asteroids.patch | 10 --
science_radar_setRangeIndicatorStepSize.patch | 11 --
10 files changed, 1 insertion(+), 371 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5618356..ed9f085 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,5 +12,3 @@
/SeriousProton-EE-2020.11.23.zip
/EmptyEpsilon-EE-2021.03.16.zip
/SeriousProton-EE-2021.03.16.zip
-/*src.rpm
-/*/
\ No newline at end of file
diff --git a/EmptyEpsilon.spec b/EmptyEpsilon.spec
index 3dcb626..92b2f6c 100644
--- a/EmptyEpsilon.spec
+++ b/EmptyEpsilon.spec
@@ -20,18 +20,6 @@ URL: http://emptyepsilon.org/
Source0: https://github.com/daid/EmptyEpsilon/archive/EE-%{version}.zip#/EmptyEpsi...
Source1: https://github.com/daid/SeriousProton/archive/EE-%{version}.zip#/SeriousP...
-# Finished tested patched which should be a standard pack of enhacements
-Patch1: science_radar_setRangeIndicatorStepSize.patch
-Patch2: relay_show_asteroids.patch
-
-# WIP tested patches which are ready to use, but the feature is only half-complete
-Patch100: relay_add_info_selected_target.patch
-
-# Unstable patches
-#Patch101: relay_visibility_range.patch
-#Patch101: relay_add_info_shipType.patch
-#Patch102: fix.patch
-
%description
EmptyEpsilon places you in the roles of a spaceship's bridge officers, like
those seen in Star Trek. While you can play EmptyEpsilon alone or with friends,
@@ -45,7 +33,7 @@ information and follow orders.
Note: Network play require port 35666 UDP and TCP allowed in firewall.
%prep
-%autosetup -b 1 -p1 -n EmptyEpsilon-EE-%{version}
+%autosetup -b 1 -n EmptyEpsilon-EE-%{version}
%build
%cmake3 \
3 years
[mlt-freeworld] On epel8 not BR SDL_images
by Sérgio M. Basto
commit 5e30b3c6f29fdde8a996aa50f5132c971e835444
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Mar 28 20:19:18 2021 +0100
On epel8 not BR SDL_images
mlt-freeworld.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/mlt-freeworld.spec b/mlt-freeworld.spec
index c8d951f..ed05d4b 100644
--- a/mlt-freeworld.spec
+++ b/mlt-freeworld.spec
@@ -123,6 +123,7 @@ find %{buildroot} -type d -empty -delete
%changelog
* Wed Feb 03 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 6.24.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+- On epel8 not BR SDL_images
* Fri Jan 1 2021 Leigh Scott <leigh123linux(a)gmail.com> - 6.24.0-2
- Rebuilt for new ffmpeg snapshot
3 years
[mlt-freeworld] On epel8 not BR SDL_images
by Sérgio M. Basto
commit 80579447366fb48ca6a8200bbe5f3c589282d306
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Mar 28 20:02:08 2021 +0100
On epel8 not BR SDL_images
mlt-freeworld.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/mlt-freeworld.spec b/mlt-freeworld.spec
index f58e524..c8d951f 100644
--- a/mlt-freeworld.spec
+++ b/mlt-freeworld.spec
@@ -8,7 +8,7 @@
Name: mlt-freeworld
Version: 6.24.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Toolkit for broadcasters, video editors, media players, transcoders
# mlt/src/win32/fnmatch.{c,h} are BSD-licensed.
@@ -24,9 +24,13 @@ BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-qtsvg-devel
BuildRequires: qt5-qt3d-devel
BuildRequires: SDL-devel
+%if ! (0%{?rhel} >= 8)
BuildRequires: SDL_image-devel
+%endif
BuildRequires: SDL2-devel
+%if ! (0%{?rhel} >= 8)
BuildRequires: SDL2_image-devel
+%endif
BuildRequires: gtk2-devel
BuildRequires: jack-audio-connection-kit-devel
BuildRequires: libatomic
3 years
[EmptyEpsilon/f32] Add a bunch of custom patches
by Michal Schorm
commit 845c2754d4e897cdc58e4f3f2009648e57f90426
Author: Michal Schorm <mschorm(a)redhat.com>
Date: Sun Mar 28 13:42:39 2021 +0200
Add a bunch of custom patches
.gitignore | 2 +
EmptyEpsilon.spec | 14 ++-
WIP_relay_long_range_v1.patch | 86 +++++++++++++++
WIP_relay_long_range_v2.patch | 47 ++++++++
WIP_relay_visibility_range.patch | 11 ++
WIP_science_scanner_box.patch | 11 ++
WIP_science_scanner_box_alternative.patch | 33 ++++++
relay_add_info_selected_target.patch | 147 ++++++++++++++++++++++++++
relay_show_asteroids.patch | 10 ++
science_radar_setRangeIndicatorStepSize.patch | 11 ++
10 files changed, 371 insertions(+), 1 deletion(-)
---
diff --git a/.gitignore b/.gitignore
index ed9f085..5618356 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,5 @@
/SeriousProton-EE-2020.11.23.zip
/EmptyEpsilon-EE-2021.03.16.zip
/SeriousProton-EE-2021.03.16.zip
+/*src.rpm
+/*/
\ No newline at end of file
diff --git a/EmptyEpsilon.spec b/EmptyEpsilon.spec
index 92b2f6c..3dcb626 100644
--- a/EmptyEpsilon.spec
+++ b/EmptyEpsilon.spec
@@ -20,6 +20,18 @@ URL: http://emptyepsilon.org/
Source0: https://github.com/daid/EmptyEpsilon/archive/EE-%{version}.zip#/EmptyEpsi...
Source1: https://github.com/daid/SeriousProton/archive/EE-%{version}.zip#/SeriousP...
+# Finished tested patched which should be a standard pack of enhacements
+Patch1: science_radar_setRangeIndicatorStepSize.patch
+Patch2: relay_show_asteroids.patch
+
+# WIP tested patches which are ready to use, but the feature is only half-complete
+Patch100: relay_add_info_selected_target.patch
+
+# Unstable patches
+#Patch101: relay_visibility_range.patch
+#Patch101: relay_add_info_shipType.patch
+#Patch102: fix.patch
+
%description
EmptyEpsilon places you in the roles of a spaceship's bridge officers, like
those seen in Star Trek. While you can play EmptyEpsilon alone or with friends,
@@ -33,7 +45,7 @@ information and follow orders.
Note: Network play require port 35666 UDP and TCP allowed in firewall.
%prep
-%autosetup -b 1 -n EmptyEpsilon-EE-%{version}
+%autosetup -b 1 -p1 -n EmptyEpsilon-EE-%{version}
%build
%cmake3 \
diff --git a/WIP_relay_long_range_v1.patch b/WIP_relay_long_range_v1.patch
new file mode 100644
index 0000000..c062fb6
--- /dev/null
+++ b/WIP_relay_long_range_v1.patch
@@ -0,0 +1,86 @@
+1/ On the "Relay" and "Strategic map" screens, reveal "Long Range Sensors" range instead of just "Short Range Sensors" range
+
+--- EmptyEpsilon-EE-2021.03.16/src/screenComponents/radarView.cpp 2021-03-16 14:36:34.000000000 +0100
++++ EmptyEpsilon-EE-2021.03.16/src/screenComponents/radarView.cpp_patched 2021-03-28 08:21:39.901481817 +0200
+@@ -245,7 +245,8 @@ void GuiRadarView::drawNoneFriendlyBlock
+ if (stb_obj
+ && (obj->isFriendly(my_spaceship) || obj == my_spaceship))
+ {
+- r = stb_obj->getShortRangeRadarRange() * scale;
++ if (obj == my_spaceship) { r = stb_obj->getLongRangeRadarRange() * scale; }
++ else { r = stb_obj->getShortRangeRadarRange() * scale; }
+ sf::CircleShape circle(r, 50);
+ circle.setOrigin(r, r);
+ circle.setFillColor(sf::Color(255, 255, 255, 255));
+
+
+
+
+2/ If the object is neither Friendly, nor Enemy, reveal area of 10 around them
+
+@@ -253,6 +254,18 @@ void GuiRadarView::drawNoneFriendlyBlock
+ window.draw(circle);
+ }
+
++ if (stb_obj
++ && ( ! obj->isFriendly(my_spaceship) && ! obj->isEnemy(my_spaceship) ))
++ {
++ r = 10;
++ sf::CircleShape circle(r, 50);
++ circle.setOrigin(r, r);
++ circle.setFillColor(sf::Color(255, 255, 255, 255));
++ circle.setPosition(worldToScreen(obj->getPosition()));
++ window.draw(circle);
++ }
++
++
+ P<ScanProbe> sp = obj;
+
+ if (sp && sp->owner_id == my_spaceship->getMultiplayerId())
+--- EmptyEpsilon-EE-2021.03.16/src/screenComponents/radarView.cpp 2021-03-16 14:36:34.000000000 +0100
++++ EmptyEpsilon-EE-2021.03.16/src/screenComponents/radarView.cpp_patched 2021-03-28 09:35:03.007650137 +0200
+@@ -243,6 +243,18 @@ void GuiRadarView::drawNoneFriendlyBlock
+ P<ShipTemplateBasedObject> stb_obj = obj;
+
+ if (stb_obj
++ && (obj == my_spaceship))
++ {
++ r = stb_obj->getLongRangeRadarRange() * scale;
++ sf::CircleShape circle(r, 50);
++ circle.setOrigin(r, r);
++ circle.setFillColor(sf::Color(255, 255, 255, 255));
++ circle.setPosition(worldToScreen(obj->getPosition()));
++ window.draw(circle);
++ drawNebulaBlockedAreas(mask_texture);
++ }
++
++ if (stb_obj
+ && (obj->isFriendly(my_spaceship) || obj == my_spaceship))
+ {
+ r = stb_obj->getShortRangeRadarRange() * scale;
+@@ -253,6 +265,17 @@ void GuiRadarView::drawNoneFriendlyBlock
+ window.draw(circle);
+ }
+
++ if (stb_obj
++ && ( ! obj->isFriendly(my_spaceship) && ! obj->isEnemy(my_spaceship) ))
++ {
++ r = 10;
++ sf::CircleShape circle(r, 50);
++ circle.setOrigin(r, r);
++ circle.setFillColor(sf::Color(255, 255, 255, 255));
++ circle.setPosition(worldToScreen(obj->getPosition()));
++ window.draw(circle);
++ }
++
+ P<ScanProbe> sp = obj;
+
+ if (sp && sp->owner_id == my_spaceship->getMultiplayerId())
+@@ -646,6 +669,7 @@ void GuiRadarView::drawObjects(sf::Rende
+ // Set the radius to reveal as getShortRangeRadarRange() if the
+ // object's a ShipTemplateBasedObject. Otherwise, default to 5U.
+ float r = stb_obj ? stb_obj->getShortRangeRadarRange() : 5000.0f;
++ if ( stb_obj == my_spaceship ) { r = stb_obj->getLongRangeRadarRange() }
+
+ // Query for objects within short-range radar/5U of this object.
+ sf::Vector2f position = obj->getPosition();
diff --git a/WIP_relay_long_range_v2.patch b/WIP_relay_long_range_v2.patch
new file mode 100644
index 0000000..0c74bf7
--- /dev/null
+++ b/WIP_relay_long_range_v2.patch
@@ -0,0 +1,47 @@
+--- EmptyEpsilon-EE-2021.03.16/src/screenComponents/radarView.cpp 2021-03-16 14:36:34.000000000 +0100
++++ EmptyEpsilon-EE-2021.03.16/src/screenComponents/radarView.cpp_patched 2021-03-28 09:35:03.007650137 +0200
+@@ -243,6 +243,18 @@ void GuiRadarView::drawNoneFriendlyBlock
+ P<ShipTemplateBasedObject> stb_obj = obj;
+
+ if (stb_obj
++ && (obj == my_spaceship))
++ {
++ r = stb_obj->getLongRangeRadarRange() * scale;
++ sf::CircleShape circle(r, 50);
++ circle.setOrigin(r, r);
++ circle.setFillColor(sf::Color(255, 255, 255, 255));
++ circle.setPosition(worldToScreen(obj->getPosition()));
++ window.draw(circle);
++ drawNebulaBlockedAreas(mask_texture);
++ }
++
++ if (stb_obj
+ && (obj->isFriendly(my_spaceship) || obj == my_spaceship))
+ {
+ r = stb_obj->getShortRangeRadarRange() * scale;
+@@ -253,6 +265,17 @@ void GuiRadarView::drawNoneFriendlyBlock
+ window.draw(circle);
+ }
+
++ if (stb_obj
++ && ( ! obj->isFriendly(my_spaceship) && ! obj->isEnemy(my_spaceship) ))
++ {
++ r = 10;
++ sf::CircleShape circle(r, 50);
++ circle.setOrigin(r, r);
++ circle.setFillColor(sf::Color(255, 255, 255, 255));
++ circle.setPosition(worldToScreen(obj->getPosition()));
++ window.draw(circle);
++ }
++
+ P<ScanProbe> sp = obj;
+
+ if (sp && sp->owner_id == my_spaceship->getMultiplayerId())
+@@ -646,6 +669,7 @@ void GuiRadarView::drawObjects(sf::Rende
+ // Set the radius to reveal as getShortRangeRadarRange() if the
+ // object's a ShipTemplateBasedObject. Otherwise, default to 5U.
+ float r = stb_obj ? stb_obj->getShortRangeRadarRange() : 5000.0f;
++ if ( stb_obj == my_spaceship ) { r = stb_obj->getLongRangeRadarRange(); }
+
+ // Query for objects within short-range radar/5U of this object.
+ sf::Vector2f position = obj->getPosition();
diff --git a/WIP_relay_visibility_range.patch b/WIP_relay_visibility_range.patch
new file mode 100644
index 0000000..d5501d6
--- /dev/null
+++ b/WIP_relay_visibility_range.patch
@@ -0,0 +1,11 @@
+--- EmptyEpsilon-EE-2021.03.16/src/screens/crew6/relayScreen.cpp 2021-03-16 14:36:34.000000000 +0100
++++ EmptyEpsilon-EE-2021.03.16/src/screens/crew6/relayScreen.cpp_patched 2021-03-28 07:34:04.797412212 +0200
+@@ -25,7 +25,7 @@ RelayScreen::RelayScreen(GuiContainer* o
+ {
+ targets.setAllowWaypointSelection();
+ radar = new GuiRadarView(this, "RELAY_RADAR", 50000.0f, &targets);
+- radar->longRange()->enableWaypoints()->enableCallsigns()->setStyle(GuiRadarView::Rectangular)->setFogOfWarStyle(GuiRadarView::FriendlysShortRangeFogOfWar);
++ radar->longRange()->enableWaypoints()->enableCallsigns()->setStyle(GuiRadarView::Rectangular)->setFogOfWarStyle(GuiRadarView::NebulaFogOfWar);
+ radar->setAutoCentering(false);
+ radar->setPosition(0, 0, ATopLeft)->setSize(GuiElement::GuiSizeMax, GuiElement::GuiSizeMax);
+ radar->setCallbacks(
diff --git a/WIP_science_scanner_box.patch b/WIP_science_scanner_box.patch
new file mode 100644
index 0000000..cba7712
--- /dev/null
+++ b/WIP_science_scanner_box.patch
@@ -0,0 +1,11 @@
+--- EmptyEpsilon-EE-2021.03.16/src/screenComponents/scanningDialog.cpp 2021-03-16 14:36:34.000000000 +0100
++++ EmptyEpsilon-EE-2021.03.16/src/screenComponents/scanningDialog.cpp_patched 2021-03-21 05:37:39.083814178 +0100
+@@ -51,7 +51,7 @@ void GuiScanningDialog::onDraw(sf::Rende
+ {
+ if (!box->isVisible())
+ {
+- box->show();
++// box->show();
+ scan_depth = 0;
+ setupParameters();
+ }
diff --git a/WIP_science_scanner_box_alternative.patch b/WIP_science_scanner_box_alternative.patch
new file mode 100644
index 0000000..fa9804e
--- /dev/null
+++ b/WIP_science_scanner_box_alternative.patch
@@ -0,0 +1,33 @@
+--- EmptyEpsilon-EE-2021.03.16/src/screens/crew4/operationsScreen.cpp 2021-03-16 14:36:34.000000000 +0100
++++ EmptyEpsilon-EE-2021.03.16/src/screens/crew4/operationsScreen.cpp_patched 2021-03-21 17:40:31.898549798 +0100
+@@ -9,7 +9,7 @@
+
+ #include "screenComponents/radarView.h"
+ #include "screenComponents/openCommsButton.h"
+-#include "screenComponents/commsOverlay.h"
++//#include "screenComponents/commsOverlay.h"
+ #include "screenComponents/shipsLogControl.h"
+
+ #include "spaceObjects/playerSpaceship.h"
+@@ -22,8 +22,8 @@ OperationScreen::OperationScreen(GuiCont
+ science->science_radar->setCallbacks(
+ [this](sf::Vector2f position) { // Down
+ // If not our ship, or if we're scanning, ignore clicks.
+- if (!my_spaceship || my_spaceship->scanning_delay > 0.0)
+- return;
++// if (!my_spaceship || my_spaceship->scanning_delay > 0.0)
++// return;
+
+ // If we're in target selection mode, there's a waypoint, and this
+ // is our ship...
+@@ -90,8 +90,8 @@ OperationScreen::OperationScreen(GuiCont
+
+ mode = TargetSelection;
+
+- new ShipsLog(this);
+- (new GuiCommsOverlay(this))->setSize(GuiElement::GuiSizeMax, GuiElement::GuiSizeMax);
++// new ShipsLog(this);
++// (new GuiCommsOverlay(this))->setSize(GuiElement::GuiSizeMax, GuiElement::GuiSizeMax);
+ }
+
+ void OperationScreen::onDraw(sf::RenderTarget& window)
diff --git a/relay_add_info_selected_target.patch b/relay_add_info_selected_target.patch
new file mode 100644
index 0000000..23335e5
--- /dev/null
+++ b/relay_add_info_selected_target.patch
@@ -0,0 +1,147 @@
+--- EmptyEpsilon-EE-2021.03.16/src/screens/crew6/relayScreen.h 2021-03-16 14:36:34.000000000 +0100
++++ EmptyEpsilon-EE-2021.03.16/src/screens/crew6/relayScreen.h_patched 2021-03-28 11:28:54.559348446 +0200
+@@ -31,6 +31,15 @@ private:
+
+ GuiKeyValueDisplay* info_callsign;
+ GuiKeyValueDisplay* info_faction;
++ GuiKeyValueDisplay* info_type;
++
++ GuiKeyValueDisplay* info_empty1;
++ GuiKeyValueDisplay* info_empty2;
++
++ GuiKeyValueDisplay* info_distance;
++
++ GuiKeyValueDisplay* info_shields;
++ GuiKeyValueDisplay* info_hull;
+
+ GuiKeyValueDisplay* info_reputation;
+ GuiKeyValueDisplay* info_clock;
+
+
+
+
+
+
+
+
+
+--- EmptyEpsilon-EE-2021.03.16/src/screens/crew6/relayScreen.cpp 2021-03-28 12:42:44.135860437 +0200
++++ EmptyEpsilon-EE-2021.03.16/src/screens/crew6/relayScreen.cpp_patched 2021-03-28 12:43:57.739816082 +0200
+@@ -76,13 +76,38 @@ RelayScreen::RelayScreen(GuiContainer* o
+ radar->setViewPosition(my_spaceship->getPosition());
+
+ GuiAutoLayout* sidebar = new GuiAutoLayout(this, "SIDE_BAR", GuiAutoLayout::LayoutVerticalTopToBottom);
+- sidebar->setPosition(-20, 150, ATopRight)->setSize(250, GuiElement::GuiSizeMax);
++ sidebar->setPosition(-10, 10, ATopRight)->setSize(250, GuiElement::GuiSizeMax);
+
++
++
++
++
++
++ // Simple scan data.
+ info_callsign = new GuiKeyValueDisplay(sidebar, "SCIENCE_CALLSIGN", 0.4, tr("Callsign"), "");
+ info_callsign->setSize(GuiElement::GuiSizeMax, 30);
+-
+ info_faction = new GuiKeyValueDisplay(sidebar, "SCIENCE_FACTION", 0.4, tr("Faction"), "");
+ info_faction->setSize(GuiElement::GuiSizeMax, 30);
++ info_type = new GuiKeyValueDisplay(sidebar, "SCIENCE_TYPE", 0.4, tr("science","Type"), "");
++ info_type->setSize(GuiElement::GuiSizeMax, 30);
++
++ info_empty1 = new GuiKeyValueDisplay(sidebar, "SCIENCE_EMPTY1", 0.4, "", "");
++ info_empty1->setSize(GuiElement::GuiSizeMax, 30);
++
++ info_distance = new GuiKeyValueDisplay(sidebar, "SCIENCE_DISTANCE", 0.4, tr("science","Distance"), "");
++ info_distance->setSize(GuiElement::GuiSizeMax, 30);
++
++ info_empty2 = new GuiKeyValueDisplay(sidebar, "SCIENCE_EMPTY2", 0.4, "", "");
++ info_empty2->setSize(GuiElement::GuiSizeMax, 30);
++
++ info_shields = new GuiKeyValueDisplay(sidebar, "SCIENCE_SHIELDS", 0.4, tr("science", "Shields"), "");
++ info_shields->setSize(GuiElement::GuiSizeMax, 30);
++ info_hull = new GuiKeyValueDisplay(sidebar, "SCIENCE_HULL", 0.4, tr("science", "Hull"), "");
++ info_hull->setSize(GuiElement::GuiSizeMax, 30);
++
++
++
++
+
+ zoom_slider = new GuiSlider(this, "ZOOM_SLIDER", 50000.0f, 6250.0f, 50000.0f, [this](float value) {
+ zoom_label->setText(tr("Zoom: {zoom}x").format({{"zoom", string(50000.0f / value, 1.0f)}}));
+@@ -214,7 +239,7 @@ void RelayScreen::onDraw(sf::RenderTarge
+
+ GuiOverlay::onDraw(window);
+
+- info_faction->setValue("-");
++ info_faction->setValue(" ");
+
+ // If the player has a target and the player isn't destroyed...
+ if (targets.get() && my_spaceship)
+@@ -275,16 +300,44 @@ void RelayScreen::onDraw(sf::RenderTarge
+ P<SpaceStation> station = obj;
+ P<ScanProbe> probe = obj;
+
++ info_callsign->setValue(" ");
++ info_faction->setValue(" ");
++ info_type->setValue(" ");
++ info_empty1->setValue(" ");
++ info_distance->setValue(" ");
++ info_empty2->setValue(" ");
++ info_shields->setValue(" ");
++ info_hull->setValue(" ");
++
+ info_callsign->setValue(obj->getCallSign());
+
++ sf::Vector2f position_diff = obj->getPosition() - my_spaceship->getPosition();
++ float distance = sf::length(position_diff);
++ info_distance->setValue(string(distance / 1000.0f, 1) + DISTANCE_UNIT_1K);
++
++
+ if (ship)
+ {
+ if (ship->getScannedStateFor(my_spaceship) >= SS_SimpleScan)
+ {
+ info_faction->setValue(factionInfo[obj->getFactionId()]->getLocaleName());
++
++ info_type->setValue(ship->getTypeName());
++ info_shields->setValue(ship->getShieldDataString());
++ info_hull->setValue(int(ceil(ship->getHull())));
++
+ }
+ }else{
+ info_faction->setValue(factionInfo[obj->getFactionId()]->getLocaleName());
++
++ // If the target is a station, show basic tactical info.
++ if (station)
++ {
++ info_type->setValue(station->template_name);
++ info_shields->setValue(station->getShieldDataString());
++ info_hull->setValue(int(ceil(station->getHull())));
++ }
++
+ }
+
+ if (probe && my_spaceship && probe->owner_id == my_spaceship->getMultiplayerId() && probe->canBeTargetedBy(my_spaceship))
+@@ -307,7 +360,7 @@ void RelayScreen::onDraw(sf::RenderTarge
+ hack_target_button->disable();
+ link_to_science_button->disable();
+ link_to_science_button->setValue(false);
+- info_callsign->setValue("-");
++ info_callsign->setValue(" ");
+ }
+ if (my_spaceship)
+ {
+@@ -322,7 +375,12 @@ void RelayScreen::onDraw(sf::RenderTarge
+ }
+
+ if (targets.getWaypointIndex() >= 0)
+- delete_waypoint_button->enable();
++ {
++ sf::Vector2f position_diff = my_spaceship->waypoints[targets.getWaypointIndex()] - my_spaceship->getPosition();
++ float distance = sf::length(position_diff);
++ info_distance->setValue(string(distance / 1000.0f, 1) + DISTANCE_UNIT_1K);
++ delete_waypoint_button->enable();
++ }
+ else
+ delete_waypoint_button->disable();
+ }
diff --git a/relay_show_asteroids.patch b/relay_show_asteroids.patch
new file mode 100644
index 0000000..9609afc
--- /dev/null
+++ b/relay_show_asteroids.patch
@@ -0,0 +1,10 @@
+--- EmptyEpsilon-EE-2021.03.16/src/spaceObjects/asteroid.h 2021-03-16 14:36:34.000000000 +0100
++++ EmptyEpsilon-EE-2021.03.16/src/spaceObjects/asteroid.h_pacthed 2021-03-28 08:38:40.332730717 +0200
+@@ -16,6 +16,7 @@ public:
+ virtual void draw3D() override;
+
+ virtual void drawOnRadar(sf::RenderTarget& window, sf::Vector2f position, float scale, float rotation, bool long_range) override;
++ virtual bool canHideInNebula() override { return false; }
+
+ virtual void collide(Collisionable* target, float force) override;
+
diff --git a/science_radar_setRangeIndicatorStepSize.patch b/science_radar_setRangeIndicatorStepSize.patch
new file mode 100644
index 0000000..44653ce
--- /dev/null
+++ b/science_radar_setRangeIndicatorStepSize.patch
@@ -0,0 +1,11 @@
+--- EmptyEpsilon-EE-2021.03.16/src/screens/crew6/scienceScreen.cpp 2021-03-16 14:36:34.000000000 +0100
++++ EmptyEpsilon-EE-2021.03.16/src/screens/crew6/scienceScreen.cpp_patched 2021-03-27 23:33:41.278919582 +0100
+@@ -44,7 +44,7 @@ ScienceScreen::ScienceScreen(GuiContaine
+ // Draw the science radar.
+ science_radar = new GuiRadarView(radar_view, "SCIENCE_RADAR", my_spaceship ? my_spaceship->getLongRangeRadarRange() : 30000.0, &targets);
+ science_radar->setPosition(-270, 0, ACenterRight)->setSize(GuiElement::GuiSizeMax, GuiElement::GuiSizeMax);
+- science_radar->setRangeIndicatorStepSize(5000.0)->longRange()->enableWaypoints()->enableCallsigns()->enableHeadingIndicators()->setStyle(GuiRadarView::Circular)->setFogOfWarStyle(GuiRadarView::NebulaFogOfWar);
++ science_radar->setRangeIndicatorStepSize(3000.0)->longRange()->enableWaypoints()->enableCallsigns()->enableHeadingIndicators()->setStyle(GuiRadarView::Circular)->setFogOfWarStyle(GuiRadarView::NebulaFogOfWar);
+ science_radar->setCallbacks(
+ [this](sf::Vector2f position) {
+ if (!my_spaceship || my_spaceship->scanning_delay > 0.0)
3 years