sci-electronics/kactus2: drop 3.12.0, 3.13.0, 3.13.1

- Drop old eclass and patches, fix 9999 ebuild

Signed-off-by: Huang Rui <vowstar@gmail.com>
This commit is contained in:
Huang Rui
2024-10-21 20:26:36 +08:00
parent 083b6fc697
commit 0d1939c861
8 changed files with 0 additions and 537 deletions

View File

@@ -1,4 +1 @@
DIST kactus2-3.12.0.tar.gz 28154387 BLAKE2B c8e0a982343d3a34f9186bca1778b68b4dfdcd977488751f90d9d5372df96c4f7349c90e15203f66778ee1be399e9e2ddb5342dffe1025754e44604c77c16684 SHA512 d7cef803314262c9fb0b77db88b5d7935203e1484965f475e954bceb1bc56a31ee9867fe1d73959d62a8454238480226df8fbd2d487442bce44fe7476de6d5bb
DIST kactus2-3.13.0.tar.gz 28682844 BLAKE2B 2dc6d6b1ed18d95cce38179c0538c4697c8b2f0de0984fedf0a0b757a7c6c9268e91b9cb09a99c2cdd1913344e928b8d3d665da292d7c47ddf983f92d28142f8 SHA512 750a318fa543f4feaf8176bc9b9bcf244ac3f97d130b6dbe5483e68e7ac30b146c5d9362cdebb4129b62a1fec89a4f3bcfb97822e45930ad05a699ab1ad2f8f5
DIST kactus2-3.13.1.tar.gz 28686011 BLAKE2B 2abe1d7f6abcfb97f41e293476c200e3d9ba31e32e2b34022d7bbb3007cd2a2c129c73b1414cc422fc7dbc6982636edcd4ad0dc89aff8d352b2e936583d08291 SHA512 9465da2448d54ae3c19aaf5d765b386dd997244ac8385c8e3fddde74807c30e37bdef4d7b56d1610c1c59a1ad10c7c13fe312b53b6263800c9142be7be558049
DIST kactus2-3.13.3.tar.gz 18195852 BLAKE2B 259e3753c088bbb6e91bf53c66fd32d52de9fe4d8c66452f866803c2560a16495c79ac74e3d47211a729dbcef0eedca9405000a09e6c94398cbf7f6c7d71e225 SHA512 902d43896e68f8f153c46a1f7945007dd24a22159093ca775976688c1dea37520d0d2b2a760cdec02f0684dbe90eec879dffde5f747bd9de178c14a6ce263330

View File

