commit: 92eb2acc80acbdc7874a07fea529201047ea9dee Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Apr 10 03:37:19 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Apr 10 03:37:19 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92eb2acc
app-text/xournalpp: support Lua 5.4, fix build w/ gcc 13 Bug: https://bugs.gentoo.org/854615 Closes: https://bugs.gentoo.org/894720 Closes: https://bugs.gentoo.org/895536 Signed-off-by: Sam James <sam <AT> gentoo.org> app-text/xournalpp/files/xournalpp-1.1.3-gcc13.patch | 12 ++++++++++++ app-text/xournalpp/files/xournalpp-1.1.3-lua-5-4.patch | 14 ++++++++++++++ .../{xournalpp-9999.ebuild => xournalpp-1.1.3-r1.ebuild} | 15 ++++++++++++--- app-text/xournalpp/xournalpp-9999.ebuild | 15 ++++++++++++--- 4 files changed, 50 insertions(+), 6 deletions(-) diff --git a/app-text/xournalpp/files/xournalpp-1.1.3-gcc13.patch b/app-text/xournalpp/files/xournalpp-1.1.3-gcc13.patch new file mode 100644 index 000000000000..97f7fbc0d7f2 --- /dev/null +++ b/app-text/xournalpp/files/xournalpp-1.1.3-gcc13.patch @@ -0,0 +1,12 @@ +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 new file mode 100644 index 000000000000..c53b63588c43 --- /dev/null +++ b/app-text/xournalpp/files/xournalpp-1.1.3-lua-5-4.patch @@ -0,0 +1,14 @@ +--- 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-9999.ebuild b/app-text/xournalpp/xournalpp-1.1.3-r1.ebuild similarity index 79% copy from app-text/xournalpp/xournalpp-9999.ebuild copy to app-text/xournalpp/xournalpp-1.1.3-r1.ebuild index a1105db47c04..3e95f5804d98 100644 --- a/app-text/xournalpp/xournalpp-9999.ebuild +++ b/app-text/xournalpp/xournalpp-1.1.3-r1.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# 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 ) +LUA_COMPAT=( lua5-3 lua5-4 ) inherit cmake lua-single xdg if [[ ${PV} == *9999 ]]; then @@ -46,4 +45,14 @@ 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" ) + +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 a1105db47c04..3e95f5804d98 100644 --- a/app-text/xournalpp/xournalpp-9999.ebuild +++ b/app-text/xournalpp/xournalpp-9999.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# 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 ) +LUA_COMPAT=( lua5-3 lua5-4 ) inherit cmake lua-single xdg if [[ ${PV} == *9999 ]]; then @@ -46,4 +45,14 @@ 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" ) + +src_configure() { + local mycmakeargs=( + -DLUA_VERSION="$(lua_get_version)" + ) + + cmake_src_configure +}
