diff options
Diffstat (limited to 'media-gfx/gthumb')
| -rw-r--r-- | media-gfx/gthumb/Manifest | 7 | ||||
| -rw-r--r-- | media-gfx/gthumb/files/gthumb-3.6.2-exiv2-0.27.patch | 31 | ||||
| -rw-r--r-- | media-gfx/gthumb/gthumb-3.10.0.ebuild | 89 | ||||
| -rw-r--r-- | media-gfx/gthumb/gthumb-3.6.2-r1.ebuild | 99 | ||||
| -rw-r--r-- | media-gfx/gthumb/metadata.xml | 3 |
5 files changed, 93 insertions, 136 deletions
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest index 7dbc20f488eb..f5c7917f9967 100644 --- a/media-gfx/gthumb/Manifest +++ b/media-gfx/gthumb/Manifest @@ -1,4 +1,3 @@ -AUX gthumb-3.6.2-exiv2-0.27.patch 1004 BLAKE2B e351a67d8fbbfd0c13b26ca575a34528ef29f6d6b2a7ede9b0f16a5835f502bf24e8415f597146abde875e5dbd93fd1fec126a6bbb27d4b0f9881fe9c823ceb5 SHA512 e6f4549526d745d7fa0f42175508be7f6b5ffc9258a5b59a31f45e8c095870b13a0da55c50635723abe6235cf983b7730677906bbb16acf99e58447cc72d8c3d -DIST gthumb-3.6.2.tar.xz 3423044 BLAKE2B ff5fd805c07c969f8e50960cdd36df9b3ef9ddedcaca66578416fc4f602fedf4f1698fec54cda77521c88774e8e309b996123ade9a633df1ffc34bb60cef0ff5 SHA512 5fc5cc43b16b51438403fbb986286d5e66575162be7b4cf35931dd0c41273933f78c210aaf2379e0a2574df6f7f7b2d532d87ce37fbc6369b65331bac338a454 -EBUILD gthumb-3.6.2-r1.ebuild 2717 BLAKE2B 62fb68e66370161eaa5cfe67eeca54eb2e3ae4d037a4f7997ebde75257a8b6ee61254641ecc3124ea03757ac6d18cae93249adccb453570a9a3a05e0c6f2cf3c SHA512 f5455213d6ee5f8613e4aed71d6b06ee7d409a984a68e463545630a566e6f83baf8ea490af97c24ab8243d72fbeaa4681d499cb8613b30a029029f95a704890a -MISC metadata.xml 492 BLAKE2B 62ee03ca8c249d8ba7d9e6516ca44677ef14a84bd6c9f9d12e245fc053e5b76215e9f5db346e06b364552c911ab9b9ca63598da5098e89fbb2c6011f8e2b4f03 SHA512 f75dcc1e5ffc912b3e3d69335f98f7bd38af5d46de10cae326ef5569a4511a022fa1bfe6964fb8e5e4883dc09cbfcb5f7e58160ad4864ef1fe1cca1d8b66172d +DIST gthumb-3.10.0.tar.xz 7550040 BLAKE2B 183ffa4c567728375c34a3f84c72d44f266a893fa8d4be7b8270faa2a120bf2e6c61d5e35494aa5e4d4e14366017adbb020f7a3dc8c51b6f012e8f18cee1a72f SHA512 d7bcac6b260bf7d5816af69ea89953517cbc43ea289227ccceebd0700b753a7d97349e6a30ec6bbb42690c56abff5b69dc3fc073f1ee2831ae1aa7d220722efd +EBUILD gthumb-3.10.0.ebuild 2245 BLAKE2B ab309d292e1cecd8afb910fe6963e0452a21117dcfb6394205251eba8298f3814adc0e5cfb6a39e56a1e45ec30e437d6794c736f1cf1ad4d631e8501e8fe4e2b SHA512 2013a04786f36a73583fe61864e117ab3e34e6c86a4b85d7eed019e820d6cc2a661a52e9a5044115a93970e1110f872ab4f2400719130a6c620cdb4e277401b3 +MISC metadata.xml 420 BLAKE2B d43a138708de7341b7b449d8bc7cbd6dedc471844ee9edac0b4cfa075ba582d5079d6eeacef69031cbfe9ef78493e50cc8f6810f3b80991cb552ffb3a2ca2757 SHA512 856096108784110fbbeeb1c3c5072697f7555edd733f31cfa4820f57e24a1e384f4ab609c77c3ce3a0d8e873c0193e493ea90085509b77686ab46e3f9ff3fc2d diff --git a/media-gfx/gthumb/files/gthumb-3.6.2-exiv2-0.27.patch b/media-gfx/gthumb/files/gthumb-3.6.2-exiv2-0.27.patch deleted file mode 100644 index 2bd8b94c3c11..000000000000 --- a/media-gfx/gthumb/files/gthumb-3.6.2-exiv2-0.27.patch +++ /dev/null @@ -1,31 +0,0 @@ -Patch kindly borrowed from Mageia. - -* asturm@gentoo.org: Dropped unnecessary and backwards incompatible -xmp_exiv2.hpp include. - -https://gitlab.gnome.org/GNOME/gthumb/issues/30 - -diff -Nru a/extensions/exiv2_tools/exiv2-utils.cpp b/extensions/exiv2_tools/exiv2-utils.cpp ---- a/extensions/exiv2_tools/exiv2-utils.cpp 2018-06-17 08:24:44.000000000 +0200 -+++ b/extensions/exiv2_tools/exiv2-utils.cpp 2018-12-31 15:51:50.912329232 +0100 -@@ -32,7 +32,7 @@ - #include <sstream> - #include <vector> - #include <iomanip> --#include <exiv2/xmp.hpp> -+#include <exiv2/exiv2.hpp> - #include <gthumb.h> - #include "exiv2-utils.h" - -@@ -1073,7 +1073,11 @@ - - try { - if (exifData.empty()) { -+#if EXIV2_TEST_VERSION(0,27,0) -+ throw Exiv2::Error(Exiv2::kerErrorMessage, " No Exif data found in the file"); -+#else - throw Exiv2::Error(1, " No Exif data found in the file"); -+#endif - } - Exiv2::ExifData::const_iterator end = exifData.end(); - for (Exiv2::ExifData::const_iterator i = exifData.begin(); i != end; ++i) { diff --git a/media-gfx/gthumb/gthumb-3.10.0.ebuild b/media-gfx/gthumb/gthumb-3.10.0.ebuild new file mode 100644 index 000000000000..a7ddac9f803c --- /dev/null +++ b/media-gfx/gthumb/gthumb-3.10.0.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit gnome.org gnome2-utils meson xdg + +DESCRIPTION="Image viewer and browser for Gnome" +HOMEPAGE="https://wiki.gnome.org/Apps/gthumb" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="cdr colord exif gnome-keyring gstreamer http lcms raw slideshow svg tiff webp" + +RDEPEND=" + >=dev-libs/glib-2.54.0:2 + >=x11-libs/gtk+-3.16.0:3 + exif? ( >=media-gfx/exiv2-0.21:= ) + slideshow? ( + >=media-libs/clutter-1.12.0:1.0 + >=media-libs/clutter-gtk-1:1.0 ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + media-plugins/gst-plugins-gtk:1.0 ) + raw? ( >=media-libs/libraw-0.14:= ) + http? ( >=net-libs/libsoup-2.42.0:2.4 + >=dev-libs/json-glib-0.15.0 + >=net-libs/webkit-gtk-1.10.0:4 ) + gnome-keyring? ( >=app-crypt/libsecret-0.11 ) + cdr? ( >=app-cdr/brasero-3.2.0 ) + svg? ( >=gnome-base/librsvg-2.34:2 ) + webp? ( >=media-libs/libwebp-0.2.0:= ) + lcms? ( >=media-libs/lcms-2.6:2 ) + colord? ( >=x11-misc/colord-1.3 + >=media-libs/lcms-2.6:2 ) + + sys-libs/zlib + virtual/jpeg:0= + tiff? ( media-libs/tiff:= ) + media-libs/libpng:0= + >=gnome-base/gsettings-desktop-schemas-0.1.4 +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/glib-utils + dev-util/itstool + sys-devel/bison + sys-devel/flex + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +src_configure() { + local emesonargs=( + -Drun-in-place=false + $(meson_use exif exiv2) + $(meson_use slideshow clutter) + $(meson_use gstreamer) + -Dlibchamplain=false # Upstream still doesn't seem to consider this ready + $(meson_use colord) + $(meson_use tiff libtiff) + $(meson_use webp libwebp) + $(meson_use raw libraw) + $(meson_use svg librsvg) + $(meson_use gnome-keyring libsecret) + $(meson_use http webservices) + $(meson_use cdr libbrasero) + ) + + # colord pulls in lcms2 anyway, so enable lcms with USE="colord -lcms"; some of upstream HAVE_COLORD code depends on HAVE_LCMS2 + if use lcms || use colord; then + emesonargs+=( -Dlcms2=true ) + else + emesonargs+=( -Dlcms2=false ) + fi + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/media-gfx/gthumb/gthumb-3.6.2-r1.ebuild b/media-gfx/gthumb/gthumb-3.6.2-r1.ebuild deleted file mode 100644 index d5b0510c3e92..000000000000 --- a/media-gfx/gthumb/gthumb-3.6.2-r1.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" - -inherit gnome2 - -DESCRIPTION="Image viewer and browser for Gnome" -HOMEPAGE="https://wiki.gnome.org/Apps/gthumb" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="cdr colord debug exif gnome-keyring gstreamer http jpeg json lcms raw slideshow svg tiff test webkit webp" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/glib-2.36.0:2[dbus] - >=x11-libs/gtk+-3.16.0:3 - exif? ( >=media-gfx/exiv2-0.21:= ) - slideshow? ( - >=media-libs/clutter-1.12.0:1.0 - >=media-libs/clutter-gtk-1:1.0 ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - media-plugins/gst-plugins-gtk:1.0 ) - raw? ( >=media-libs/libraw-0.14:= ) - http? ( >=net-libs/libsoup-2.42.0:2.4 ) - gnome-keyring? ( >=app-crypt/libsecret-0.11 ) - cdr? ( >=app-cdr/brasero-3.2 ) - svg? ( >=gnome-base/librsvg-2.34:2 ) - webp? ( >=media-libs/libwebp-0.2.0 ) - json? ( >=dev-libs/json-glib-0.15.0 ) - webkit? ( >=net-libs/webkit-gtk-1.10.0:4 ) - lcms? ( >=media-libs/lcms-2.6:2 ) - colord? ( >=x11-misc/colord-1.3 - >=media-libs/lcms-2.6:2 ) - - media-libs/libpng:0= - sys-libs/zlib - >=gnome-base/gsettings-desktop-schemas-0.1.4 - jpeg? ( virtual/jpeg:0= ) - tiff? ( media-libs/tiff:= ) -" -DEPEND="${RDEPEND} - dev-util/glib-utils - >=dev-util/intltool-0.50.1 - dev-util/itstool - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - test? ( ~app-text/docbook-xml-dtd-4.1.2 ) -" -# eautoreconf needs: -# gnome-base/gnome-common - -PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" ) # bug 674092 - -src_prepare() { - # Remove unwanted CFLAGS added with USE=debug - sed -e 's/CFLAGS="$CFLAGS -g -O0 -DDEBUG"//' \ - -i configure.ac -i configure || die - - gnome2_src_prepare -} - -src_configure() { - # Upstream says in configure help that libchamplain support - # crashes frequently - local myeconfargs=( - --disable-static - --disable-libchamplain - $(use_enable cdr libbrasero) - $(use_enable colord) - $(use_enable debug) - $(use_enable exif exiv2) - $(use_enable gnome-keyring libsecret) - $(use_enable gstreamer) - $(use_enable http libsoup) - $(use_enable jpeg) - $(use_enable json libjson-glib) - $(use_enable raw libraw) - $(use_enable slideshow clutter) - $(use_enable svg librsvg) - $(use_enable test test-suite) - $(use_enable tiff) - $(use_enable webkit webkit2) - $(use_enable webp libwebp) - ) - # colord pulls in lcms2 anyway, so enable lcms with USE="colord -lcms"; some of upstream HAVE_COLORD code depends on HAVE_LCMS2 - if use lcms || use colord; then - myeconfargs+=( --enable-lcms2 ) - else - myeconfargs+=( --disable-lcms2 ) - fi - gnome2_src_configure "${myeconfargs[@]}" -} diff --git a/media-gfx/gthumb/metadata.xml b/media-gfx/gthumb/metadata.xml index 0ba6dde6a358..7277ae1b1da6 100644 --- a/media-gfx/gthumb/metadata.xml +++ b/media-gfx/gthumb/metadata.xml @@ -6,8 +6,7 @@ <name>Gentoo GNOME Desktop</name> </maintainer> <use> - <flag name="http">Enable webservice integration through <pkg>net-libs/libsoup</pkg></flag> - <flag name="json">Compile code that uses the libjson-glib library</flag> + <flag name="http">Enable webservice integration through <pkg>net-libs/webkit-gtk</pkg></flag> <flag name="slideshow">Enable slideshow plugin</flag> </use> </pkgmetadata> |