@@ -1,94 +0,0 @@
From d3e5af0dba523303708d30ceb8cd8339eabd4320 Mon Sep 17 00:00:00 2001
From: Huang Rui <vowstar@gmail.com>
Date: Tue, 17 Oct 2023 19:11:21 +0800
Subject: [PATCH] [CORRECTIVE] fix build PATH bugs about QT
- Path variables need to be enclosed in double quotes to prevent
accidents caused by spaces in the middle.
- createhelp also needs to do the same processing as configure
- Fixed build issues under gentoo and archlinux
Signed-off-by: Huang Rui <vowstar@gmail.com>
---
configure | 15 ++++++++++-----
createhelp | 25 ++++++++++++++++++++++++-
2 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/configure b/configure
index 82c7b9060..f74a23ee2 100755
--- a/configure
+++ b/configure
@@ -20,27 +20,32 @@ print_success() {
}
# Auto search QTBIN_PATH when empty and qmake already installed.
-if [ -z ${QTBIN_PATH} ]; then
+if [ -z "${QTBIN_PATH}" ]; then
if command -v qmake6 >/dev/null 2>&1; then
# Default to qmake6, which will exist on some linux distributions.
- QTBIN_PATH=$(qmake6 -query QT_INSTALL_BINS)/
+ QTBIN_PATH="$(qmake6 -query QT_INSTALL_BINS)/"
+ QTLIBEXEC_PATH="$(qmake6 -query QT_INSTALL_LIBEXECS)/"
elif command -v qmake >/dev/null 2>&1; then
# qmake exists on the vast majority of linux distributions.
- QTBIN_PATH=$(qmake -query QT_INSTALL_BINS)/
+ QTBIN_PATH="$(qmake -query QT_INSTALL_BINS)/"
+ QTLIBEXEC_PATH="$(qmake -query QT_INSTALL_LIBEXECS)/"
fi
fi
# Generate compressed help files.
echo "Generating compressed help files..."
if command -v ${QTBIN_PATH}qhelpgenerator >/dev/null 2>&1; then
- ${QTBIN_PATH}qhelpgenerator Help/kactus2help.qhcp -o Help/Kactus2Help.qhc
+ "${QTBIN_PATH}qhelpgenerator" Help/kactus2help.qhcp -o Help/Kactus2Help.qhc
+elif command -v ${QTLIBEXEC_PATH}qhelpgenerator >/dev/null 2>&1; then
+ # QT6 put qhelpgenerator at QTLIBEXEC_PATH
+ "${QTLIBEXEC_PATH}qhelpgenerator" Help/kactus2help.qhcp -o Help/Kactus2Help.qhc
else
echo "Qhelpgenerator not found. Please set variable QTBIN_PATH to Qt binary files."
fi
if command -v ${QTBIN_PATH}qmake >/dev/null 2>&1; then
echo "Running qmake..."
- ${QTBIN_PATH}qmake Kactus2_Solution.pro
+ "${QTBIN_PATH}qmake" Kactus2_Solution.pro
print_success
else
echo "Qmake not found. Please set variable QTBIN_PATH to Qt binary files."
diff --git a/createhelp b/createhelp
index 72299e655..522378331 100755
--- a/createhelp
+++ b/createhelp
@@ -1,7 +1,30 @@
#!/bin/sh
+# Change this to your Qt binaries directory.
+QTBIN_PATH=""
+
+# Auto search QTBIN_PATH when empty and qmake already installed.
+if [ -z "${QTBIN_PATH}" ]; then
+ if command -v qmake6 >/dev/null 2>&1; then
+ # Default to qmake6, which will exist on some linux distributions.
+ QTBIN_PATH="$(qmake6 -query QT_INSTALL_BINS)/"
+ QTLIBEXEC_PATH="$(qmake6 -query QT_INSTALL_LIBEXECS)/"
+ elif command -v qmake >/dev/null 2>&1; then
+ # qmake exists on the vast majority of linux distributions.
+ QTBIN_PATH="$(qmake -query QT_INSTALL_BINS)/"
+ QTLIBEXEC_PATH="$(qmake -query QT_INSTALL_LIBEXECS)/"
+ fi
+fi
+
if [ ! -f Help/Kactus2Help.qch ] || [ ! -f Help/Kactus2Help.qhc ]; then
- qhelpgenerator Help/kactus2help.qhp -o Help/Kactus2Help.qch
+ if command -v ${QTBIN_PATH}qhelpgenerator >/dev/null 2>&1; then
+ "${QTBIN_PATH}qhelpgenerator" Help/kactus2help.qhp -o Help/Kactus2Help.qch
+ elif command -v ${QTLIBEXEC_PATH}qhelpgenerator >/dev/null 2>&1; then
+ # QT6 put qhelpgenerator at QTLIBEXEC_PATH
+ "${QTLIBEXEC_PATH}qhelpgenerator" Help/kactus2help.qhp -o Help/Kactus2Help.qch
+ else
+ echo "Qhelpgenerator not found. Please set variable QTBIN_PATH to Qt binary files."
+ fi
fi
rm -R -f executable/Help

View File

