commit: e836b0a51dbed966f373adea13fc3c3abb320c48 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Sat Feb 26 18:25:40 2022 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Sat Feb 26 18:25:55 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e836b0a5
app-text/xournalpp: QA fixes Closes: https://bugs.gentoo.org/834064 Closes: https://bugs.gentoo.org/834065 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> .../files/xournalpp-1.1.1-nocompress.patch | 53 ++++++++++++++++++++++ .../xournalpp/files/xournalpp-1.1.1-nostrip.patch | 31 +++++++++++++ ...nalpp-9999.ebuild => xournalpp-1.1.1-r1.ebuild} | 5 ++ app-text/xournalpp/xournalpp-9999.ebuild | 5 ++ 4 files changed, 94 insertions(+) diff --git a/app-text/xournalpp/files/xournalpp-1.1.1-nocompress.patch b/app-text/xournalpp/files/xournalpp-1.1.1-nocompress.patch new file mode 100644 index 000000000000..dc3ecca1bad0 --- /dev/null +++ b/app-text/xournalpp/files/xournalpp-1.1.1-nocompress.patch @@ -0,0 +1,53 @@ +From 91319980ebddf80f797118fd67bf95b509b31725 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <[email protected]> +Date: Sat, 26 Feb 2022 19:05:39 +0100 +Subject: [PATCH 2/2] Do not compress manpages, this is done by the package + manager +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Andreas K. Hüttel <[email protected]> +--- + man/CMakeLists.txt | 12 ++++-------- + 1 file changed, 4 insertions(+), 8 deletions(-) + +diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt +index 499d9297..974aea4b 100644 +--- a/man/CMakeLists.txt ++++ b/man/CMakeLists.txt +@@ -9,27 +9,23 @@ mark_as_advanced(HELP2MAN) + if (HELP2MAN) + set(MAN_INCLUDE "${PROJECT_SOURCE_DIR}/man/extra.groff") + set(MAN_PAGE "${CMAKE_CURRENT_BINARY_DIR}/xournalpp.1") +- set(MAN_FILE "${CMAKE_CURRENT_BINARY_DIR}/xournalpp.1.gz") + + add_custom_command( +- OUTPUT ${MAN_FILE} ++ OUTPUT ${MAN_PAGE} + COMMAND ${HELP2MAN} --no-info -i ${MAN_INCLUDE} -o ${MAN_PAGE} --version-string=${PROJECT_VERSION} --name="open-source hand note-taking program" ${CMAKE_BINARY_DIR}/src/xournalpp +- COMMAND gzip -n -f -9 ${MAN_PAGE} + DEPENDS ${CMAKE_BINARY_DIR}/src/xournalpp + ) + + set(MAN_PAGE_THUMBNAILER "${CMAKE_CURRENT_BINARY_DIR}/xournalpp-thumbnailer.1") +- set(MAN_FILE_THUMBNAILER "${CMAKE_CURRENT_BINARY_DIR}/xournalpp-thumbnailer.1.gz") + + add_custom_command( +- OUTPUT ${MAN_FILE_THUMBNAILER} ++ OUTPUT ${MAN_PAGE_THUMBNAILER} + COMMAND ${HELP2MAN} --no-info --no-discard-stderr -o ${MAN_PAGE_THUMBNAILER} --version-string=${PROJECT_VERSION} --name="creates thumbnails" ${CMAKE_BINARY_DIR}/src/xoj-preview-extractor/xournalpp-thumbnailer +- COMMAND gzip -n -f -9 ${MAN_PAGE_THUMBNAILER} + DEPENDS ${CMAKE_BINARY_DIR}/src/xoj-preview-extractor/xournalpp-thumbnailer + ) + +- add_custom_target(manpage ALL DEPENDS ${MAN_FILE} ${MAN_FILE_THUMBNAILER}) +- install(FILES ${MAN_FILE} ${MAN_FILE_THUMBNAILER} DESTINATION "share/man/man1") ++ add_custom_target(manpage ALL DEPENDS ${MAN_PAGE} ${MAN_PAGE_THUMBNAILER}) ++ install(FILES ${MAN_PAGE} ${MAN_PAGE_THUMBNAILER} DESTINATION "share/man/man1") + else(HELP2MAN) + message("help2man is missing; no man pages will be generated") + endif(HELP2MAN) +-- +2.34.1 + diff --git a/app-text/xournalpp/files/xournalpp-1.1.1-nostrip.patch b/app-text/xournalpp/files/xournalpp-1.1.1-nostrip.patch new file mode 100644 index 000000000000..0698bc443fda --- /dev/null +++ b/app-text/xournalpp/files/xournalpp-1.1.1-nostrip.patch @@ -0,0 +1,31 @@ +From 9686113b760cf5838a63ba6bee438ec3b7ab99e8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <[email protected]> +Date: Sat, 26 Feb 2022 19:01:17 +0100 +Subject: [PATCH 1/2] Do not explicitly strip the thumbnailer (why?) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Andreas K. Hüttel <[email protected]> +--- + src/xoj-preview-extractor/CMakeLists.txt | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/xoj-preview-extractor/CMakeLists.txt b/src/xoj-preview-extractor/CMakeLists.txt +index 50d1b410..b653d983 100644 +--- a/src/xoj-preview-extractor/CMakeLists.txt ++++ b/src/xoj-preview-extractor/CMakeLists.txt +@@ -41,10 +41,6 @@ target_include_directories (xournalpp-thumbnailer PRIVATE ${librsvg_INCLUDE_DIRS + + set (THUMBNAILER_BIN "xournalpp-thumbnailer") + +-add_custom_command (TARGET xournalpp-thumbnailer POST_BUILD +- COMMAND ${CMAKE_STRIP} ${THUMBNAILER_BIN} +-) +- + ## Install ## + + install (TARGETS xournalpp-thumbnailer +-- +2.34.1 + diff --git a/app-text/xournalpp/xournalpp-9999.ebuild b/app-text/xournalpp/xournalpp-1.1.1-r1.ebuild similarity index 90% copy from app-text/xournalpp/xournalpp-9999.ebuild copy to app-text/xournalpp/xournalpp-1.1.1-r1.ebuild index 2c5a3a5f0527..8ce79e89fbf1 100644 --- a/app-text/xournalpp/xournalpp-9999.ebuild +++ b/app-text/xournalpp/xournalpp-1.1.1-r1.ebuild @@ -41,6 +41,11 @@ BDEPEND=" sys-apps/lsb-release " +PATCHES=( + "${FILESDIR}/${PN}-1.1.1-nostrip.patch" + "${FILESDIR}/${PN}-1.1.1-nocompress.patch" +) + src_prepare() { cmake_src_prepare } diff --git a/app-text/xournalpp/xournalpp-9999.ebuild b/app-text/xournalpp/xournalpp-9999.ebuild index 2c5a3a5f0527..8ce79e89fbf1 100644 --- a/app-text/xournalpp/xournalpp-9999.ebuild +++ b/app-text/xournalpp/xournalpp-9999.ebuild @@ -41,6 +41,11 @@ BDEPEND=" sys-apps/lsb-release " +PATCHES=( + "${FILESDIR}/${PN}-1.1.1-nostrip.patch" + "${FILESDIR}/${PN}-1.1.1-nocompress.patch" +) + src_prepare() { cmake_src_prepare }
