From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 450F015808B for ; Thu, 3 Oct 2024 15:57:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 656A8E29BC; Thu, 3 Oct 2024 15:57:26 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 42673E29C2 for ; Thu, 3 Oct 2024 15:57:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 52E82340CC9 for ; Thu, 3 Oct 2024 15:57:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E70CD1A09 for ; Thu, 3 Oct 2024 15:57:23 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1727971014.420cbd16a28b6ed5e3509ad4b0ac5e00cdd39ac4.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/texstudio/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/texstudio/Manifest app-office/texstudio/texstudio-4.8.1.ebuild app-office/texstudio/texstudio-4.8.4.ebuild X-VCS-Directories: app-office/texstudio/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 420cbd16a28b6ed5e3509ad4b0ac5e00cdd39ac4 X-VCS-Branch: master Date: Thu, 3 Oct 2024 15:57:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a99efa79-8b98-4867-9598-002c3fbbfdd8 X-Archives-Hash: 12147d1ae8f4b8d1bcf019f796f96d88 commit: 420cbd16a28b6ed5e3509ad4b0ac5e00cdd39ac4 Author: Florian Schmaus gentoo org> AuthorDate: Fri Sep 20 09:48:09 2024 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Thu Oct 3 15:56:54 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=420cbd16 app-office/texstudio: add 4.8.4 using qt6, drop 4.8.1 Switch from qmake to cmake. Drop the .pro related unbundling patches, as they are not relevant to the cmake build. This also drops the unbundling of qtsingeapplication, as texstudio's bundled version contains Qt6 specfic guards. Thanks to ionen for constructive suggestions. Closes: https://bugs.gentoo.org/934762 Closes: https://bugs.gentoo.org/934581 Closes: https://github.com/gentoo/gentoo/pull/38702 Signed-off-by: Florian Schmaus gentoo.org> app-office/texstudio/Manifest | 2 +- app-office/texstudio/texstudio-4.8.1.ebuild | 79 ----------------------------- app-office/texstudio/texstudio-4.8.4.ebuild | 66 ++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 80 deletions(-) diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest index 845d56ca56fc..d42f3590bb63 100644 --- a/app-office/texstudio/Manifest +++ b/app-office/texstudio/Manifest @@ -1,3 +1,3 @@ DIST texstudio-4.3.1.tar.gz 90529450 BLAKE2B 500f42f8a540aff97d8bb8d65262d6e0a758ccfb431fa00d9aa6e848d76da9eb1320dc3bc5a472e15d4492174e2817181271243c581830958c5e370751ed0b36 SHA512 6fc8717ed22e21947260d0af5c5b857f9b79476f28f400f9036134d9de2d9e11a605a871b6c8d520b366cb43f3fb61bb89c411e5c11aee1e87642e77fe1b0560 DIST texstudio-4.7.1.tar.gz 111614038 BLAKE2B 01334389930fff5147f49a55b925a64173b8615553b58aaf48a9c9e446997aa0a2600f88a9bd4e5d81f5bef29c97d21796171c2dba231c9f3377c200e6ec676f SHA512 3aebc09f1cec288d841552b3861c4ba33f006b25e9f99418e53bdc0e5a3ece915c1649e7027e3626eec14b6c00214df2eb2012b7a0b71874b0f75cc9f9fb2d06 -DIST texstudio-4.8.1.tar.gz 116013004 BLAKE2B 57479b1f6f0daf560258728ec7216c62d8eeacbc4b29f3a4ac5391bc4c933b3fbb152661062b93ec5a97b9ab16b9ace0070cf6af07743a13e451294acd2c58fc SHA512 9749c9d4c67afb8c48171a051f8d7876c89cb40d088a58707cf19209f9da515c1e817b4c46fc333279c9f42652000fa2029291ba83d748137c98b0b34981b1bf +DIST texstudio-4.8.4.tar.gz 114147594 BLAKE2B 0f553bea66ef0709434ee8b3afc20db6b8ddce45f1f4a923768215d880b4428acefa54942aa99b36b2f03674de2935d8434a8689e1062e52b05e477de4b56416 SHA512 c42d475f1807feaaf86b0245d8a71ccc28172c5867224383bdc3b4e4c719577c7fbc9b2f3ddac90ad957a9bacd36ecc79accea5d0453552d3856b66129091538 diff --git a/app-office/texstudio/texstudio-4.8.1.ebuild b/app-office/texstudio/texstudio-4.8.1.ebuild deleted file mode 100644 index 187f608c4f49..000000000000 --- a/app-office/texstudio/texstudio-4.8.1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop qmake-utils xdg - -MY_PV="${PV/_/}" -DESCRIPTION="Free cross-platform LaTeX editor (fork from texmakerX)" -HOMEPAGE="https://www.texstudio.org https://github.com/texstudio-org/texstudio" -SRC_URI="https://github.com/texstudio-org/texstudio/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${MY_PV}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -IUSE="video" - -DEPEND=" - app-text/hunspell:= - app-text/poppler:=[qt5] - >=dev-libs/quazip-1.0:0=[qt5(+)] - dev-qt/designer:5 - dev-qt/qtcore:5 - dev-qt/qtconcurrent:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsingleapplication[qt5(+),X] - dev-qt/qtsvg:5 - dev-qt/qttest:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - sys-libs/zlib - x11-libs/libX11 - video? ( >=media-libs/phonon-4.11.0[qt5(+)] ) -" -RDEPEND=" - ${DEPEND} - app-text/ghostscript-gpl - app-text/psutils - media-libs/netpbm - virtual/latex-base -" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${PN}-4.7.0-quazip.patch" # TODO: upstream -) - -src_prepare() { - # TODO: find hunspell quazip utilities/poppler-data qtsingleapplication -delete || die - rm -r src/quazip || die - - if use video; then - sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die - fi - - sed -e "/qtsingleapplication.pri/s/.*/CONFIG += qtsingleapplication/" \ - -i ${PN}.pro || die - default -} - -src_configure() { - eqmake5 USE_SYSTEM_HUNSPELL=1 USE_SYSTEM_QUAZIP=1 NO_TESTS=false -} - -src_install() { - local i - for i in 16x16 22x22 32x32 48x48 64x64 128x128; do - newicon -s ${i} utilities/${PN}${i}.png ${PN}.png - done - - emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install - - # We don't install licences per package - rm "${ED}"/usr/share/texstudio/COPYING || die -} diff --git a/app-office/texstudio/texstudio-4.8.4.ebuild b/app-office/texstudio/texstudio-4.8.4.ebuild new file mode 100644 index 000000000000..859bcaad2a9b --- /dev/null +++ b/app-office/texstudio/texstudio-4.8.4.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake desktop xdg + +MY_PV="${PV/_/}" +DESCRIPTION="Free cross-platform LaTeX editor (fork from texmakerX)" +HOMEPAGE="https://www.texstudio.org https://github.com/texstudio-org/texstudio" +SRC_URI="https://github.com/texstudio-org/texstudio/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + +DEPEND=" + app-text/hunspell:= + app-text/poppler:=[qt6] + >=dev-libs/quazip-1.0:0=[qt6(+)] + dev-qt/qt5compat:6 + dev-qt/qtbase:6[concurrent,gui,network,widgets,xml] + dev-qt/qtdeclarative:6 + dev-qt/qtmultimedia:6 + dev-qt/qtsvg:6 + dev-qt/qttools:6[widgets] + sys-libs/zlib + x11-libs/libX11 +" +RDEPEND=" + ${DEPEND} + app-text/ghostscript-gpl + app-text/psutils + media-libs/netpbm + virtual/latex-base +" +BDEPEND=" + dev-qt/qttools:6[linguist] + virtual/pkgconfig +" + +src_prepare() { + local dir + for dir in src/quazip src/hunspell utilities/poppler-data; do + rm -r "${dir}" || die "Failed to delete ${dir}" + done + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DQT_VERSION_MAJOR=6 + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + local i + for i in 16x16 22x22 32x32 48x48 64x64 128x128; do + newicon -s ${i} utilities/${PN}${i}.png ${PN}.png + done +}