commit: 76147231ad2fcf672561c209c480bd2636f2cd61 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Feb 20 20:53:11 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Feb 23 19:52:35 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76147231
app-office/texstudio: Support build with >=dev-libs/quazip-1.0 Drop prefix.eclass, using pkgconfig for dev-libs/quazip:0/0 instead. Raise minimum dev-libs/quazip version to first w/o IUSE=qt5, cleanup usedep. Raise minimum media-libs/phonon version to first w/o IUSE=qt5, cleanup usedep. Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../texstudio/files/texstudio-3.0.5-quazip1.patch | 19 +++++++++++ ...tudio-9999.ebuild => texstudio-3.0.5-r1.ebuild} | 37 ++++++++++++---------- ...tudio-9999.ebuild => texstudio-3.1.0-r1.ebuild} | 37 ++++++++++++---------- app-office/texstudio/texstudio-9999.ebuild | 30 +++++++++--------- 4 files changed, 74 insertions(+), 49 deletions(-) diff --git a/app-office/texstudio/files/texstudio-3.0.5-quazip1.patch b/app-office/texstudio/files/texstudio-3.0.5-quazip1.patch new file mode 100644 index 00000000000..a2a9033abd6 --- /dev/null +++ b/app-office/texstudio/files/texstudio-3.0.5-quazip1.patch @@ -0,0 +1,19 @@ +Fix build with QuaZip-1.0. + +--- a/texstudio.pro ++++ b/texstudio.pro +@@ -369,11 +369,9 @@ + isEmpty(USE_SYSTEM_QUAZIP) { + include(src/quazip/quazip/quazip.pri) + } else { +- message(System quazip5) +- isEmpty(QUAZIP_LIB): QUAZIP_LIB = -lquazip5 +- isEmpty(QUAZIP_INCLUDE): QUAZIP_INCLUDE = $${PREFIX}/include/quazip5 +- INCLUDEPATH += $${QUAZIP_INCLUDE} +- LIBS += $${QUAZIP_LIB} ++ message(System QuaZip) ++ CONFIG += link_pkgconfig ++ PKGCONFIG += quazip1-qt5 + } + + include(src/pdfviewer/pdfviewer.pri) diff --git a/app-office/texstudio/texstudio-9999.ebuild b/app-office/texstudio/texstudio-3.0.5-r1.ebuild similarity index 66% copy from app-office/texstudio/texstudio-9999.ebuild copy to app-office/texstudio/texstudio-3.0.5-r1.ebuild index feb15564ad1..17c7377b06e 100644 --- a/app-office/texstudio/texstudio-9999.ebuild +++ b/app-office/texstudio/texstudio-3.0.5-r1.ebuild @@ -3,22 +3,23 @@ EAPI=7 -inherit desktop git-r3 prefix qmake-utils xdg - MY_PV="${PV/_/}" +inherit desktop qmake-utils xdg + DESCRIPTION="Free cross-platform LaTeX editor (fork from texmakerX)" HOMEPAGE="https://www.texstudio.org https://github.com/texstudio-org/texstudio" -EGIT_REPO_URI="https://github.com/texstudio-org/texstudio.git" +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 ~ppc ~ppc64 ~x86" IUSE="video" -COMMON_DEPEND=" +DEPEND=" app-text/hunspell:= app-text/poppler[qt5] - >=dev-libs/quazip-0.7.2:0[qt5(+)] + >=dev-libs/quazip-0.7.3-r1:0= dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 @@ -34,30 +35,32 @@ COMMON_DEPEND=" sys-libs/zlib x11-libs/libX11 x11-libs/libXext - video? ( media-libs/phonon[qt5(+)] )" -RDEPEND="${COMMON_DEPEND} + video? ( >=media-libs/phonon-4.11.0 ) +" +RDEPEND="${DEPEND} app-text/ghostscript-gpl app-text/psutils media-libs/netpbm - virtual/latex-base" -DEPEND="${COMMON_DEPEND}" - + virtual/latex-base +" BDEPEND="virtual/pkgconfig" +PATCHES=( "${FILESDIR}/${P}-quazip1.patch" ) # TODO: upstream + src_prepare() { - default - # TODO: find hunspell quazip utilities/poppler-data qtsingleapplication -delete || die + xdg_src_prepare + + if has_version "<dev-libs/quazip-1.0"; then + sed -e "/PKGCONFIG/s/quazip1-qt5/quazip/" -i ${PN}.pro || die + fi + rm -r src/quazip || die if use video; then sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die fi - sed \ - -e '/qtsingleapplication.pri/d' \ + sed -e "/qtsingleapplication.pri/s/.*/CONFIG += qtsingleapplication/" \ -i ${PN}.pro || die - - cp "${FILESDIR}"/texmakerx_my.pri ${PN}.pri || die - eprefixify ${PN}.pri } src_configure() { diff --git a/app-office/texstudio/texstudio-9999.ebuild b/app-office/texstudio/texstudio-3.1.0-r1.ebuild similarity index 66% copy from app-office/texstudio/texstudio-9999.ebuild copy to app-office/texstudio/texstudio-3.1.0-r1.ebuild index feb15564ad1..3a47094b768 100644 --- a/app-office/texstudio/texstudio-9999.ebuild +++ b/app-office/texstudio/texstudio-3.1.0-r1.ebuild @@ -3,22 +3,23 @@ EAPI=7 -inherit desktop git-r3 prefix qmake-utils xdg - MY_PV="${PV/_/}" +inherit desktop qmake-utils xdg + DESCRIPTION="Free cross-platform LaTeX editor (fork from texmakerX)" HOMEPAGE="https://www.texstudio.org https://github.com/texstudio-org/texstudio" -EGIT_REPO_URI="https://github.com/texstudio-org/texstudio.git" +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 ~ppc ~ppc64 ~x86" IUSE="video" -COMMON_DEPEND=" +DEPEND=" app-text/hunspell:= app-text/poppler[qt5] - >=dev-libs/quazip-0.7.2:0[qt5(+)] + >=dev-libs/quazip-0.7.3-r1:0= dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 @@ -34,30 +35,32 @@ COMMON_DEPEND=" sys-libs/zlib x11-libs/libX11 x11-libs/libXext - video? ( media-libs/phonon[qt5(+)] )" -RDEPEND="${COMMON_DEPEND} + video? ( >=media-libs/phonon-4.11.0 ) +" +RDEPEND="${DEPEND} app-text/ghostscript-gpl app-text/psutils media-libs/netpbm - virtual/latex-base" -DEPEND="${COMMON_DEPEND}" - + virtual/latex-base +" BDEPEND="virtual/pkgconfig" +PATCHES=( "${FILESDIR}/${PN}-3.0.5-quazip1.patch" ) # TODO: upstream + src_prepare() { - default - # TODO: find hunspell quazip utilities/poppler-data qtsingleapplication -delete || die + xdg_src_prepare + + if has_version "<dev-libs/quazip-1.0"; then + sed -e "/PKGCONFIG/s/quazip1-qt5/quazip/" -i ${PN}.pro || die + fi + rm -r src/quazip || die if use video; then sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die fi - sed \ - -e '/qtsingleapplication.pri/d' \ + sed -e "/qtsingleapplication.pri/s/.*/CONFIG += qtsingleapplication/" \ -i ${PN}.pro || die - - cp "${FILESDIR}"/texmakerx_my.pri ${PN}.pri || die - eprefixify ${PN}.pri } src_configure() { diff --git a/app-office/texstudio/texstudio-9999.ebuild b/app-office/texstudio/texstudio-9999.ebuild index feb15564ad1..0526576f09e 100644 --- a/app-office/texstudio/texstudio-9999.ebuild +++ b/app-office/texstudio/texstudio-9999.ebuild @@ -3,9 +3,9 @@ EAPI=7 -inherit desktop git-r3 prefix qmake-utils xdg - MY_PV="${PV/_/}" +inherit desktop git-r3 qmake-utils xdg + DESCRIPTION="Free cross-platform LaTeX editor (fork from texmakerX)" HOMEPAGE="https://www.texstudio.org https://github.com/texstudio-org/texstudio" EGIT_REPO_URI="https://github.com/texstudio-org/texstudio.git" @@ -15,10 +15,10 @@ LICENSE="GPL-2" SLOT="0" IUSE="video" -COMMON_DEPEND=" +DEPEND=" app-text/hunspell:= app-text/poppler[qt5] - >=dev-libs/quazip-0.7.2:0[qt5(+)] + >=dev-libs/quazip-1.0:0= dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 @@ -34,30 +34,30 @@ COMMON_DEPEND=" sys-libs/zlib x11-libs/libX11 x11-libs/libXext - video? ( media-libs/phonon[qt5(+)] )" -RDEPEND="${COMMON_DEPEND} + video? ( >=media-libs/phonon-4.11.0 ) +" +RDEPEND="${DEPEND} app-text/ghostscript-gpl app-text/psutils media-libs/netpbm - virtual/latex-base" -DEPEND="${COMMON_DEPEND}" - + virtual/latex-base +" BDEPEND="virtual/pkgconfig" +PATCHES=( "${FILESDIR}/${PN}-3.0.5-quazip1.patch" ) # TODO: upstream + src_prepare() { - default + xdg_src_prepare + + rm -r src/quazip || die # TODO: find hunspell quazip utilities/poppler-data qtsingleapplication -delete || die if use video; then sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die fi - sed \ - -e '/qtsingleapplication.pri/d' \ + sed -e "/qtsingleapplication.pri/s/.*/CONFIG += qtsingleapplication/" \ -i ${PN}.pro || die - - cp "${FILESDIR}"/texmakerx_my.pri ${PN}.pri || die - eprefixify ${PN}.pri } src_configure() {