From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EDE6215ACFB for ; Mon, 10 Apr 2023 03:38:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 36CBCE084F; Mon, 10 Apr 2023 03:38:49 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1D402E084F for ; Mon, 10 Apr 2023 03:38:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E3E9B340EE6 for ; Mon, 10 Apr 2023 03:38:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 948FE9F7 for ; Mon, 10 Apr 2023 03:38:45 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1681097839.92eb2acc80acbdc7874a07fea529201047ea9dee.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/xournalpp/files/, app-text/xournalpp/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/xournalpp/files/xournalpp-1.1.3-gcc13.patch app-text/xournalpp/files/xournalpp-1.1.3-lua-5-4.patch app-text/xournalpp/xournalpp-1.1.3-r1.ebuild app-text/xournalpp/xournalpp-9999.ebuild X-VCS-Directories: app-text/xournalpp/ app-text/xournalpp/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 92eb2acc80acbdc7874a07fea529201047ea9dee X-VCS-Branch: master Date: Mon, 10 Apr 2023 03:38:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 548e6d6b-eeb8-4837-9a5d-0483f8657708 X-Archives-Hash: 901bbb43256b4362cd3b903541e463a8 commit: 92eb2acc80acbdc7874a07fea529201047ea9dee Author: Sam James gentoo org> AuthorDate: Mon Apr 10 03:37:19 2023 +0000 Commit: Sam James gentoo 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 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 + #include + #include + 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 +}