diff --git a/user/android-tools/patches/ppc.patch b/user/android-tools/patches/ppc.patch index c986a27cfe..042b937b05 100644 --- a/user/android-tools/patches/ppc.patch +++ b/user/android-tools/patches/ppc.patch @@ -9,8 +9,8 @@ +#elif defined(__powerpc__) +#define OPENSSL_32_BIT #else - // Note BoringSSL only supports standard 32-bit and 64-bit two's-complement, - // little-endian architectures. Functions will not produce the correct answer + // The list above enumerates the platforms that BoringSSL supports. For these + // platforms we keep a reasonable bar of not breaking them: automated test --- a/vendor/e2fsprogs/contrib/android/perms.h +++ b/vendor/e2fsprogs/contrib/android/perms.h @@ -1,6 +1,7 @@ diff --git a/user/android-tools/template.py b/user/android-tools/template.py index 8efb3d764a..97fb5fff65 100644 --- a/user/android-tools/template.py +++ b/user/android-tools/template.py @@ -36,7 +36,6 @@ url = "https://github.com/nmeum/android-tools" source = f"{url}/releases/download/{pkgver}/android-tools-{pkgver}.tar.xz" sha256 = "d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097" -patch_style = "patch" tool_flags = {"CXXFLAGS": ["-D_LARGEFILE64_SOURCE"]} hardening = ["vis", "cfi"] diff --git a/user/cppcheck/patches/feenableexcept.patch b/user/cppcheck/patches/feenableexcept.patch index 98d0d3d34f..a19b7154cf 100644 --- a/user/cppcheck/patches/feenableexcept.patch +++ b/user/cppcheck/patches/feenableexcept.patch @@ -5,7 +5,7 @@ index 023137c2a..92b3fe8af 100644 +++ b/test/signal/test-signalhandler.cpp @@ -46,9 +46,6 @@ - /*static*/ void my_fpe() + /*static*/ void my_fpe() // NOLINT(misc-use-internal-linkage) { -#if !defined(__APPLE__) - feenableexcept(FE_ALL_EXCEPT); // TODO: check result diff --git a/user/cppcheck/template.py b/user/cppcheck/template.py index 895a2d1b1e..e8aba2ff74 100644 --- a/user/cppcheck/template.py +++ b/user/cppcheck/template.py @@ -32,7 +32,6 @@ url = "https://cppcheck.sourceforge.io" source = f"https://github.com/danmar/cppcheck/archive/refs/tags/{pkgver}.tar.gz" sha256 = "98bcc40ac8062635b492fb096d7815376a176ae26749d6c708083f4637f7c0bb" -patch_style = "patch" # TestSymbolDatabase::enum14 test failed # (0x7FFFFFFFFFFFFFFF + 1 cause signed overflow) hardening = ["!int"] diff --git a/user/gamescope/patches/more-mtx-cpp-20.patch b/user/gamescope/patches/more-mtx-cpp-20.patch deleted file mode 100644 index 5c12db2a6d..0000000000 --- a/user/gamescope/patches/more-mtx-cpp-20.patch +++ /dev/null @@ -1,53 +0,0 @@ -commit 2c7e1037d017d8ab5274e423ae1d84edda4d3ff9 -Author: q66 -Date: Sat May 18 03:13:13 2024 +0200 - - nuke another atomic - -diff --git a/src/wayland_backend.cpp b/src/wayland_backend.cpp -index a8b0673..83ba712 100644 ---- a/src/Backends/WaylandBackend.cpp -+++ b/src/Backends/WaylandBackend.cpp -@@ -382,7 +382,8 @@ namespace gamescope - std::optional m_ofPendingCursorX; - std::optional m_ofPendingCursorY; - -- std::atomic> m_pRelativePointer = nullptr; -+ std::mutex m_pRelativePointerMutex; -+ std::shared_ptr m_pRelativePointer = nullptr; - std::unordered_set m_uScancodesHeld; - - void Wayland_Registry_Global( wl_registry *pRegistry, uint32_t uName, const char *pInterface, uint32_t uVersion ); -@@ -2125,12 +2126,17 @@ namespace gamescope - // This constructors/destructors the display's mutex, so should be safe to do across threads. - if ( !bRelative ) - { -+ std::lock_guard g{m_pRelativePointerMutex}; - m_pRelativePointer = nullptr; - } - else - { - zwp_relative_pointer_v1 *pRelativePointer = zwp_relative_pointer_manager_v1_get_relative_pointer( m_pRelativePointerManager, m_pPointer ); -- m_pRelativePointer = std::shared_ptr{ pRelativePointer, []( zwp_relative_pointer_v1 *pObject ){ zwp_relative_pointer_v1_destroy( pObject ); } }; -+ auto relp = std::shared_ptr{ pRelativePointer, []( zwp_relative_pointer_v1 *pObject ){ zwp_relative_pointer_v1_destroy( pObject ); } }; -+ { -+ std::lock_guard g{m_pRelativePointerMutex}; -+ m_pRelativePointer = std::move(relp); -+ } - zwp_relative_pointer_v1_add_listener( pRelativePointer, &s_RelativePointerListener, this ); - } - } -@@ -2303,8 +2309,11 @@ namespace gamescope - } - void CWaylandInputThread::Wayland_Pointer_Motion( wl_pointer *pPointer, uint32_t uTime, wl_fixed_t fSurfaceX, wl_fixed_t fSurfaceY ) - { -- if ( m_pRelativePointer.load() != nullptr ) -- return; -+ { -+ std::lock_guard g{m_pRelativePointerMutex}; -+ if ( m_pRelativePointer != nullptr ) -+ return; -+ } - - if ( !cv_wayland_mouse_warp_without_keyboard_focus && !m_bKeyboardEntered ) - { diff --git a/user/gamescope/patches/mtx-cpp-20.patch b/user/gamescope/patches/mtx-cpp-20.patch index ae1b991341..1e078e0552 100644 --- a/user/gamescope/patches/mtx-cpp-20.patch +++ b/user/gamescope/patches/mtx-cpp-20.patch @@ -10,11 +10,9 @@ is a little bit slower src/sdlwindow.cpp | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) -diff --git a/src/sdlwindow.cpp b/src/sdlwindow.cpp -index 50c3b95..7bd1104 100644 --- a/src/Backends/SDLBackend.cpp +++ b/src/Backends/SDLBackend.cpp -@@ -177,13 +177,14 @@ namespace gamescope +@@ -179,13 +179,14 @@ namespace gamescope std::vector m_pszInstanceExtensions; std::thread m_SDLThread; @@ -32,7 +30,7 @@ index 50c3b95..7bd1104 100644 SDL_Surface *m_pIconSurface = nullptr; SDL_Surface *m_pCursorSurface = nullptr; SDL_Cursor *m_pCursor = nullptr; -@@ -479,7 +480,10 @@ namespace gamescope +@@ -475,7 +476,10 @@ namespace gamescope void CSDLBackend::SetCursorImage( std::shared_ptr info ) { @@ -44,7 +42,7 @@ index 50c3b95..7bd1104 100644 PushUserEvent( GAMESCOPE_SDL_EVENT_CURSOR ); } void CSDLBackend::SetRelativeMouseMode( bool bRelative ) -@@ -494,12 +498,18 @@ namespace gamescope +@@ -490,12 +494,18 @@ namespace gamescope } void CSDLBackend::SetTitle( std::shared_ptr szTitle ) { @@ -64,8 +62,8 @@ index 50c3b95..7bd1104 100644 + } PushUserEvent( GAMESCOPE_SDL_EVENT_ICON ); } - -@@ -874,7 +884,11 @@ namespace gamescope + void CSDLBackend::SetSelection( std::shared_ptr szContents, GamescopeSelection eSelection ) +@@ -842,7 +852,11 @@ namespace gamescope } else if ( event.type == GetUserEventIndex( GAMESCOPE_SDL_EVENT_TITLE ) ) { @@ -78,7 +76,7 @@ index 50c3b95..7bd1104 100644 std::string szTitle = pAppTitle ? *pAppTitle : "gamescope"; if ( g_bGrabbed ) -@@ -883,7 +897,11 @@ namespace gamescope +@@ -855,7 +869,11 @@ namespace gamescope } else if ( event.type == GetUserEventIndex( GAMESCOPE_SDL_EVENT_ICON ) ) { @@ -91,7 +89,7 @@ index 50c3b95..7bd1104 100644 if ( m_pIconSurface ) { -@@ -911,7 +929,11 @@ namespace gamescope +@@ -883,7 +901,11 @@ namespace gamescope } else if ( event.type == GetUserEventIndex( GAMESCOPE_SDL_EVENT_CURSOR ) ) { @@ -104,5 +102,48 @@ index 50c3b95..7bd1104 100644 if ( m_pCursorSurface ) { --- -2.43.1 +--- a/src/Backends/WaylandBackend.cpp ++++ b/src/Backends/WaylandBackend.cpp +@@ -420,7 +420,8 @@ namespace gamescope + std::optional m_ofPendingCursorX; + std::optional m_ofPendingCursorY; + +- std::atomic> m_pRelativePointer = nullptr; ++ std::mutex m_pRelativePointerMutex; ++ std::shared_ptr m_pRelativePointer = nullptr; + std::unordered_set m_uScancodesHeld; + + void Wayland_Registry_Global( wl_registry *pRegistry, uint32_t uName, const char *pInterface, uint32_t uVersion ); +@@ -2418,12 +2419,17 @@ namespace gamescope + // This constructors/destructors the display's mutex, so should be safe to do across threads. + if ( !bRelative ) + { ++ std::lock_guard g{m_pRelativePointerMutex}; + m_pRelativePointer = nullptr; + } + else + { + zwp_relative_pointer_v1 *pRelativePointer = zwp_relative_pointer_manager_v1_get_relative_pointer( m_pRelativePointerManager, m_pPointer ); +- m_pRelativePointer = std::shared_ptr{ pRelativePointer, []( zwp_relative_pointer_v1 *pObject ){ zwp_relative_pointer_v1_destroy( pObject ); } }; ++ auto relp = std::shared_ptr{ pRelativePointer, []( zwp_relative_pointer_v1 *pObject ){ zwp_relative_pointer_v1_destroy( pObject ); } }; ++ { ++ std::lock_guard g{m_pRelativePointerMutex}; ++ m_pRelativePointer = std::move(relp); ++ } + zwp_relative_pointer_v1_add_listener( pRelativePointer, &s_RelativePointerListener, this ); + } + } +@@ -2596,8 +2602,11 @@ namespace gamescope + } + void CWaylandInputThread::Wayland_Pointer_Motion( wl_pointer *pPointer, uint32_t uTime, wl_fixed_t fSurfaceX, wl_fixed_t fSurfaceY ) + { +- if ( m_pRelativePointer.load() != nullptr ) +- return; ++ { ++ std::lock_guard g{m_pRelativePointerMutex}; ++ if ( m_pRelativePointer != nullptr ) ++ return; ++ } + + if ( !cv_wayland_mouse_warp_without_keyboard_focus && !m_bKeyboardEntered ) + { diff --git a/user/gamescope/patches/steamcompmgr-deadlock.patch b/user/gamescope/patches/steamcompmgr-deadlock.patch index 9f75f285ac..cacde68009 100644 --- a/user/gamescope/patches/steamcompmgr-deadlock.patch +++ b/user/gamescope/patches/steamcompmgr-deadlock.patch @@ -17,19 +17,17 @@ Date: Sat Nov 11 02:41:10 2023 +0100 Upon invocation of error handler however, do call pthread_exit and unlock the mutex manually. -diff --git a/src/steamcompmgr.cpp b/src/steamcompmgr.cpp -index f53f49e..08784f1 100644 --- a/src/steamcompmgr.cpp +++ b/src/steamcompmgr.cpp -@@ -743,6 +743,7 @@ extern float g_flMaxWindowScale; +@@ -782,6 +782,7 @@ extern float g_flMaxWindowScale; bool synchronize; std::mutex g_SteamCompMgrXWaylandServerMutex; +static std::unique_lock *g_SteamCompMgrXWaylandServerLock; - VBlankTimeInfo_t g_SteamCompMgrVBlankTime = {}; + gamescope::VBlankTime g_SteamCompMgrVBlankTime = {}; -@@ -5892,8 +5893,8 @@ error(Display *dpy, XErrorEvent *ev) +@@ -5895,8 +5896,8 @@ error(Display *dpy, XErrorEvent *ev) return 0; } @@ -38,11 +36,11 @@ index f53f49e..08784f1 100644 +static void +steamcompmgr_exit(bool exit) { - // Clean up any commits. - { -@@ -5925,14 +5926,19 @@ steamcompmgr_exit(void) + g_ImageWaiter.Shutdown(); - finish_drm( &g_DRM ); +@@ -5937,14 +5938,19 @@ steamcompmgr_exit(void) + wlserver_shutdown(); + wlserver_unlock(false); - pthread_exit(NULL); + if (exit) @@ -63,15 +61,15 @@ index f53f49e..08784f1 100644 } static bool -@@ -7399,6 +7405,7 @@ steamcompmgr_main(int argc, char **argv) - assert( vblankFD >= 0 ); +@@ -7495,6 +7501,7 @@ steamcompmgr_main(int argc, char **argv) + init_runtime_info(); std::unique_lock xwayland_server_guard(g_SteamCompMgrXWaylandServerMutex); + g_SteamCompMgrXWaylandServerLock = &xwayland_server_guard; // Initialize any xwayland ctxs we have { -@@ -7869,7 +7876,7 @@ steamcompmgr_main(int argc, char **argv) +@@ -8037,7 +8044,7 @@ steamcompmgr_main(int argc, char **argv) vblank = false; } diff --git a/user/gamescope/patches/system-spirv-headers.patch b/user/gamescope/patches/system-spirv-headers.patch index 38cb19c6eb..380bcd7973 100644 --- a/user/gamescope/patches/system-spirv-headers.patch +++ b/user/gamescope/patches/system-spirv-headers.patch @@ -4,11 +4,9 @@ Date: Sat Oct 14 16:36:01 2023 +0200 use system spirv-headers -diff --git a/src/meson.build b/src/meson.build -index c63cbd7..0afe796 100644 --- a/src/meson.build +++ b/src/meson.build -@@ -94,7 +94,7 @@ reshade_src = [ +@@ -87,7 +87,7 @@ reshade_src = [ reshade_include = include_directories([ 'reshade/source', 'reshade/include', @@ -16,4 +14,4 @@ index c63cbd7..0afe796 100644 + '/usr/include/spirv/unified1' ]) - src = [ + required_wlroots_features = ['xwayland'] diff --git a/user/gamescope/template.py b/user/gamescope/template.py index 3c0e817a44..bc16a79520 100644 --- a/user/gamescope/template.py +++ b/user/gamescope/template.py @@ -79,7 +79,6 @@ "8de28aee6f90f47b7fc7037dcd2360166197c0b5d2033f3afdbd34f2ea1bf216", "3aa6feda7773cc8ffa8fb012fe95e6207c776101e29198d0e0d34a0c5e339f6a", ] -patch_style = "patch" file_modes = { "usr/bin/gamescope": ("root", "root", 0o755), } diff --git a/user/gcc/patches/0003-specs-turn-on-Wl-z-now-by-default.patch b/user/gcc/patches/0003-specs-turn-on-Wl-z-now-by-default.patch index 4541dbe753..e6ae6479e0 100644 --- a/user/gcc/patches/0003-specs-turn-on-Wl-z-now-by-default.patch +++ b/user/gcc/patches/0003-specs-turn-on-Wl-z-now-by-default.patch @@ -1,8 +1,8 @@ diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi -index b6731a4673c..f393c7846c6 100644 +index f82f7d2..9f0a34c 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi -@@ -17961,6 +17961,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the +@@ -18924,6 +18924,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the linker. When using the GNU linker, you can also get the same effect with @option{-Wl,-Map=output.map}. @@ -13,17 +13,14 @@ index b6731a4673c..f393c7846c6 100644 @item -u @var{symbol} Pretend the symbol @var{symbol} is undefined, to force linking of diff --git a/gcc/gcc.cc b/gcc/gcc.cc -index 33b56e721d2..f82fae23c22 100644 +index 728332b..b19a69f 100644 --- a/gcc/gcc.cc +++ b/gcc/gcc.cc -@@ -1144,6 +1144,7 @@ proper position among the other output files. */ +@@ -1157,6 +1157,7 @@ proper position among the other output files. */ "%{flto|flto=*:%= 2, 0) @@ -20,7 +20,7 @@ index a75038930ae..b98726f33ed 100644 Warn about possible security problems with format functions. Wformat-signedness -@@ -725,7 +725,7 @@ C ObjC C++ ObjC++ Var(warn_format_zero_length) Warning LangEnabledBy(C ObjC C++ +@@ -799,7 +799,7 @@ C ObjC C++ ObjC++ Var(warn_format_zero_length) Warning LangEnabledBy(C ObjC C++ Warn about zero-length formats. Wformat= @@ -28,7 +28,4 @@ index a75038930ae..b98726f33ed 100644 +C ObjC C++ ObjC++ Joined RejectNegative UInteger Var(warn_format) Init(1) Warning LangEnabledBy(C ObjC C++ ObjC++,Wall, 1, 0) IntegerRange(0, 2) Warn about printf/scanf/strftime/strfmon format string anomalies. - Wformat-overflow= --- -2.41.0 - + Wframe-address diff --git a/user/gcc/patches/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch b/user/gcc/patches/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch index 69c1bf7254..42edc3fc7a 100644 --- a/user/gcc/patches/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch +++ b/user/gcc/patches/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch @@ -10,10 +10,10 @@ Subject: [PATCH 08/35] Disable ssp on -nostdlib, -nodefaultlibs and 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gcc/gcc.cc b/gcc/gcc.cc -index da6417dd0d1..b5a6f200635 100644 +index 13e4f93..d8f0b5d 100644 --- a/gcc/gcc.cc +++ b/gcc/gcc.cc -@@ -983,6 +983,12 @@ proper position among the other output files. */ +@@ -996,6 +996,12 @@ proper position among the other output files. */ #define LINK_GCC_C_SEQUENCE_SPEC "%G %{!nolibc:%L %G}" #endif @@ -26,20 +26,20 @@ index da6417dd0d1..b5a6f200635 100644 #ifndef LINK_SSP_SPEC #ifdef TARGET_LIBC_PROVIDES_SSP #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ -@@ -1282,7 +1288,7 @@ static const char *cc1_options = +@@ -1299,7 +1305,7 @@ static const char *cc1_options = %{-version:--version}\ %{-help=*:--help=%*}\ %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %w%b.s}}}\ - %{fsyntax-only:-o %j} %{-param*}\ + %{fsyntax-only:-o %j} %{-param*} " NO_SSP_SPEC "\ %{coverage:-fprofile-arcs -ftest-coverage}\ - %{fprofile-arcs|fprofile-generate*|coverage:\ + %{fprofile-arcs|fcondition-coverage|fprofile-generate*|coverage:\ %{!fprofile-update=single:\ diff --git a/gcc/params.opt b/gcc/params.opt -index 823cdb2ff85..5b096899b40 100644 +index d34ef54..807e5a4 100644 --- a/gcc/params.opt +++ b/gcc/params.opt -@@ -1006,7 +1006,7 @@ Common Joined UInteger Var(param_ssa_name_def_chain_limit) Init(512) Param Optim +@@ -1013,7 +1013,7 @@ Common Joined UInteger Var(param_ssa_name_def_chain_limit) Init(512) Param Optim The maximum number of SSA_NAME assignments to follow in determining a value. -param=ssp-buffer-size= @@ -48,6 +48,3 @@ index 823cdb2ff85..5b096899b40 100644 The lower bound for a buffer to be considered for stack smashing protection. -param=stack-clash-protection-guard-size= --- -2.41.0 - diff --git a/user/gcc/patches/0019-disable-multilib.patch b/user/gcc/patches/0019-disable-multilib.patch index 994467b9f2..da6d184548 100644 --- a/user/gcc/patches/0019-disable-multilib.patch +++ b/user/gcc/patches/0019-disable-multilib.patch @@ -1,5 +1,5 @@ diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux -index 57bf4100fcd..172894b57ef 100644 +index 3f7b786ec..46dcc49cd 100644 --- a/gcc/config/aarch64/t-aarch64-linux +++ b/gcc/config/aarch64/t-aarch64-linux @@ -22,7 +22,7 @@ LIB1ASMSRC = aarch64/lib1funcs.asm @@ -11,8 +11,52 @@ index 57bf4100fcd..172894b57ef 100644 MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu) MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32) +diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64 +index f9edc289e..28a6e8f0a 100644 +--- a/gcc/config/i386/t-linux64 ++++ b/gcc/config/i386/t-linux64 +@@ -33,6 +33,6 @@ + comma=, + MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG)) + MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS))) +-MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu) +-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu) ++MULTILIB_OSDIRNAMES = m64=../lib ++MULTILIB_OSDIRNAMES+= m32=../lib32 + MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32) +diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h +index 0cf689891..29ed8c0dc 100644 +--- a/gcc/config/riscv/linux.h ++++ b/gcc/config/riscv/linux.h +@@ -61,11 +61,3 @@ along with GCC; see the file COPYING3. If not see + %{rdynamic:-export-dynamic} \ + -dynamic-linker " GNU_USER_DYNAMIC_LINKER "}} \ + %{static:-static} %{static-pie:-static -pie --no-dynamic-linker -z text}}" +- +-#define STARTFILE_PREFIX_SPEC \ +- "/lib" XLEN_SPEC "/" ABI_SPEC "/ " \ +- "/usr/lib" XLEN_SPEC "/" ABI_SPEC "/ " \ +- "/lib/ " \ +- "/usr/lib/ " +- +-#define RISCV_USE_CUSTOMISED_MULTI_LIB select_by_abi +diff --git a/gcc/config/riscv/t-linux b/gcc/config/riscv/t-linux +index a6f64f88d..f88776ec5 100644 +--- a/gcc/config/riscv/t-linux ++++ b/gcc/config/riscv/t-linux +@@ -1,5 +1,8 @@ +-# Only XLEN and ABI affect Linux multilib dir names, e.g. /lib32/ilp32d/ +-MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib64,$(MULTILIB_DIRNAMES))) ++MULTILIB_OPTIONS := march=rv64gc ++MULTILIB_DIRNAMES := rv64gc ++ ++MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib,$(MULTILIB_DIRNAMES))) + MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES)) ++MULTILIB_MATCHES := march?rv64gc=march?rv64imafdc + + MULTIARCH_DIRNAME := $(call if_multiarch,$(firstword $(subst -, ,$(target)))-linux-gnu) diff --git a/gcc/config/rs6000/t-linux b/gcc/config/rs6000/t-linux -index 4e371255533..128c75c7d39 100644 +index 4e3712555..128c75c7d 100644 --- a/gcc/config/rs6000/t-linux +++ b/gcc/config/rs6000/t-linux @@ -2,7 +2,8 @@ @@ -36,7 +80,7 @@ index 4e371255533..128c75c7d39 100644 endif diff --git a/gcc/config/rs6000/t-linux64 b/gcc/config/rs6000/t-linux64 -index 01a94242308..b3a76379c03 100644 +index 248b5891e..1c60286d2 100644 --- a/gcc/config/rs6000/t-linux64 +++ b/gcc/config/rs6000/t-linux64 @@ -28,8 +28,8 @@ @@ -51,7 +95,7 @@ index 01a94242308..b3a76379c03 100644 rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.cc $(COMPILE) $< diff --git a/gcc/config/rs6000/t-linux64bele b/gcc/config/rs6000/t-linux64bele -index 97c1ee6fb4d..08d72639cb6 100644 +index 97c1ee6fb..08d72639c 100644 --- a/gcc/config/rs6000/t-linux64bele +++ b/gcc/config/rs6000/t-linux64bele @@ -2,6 +2,6 @@ @@ -64,7 +108,7 @@ index 97c1ee6fb4d..08d72639cb6 100644 +MULTILIB_OSDIRNAMES+= m32=../lib32 MULTILIB_MATCHES := ${MULTILIB_MATCHES_ENDIAN} diff --git a/gcc/config/rs6000/t-linux64lebe b/gcc/config/rs6000/t-linux64lebe -index 2e63bdb9fc9..c6e1c5db65d 100644 +index 2e63bdb9f..c6e1c5db6 100644 --- a/gcc/config/rs6000/t-linux64lebe +++ b/gcc/config/rs6000/t-linux64lebe @@ -2,6 +2,6 @@ @@ -76,45 +120,3 @@ index 2e63bdb9fc9..c6e1c5db65d 100644 +MULTILIB_OSDIRNAMES := m64=../lib +MULTILIB_OSDIRNAMES += m32=../lib32 MULTILIB_MATCHES := ${MULTILIB_MATCHES_ENDIAN} -diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64 -index 138956b0962..bc03dab874f 100644 ---- a/gcc/config/i386/t-linux64 -+++ b/gcc/config/i386/t-linux64 -@@ -33,6 +33,6 @@ - comma=, - MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG)) - MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS))) --MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu) --MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu) -+MULTILIB_OSDIRNAMES = m64=../lib -+MULTILIB_OSDIRNAMES+= m32=../lib32 - MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32) -diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h -index f8c2c351e5a..8d9881eadeb 100644 ---- a/gcc/config/riscv/linux.h -+++ b/gcc/config/riscv/linux.h -@@ -61,11 +61,3 @@ along with GCC; see the file COPYING3. If not see - %{rdynamic:-export-dynamic} \ - -dynamic-linker " GNU_USER_DYNAMIC_LINKER "}} \ - %{static:-static} %{static-pie:-static -pie --no-dynamic-linker -z text}}" -- --#define STARTFILE_PREFIX_SPEC \ -- "/lib" XLEN_SPEC "/" ABI_SPEC "/ " \ -- "/usr/lib" XLEN_SPEC "/" ABI_SPEC "/ " \ -- "/lib/ " \ -- "/usr/lib/ " -- --#define RISCV_USE_CUSTOMISED_MULTI_LIB select_by_abi -diff --git a/gcc/config/riscv/t-linux b/gcc/config/riscv/t-linux -index 216d2776a18..1a8a863853e 100644 ---- a/gcc/config/riscv/t-linux -+++ b/gcc/config/riscv/t-linux -@@ -1,3 +1,6 @@ --# Only XLEN and ABI affect Linux multilib dir names, e.g. /lib32/ilp32d/ --MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib64,$(MULTILIB_DIRNAMES))) -+MULTILIB_OPTIONS := march=rv64gc -+MULTILIB_DIRNAMES := rv64gc -+ -+MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib,$(MULTILIB_DIRNAMES))) - MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES)) -+MULTILIB_MATCHES := march?rv64gc=march?rv64imafdc diff --git a/user/gcc/patches/clang-tree-vect.patch b/user/gcc/patches/clang-tree-vect.patch index 07671453cc..21c70c4f91 100644 --- a/user/gcc/patches/clang-tree-vect.patch +++ b/user/gcc/patches/clang-tree-vect.patch @@ -8,11 +8,11 @@ as a variable. --- UTC Index: gcc/tree-vect-loop.cc =================================================================== ---- a/gcc/tree-vect-loop.cc (revision 273856) -+++ b/gcc/tree-vect-loop.cc (working copy) -@@ -55,6 +55,8 @@ along with GCC; see the file COPYING3. If not see - #include "vec-perm-indices.h" - #include "tree-eh.h" +--- a/gcc/tree-vect-loop.cc ++++ b/gcc/tree-vect-loop.cc +@@ -59,6 +59,8 @@ along with GCC; see the file COPYING3. If not see + #include "case-cfn-macros.h" + #include "langhooks.h" +#define vec_step vec_step_ + diff --git a/user/gcc/patches/gcc-use-compiler-rt.patch b/user/gcc/patches/gcc-use-compiler-rt.patch index 1202baf275..99487d33a9 100644 --- a/user/gcc/patches/gcc-use-compiler-rt.patch +++ b/user/gcc/patches/gcc-use-compiler-rt.patch @@ -5,10 +5,10 @@ Date: Wed Dec 27 23:45:04 2023 +0100 use compiler-rt by default diff --git a/gcc/config/linux.h b/gcc/config/linux.h -index b3537b8fb..a4762fdf6 100644 +index 04fe1c5..698eeba 100644 --- a/gcc/config/linux.h +++ b/gcc/config/linux.h -@@ -214,4 +214,9 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +@@ -214,6 +214,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see # undef TARGET_LIBC_HAS_FUNCTION # define TARGET_LIBC_HAS_FUNCTION linux_libc_has_function @@ -17,4 +17,6 @@ index b3537b8fb..a4762fdf6 100644 +"-lclang_rt.builtins %{static|static-libgcc:-l:libunwind.a} \ + %{!static:%{!static-libgcc: -lunwind}}" + - #endif + # undef TARGET_LIBM_FUNCTION_MAX_ERROR + # define TARGET_LIBM_FUNCTION_MAX_ERROR linux_libm_function_max_error + diff --git a/user/gcc/patches/gcxx-use-libcxx.patch b/user/gcc/patches/gcxx-use-libcxx.patch index 3d7fbcc329..34749c3248 100644 --- a/user/gcc/patches/gcxx-use-libcxx.patch +++ b/user/gcc/patches/gcxx-use-libcxx.patch @@ -5,11 +5,11 @@ Date: Wed Dec 27 22:46:32 2023 +0100 use libcxx by default diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt -index b98726f33..5ea9ac13b 100644 +index a92a039a3..fead0a2eb 100644 --- a/gcc/c-family/c.opt +++ b/gcc/c-family/c.opt -@@ -2553,8 +2553,8 @@ C ObjC Alias(std=c17) - Conform to the ISO 2017 C standard (published in 2018). +@@ -2662,8 +2662,8 @@ C ObjC Alias(std=c23) + Conform to the ISO 2023 C standard draft (expected to be published in 2024) (experimental and incomplete support). stdlib= -Driver C++ ObjC++ Common Condition(ENABLE_STDLIB_OPTION) Var(flag_stdlib_kind) Joined Enum(stdlib_kind) RejectNegative Init(1) @@ -20,7 +20,7 @@ index b98726f33..5ea9ac13b 100644 Enum diff --git a/gcc/config/linux.h b/gcc/config/linux.h -index a4762fdf6..2a76c17b7 100644 +index 698eebad2..5a909921a 100644 --- a/gcc/config/linux.h +++ b/gcc/config/linux.h @@ -126,6 +126,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see @@ -33,7 +33,7 @@ index a4762fdf6..2a76c17b7 100644 #ifdef LOCAL_INCLUDE_DIR diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h -index c8ff0c6dc..437a1cc8d 100644 +index ebddfcef4..e0b3ae4f1 100644 --- a/gcc/config/rs6000/sysv4.h +++ b/gcc/config/rs6000/sysv4.h @@ -955,6 +955,8 @@ ncrtn.o%s" @@ -46,7 +46,7 @@ index c8ff0c6dc..437a1cc8d 100644 #ifdef LOCAL_INCLUDE_DIR diff --git a/gcc/cp/g++spec.cc b/gcc/cp/g++spec.cc -index 7584f8c22..2d699a19a 100644 +index ad5d0d6a4..14bf1fc3c 100644 --- a/gcc/cp/g++spec.cc +++ b/gcc/cp/g++spec.cc @@ -97,7 +97,7 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options, @@ -59,10 +59,10 @@ index 7584f8c22..2d699a19a 100644 /* The number of arguments being added to what's in argv, other than libraries. We use this to track the number of times we've inserted diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi -index 157c1a68a..0f7447fed 100644 +index adcb4aae0..38ca35824 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi -@@ -3655,12 +3655,11 @@ directory separators or enclosed in @code{<>} or @code{""}). +@@ -3793,12 +3793,11 @@ directory separators or enclosed in @code{<>} or @code{""}). @opindex stdlib @item -stdlib=@var{libstdc++,libc++} When G++ is configured to support this option, it allows specification of @@ -81,7 +81,7 @@ index 157c1a68a..0f7447fed 100644 In addition, these warning options have meanings only for C++ programs: diff --git a/gcc/m2/gm2spec.cc b/gcc/m2/gm2spec.cc -index 75a6ed36c..36ec8212c 100644 +index a4faf8802..4a20d9c73 100644 --- a/gcc/m2/gm2spec.cc +++ b/gcc/m2/gm2spec.cc @@ -424,7 +424,7 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options, diff --git a/user/gcc/template.py b/user/gcc/template.py index 79beeab943..6a19c4a812 100644 --- a/user/gcc/template.py +++ b/user/gcc/template.py @@ -90,7 +90,6 @@ url = "https://gcc.gnu.org" source = f"https://github.com/gcc-mirror/gcc/archive/{_commit}.tar.gz" sha256 = "9cb2bcffa015c663cc9a23a57381739eb8226d0e6c069b1e79f6681d698dd390" -patch_style = "patch" hardening = ["!int", "!format", "!var-init"] # no tests to run options = ["!check", "!lto", "!relr", "!cross", "!scanshlibs"] diff --git a/user/juce/patches/cmake_install.patch b/user/juce/patches/cmake_install.patch index 30a0634b16..734af0d3b7 100644 --- a/user/juce/patches/cmake_install.patch +++ b/user/juce/patches/cmake_install.patch @@ -1,11 +1,10 @@ Patch-Source: https://gitlab.archlinux.org/archlinux/packaging/packages/juce/-/blob/85ac0733192bb74ca0ae07f64f38d20a1a9a9691/juce-6.1.2-cmake_install.patch -diff -ruN a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2021-09-20 14:26:04.000000000 +0200 -+++ b/CMakeLists.txt 2021-09-25 23:53:15.171028235 +0200 -@@ -119,10 +119,10 @@ - COMPATIBILITY ExactVersion - ${extra_version_arg}) +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -137,10 +137,10 @@ write_basic_package_version_file("${JUCE_BINARY_DIR}/JUCEConfigVersion.cmake" + VERSION ${JUCE_VERSION} + COMPATIBILITY ExactVersion) -set(JUCE_INSTALL_DESTINATION "lib/cmake/JUCE-${JUCE_VERSION}" CACHE STRING +set(JUCE_INSTALL_DESTINATION "lib/cmake/juce" CACHE STRING @@ -16,7 +15,7 @@ diff -ruN a/CMakeLists.txt b/CMakeLists.txt set(UTILS_INSTALL_DIR "${JUCE_INSTALL_DESTINATION}") set(JUCEAIDE_PATH "${JUCE_TOOL_INSTALL_DIR}/${JUCE_JUCEAIDE_NAME}") configure_package_config_file("${JUCE_CMAKE_UTILS_DIR}/JUCEConfig.cmake.in" -@@ -130,7 +130,6 @@ +@@ -148,7 +148,6 @@ configure_package_config_file("${JUCE_CMAKE_UTILS_DIR}/JUCEConfig.cmake.in" PATH_VARS UTILS_INSTALL_DIR JUCEAIDE_PATH JUCE_MODULE_PATH INSTALL_DESTINATION "${JUCE_INSTALL_DESTINATION}") @@ -24,10 +23,9 @@ diff -ruN a/CMakeLists.txt b/CMakeLists.txt set(UTILS_INSTALL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/extras/Build/CMake") get_target_property(JUCEAIDE_PATH juceaide IMPORTED_LOCATION) configure_package_config_file("${JUCE_CMAKE_UTILS_DIR}/JUCEConfig.cmake.in" -diff -ruN a/extras/Build/juceaide/CMakeLists.txt b/extras/Build/juceaide/CMakeLists.txt ---- a/extras/Build/juceaide/CMakeLists.txt 2021-09-20 14:26:04.000000000 +0200 -+++ b/extras/Build/juceaide/CMakeLists.txt 2021-09-25 21:41:25.590399181 +0200 -@@ -100,7 +100,7 @@ +--- a/extras/Build/juceaide/CMakeLists.txt ++++ b/extras/Build/juceaide/CMakeLists.txt +@@ -153,7 +153,7 @@ else() add_executable(juce::juceaide ALIAS juceaide) @@ -36,10 +34,9 @@ diff -ruN a/extras/Build/juceaide/CMakeLists.txt b/extras/Build/juceaide/CMakeLi "The location, relative to the install prefix, where juceaide will be installed") install(PROGRAMS "${imported_location}" DESTINATION "${JUCE_TOOL_INSTALL_DIR}") -diff -ruN a/modules/CMakeLists.txt b/modules/CMakeLists.txt ---- a/modules/CMakeLists.txt 2021-09-20 14:26:04.000000000 +0200 -+++ b/modules/CMakeLists.txt 2021-09-25 21:39:39.876766842 +0200 -@@ -22,7 +22,7 @@ +--- a/modules/CMakeLists.txt ++++ b/modules/CMakeLists.txt +@@ -31,7 +31,7 @@ # ============================================================================== juce_add_modules( @@ -47,4 +44,4 @@ diff -ruN a/modules/CMakeLists.txt b/modules/CMakeLists.txt + INSTALL_PATH "share/juce/modules" ALIAS_NAMESPACE juce juce_analytics - juce_audio_basics + juce_animation diff --git a/user/juce/patches/cmake_link_against_system_deps.patch b/user/juce/patches/cmake_link_against_system_deps.patch index 949b0a5a16..4b20971c68 100644 --- a/user/juce/patches/cmake_link_against_system_deps.patch +++ b/user/juce/patches/cmake_link_against_system_deps.patch @@ -1,9 +1,8 @@ Patch-Source: https://gitlab.archlinux.org/archlinux/packaging/packages/juce/-/blob/85ac0733192bb74ca0ae07f64f38d20a1a9a9691/juce-6.1.3-cmake_link_against_system_deps.patch -diff -ruN a/extras/AudioPerformanceTest/CMakeLists.txt b/extras/AudioPerformanceTest/CMakeLists.txt ---- a/extras/AudioPerformanceTest/CMakeLists.txt 2021-12-08 16:31:22.000000000 +0100 -+++ b/extras/AudioPerformanceTest/CMakeLists.txt 2021-12-12 00:06:59.963753084 +0100 -@@ -32,6 +32,11 @@ +--- a/extras/AudioPerformanceTest/CMakeLists.txt ++++ b/extras/AudioPerformanceTest/CMakeLists.txt +@@ -41,6 +41,11 @@ target_compile_definitions(AudioPerformanceTest PRIVATE JUCE_USE_CURL=0 JUCE_WEB_BROWSER=0) target_link_libraries(AudioPerformanceTest PRIVATE @@ -15,11 +14,10 @@ diff -ruN a/extras/AudioPerformanceTest/CMakeLists.txt b/extras/AudioPerformance juce::juce_audio_utils juce::juce_recommended_config_flags juce::juce_recommended_lto_flags -diff -ruN a/extras/AudioPluginHost/CMakeLists.txt b/extras/AudioPluginHost/CMakeLists.txt ---- a/extras/AudioPluginHost/CMakeLists.txt 2021-12-08 16:31:22.000000000 +0100 -+++ b/extras/AudioPluginHost/CMakeLists.txt 2021-12-12 00:08:03.473979636 +0100 -@@ -63,6 +63,10 @@ - JUCE_WEB_BROWSER=0) +--- a/extras/AudioPluginHost/CMakeLists.txt ++++ b/extras/AudioPluginHost/CMakeLists.txt +@@ -81,6 +81,10 @@ target_compile_definitions(AudioPluginHost PRIVATE + JUCE_SILENCE_XCODE_15_LINKER_WARNING=1) target_link_libraries(AudioPluginHost PRIVATE + "ogg" @@ -29,11 +27,10 @@ diff -ruN a/extras/AudioPluginHost/CMakeLists.txt b/extras/AudioPluginHost/CMake AudioPluginHostData juce::juce_audio_utils juce::juce_cryptography -diff -ruN a/extras/Build/juceaide/CMakeLists.txt b/extras/Build/juceaide/CMakeLists.txt ---- a/extras/Build/juceaide/CMakeLists.txt 2021-12-08 16:31:22.000000000 +0100 -+++ b/extras/Build/juceaide/CMakeLists.txt 2021-12-12 00:06:59.970419777 +0100 -@@ -37,6 +37,9 @@ - JUCE_USE_CURL=0) +--- a/extras/Build/juceaide/CMakeLists.txt ++++ b/extras/Build/juceaide/CMakeLists.txt +@@ -50,6 +50,9 @@ if(JUCE_BUILD_HELPER_TOOLS) + JUCE_SILENCE_XCODE_15_LINKER_WARNING=1) target_link_libraries(juceaide PRIVATE + "jpeg" @@ -42,10 +39,9 @@ diff -ruN a/extras/Build/juceaide/CMakeLists.txt b/extras/Build/juceaide/CMakeLi juce::juce_build_tools juce::juce_recommended_config_flags juce::juce_recommended_lto_flags -diff -ruN a/extras/NetworkGraphicsDemo/CMakeLists.txt b/extras/NetworkGraphicsDemo/CMakeLists.txt ---- a/extras/NetworkGraphicsDemo/CMakeLists.txt 2021-12-08 16:31:22.000000000 +0100 -+++ b/extras/NetworkGraphicsDemo/CMakeLists.txt 2021-12-12 00:06:59.963753084 +0100 -@@ -31,6 +31,13 @@ +--- a/extras/NetworkGraphicsDemo/CMakeLists.txt ++++ b/extras/NetworkGraphicsDemo/CMakeLists.txt +@@ -40,6 +40,13 @@ target_compile_definitions(NetworkGraphicsDemo PRIVATE JUCE_USE_CURL=0 JUCE_WEB_BROWSER=0) target_link_libraries(NetworkGraphicsDemo PRIVATE @@ -59,11 +55,10 @@ diff -ruN a/extras/NetworkGraphicsDemo/CMakeLists.txt b/extras/NetworkGraphicsDe juce::juce_audio_utils juce::juce_cryptography juce::juce_opengl -diff -ruN a/extras/Projucer/CMakeLists.txt b/extras/Projucer/CMakeLists.txt ---- a/extras/Projucer/CMakeLists.txt 2021-12-08 16:31:22.000000000 +0100 -+++ b/extras/Projucer/CMakeLists.txt 2021-12-12 00:06:59.970419777 +0100 -@@ -158,6 +158,8 @@ - ../Build/CMake/juce_runtime_arch_detection.cpp) +--- a/extras/Projucer/CMakeLists.txt ++++ b/extras/Projucer/CMakeLists.txt +@@ -153,6 +153,8 @@ juce_add_binary_data(ProjucerData SOURCES + ../Build/CMake/juce_LinuxSubprocessHelper.cpp) target_link_libraries(Projucer PRIVATE + "png16" @@ -71,11 +66,10 @@ diff -ruN a/extras/Projucer/CMakeLists.txt b/extras/Projucer/CMakeLists.txt ProjucerData juce::juce_build_tools juce::juce_cryptography -diff -ruN a/extras/UnitTestRunner/CMakeLists.txt b/extras/UnitTestRunner/CMakeLists.txt ---- a/extras/UnitTestRunner/CMakeLists.txt 2021-12-08 16:31:22.000000000 +0100 -+++ b/extras/UnitTestRunner/CMakeLists.txt 2021-12-12 00:06:59.963753084 +0100 -@@ -33,6 +33,13 @@ - JUCE_WEB_BROWSER=0) +--- a/extras/UnitTestRunner/CMakeLists.txt ++++ b/extras/UnitTestRunner/CMakeLists.txt +@@ -48,6 +48,13 @@ target_compile_definitions(UnitTestRunner PRIVATE + JUCE_SILENCE_XCODE_15_LINKER_WARNING=1) target_link_libraries(UnitTestRunner PRIVATE + "FLAC" diff --git a/user/juce/template.py b/user/juce/template.py index cdeee1b5e6..82e6b85c66 100644 --- a/user/juce/template.py +++ b/user/juce/template.py @@ -32,7 +32,6 @@ f"https://github.com/juce-framework/JUCE/archive/refs/tags/{pkgver}.tar.gz" ) sha256 = "44beae3ecd058ed865fadb1d1a16217b03fecad05a5f158bc8317469cdebf19e" -patch_style = "patch" # remove next release when unsigned char works in bad test code tool_flags = {"CXXFLAGS": ["-Wno-c++11-narrowing"]} diff --git a/user/lxc/patches/meson.patch b/user/lxc/patches/meson.patch index f00ef17aa9..270d618937 100644 --- a/user/lxc/patches/meson.patch +++ b/user/lxc/patches/meson.patch @@ -1,15 +1,15 @@ --- a/meson.build +++ b/meson.build -@@ -316,7 +316,7 @@ +@@ -307,7 +307,7 @@ if time_epoch == '' - time_epoch = run_command(date, '+%s', check: true).stdout() + time_epoch = run_command(date, '+%s', check: true).stdout().strip() endif -generate_date = run_command(date, '--utc', '--date=@' + time_epoch, '+%Y-%m-%d', check: true).stdout().strip() +generate_date = run_command(date, '-z', '--date=@' + time_epoch, '+%Y-%m-%d', check: true).stdout().strip() ## Manpages. - sgml2man = find_program('docbook2X2man', 'docbook2x-man', 'db2x_docbook2man', 'docbook2man', 'docbook-to-man', required: want_mans) -@@ -938,6 +939,6 @@ + docconf = configuration_data() +@@ -983,8 +983,8 @@ 'lxc user network config: @0@'.format(lxc_user_network_conf), 'lxc user network database: @0@'.format(lxc_user_network_db)] @@ -19,3 +19,4 @@ + '+%Y-%m-%dT%H:%M:%S+00:00', check: true).stdout().strip() status += [ 'time epoch: @0@ (@1@)'.format(time_epoch, alt_time_epoch)] + diff --git a/user/lxc/template.py b/user/lxc/template.py index 013ef0f739..38e0b8702e 100644 --- a/user/lxc/template.py +++ b/user/lxc/template.py @@ -32,7 +32,6 @@ url = "https://linuxcontainers.org" source = f"{url}/downloads/lxc/lxc-{pkgver}.tar.gz" sha256 = "1930aa10d892db8531d1353d15f7ebf5913e74a19e134423e4d074c07f2d6e8b" -patch_style = "patch" file_modes = {"usr/libexec/lxc/lxc-user-nic": ("root", "root", 0o4755)} # symlinks to _lxc options = ["!lintcomp"] diff --git a/user/opentabletdriver-udev/patches/fix.patch b/user/opentabletdriver-udev/patches/fix.patch new file mode 100644 index 0000000000..78cc7c0ca8 --- /dev/null +++ b/user/opentabletdriver-udev/patches/fix.patch @@ -0,0 +1,30 @@ +we create uinput separately in main udev rules, and don't build from git +-- +--- a/generate-rules.sh ++++ b/generate-rules.sh +@@ -8,7 +8,7 @@ + echo " -h, --help Print this help message" + } + +-for c in git jq tr awk sed; do ++for c in jq tr awk sed; do + command -v $c > /dev/null + if [[ $? > 0 ]]; then + echo "Error: Command $c not found in \$PATH." >&2 +@@ -23,7 +23,7 @@ + shopt -s globstar + set -eu + +-OTD_CONFIGURATIONS="${OTD_CONFIGURATIONS:="$(git rev-parse --show-toplevel)/OpenTabletDriver.Configurations/Configurations"}" ++OTD_CONFIGURATIONS="./OpenTabletDriver.Configurations/Configurations" + + while [ $# -gt 0 ]; do + case "$1" in +@@ -51,7 +51,6 @@ + configs_arr=$(jq -s "$script" $OTD_CONFIGURATIONS/**/**.json | tr -d '"') + + echo \# OpenTabletDriver udev rules \(https://github.com/OpenTabletDriver/OpenTabletDriver\) +-echo KERNEL==\"uinput\", SUBSYSTEM==\"misc\", OPTIONS+=\"static_node=uinput\", TAG+=\"uaccess\", TAG+=\"udev-acl\" + echo KERNEL==\"js[0-9]*\", SUBSYSTEM==\"input\", ATTRS{name}==\"OpenTabletDriver Virtual Tablet\", RUN+=\"/usr/bin/env rm %E{DEVNAME}\" + + IFS=':' diff --git a/user/opentabletdriver-udev/patches/git.patch b/user/opentabletdriver-udev/patches/git.patch deleted file mode 100644 index 964e7e4ab1..0000000000 --- a/user/opentabletdriver-udev/patches/git.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- generate-rules.sh 2024-09-22 02:10:25.521129020 -0300 -+++ generate-rules.sh 2024-09-22 02:11:43.889844039 -0300 -@@ -8,7 +8,7 @@ - echo " -h, --help Print this help message" - } - --for c in git jq tr awk sed; do -+for c in jq tr awk sed; do - command -v $c > /dev/null - if [[ $? > 0 ]]; then - echo "Error: Command $c not found in \$PATH." >&2 -@@ -23,7 +23,7 @@ - shopt -s globstar - set -eu - --OTD_CONFIGURATIONS="${OTD_CONFIGURATIONS:="$(git rev-parse --show-toplevel)/OpenTabletDriver.Configurations/Configurations"}" -+OTD_CONFIGURATIONS="./OpenTabletDriver.Configurations/Configurations" - - while [ $# -gt 0 ]; do - case "$1" in diff --git a/user/opentabletdriver-udev/patches/uinput.patch b/user/opentabletdriver-udev/patches/uinput.patch deleted file mode 100644 index 66f56d386b..0000000000 --- a/user/opentabletdriver-udev/patches/uinput.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- generate-rules.sh 2024-09-22 03:37:18.488334658 -0300 -+++ generate-rules.sh 2024-09-22 03:37:26.436277278 -0300 -@@ -55,7 +55,6 @@ - } - - echo \# OpenTabletDriver udev rules \(https://github.com/OpenTabletDriver/OpenTabletDriver\) --echo KERNEL==\"uinput\", SUBSYSTEM==\"misc\", OPTIONS+=\"static_node=uinput\", TAG+=\"uaccess\", TAG+=\"udev-acl\" - echo KERNEL==\"js[0-9]*\", SUBSYSTEM==\"input\", ATTRS{name}==\"OpenTabletDriver Virtual Tablet\", RUN+=\"/usr/bin/env rm %E{DEVNAME}\" - - IFS=':' - diff --git a/user/opentabletdriver-udev/template.py b/user/opentabletdriver-udev/template.py index bdb364655d..b27c4adbec 100644 --- a/user/opentabletdriver-udev/template.py +++ b/user/opentabletdriver-udev/template.py @@ -8,7 +8,6 @@ url = "https://opentabletdriver.net" source = f"https://github.com/OpenTabletDriver/OpenTabletDriver/archive/refs/tags/v{pkgver}.tar.gz" sha256 = "1ad04f4a32b54b9b62bd944b0196abb6613873b19c269abcc9f9e94c1dc3027f" -patch_style = "patch" def build(self): diff --git a/user/postgresql16/patches/perl-rpath.patch b/user/postgresql16/patches/perl-rpath.patch index 2d599dff0f..430deef5a9 100644 --- a/user/postgresql16/patches/perl-rpath.patch +++ b/user/postgresql16/patches/perl-rpath.patch @@ -13,13 +13,12 @@ This patch is copied from Alpine. --- a/src/pl/plperl/GNUmakefile +++ b/src/pl/plperl/GNUmakefile -@@ -55,6 +55,9 @@ +@@ -54,6 +54,8 @@ - SHLIB_LINK = $(perl_embed_ldflags) + SHLIB_LINK = $(perl_embed_ldflags) +# Force rpath to be used even though we disable it everywhere else +SHLIB_LINK += $(rpath) -+ - REGRESS_OPTS = --dbname=$(PL_TESTDB) - REGRESS = plperl_setup plperl plperl_lc plperl_trigger plperl_shared \ - plperl_elog plperl_util plperl_init plperlu plperl_array \ + + # see https://www.postgresql.org/message-id/flat/8c4fcb72-2574-ff7c-4c25-1f032d4a2a57%40enterprisedb.com + ifeq ($(PORTNAME), cygwin) diff --git a/user/postgresql16/patches/remove-libecpg_compat.patch b/user/postgresql16/patches/remove-libecpg_compat.patch index ff5fab07fa..f07b279a42 100644 --- a/user/postgresql16/patches/remove-libecpg_compat.patch +++ b/user/postgresql16/patches/remove-libecpg_compat.patch @@ -7,7 +7,7 @@ diff --git a/src/interfaces/ecpg/Makefile b/src/interfaces/ecpg/Makefile index 41460a1..cc3dd37 100644 --- a/src/interfaces/ecpg/Makefile +++ b/src/interfaces/ecpg/Makefile -@@ -2,7 +2,7 @@ subdir = src/interfaces/ecpg +@@ -2,7 +2,7 @@ top_builddir = ../../.. include $(top_builddir)/src/Makefile.global @@ -15,4 +15,4 @@ index 41460a1..cc3dd37 100644 +SUBDIRS = include pgtypeslib ecpglib preproc # Suppress parallel build of subdirectories to avoid a bug in GNU make 3.82, cf - # http://savannah.gnu.org/bugs/?30653 + # https://savannah.gnu.org/bugs/?30653 diff --git a/user/postgresql16/template.py b/user/postgresql16/template.py index 63403cfa0d..2a7738a888 100644 --- a/user/postgresql16/template.py +++ b/user/postgresql16/template.py @@ -49,7 +49,6 @@ f"https://ftp.postgresql.org/pub/source/v{pkgver}/postgresql-{pkgver}.tar.bz2" ] sha256 = ["971766d645aa73e93b9ef4e3be44201b4f45b5477095b049125403f9f3386d6f"] -patch_style = "patch" # checks depend on libpq already being installed options = ["!check"] diff --git a/user/snapper/patches/btrfs.patch b/user/snapper/patches/btrfs.patch index ae705d4fd6..f3a2eb96a5 100644 --- a/user/snapper/patches/btrfs.patch +++ b/user/snapper/patches/btrfs.patch @@ -1,17 +1,14 @@ ---- a/snapper/BtrfsUtils.cc 2024-09-16 06:34:13.758280195 -0300 -+++ b/snapper/BtrfsUtils.cc 2024-09-16 14:59:43.125914359 -0300 -@@ -31,15 +31,9 @@ +the build system doesn't check for this and uses the fallback, but those headers +are broken with musl and kernel include order stuff +-- +--- a/snapper/BtrfsUtils.cc ++++ b/snapper/BtrfsUtils.cc +@@ -31,7 +31,7 @@ #include #include #include -#ifdef HAVE_LIBBTRFS ++#if 1 #include #include --#else --#include --#endif --#ifdef HAVE_LIBBTRFSUTIL - #include --#endif - #include - #include + #else diff --git a/user/snapper/patches/cron.patch b/user/snapper/patches/cron.patch deleted file mode 100644 index 3f58bd56bb..0000000000 --- a/user/snapper/patches/cron.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/scripts/Makefile.am 2024-09-17 07:38:01.803882562 -0300 -+++ b/scripts/Makefile.am 2024-09-17 07:38:22.827614844 -0300 -@@ -17,6 +17,6 @@ - EXTRA_DIST = snapper-hourly bash-completion.bash zsh-completion.zsh $(pam_snapper_SCRIPTS) - - install-data-local: -- install -D snapper-hourly $(DESTDIR)/etc/cron.hourly/suse.de-snapper -+ install -D snapper-hourly $(DESTDIR)/etc/cron.hourly/snapper - install -D --mode a+r,u+w bash-completion.bash $(DESTDIR)/usr/share/bash-completion/completions/snapper - install -D --mode a+r,u+w zsh-completion.zsh $(DESTDIR)/usr/share/zsh/site-functions/_snapper diff --git a/user/snapper/patches/fix-cron.patch b/user/snapper/patches/fix-cron.patch index fe3268ee42..c64085c7d6 100644 --- a/user/snapper/patches/fix-cron.patch +++ b/user/snapper/patches/fix-cron.patch @@ -1,5 +1,5 @@ ---- a/scripts/snapper-hourly 2024-09-16 18:47:03.665873959 -0300 -+++ b/scripts/snapper-hourly 2024-09-16 18:47:12.112772824 -0300 +--- a/scripts/snapper-hourly ++++ b/scripts/snapper-hourly @@ -9,10 +9,10 @@ @@ -13,3 +13,4 @@ + . /etc/snapper/snapper fi + diff --git a/user/snapper/patches/completions.patch b/user/snapper/patches/miscdata.patch similarity index 55% rename from user/snapper/patches/completions.patch rename to user/snapper/patches/miscdata.patch index ea13768c18..c5d349aee7 100644 --- a/user/snapper/patches/completions.patch +++ b/user/snapper/patches/miscdata.patch @@ -1,10 +1,14 @@ ---- a/scripts/Makefile.am 2024-09-16 06:34:13.754280242 -0300 -+++ b/scripts/Makefile.am 2024-09-16 15:50:43.844506756 -0300 -@@ -18,5 +18,5 @@ +fix --mode and the cron.hourly name aesthetic +-- +--- a/scripts/Makefile.am ++++ b/scripts/Makefile.am +@@ -17,6 +17,6 @@ + EXTRA_DIST = snapper-hourly bash-completion.bash zsh-completion.zsh $(pam_snapper_SCRIPTS) install-data-local: - install -D snapper-hourly $(DESTDIR)/etc/cron.hourly/suse.de-snapper +- install -D snapper-hourly $(DESTDIR)/etc/cron.hourly/suse.de-snapper - install -D --mode a+r,u+w bash-completion.bash $(DESTDIR)/usr/share/bash-completion/completions/snapper - install -D --mode a+r,u+w zsh-completion.zsh $(DESTDIR)/usr/share/zsh/site-functions/_snapper ++ install -D snapper-hourly $(DESTDIR)/etc/cron.hourly/snapper + install -D -m a+r,u+w bash-completion.bash $(DESTDIR)/usr/share/bash-completion/completions/snapper + install -D -m a+r,u+w zsh-completion.zsh $(DESTDIR)/usr/share/zsh/site-functions/_snapper diff --git a/user/snapper/template.py b/user/snapper/template.py index 399c2d301b..02a53eaee4 100644 --- a/user/snapper/template.py +++ b/user/snapper/template.py @@ -40,7 +40,6 @@ url = "https://github.com/openSUSE/snapper" source = f"{url}/archive/refs/tags/v{pkgver}.tar.gz" sha256 = "d2a33935f94f30b22aecbdfdecccf651b3616fa698aec266646a9d06043bfd6f" -patch_style = "patch" def post_install(self): diff --git a/user/waydroid/template.py b/user/waydroid/template.py index 36e3aebc60..a5d9f9103d 100644 --- a/user/waydroid/template.py +++ b/user/waydroid/template.py @@ -17,7 +17,6 @@ url = "https://github.com/waydroid/waydroid" source = f"{url}/archive/refs/tags/{pkgver}.tar.gz" sha256 = "6557c6fed6a0a7417503eaaab3602efd67c6ced2026725ac24ec8c809fc672e4" -patch_style = "patch" # check: no tests options = ["!check"]