From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] New package: eric-ide-24.8
Date: Tue, 30 Jul 2024 11:23:44 +0200 [thread overview]
Message-ID: <20240730092344.C0CEB23951@inbox.vuxu.org> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-51523@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 701 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/Eloitor/void-packages eric
https://github.com/void-linux/void-packages/pull/51523
[WIP] New package: eric-ide-24.8
#### Testing the changes
- I tested the changes in this PR: **NO**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
I don't know why it doesn't launch.
A patch file from https://github.com/void-linux/void-packages/pull/51523.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-eric-51523.patch --]
[-- Type: text/x-diff, Size: 11886 bytes --]
From 9543e554bcc60538cd2f37e9e60a06c30d69e911 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Mon, 29 Jul 2024 13:08:31 +0200
Subject: [PATCH 1/5] New package: qscintilla-qt6-2.14.1
---
common/shlibs | 1 +
srcpkgs/qscintilla-qt6-devel | 1 +
srcpkgs/qscintilla-qt6/template | 66 +++++++++++++++++++++++++++++++++
srcpkgs/qscintilla-qt6/update | 2 +
4 files changed, 70 insertions(+)
create mode 120000 srcpkgs/qscintilla-qt6-devel
create mode 100644 srcpkgs/qscintilla-qt6/template
create mode 100644 srcpkgs/qscintilla-qt6/update
diff --git a/common/shlibs b/common/shlibs
index 5cfafa2be55b75..12436fd372718c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3032,6 +3032,7 @@ libCGAL.so.13 cgal-4.10_1
libCGAL_Core.so.13 cgal-4.10_1
libCGAL_ImageIO.so.14 cgal-4.14_1
libqscintilla2_qt5.so.15 qscintilla-qt5-2.11_1
+libqscintilla2_qt6.so.15 qscintilla-qt6-2.14.1_1
liblxpanel.so.0 lxpanel-0.9.3_1
libuim.so.8 uim-1.8.6_1
libuim-scm.so.0 uim-1.8.6_1
diff --git a/srcpkgs/qscintilla-qt6-devel b/srcpkgs/qscintilla-qt6-devel
new file mode 120000
index 00000000000000..7ee3295294b5a1
--- /dev/null
+++ b/srcpkgs/qscintilla-qt6-devel
@@ -0,0 +1 @@
+qscintilla-qt6
\ No newline at end of file
diff --git a/srcpkgs/qscintilla-qt6/template b/srcpkgs/qscintilla-qt6/template
new file mode 100644
index 00000000000000..19479f0f458f9f
--- /dev/null
+++ b/srcpkgs/qscintilla-qt6/template
@@ -0,0 +1,66 @@
+# Template file for 'qscintilla-qt6'
+# Keep synced with python3-pyqt6-qsci
+pkgname=qscintilla-qt6
+version=2.14.1
+revision=1
+build_wrksrc=src
+build_style=qmake
+hostmakedepends="qt6-base-devel pkg-config"
+makedepends="qt6-tools-devel"
+short_desc="Qt6 port of Neil Hodgson's Scintilla C++ editor class"
+maintainer="Eloi Torrents <eloitor@duck.com>"
+license="GPL-3.0-only"
+homepage="https://www.riverbankcomputing.com/software/qscintilla/intro"
+distfiles="https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_src-${version}.tar.gz"
+checksum=dfe13c6acc9d85dfcba76ccc8061e71a223957a6c02f3c343b30a9d43a4cdd4d
+
+post_configure() {
+ local _qt_arch
+ local qmake_args
+ if [ "$CROSS_BUILD" ]; then
+ case $XBPS_TARGET_MACHINE in
+ i686*) _qt_arch=i386;;
+ x86_64*) _qt_arch=x86_64;;
+ aarch64*) _qt_arch=arm64;;
+ arm*) _qt_arch=arm;;
+ mips*) _qt_arch=mips;;
+ ppc64*) _qt_arch=power64;;
+ ppc*) _qt_arch=power;;
+ esac
+ qmake_args="-qtconf ${wrksrc}/qt.conf
+ PKG_CONFIG_EXECUTABLE=${XBPS_WRAPPERDIR}/${PKG_CONFIG}"
+ fi
+ cd $wrksrc/designer
+ /usr/lib/qt6/bin/qmake \
+ ${qmake_args} \
+ PREFIX=/usr \
+ QT_INSTALL_PREFIX=/usr \
+ LIB=/usr/lib \
+ QMAKE_CC=$CC QMAKE_CXX=$CXX \
+ QMAKE_LINK=$CXX QMAKE_LINK_C=$CC \
+ QMAKE_CFLAGS="${CFLAGS} -I$wrksrc/src" \
+ QMAKE_CXXFLAGS="${CXXFLAGS} -I$wrksrc/src" \
+ QMAKE_LFLAGS="${LDFLAGS}" \
+ ${_qt_arch:+"QT_TARGET_ARCH=$_qt_arch"} \
+ CONFIG+=no_qt_rpath
+}
+
+post_build() {
+ make -C $wrksrc/designer ${makejobs} CC="$CC" CXX="$CXX" LINK="$CXX"
+}
+
+post_install() {
+ make -C $wrksrc/designer STRIP=true PREFIX=/usr DESTDIR=${DESTDIR} \
+ INSTALL_ROOT=${DESTDIR} install
+}
+
+qscintilla-qt6-devel_package() {
+ short_desc+=" - development files"
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/qt6/mkspecs
+ vmove usr/share/qt6/qsci/api
+ }
+}
diff --git a/srcpkgs/qscintilla-qt6/update b/srcpkgs/qscintilla-qt6/update
new file mode 100644
index 00000000000000..8ddafc0f70ad5a
--- /dev/null
+++ b/srcpkgs/qscintilla-qt6/update
@@ -0,0 +1,2 @@
+site="https://www.riverbankcomputing.com/software/qscintilla/download"
+pattern='QScintilla[_a-zA-Z]*-\K[\d.]+(?=.tar.gz)'
From f98c3bb59b0ddfa146222714e96b877c1fbeacbc Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Mon, 29 Jul 2024 13:22:12 +0200
Subject: [PATCH 2/5] New package: python3-pyqt6-qsci-2.14.1
---
srcpkgs/python3-pyqt6-qsci-devel | 1 +
srcpkgs/python3-pyqt6-qsci/template | 38 +++++++++++++++++++++++++++++
srcpkgs/python3-pyqt6-qsci/update | 2 ++
3 files changed, 41 insertions(+)
create mode 120000 srcpkgs/python3-pyqt6-qsci-devel
create mode 100644 srcpkgs/python3-pyqt6-qsci/template
create mode 100644 srcpkgs/python3-pyqt6-qsci/update
diff --git a/srcpkgs/python3-pyqt6-qsci-devel b/srcpkgs/python3-pyqt6-qsci-devel
new file mode 120000
index 00000000000000..a70f9fccd39f6d
--- /dev/null
+++ b/srcpkgs/python3-pyqt6-qsci-devel
@@ -0,0 +1 @@
+python3-pyqt6-qsci
\ No newline at end of file
diff --git a/srcpkgs/python3-pyqt6-qsci/template b/srcpkgs/python3-pyqt6-qsci/template
new file mode 100644
index 00000000000000..d245c0e3ab8949
--- /dev/null
+++ b/srcpkgs/python3-pyqt6-qsci/template
@@ -0,0 +1,38 @@
+# Template file for 'python3-pyqt6-qsci'
+# XXX Keep in sync with qscintilla-qt6
+# Splited because pyqt6-qsci requires qscintilla-qt6 built at configure time.
+pkgname=python3-pyqt6-qsci
+version=2.14.1
+revision=1
+build_wrksrc=Python
+build_style=sip-build
+build_helper=qemu
+hostmakedepends="qt6-base-devel qscintilla-qt6-devel python3-PyQt-builder
+ python3-pyqt6-tools-devel python3-pyqt6-printsupport-devel pkg-config"
+makedepends="qscintilla-qt6-devel qt6-tools-devel python3-devel"
+depends="python3-pyqt6"
+short_desc="Qt6 port of Scintilla editor - Python 3 binding"
+maintainer="Eloi Torrents <eloitor@duck.com>"
+license="GPL-3.0-only"
+homepage="https://www.riverbankcomputing.com/software/qscintilla/intro"
+distfiles="https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_src-${version}.tar.gz"
+checksum=dfe13c6acc9d85dfcba76ccc8061e71a223957a6c02f3c343b30a9d43a4cdd4d
+lib32disabled=yes
+
+CXXFLAGS="$(printf " -I$XBPS_CROSS_BASE/usr/include/qt6/%s" \
+ QtWidgets QtPrintSupport)"
+
+post_extract() {
+ rm -rf src
+ ln -sf pyproject-qt6.toml Python/pyproject.toml
+}
+
+python3-pyqt6-qsci-devel_package() {
+ lib32disabled=yes
+ short_desc+=" - development files"
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove ${py3_sitelib}/PyQt6/bindings
+ vmove usr/share/qt6/qsci/api
+ }
+}
diff --git a/srcpkgs/python3-pyqt6-qsci/update b/srcpkgs/python3-pyqt6-qsci/update
new file mode 100644
index 00000000000000..8ddafc0f70ad5a
--- /dev/null
+++ b/srcpkgs/python3-pyqt6-qsci/update
@@ -0,0 +1,2 @@
+site="https://www.riverbankcomputing.com/software/qscintilla/download"
+pattern='QScintilla[_a-zA-Z]*-\K[\d.]+(?=.tar.gz)'
From c6e69461f1aff51d5d9d0c03faf3b4e9061bb2e7 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Mon, 29 Jul 2024 13:46:01 +0200
Subject: [PATCH 3/5] New package: python3-editorconfig-0.12.4
---
srcpkgs/python3-editorconfig/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/python3-editorconfig/template
diff --git a/srcpkgs/python3-editorconfig/template b/srcpkgs/python3-editorconfig/template
new file mode 100644
index 00000000000000..7145da29b603c7
--- /dev/null
+++ b/srcpkgs/python3-editorconfig/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-editorconfig'
+pkgname=python3-editorconfig
+version=0.12.4
+revision=1
+build_style=python3-pep517
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends="python3-setuptools"
+short_desc="EditorConfig File Locator and Interpreter for Python"
+maintainer="Eloi Torrents <eloitor@duck.com>"
+license="PSF"
+homepage="https://github.com/editorconfig/editorconfig-core-py"
+distfiles="${PYPI_SITE}/E/EditorConfig/EditorConfig-${version}.tar.gz"
+checksum=24857fa1793917dd9ccf0c7810a07e05404ce9b823521c7dce22a4fb5d125f80
+
+post_install() {
+ mv "${DESTDIR}/usr/bin/editorconfig" "${DESTDIR}/usr/bin/editorconfig-py"
+}
From 23dd0cbc5df7948640aaa074a5294f88db9c2dcc Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Mon, 29 Jul 2024 13:46:08 +0200
Subject: [PATCH 4/5] New package: eric-ide-24.8
---
srcpkgs/eric-ide/template | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 srcpkgs/eric-ide/template
diff --git a/srcpkgs/eric-ide/template b/srcpkgs/eric-ide/template
new file mode 100644
index 00000000000000..b36f2534ff3975
--- /dev/null
+++ b/srcpkgs/eric-ide/template
@@ -0,0 +1,21 @@
+# Template file for 'eric-ide'
+pkgname=eric-ide
+version=24.8
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3-pyqt6 python3-pyqt6-charts python3-pyqt6-webengine
+ python3-pyqt6-qsci python3-docutils python3-Markdown python3-esprima
+ python3-yaml python3-tomlkit python3-chardet python3-asttokens
+ python3-editorconfig python3-Pygments python3-parso python3-jedi
+ python3-trove-classifiers black python3-isort
+ python3-coverage python3-semver python3-watchdog python3-psutil
+ python3-fido2 python3-pyqt6-serialport python3-pyqt6-websockets
+ python3-pyqt6-sip python3-pyqt6-webchannel"
+short_desc="Full-featured Python and Ruby IDE in PyQt"
+maintainer="Eloi Torrents <eloitor@duck.com>"
+license="GPL-3.0-or-later"
+homepage="https://eric-ide.python-projects.org/"
+changelog="https://eric-ide.python-projects.org/eric-news.html"
+distfiles="${PYPI_SITE}/e/eric-ide/eric_ide-${version}.tar.gz"
+checksum=a1aaedd4d3a0147571ac400aebc8b94238447b92ae8a3e4786faee8e671897d3
From a9295c3c727b998df12b512e0bfedc4c3304e842 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<sgn.danh@gmail.com>
Date: Tue, 30 Jul 2024 16:23:41 +0700
Subject: [PATCH 5/5] Apply suggestions from code review
---
srcpkgs/eric-ide/template | 4 ++--
srcpkgs/python3-editorconfig/template | 2 +-
srcpkgs/qscintilla-qt6/template | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/eric-ide/template b/srcpkgs/eric-ide/template
index b36f2534ff3975..8d945db9755149 100644
--- a/srcpkgs/eric-ide/template
+++ b/srcpkgs/eric-ide/template
@@ -6,10 +6,10 @@ build_style=python3-pep517
hostmakedepends="python3-setuptools python3-wheel"
depends="python3-pyqt6 python3-pyqt6-charts python3-pyqt6-webengine
python3-pyqt6-qsci python3-docutils python3-Markdown python3-esprima
- python3-yaml python3-tomlkit python3-chardet python3-asttokens
+ python3-yaml python3-tomlkit python3-chardet python3-asttokens
python3-editorconfig python3-Pygments python3-parso python3-jedi
python3-trove-classifiers black python3-isort
- python3-coverage python3-semver python3-watchdog python3-psutil
+ python3-coverage python3-semver python3-watchdog python3-psutil
python3-fido2 python3-pyqt6-serialport python3-pyqt6-websockets
python3-pyqt6-sip python3-pyqt6-webchannel"
short_desc="Full-featured Python and Ruby IDE in PyQt"
diff --git a/srcpkgs/python3-editorconfig/template b/srcpkgs/python3-editorconfig/template
index 7145da29b603c7..4bf4d441a5ccbb 100644
--- a/srcpkgs/python3-editorconfig/template
+++ b/srcpkgs/python3-editorconfig/template
@@ -7,7 +7,7 @@ build_style=python3-pep517
hostmakedepends="python3-setuptools"
short_desc="EditorConfig File Locator and Interpreter for Python"
maintainer="Eloi Torrents <eloitor@duck.com>"
-license="PSF"
+license="Python-2.0.1"
homepage="https://github.com/editorconfig/editorconfig-core-py"
distfiles="${PYPI_SITE}/E/EditorConfig/EditorConfig-${version}.tar.gz"
checksum=24857fa1793917dd9ccf0c7810a07e05404ce9b823521c7dce22a4fb5d125f80
diff --git a/srcpkgs/qscintilla-qt6/template b/srcpkgs/qscintilla-qt6/template
index 19479f0f458f9f..0fb43b65e77289 100644
--- a/srcpkgs/qscintilla-qt6/template
+++ b/srcpkgs/qscintilla-qt6/template
@@ -27,7 +27,7 @@ post_configure() {
ppc64*) _qt_arch=power64;;
ppc*) _qt_arch=power;;
esac
- qmake_args="-qtconf ${wrksrc}/qt.conf
+ qmake_args="-qtconf ${wrksrc}/src/qt.conf
PKG_CONFIG_EXECUTABLE=${XBPS_WRAPPERDIR}/${PKG_CONFIG}"
fi
cd $wrksrc/designer
next prev parent reply other threads:[~2024-07-30 9:23 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-29 8:47 [PR PATCH] [WIP] Eric Eloitor
2024-07-29 9:21 ` [PR PATCH] [Updated] " Eloitor
2024-07-29 15:16 ` Eloitor
2024-07-29 15:48 ` Eloitor
2024-07-29 19:05 ` Eloitor
2024-07-29 21:27 ` Eloitor
2024-07-29 21:38 ` Eloitor
2024-07-29 21:47 ` [PR PATCH] [Updated] " Eloitor
2024-07-30 7:03 ` Eloitor
2024-07-30 7:11 ` Eloitor
2024-07-30 8:11 ` [PR PATCH] [Updated] [WIP] New package: eric-ide-24.8 Eloitor
2024-07-30 8:30 ` Eloitor
2024-07-30 8:32 ` Eloitor
2024-07-30 9:23 ` [PR REVIEW] " sgn
2024-07-30 9:23 ` sgn
2024-07-30 9:23 ` sgn
2024-07-30 9:23 ` sgn
2024-07-30 9:23 ` sgn [this message]
2024-07-30 18:47 ` Eloitor
2024-07-30 18:48 ` Eloitor
2024-07-30 20:25 ` Eloitor
2024-07-31 0:37 ` sgn
2024-07-31 0:47 ` sgn
2024-07-31 9:58 ` [PR PATCH] [Updated] " Eloitor
2024-07-31 10:01 ` Eloitor
2024-07-31 10:03 ` Eloitor
2024-10-30 2:00 ` github-actions
2024-10-30 8:03 ` sgn
2024-10-30 10:31 ` Eloitor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240730092344.C0CEB23951@inbox.vuxu.org \
--to=sgn@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).