@@ -1,117 +0,0 @@
From 1fd0d3cc8a3530a04491e736a673b9fc5092daeb Mon Sep 17 00:00:00 2001
From: Huang Rui <vowstar@gmail.com>
Date: Fri, 20 Oct 2023 23:41:51 +0800
Subject: [PATCH] [CORRECTIVE] add missing <QSharedPointer> include to fix
QT6.6.0 build
- add missing #include <QSharedPointer> to fix incomplete type about QSharedPointer
Closes: https://github.com/kactus2/kactus2dev/issues/85
Signed-off-by: Huang Rui <vowstar@gmail.com>
---
editors/HWDesign/undoCommands/HWComponentAddCommand.h | 5 +++--
.../SystemDesign/UndoCommands/ApiConnectionDeleteCommand.h | 3 ++-
.../SystemDesign/UndoCommands/ComConnectionDeleteCommand.h | 3 ++-
editors/SystemDesign/UndoCommands/SWInterfaceDeleteCommand.h | 3 ++-
.../SystemDesign/UndoCommands/SystemComponentDeleteCommand.h | 3 ++-
editors/SystemDesign/UndoCommands/SystemDeleteCommands.h | 3 ++-
6 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/editors/HWDesign/undoCommands/HWComponentAddCommand.h b/editors/HWDesign/undoCommands/HWComponentAddCommand.h
index fe53209d6..c131ada50 100644
--- a/editors/HWDesign/undoCommands/HWComponentAddCommand.h
+++ b/editors/HWDesign/undoCommands/HWComponentAddCommand.h
@@ -12,10 +12,11 @@
#ifndef HWCOMPONENTADDCOMMAND_H
#define HWCOMPONENTADDCOMMAND_H
-#include <QUndoCommand>
#include <QGraphicsScene>
-#include <QString>
#include <QObject>
+#include <QSharedPointer>
+#include <QString>
+#include <QUndoCommand>
class IGraphicsItemStack;
class ComponentItem;
diff --git a/editors/SystemDesign/UndoCommands/ApiConnectionDeleteCommand.h b/editors/SystemDesign/UndoCommands/ApiConnectionDeleteCommand.h
index 02aaea2c1..7173b9dd9 100644
--- a/editors/SystemDesign/UndoCommands/ApiConnectionDeleteCommand.h
+++ b/editors/SystemDesign/UndoCommands/ApiConnectionDeleteCommand.h
@@ -12,9 +12,10 @@
#ifndef APICONNECTIONDELETECOMMAND_H
#define APICONNECTIONDELETECOMMAND_H
-#include <QUndoCommand>
#include <QGraphicsScene>
#include <QObject>
+#include <QSharedPointer>
+#include <QUndoCommand>
class ApiGraphicsConnection;
diff --git a/editors/SystemDesign/UndoCommands/ComConnectionDeleteCommand.h b/editors/SystemDesign/UndoCommands/ComConnectionDeleteCommand.h
index 5e86dbdf1..e0676b2ca 100644
--- a/editors/SystemDesign/UndoCommands/ComConnectionDeleteCommand.h
+++ b/editors/SystemDesign/UndoCommands/ComConnectionDeleteCommand.h
@@ -12,9 +12,10 @@
#ifndef COMCONNECTIONDELETECOMMAND_H
#define COMCONNECTIONDELETECOMMAND_H
-#include <QUndoCommand>
#include <QGraphicsScene>
#include <QObject>
+#include <QSharedPointer>
+#include <QUndoCommand>
class ComGraphicsConnection;
diff --git a/editors/SystemDesign/UndoCommands/SWInterfaceDeleteCommand.h b/editors/SystemDesign/UndoCommands/SWInterfaceDeleteCommand.h
index d05d3750d..72a1128fd 100644
--- a/editors/SystemDesign/UndoCommands/SWInterfaceDeleteCommand.h
+++ b/editors/SystemDesign/UndoCommands/SWInterfaceDeleteCommand.h
@@ -12,9 +12,10 @@
#ifndef SWINTERFACEDELETECOMMAND_H
#define SWINTERFACEDELETECOMMAND_H
-#include <QUndoCommand>
#include <QGraphicsScene>
#include <QObject>
+#include <QSharedPointer>
+#include <QUndoCommand>
class IGraphicsItemStack;
class SWInterfaceItem;
diff --git a/editors/SystemDesign/UndoCommands/SystemComponentDeleteCommand.h b/editors/SystemDesign/UndoCommands/SystemComponentDeleteCommand.h
index 36abdda6f..ecfcef7db 100644
--- a/editors/SystemDesign/UndoCommands/SystemComponentDeleteCommand.h
+++ b/editors/SystemDesign/UndoCommands/SystemComponentDeleteCommand.h
@@ -12,9 +12,10 @@
#ifndef SYSTEMCOMPONENTDELETECOMMAND_H
#define SYSTEMCOMPONENTDELETECOMMAND_H
-#include <QUndoCommand>
#include <QGraphicsScene>
#include <QObject>
+#include <QSharedPointer>
+#include <QUndoCommand>
class ComponentItem;
class IGraphicsItemStack;
diff --git a/editors/SystemDesign/UndoCommands/SystemDeleteCommands.h b/editors/SystemDesign/UndoCommands/SystemDeleteCommands.h
index 7eb0ed694..a3c1748e6 100644
--- a/editors/SystemDesign/UndoCommands/SystemDeleteCommands.h
+++ b/editors/SystemDesign/UndoCommands/SystemDeleteCommands.h
@@ -12,9 +12,10 @@
#ifndef SYSTEMDELETECOMMANDS_H
#define SYSTEMDELETECOMMANDS_H
-#include <QUndoCommand>
#include <QGraphicsScene>
#include <QObject>
+#include <QSharedPointer>
+#include <QUndoCommand>
class GraphicsConnection;
class GraphicsColumnLayout;

