summaryrefslogtreecommitdiff
path: root/media-gfx/photoqt
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-12-31 13:43:35 +0000
committerV3n3RiX <venerix@redcorelinux.org>2018-12-31 13:43:35 +0000
commit2891d29af8907ce881662f4a02844926d7a293c7 (patch)
tree56979d96839d0827aa52008b81b746b4934d88df /media-gfx/photoqt
parentde49812990871e1705b64051c35161d5e6400269 (diff)
gentoo resync : 31.12.2018
Diffstat (limited to 'media-gfx/photoqt')
-rw-r--r--media-gfx/photoqt/Manifest7
-rw-r--r--media-gfx/photoqt/files/photoqt-1.7.1-cmake.patch13
-rw-r--r--media-gfx/photoqt/metadata.xml5
-rw-r--r--media-gfx/photoqt/photoqt-1.5.1-r1.ebuild8
-rw-r--r--media-gfx/photoqt/photoqt-1.7.1.ebuild10
5 files changed, 28 insertions, 15 deletions
diff --git a/media-gfx/photoqt/Manifest b/media-gfx/photoqt/Manifest
index 36b39a2b4144..7afa414a018f 100644
--- a/media-gfx/photoqt/Manifest
+++ b/media-gfx/photoqt/Manifest
@@ -1,5 +1,6 @@
+AUX photoqt-1.7.1-cmake.patch 358 BLAKE2B ecadfc9f5ff6cac0535f5db36efc87f37705e77bc6d4b2445a77430c606c642081bff5c6c5733804dcf6cc3878d424bce4c39fd590478ee596f63e23f022506b SHA512 3a5b74999bc6765c37252dd2b34e36ed910c0f3c58e30dbdc84b38b361b45bf6e9131525069b1184c7e2b4e820674742233359120c63c37324fb802e0d9c1726
DIST photoqt-1.5.1.tar.gz 1596831 BLAKE2B 306beaf97cb9e81a2a219e9549abba35eecfaa0f2ad79d769095014d73708f525d5efa3ff4d83f75e89e0f9971a3a46da8b98ca7259b3666e27fc9addc9e836a SHA512 ccb4ada12e76b611475ec66ceaa2ad3a15f92311d2b7c22aa8b94cd145a062bf502af6ff40fa9bb681c5dad97b2941c2a8203da4ac937c8d86c34d805084ec7c
DIST photoqt-1.7.1.tar.gz 1324774 BLAKE2B b739508511cdc34b6de5736260692c48186a49d0cf62d8283238ee274d2fdf73716589277fa602f86c8c15fff87b49d1700202d260480e002dfa18380b47d328 SHA512 50cee1a77a5e69d05f19a8f1ac8ab18d1ef420962b05f3a76e12ce0f3202db7037c894bbd7631674504f0e51c2be690aff4248ed343d0da2dc8a1ccce2d8e078
-EBUILD photoqt-1.5.1-r1.ebuild 1139 BLAKE2B 896daff470d196b0be36ce30011ac6308edd1eca1633d0c9a5757f8a8920e72116169d76c5f7028b3437759cfbada31000d5f0873a4f9a06435fe8a4da08fd0f SHA512 d3e9a337162a71118b8434a90581421583c0f642b7e81c46c37d0186160aad7752d9e4543c22c65d3dcd1717243e9d414e6ffca597a397fbdfa53b2d05974c83
-EBUILD photoqt-1.7.1.ebuild 1375 BLAKE2B ee5a7007cc86be781b936e9d194aae64f804da4c746f53d85d9143fbdb6b181c652fe573fe61c2479f8fc6ddce3eaa949f15d041c0e62cac45af1a208d0f4e71 SHA512 f49af8a780d3f4e347d1e5a4207d8568898fef4e58231c520e9b9f8da4268ef85605ee5fe061be769e7379e00f6cb440e3beb84b2216db6e9b9d66f535f2d411
-MISC metadata.xml 563 BLAKE2B 78b8cf15864ab806162ac48ff45b7dd5644a5170d336a05a2b4402e7eff5be9d56df31b8f825bfa21bac38ca4d17784c4faa146791d35b7a426064cf07c88d9d SHA512 f1d5950bbf5b29645058ef0cfd620fb142dab8a4bdfe3b8ce218ae7e530ff56153d3756e5743e7ec9b4d7c6cf7b609e16fd62228fd19571ac1b30a007e48dc67
+EBUILD photoqt-1.5.1-r1.ebuild 1133 BLAKE2B 3b5bf5a7baff887bc09653a2799c3372713252c9668f3d95650e2dfbdcba77dd82e637d9a9a3688039d305e8ec154e7d0a53351dbe8774f45f4f9feb204a6417 SHA512 991c545c015dc3fb89fc3311472e5fa46433015311ae7b8b26e704d910ca3fb8a405dc69241fe2074ed23339f7b185f070e31ccc0d238880e9b7cf43cd08960a
+EBUILD photoqt-1.7.1.ebuild 1413 BLAKE2B 74faf1e176770f1b8f965a96b8e4be9c730ea791c951152be9ade3523e35c898e56d439699841d7f44407aa3a9cf9e2b11c3c1de5cf45915bb0571f3813a4828 SHA512 86f48c17776705332b504df6ba1ea5cf354ba597252884cbd693f69a3a13e86aaadeec6804dde92faa99c1c95b334d6ddf49a00299ed4abb908cd5073260df47
+MISC metadata.xml 474 BLAKE2B 44114be5222dc1c0ad5a926fc6ff85da5b284a929a0991795632896c0f56ad24021591260c899549eda9b36557dc251363d17eef52928930afaaafebdf29bcf3 SHA512 50c4bf4437dec5d9919e3a16fdc4e429e3fdbc8d23656ecca57ae7674bc90bd6e8e33949191d7c15d49cbfe5451e72155e1bf441f020a44ab98b35115a29b6e0
diff --git a/media-gfx/photoqt/files/photoqt-1.7.1-cmake.patch b/media-gfx/photoqt/files/photoqt-1.7.1-cmake.patch
new file mode 100644
index 000000000000..5dfacf435a0e
--- /dev/null
+++ b/media-gfx/photoqt/files/photoqt-1.7.1-cmake.patch
@@ -0,0 +1,13 @@
+--- a/CMake/FindExiv2.cmake 2018-06-03 05:21:04.143148857 +0200
++++ b/CMake/FindExiv2.cmake 2018-12-29 22:35:40.770393025 +0100
+@@ -13,8 +13,8 @@
+ "${EXIV2_LOCATION}"
+ "${EXIV2_LOCATION}/include"
+ /usr/include
+- /usr/include/Exiv2
+- /opt/local/include/Exiv2
++ /usr/include/exiv2
++ /opt/local/include/exiv2
+ )
+
+ IF(EXIV2_INCLUDE_DIR)
diff --git a/media-gfx/photoqt/metadata.xml b/media-gfx/photoqt/metadata.xml
index c0acf63798da..b44c7e9f4433 100644
--- a/media-gfx/photoqt/metadata.xml
+++ b/media-gfx/photoqt/metadata.xml
@@ -10,10 +10,7 @@
Support additional image formats using <pkg>media-libs/devil</pkg>
</flag>
<flag name="freeimage">
- Support additional iamge formats using <pkg>media-libs/freeimage</pkg>
- </flag>
- <flag name="exiv2">
- Use <pkg>media-gfx/exiv2</pkg> as optional dependency
+ Support additional image formats using <pkg>media-libs/freeimage</pkg>
</flag>
</use>
</pkgmetadata>
diff --git a/media-gfx/photoqt/photoqt-1.5.1-r1.ebuild b/media-gfx/photoqt/photoqt-1.5.1-r1.ebuild
index ff02aa7771cc..7702e5284c0f 100644
--- a/media-gfx/photoqt/photoqt-1.5.1-r1.ebuild
+++ b/media-gfx/photoqt/photoqt-1.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://photoqt.org/pkgs/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE="exiv2 graphicsmagick raw"
+IUSE="exif graphicsmagick raw"
RDEPEND="
dev-qt/qtcore:5
@@ -27,7 +27,7 @@ RDEPEND="
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
- exiv2? ( media-gfx/exiv2:= )
+ exif? ( media-gfx/exiv2:= )
graphicsmagick? ( >=media-gfx/graphicsmagick-1.3.20:= )
raw? ( media-libs/libraw:= )
"
@@ -37,7 +37,7 @@ DEPEND="${RDEPEND}
src_configure() {
local mycmakeargs=(
- -DEXIV2=$(usex exiv2)
+ -DEXIV2=$(usex exif)
-DGM=$(usex graphicsmagick)
-DRAW=$(usex raw)
)
diff --git a/media-gfx/photoqt/photoqt-1.7.1.ebuild b/media-gfx/photoqt/photoqt-1.7.1.ebuild
index b1e9fd011dee..a865dab8014b 100644
--- a/media-gfx/photoqt/photoqt-1.7.1.ebuild
+++ b/media-gfx/photoqt/photoqt-1.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://photoqt.org/pkgs/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="devil exiv2 freeimage graphicsmagick pdf raw"
+IUSE="devil exif freeimage graphicsmagick pdf raw"
RDEPEND="
dev-qt/qtcore:5
@@ -30,7 +30,7 @@ RDEPEND="
app-arch/libarchive:=
app-arch/unrar
devil? ( media-libs/devil )
- exiv2? ( media-gfx/exiv2:= )
+ exif? ( media-gfx/exiv2:= )
freeimage? ( media-libs/freeimage )
graphicsmagick? ( >=media-gfx/graphicsmagick-1.3.20:= )
pdf? ( app-text/poppler[qt5] )
@@ -41,10 +41,12 @@ DEPEND="${RDEPEND}
kde-frameworks/extra-cmake-modules:5
"
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+
src_configure() {
local mycmakeargs=(
-DDEVIL=$(usex devil)
- -DEXIV2=$(usex exiv2)
+ -DEXIV2=$(usex exif)
-DFREEIMAGE=$(usex freeimage)
-DGM=$(usex graphicsmagick)
-DPOPPLER=$(usex pdf)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-04 16:54:58 +0000