commit: 293c4985ed00bfaca1004cf43d1b0a1f8e19ea04 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Sat Apr 27 13:45:32 2024 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Sat Apr 27 13:46:03 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=293c4985
app-text/xournalpp: add 1.2.3 Closes: https://bugs.gentoo.org/915485 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> app-text/xournalpp/Manifest | 1 + .../xournalpp/files/xournalpp-1.2.3-lua-5-4.patch | 13 ++++++++ .../files/xournalpp-1.2.3-nocompress.patch | 36 ++++++++++++++++++++++ ...ournalpp-9999.ebuild => xournalpp-1.2.3.ebuild} | 19 ++++++------ app-text/xournalpp/xournalpp-9999.ebuild | 19 ++++++------ 5 files changed, 68 insertions(+), 20 deletions(-) diff --git a/app-text/xournalpp/Manifest b/app-text/xournalpp/Manifest index 01892e0da412..5a40251ff5b3 100644 --- a/app-text/xournalpp/Manifest +++ b/app-text/xournalpp/Manifest @@ -1 +1,2 @@ DIST xournalpp-1.1.3.tgz 15096883 BLAKE2B 814aea3510f26f9478280d158cfa32bafd168df6a21e6776cc831f4d41a69b4dd596df3bac990d28851bba933b6c448f1e38109042bd02cd7454985aaac8d13b SHA512 7b3f1507a8f7b2b5ebef093e319008d4bc14b961ab528af490d133bc64176b85b14a4002753f5444f8fd96c326e7c6cf5d1bad443ad7ce2ea56e9f465aacae3d +DIST xournalpp-1.2.3.tgz 16708613 BLAKE2B f631ec686846e3c00428f050c5ff5d72ebb51b5bfbb1e81b22bcf9416bedb8507c887d6f68d6031945ff107bbd82dfca6c5d4c2430943c17b1c0e9d55d288f73 SHA512 17303314d49001f492469d855155a019659cdafc67509d4e176f60a93322f4ee1d4b999e8a25a9a23bde27b878012c06aa11f15bc2a54a730098964053834d1f diff --git a/app-text/xournalpp/files/xournalpp-1.2.3-lua-5-4.patch b/app-text/xournalpp/files/xournalpp-1.2.3-lua-5-4.patch new file mode 100644 index 000000000000..89784b96354f --- /dev/null +++ b/app-text/xournalpp/files/xournalpp-1.2.3-lua-5-4.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 453695c0..900c6cc3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -146,7 +146,7 @@ find_package(ZLIB REQUIRED) + find_package(Threads REQUIRED) + + option(ENABLE_PLUGINS "Compile with plugin support" ON) +-find_package(Lua) # Lua 5.4 is only supported with cmake >=3.18 ++find_package(Lua ${LUA_VERSION} EXACT) # Lua 5.4 is only supported with cmake >=3.18 + message(STATUS "Found Lua: ${Lua_FOUND}") + if (Lua_FOUND AND ENABLE_PLUGINS) + # currently not fully supported by cmake diff --git a/app-text/xournalpp/files/xournalpp-1.2.3-nocompress.patch b/app-text/xournalpp/files/xournalpp-1.2.3-nocompress.patch new file mode 100644 index 000000000000..df77cc00f745 --- /dev/null +++ b/app-text/xournalpp/files/xournalpp-1.2.3-nocompress.patch @@ -0,0 +1,36 @@ +diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt +index 1cb6bb5b..af069dca 100644 +--- a/man/CMakeLists.txt ++++ b/man/CMakeLists.txt +@@ -12,27 +12,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}/xournalpp +- COMMAND gzip -n -f -9 ${MAN_PAGE} + DEPENDS ${CMAKE_BINARY_DIR}/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) diff --git a/app-text/xournalpp/xournalpp-9999.ebuild b/app-text/xournalpp/xournalpp-1.2.3.ebuild similarity index 75% copy from app-text/xournalpp/xournalpp-9999.ebuild copy to app-text/xournalpp/xournalpp-1.2.3.ebuild index 681bb9a2a3cf..df7aa6c945ea 100644 --- a/app-text/xournalpp/xournalpp-9999.ebuild +++ b/app-text/xournalpp/xournalpp-1.2.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -25,14 +25,14 @@ REQUIRED_USE="${LUA_REQUIRED_USE}" COMMON_DEPEND=" ${LUA_DEPS} app-text/poppler[cairo] - dev-libs/glib + >=dev-libs/glib-2.32.0 dev-libs/libxml2 - dev-libs/libzip:= - gnome-base/librsvg - media-libs/portaudio[cxx] - media-libs/libsndfile + >=dev-libs/libzip-1.0.1:= + >=gnome-base/librsvg-2.40 + >=media-libs/portaudio-12[cxx] + >=media-libs/libsndfile-1.0.25 sys-libs/zlib:= - x11-libs/gtk+:3 + >=x11-libs/gtk+-3.18.9:3 " RDEPEND="${COMMON_DEPEND}" DEPEND="${COMMON_DEPEND}" @@ -43,9 +43,8 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-1.1.1-nostrip.patch" - "${FILESDIR}/${PN}-1.1.1-nocompress.patch" - "${FILESDIR}/${PN}-1.1.3-lua-5-4.patch" - "${FILESDIR}/${PN}-1.1.3-gcc13.patch" + "${FILESDIR}/${PN}-1.2.3-nocompress.patch" + "${FILESDIR}/${PN}-1.2.3-lua-5-4.patch" ) src_configure() { diff --git a/app-text/xournalpp/xournalpp-9999.ebuild b/app-text/xournalpp/xournalpp-9999.ebuild index 681bb9a2a3cf..df7aa6c945ea 100644 --- a/app-text/xournalpp/xournalpp-9999.ebuild +++ b/app-text/xournalpp/xournalpp-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -25,14 +25,14 @@ REQUIRED_USE="${LUA_REQUIRED_USE}" COMMON_DEPEND=" ${LUA_DEPS} app-text/poppler[cairo] - dev-libs/glib + >=dev-libs/glib-2.32.0 dev-libs/libxml2 - dev-libs/libzip:= - gnome-base/librsvg - media-libs/portaudio[cxx] - media-libs/libsndfile + >=dev-libs/libzip-1.0.1:= + >=gnome-base/librsvg-2.40 + >=media-libs/portaudio-12[cxx] + >=media-libs/libsndfile-1.0.25 sys-libs/zlib:= - x11-libs/gtk+:3 + >=x11-libs/gtk+-3.18.9:3 " RDEPEND="${COMMON_DEPEND}" DEPEND="${COMMON_DEPEND}" @@ -43,9 +43,8 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-1.1.1-nostrip.patch" - "${FILESDIR}/${PN}-1.1.1-nocompress.patch" - "${FILESDIR}/${PN}-1.1.3-lua-5-4.patch" - "${FILESDIR}/${PN}-1.1.3-gcc13.patch" + "${FILESDIR}/${PN}-1.2.3-nocompress.patch" + "${FILESDIR}/${PN}-1.2.3-lua-5-4.patch" ) src_configure() {
