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 24073138359 for ; Sat, 18 Jul 2020 08:41:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0DA70E08F4; Sat, 18 Jul 2020 08:41:22 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 DE513E08F4 for ; Sat, 18 Jul 2020 08:41:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 67B7B34F06A for ; Sat, 18 Jul 2020 08:41:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 951272DD for ; Sat, 18 Jul 2020 08:41:16 +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: <1595061116.c97e7b1c25f32e8e6b0fb70a74b9af2ad607db4c.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/nomacs/files/, media-gfx/nomacs/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/nomacs/Manifest media-gfx/nomacs/files/nomacs-3.12-gcc9.patch media-gfx/nomacs/nomacs-3.12.ebuild X-VCS-Directories: media-gfx/nomacs/files/ media-gfx/nomacs/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: c97e7b1c25f32e8e6b0fb70a74b9af2ad607db4c X-VCS-Branch: master Date: Sat, 18 Jul 2020 08:41:16 +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: ae1c38fb-9b65-486e-a95b-e5dcd02e52f6 X-Archives-Hash: f97e0541128a1be3e88d9ad75e4d3bf9 commit: c97e7b1c25f32e8e6b0fb70a74b9af2ad607db4c Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jul 18 00:53:48 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jul 18 08:31:56 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c97e7b1c media-gfx/nomacs: Drop 3.12 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/nomacs/Manifest | 1 - media-gfx/nomacs/files/nomacs-3.12-gcc9.patch | 39 --------------- media-gfx/nomacs/nomacs-3.12.ebuild | 69 --------------------------- 3 files changed, 109 deletions(-) diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest index 8b3319018db..b35cedb5a0a 100644 --- a/media-gfx/nomacs/Manifest +++ b/media-gfx/nomacs/Manifest @@ -1,3 +1,2 @@ -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/files/nomacs-3.12-gcc9.patch b/media-gfx/nomacs/files/nomacs-3.12-gcc9.patch deleted file mode 100644 index ccf6ea31d9d..00000000000 --- a/media-gfx/nomacs/files/nomacs-3.12-gcc9.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 37805e3bc8753970127db101f4aa0c061bc5a70d Mon Sep 17 00:00:00 2001 -From: Michael Palimaka -Date: Sun, 9 Jun 2019 19:15:28 +1000 -Subject: [PATCH] Fix build with GCC9 - ---- - ImageLounge/src/DkCore/DkMetaData.cpp | 2 ++ - ImageLounge/src/DkGui/DkNoMacs.cpp | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/ImageLounge/src/DkCore/DkMetaData.cpp b/ImageLounge/src/DkCore/DkMetaData.cpp -index 7540f7b9..fe2bc7ec 100644 ---- a/src/DkCore/DkMetaData.cpp -+++ b/src/DkCore/DkMetaData.cpp -@@ -42,6 +42,8 @@ - #include - #pragma warning(pop) // no warnings from includes - end - -+#include -+ - namespace nmc { - - // DkMetaDataT -------------------------------------------------------------------- -diff --git a/ImageLounge/src/DkGui/DkNoMacs.cpp b/ImageLounge/src/DkGui/DkNoMacs.cpp -index edda14cd..8fcdb59c 100644 ---- a/src/DkGui/DkNoMacs.cpp -+++ b/src/DkGui/DkNoMacs.cpp -@@ -99,6 +99,8 @@ - - #include - -+#include -+ - namespace nmc { - - DkNomacsOSXEventFilter::DkNomacsOSXEventFilter(QObject *parent) : QObject(parent) { --- -2.21.0 - diff --git a/media-gfx/nomacs/nomacs-3.12.ebuild b/media-gfx/nomacs/nomacs-3.12.ebuild deleted file mode 100644 index a527bc46b3e..00000000000 --- a/media-gfx/nomacs/nomacs-3.12.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake xdg-utils - -DESCRIPTION="Qt-based image viewer" -HOMEPAGE="https://nomacs.org/" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux" -IUSE="+jpeg +opencv 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:0 - ) - zip? ( dev-libs/quazip[qt5(+)] ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" - -S="${WORKDIR}/${P}/ImageLounge" - -DOCS=( src/changelog.txt ) -PATCHES=( "${FILESDIR}/${P}-gcc9.patch" ) - -src_configure() { - local mycmakeargs=( - -DENABLE_CODE_COV=OFF - -DUSE_SYSTEM_QUAZIP=ON - -DENABLE_TRANSLATIONS=ON - -DENABLE_OPENCV=$(usex opencv) - -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 -}