View File

@@ -1,45 +0,0 @@
From d69c10931e17655f6d159e58a910a91c7fcd0a63 Mon Sep 17 00:00:00 2001
From: Huang Rui <vowstar@gmail.com>
Date: Sat, 9 Dec 2023 12:34:01 +0800
Subject: [PATCH] [CORRECTIVE] Fix incomplete QObject type in
FieldReferenceValidator
- Added missing #include <QObject> in FieldReferenceValidator.h
- Resolves compilation errors due to incomplete type 'QObject' used
in nested name specifier in various validator components
Signed-off-by: Huang Rui <vowstar@gmail.com>
---
IPXACTmodels/Component/validators/FieldReferenceValidator.h | 2 ++
IPXACTmodels/Component/validators/MemoryArrayValidator.h | 2 ++
2 files changed, 4 insertions(+)
diff --git a/IPXACTmodels/Component/validators/FieldReferenceValidator.h b/IPXACTmodels/Component/validators/FieldReferenceValidator.h
index 0beea5845..4cfcbcb8b 100644
--- a/IPXACTmodels/Component/validators/FieldReferenceValidator.h
+++ b/IPXACTmodels/Component/validators/FieldReferenceValidator.h
@@ -16,6 +16,8 @@
#include <IPXACTmodels/Component/FieldReference.h>
+#include <QObject>
+
namespace FieldReferenceValidator
{
/*!
diff --git a/IPXACTmodels/Component/validators/MemoryArrayValidator.h b/IPXACTmodels/Component/validators/MemoryArrayValidator.h
index b0f3e492f..c8ddc249e 100644
--- a/IPXACTmodels/Component/validators/MemoryArrayValidator.h
+++ b/IPXACTmodels/Component/validators/MemoryArrayValidator.h
@@ -16,6 +16,8 @@
#include <KactusAPI/include/SystemVerilogExpressionParser.h>
+#include <QObject>
+
class MemoryArray;
class IPXACTMODELS_EXPORT MemoryArrayValidator
--
2.43.0

View File

@@ -1,93 +0,0 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
PYTHON_COMPAT=( python3_{10..12} )
inherit python-r1 qmake-utils xdg
DESCRIPTION="A open source IP-XACT-based tool"
HOMEPAGE="
https://research.tuni.fi/system-on-chip/tools/
https://github.com/kactus2/kactus2dev
"
if [[ "${PV}" == "9999" ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/${PN}/${PN}dev.git"
else
SRC_URI="https://github.com/${PN}/${PN}dev/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
S="${WORKDIR}/${PN}dev-${PV}"
fi
LICENSE="GPL-2"
SLOT="0"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="
${PYTHON_DEPS}
dev-qt/qtbase:6=[cups,gui,network,opengl,widgets,xml]
dev-qt/qtsvg:6
"
DEPEND="
${RDEPEND}
"
BDEPEND="
dev-lang/swig
dev-qt/qttools:6[linguist,qdoc]
"
PATCHES=(
"${FILESDIR}"/${PN}-3.12.0-fix-createhelp.patch
"${FILESDIR}"/${PN}-3.12.0-fix-missing-qsharedpointer.patch
)
src_prepare() {
default
# Fix QA pre-stripped warnings, bug 781674
find . -type f -name \*.pro -exec sed -e '$a\\nCONFIG+=nostrip' -i '{}' + || die
# Fix bug 854081
python_setup
sed -e "s|PYTHON_CONFIG=.*|PYTHON_CONFIG=${EPYTHON}-config|" -i .qmake.conf || die
}
src_configure() {
default
# Fix bug 854075
# Fix bug 854078
eqmake6 Kactus2_Solution.pro
}
src_compile() {
default
python_compile() {
cp -TR "${S}/" "${BUILD_DIR}/" || die
# Fix bug 854081
python_setup
sed -e "s|PYTHON_CONFIG=.*|PYTHON_CONFIG=${EPYTHON}-config|" -i .qmake.conf || die
export PYTHON_C_FLAGS="$(python_get_CFLAGS)"
export PYTHON_LIBS="$(python_get_LIBS)"
pushd "PythonAPI" || die
eqmake6 PREFIX="$(python_get_library_path)"
emake
rm _pythonAPI.so || die
cp libPythonAPI.so.1.0.0 _pythonAPI.so || die
popd
}
python_foreach_impl run_in_build_dir python_compile
}
src_install() {
# Can't use default, set INSTALL_ROOT and workaround parallel install bug
emake -j1 INSTALL_ROOT="${D}" install
python_install() {
pushd "PythonAPI" || die
python_domodule _pythonAPI.so
python_domodule pythonAPI.py
popd
}
python_foreach_impl run_in_build_dir python_install
}

View File

@@ -1,92 +0,0 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
PYTHON_COMPAT=( python3_{10..12} )
inherit python-r1 qmake-utils xdg
DESCRIPTION="A open source IP-XACT-based tool"
HOMEPAGE="
https://research.tuni.fi/system-on-chip/tools/
https://github.com/kactus2/kactus2dev
"
if [[ "${PV}" == "9999" ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/${PN}/${PN}dev.git"
else
SRC_URI="https://github.com/${PN}/${PN}dev/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
S="${WORKDIR}/${PN}dev-${PV}"
fi
LICENSE="GPL-2"
SLOT="0"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="
${PYTHON_DEPS}
dev-qt/qtbase:6=[cups,gui,network,opengl,widgets,xml]
dev-qt/qtsvg:6
"
DEPEND="
${RDEPEND}
"
BDEPEND="
dev-lang/swig
dev-qt/qttools:6[linguist,qdoc]
"
PATCHES=(
"${FILESDIR}"/${PN}-3.13.0-fix-missing-qobject.patch
)
src_prepare() {
default
# Fix QA pre-stripped warnings, bug 781674
find . -type f -name \*.pro -exec sed -e '$a\\nCONFIG+=nostrip' -i '{}' + || die
# Fix bug 854081
python_setup
sed -e "s|PYTHON_CONFIG=.*|PYTHON_CONFIG=${EPYTHON}-config|" -i .qmake.conf || die
}
src_configure() {
default
# Fix bug 854075
# Fix bug 854078
eqmake6 Kactus2_Solution.pro
}
src_compile() {
default
python_compile() {
cp -TR "${S}/" "${BUILD_DIR}/" || die
# Fix bug 854081
python_setup
sed -e "s|PYTHON_CONFIG=.*|PYTHON_CONFIG=${EPYTHON}-config|" -i .qmake.conf || die
export PYTHON_C_FLAGS="$(python_get_CFLAGS)"
export PYTHON_LIBS="$(python_get_LIBS)"
pushd "PythonAPI" || die
eqmake6 PREFIX="$(python_get_library_path)"
emake
rm _pythonAPI.so || die
cp libPythonAPI.so.1.0.0 _pythonAPI.so || die
popd
}
python_foreach_impl run_in_build_dir python_compile
}
src_install() {
# Can't use default, set INSTALL_ROOT and workaround parallel install bug
emake -j1 INSTALL_ROOT="${D}" install
python_install() {
pushd "PythonAPI" || die
python_domodule _pythonAPI.so
python_domodule pythonAPI.py
popd
}
python_foreach_impl run_in_build_dir python_install
}

View File

@@ -1,88 +0,0 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
PYTHON_COMPAT=( python3_{10..12} )
inherit python-r1 qmake-utils xdg
DESCRIPTION="A open source IP-XACT-based tool"
HOMEPAGE="
https://research.tuni.fi/system-on-chip/tools/
https://github.com/kactus2/kactus2dev
"
if [[ "${PV}" == "9999" ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/${PN}/${PN}dev.git"
else
SRC_URI="https://github.com/${PN}/${PN}dev/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
S="${WORKDIR}/${PN}dev-${PV}"
fi
LICENSE="GPL-2"
SLOT="0"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="
${PYTHON_DEPS}
dev-qt/qtbase:6=[cups,gui,network,opengl,widgets,xml]
dev-qt/qtsvg:6
"
DEPEND="
${RDEPEND}
"
BDEPEND="
dev-lang/swig
dev-qt/qttools:6[linguist,qdoc]
"
src_prepare() {
default
# Fix QA pre-stripped warnings, bug 781674
find . -type f -name \*.pro -exec sed -e '$a\\nCONFIG+=nostrip' -i '{}' + || die
# Fix bug 854081
python_setup
sed -e "s|PYTHON_CONFIG=.*|PYTHON_CONFIG=${EPYTHON}-config|" -i .qmake.conf || die
}
src_configure() {
default
# Fix bug 854075
# Fix bug 854078
eqmake6 Kactus2_Solution.pro
}
src_compile() {
default
python_compile() {
cp -TR "${S}/" "${BUILD_DIR}/" || die
# Fix bug 854081
python_setup
sed -e "s|PYTHON_CONFIG=.*|PYTHON_CONFIG=${EPYTHON}-config|" -i .qmake.conf || die
export PYTHON_C_FLAGS="$(python_get_CFLAGS)"
export PYTHON_LIBS="$(python_get_LIBS)"
pushd "PythonAPI" || die
eqmake6 PREFIX="$(python_get_library_path)"
emake
rm _pythonAPI.so || die
cp libPythonAPI.so.1.0.0 _pythonAPI.so || die
popd
}
python_foreach_impl run_in_build_dir python_compile
}
src_install() {
# Can't use default, set INSTALL_ROOT and workaround parallel install bug
emake -j1 INSTALL_ROOT="${D}" install
python_install() {
pushd "PythonAPI" || die
python_domodule _pythonAPI.so
python_domodule pythonAPI.py
popd
}
python_foreach_impl run_in_build_dir python_install
}

View File

@@ -40,11 +40,6 @@ BDEPEND="
dev-qt/qttools:6[linguist,qdoc]
"
PATCHES=(
"${FILESDIR}"/${PN}-3.12.0-fix-createhelp.patch
"${FILESDIR}"/${PN}-3.12.0-fix-missing-qsharedpointer.patch
)
src_prepare() {
default
# Fix QA pre-stripped warnings, bug 781674