diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile index a7554cd0bb38..a36be29574f2 100644 --- a/graphics/gthumb/Makefile +++ b/graphics/gthumb/Makefile @@ -1,107 +1,108 @@ PORTNAME= gthumb PORTVERSION= 3.12.2 PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= GNOME DIST_SUBDIR= gnome PATCH_SITES= https://gitlab.gnome.org/GNOME/gthumb/-/commit/ PATCHFILES= 2133520496afd179702953a5d07aa99b5209f9cf.patch:-p1 #Fix build with libraw >= 0.21.0 +PATCHFILES+= 306d0eeca5ef.patch:-p1 # https://gitlab.gnome.org/GNOME/gthumb/-/issues/306 MAINTAINER= gnome@FreeBSD.org COMMENT= Image viewer and browser for the GNOME environment WWW= https://wiki.gnome.org/Apps/gthumb/ LICENSE= GPLv2+ BUILD_DEPENDS= gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas \ itstool:textproc/itstool LIB_DEPENDS= libclutter-1.0.so:graphics/clutter \ libcogl.so:graphics/cogl \ libgstreamer-1.0.so:multimedia/gstreamer1 \ libjson-glib-1.0.so:devel/json-glib \ liblcms2.so:graphics/lcms2 \ liboauth.so:net/liboauth \ libpng.so:graphics/png \ libsoup-2.4.so:devel/libsoup \ libtiff.so:graphics/tiff \ libcolord.so:graphics/colord RUN_DEPENDS= gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas USES= bison compiler:c++11-lib cpe desktop-file-utils gettext gl \ gnome jpeg localbase:ldflags meson pkgconfig \ python:build shebangfix tar:xz xorg USE_GL= egl USE_GNOME= cairo gtk30 intltool librsvg2 USE_XORG= x11 xcomposite xdamage xext xfixes xrandr xi MESON_ARGS= -Dlibrsvg=true \ -Dlibchamplain=false CPE_VENDOR= gnome INSTALL_TARGET= install-strip USE_LDCONFIG= yes BINARY_ALIAS= python3=${PYTHON_CMD} SHEBANG_FILES= *.py data/gschemas/*.py gthumb/*.py po/*.py PLIST_SUB= GTHUMB_VER="3.10" GLIB_SCHEMAS= org.gnome.gthumb.change-date.gschema.xml \ org.gnome.gthumb.comments.gschema.xml \ org.gnome.gthumb.contact-sheet.gschema.xml \ org.gnome.gthumb.convert-format.gschema.xml \ org.gnome.gthumb.crop.gschema.xml \ org.gnome.gthumb.enums.xml \ org.gnome.gthumb.facebook.gschema.xml \ org.gnome.gthumb.file-manager.gschema.xml \ org.gnome.gthumb.flickr.gschema.xml \ org.gnome.gthumb.gschema.xml \ org.gnome.gthumb.gstreamer-tools.gschema.xml \ org.gnome.gthumb.image-print.gschema.xml \ org.gnome.gthumb.image-viewer.gschema.xml \ org.gnome.gthumb.importer.gschema.xml \ org.gnome.gthumb.photo-importer.gschema.xml \ org.gnome.gthumb.picasaweb.gschema.xml \ org.gnome.gthumb.pixbuf-savers.gschema.xml \ org.gnome.gthumb.rename-series.gschema.xml \ org.gnome.gthumb.resize-images.gschema.xml \ org.gnome.gthumb.resize.gschema.xml \ org.gnome.gthumb.rotate.gschema.xml \ org.gnome.gthumb.slideshow.gschema.xml \ org.gnome.gthumb.webalbums.gschema.xml \ org.gnome.gthumb.catalogs.gschema.xml \ org.gnome.gthumb.terminal.gschema.xml OPTIONS_DEFINE= BRASERO CLUTTER EXIV2 GSTREAMER JXL RAW SECRET \ WEBP WEBSERVICES YELP OPTIONS_DEFAULT= BRASERO CLUTTER EXIV2 GSTREAMER JXL RAW SECRET \ WEBP WEBSERVICES YELP OPTIONS_SUB= yes BRASERO_DESC= Write galleries to CD/DVD (large dependency) BRASERO_LIB_DEPENDS= libbrasero-media3.so:sysutils/brasero BRASERO_MESON_TRUE= libbrasero CLUTTER_DESC= Fancy slideshows CLUTTER_LIB_DEPENDS= libclutter-gtk-1.0.so:graphics/clutter-gtk3 CLUTTER_MESON_TRUE= clutter EXIV2_LIB_DEPENDS= libexiv2.so:graphics/exiv2 EXIV2_MESON_TRUE= exiv2 GSTREAMER_USES= gstreamer GSTREAMER_MESON_TRUE= gstreamer JXL_LIB_DEPENDS= libjxl.so:graphics/libjxl JXL_MESON_TRUE= libjxl RAW_DESC= Raw image support via libraw RAW_LIB_DEPENDS= libraw.so:graphics/libraw RAW_MESON_TRUE= libraw SECRET_DESC= Libsecret support for storing passwords SECRET_LIB_DEPENDS= libsecret-1.so:security/libsecret SECRET_MESON_TRUE= libsecret WEBP_LIB_DEPENDS= libwebp.so:graphics/webp WEBP_MESON_TRUE= libwebp WEBSERVICES_DESC= Web services WEBSERVICES_LIB_DEPENDS=\ libjson-glib-1.0.so:devel/json-glib \ libwebkit2gtk-4.0.so:www/webkit2-gtk3 WEBSERVICES_MESON_TRUE= webservices YELP_DESC= Viewer for built-in help system YELP_RUN_DEPENDS= yelp:x11/yelp .include diff --git a/graphics/gthumb/distinfo b/graphics/gthumb/distinfo index 84132352c484..4900f97a69f1 100644 --- a/graphics/gthumb/distinfo +++ b/graphics/gthumb/distinfo @@ -1,5 +1,7 @@ TIMESTAMP = 1677764827 SHA256 (gnome/gthumb-3.12.2.tar.xz) = 97f8afe522535216541ebbf1e3b546d12a6beb38a8f0eb85f26e676934aad425 SIZE (gnome/gthumb-3.12.2.tar.xz) = 7585700 SHA256 (gnome/2133520496afd179702953a5d07aa99b5209f9cf.patch) = 96c82ad7390d3c39e421f1e0e6b129492f07dc9239d54791ed41713659dd496a SIZE (gnome/2133520496afd179702953a5d07aa99b5209f9cf.patch) = 2358 +SHA256 (gnome/306d0eeca5ef.patch) = db219738ed0c6349c9c60fee0df4d05b50304fbea5018aa145f9286840676b64 +SIZE (gnome/306d0eeca5ef.patch) = 2011 diff --git a/graphics/gthumb/files/patch-extensions_cairo__io_cairo-image-surface-jxl.c b/graphics/gthumb/files/patch-extensions_cairo__io_cairo-image-surface-jxl.c deleted file mode 100644 index 02ff064ccc9a..000000000000 --- a/graphics/gthumb/files/patch-extensions_cairo__io_cairo-image-surface-jxl.c +++ /dev/null @@ -1,26 +0,0 @@ -https://gitlab.gnome.org/GNOME/gthumb/-/issues/306 - ---- extensions/cairo_io/cairo-image-surface-jxl.c.orig 2022-04-03 18:38:59 UTC -+++ extensions/cairo_io/cairo-image-surface-jxl.c -@@ -234,18 +234,18 @@ _cairo_image_surface_create_from_jxl(GInputStream *is - - case JXL_DEC_COLOR_ENCODING: - #if HAVE_LCMS2 -- if (JxlDecoderGetColorAsEncodedProfile(dec, &pixel_format, JXL_COLOR_PROFILE_TARGET_DATA, NULL) == JXL_DEC_SUCCESS) -+ if (JxlDecoderGetColorAsEncodedProfile(dec, JXL_COLOR_PROFILE_TARGET_DATA, NULL) == JXL_DEC_SUCCESS) - break; - - { - gsize profile_size; -- if (JxlDecoderGetICCProfileSize(dec, &pixel_format, JXL_COLOR_PROFILE_TARGET_DATA, &profile_size) > 0) { -+ if (JxlDecoderGetICCProfileSize(dec, JXL_COLOR_PROFILE_TARGET_DATA, &profile_size) > 0) { - g_message("Could not get ICC profile size.\n"); - break; - } - - guchar *profile_data = g_new(guchar, profile_size); -- if (JxlDecoderGetColorAsICCProfile(dec, &pixel_format, JXL_COLOR_PROFILE_TARGET_DATA, profile_data, profile_size) > 0) { -+ if (JxlDecoderGetColorAsICCProfile(dec, JXL_COLOR_PROFILE_TARGET_DATA, profile_data, profile_size) > 0) { - g_message("Could not get ICC profile.\n"); - g_free(profile_data); - break;