From 413421048cc2b0df9a218f0ab3cb151846809eb5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 27 Apr 2024 23:59:43 +0100 Subject: gentoo auto-resync : 27:04:2024 - 23:59:42 --- app-text/xournalpp/Manifest | 8 ++-- .../xournalpp/files/xournalpp-1.2.3-lua-5-4.patch | 13 +++++ .../files/xournalpp-1.2.3-nocompress.patch | 36 ++++++++++++++ app-text/xournalpp/xournalpp-1.1.1-r3.ebuild | 48 ------------------- app-text/xournalpp/xournalpp-1.2.3.ebuild | 56 ++++++++++++++++++++++ app-text/xournalpp/xournalpp-9999.ebuild | 19 ++++---- 6 files changed, 119 insertions(+), 61 deletions(-) create mode 100644 app-text/xournalpp/files/xournalpp-1.2.3-lua-5-4.patch create mode 100644 app-text/xournalpp/files/xournalpp-1.2.3-nocompress.patch delete mode 100644 app-text/xournalpp/xournalpp-1.1.1-r3.ebuild create mode 100644 app-text/xournalpp/xournalpp-1.2.3.ebuild (limited to 'app-text/xournalpp') diff --git a/app-text/xournalpp/Manifest b/app-text/xournalpp/Manifest index bc1487ff303e..9fb4a7a5f25d 100644 --- a/app-text/xournalpp/Manifest +++ b/app-text/xournalpp/Manifest @@ -2,9 +2,11 @@ AUX xournalpp-1.1.1-nocompress.patch 2302 BLAKE2B 1f381d9cc89725aa2ab04c71ceb65c AUX xournalpp-1.1.1-nostrip.patch 1037 BLAKE2B 5016e48f6abd9368ae703f693efe3ae84d395c939f08e9244443c6aaee794729abbc52195816c7e21f08c751b8c953fef3ffda1c0f0ea73a0203f243f614e81d SHA512 5651db0248ad71967412d33cc2f39b8638c38c185635936e988ef7561dd7a51ebb0c7be803a69b7b4eb4cc548dfd237f2920b2b8c8dd779a38b90b4b28e322e1 AUX xournalpp-1.1.3-gcc13.patch 245 BLAKE2B 32593e41947d39cc13b4012ef7f8b42d422d312f3df724bf29dfd90dacc8a3447dbdc214ec0339f94d98ae74971c45de19d4bd863123ab88256ed6e2952cd2c1 SHA512 8fe22b0d18e1be5add93642bcacac4d246e079bc4e52b6080ba2678d2017616170e1cdd3423a53ad4521a24a5b4631a28ef649b5293648d9ab3fc1048366f9b3 AUX xournalpp-1.1.3-lua-5-4.patch 402 BLAKE2B fe257a01a3a42306cbded7311b9974db5f19d91a5e616aa9fc063747f3dca2f76e6c79ed7a1e9027fb2826b4064c4d6b28b7859cdc5e27f677faf411819bfff0 SHA512 94889468a810910bc955cdce7e0b4f6b52ae31bab36d7b9fdb03ef7221028e5fa0f3ceebf932c4fcbedb967240f70579a8a0bd6ee81936bdd183619d21cef1d4 -DIST xournalpp-1.1.1.tgz 15093900 BLAKE2B 87988bc78a0d904f1e3533e393bcdfc7b76517f6cc13343cb63ceaa83de25eca885274238ce45840334ea653964c9cd1834fc22d5b2c89a731ae5616f01f22c8 SHA512 efba97d26f624e3a1b8164ef6333a0f1d2992d0245414bdb51692d845965f6c37071f687520b43a94f713465796a16cbafd8929fd3bf8e6c3face847df92251d +AUX xournalpp-1.2.3-lua-5-4.patch 533 BLAKE2B 66e408f4c78ede1f31d856a17c44c3f2ac0b61a7dbec5c552f906dff5daf8a1c59d514efcfe5d091774f5e90a8ffd9a4517642505f0d189bf26052319400e134 SHA512 97bde988494541610ed5f622ec3da432203f3e697125db08b1d27d58422596b46d62e531db636f73ad16eb7052b4b830df37f4161fffe0a35268a28b423325a8 +AUX xournalpp-1.2.3-nocompress.patch 1801 BLAKE2B 06abaa73e1641efae99acbbe3c3825743526d724c4f4446f3eed486628b03c86ad312823f55441cb8ce6b695ae771b8e50454b61c73085baeb7ff6766f8c7dd5 SHA512 99ce44fd4650fa72aab181590652ea04ac2bc2629e1523b02349bea96733606d8a8b323dda500e8825da8974766d338b9b7b2f89a7e675d6c92c4ed463779ff1 DIST xournalpp-1.1.3.tgz 15096883 BLAKE2B 814aea3510f26f9478280d158cfa32bafd168df6a21e6776cc831f4d41a69b4dd596df3bac990d28851bba933b6c448f1e38109042bd02cd7454985aaac8d13b SHA512 7b3f1507a8f7b2b5ebef093e319008d4bc14b961ab528af490d133bc64176b85b14a4002753f5444f8fd96c326e7c6cf5d1bad443ad7ce2ea56e9f465aacae3d -EBUILD xournalpp-1.1.1-r3.ebuild 1069 BLAKE2B 339ca036731952260978f16d9897d9a23cf11b96a48fbd06c072afecc69d89bf6e3e90a8749bf6644cb83aa4f30165d920ee155ca81bd637912caa2ed343e8c3 SHA512 911377ec94ce1ed96c66bc8b47caa056af2b9b6ef043cb753be01ea406c0fc764f66480b2020040ffcf168ed23575785569a398f67c67f9fc72d3128fed7c42b +DIST xournalpp-1.2.3.tgz 16708613 BLAKE2B f631ec686846e3c00428f050c5ff5d72ebb51b5bfbb1e81b22bcf9416bedb8507c887d6f68d6031945ff107bbd82dfca6c5d4c2430943c17b1c0e9d55d288f73 SHA512 17303314d49001f492469d855155a019659cdafc67509d4e176f60a93322f4ee1d4b999e8a25a9a23bde27b878012c06aa11f15bc2a54a730098964053834d1f EBUILD xournalpp-1.1.3-r2.ebuild 1193 BLAKE2B 62a104f7866f2c059e7ab4daae88bbe51e62c61ddc9d4fc0292a9d282d75048bfb8f6a6248dbab0d20571d9f7517a4ce613c8e3f1f13c417e17bb6a7462b8723 SHA512 4afed7ca417c7e5cf56a08ed30b0cf87a856450c27d1434ffe01b2c224b30b07359a0bc7028142eabc8cb6b56e575c268236f5d25722ddcb66a61cb514383e75 -EBUILD xournalpp-9999.ebuild 1194 BLAKE2B 0e66dd64b40afca34bf01129d36d6e269179fcb0bbc369a9a49e55cc301fcd77e9526d6fa484354c9d0b6ed799daa7926bb894176fea37a8e5f5434e0eb571df SHA512 8a94a24b965f915883433c3ff1cf6fe4fe43aed81a9b765cdce4714cd944ee0baea86c069b30e09fb19fdca8264d95f70f9e93310f92275184534109e599b800 +EBUILD xournalpp-1.2.3.ebuild 1202 BLAKE2B a61df5b8e482ca695c7d06508d1d09664a4422390e92a344afb7d3c28c2842a4f15e289c17bbf5274ce43c89c47945155d107331b5c2cd27333a2740bef20622 SHA512 4ce4e1f7bcc4696bff218775e380455de6fef3ba928e67f11919cdc6dbbc85b3caf4694d87234d35ff7c89efef6c5e5905d9c223191cb935f0613c855012420e +EBUILD xournalpp-9999.ebuild 1202 BLAKE2B a61df5b8e482ca695c7d06508d1d09664a4422390e92a344afb7d3c28c2842a4f15e289c17bbf5274ce43c89c47945155d107331b5c2cd27333a2740bef20622 SHA512 4ce4e1f7bcc4696bff218775e380455de6fef3ba928e67f11919cdc6dbbc85b3caf4694d87234d35ff7c89efef6c5e5905d9c223191cb935f0613c855012420e MISC metadata.xml 305 BLAKE2B a0f91402d7c9940c0e0a6c6fd9d6785751734fddea3c57025889ef4037238e8f0db013b4d08d3398254936e83d17dd97aa011d23be3bae2853ac6954314b3ea8 SHA512 083227ced431d1b53984d271d76f1fc9c16f894c81355662aca8cb3545493cea7bcf9daa5e7a309c04a8006b5512edeadc0e969e76011c4f33f222c48dec57cb 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-1.1.1-r3.ebuild b/app-text/xournalpp/xournalpp-1.1.1-r3.ebuild deleted file mode 100644 index cd729ea77198..000000000000 --- a/app-text/xournalpp/xournalpp-1.1.1-r3.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Upstream only support 5.3 (see CMakeLists.txt), also bug #854615 -LUA_COMPAT=( lua5-3 ) -inherit cmake lua-single xdg - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/xournalpp/xournalpp.git" -else - SRC_URI="https://github.com/xournalpp/xournalpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tgz" - KEYWORDS="amd64 ~ppc64" -fi - -DESCRIPTION="Handwriting notetaking software with PDF annotation support" -HOMEPAGE="https://github.com/xournalpp/xournalpp" - -LICENSE="GPL-2" -SLOT="0" - -REQUIRED_USE="${LUA_REQUIRED_USE}" - -COMMON_DEPEND=" - ${LUA_DEPS} - app-text/poppler[cairo] - dev-libs/glib - dev-libs/libxml2 - dev-libs/libzip:= - gnome-base/librsvg - media-libs/portaudio[cxx] - media-libs/libsndfile - sys-libs/zlib:= - x11-libs/gtk+:3 -" -RDEPEND="${COMMON_DEPEND}" -DEPEND="${COMMON_DEPEND}" -BDEPEND=" - virtual/pkgconfig - sys-apps/lsb-release -" - -PATCHES=( - "${FILESDIR}/${PN}-1.1.1-nostrip.patch" - "${FILESDIR}/${PN}-1.1.1-nocompress.patch" -) diff --git a/app-text/xournalpp/xournalpp-1.2.3.ebuild b/app-text/xournalpp/xournalpp-1.2.3.ebuild new file mode 100644 index 000000000000..df7aa6c945ea --- /dev/null +++ b/app-text/xournalpp/xournalpp-1.2.3.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-3 lua5-4 ) +inherit cmake lua-single xdg + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/xournalpp/xournalpp.git" +else + SRC_URI="https://github.com/xournalpp/xournalpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tgz" + KEYWORDS="~amd64 ~ppc64" +fi + +DESCRIPTION="Handwriting notetaking software with PDF annotation support" +HOMEPAGE="https://github.com/xournalpp/xournalpp" + +LICENSE="GPL-2" +SLOT="0" + +REQUIRED_USE="${LUA_REQUIRED_USE}" + +COMMON_DEPEND=" + ${LUA_DEPS} + app-text/poppler[cairo] + >=dev-libs/glib-2.32.0 + dev-libs/libxml2 + >=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.18.9:3 +" +RDEPEND="${COMMON_DEPEND}" +DEPEND="${COMMON_DEPEND}" +BDEPEND=" + virtual/pkgconfig + sys-apps/lsb-release +" + +PATCHES=( + "${FILESDIR}/${PN}-1.1.1-nostrip.patch" + "${FILESDIR}/${PN}-1.2.3-nocompress.patch" + "${FILESDIR}/${PN}-1.2.3-lua-5-4.patch" +) + +src_configure() { + local mycmakeargs=( + -DLUA_VERSION="$(lua_get_version)" + ) + + cmake_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() { -- cgit v1.2.3