public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/7zip] epel9: Amend patch so library will always be found
@ 2026-07-01 17:10 Sandro
  0 siblings, 0 replies; only message in thread
From: Sandro @ 2026-07-01 17:10 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/7zip
            Branch : epel9
            Commit : 7d0d042366ab0dcbb158c0e6c24dae6396b7603e
            Author : Sandro <devel@penguinpee.nl>
            Date   : 2025-08-15T10:26:53+02:00
            Stats  : +6/-2 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/7zip/c/7d0d042366ab0dcbb158c0e6c24dae6396b7603e?branch=epel9

            Log:
            Amend patch so library will always be found

This ensures the librarary is always searched for in `/usr/libexec/7zip`
even when `7z` is called using the full path.

- Close RHBZ#2373874

---
diff --git a/7zip-find-so-in-libexec.diff b/7zip-find-so-in-libexec.diff
index 1213bc5..f63e141 100644
--- a/7zip-find-so-in-libexec.diff
+++ b/7zip-find-so-in-libexec.diff
@@ -1,10 +1,14 @@
+diff --git a/CPP/7zip/UI/Common/ArchiveCommandLine.cpp b/CPP/7zip/UI/Common/ArchiveCommandLine.cpp
+index 7fe18fb..4b79e2d 100644
 --- a/CPP/7zip/UI/Common/ArchiveCommandLine.cpp
 +++ b/CPP/7zip/UI/Common/ArchiveCommandLine.cpp
-@@ -1751,7 +1751,7 @@ FString GetModuleDirPrefix()
+@@ -1780,8 +1780,8 @@ FString GetModuleDirPrefix()
+   FString s;
  
    s = fas2fs(g_ModuleDirPrefix);
-   if (s.IsEmpty())
+-  if (s.IsEmpty())
 -    s = FTEXT(".") FSTRING_PATH_SEPARATOR;
++  if (s.IsEmpty() || s.IsPrefixedBy("/usr/bin"))
 +    s = FTEXT("/usr/libexec/7zip") FSTRING_PATH_SEPARATOR;
    return s;
    /*

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-07-01 17:10 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-01 17:10 [rpms/7zip] epel9: Amend patch so library will always be found Sandro

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