commit: 24b983dc9155c89be0173954e11891e1fec296b0 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Jan 7 20:02:40 2017 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Jan 7 20:26:10 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24b983dc
media-gfx/nomacs: Drop old, broken by quazip-0.7.2 ebuilds Package-Manager: portage-2.3.0 media-gfx/nomacs/Manifest | 2 - .../nomacs/files/nomacs-3.0.0-quazip-build.patch | 32 ---------- .../nomacs/files/nomacs-3.0.0-quazip-link.patch | 25 -------- .../nomacs/files/nomacs-3.0.0-tiff-build.patch | 28 --------- media-gfx/nomacs/nomacs-3.0.0.ebuild | 69 ---------------------- media-gfx/nomacs/nomacs-3.2.0.ebuild | 59 ------------------ media-gfx/nomacs/nomacs-3.4.ebuild | 63 -------------------- 7 files changed, 278 deletions(-) diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest index e2e9dbf..e0d5832 100644 --- a/media-gfx/nomacs/Manifest +++ b/media-gfx/nomacs/Manifest @@ -1,4 +1,2 @@ DIST nomacs-2.4.6-source.tar.bz2 1457529 SHA256 b846e335c768593e9f36cdee1a5c186e7794c76770ea3cadc87cf264153e8960 SHA512 9389df46635e619e198388e8b161a840d15227dd902cf04c250e71211098a10fd808d710ebab71f3e9a437bdca9451f966c46d22c2ce2379b94b678e79e92d71 WHIRLPOOL 97ccd02cbeabda62888ed25065cd24ce9a297b7bae3f9343e903d0223e8107cab601834fbc6dcf31a0b7f8d9e93052ba5a1a08e9c5e006027994c27bdb6f3940 -DIST nomacs-3.0.0-source.tar.bz2 1465264 SHA256 a0e30cf2795dc18d1af29435145ea37f0cbb8dfb4013e01f5af267039560e476 SHA512 2a536012eed6ba59227aab9374fc22b7c9d49340d335c6c124cdc8f366f279a62edc37407dff47f1444b0d52f9df13e165ee76d44d453badefbffe5effbf8449 WHIRLPOOL 9a75bba86531b87025b8a01d96c9a12a2549d6d462cc0baeb37e06e37e419cb6e81d3be5c2b4894adb001210429f851dea4035aa281104566d1b168c9a81938d -DIST nomacs-3.2.0-source.tar.bz2 1090076 SHA256 82462f36659b0b09ef4169d927d0861244ecf83790ba03185a244440278c49ad SHA512 efd27d97a3843d2527c4423321ad946f32381a917f328878a04e39275e0fde2879e5836eb4ac2a54b489c47364f4ad76fd8dc7190fc8ebc1d9507d957fd66049 WHIRLPOOL 076390f77bcc47e88023f65bcdc5d17e939b08419c7ed9b3ed65f141a76d65ce64c3256b57fed3aecc7cd2b68b89dd871734ac248c6d1719e977ff14e0b117ec DIST nomacs-3.4.tar.gz 30026261 SHA256 552eda88aedea48831ce354095e3aad47892b4b5029f424171bedb68271c2a2f SHA512 67a1b57971dc373d5a3be75b7deaff6702893252568eef135903754b2465416a58b40f18f55cf2994c8c3853ae96b82506c1caf26b0e645c20179a9cd81c0d36 WHIRLPOOL f082d568ba56eaa1effc5e8552d16b816d558b7d4c2d7ddfd14a39f8805490d772116ca6ee35c8a38bd6b5fc69917287b7c596986f6a15b854bfebcbbe14304f diff --git a/media-gfx/nomacs/files/nomacs-3.0.0-quazip-build.patch b/media-gfx/nomacs/files/nomacs-3.0.0-quazip-build.patch deleted file mode 100644 index 5f33b65..00000000 --- a/media-gfx/nomacs/files/nomacs-3.0.0-quazip-build.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 204dd809ae0d6287385905d44c1a60a38a7c4084 Mon Sep 17 00:00:00 2001 -From: diemmarkus <[email protected]> -Date: Thu, 14 Jan 2016 16:35:55 +0100 -Subject: [PATCH] #44 (github) fix proposed by @kensingtion - ---- - ImageLounge/src/DkImageLoader.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/ImageLounge/src/DkImageLoader.cpp b/ImageLounge/src/DkImageLoader.cpp -index 5d66e09..3a00010 100644 ---- a/ImageLounge/src/DkImageLoader.cpp -+++ b/ImageLounge/src/DkImageLoader.cpp -@@ -512,6 +512,7 @@ QSharedPointer<DkImageContainerT> DkImageLoader::getSkippedImage(int skipIdx, bo - - } - -+#ifdef WITH_QUAZIP - if (mCurrentImage && (newFileIdx < 0 || newFileIdx >= mImages.size()) && mCurrentImage->isFromZip() && mCurrentImage->getZipData()) { - - // load the zip again and go on from there -@@ -522,6 +523,7 @@ QSharedPointer<DkImageContainerT> DkImageLoader::getSkippedImage(int skipIdx, bo - - return getSkippedImage(newFileIdx); - } -+#endif - - // this should never happen! - if (mImages.empty()) { --- -2.4.10 - diff --git a/media-gfx/nomacs/files/nomacs-3.0.0-quazip-link.patch b/media-gfx/nomacs/files/nomacs-3.0.0-quazip-link.patch deleted file mode 100644 index d31f650..00000000 --- a/media-gfx/nomacs/files/nomacs-3.0.0-quazip-link.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 060f4e972fec0308404a7e535b43254b06908a84 Mon Sep 17 00:00:00 2001 -From: Michael Palimaka <[email protected]> -Date: Thu, 14 Jan 2016 00:24:05 +1100 -Subject: [PATCH] Fix linking failure with system quazip. - ---- - ImageLounge/cmake/UnixBuildTarget.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ImageLounge/cmake/UnixBuildTarget.cmake b/ImageLounge/cmake/UnixBuildTarget.cmake -index ce95617..8a59c97 100644 ---- a/ImageLounge/cmake/UnixBuildTarget.cmake -+++ b/ImageLounge/cmake/UnixBuildTarget.cmake -@@ -93,7 +93,7 @@ else() - - add_library(${DLL_NAME} SHARED ${NOMACS_SOURCES} ${NOMACS_UI} ${NOMACS_HEADERS} ${NOMACS_RC} ${LIBQPSD_SOURCES} ${LIBQPSD_HEADERS} ${WEBP_SOURCE} ${QUAZIP_SOURCES} ${NOMACS_RESOURCES} ${NOMACS_RCC}) - target_include_directories(${DLL_NAME} PRIVATE ${OpenCV_INCLUDE_DIRS}) -- target_link_libraries(${DLL_NAME} ${QT_LIBRARIES} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBRARIES} ${VERSION_LIB} ${TIFF_LIBRARIES} ${HUPNP_LIBS} ${HUPNPAV_LIBS} ${WEBP_LIBRARIES} ${WEBP_STATIC_LIBRARIES}) -+ target_link_libraries(${DLL_NAME} ${QT_LIBRARIES} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBRARIES} ${VERSION_LIB} ${TIFF_LIBRARIES} ${HUPNP_LIBS} ${HUPNPAV_LIBS} ${WEBP_LIBRARIES} ${QUAZIP_LIBRARIES} ${WEBP_STATIC_LIBRARIES}) - add_dependencies(${BINARY_NAME} ${DLL_NAME}) - set_target_properties(${DLL_NAME} PROPERTIES PREFIX "") - --- -2.4.10 - diff --git a/media-gfx/nomacs/files/nomacs-3.0.0-tiff-build.patch b/media-gfx/nomacs/files/nomacs-3.0.0-tiff-build.patch deleted file mode 100644 index 71f564c..00000000 --- a/media-gfx/nomacs/files/nomacs-3.0.0-tiff-build.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0ac51051b7e9460a2958917750d7c31072318313 Mon Sep 17 00:00:00 2001 -From: Michael Palimaka <[email protected]> -Date: Thu, 14 Jan 2016 00:55:24 +1100 -Subject: [PATCH] Fix build with tiff disabled. - ---- - ImageLounge/src/DkBasicLoader.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/ImageLounge/src/DkBasicLoader.cpp b/ImageLounge/src/DkBasicLoader.cpp -index 67ef31f..8c2c71e 100644 ---- a/ImageLounge/src/DkBasicLoader.cpp -+++ b/ImageLounge/src/DkBasicLoader.cpp -@@ -98,9 +98,11 @@ - #endif - - #else -+#ifdef WIN32 - #include <olectl.h> - #pragma comment(lib, "oleaut32.lib") - #endif -+#endif - - #pragma warning(pop) - --- -2.4.10 - diff --git a/media-gfx/nomacs/nomacs-3.0.0.ebuild b/media-gfx/nomacs/nomacs-3.0.0.ebuild deleted file mode 100644 index 3915d6d..00000000 --- a/media-gfx/nomacs/nomacs-3.0.0.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit cmake-utils fdo-mime - -DESCRIPTION="Qt-based image viewer" -HOMEPAGE="http://www.nomacs.org/"; -SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}-source.tar.bz2"; - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~amd64-linux" -IUSE="opencv raw tiff webp zip" - -REQUIRED_USE=" - raw? ( opencv ) - tiff? ( opencv ) -" - -RDEPEND=" - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - >=media-gfx/exiv2-0.25:= - opencv? ( media-libs/opencv:=[qt5] ) - raw? ( >=media-libs/libraw-0.14:= ) - tiff? ( media-libs/tiff:0 ) - webp? ( >=media-libs/libwebp-0.3.1:= ) - zip? ( dev-libs/quazip[qt5] ) -" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/${P}-tiff-build.patch" - "${FILESDIR}/${P}-quazip-build.patch" - "${FILESDIR}/${P}-quazip-link.patch" - "${FILESDIR}/${P}-opencv3.patch" -) - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_enable opencv) - $(cmake-utils_use_enable raw) - $(cmake-utils_use_enable tiff) - $(cmake-utils_use_enable webp) - $(cmake-utils_use_enable zip QUAZIP) - -DUSE_SYSTEM_WEBP=ON - -DUSE_SYSTEM_QUAZIP=ON - ) - cmake-utils_src_configure -} - -pkg_postinst() { - fdo-mime_desktop_database_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update -} diff --git a/media-gfx/nomacs/nomacs-3.2.0.ebuild b/media-gfx/nomacs/nomacs-3.2.0.ebuild deleted file mode 100644 index 7ddaeb3..00000000 --- a/media-gfx/nomacs/nomacs-3.2.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit cmake-utils fdo-mime - -DESCRIPTION="Qt-based image viewer" -HOMEPAGE="http://www.nomacs.org/"; -SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}-source.tar.bz2"; - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~amd64-linux" -IUSE="opencv raw tiff zip" - -REQUIRED_USE=" - raw? ( opencv ) - tiff? ( opencv ) -" - -RDEPEND=" - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - >=media-gfx/exiv2-0.25:= - opencv? ( media-libs/opencv:=[qt5] ) - raw? ( >=media-libs/libraw-0.14:= ) - tiff? ( media-libs/tiff:0 ) - zip? ( dev-libs/quazip[qt5] ) -" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 - virtual/pkgconfig -" - -src_configure() { - local mycmakeargs=( - -DENABLE_OPENCV=$(usex opencv) - -DENABLE_RAW=$(usex raw) - -DENABLE_TIFF=$(usex tiff) - -DENABLE_QUAZIP=$(usex zip) - -DUSE_SYSTEM_QUAZIP=ON - ) - cmake-utils_src_configure -} - -pkg_postinst() { - fdo-mime_desktop_database_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update -} diff --git a/media-gfx/nomacs/nomacs-3.4.ebuild b/media-gfx/nomacs/nomacs-3.4.ebuild deleted file mode 100644 index a113420..00000000 --- a/media-gfx/nomacs/nomacs-3.4.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit cmake-utils fdo-mime - -DESCRIPTION="Qt-based image viewer" -HOMEPAGE="http://www.nomacs.org/"; -SRC_URI="https://github.com/${PN}/${PN}/archive/3.4.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~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-0.25:= - opencv? ( media-libs/opencv:=[-qt4(-)] ) - raw? ( >=media-libs/libraw-0.14:= ) - tiff? ( media-libs/tiff:0 ) - zip? ( dev-libs/quazip[qt5] ) -" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 - virtual/pkgconfig -" - -S="${WORKDIR}/${P}/ImageLounge" - -PATCHES=( "${FILESDIR}/${P}-no-opencv.patch" ) # bug 592134 - -src_configure() { - local mycmakeargs=( - -DENABLE_OPENCV=$(usex opencv) - -DENABLE_RAW=$(usex raw) - -DENABLE_TIFF=$(usex tiff) - -DENABLE_QUAZIP=$(usex zip) - -DUSE_SYSTEM_QUAZIP=ON - ) - cmake-utils_src_configure -} - -pkg_postinst() { - fdo-mime_desktop_database_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update -}
