From 5ae9a20d20d23c000f24f5edfe810f1126c4b323 Mon Sep 17 00:00:00 2001 From: truckmonth Date: Thu, 28 Feb 2019 11:23:00 -0600 Subject: [PATCH 1/4] update `.gitignore` to ignore custom build dirs --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 980259c484..1f004ac6fc 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,6 @@ inkscape_devel_source.tar.bz2 /*.snap /*_source.tar.bz2 + +# @truckmonth +_build_macos_native/ -- GitLab From 824c5821b2a3852f00685957ac19fd3165dcc4bd Mon Sep 17 00:00:00 2001 From: truckmonth Date: Thu, 28 Feb 2019 15:36:53 -0600 Subject: [PATCH 2/4] update submodules for inkscape --- share/extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/extensions b/share/extensions index 9a0bc4b725..71f21129a7 160000 --- a/share/extensions +++ b/share/extensions @@ -1 +1 @@ -Subproject commit 9a0bc4b725f597e9d79aa57a1f24483b76b73dad +Subproject commit 71f21129a7c7ffac03c103ea777b09214f2a63b6 -- GitLab From 740787491de4102195cc528a9ec112dce297bbcf Mon Sep 17 00:00:00 2001 From: truckmonth Date: Sun, 3 Mar 2019 14:35:50 -0600 Subject: [PATCH 3/4] update submodules for inkscape --- share/extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/extensions b/share/extensions index 71f21129a7..d6894fd0ef 160000 --- a/share/extensions +++ b/share/extensions @@ -1 +1 @@ -Subproject commit 71f21129a7c7ffac03c103ea777b09214f2a63b6 +Subproject commit d6894fd0eff647b7fb908a767a102093e292f7b4 -- GitLab From f2451f130856eb36184e88bf3e41d5cb8bcd8f61 Mon Sep 17 00:00:00 2001 From: truckmonth Date: Wed, 27 Mar 2019 20:46:38 -0500 Subject: [PATCH 4/4] add `-f` flag to gzip command to force overwrite of compressed man pages --- CMakeScripts/Pod2man.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeScripts/Pod2man.cmake b/CMakeScripts/Pod2man.cmake index 42b4f41001..eda6292749 100644 --- a/CMakeScripts/Pod2man.cmake +++ b/CMakeScripts/Pod2man.cmake @@ -56,7 +56,7 @@ macro(pod2man PODFILE_FULL RELEASE SECTION CENTER) if(GZIP) add_custom_command( OUTPUT ${MANFILE_FULL_GZ} - COMMAND ${GZIP} -k --best -n "${MANFILE_FULL}" + COMMAND ${GZIP} -f -k --best -n "${MANFILE_FULL}" DEPENDS ${MANFILE_FULL} ) add_custom_target(${MANPAGE_TARGET} ALL -- GitLab