packages: Commit missing patches
parent
6c77eb896c
commit
91a1713d6d
|
@ -0,0 +1,61 @@
|
||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index 80a3bdcd6..380a1573a 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -61,7 +61,7 @@ option(
|
||||||
|
"Link dependencies using CMake's find_package and do not use internal builds"
|
||||||
|
${SRB2_CONFIG_SYSTEM_LIBRARIES_DEFAULT}
|
||||||
|
)
|
||||||
|
-option(SRB2_CONFIG_ENABLE_TESTS "Build the test suite" ON)
|
||||||
|
+option(SRB2_CONFIG_ENABLE_TESTS "Build the test suite" OFF)
|
||||||
|
# This option isn't recommended for distribution builds and probably won't work (yet).
|
||||||
|
cmake_dependent_option(
|
||||||
|
SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES
|
||||||
|
@@ -80,25 +80,6 @@ option(SRB2_CONFIG_ZDEBUG "Compile with ZDEBUG defined." OFF)
|
||||||
|
option(SRB2_CONFIG_PROFILEMODE "Compile for profiling (GCC only)." OFF)
|
||||||
|
set(SRB2_CONFIG_ASSET_DIRECTORY "" CACHE PATH "Path to directory that contains all asset files for the installer. If set, assets will be part of installation and cpack.")
|
||||||
|
|
||||||
|
-if(SRB2_CONFIG_ENABLE_TESTS)
|
||||||
|
- # https://github.com/catchorg/Catch2
|
||||||
|
- CPMAddPackage(
|
||||||
|
- NAME Catch2
|
||||||
|
- VERSION 3.4.0
|
||||||
|
- GITHUB_REPOSITORY catchorg/Catch2
|
||||||
|
- OPTIONS
|
||||||
|
- "CATCH_INSTALL_DOCS OFF"
|
||||||
|
- )
|
||||||
|
- list(APPEND CMAKE_MODULE_PATH "${Catch2_SOURCE_DIR}/extras")
|
||||||
|
- include(CTest)
|
||||||
|
- include(Catch)
|
||||||
|
- add_executable(srb2tests)
|
||||||
|
- # To add tests, use target_sources to add individual test files to the target in subdirs.
|
||||||
|
- target_link_libraries(srb2tests PRIVATE Catch2::Catch2 Catch2::Catch2WithMain)
|
||||||
|
- target_compile_features(srb2tests PRIVATE c_std_11 cxx_std_17)
|
||||||
|
- catch_discover_tests(srb2tests)
|
||||||
|
-endif()
|
||||||
|
-
|
||||||
|
# Enable CCache
|
||||||
|
# (Set USE_CCACHE=ON to use, CCACHE_OPTIONS for options)
|
||||||
|
if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL Windows)
|
||||||
|
@@ -113,12 +94,6 @@ if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL Windows)
|
||||||
|
message(WARNING "USE_CCACHE was set but ccache is not found (set CCACHE_TOOL_PATH)")
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
-else()
|
||||||
|
- CPMAddPackage(
|
||||||
|
- NAME Ccache.cmake
|
||||||
|
- GITHUB_REPOSITORY TheLartians/Ccache.cmake
|
||||||
|
- VERSION 1.2
|
||||||
|
- )
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# Dependencies
|
||||||
|
@@ -179,7 +154,7 @@ include(GitUtilities)
|
||||||
|
if("${SRB2_SDL2_EXE_NAME}" STREQUAL "")
|
||||||
|
# cause a reconfigure if the branch changes
|
||||||
|
get_git_dir(SRB2_GIT_DIR)
|
||||||
|
- configure_file("${SRB2_GIT_DIR}/HEAD" HEAD COPYONLY)
|
||||||
|
+ #configure_file("${SRB2_GIT_DIR}/HEAD" HEAD COPYONLY)
|
||||||
|
|
||||||
|
git_current_branch(SRB2_GIT_REVISION)
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
|
||||||
|
index f33b3bf3f..1214f179c 100644
|
||||||
|
--- a/thirdparty/CMakeLists.txt
|
||||||
|
+++ b/thirdparty/CMakeLists.txt
|
||||||
|
@@ -16,6 +16,5 @@ if(NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}")
|
||||||
|
include("cpm-png.cmake")
|
||||||
|
include("cpm-curl.cmake")
|
||||||
|
include("cpm-openmpt.cmake")
|
||||||
|
+ include("cpm-libgme.cmake")
|
||||||
|
endif()
|
||||||
|
-
|
||||||
|
-include("cpm-libgme.cmake")
|
|
@ -0,0 +1,19 @@
|
||||||
|
Tell bubblewrap to share the store. Required for programs that use the
|
||||||
|
sandboxing features such as Epiphany.
|
||||||
|
|
||||||
|
See <https://bugs.gnu.org/40837>.
|
||||||
|
Author: Jack Hill <jackhill@jackhill.us>
|
||||||
|
---
|
||||||
|
diff --git a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
|
||||||
|
--- a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
|
||||||
|
+++ b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
|
||||||
|
@@ -737,6 +737,9 @@ GRefPtr<GSubprocess> bubblewrapSpawn(GSubprocessLauncher* launcher, const Proces
|
||||||
|
"--ro-bind-try", "/usr/local/share", "/usr/local/share",
|
||||||
|
"--ro-bind-try", DATADIR, DATADIR,
|
||||||
|
|
||||||
|
+ // Bind mount the store inside the WebKitGTK sandbox.
|
||||||
|
+ "--ro-bind", "@storedir@", "@storedir@",
|
||||||
|
+
|
||||||
|
// We only grant access to the libdirs webkit is built with and
|
||||||
|
// guess system libdirs. This will always have some edge cases.
|
||||||
|
"--ro-bind-try", "/lib", "/lib",
|
Loading…
Reference in New Issue