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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 785051382C5 for ; Tue, 16 Jun 2020 13:39:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5B7CCE0D6C; Tue, 16 Jun 2020 13:39:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 092C2E0D6C for ; Tue, 16 Jun 2020 13:39:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0766F34F296 for ; Tue, 16 Jun 2020 13:39:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6805727F for ; Tue, 16 Jun 2020 13:39:11 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1592314738.f0f3dd60604bd36d35ee19e6d8cbf6e58f69386b.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/nomacs/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/nomacs/Manifest media-gfx/nomacs/metadata.xml media-gfx/nomacs/nomacs-3.14.2.ebuild X-VCS-Directories: media-gfx/nomacs/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: f0f3dd60604bd36d35ee19e6d8cbf6e58f69386b X-VCS-Branch: master Date: Tue, 16 Jun 2020 13:39:11 +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: 0078bcc0-bbb8-4ef4-b9d2-f2fa0c8d784a X-Archives-Hash: 4b7650f304564f8924e35e866e3fe86a commit: f0f3dd60604bd36d35ee19e6d8cbf6e58f69386b Author: Sergey Torokhov yandex ru> AuthorDate: Tue May 5 11:08:49 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jun 16 13:38:58 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0f3dd60 media-gfx/nomacs: 3.14.2 version bump. Add plugins support. The updated nomacs ebuild contains: - add 'plugins' USE-flag with appropriate SRC_URI variable, and changes within src_unpack() and src_configure() functions; - add src_prepare() section as there is no PATCHES array in ebuild with fix for nomacs-plugins intallation and search path. Closes: https://bugs.gentoo.org/712918 Signed-off-by: Sergey Torokhov yandex.ru> Closes: https://github.com/gentoo/gentoo/pull/15649 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/nomacs/Manifest | 2 + media-gfx/nomacs/metadata.xml | 1 + media-gfx/nomacs/nomacs-3.14.2.ebuild | 91 +++++++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+) diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest index e0aca8ce306..8b3319018db 100644 --- a/media-gfx/nomacs/Manifest +++ b/media-gfx/nomacs/Manifest @@ -1 +1,3 @@ DIST nomacs-3.12.tar.gz 1736648 BLAKE2B 533e18dec4be5d945213ccd629262a2cbae1eba93599f43be0a98d32d0b54d9caad7d963809f2fc9bb5c1ba682a39f44763b5d04e50c6e86658f6cd84324f3d2 SHA512 4508354d48a6115cd40f701cc90cbbcb84490e99eaac0295db48f6fea99550d5e2b3e7365128d0c9cc4eeb621906f55e275603d84cb8b6bb164d0b5e2e192119 +DIST nomacs-3.14.2.tar.gz 2169504 BLAKE2B 6050ddba3ddbdeb7d1fbd29831d5dfbee066b61398ef46be4145a287d565eb2d55d59f47bc9e9e34a10379f8e0e676ca1f5373389a0d35c27fe85cff5da3fded SHA512 58104c85078bdbff7f65625658bb01b152631470eea93a43494eed55ae5e2441b7bcf3ed6c8f1aef07831bc99c80af94467fcc0e15dc1d282ef313bfcb3c81e9 +DIST nomacs-plugins-3.14.tar.gz 514472 BLAKE2B fe8e1608c0a0ed502ea82efe80a9cfab3a9aff3ca7e8cbecfcb199377d137f5c19ad176940ef1f1109938634af3548008da1311339e6da78b8b5b983102bebb6 SHA512 c0bca87e50b7b91d80a9d6afd95eeb1d6730b17b9a28ad4109514b36c42781b3f67b25f68f48c0953110d1e02bb03762e813af9c1ec2851c072b4aea74969cbd diff --git a/media-gfx/nomacs/metadata.xml b/media-gfx/nomacs/metadata.xml index b27b6fcfc0e..17d5f379444 100644 --- a/media-gfx/nomacs/metadata.xml +++ b/media-gfx/nomacs/metadata.xml @@ -12,5 +12,6 @@ Build support for media-libs/opencv + Build plugins diff --git a/media-gfx/nomacs/nomacs-3.14.2.ebuild b/media-gfx/nomacs/nomacs-3.14.2.ebuild new file mode 100644 index 00000000000..ff12e28b2c9 --- /dev/null +++ b/media-gfx/nomacs/nomacs-3.14.2.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake xdg-utils + +PLUGIN_PKG="${PN}-plugins-$(ver_cut 1-2)" + +DESCRIPTION="Qt-based image viewer" +HOMEPAGE="https://nomacs.org/" +SRC_URI=" + https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz + plugins? ( https://github.com/${PN}/${PN}-plugins/archive/$(ver_cut 1-2).tar.gz -> ${PLUGIN_PKG}.tar.gz ) +" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux" +IUSE="+jpeg +opencv plugins raw tiff zip" + +REQUIRED_USE=" + raw? ( opencv ) + tiff? ( opencv ) +" + +RDEPEND=" + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5[jpeg?] + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + media-gfx/exiv2:= + opencv? ( >=media-libs/opencv-3.4:= ) + raw? ( media-libs/libraw:= ) + tiff? ( + dev-qt/qtimageformats:5 + media-libs/tiff + ) + zip? ( dev-libs/quazip ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-qt/linguist-tools:5 + virtual/pkgconfig +" + +S="${WORKDIR}/${P}/ImageLounge" + +DOCS=( src/changelog.txt ) + +src_unpack() { + unpack "${P}.tar.gz" + if use plugins ; then + unpack "${PLUGIN_PKG}.tar.gz" + mv "${PLUGIN_PKG}" "${S}/plugins" || die + fi +} + +src_prepare() { + cmake_src_prepare + if use plugins ; then + # Fix nomacs-plugins installation and search library directory + sed -i "s:lib/nomacs-plugins:$(get_libdir)/nomacs-plugins:" "${S}/plugins/cmake/Utils.cmake" || die + sed -i "s:lib/nomacs-plugins:$(get_libdir)/nomacs-plugins:" "${S}/src/DkCore/DkPluginManager.cpp" || die + fi +} + +src_configure() { + local mycmakeargs=( + -DENABLE_CODE_COV=OFF + -DUSE_SYSTEM_QUAZIP=ON + -DENABLE_TRANSLATIONS=ON + -DENABLE_OPENCV=$(usex opencv) + -DENABLE_PLUGINS=$(usex plugins) + -DENABLE_RAW=$(usex raw) + -DENABLE_TIFF=$(usex tiff) + -DENABLE_QUAZIP=$(usex zip) + ) + cmake_src_configure +} + +pkg_postinst() { + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_desktop_database_update +}