From 76cba73c47c8694e74377004634daca18f2d9c08 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Apr 2018 01:05:40 +0100 Subject: gentoo resync : 14.04.2018 --- media-gfx/Manifest.gz | Bin 42607 -> 42606 bytes media-gfx/farbfeld/Manifest | 6 +- media-gfx/farbfeld/farbfeld-2.ebuild | 44 -------- media-gfx/farbfeld/farbfeld-4.ebuild | 40 ++++++++ media-gfx/farbfeld/farbfeld-9999.ebuild | 3 +- media-gfx/krita/Manifest | 4 +- media-gfx/krita/krita-4.0.0.ebuild | 111 --------------------- media-gfx/krita/krita-4.0.1.ebuild | 111 +++++++++++++++++++++ media-gfx/nomacs/Manifest | 3 + media-gfx/nomacs/files/nomacs-3.8.1-qt-5.11.patch | 103 +++++++++++++++++++ media-gfx/nomacs/nomacs-3.8.1.ebuild | 83 +++++++++++++++ media-gfx/sane-frontends/Manifest | 2 +- .../sane-frontends/sane-frontends-1.0.14-r3.ebuild | 3 +- media-gfx/shotwell/Manifest | 2 + media-gfx/shotwell/shotwell-0.28.2.ebuild | 63 ++++++++++++ 15 files changed, 413 insertions(+), 165 deletions(-) delete mode 100644 media-gfx/farbfeld/farbfeld-2.ebuild create mode 100644 media-gfx/farbfeld/farbfeld-4.ebuild delete mode 100644 media-gfx/krita/krita-4.0.0.ebuild create mode 100644 media-gfx/krita/krita-4.0.1.ebuild create mode 100644 media-gfx/nomacs/files/nomacs-3.8.1-qt-5.11.patch create mode 100644 media-gfx/nomacs/nomacs-3.8.1.ebuild create mode 100644 media-gfx/shotwell/shotwell-0.28.2.ebuild (limited to 'media-gfx') diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz index 71582b8592ca..03552c2c1d69 100644 Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ diff --git a/media-gfx/farbfeld/Manifest b/media-gfx/farbfeld/Manifest index b56e00291428..f656b1c594b4 100644 --- a/media-gfx/farbfeld/Manifest +++ b/media-gfx/farbfeld/Manifest @@ -1,7 +1,7 @@ AUX farbfeld-3-as-needed.patch 249 BLAKE2B cb6b8fa0dbdfdf7fb67c519d1d740f392b22eeb71a65eeb0db3ef63a39747996bf6da903681b78d897bee271749e87011e0c4922513621e33390789b382f346f SHA512 c00ad29d4c06777896b0915b8277b25eecf2d09312c2fbb2f0d5dbde9150ad3fb9d4f1d49fd6fdd742fdabeede128c9dd827c272604edcda017a959ca68ee738 -DIST farbfeld-2.tar.gz 6646 BLAKE2B 38a22640699c19fd8580b9347988d471d434c75fc839395dcd163ef6a7a3d5610300dc5167f77eeb26e91d1338562812a4faf5b122fd72b5a81eb1a1ada44776 SHA512 04471f0d6092433083b1441c17fb80db27fcedea6a12ddab3b08eaf9731da06f48560cf49124b56e1e27d7de2b69109b0ce38513ee90c735ac966dc2132e000f DIST farbfeld-3.tar.gz 10169 BLAKE2B 8d548cb33950d1b8f94f79ea5e8dbff445f2378f1c75cb4945f8f48ae9fec8075d38bc83a6bc99184182f3b1920b15454853c0a899de2e0756f2614bc3f684aa SHA512 4f1e44282810bd2724f78857bcde401b82945375c5472b31e39250d660efffd425e0a2da5aecf0133ad3d414c31214d073d00f519bc83960b5bbfd53df3b1c49 -EBUILD farbfeld-2.ebuild 849 BLAKE2B 72cdff5fc3cefe67fe3d30227d5554b19f8c6718874ee88deadde8c8b37448c6ac602b31214e35cc7ce71a892a2cbc01c786a1bc1e7c66ca001fbb80e856f9e9 SHA512 f44594b067f339c4b1b7358de6a74c933a3a9cc23193bc76109b129540e9d492081bef124319211bf526bd9ef831623e84f3dd71d09e0809997fb7c32ac577cb +DIST farbfeld-4.tar.gz 10340 BLAKE2B 0ef13baabe70f0be485746602a77eb4002c8611d1ccb0468de512b687eb9a5c48dafb81c12274e29377697bc70d3586f4a71b47e82ffd3f6238398741565c1b9 SHA512 5139dd81cf1e3cb7a32108c0acad0e4ae0de13e86b997f1a759aa1b1f7be6c1ad2a93a69af7126e3512a7c9b1669a2a301ff60171b098b3450f1da0594e3b6ac EBUILD farbfeld-3.ebuild 837 BLAKE2B 82a4f748470f0ff236ba6729305106b9f0d99566094531d22f5ac4640c16f78a6dd1a034c16b977788bec02d0efcb5c972940ad30a2cc9b6df2d4d4bc0ccfafb SHA512 904f6887c170f56fd5e56e5af4bfde155049645172e0910f9e9f270e5ffb9b9463b9905b86fcea5bc0ca56a24c9b72d5eb9e38d70d19dde00ac7d02236b3b8e9 -EBUILD farbfeld-9999.ebuild 785 BLAKE2B 803d7bf0024fa01aaf856a8a114f67f501d0d103d9e0955c687dad3bafd1747dab90767c4051e4de06769baf4e51dbe767906c0f80f60ff95069dedb86a68b1d SHA512 12f5e559f0ba1e588f9f89ad72585c141cb3942e759ea10d1ec8ed0d8035474e65bb472511382e7fb58095cb66188d7392a0eddbd7ac66a5a7b00df9ca5d22f0 +EBUILD farbfeld-4.ebuild 761 BLAKE2B e5746da38c2a34fe6cc9cff7764f19988d2aa15b28776835f7afb0e975d93b0faa970920b02f806aeba06447ced6ebe07bb8689fdec323ae5f0ccbf46911e8cb SHA512 d17a0f75ed5063c3a898c6eaab81031e3604364e1dfef5209ceb6523e25cd1c4df4efb421f738f64bbf2ee0fc703d9dcbaa70703907a5ca891b013232c2d807d +EBUILD farbfeld-9999.ebuild 760 BLAKE2B 56fd29a6ba7c7627ff41fbfd44230dab08ccb3a742cf14120d7c92592fdea5c732dea0675bbb95e89b9a7b92b1584ca132a3fe1813da39ac543d56057f92d9f8 SHA512 dd41545e7f16f4700e3fc711297d66b41ce4697cc9e7acde2cb8cb97c257ea52e038756204c415abe782c7bf30e7075fe6da08f08141944a486aba7a0b896e84 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993 diff --git a/media-gfx/farbfeld/farbfeld-2.ebuild b/media-gfx/farbfeld/farbfeld-2.ebuild deleted file mode 100644 index 6ca2302b9a04..000000000000 --- a/media-gfx/farbfeld/farbfeld-2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit toolchain-funcs - -DESCRIPTION="farbfeld simple image format tools" -HOMEPAGE="https://tools.suckless.org/farbfeld/" -SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=" - media-libs/libjpeg-turbo - media-libs/libpng:* -" -DEPEND=" - ${RDEPEND} -" - -src_prepare() { - sed config.mk \ - -e '/^CC/d' \ - -e 's|/usr/local|/usr|g' \ - -e 's|^CFLAGS.*|CFLAGS += -std=c99 -pedantic -Wall -Wextra $(INCS) $(CPPFLAGS)|g' \ - -e 's|^LDFLAGS.*|LDFLAGS += $(LIBS)|g' \ - -e 's|{|(|g;s|}|)|g' \ - -i || die - - sed Makefile \ - -e 's|{|(|g;s|}|)|g' \ - -e 's|^ @| |g' \ - -i || die -} - -src_compile() { - emake CC=$(tc-getCC) -} - -src_install() { - emake DESTDIR="${D}" install MANPREFIX=/usr/share/man -} diff --git a/media-gfx/farbfeld/farbfeld-4.ebuild b/media-gfx/farbfeld/farbfeld-4.ebuild new file mode 100644 index 000000000000..d41a6ee63dd3 --- /dev/null +++ b/media-gfx/farbfeld/farbfeld-4.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit toolchain-funcs + +DESCRIPTION="farbfeld simple image format tools" +HOMEPAGE="https://tools.suckless.org/farbfeld/" +SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" + media-libs/libjpeg-turbo + media-libs/libpng:* +" +DEPEND=" + ${RDEPEND} +" + +src_prepare() { + default + + sed -i \ + -e '/^CC/d' \ + -e 's|/usr/local|/usr|g' \ + -e 's|^CFLAGS.*|CFLAGS += -std=c99 -pedantic -Wall -Wextra $(INCS) $(CPPFLAGS)|g' \ + -e 's|^LDFLAGS.*|LDFLAGS += $(LIBS)|g' \ + config.mk || die +} + +src_compile() { + emake CC=$(tc-getCC) +} + +src_install() { + emake DESTDIR="${D}" install MANPREFIX=/usr/share/man +} diff --git a/media-gfx/farbfeld/farbfeld-9999.ebuild b/media-gfx/farbfeld/farbfeld-9999.ebuild index 7ba44661350a..7633fe053abd 100644 --- a/media-gfx/farbfeld/farbfeld-9999.ebuild +++ b/media-gfx/farbfeld/farbfeld-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -28,7 +28,6 @@ src_prepare() { -e 's|/usr/local|/usr|g' \ -e 's|^CFLAGS.*|CFLAGS += -std=c99 -pedantic -Wall -Wextra $(INCS) $(CPPFLAGS)|g' \ -e 's|^LDFLAGS.*|LDFLAGS += $(LIBS)|g' \ - -e 's|{|(|g;s|}|)|g' \ config.mk || die } diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest index e909da16b0b8..6e0e85099253 100644 --- a/media-gfx/krita/Manifest +++ b/media-gfx/krita/Manifest @@ -1,6 +1,6 @@ AUX krita-3.2.0-tests-optional.patch 8806 BLAKE2B 90355102edb82e69539dbbedae83a9bb51f98a34fdfd85758e4b4427ed5ec058cfe28931fb6a1c604a9631ff1b3b5c86651a7d6fde80d2002d7e7a2ef6f6aa69 SHA512 aeba8043f7a31a24fad6b515608a881b34bffd0f05502ddd7591f8bb7a7c82eae5ec21bcab4c17091255f94422817ca5e89d97836ab0ce9298f29350a1666b34 DIST krita-3.3.3.tar.gz 207582956 BLAKE2B 36fd2978956fbba870ff8d8c28c31db0731742385620d6b5fd0cc275d74bf6352635c4fd4a537a87b7994fa41d140ee05000593d5a95cd288fd07959e8ef1693 SHA512 b6dc30809e0d6c19fee4bbb240aa53c65e88361ebe273c73c2f24f43904c3cd51719dadb9c11fb7f691f17d75732374295ce904810d8893b7f95b45f859901e0 -DIST krita-4.0.0.tar.gz 237309220 BLAKE2B bbc4fe9b32359348ca1f9a83a6f66cd5972ece2ba6e17c79799e94ff2e8d3968ad0cf6a02c8466c37bd562dc1ee47ce4bacf790f44aa63e02f867cd266d919ce SHA512 026f15c747eedf1335791a607984acbda049a63550b94fe19c99028499668ccbc723dcd66d8b4d3f981035a040121a5fd6a8f35ced911748578af5c88408eaab +DIST krita-4.0.1.tar.gz 237493152 BLAKE2B 4029ac08ec17a2f56524404c8d4d61bf73d52d0aae7e783d02899eab9a47750bf19ff201a58cbb3c9a062d55742676d829938b7c456bd7c4ab96988ae5c113f2 SHA512 51ec8bfa7936a081bd62ef7020b16f534042fc50abc1218a5d40721f6b6672791700cb09d006a4975491fddc23358d5ef64322231dd7e3284f943bbabc16a980 EBUILD krita-3.3.3.ebuild 2553 BLAKE2B a1d97fa3af8a79da72fa2dbdddd73135892d9df066f9316359036eed49d0bf21cc57ff2aab2d9e43549bab839d3949e0623aea9fc946337fbd1004ef10df6404 SHA512 c750f5904eddcee56469a463c0421250d905d9d6bb3f97711e19ee98b1e3b614c07e6fd68cc46597b4e500d8c8b51f9b10401cdb54622243cdc6491807657662 -EBUILD krita-4.0.0.ebuild 3030 BLAKE2B acbf119bdac45ed6badfb1fb79586e998f6d46652d70c3dc666259de586d7b9d755561404c8b376a527bb34906aa50875e52d2ded26d76519c2c2827e6f7f940 SHA512 f25696276b5fcf5574b3484deff8a755e067071311bd6995de166cbae5caf87ec304c481ff9ce229279a09a2566adab230b7cc17786b721f91909a1102e33053 +EBUILD krita-4.0.1.ebuild 3027 BLAKE2B 32d9132b221c68d5e22fff6a7e234f1f34099a3aec054fc5d3becc4dc69f7ed205ba2f3468945346fc5890e10ad0f7301da5833d70b1039ac9993d697c0e0a21 SHA512 103fddb1bdbdfb47cd2dd04403c1840e5108d16ef7c43f7e6462bfc26cd33202603df51f0f94ad17b4c006643a386989aa887bd2302ea3a0ece807e9c265ed7a MISC metadata.xml 569 BLAKE2B 7609e8cfc1f63fd04b3306a37a9b429eddaf56bf4bcca32d707b529d0267d7f63979a850edf8fcb5b1043134b1baa7210e849903a65243ac300596ccbdb473bd SHA512 44b2dc2f5d0e737a780e16f4d88cb3c2ff1dbab8b1878ae3561659c3a191040ef0f0f2ef0e7325b16ca6c149e29d417c10bec18bfcf06d8e847000e1e8279b27 diff --git a/media-gfx/krita/krita-4.0.0.ebuild b/media-gfx/krita/krita-4.0.0.ebuild deleted file mode 100644 index 04f2354e07d3..000000000000 --- a/media-gfx/krita/krita-4.0.0.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_TEST="forceoptional-recursive" -VIRTUALX_REQUIRED="test" -PYTHON_COMPAT=( python3_{4,5,6} ) -inherit kde5 python-single-r1 - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV%.1}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!" -HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/" -LICENSE="GPL-3" -IUSE="color-management fftw gif +gsl +jpeg openexr pdf python qtmedia +raw tiff vc" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -COMMON_DEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemmodels) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtconcurrent) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui '-gles2') - $(add_qt_dep qtnetwork) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtsvg) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) - $(add_qt_dep qtxml) - dev-libs/boost:= - media-gfx/exiv2:= - media-libs/lcms - media-libs/libpng:0= - sys-libs/zlib - virtual/opengl - x11-libs/libX11 - x11-libs/libxcb - x11-libs/libXi - color-management? ( media-libs/opencolorio ) - fftw? ( sci-libs/fftw:3.0= ) - gif? ( media-libs/giflib ) - gsl? ( sci-libs/gsl:= ) - jpeg? ( virtual/jpeg:0 ) - openexr? ( - media-libs/ilmbase:= - media-libs/openexr - ) - pdf? ( app-text/poppler[qt5] ) - python? ( - ${PYTHON_DEPS} - dev-python/PyQt5[${PYTHON_USEDEP}] - dev-python/sip[${PYTHON_USEDEP}] - ) - qtmedia? ( $(add_qt_dep qtmultimedia) ) - raw? ( media-libs/libraw:= ) - tiff? ( media-libs/tiff:0 ) -" -DEPEND="${COMMON_DEPEND} - dev-cpp/eigen:3 - dev-lang/perl - sys-devel/gettext - vc? ( >=dev-libs/vc-1.1.0 ) -" -RDEPEND="${COMMON_DEPEND} - !app-office/calligra:4[calligra_features_krita] - !app-office/calligra-l10n:4[calligra_features_krita(+)] -" - -# bug 630508 -RESTRICT+=" test" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package color-management OCIO) - $(cmake-utils_use_find_package fftw FFTW3) - $(cmake-utils_use_find_package gif GIF) - $(cmake-utils_use_find_package gsl GSL) - $(cmake-utils_use_find_package jpeg JPEG) - $(cmake-utils_use_find_package openexr OpenEXR) - $(cmake-utils_use_find_package pdf Poppler) - $(cmake-utils_use_find_package python PyQt5) - $(cmake-utils_use_find_package python SIP) - $(cmake-utils_use_find_package qtmedia Qt5Multimedia) - $(cmake-utils_use_find_package raw LibRaw) - $(cmake-utils_use_find_package tiff TIFF) - $(cmake-utils_use_find_package vc Vc) - ) - - kde5_src_configure -} diff --git a/media-gfx/krita/krita-4.0.1.ebuild b/media-gfx/krita/krita-4.0.1.ebuild new file mode 100644 index 000000000000..432b5ebc2692 --- /dev/null +++ b/media-gfx/krita/krita-4.0.1.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +KDE_TEST="forceoptional-recursive" +VIRTUALX_REQUIRED="test" +PYTHON_COMPAT=( python3_{4,5,6} ) +inherit kde5 python-single-r1 + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!" +HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/" +LICENSE="GPL-3" +IUSE="color-management fftw gif +gsl +jpeg openexr pdf python qtmedia +raw tiff vc" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +COMMON_DEPEND=" + $(add_frameworks_dep karchive) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep kguiaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kitemmodels) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_qt_dep qtconcurrent) + $(add_qt_dep qtdbus) + $(add_qt_dep qtdeclarative) + $(add_qt_dep qtgui '-gles2') + $(add_qt_dep qtnetwork) + $(add_qt_dep qtprintsupport) + $(add_qt_dep qtsvg) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtx11extras) + $(add_qt_dep qtxml) + dev-libs/boost:= + media-gfx/exiv2:= + media-libs/lcms + media-libs/libpng:0= + sys-libs/zlib + virtual/opengl + x11-libs/libX11 + x11-libs/libxcb + x11-libs/libXi + color-management? ( media-libs/opencolorio ) + fftw? ( sci-libs/fftw:3.0= ) + gif? ( media-libs/giflib ) + gsl? ( sci-libs/gsl:= ) + jpeg? ( virtual/jpeg:0 ) + openexr? ( + media-libs/ilmbase:= + media-libs/openexr + ) + pdf? ( app-text/poppler[qt5] ) + python? ( + ${PYTHON_DEPS} + dev-python/PyQt5[${PYTHON_USEDEP}] + dev-python/sip[${PYTHON_USEDEP}] + ) + qtmedia? ( $(add_qt_dep qtmultimedia) ) + raw? ( media-libs/libraw:= ) + tiff? ( media-libs/tiff:0 ) +" +DEPEND="${COMMON_DEPEND} + dev-cpp/eigen:3 + dev-lang/perl + sys-devel/gettext + vc? ( >=dev-libs/vc-1.1.0 ) +" +RDEPEND="${COMMON_DEPEND} + !app-office/calligra:4[calligra_features_krita] + !app-office/calligra-l10n:4[calligra_features_krita(+)] +" + +# bug 630508 +RESTRICT+=" test" + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package color-management OCIO) + $(cmake-utils_use_find_package fftw FFTW3) + $(cmake-utils_use_find_package gif GIF) + $(cmake-utils_use_find_package gsl GSL) + $(cmake-utils_use_find_package jpeg JPEG) + $(cmake-utils_use_find_package openexr OpenEXR) + $(cmake-utils_use_find_package pdf Poppler) + $(cmake-utils_use_find_package python PyQt5) + $(cmake-utils_use_find_package python SIP) + $(cmake-utils_use_find_package qtmedia Qt5Multimedia) + $(cmake-utils_use_find_package raw LibRaw) + $(cmake-utils_use_find_package tiff TIFF) + $(cmake-utils_use_find_package vc Vc) + ) + + kde5_src_configure +} diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest index bc79948eb9cf..cbdf96d121f0 100644 --- a/media-gfx/nomacs/Manifest +++ b/media-gfx/nomacs/Manifest @@ -1,7 +1,10 @@ AUX nomacs-3.6.1-batch-resize.patch 757 BLAKE2B 0eba44f34bcde704fcb5ae907ee25fbab3752481409df81d48feb7b923328dd03ceeb0958f5221da493eb9e847f9c8ca7c13a313f532a929e7c6627ddf12f2ff SHA512 781921c31fdd7714e654c7112b4b866c76a2140f5b7e2e9ec2859a06281e01d00912813bae8b6b44b2cc263c27da03ee4610cde692a184125d82747c8c8cf9df +AUX nomacs-3.8.1-qt-5.11.patch 4507 BLAKE2B 5473253ebd9405ee31dc8fa230dc3548f15f3b01cbeadf388339f836091c4a0880346a1d06344e1935c79fa1f25d30f76e1bba87363b777235a181c28aba713b SHA512 14495e3f1a93c5559fef6bfa3a141ec8b9b84e11cce09d3f362f1a8f9de1ab2b31b6c3f1407fa3f79f828b79d65f940118a311c69ae0aefee9c19cd87880bb3c DIST nomacs-3.6.1.tar.gz 28604636 BLAKE2B 74045163d5dabf9858de4e11a2300a298c15d691b3991a56dc802e6b16ee484637de05674aa13ba1d31848bce2df4724c3e083c5d35f82dba926b16aeaf81327 SHA512 cfbda2be5ed015a5ea39cc3c3c9273e3164bb67f0c5fd4fac0e3c607075cf67cfea2311b21420585363a841d65a53c03e100af57c209786243c2c3dcaba11f8e DIST nomacs-3.8.0.tar.gz 32240476 BLAKE2B b0bf2832cda09c01b98c5ef540a0d3d61046ca652c2c0b8b382ba69b7623327f6bcaf030cce2b87719a4bda1141b2118cb184700bfbff83fc86b496622178a16 SHA512 90ffd1ea7f6d8e2f07b2b093ebc7cfec682f11b874d95e249f3d35a2ceb8b75e7a0c55f19c978231c3c8342abe5cb251359771fd90aa39b50ee0a6d1514e88e1 +DIST nomacs-3.8.1.tar.gz 32184536 BLAKE2B 3ba4e0b0220797991c5999164e27fb3c57218d87d17858f5cf6098d8b91ddd0b3330836642999ce953f3ce9b538dcb35ecb48400f94f11805cd8eedeed05b110 SHA512 ff27570bc15096d0e331ad2c871b2f504a414927b8e64166668dedbbbc41f8cd031d9fb142c89c22cff76bf79156f93decf1038e30eecfc3de3e328a325f0134 EBUILD nomacs-3.6.1-r1.ebuild 1598 BLAKE2B 95aa8b0faf792aa1a6fdd92f1b3ef1f3ab740eb3900e454f2ba45a7f4700b0ddd20ecf9f40cbe086932058b2a9a670d71c3c11c0b7f7e57d1efc57b1abd1cdfa SHA512 57fce8366da69eff7739e5cd05c461ab1a577e59caf194d2b472ab1db83c29ad2ed12da6372d651d15339ae0307d58e260686e78f67ede84fcfd71f86b6054a8 EBUILD nomacs-3.6.1.ebuild 1516 BLAKE2B 6f90ecc2401786a6ff3c06649006fd7994fe8dc53c1507937923eea49592b629102c5d49bf3047901a0d1464eb452e9294af482c0b75b3757870126914763513 SHA512 7852f9e0d3c4091b5326f4081bd3fa90d729910a036832a901f83880f55a196c26b12ff89e7f2c0cd2514af67e86c89ee939342aa459c333e0d580e17e9615bc EBUILD nomacs-3.8.0.ebuild 1661 BLAKE2B 286200d262f759b648747fb014ca76c24718153b9cbca0630b645637976a1b8871126809ab47971a1b03ac010ee3b3b163936c31d6a35e736c4eeead0dd8d528 SHA512 1edc2400b6f53cfbcc900cb8e3c94d82b3a1a4fc216383de413a73b9c76eada1bf5a8ffbb03a3aa35ccdd229171451352a334e34f1b90906bfc5c038c4f1fd31 +EBUILD nomacs-3.8.1.ebuild 1735 BLAKE2B 2bb1754a19a26e8547de56d1e97bbb49a36ac244df4e26fc86f50a224d1b1af2f64a49f62229c00f19a01c44669c410d05fac5ceacef8e776002b3892e28d1a5 SHA512 55c837c5117ce8ab7f97c95ed0b053c1139f257d6d9edfb38403828470bb6facd80a6a62ad84a166d4631d81a582f575970fa865f92f0a18f515320e78afab6e MISC metadata.xml 588 BLAKE2B 544009f8f7b184b666e5b7bbb88ce395028032bd060a7abe16f2ed096accb11b0819c19b3898ca1fc96c61aacc9cf0bb5960716f711ba77c5f545f040dd31567 SHA512 f681a8f2f1ec2c2902d34829245790edd014eca1829479f2a47b9179f370d3c3d3c562c32dae1918a7616c8f75c7d94b525beec410ad39704b25fd502cefb5fb diff --git a/media-gfx/nomacs/files/nomacs-3.8.1-qt-5.11.patch b/media-gfx/nomacs/files/nomacs-3.8.1-qt-5.11.patch new file mode 100644 index 000000000000..e9e68af826fb --- /dev/null +++ b/media-gfx/nomacs/files/nomacs-3.8.1-qt-5.11.patch @@ -0,0 +1,103 @@ +From 8480a1c62aa99b6a73a76c9af80392568e0dae5e Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Fri, 13 Apr 2018 21:09:17 +0200 +Subject: [PATCH 1/2] Fix cmake with Qt 5.11_beta3 + +--- + cmake/MacBuildTarget.cmake | 4 ++-- + cmake/UnixBuildTarget.cmake | 4 ++-- + cmake/WinBuildTarget.cmake | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/cmake/MacBuildTarget.cmake b/cmake/MacBuildTarget.cmake +index eae9a76b..54633ca1 100644 +--- a/cmake/MacBuildTarget.cmake ++++ b/cmake/MacBuildTarget.cmake +@@ -66,8 +66,8 @@ add_dependencies( + ${QUAZIP_DEPENDENCY} + ${LIBQPSD_LIBRARY}) + +-qt5_use_modules(${BINARY_NAME} Widgets Gui Network LinguistTools PrintSupport Concurrent Svg) +-qt5_use_modules(${DLL_CORE_NAME} Widgets Gui Network LinguistTools PrintSupport Concurrent Svg) ++qt5_use_modules(${BINARY_NAME} Qt5::Widgets Qt5::Gui Qt5::Network Qt5::PrintSupport Qt5::Concurrent Qt5::Svg) ++qt5_use_modules(${DLL_CORE_NAME} Qt5::Widgets Qt5::Gui Qt5::Network Qt5::PrintSupport Qt5::Concurrent Qt5::Svg) + + # core flags + set_target_properties(${DLL_CORE_NAME} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_BINARY_DIR}/libs) +diff --git a/cmake/UnixBuildTarget.cmake b/cmake/UnixBuildTarget.cmake +index 4eb3108e..3f592764 100644 +--- a/cmake/UnixBuildTarget.cmake ++++ b/cmake/UnixBuildTarget.cmake +@@ -58,8 +58,8 @@ add_dependencies( + ${QUAZIP_DEPENDENCY} + ${LIBQPSD_LIBRARY}) + +-qt5_use_modules(${BINARY_NAME} Widgets Gui Network LinguistTools PrintSupport Concurrent Svg) +-qt5_use_modules(${DLL_CORE_NAME} Widgets Gui Network LinguistTools PrintSupport Concurrent Svg) ++target_link_libraries(${BINARY_NAME} Qt5::Widgets Qt5::Gui Qt5::Network Qt5::PrintSupport Qt5::Concurrent Qt5::Svg) ++target_link_libraries(${DLL_CORE_NAME} Qt5::Widgets Qt5::Gui Qt5::Network Qt5::PrintSupport Qt5::Concurrent Qt5::Svg) + + # core flags + set_target_properties(${DLL_CORE_NAME} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_BINARY_DIR}/libs) +diff --git a/cmake/WinBuildTarget.cmake b/cmake/WinBuildTarget.cmake +index 9a71d508..63a4b27d 100644 +--- a/cmake/WinBuildTarget.cmake ++++ b/cmake/WinBuildTarget.cmake +@@ -62,8 +62,8 @@ add_dependencies( + target_include_directories(${BINARY_NAME} PRIVATE ${OpenCV_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}) + target_include_directories(${DLL_CORE_NAME} PRIVATE ${OpenCV_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}) + +-qt5_use_modules(${BINARY_NAME} Widgets Gui Network LinguistTools PrintSupport Concurrent Svg WinExtras) +-qt5_use_modules(${DLL_CORE_NAME} Widgets Gui Network LinguistTools PrintSupport Concurrent Svg WinExtras) ++target_link_libraries(${BINARY_NAME} Qt5::Widgets Qt5::Gui Qt5::Network Qt5::PrintSupport Qt5::Concurrent Qt5::Svg Qt5::WinExtras) ++target_link_libraries(${DLL_CORE_NAME} Qt5::Widgets Qt5::Gui Qt5::Network Qt5::PrintSupport Qt5::Concurrent Qt5::Svg Qt5::WinExtras) + + # set(_moc ${CMAKE_CURRENT_BINARY_DIR}/GeneratedFiles) + file(GLOB NOMACS_AUTOMOC "${CMAKE_BINARY_DIR}/*_automoc.cpp ${CMAKE_BINARY_DIR}/moc_.cpp") +-- +2.17.0 + + +From 6c400cb6341e4c15413b0406d575779a6f3ce6c5 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Fri, 13 Apr 2018 21:36:15 +0200 +Subject: [PATCH 2/2] Require minimum Qt5 version as documented in README.md + +--- + CMakeLists.txt | 2 ++ + cmake/Utils.cmake | 4 ++-- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5869c2c6..5b9abe67 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -36,6 +36,8 @@ set(NOMACS_BUILD_DIRECTORY ${CMAKE_BINARY_DIR}) + # include macros needed + include("cmake/Utils.cmake") + ++set(QT5_MIN_VERSION 5.2.1) ++ + # different compile options + option(ENABLE_OPENCV "Compile with Opencv (needed for RAW and TIFF)" ON) + option(ENABLE_RAW "Compile with raw images support (libraw)" ON) +diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake +index 5ea88a69..bdd547cb 100644 +--- a/cmake/Utils.cmake ++++ b/cmake/Utils.cmake +@@ -17,10 +17,10 @@ macro(NMC_FINDQT) + set(QT_ROOT ${QT_QMAKE_PATH}/) + set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${QT_QMAKE_PATH}\\..\\lib\\cmake\\Qt5) + +- find_package(Qt5 REQUIRED Core Widgets Network LinguistTools PrintSupport Concurrent Gui Svg) ++ find_package(Qt5 ${QT5_MIN_VERSION} REQUIRED COMPONENTS Core Widgets Network LinguistTools PrintSupport Concurrent Gui Svg) + + if (MSVC) +- find_package(Qt5 REQUIRED WinExtras) ++ find_package(Qt5 ${QT5_MIN_VERSION} REQUIRED WinExtras) + endif() + + if (NOT Qt5_FOUND) +-- +2.17.0 + diff --git a/media-gfx/nomacs/nomacs-3.8.1.ebuild b/media-gfx/nomacs/nomacs-3.8.1.ebuild new file mode 100644 index 000000000000..782838abb005 --- /dev/null +++ b/media-gfx/nomacs/nomacs-3.8.1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils 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-0.25:= + opencv? ( media-libs/opencv:=[-qt4(-)] ) + raw? ( >=media-libs/libraw-0.14:= ) + tiff? ( + dev-qt/qtimageformats:5 + media-libs/tiff:0 + ) + zip? ( >=dev-libs/quazip-0.7.2[qt5(+)] ) +" +DEPEND="${RDEPEND} + dev-qt/linguist-tools:5 + virtual/pkgconfig +" + +S="${WORKDIR}/${P}/ImageLounge" + +DOCS=( src/changelog.txt ) + +PATCHES=( "${FILESDIR}"/${P}-qt-5.11.patch ) + +src_prepare() { + cmake-utils_src_prepare + + # fix build with quazip-0.7.2 - bug 598354 + sed -i -e "s/find_package(QuaZIP/find_package(QuaZip5/" cmake/Unix.cmake || die + sed -e "s/include