[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Jimi Huotari" <chiitoo@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/
Date: Tue, 16 Apr 2024 16:30:33 +0000 (UTC)	[thread overview]
Message-ID: <1713284951.aecddf2e9f314168dddf8e357dce5bc26063a31e.chiitoo@gentoo> (raw)

commit:     aecddf2e9f314168dddf8e357dce5bc26063a31e
Author:     José de Paula R. N. Assis <espinafre <AT> gmail <DOT> com>
AuthorDate: Tue Oct 24 16:13:43 2023 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Tue Apr 16 16:29:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aecddf2e

x11-libs/qscintilla: add USE=qt6 #916232

Adding USE=qt6 to x11-libs/qscintilla, based on previous work by @t0b3
(#31252), keeping qt5 support, via multibuild.

Closes: https://bugs.gentoo.org/916232
Signed-off-by: José P. R. N. Assis <espinafre <AT> gmail.com>
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.14.1-r1.ebuild | 114 ++++++++++++++++++++++++
 1 file changed, 114 insertions(+)

diff --git a/x11-libs/qscintilla/qscintilla-2.14.1-r1.ebuild b/x11-libs/qscintilla/qscintilla-2.14.1-r1.ebuild
new file mode 100644
index 000000000000..43e36261230c
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.14.1-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic multibuild qmake-utils
+
+DESCRIPTION="Qt port of Neil Hodgson's Scintilla C++ editor control"
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
+
+MY_PN=QScintilla
+MY_P=${MY_PN}_src-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
+fi
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-3"
+SLOT="0/15"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="designer doc +qt5 qt6"
+
+REQUIRED_USE="|| ( qt5 qt6 )"
+
+# no tests
+RESTRICT="test"
+
+RDEPEND="
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		designer? ( dev-qt/designer:5 )
+	)
+	qt6? (
+		dev-qt/qtbase:6[gui,widgets]
+		designer? ( dev-qt/qttools:6[designer] )
+	)
+"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
+}
+
+src_unpack() {
+	default
+
+	# Sub-slot sanity check
+	local subslot=${SLOT#*/}
+	local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' "${S}"/src/qscintilla.pro || die)
+	local major=${version%%.*}
+	if [[ ${subslot} != ${major} ]]; then
+		eerror
+		eerror "Ebuild sub-slot (${subslot}) does not match QScintilla major version (${major})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${major}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+
+	multibuild_copy_sources
+}
+
+qsci_run_in() {
+	pushd "$1" >/dev/null || die
+	shift || die
+	"$@" || die
+	popd >/dev/null || die
+}
+
+src_configure() {
+	if use designer; then
+		# prevent building against system version (bug 466120)
+		append-cxxflags -I../src
+		append-ldflags -L../src
+	fi
+	my_src_configure() {
+		case ${MULTIBUILD_VARIANT} in
+			qt5)
+				qsci_run_in "${BUILD_DIR}"/src eqmake5;
+				use designer && qsci_run_in "${BUILD_DIR}"/designer eqmake5;;
+			qt6)
+				qsci_run_in "${BUILD_DIR}"/src eqmake6;
+				use designer && qsci_run_in "${BUILD_DIR}"/designer eqmake6;;
+		esac
+	}
+
+	multibuild_foreach_variant my_src_configure
+}
+
+src_compile() {
+	my_src_compile() {
+		qsci_run_in "${BUILD_DIR}"/src emake
+		use designer && qsci_run_in "${BUILD_DIR}"/designer emake
+	}
+
+	multibuild_foreach_variant my_src_compile
+}
+
+src_install() {
+	my_src_install() {
+		qsci_run_in "${BUILD_DIR}"/src emake INSTALL_ROOT="${D}" install
+		use designer && qsci_run_in "${BUILD_DIR}"/designer emake INSTALL_ROOT="${D}" install
+	}
+
+	multibuild_foreach_variant my_src_install
+
+	use doc && local HTML_DOCS=( doc/html/. )
+	einstalldocs
+}

next             reply	other threads:[~2024-04-16 16:30 UTC|newest]

