commit: afa39c0fbe3807afa855f3cd8483eba13893ed0a Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Sun Feb 16 18:30:47 2025 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Sun Feb 16 18:30:47 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afa39c0f
app-text/xournalpp: drop 1.1.3-r2 Closes: https://bugs.gentoo.org/925688 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> app-text/xournalpp/Manifest | 1 - .../files/xournalpp-1.1.1-nocompress.patch | 53 -------------------- .../xournalpp/files/xournalpp-1.1.3-gcc13.patch | 12 ----- .../xournalpp/files/xournalpp-1.1.3-lua-5-4.patch | 14 ------ app-text/xournalpp/xournalpp-1.1.3-r2.ebuild | 57 ---------------------- 5 files changed, 137 deletions(-) diff --git a/app-text/xournalpp/Manifest b/app-text/xournalpp/Manifest index 5a40251ff5b3..90d0a589e30f 100644 --- a/app-text/xournalpp/Manifest +++ b/app-text/xournalpp/Manifest @@ -1,2 +1 @@ -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.1.1-nocompress.patch b/app-text/xournalpp/files/xournalpp-1.1.1-nocompress.patch deleted file mode 100644 index dc3ecca1bad0..000000000000 --- a/app-text/xournalpp/files/xournalpp-1.1.1-nocompress.patch +++ /dev/null @@ -1,53 +0,0 @@ -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.3-gcc13.patch b/app-text/xournalpp/files/xournalpp-1.1.3-gcc13.patch deleted file mode 100644 index 97f7fbc0d7f2..000000000000 --- a/app-text/xournalpp/files/xournalpp-1.1.3-gcc13.patch +++ /dev/null @@ -1,12 +0,0 @@ -https://bugs.gentoo.org/894720 -https://bugs.gentoo.org/895536 ---- a/src/view/background/BackgroundConfig.h -+++ b/src/view/background/BackgroundConfig.h -@@ -11,6 +11,7 @@ - - #pragma once - -+#include <cstdint> - #include <map> - #include <string> - diff --git a/app-text/xournalpp/files/xournalpp-1.1.3-lua-5-4.patch b/app-text/xournalpp/files/xournalpp-1.1.3-lua-5-4.patch deleted file mode 100644 index c53b63588c43..000000000000 --- a/app-text/xournalpp/files/xournalpp-1.1.3-lua-5-4.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -148,9 +148,9 @@ if (ENABLE_CPPUNIT) - endif (ENABLE_CPPUNIT) - - # Plugins / scripting --find_package (Lua 5.3 EXACT) -+find_package (Lua ${LUA_VERSION} EXACT) - if (NOT Lua_FOUND) -- find_package (Lua 5.3) # Lua 5.4 is only supported with cmake >=3.18 -+ find_package (Lua ${LUA_VERSION}) # Lua 5.4 is only supported with cmake >=3.18 - endif() - - if (Lua_FOUND) diff --git a/app-text/xournalpp/xournalpp-1.1.3-r2.ebuild b/app-text/xournalpp/xournalpp-1.1.3-r2.ebuild deleted file mode 100644 index 77d1e2514686..000000000000 --- a/app-text/xournalpp/xournalpp-1.1.3-r2.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2023 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 - 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" - "${FILESDIR}/${PN}-1.1.3-lua-5-4.patch" - "${FILESDIR}/${PN}-1.1.3-gcc13.patch" -) - -src_configure() { - local mycmakeargs=( - -DLUA_VERSION="$(lua_get_version)" - ) - - cmake_src_configure -}
