From: Ryan Pavlik Date: Thu, 30 Jun 2022 15:46:39 +0000 (-0500) Subject: Rediff patches X-Git-Tag: archive/raspbian/3.1+ds1-4+rpi1^2~29 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=682b52e0894ec307239475e60ed6beb21c25e4b7;p=solvespace.git Rediff patches Drop 05_eigen_dependency_fix.patch: Applied upstream. Drop 06_desktop_file_exec.patch: Applied upstream. Gbp-Dch: Full --- diff --git a/debian/patches/01_hardcode_git_hash.patch b/debian/patches/01_hardcode_git_hash.patch index 6210de3..08baf16 100644 --- a/debian/patches/01_hardcode_git_hash.patch +++ b/debian/patches/01_hardcode_git_hash.patch @@ -5,14 +5,14 @@ Subject: Manually specify git commit hash Revise on every upstream update! Forwarded: not-needed -Last-Update: 2022-05-13 +Last-Update: 2022-06-30 =================================================================== --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7f08e95..cfdd52d 100644 +index 399e2ca..0446e1b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,9 +34,9 @@ endif() @@ -23,7 +23,7 @@ index 7f08e95..cfdd52d 100644 +# include(GetGitCommitHash) # and instead uncomment the following, adding the complete git hash of the checkout you are using: -# set(GIT_COMMIT_HASH 0000000000000000000000000000000000000000) -+set(GIT_COMMIT_HASH a4416a4cae3e56b64108f216b5982df51bdd69f3) ++set(GIT_COMMIT_HASH 70bde63cb32a7f049fa56cbdf924e2695fcb2916) string(SUBSTRING "${GIT_COMMIT_HASH}" 0 8 solvespace_GIT_HASH) project(solvespace diff --git a/debian/patches/05_eigen_dependency_fix.patch b/debian/patches/05_eigen_dependency_fix.patch deleted file mode 100644 index 8c402cd..0000000 --- a/debian/patches/05_eigen_dependency_fix.patch +++ /dev/null @@ -1,82 +0,0 @@ -From: Ryan Pavlik -Date: Fri, 13 May 2022 17:03:23 -0500 -Subject: Eigen includes are a public dependency - -Forwarded: https://github.com/solvespace/solvespace/pull/1243 ---- - CMakeLists.txt | 8 ++++---- - src/CMakeLists.txt | 7 +++++-- - test/CMakeLists.txt | 3 +++ - 3 files changed, 12 insertions(+), 6 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cfdd52d..0446e1b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -185,9 +185,6 @@ endif() - message(STATUS "Using in-tree libdxfrw") - add_subdirectory(extlib/libdxfrw) - --message(STATUS "Using in-tree eigen") --include_directories(extlib/eigen) -- - message(STATUS "Using in-tree mimalloc") - set(MI_OVERRIDE OFF CACHE BOOL "") - set(MI_BUILD_SHARED OFF CACHE BOOL "") -@@ -199,13 +196,16 @@ set(MIMALLOC_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/extlib/mimalloc/include) - if(NOT FORCE_VENDORED_Eigen3) - find_package(Eigen3 CONFIG) - endif() --if(FORCE_VENDORED_Eigen3 OR NOT EIGEN3_FOUND) -+if(FORCE_VENDORED_Eigen3 OR NOT EIGEN3_INCLUDE_DIRS) - message(STATUS "Using in-tree Eigen") - set(EIGEN3_FOUND YES) - set(EIGEN3_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extlib/eigen) - else() - message(STATUS "Using system Eigen: ${EIGEN3_INCLUDE_DIRS}") - endif() -+if(NOT EXISTS "${EIGEN3_INCLUDE_DIRS}") -+ message(FATAL_ERROR "Eigen 3 not found on system or in-tree") -+endif() - - - if(WIN32 OR APPLE) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 0c0277e..41c40d0 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -82,7 +82,9 @@ target_compile_definitions(slvs - PRIVATE -DLIBRARY) - - target_include_directories(slvs -- PUBLIC ${CMAKE_SOURCE_DIR}/include) -+ PUBLIC -+ ${CMAKE_SOURCE_DIR}/include -+ ${EIGEN3_INCLUDE_DIRS}) - - target_link_libraries(slvs PRIVATE slvs_deps) - -@@ -336,7 +338,8 @@ target_compile_definitions(solvespace-headless - PRIVATE HEADLESS) - - target_include_directories(solvespace-headless -- INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) -+ INTERFACE ${CMAKE_CURRENT_SOURCE_DIR} -+ PUBLIC ${EIGEN3_INCLUDE_DIRS}) - - target_link_libraries(solvespace-headless - PRIVATE -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index db812bf..eb6cf60 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -76,6 +76,9 @@ target_link_libraries(solvespace-testsuite - solvespace-headless - ${COVERAGE_LIBRARY}) - -+target_include_directories(solvespace-testsuite -+ PRIVATE -+ ${EIGEN3_INCLUDE_DIRS}) - add_dependencies(solvespace-testsuite - resources) - diff --git a/debian/patches/06_desktop_file_exec.patch b/debian/patches/06_desktop_file_exec.patch deleted file mode 100644 index 87f3d06..0000000 --- a/debian/patches/06_desktop_file_exec.patch +++ /dev/null @@ -1,50 +0,0 @@ -From: Ryan Pavlik -Date: Fri, 13 May 2022 17:09:34 -0500 -Subject: Fix desktop file exec line. - -Forwarded: https://github.com/solvespace/solvespace/pull/1243 ---- - res/freedesktop/solvespace-flatpak.desktop.in | 2 +- - res/freedesktop/solvespace-snap.desktop | 2 +- - res/freedesktop/solvespace.desktop.in | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/res/freedesktop/solvespace-flatpak.desktop.in b/res/freedesktop/solvespace-flatpak.desktop.in -index c80b67a..f07f293 100644 ---- a/res/freedesktop/solvespace-flatpak.desktop.in -+++ b/res/freedesktop/solvespace-flatpak.desktop.in -@@ -2,7 +2,7 @@ - Version=1.0 - Name=SolveSpace - Comment=A parametric 2d/3d CAD --Exec=${CMAKE_INSTALL_FULL_BINDIR}/solvespace -+Exec=${CMAKE_INSTALL_FULL_BINDIR}/solvespace %f - MimeType=application/x-solvespace - Icon=com.solvespace.SolveSpace - Type=Application -diff --git a/res/freedesktop/solvespace-snap.desktop b/res/freedesktop/solvespace-snap.desktop -index da0dda1..7beceb0 100644 ---- a/res/freedesktop/solvespace-snap.desktop -+++ b/res/freedesktop/solvespace-snap.desktop -@@ -2,7 +2,7 @@ - Version=1.0 - Name=SolveSpace - Comment=A parametric 2d/3d CAD --Exec=solvespace -+Exec=solvespace %f - MimeType=application/x-solvespace - Icon=${SNAP}/meta/icons/hicolor/scalable/apps/snap.solvespace.svg - Type=Application -diff --git a/res/freedesktop/solvespace.desktop.in b/res/freedesktop/solvespace.desktop.in -index 87e6863..e9b78de 100644 ---- a/res/freedesktop/solvespace.desktop.in -+++ b/res/freedesktop/solvespace.desktop.in -@@ -2,7 +2,7 @@ - Version=1.0 - Name=SolveSpace - Comment=A parametric 2d/3d CAD --Exec=${CMAKE_INSTALL_FULL_BINDIR}/solvespace -+Exec=${CMAKE_INSTALL_FULL_BINDIR}/solvespace %f - MimeType=application/x-solvespace - Icon=solvespace - Type=Application diff --git a/debian/patches/series b/debian/patches/series index f795e4d..4745fc7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,5 +2,3 @@ 02_add_debian_pkg_version.patch 03_use_system_threejs.patch 04_use_system_unifont.patch -05_eigen_dependency_fix.patch -06_desktop_file_exec.patch