From aae1263749ef7aeb7f97c32257e0a8cda5572722 Mon Sep 17 00:00:00 2001 From: Eloi Torrents 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 " +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 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 " +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 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 " +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 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 " +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 +}