Thread overview: 104+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-16 16:30 Jimi Huotari [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-05-26 19:43 [gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/ Andreas Sturmlechner
2025-05-26 19:43 Andreas Sturmlechner
2025-01-22 21:57 Andreas Sturmlechner
2024-05-08  7:54 Michał Górny
2023-10-18 15:42 Arthur Zamarin
2023-10-18  9:02 Sam James
2023-10-18  9:02 Sam James
2023-10-18  9:02 Sam James
2023-10-18  9:02 Sam James
2023-09-17  6:17 Sam James
2022-11-23 21:18 Andreas Sturmlechner
2022-10-28 18:55 Sam James
2022-10-28 18:55 Sam James
2022-10-28 18:52 Arthur Zamarin
2022-10-28 16:36 Arthur Zamarin
2022-10-28 16:33 Arthur Zamarin
2022-09-26 17:18 Andreas Sturmlechner
2022-09-26 17:18 Andreas Sturmlechner
2022-06-01  5:25 Sam James
2022-06-01  5:25 Sam James
2022-06-01  2:29 Sam James
2022-06-01  1:56 Sam James
2022-06-01  1:55 Sam James
2021-10-22  3:02 Davide Pesavento
2021-10-19  4:29 Davide Pesavento
2021-10-11 22:22 Yixun Lan
2021-08-04  1:06 Davide Pesavento
2021-07-31  6:23 Sam James
2021-07-31  4:14 Sam James
2021-07-30 15:14 Agostino Sarubbo
2021-07-09  2:47 Davide Pesavento
2021-07-09  2:47 Davide Pesavento
2021-06-23 19:57 Davide Pesavento
2020-12-17  1:17 Davide Pesavento
2020-11-07 17:57 Sam James
2020-11-06  5:21 Sam James
2020-08-30  0:33 Davide Pesavento
2020-08-30  0:19 Sam James
2020-08-18 11:16 Agostino Sarubbo
2020-06-16  5:47 Davide Pesavento
2020-03-26 18:38 Davide Pesavento
2020-03-22 10:37 Agostino Sarubbo
2020-03-21 16:49 Agostino Sarubbo
2020-03-21 15:52 Agostino Sarubbo
2020-03-07 15:11 Michał Górny
2020-02-16  7:52 Michał Górny
2020-01-11 19:25 Davide Pesavento
2019-12-31 14:16 Agostino Sarubbo
2019-12-31 14:06 Agostino Sarubbo
2019-12-31 14:02 Agostino Sarubbo
2019-12-27  1:01 Davide Pesavento
2019-12-23  0:09 Davide Pesavento
2019-12-03  2:57 Davide Pesavento
2019-11-16 19:55 Davide Pesavento
2019-04-03  1:14 Davide Pesavento
2019-03-21 20:46 Davide Pesavento
2019-03-21 20:30 Davide Pesavento
2018-12-31 23:44 Davide Pesavento
2018-12-31 22:27 Davide Pesavento
2018-12-29 19:12 Thomas Deutschmann
2018-12-25 19:46 Sergei Trofimovich
2018-12-15 20:37 Davide Pesavento
2018-10-07 23:22 Davide Pesavento
2018-08-25 18:48 Davide Pesavento
2018-08-25 18:11 Davide Pesavento
2018-07-14 20:16 Sergei Trofimovich
2018-07-09 14:02 Mikle Kolyada
2018-07-06 13:43 Thomas Deutschmann
2018-04-26  3:32 Andreas Sturmlechner
2018-04-26  3:01 Matt Turner
2018-04-15 17:16 Davide Pesavento
2018-04-15 14:41 Sergei Trofimovich
2018-04-12 19:07 Thomas Deutschmann
2018-04-06 15:51 Aaron Bauman
2018-03-04 22:16 Davide Pesavento
2017-11-27 23:58 Andreas Sturmlechner
2017-11-26 19:15 Sergei Trofimovich
2017-11-26 12:17 Sergei Trofimovich
2017-11-25  0:54 Davide Pesavento
2017-11-25  0:33 Davide Pesavento
2017-11-20 15:42 Manuel Rüger
2017-11-02 21:16 Thomas Deutschmann
2017-09-30  7:18 Sergei Trofimovich
2017-08-19 18:40 Davide Pesavento
2017-05-26 14:59 Agostino Sarubbo
2017-05-26 14:05 Agostino Sarubbo
2017-05-24 13:42 Agostino Sarubbo
2017-05-23 23:25 Michael Weber
2017-04-23 23:37 Davide Pesavento
2017-02-26  1:51 Davide Pesavento
2017-01-25  0:54 Davide Pesavento
2017-01-01 14:20 Michael Palimaka
2016-12-31  6:02 Andrey Grozin
2016-12-23  1:24 Davide Pesavento
2016-12-22 18:26 David Seifert
2016-10-02 10:08 Jeroen Roovers
2016-07-27  9:31 Davide Pesavento
2016-07-14 20:43 Davide Pesavento
2016-07-13 21:22 Michael Palimaka
2016-04-23 22:36 Davide Pesavento
2016-04-20  0:40 Davide Pesavento
2016-04-20  0:40 Davide Pesavento
2015-10-24 15:44 Davide Pesavento

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:43e36261230 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1713284951.aecddf2e9f314168dddf8e357dce5bc26063a31e.chiitoo@gentoo \
    --to=chiitoo@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox