Compare commits

...

3 commits

5 changed files with 17 additions and 47 deletions

View file

@ -1,4 +1 @@
AUX texworks-0.6.5-cmake_lua_version.patch 219 BLAKE2B c09494099363fa26e4110c23b0e1c06caf44cb0040578bfa33457741fdc8fe4698a2f4000a6dc6da4cd19dca6039c251cd1b875a27dc41abfea03b5cb79c341a SHA512 66ccbbcf313596c674833b36f222c8aa8bde541dfd58a706814aef3eaeec50247bec954a4f7137dfda31df9cd7b15163200592acb8433ed252d961ebf2b9ea32 DIST texworks-0.6.9.tar.gz 12505487 BLAKE2B 7d1fbce67a666a7b99e093dab2e034d96a847e67a8f3c0015e34f2691d5d306bb398b1b8ddaecf8003a339a0c2e7fe946097438e0db81932f0cca597225d905c SHA512 54677205e7767f377fa66be6b2c43bec2d3c3981ea1a24eb11f45608c1cb3ddc98852c43611680273601eb8e8ae4a6095c9b9a9338ee69ef0475a43f2191551e
AUX texworks-0.6.8-optional-qtscript.patch 1038 BLAKE2B 43f130632a1ea3d815e28b427eacfcfac5967233238d7b2ef271b9288f3c4f9d8492679edfd3a50a585303d02d26ced97ed36c56610223af7bf273ab3212d548 SHA512 badc300f48886c596155f10638c9929ab4093ee63d1efdba760674cef8fbe0c5a91164adca843e7f2957dc05a89d37bad440d527034cf4ea709238aa1a68cef1
DIST texworks-0.6.8.tar.gz 12486607 BLAKE2B a7de78adc0746c57b721a400a704d3912574933604e01124a99f5a60ba377ba66ce8d57f5f0a87e336de715d981146db6b8ae61a78c744b385c698fcdad2f7fe SHA512 23164f9ab2f611a705b533f4c435891f1279d1e0e0de2d7f947864f8919a6513cb696881dc1dcf93345471599f113d264ced57cbd2dceae343b9dde46ee80482
EBUILD texworks-0.6.8.ebuild 1807 BLAKE2B c9677b88df568d3b93cb0c5f50df865a7cbdc66fe0ecfe29460bd935aac645a860ca4c59f63fee930a8df850aea63b923162d422c4337245907a335e4fe17978 SHA512 aef2c00456b7f6d129f3794eff7c739c88c3b1af2823b80792092d5c2004a041419b40743126504d90ba187bbcf951f61dae3250a8e30bb53cc393533547a4c7

View file

@ -1,25 +0,0 @@
It doesn't work like that.
--- a/CMakeLists.txt 2023-02-18 11:42:11.000000000 +0100
+++ b/CMakeLists.txt 2023-10-21 20:00:29.144638825 +0200
@@ -281,9 +281,11 @@
set(QT_VERSION_PATCH "${Qt6_VERSION_PATCH}")
else ()
# Check for Qt5
- find_package(Qt5 REQUIRED COMPONENTS Core Widgets Gui UiTools Concurrent Xml LinguistTools Qml OPTIONAL_COMPONENTS Script ScriptTools)
+ find_package(Qt5 REQUIRED COMPONENTS Core Widgets Gui UiTools Concurrent Xml LinguistTools Qml)
set(QT_LIBRARIES Qt5::Core Qt5::Widgets Qt5::Gui Qt5::UiTools Qt5::Concurrent Qt5::Xml Qt5::Qml)
+ find_package(Qt5Script)
+ find_package(Qt5ScriptTools)
if (Qt5Script_FOUND AND Qt5ScriptTools_FOUND)
list(APPEND QT_LIBRARIES Qt5::ScriptTools Qt5::Script)
set(WITH_QTSCRIPT ON)
@@ -311,7 +313,6 @@
set(QT_VERSION_MAJOR "${Qt5_VERSION_MAJOR}")
set(QT_VERSION_MINOR "${Qt5_VERSION_MINOR}")
set(QT_VERSION_PATCH "${Qt5_VERSION_PATCH}")
- set(WITH_QTSCRIPT ON)
endif ()
# Expose the major version number of Qt to the preprocessor. This is necessary

View file

@ -4,7 +4,7 @@
EAPI=8 EAPI=8
LUA_COMPAT=( lua5-{1..3} ) LUA_COMPAT=( lua5-{1..3} )
PYTHON_COMPAT=( python3_{9..12} ) PYTHON_COMPAT=( python3_{9..13} python3_13t )
CMAKE_REMOVE_MODULES_LIST=( FindLua ) CMAKE_REMOVE_MODULES_LIST=( FindLua )
inherit lua-single python-single-r1 cmake xdg inherit lua-single python-single-r1 cmake xdg
@ -17,7 +17,7 @@ LICENSE="GPL-2"
SLOT="0" SLOT="0"
KEYWORDS="amd64 ~riscv x86" KEYWORDS="amd64 ~riscv x86"
IUSE="lua python test" IUSE="lua python test"
RESTRICT="!test? ( test )" RESTRICT="!test? ( test ) mirror"
REQUIRED_USE=" REQUIRED_USE="
lua? ( ${LUA_REQUIRED_USE} ) lua? ( ${LUA_REQUIRED_USE} )
@ -26,30 +26,29 @@ REQUIRED_USE="
RDEPEND=" RDEPEND="
app-text/hunspell:= app-text/hunspell:=
app-text/poppler[qt5] app-text/poppler[qt6]
dev-qt/designer:5 dev-qt/designer:6
dev-qt/qtcore:5 dev-qt/qtcore:6
dev-qt/qtconcurrent:5 dev-qt/qtconcurrent:6
dev-qt/qtdeclarative:5 dev-qt/qtdeclarative:6
dev-qt/qtdbus:5 dev-qt/qtdbus:6
dev-qt/qtdeclarative:5 dev-qt/qtdeclarative:6
dev-qt/qtgui:5 dev-qt/qtgui:6
dev-qt/qtwidgets:5 dev-qt/qtwidgets:6
sys-libs/zlib sys-libs/zlib
lua? ( ${LUA_DEPS} ) lua? ( ${LUA_DEPS} )
python? ( ${PYTHON_DEPS} ) python? ( ${PYTHON_DEPS} )
" "
DEPEND="${RDEPEND} DEPEND="${RDEPEND}
test? ( dev-qt/qttest:5 ) test? ( dev-qt/qttest:6 )
" "
BDEPEND=" BDEPEND="
dev-qt/linguist-tools:5 dev-qt/linguist-tools:6
virtual/pkgconfig virtual/pkgconfig
" "
PATCHES=( PATCHES=(
"${FILESDIR}"/${PN}-0.6.5-cmake_lua_version.patch "${FILESDIR}"/${PN}-0.6.5-cmake_lua_version.patch
"${FILESDIR}"/${P}-optional-qtscript.patch
) )
pkg_setup() { pkg_setup() {
@ -61,8 +60,6 @@ pkg_setup() {
src_configure() { src_configure() {
local mycmakeargs=( local mycmakeargs=(
-Wno-dev -Wno-dev
-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Script=ON
-DCMAKE_DISABLE_FIND_PACKAGE_Qt5ScriptTools=ON
-DPREFER_BUNDLED_SYNCTEX=ON -DPREFER_BUNDLED_SYNCTEX=ON
-DWITH_LUA=$(usex lua) -DWITH_LUA=$(usex lua)
-DWITH_PYTHON=$(usex python) -DWITH_PYTHON=$(usex python)

View file

@ -1,3 +1 @@
DIST scq-2.0.1.tar.gz 9581 BLAKE2B 373e0dfd84b74c5744c8f879bcdbf2e6d24cd8278f2fcc86bb8219581702f116598132b1ad1d0a98e80821ea9d9a67404c8b0f6bd0fb4534e39c1141379b732c SHA512 c8cc51d14a4dcaa00ca36d939ad730a5fb49623b1f462ca9c769a48a7c277e8286cf650029e4d2bce426f46747b12bf341fba5a8972e54d2f9285a498a7361c4 DIST scq-2.0.1.tar.gz 9581 BLAKE2B 373e0dfd84b74c5744c8f879bcdbf2e6d24cd8278f2fcc86bb8219581702f116598132b1ad1d0a98e80821ea9d9a67404c8b0f6bd0fb4534e39c1141379b732c SHA512 c8cc51d14a4dcaa00ca36d939ad730a5fb49623b1f462ca9c769a48a7c277e8286cf650029e4d2bce426f46747b12bf341fba5a8972e54d2f9285a498a7361c4
EBUILD scq-2.0.1.ebuild 557 BLAKE2B c2f91a7a8fc2f32d0e1f6077bd43660d6425de80a58e9d34877030d1abe4e2e13ac5351dd774dc07e22c1f4ffddb536ebd6e838f7e71aea5ee79fe3eb538964a SHA512 3b85f1d16835b29346171468a861cb1fbca587a1dafa9a1ac4181da9f60b7e90833f591af8f90b998e32e5b461bc4374f505a0413db9ed8cda4c6df106586a20
MISC metadata.xml 301 BLAKE2B 0e4315292de07a135166e9de893a41e647836b8fff455159b366ff98b1020def269ed2f5f9f72876c604fe63874ee3cac3fa400e3e000a9f9098b75fd518e508 SHA512 a34975d941d8184aae62e0427152f56a57b1e12ff17baaa00d3710246edd758bbf56bd48a67a6e135d2db32506d9aa2c5b4dd6fa8ef89d3e0e2c47dc12127c92

3
metadata/layout.conf Normal file
View file

@ -0,0 +1,3 @@
masters = gentoo
thin-manifests = true
sign-manifests = false