* [PR PATCH] [WIP] Eric
@ 2024-07-29 8:47 Eloitor
2024-07-29 9:21 ` [PR PATCH] [Updated] " Eloitor
` (27 more replies)
0 siblings, 28 replies; 29+ messages in thread
From: Eloitor @ 2024-07-29 8:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 678 bytes --]
There is a new pull request by Eloitor against master on the void-packages repository
https://github.com/Eloitor/void-packages eric
https://github.com/void-linux/void-packages/pull/51523
[WIP] Eric
#### 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: 9010 bytes --]
From c37c2fe7e9245eed76217bc0767a34ad6295ac80 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/4] New package: qscintilla-qt6-2.14.1
---
common/shlibs | 1 +
srcpkgs/qscintilla-qt6-devel | 1 +
srcpkgs/qscintilla-qt6/template | 67 +++++++++++++++++++++++++++++++++
srcpkgs/qscintilla-qt6/update | 2 +
4 files changed, 71 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 7bc84e629277b2..eae4758d1a95df 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3036,6 +3036,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..2a709e26abc442
--- /dev/null
+++ b/srcpkgs/qscintilla-qt6/template
@@ -0,0 +1,67 @@
+# Template file for 'qscintilla-qt6'
+# Keep synced with python3-pyqt6-qsci
+pkgname=qscintilla-qt6
+version=2.14.1
+revision=1
+wrksrc="QScintilla_src-${version}"
+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 905e3f05cd7221e76fa5ed428acbe529f7aa453e 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/4] New package: python3-pyqt6-qsci-2.14.1
---
srcpkgs/python3-pyqt6-qsci-devel | 1 +
srcpkgs/python3-pyqt6-qsci/template | 39 +++++++++++++++++++++++++++++
srcpkgs/python3-pyqt6-qsci/update | 2 ++
3 files changed, 42 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..c04621a6a17ef7
--- /dev/null
+++ b/srcpkgs/python3-pyqt6-qsci/template
@@ -0,0 +1,39 @@
+# 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
+wrksrc=QScintilla_src-$version
+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 4b13474b553e51a04d5edc7ec8e04d59a1d2c65e 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/4] New package: python3-editorconfig-0.12.4
---
srcpkgs/python3-editorconfig/template | 13 +++++++++++++
1 file changed, 13 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..ec47c6eaf7910d
--- /dev/null
+++ b/srcpkgs/python3-editorconfig/template
@@ -0,0 +1,13 @@
+# 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
From 76d108b4dba9acca6a81773f5d00f47c1e3d0e6c 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/4] New package: eric-24.7.1
---
srcpkgs/eric/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/eric/template
diff --git a/srcpkgs/eric/template b/srcpkgs/eric/template
new file mode 100644
index 00000000000000..7771707d76901b
--- /dev/null
+++ b/srcpkgs/eric/template
@@ -0,0 +1,17 @@
+# Template file for 'eric'
+pkgname=eric
+version=24.7.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="black python3-asttokens python3-coverage python3-editorconfig
+ python3-isort python3-pyqt6-charts python3-pyqt6-webengine python3-pyqt6-qsci
+ python3-semver python3-tomlkit qt6-serialport qt6-svg qt6-tools qt6-websockets
+ watchdog"
+short_desc="Full-featured Python and Ruby IDE in PyQt"
+maintainer="Eloi Torrents <eloitor@disroot.org>"
+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=10d9754043e19481b43635334b4cce243b41e13364bf24d5a816968587dcee0f
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] Eric
2024-07-29 8:47 [PR PATCH] [WIP] Eric Eloitor
@ 2024-07-29 9:21 ` Eloitor
2024-07-29 15:16 ` Eloitor
` (26 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: Eloitor @ 2024-07-29 9:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 683 bytes --]
There is an updated pull request by Eloitor against master on the void-packages repository
https://github.com/Eloitor/void-packages eric
https://github.com/void-linux/void-packages/pull/51523
[WIP] Eric
#### 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: 9052 bytes --]
From c37c2fe7e9245eed76217bc0767a34ad6295ac80 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/4] New package: qscintilla-qt6-2.14.1
---
common/shlibs | 1 +
srcpkgs/qscintilla-qt6-devel | 1 +
srcpkgs/qscintilla-qt6/template | 67 +++++++++++++++++++++++++++++++++
srcpkgs/qscintilla-qt6/update | 2 +
4 files changed, 71 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 7bc84e629277b2..eae4758d1a95df 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3036,6 +3036,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..2a709e26abc442
--- /dev/null
+++ b/srcpkgs/qscintilla-qt6/template
@@ -0,0 +1,67 @@
+# Template file for 'qscintilla-qt6'
+# Keep synced with python3-pyqt6-qsci
+pkgname=qscintilla-qt6
+version=2.14.1
+revision=1
+wrksrc="QScintilla_src-${version}"
+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 905e3f05cd7221e76fa5ed428acbe529f7aa453e 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/4] New package: python3-pyqt6-qsci-2.14.1
---
srcpkgs/python3-pyqt6-qsci-devel | 1 +
srcpkgs/python3-pyqt6-qsci/template | 39 +++++++++++++++++++++++++++++
srcpkgs/python3-pyqt6-qsci/update | 2 ++
3 files changed, 42 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..c04621a6a17ef7
--- /dev/null
+++ b/srcpkgs/python3-pyqt6-qsci/template
@@ -0,0 +1,39 @@
+# 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
+wrksrc=QScintilla_src-$version
+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 4b13474b553e51a04d5edc7ec8e04d59a1d2c65e 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/4] New package: python3-editorconfig-0.12.4
---
srcpkgs/python3-editorconfig/template | 13 +++++++++++++
1 file changed, 13 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..ec47c6eaf7910d
--- /dev/null
+++ b/srcpkgs/python3-editorconfig/template
@@ -0,0 +1,13 @@
+# 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
From c2c573d3ed27c8d0d10d5231618ddb20f673ecc3 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/4] New package: eric-24.7.1
---
srcpkgs/eric/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/eric/template
diff --git a/srcpkgs/eric/template b/srcpkgs/eric/template
new file mode 100644
index 00000000000000..65266b92703467
--- /dev/null
+++ b/srcpkgs/eric/template
@@ -0,0 +1,17 @@
+# Template file for 'eric'
+pkgname=eric
+version=24.7.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="black python3-asttokens python3-coverage python3-editorconfig
+ python3-esprima python3-isort python3-pyqt6-charts python3-pyqt6-webengine
+ python3-pyqt6-qsci python3-semver python3-tomlkit python3-trove-classifiers
+ qt6-serialport qt6-svg qt6-tools qt6-websockets watchdog"
+short_desc="Full-featured Python and Ruby IDE in PyQt"
+maintainer="Eloi Torrents <eloitor@disroot.org>"
+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=10d9754043e19481b43635334b4cce243b41e13364bf24d5a816968587dcee0f
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] Eric
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
` (25 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: Eloitor @ 2024-07-29 15:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 683 bytes --]
There is an updated pull request by Eloitor against master on the void-packages repository
https://github.com/Eloitor/void-packages eric
https://github.com/void-linux/void-packages/pull/51523
[WIP] Eric
#### 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: 9462 bytes --]
From 70d9600a9048d657403b1a0a37580f978b47ac0a 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/4] New package: qscintilla-qt6-2.14.1
---
common/shlibs | 1 +
srcpkgs/qscintilla-qt6-devel | 1 +
srcpkgs/qscintilla-qt6/template | 67 +++++++++++++++++++++++++++++++++
srcpkgs/qscintilla-qt6/update | 2 +
4 files changed, 71 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..2a709e26abc442
--- /dev/null
+++ b/srcpkgs/qscintilla-qt6/template
@@ -0,0 +1,67 @@
+# Template file for 'qscintilla-qt6'
+# Keep synced with python3-pyqt6-qsci
+pkgname=qscintilla-qt6
+version=2.14.1
+revision=1
+wrksrc="QScintilla_src-${version}"
+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 f0ef1dcc64c11b194532ee6417204d37ac80e988 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/4] New package: python3-pyqt6-qsci-2.14.1
---
srcpkgs/python3-pyqt6-qsci-devel | 1 +
srcpkgs/python3-pyqt6-qsci/template | 39 +++++++++++++++++++++++++++++
srcpkgs/python3-pyqt6-qsci/update | 2 ++
3 files changed, 42 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..c04621a6a17ef7
--- /dev/null
+++ b/srcpkgs/python3-pyqt6-qsci/template
@@ -0,0 +1,39 @@
+# 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
+wrksrc=QScintilla_src-$version
+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 93abb5726fb32122b3e54d47790fa5e028fbb51e 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/4] New package: python3-editorconfig-0.12.4
---
srcpkgs/python3-editorconfig/template | 13 +++++++++++++
1 file changed, 13 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..ec47c6eaf7910d
--- /dev/null
+++ b/srcpkgs/python3-editorconfig/template
@@ -0,0 +1,13 @@
+# 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
From b56e1f455cdcec2edafc0770b15d286fe053c303 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/4] New package: eric-24.7.1
---
srcpkgs/eric/template | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
create mode 100644 srcpkgs/eric/template
diff --git a/srcpkgs/eric/template b/srcpkgs/eric/template
new file mode 100644
index 00000000000000..b0e9f58955960c
--- /dev/null
+++ b/srcpkgs/eric/template
@@ -0,0 +1,29 @@
+# Template file for 'eric'
+pkgname=eric
+version=24.7.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="black python3-asttokens python3-coverage python3-editorconfig
+ python3-esprima python3-isort python3-pyqt6-charts python3-pyqt6-gui
+ python3-pyqt6-webengine python3-pyqt6-qsci python3-semver python3-tomlkit
+ python3-trove-classifiers qt6-serialport qt6-svg qt6-tools qt6-websockets watchdog"
+short_desc="Full-featured Python and Ruby IDE in PyQt"
+maintainer="Eloi Torrents <eloitor@disroot.org>"
+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=10d9754043e19481b43635334b4cce243b41e13364bf24d5a816968587dcee0f
+
+do_patch() {
+ # fix desktop files
+ find . -name '*.desktop' -exec sed -i "s|@BINDIR@|/usr/bin|g" {} \;
+}
+
+post_install() {
+ vinstall src/eric7/data/linux/eric7_browser.desktop 644 /usr/share/applications
+ vinstall src/eric7/data/linux/eric7_ide.desktop 644 /usr/share/applications
+ vinstall src/eric7/data/linux/eric7_mpy.desktop 644 /usr/share/applications
+
+}
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] Eric
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
` (24 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: Eloitor @ 2024-07-29 15:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 683 bytes --]
There is an updated pull request by Eloitor against master on the void-packages repository
https://github.com/Eloitor/void-packages eric
https://github.com/void-linux/void-packages/pull/51523
[WIP] Eric
#### 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: 9565 bytes --]
From aae1263749ef7aeb7f97c32257e0a8cda5572722 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/4] New package: qscintilla-qt6-2.14.1
---
common/shlibs | 1 +
srcpkgs/qscintilla-qt6-devel | 1 +
srcpkgs/qscintilla-qt6/template | 67 +++++++++++++++++++++++++++++++++
srcpkgs/qscintilla-qt6/update | 2 +
4 files changed, 71 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..2a709e26abc442
--- /dev/null
+++ b/srcpkgs/qscintilla-qt6/template
@@ -0,0 +1,67 @@
+# Template file for 'qscintilla-qt6'
+# Keep synced with python3-pyqt6-qsci
+pkgname=qscintilla-qt6
+version=2.14.1
+revision=1
+wrksrc="QScintilla_src-${version}"
+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 46aabfd8cf61975f77d33d1b52e1c8921a8edd5f 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/4] New package: python3-pyqt6-qsci-2.14.1
---
srcpkgs/python3-pyqt6-qsci-devel | 1 +
srcpkgs/python3-pyqt6-qsci/template | 39 +++++++++++++++++++++++++++++
srcpkgs/python3-pyqt6-qsci/update | 2 ++
3 files changed, 42 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..c04621a6a17ef7
--- /dev/null
+++ b/srcpkgs/python3-pyqt6-qsci/template
@@ -0,0 +1,39 @@
+# 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
+wrksrc=QScintilla_src-$version
+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 140bb38405783ee4d10927d14a31b150d65d5830 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/4] New package: python3-editorconfig-0.12.4
---
srcpkgs/python3-editorconfig/template | 13 +++++++++++++
1 file changed, 13 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..ec47c6eaf7910d
--- /dev/null
+++ b/srcpkgs/python3-editorconfig/template
@@ -0,0 +1,13 @@
+# 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
From 5b1afe52745036ac9b6eb0481feba5aafc73bb5a 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/4] New package: eric-24.7.1
---
srcpkgs/eric/template | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
create mode 100644 srcpkgs/eric/template
diff --git a/srcpkgs/eric/template b/srcpkgs/eric/template
new file mode 100644
index 00000000000000..f5e2a8c6156dd0
--- /dev/null
+++ b/srcpkgs/eric/template
@@ -0,0 +1,31 @@
+# Template file for 'eric'
+pkgname=eric
+version=24.7.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="black python3-asttokens python3-coverage python3-editorconfig
+ python3-esprima python3-isort python3-pyqt6-charts python3-pyqt6-gui
+ python3-pyqt6-network python3-pyqt6-pdf python3-pyqt6-printsupport
+ python3-pyqt6-webengine python3-pyqt6-widgets python3-pyqt6-qsci
+ python3-semver python3-tomlkit python3-trove-classifiers python3-watchdog
+ qt6-serialport qt6-svg qt6-tools qt6-websockets"
+short_desc="Full-featured Python and Ruby IDE in PyQt"
+maintainer="Eloi Torrents <eloitor@disroot.org>"
+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=10d9754043e19481b43635334b4cce243b41e13364bf24d5a816968587dcee0f
+
+do_patch() {
+ # fix desktop files
+ find . -name '*.desktop' -exec sed -i "s|@BINDIR@|/usr/bin|g" {} \;
+}
+
+post_install() {
+ vinstall src/eric7/data/linux/eric7_browser.desktop 644 /usr/share/applications
+ vinstall src/eric7/data/linux/eric7_ide.desktop 644 /usr/share/applications
+ vinstall src/eric7/data/linux/eric7_mpy.desktop 644 /usr/share/applications
+
+}
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] Eric
2024-07-29 8:47 [PR PATCH] [WIP] Eric Eloitor
` (2 preceding siblings ...)
2024-07-29 15:48 ` Eloitor
@ 2024-07-29 19:05 ` Eloitor
2024-07-29 21:27 ` Eloitor
` (23 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: Eloitor @ 2024-07-29 19:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 683 bytes --]
There is an updated pull request by Eloitor against master on the void-packages repository
https://github.com/Eloitor/void-packages eric
https://github.com/void-linux/void-packages/pull/51523
[WIP] Eric
#### 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: 9558 bytes --]
From aae1263749ef7aeb7f97c32257e0a8cda5572722 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/4] New package: qscintilla-qt6-2.14.1
---
common/shlibs | 1 +
srcpkgs/qscintilla-qt6-devel | 1 +
srcpkgs/qscintilla-qt6/template | 67 +++++++++++++++++++++++++++++++++
srcpkgs/qscintilla-qt6/update | 2 +
4 files changed, 71 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..2a709e26abc442
--- /dev/null
+++ b/srcpkgs/qscintilla-qt6/template
@@ -0,0 +1,67 @@
+# Template file for 'qscintilla-qt6'
+# Keep synced with python3-pyqt6-qsci
+pkgname=qscintilla-qt6
+version=2.14.1
+revision=1
+wrksrc="QScintilla_src-${version}"
+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 46aabfd8cf61975f77d33d1b52e1c8921a8edd5f 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/4] New package: python3-pyqt6-qsci-2.14.1
---
srcpkgs/python3-pyqt6-qsci-devel | 1 +
srcpkgs/python3-pyqt6-qsci/template | 39 +++++++++++++++++++++++++++++
srcpkgs/python3-pyqt6-qsci/update | 2 ++
3 files changed, 42 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..c04621a6a17ef7
--- /dev/null
+++ b/srcpkgs/python3-pyqt6-qsci/template
@@ -0,0 +1,39 @@
+# 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
+wrksrc=QScintilla_src-$version
+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 140bb38405783ee4d10927d14a31b150d65d5830 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/4] New package: python3-editorconfig-0.12.4
---
srcpkgs/python3-editorconfig/template | 13 +++++++++++++
1 file changed, 13 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..ec47c6eaf7910d
--- /dev/null
+++ b/srcpkgs/python3-editorconfig/template
@@ -0,0 +1,13 @@
+# 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
From 1191cf038dbb1291e8635bc3da9629c3cc4a0618 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/4] New package: eric-24.8
---
srcpkgs/eric/template | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
create mode 100644 srcpkgs/eric/template
diff --git a/srcpkgs/eric/template b/srcpkgs/eric/template
new file mode 100644
index 00000000000000..9b2384bc04ac7f
--- /dev/null
+++ b/srcpkgs/eric/template
@@ -0,0 +1,31 @@
+# Template file for 'eric'
+pkgname=eric
+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"
+short_desc="Full-featured Python and Ruby IDE in PyQt"
+maintainer="Eloi Torrents <eloitor@disroot.org>"
+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
+
+do_patch() {
+ # fix desktop files
+ find . -name '*.desktop' -exec sed -i "s|@BINDIR@|/usr/bin|g" {} \;
+}
+
+post_install() {
+ vinstall src/eric7/data/linux/eric7_browser.desktop 644 /usr/share/applications
+ vinstall src/eric7/data/linux/eric7_ide.desktop 644 /usr/share/applications
+ vinstall src/eric7/data/linux/eric7_mpy.desktop 644 /usr/share/applications
+}
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] Eric
2024-07-29 8:47 [PR PATCH] [WIP] Eric Eloitor
` (3 preceding siblings ...)
2024-07-29 19:05 ` Eloitor
@ 2024-07-29 21:27 ` Eloitor
2024-07-29 21:38 ` Eloitor
` (22 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: Eloitor @ 2024-07-29 21:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 683 bytes --]
There is an updated pull request by Eloitor against master on the void-packages repository
https://github.com/Eloitor/void-packages eric
https://github.com/void-linux/void-packages/pull/51523
[WIP] Eric
#### 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: 9233 bytes --]
From aae1263749ef7aeb7f97c32257e0a8cda5572722 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/4] New package: qscintilla-qt6-2.14.1
---
common/shlibs | 1 +
srcpkgs/qscintilla-qt6-devel | 1 +
srcpkgs/qscintilla-qt6/template | 67 +++++++++++++++++++++++++++++++++
srcpkgs/qscintilla-qt6/update | 2 +
4 files changed, 71 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..2a709e26abc442
--- /dev/null
+++ b/srcpkgs/qscintilla-qt6/template
@@ -0,0 +1,67 @@
+# Template file for 'qscintilla-qt6'
+# Keep synced with python3-pyqt6-qsci
+pkgname=qscintilla-qt6
+version=2.14.1
+revision=1
+wrksrc="QScintilla_src-${version}"
+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 46aabfd8cf61975f77d33d1b52e1c8921a8edd5f 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/4] New package: python3-pyqt6-qsci-2.14.1
---
srcpkgs/python3-pyqt6-qsci-devel | 1 +
srcpkgs/python3-pyqt6-qsci/template | 39 +++++++++++++++++++++++++++++
srcpkgs/python3-pyqt6-qsci/update | 2 ++
3 files changed, 42 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..c04621a6a17ef7
--- /dev/null
+++ b/srcpkgs/python3-pyqt6-qsci/template
@@ -0,0 +1,39 @@
+# 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
+wrksrc=QScintilla_src-$version
+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 140bb38405783ee4d10927d14a31b150d65d5830 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/4] New package: python3-editorconfig-0.12.4
---
srcpkgs/python3-editorconfig/template | 13 +++++++++++++
1 file changed, 13 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..ec47c6eaf7910d
--- /dev/null
+++ b/srcpkgs/python3-editorconfig/template
@@ -0,0 +1,13 @@
+# 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
From dae1d1128d50b719709fbdccbd34d7f299146737 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/4] New package: eric-24.8
---
srcpkgs/eric/template | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
create mode 100644 srcpkgs/eric/template
diff --git a/srcpkgs/eric/template b/srcpkgs/eric/template
new file mode 100644
index 00000000000000..22f700c0a60691
--- /dev/null
+++ b/srcpkgs/eric/template
@@ -0,0 +1,24 @@
+# Template file for 'eric'
+pkgname=eric
+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"
+short_desc="Full-featured Python and Ruby IDE in PyQt"
+maintainer="Eloi Torrents <eloitor@disroot.org>"
+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
+
+post_build() {
+ python3 src/eric7/eric7_post_install
+}
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [WIP] Eric
2024-07-29 8:47 [PR PATCH] [WIP] Eric Eloitor
` (4 preceding siblings ...)
2024-07-29 21:27 ` Eloitor
@ 2024-07-29 21:38 ` Eloitor
2024-07-29 21:47 ` [PR PATCH] [Updated] " Eloitor
` (21 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: Eloitor @ 2024-07-29 21:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 250 bytes --]
New comment by Eloitor on void-packages repository
https://github.com/void-linux/void-packages/pull/51523#issuecomment-2257055208
Comment:
I get this problem now: https://eric.riverbankcomputing.narkive.com/rXNQqTDH/background-client-disconnecting
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] Eric
2024-07-29 8:47 [PR PATCH] [WIP] Eric Eloitor
` (5 preceding siblings ...)
2024-07-29 21:38 ` Eloitor
@ 2024-07-29 21:47 ` Eloitor
2024-07-30 7:03 ` Eloitor
` (20 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: Eloitor @ 2024-07-29 21:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 683 bytes --]
There is an updated pull request by Eloitor against master on the void-packages repository
https://github.com/Eloitor/void-packages eric
https://github.com/void-linux/void-packages/pull/51523
[WIP] Eric
#### 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: 9283 bytes --]
From aae1263749ef7aeb7f97c32257e0a8cda5572722 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/4] New package: qscintilla-qt6-2.14.1
---
common/shlibs | 1 +
srcpkgs/qscintilla-qt6-devel | 1 +
srcpkgs/qscintilla-qt6/template | 67 +++++++++++++++++++++++++++++++++
srcpkgs/qscintilla-qt6/update | 2 +
4 files changed, 71 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..2a709e26abc442
--- /dev/null
+++ b/srcpkgs/qscintilla-qt6/template
@@ -0,0 +1,67 @@
+# Template file for 'qscintilla-qt6'
+# Keep synced with python3-pyqt6-qsci
+pkgname=qscintilla-qt6
+version=2.14.1
+revision=1
+wrksrc="QScintilla_src-${version}"
+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 46aabfd8cf61975f77d33d1b52e1c8921a8edd5f 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/4] New package: python3-pyqt6-qsci-2.14.1
---
srcpkgs/python3-pyqt6-qsci-devel | 1 +
srcpkgs/python3-pyqt6-qsci/template | 39 +++++++++++++++++++++++++++++
srcpkgs/python3-pyqt6-qsci/update | 2 ++
3 files changed, 42 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..c04621a6a17ef7
--- /dev/null
+++ b/srcpkgs/python3-pyqt6-qsci/template
@@ -0,0 +1,39 @@
+# 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
+wrksrc=QScintilla_src-$version
+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 140bb38405783ee4d10927d14a31b150d65d5830 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/4] New package: python3-editorconfig-0.12.4
---
srcpkgs/python3-editorconfig/template | 13 +++++++++++++
1 file changed, 13 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..ec47c6eaf7910d
--- /dev/null
+++ b/srcpkgs/python3-editorconfig/template
@@ -0,0 +1,13 @@
+# 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
From 48630d39a8fe25910d2077cb074983995cd88e0b 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/4] New package: eric-24.8
---
srcpkgs/eric/template | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
create mode 100644 srcpkgs/eric/template
diff --git a/srcpkgs/eric/template b/srcpkgs/eric/template
new file mode 100644
index 00000000000000..55ef18d8dfb7cf
--- /dev/null
+++ b/srcpkgs/eric/template
@@ -0,0 +1,24 @@
+# Template file for 'eric'
+pkgname=eric
+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"
+short_desc="Full-featured Python and Ruby IDE in PyQt"
+maintainer="Eloi Torrents <eloitor@disroot.org>"
+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
+
+post_build() {
+ python3 src/eric7/eric7_post_install
+}
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] Eric
2024-07-29 8:47 [PR PATCH] [WIP] Eric Eloitor
` (6 preceding siblings ...)
2024-07-29 21:47 ` [PR PATCH] [Updated] " Eloitor
@ 2024-07-30 7:03 ` Eloitor
2024-07-30 7:11 ` Eloitor
` (19 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: Eloitor @ 2024-07-30 7:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 683 bytes --]
There is an updated pull request by Eloitor against master on the void-packages repository
https://github.com/Eloitor/void-packages eric
https://github.com/void-linux/void-packages/pull/51523
[WIP] Eric
#### 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: 9197 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/4] 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/4] 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 3d21c850f92167aac914962d0b770bc53df1f826 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/4] New package: python3-editorconfig-0.12.4
---
srcpkgs/python3-editorconfig/template | 13 +++++++++++++
1 file changed, 13 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..ec47c6eaf7910d
--- /dev/null
+++ b/srcpkgs/python3-editorconfig/template
@@ -0,0 +1,13 @@
+# 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
From 2eb4ab261eb50db868ac50a464bbb47820b7e6fa 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/4] New package: eric-24.8
---
srcpkgs/eric/template | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 srcpkgs/eric/template
diff --git a/srcpkgs/eric/template b/srcpkgs/eric/template
new file mode 100644
index 00000000000000..d19288600e79a5
--- /dev/null
+++ b/srcpkgs/eric/template
@@ -0,0 +1,21 @@
+# Template file for 'eric'
+pkgname=eric
+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@disroot.org>"
+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
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] Eric
2024-07-29 8:47 [PR PATCH] [WIP] Eric Eloitor
` (7 preceding siblings ...)
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
` (18 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: Eloitor @ 2024-07-30 7:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 683 bytes --]
There is an updated pull request by Eloitor against master on the void-packages repository
https://github.com/Eloitor/void-packages eric
https://github.com/void-linux/void-packages/pull/51523
[WIP] Eric
#### 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: 9226 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/4] 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/4] 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 3d21c850f92167aac914962d0b770bc53df1f826 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/4] New package: python3-editorconfig-0.12.4
---
srcpkgs/python3-editorconfig/template | 13 +++++++++++++
1 file changed, 13 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..ec47c6eaf7910d
--- /dev/null
+++ b/srcpkgs/python3-editorconfig/template
@@ -0,0 +1,13 @@
+# 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
From 7365a6605b6c72e1783731b8c6559411b8de9dcf 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/4] 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
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] New package: eric-ide-24.8
2024-07-29 8:47 [PR PATCH] [WIP] Eric Eloitor
` (8 preceding siblings ...)
2024-07-30 7:11 ` Eloitor
@ 2024-07-30 8:11 ` Eloitor
2024-07-30 8:30 ` Eloitor
` (17 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: Eloitor @ 2024-07-30 8:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 705 bytes --]
There is an updated pull request by Eloitor 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: 9332 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/4] 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/4] 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/4] 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/4] 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
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [WIP] New package: eric-ide-24.8
2024-07-29 8:47 [PR PATCH] [WIP] Eric Eloitor
` (9 preceding siblings ...)
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
` (16 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: Eloitor @ 2024-07-30 8:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 255 bytes --]
New comment by Eloitor on void-packages repository
https://github.com/void-linux/void-packages/pull/51523#issuecomment-2257778302
Comment:
@sgn qscintilla-qt6 does not cross-compile to arm... Do you know how to fix it?
I took the template from #31621
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [WIP] New package: eric-ide-24.8
2024-07-29 8:47 [PR PATCH] [WIP] Eric Eloitor
` (10 preceding siblings ...)
2024-07-30 8:30 ` Eloitor
@ 2024-07-30 8:32 ` Eloitor
2024-07-30 9:23 ` [PR REVIEW] " sgn
` (15 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: Eloitor @ 2024-07-30 8:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1034 bytes --]
New comment by Eloitor on void-packages repository
https://github.com/void-linux/void-packages/pull/51523#issuecomment-2257778302
Comment:
@sgn qscintilla-qt6 does not cross-compile to arm... Do you know how to fix it?
I took the template from #31621
```
=> qscintilla-qt6-2.14.1_1: running do_configure ...
Info: creating stash file /builddir/qscintilla-qt6-2.14.1/src/.qmake.stash
=> qscintilla-qt6-2.14.1_1: running post_configure ...
Could not find qmake spec 'linux-g++'.
Error processing project file: /builddir/qscintilla-qt6-2.14.1/designer/designer.pro
=> ERROR: qscintilla-qt6-2.14.1_1: post_configure: '/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' exited with 3
=> ERROR: in post_configure() at srcpkgs/qscintilla-qt6/template:35
```
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] [WIP] New package: eric-ide-24.8
2024-07-29 8:47 [PR PATCH] [WIP] Eric Eloitor
` (11 preceding siblings ...)
2024-07-30 8:32 ` Eloitor
@ 2024-07-30 9:23 ` sgn
2024-07-30 9:23 ` sgn
` (14 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: sgn @ 2024-07-30 9:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 207 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/51523#discussion_r1696636402
Comment:
```suggestion
qmake_args="-qtconf ${wrksrc}/src/qt.conf
```
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] [WIP] New package: eric-ide-24.8
2024-07-29 8:47 [PR PATCH] [WIP] Eric Eloitor
` (14 preceding siblings ...)
2024-07-30 9:23 ` sgn
@ 2024-07-30 9:23 ` sgn
2024-07-30 9:23 ` [PR PATCH] [Updated] " sgn
` (11 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: sgn @ 2024-07-30 9:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 227 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/51523#discussion_r1696617760
Comment:
```suggestion
python3-yaml python3-tomlkit python3-chardet python3-asttokens
```
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] [WIP] New package: eric-ide-24.8
2024-07-29 8:47 [PR PATCH] [WIP] Eric Eloitor
` (12 preceding siblings ...)
2024-07-30 9:23 ` [PR REVIEW] " sgn
@ 2024-07-30 9:23 ` sgn
2024-07-30 9:23 ` sgn
` (13 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: sgn @ 2024-07-30 9:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 186 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/51523#discussion_r1696635874
Comment:
```suggestion
license="Python-2.0.1"
```
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] [WIP] New package: eric-ide-24.8
2024-07-29 8:47 [PR PATCH] [WIP] Eric Eloitor
` (13 preceding siblings ...)
2024-07-30 9:23 ` sgn
@ 2024-07-30 9:23 ` sgn
2024-07-30 9:23 ` sgn
` (12 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: sgn @ 2024-07-30 9:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 228 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/51523#discussion_r1696617929
Comment:
```suggestion
python3-coverage python3-semver python3-watchdog python3-psutil
```
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] New package: eric-ide-24.8
2024-07-29 8:47 [PR PATCH] [WIP] Eric Eloitor
` (15 preceding siblings ...)
2024-07-30 9:23 ` sgn
@ 2024-07-30 9:23 ` sgn
2024-07-30 18:47 ` Eloitor
` (10 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: sgn @ 2024-07-30 9:23 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [WIP] New package: eric-ide-24.8
2024-07-29 8:47 [PR PATCH] [WIP] Eric Eloitor
` (16 preceding siblings ...)
2024-07-30 9:23 ` [PR PATCH] [Updated] " sgn
@ 2024-07-30 18:47 ` Eloitor
2024-07-30 18:48 ` Eloitor
` (9 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: Eloitor @ 2024-07-30 18:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1275 bytes --]
New comment by Eloitor on void-packages repository
https://github.com/void-linux/void-packages/pull/51523#issuecomment-2258988922
Comment:
I attempted to build on another machine with this changes and I get
```
=> python3-pyqt6-qsci-2.14.1_1: running do_configure ...
pyproject.toml: line 7: using '[tool.sip.metadata]' to specify the project metadata is deprecated and will be removed in SIP v7.0.0, use '[project]' instead
Querying qmake about your Qt installation...
Checking to see if the Qsci bindings can be built...
These bindings will be built: Qsci.
Generating the Qsci bindings...
/usr/lib/python3.12/site-packages/PyQt6/bindings/QtCore/QtCoremod.sip: line 64: '%Plugin' is deprecated and will be removed in SIP v7.0.0
/void-packages/common/build-style/sip-build.sh: line 5: 19136 Segmentation fault sip-build --no-make ${_qt:+--qmake "$XBPS_WRAPPERDIR/sip-qmake"} --api-dir /usr/share/$_qt/qsci/api/python $configure_args --build-dir "$sip_builddir"
=> ERROR: python3-pyqt6-qsci-2.14.1_1: do_configure: 'sip-build --no-make ${_qt:+--qmake "$XBPS_WRAPPERDIR/sip-qmake"} --api-dir /usr/share/$_qt/qsci/api/python $configure_args --build-dir "$sip_builddir"' exited with 139
=> ERROR: in do_configure() at common/build-style/sip-build.sh:124
```
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [WIP] New package: eric-ide-24.8
2024-07-29 8:47 [PR PATCH] [WIP] Eric Eloitor
` (17 preceding siblings ...)
2024-07-30 18:47 ` Eloitor
@ 2024-07-30 18:48 ` Eloitor
2024-07-30 20:25 ` Eloitor
` (8 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: Eloitor @ 2024-07-30 18:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1323 bytes --]
New comment by Eloitor on void-packages repository
https://github.com/void-linux/void-packages/pull/51523#issuecomment-2258988922
Comment:
I attempted to build on another machine with this changes and I get
```
=> python3-pyqt6-qsci-2.14.1_1: running do_configure ...
pyproject.toml: line 7: using '[tool.sip.metadata]' to specify the project metadata is deprecated and will be removed in SIP v7.0.0, use '[project]' instead
Querying qmake about your Qt installation...
Checking to see if the Qsci bindings can be built...
These bindings will be built: Qsci.
Generating the Qsci bindings...
/usr/lib/python3.12/site-packages/PyQt6/bindings/QtCore/QtCoremod.sip: line 64: '%Plugin' is deprecated and will be removed in SIP v7.0.0
/void-packages/common/build-style/sip-build.sh: line 5: 19136 Segmentation fault sip-build --no-make ${_qt:+--qmake "$XBPS_WRAPPERDIR/sip-qmake"} --api-dir /usr/share/$_qt/qsci/api/python $configure_args --build-dir "$sip_builddir"
=> ERROR: python3-pyqt6-qsci-2.14.1_1: do_configure: 'sip-build --no-make ${_qt:+--qmake "$XBPS_WRAPPERDIR/sip-qmake"} --api-dir /usr/share/$_qt/qsci/api/python $configure_args --build-dir "$sip_builddir"' exited with 139
=> ERROR: in do_configure() at common/build-style/sip-build.sh:124
```
It has 4Gb of RAM, maybe that's the issue...
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [WIP] New package: eric-ide-24.8
2024-07-29 8:47 [PR PATCH] [WIP] Eric Eloitor
` (18 preceding siblings ...)
2024-07-30 18:48 ` Eloitor
@ 2024-07-30 20:25 ` Eloitor
2024-07-31 0:37 ` sgn
` (7 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: Eloitor @ 2024-07-30 20:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1506 bytes --]
New comment by Eloitor on void-packages repository
https://github.com/void-linux/void-packages/pull/51523#issuecomment-2258988922
Comment:
I attempted to build on another machine with this changes and I get
```
=> python3-pyqt6-qsci-2.14.1_1: running do_configure ...
pyproject.toml: line 7: using '[tool.sip.metadata]' to specify the project metadata is deprecated and will be removed in SIP v7.0.0, use '[project]' instead
Querying qmake about your Qt installation...
Checking to see if the Qsci bindings can be built...
These bindings will be built: Qsci.
Generating the Qsci bindings...
/usr/lib/python3.12/site-packages/PyQt6/bindings/QtCore/QtCoremod.sip: line 64: '%Plugin' is deprecated and will be removed in SIP v7.0.0
/void-packages/common/build-style/sip-build.sh: line 5: 19136 Segmentation fault sip-build --no-make ${_qt:+--qmake "$XBPS_WRAPPERDIR/sip-qmake"} --api-dir /usr/share/$_qt/qsci/api/python $configure_args --build-dir "$sip_builddir"
=> ERROR: python3-pyqt6-qsci-2.14.1_1: do_configure: 'sip-build --no-make ${_qt:+--qmake "$XBPS_WRAPPERDIR/sip-qmake"} --api-dir /usr/share/$_qt/qsci/api/python $configure_args --build-dir "$sip_builddir"' exited with 139
=> ERROR: in do_configure() at common/build-style/sip-build.sh:124
```
It has 4Gb of RAM, maybe that's the issue...
Edit: In a second attempt it worked.
running `eric7_ide` I get
```
The background client for Python3 disconnected because of an unknown reason.
Should it be restarted?
```
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [WIP] New package: eric-ide-24.8
2024-07-29 8:47 [PR PATCH] [WIP] Eric Eloitor
` (19 preceding siblings ...)
2024-07-30 20:25 ` Eloitor
@ 2024-07-31 0:37 ` sgn
2024-07-31 0:47 ` sgn
` (6 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: sgn @ 2024-07-31 0:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1377 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/51523#issuecomment-2259421091
Comment:
> I attempted to build on another machine with this changes and I get
>
> ```
> => python3-pyqt6-qsci-2.14.1_1: running do_configure ...
> pyproject.toml: line 7: using '[tool.sip.metadata]' to specify the project metadata is deprecated and will be removed in SIP v7.0.0, use '[project]' instead
> Querying qmake about your Qt installation...
> Checking to see if the Qsci bindings can be built...
> These bindings will be built: Qsci.
> Generating the Qsci bindings...
> /usr/lib/python3.12/site-packages/PyQt6/bindings/QtCore/QtCoremod.sip: line 64: '%Plugin' is deprecated and will be removed in SIP v7.0.0
> /void-packages/common/build-style/sip-build.sh: line 5: 19136 Segmentation fault sip-build --no-make ${_qt:+--qmake "$XBPS_WRAPPERDIR/sip-qmake"} --api-dir /usr/share/$_qt/qsci/api/python $configure_args --build-dir "$sip_builddir"
> => ERROR: python3-pyqt6-qsci-2.14.1_1: do_configure: 'sip-build --no-make ${_qt:+--qmake "$XBPS_WRAPPERDIR/sip-qmake"} --api-dir /usr/share/$_qt/qsci/api/python $configure_args --build-dir "$sip_builddir"' exited with 139
> => ERROR: in do_configure() at common/build-style/sip-build.sh:124
> ```
You need the patch at `srcpkgs/python3-pyqt6-qsci/patches/cross.patch`
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [WIP] New package: eric-ide-24.8
2024-07-29 8:47 [PR PATCH] [WIP] Eric Eloitor
` (20 preceding siblings ...)
2024-07-31 0:37 ` sgn
@ 2024-07-31 0:47 ` sgn
2024-07-31 9:58 ` [PR PATCH] [Updated] " Eloitor
` (5 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: sgn @ 2024-07-31 0:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 212 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/51523#issuecomment-2259429601
Comment:
I will push `python3-pyqt6-qsci` first, so you can work on other packages.
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] New package: eric-ide-24.8
2024-07-29 8:47 [PR PATCH] [WIP] Eric Eloitor
` (21 preceding siblings ...)
2024-07-31 0:47 ` sgn
@ 2024-07-31 9:58 ` Eloitor
2024-07-31 10:01 ` Eloitor
` (4 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: Eloitor @ 2024-07-31 9:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 705 bytes --]
There is an updated pull request by Eloitor 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: 4011 bytes --]
From d8b33059ab85aba8309586080060e877029c6652 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Mon, 29 Jul 2024 13:46:01 +0200
Subject: [PATCH 1/2] 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..4bf4d441a5ccbb
--- /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="Python-2.0.1"
+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 e73df7bb626a968cb1c0de461452ca5457aa604b Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Mon, 29 Jul 2024 13:46:08 +0200
Subject: [PATCH 2/2] New package: eric-ide-24.8
---
srcpkgs/eric-ide/template | 45 +++++++++++++++++++++++++++++++++++++++
1 file changed, 45 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..b3f7a71ce44c5d
--- /dev/null
+++ b/srcpkgs/eric-ide/template
@@ -0,0 +1,45 @@
+# 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 python3-pyqt6-tools"
+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
+
+do_patch() {
+ find . -name '*.desktop' -exec sed -i "s|@BINDIR@|/usr/bin|g" {} \;
+ vsed -e "s|^Icon=.*|Icon=/usr/share/icons/hicolor/scalable/apps/eric.svg|" -i src/eric7/data/linux/eric7_ide.desktop
+ vsed -e "s|^Icon=.*|Icon=/usr/share/icons/hicolor/scalable/apps/ericMPy48.svg|" -i src/eric7/data/linux/eric7_mpy.desktop
+ vsed -e "s|^Icon=.*|Icon=/usr/share/icons/hicolor/scalable/apps/ericWeb48.svg|" -i src/eric7/data/linux/eric7_browser.desktop
+ rm src/eric7/eric7_post_install.py
+}
+
+post_install() {
+ vinstall src/eric7/data/linux/eric7_browser.desktop 644 /usr/share/applications
+ vinstall src/eric7/data/linux/eric7_ide.desktop 644 /usr/share/applications
+ vinstall src/eric7/data/linux/eric7_mpy.desktop 644 /usr/share/applications
+
+ for icon in eric48_icon.png ericMPy48_icon.png ericWeb48_icon.png; do
+ vinstall "src/eric7/pixmaps/$icon" 644 /usr/share/icons/hicolor/48x48/apps
+ done
+
+ for svg_icon in eric.svg ericMPy48.svg ericWeb48.svg; do
+ vinstall "src/eric7/pixmaps/$svg_icon" 644 /usr/share/icons/hicolor/scalable/apps/
+ done
+
+ vinstall src/eric7/data/linux/eric7.appdata.xml 644 /usr/share/metainfo
+}
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] New package: eric-ide-24.8
2024-07-29 8:47 [PR PATCH] [WIP] Eric Eloitor
` (22 preceding siblings ...)
2024-07-31 9:58 ` [PR PATCH] [Updated] " Eloitor
@ 2024-07-31 10:01 ` Eloitor
2024-07-31 10:03 ` Eloitor
` (3 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: Eloitor @ 2024-07-31 10:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 705 bytes --]
There is an updated pull request by Eloitor 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: 4008 bytes --]
From 4139fb478173304868f5fe4057d8827844beaa15 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Mon, 29 Jul 2024 13:46:01 +0200
Subject: [PATCH 1/2] 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..a3c44f264dacea
--- /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="Python-2.0.1"
+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 825d7b659f92205155f23d40946839ce6229dbeb Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Mon, 29 Jul 2024 13:46:08 +0200
Subject: [PATCH 2/2] New package: eric-ide-24.8
---
srcpkgs/eric-ide/template | 45 +++++++++++++++++++++++++++++++++++++++
1 file changed, 45 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..b3f7a71ce44c5d
--- /dev/null
+++ b/srcpkgs/eric-ide/template
@@ -0,0 +1,45 @@
+# 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 python3-pyqt6-tools"
+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
+
+do_patch() {
+ find . -name '*.desktop' -exec sed -i "s|@BINDIR@|/usr/bin|g" {} \;
+ vsed -e "s|^Icon=.*|Icon=/usr/share/icons/hicolor/scalable/apps/eric.svg|" -i src/eric7/data/linux/eric7_ide.desktop
+ vsed -e "s|^Icon=.*|Icon=/usr/share/icons/hicolor/scalable/apps/ericMPy48.svg|" -i src/eric7/data/linux/eric7_mpy.desktop
+ vsed -e "s|^Icon=.*|Icon=/usr/share/icons/hicolor/scalable/apps/ericWeb48.svg|" -i src/eric7/data/linux/eric7_browser.desktop
+ rm src/eric7/eric7_post_install.py
+}
+
+post_install() {
+ vinstall src/eric7/data/linux/eric7_browser.desktop 644 /usr/share/applications
+ vinstall src/eric7/data/linux/eric7_ide.desktop 644 /usr/share/applications
+ vinstall src/eric7/data/linux/eric7_mpy.desktop 644 /usr/share/applications
+
+ for icon in eric48_icon.png ericMPy48_icon.png ericWeb48_icon.png; do
+ vinstall "src/eric7/pixmaps/$icon" 644 /usr/share/icons/hicolor/48x48/apps
+ done
+
+ for svg_icon in eric.svg ericMPy48.svg ericWeb48.svg; do
+ vinstall "src/eric7/pixmaps/$svg_icon" 644 /usr/share/icons/hicolor/scalable/apps/
+ done
+
+ vinstall src/eric7/data/linux/eric7.appdata.xml 644 /usr/share/metainfo
+}
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: New package: eric-ide-24.8
2024-07-29 8:47 [PR PATCH] [WIP] Eric Eloitor
` (23 preceding siblings ...)
2024-07-31 10:01 ` Eloitor
@ 2024-07-31 10:03 ` Eloitor
2024-10-30 2:00 ` github-actions
` (2 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: Eloitor @ 2024-07-31 10:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 297 bytes --]
New comment by Eloitor on void-packages repository
https://github.com/void-linux/void-packages/pull/51523#issuecomment-2260143847
Comment:
Thank you!
The only minor issue that remains to be solved is that the .desktop entry does not appear in the menu in gnome...
I don't know what's wrong.
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: New package: eric-ide-24.8
2024-07-29 8:47 [PR PATCH] [WIP] Eric Eloitor
` (24 preceding siblings ...)
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
27 siblings, 0 replies; 29+ messages in thread
From: github-actions @ 2024-10-30 2:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/51523#issuecomment-2445660318
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: New package: eric-ide-24.8
2024-07-29 8:47 [PR PATCH] [WIP] Eric Eloitor
` (25 preceding siblings ...)
2024-10-30 2:00 ` github-actions
@ 2024-10-30 8:03 ` sgn
2024-10-30 10:31 ` Eloitor
27 siblings, 0 replies; 29+ messages in thread
From: sgn @ 2024-10-30 8:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 181 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/51523#issuecomment-2446110427
Comment:
Did you look into the menu entry problem?
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: New package: eric-ide-24.8
2024-07-29 8:47 [PR PATCH] [WIP] Eric Eloitor
` (26 preceding siblings ...)
2024-10-30 8:03 ` sgn
@ 2024-10-30 10:31 ` Eloitor
27 siblings, 0 replies; 29+ messages in thread
From: Eloitor @ 2024-10-30 10:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 272 bytes --]
New comment by Eloitor on void-packages repository
https://github.com/void-linux/void-packages/pull/51523#issuecomment-2446497498
Comment:
mmm... Right now it appears in my menu, but I don't remember if I updated this package accordingly... I'll take a look later today
^ permalink raw reply [flat|nested] 29+ messages in thread
end of thread, other threads:[~2024-10-30 10:31 UTC | newest]
Thread overview: 29+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [PR PATCH] [Updated] " sgn
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
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).