diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index 19f444ac87d7..8283aa20d438 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -1,137 +1,137 @@ PORTNAME= gimp DISTVERSION= 2.10.38 PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= graphics gnome MASTER_SITES= GIMP/gimp/v${PORTVERSION:R} PKGNAMESUFFIX= -app MAINTAINER= gnome@FreeBSD.org COMMENT= GNU Image Manipulation Program WWW= https://www.gimp.org/ LICENSE= GPLv3 LGPL3 LICENSE_COMB= multi BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \ + gtkdocize:textproc/gtk-doc \ glib-networking>=0:net/glib-networking \ mypaint-brushes>0:graphics/mypaint-brushes - LIB_DEPENDS= libasound.so:audio/alsa-lib \ libbabl-0.1.so:x11/babl \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libgegl-0.4.so:graphics/gegl \ libgexiv2.so:graphics/gexiv2 \ libharfbuzz.so:print/harfbuzz \ libjson-c.so:devel/json-c \ libjson-glib-1.0.so:devel/json-glib \ liblcms2.so:graphics/lcms2 \ libmypaint.so:graphics/libmypaint \ libpng.so:graphics/png \ libpoppler-glib.so:graphics/poppler-glib \ libtiff.so:graphics/tiff \ ${LIB_DEPENDS_${ARCH}} LIB_DEPENDS_aarch64= libunwind.so:devel/libunwind LIB_DEPENDS_amd64= libunwind.so:devel/libunwind LIB_DEPENDS_armv7= libunwind.so:devel/libunwind LIB_DEPENDS_i386= libunwind.so:devel/libunwind LIB_DEPENDS_powerpc64= libunwind.so:devel/libunwind LIB_DEPENDS_powerpc64le= libunwind.so:devel/libunwind RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \ glib-networking>=0:net/glib-networking \ mypaint-brushes>0:graphics/mypaint-brushes -USES= cpe compiler:c++14-lang desktop-file-utils gettext gmake gnome \ - jpeg libtool localbase pkgconfig shebangfix tar:bzip2 xorg +USES= autoreconf:2.69 cpe compiler:c++14-lang desktop-file-utils gettext gmake \ + gnome jpeg libtool localbase pkgconfig shebangfix tar:bzip2 xorg CPE_VENDOR= gimp CPE_PRODUCT= gimp USE_GNOME+= cairo gtk20 intltool librsvg2 USE_LDCONFIG= yes USE_XORG= ice sm x11 xcursor xext xfixes xmu xpm xt SHEBANG_FILES= plug-ins/pygimp/plug-ins/*.py GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc/gimp \ --with-bug-report-url="https://bugs.freebsd.org/" \ --disable-gtk-doc \ --without-linux-input \ --with-print \ --without-gudev \ --enable-default-binary \ --disable-gimp-console \ --disable-python \ --without-appdata-test \ --with-desktop-dir=${PREFIX}/share \ --docdir=${PREFIX}/share/doc/gimp \ --with-icc-directory=${LOCALBASE}/share/color/icc \ --without-webkit \ --enable-default-binary CONFIGURE_ENV= GIMP_THREAD_LIBS=-lpthread INSTALL_TARGET= install-strip .if !defined(XAUTHORITY) TEST_ENV= XAUTHORITY=${HOME}/.Xauthority .endif TEST_TARGET= check LIBS+= -lexecinfo -lm PLIST_SUB+= LIBVER=0.1000.${PORTVERSION:E} OPTIONS_DEFINE= AALIB GHOSTSCRIPT HEIF JXL LIBMNG OPENEXR OPENJPEG \ SIMD WEBP WMF OPTIONS_DEFAULT= AALIB HEIF JXL LIBMNG OPENEXR OPENJPEG SIMD WEBP WMF OPTIONS_SUB= yes AALIB_DESC= Ascii-art Plug-in OPENJPEG_DESC= Enhanced JPEG (JPEG 2000) graphics support AALIB_LIB_DEPENDS= libaa.so:graphics/aalib AALIB_CONFIGURE_WITH= aa GHOSTSCRIPT_USES= ghostscript GHOSTSCRIPT_CONFIGURE_WITH= gs HEIF_LIB_DEPENDS= libheif.so:graphics/libheif HEIF_CONFIGURE_WITH= libheif JXL_LIB_DEPENDS= libjxl.so:graphics/libjxl JXL_CONFIGURE_WITH= jpegxl LIBMNG_LIB_DEPENDS= libmng.so:graphics/libmng LIBMNG_CONFIGURE_WITH= libmng OPENEXR_LIB_DEPENDS= libImath.so:math/Imath \ libOpenEXR.so:graphics/openexr OPENEXR_CONFIGURE_WITH= openexr OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg OPENJPEG_CONFIGURE_WITH= jpeg2000 SIMD_CONFIGURE_OFF= --disable-altivec \ --disable-mmx \ --disable-sse WEBP_LIB_DEPENDS= libwebp.so:graphics/webp WEBP_CONFIGURE_WITH= webp WMF_LIB_DEPENDS= libexpat.so:textproc/expat2 \ libwmf.so:graphics/libwmf WMF_CONFIGURE_WITH= wmf .include post-patch: @${REINPLACE_CMD} -e 's|%%GIMP_LIBS%%|${GIMP_LIBS}|; \ s|%%GIMP_THUMB_LIBS%%|${GIMP_THUMB_LIBS}|; \ s|%%GIMP_UI_LIBS%%|${GIMP_UI_LIBS}|' \ ${WRKSRC}/plug-ins/pygimp/Makefile.in @${REINPLACE_CMD} \ -e 's|x86_64|amd64|g' \ - ${WRKSRC}/configure + ${WRKSRC}/configure.ac .include diff --git a/graphics/gimp-app/files/patch-configure b/graphics/gimp-app/files/patch-configure deleted file mode 100644 index d75892b66498..000000000000 --- a/graphics/gimp-app/files/patch-configure +++ /dev/null @@ -1,33 +0,0 @@ ---- configure.orig 2024-05-03 00:36:33 UTC -+++ configure -@@ -30417,13 +30417,13 @@ if test "x$have_libheif" = xyes; then - can_import_avif=no - can_export_avif=no - if test "x$have_libheif" = xyes; then -- can_import_heic=`$PKG_CONFIG --variable=builtin_h265_decoder libheif` -- can_export_heic=`$PKG_CONFIG --variable=builtin_h265_encoder libheif` -+ can_import_heic=yes -+ can_export_heic=yes - if test "x$can_import_heic" = xyes; then - MIME_TYPES="$MIME_TYPES;image/heif;image/heic" - fi -- can_import_avif=`$PKG_CONFIG --variable=builtin_avif_decoder libheif` -- can_export_avif=`$PKG_CONFIG --variable=builtin_avif_encoder libheif` -+ can_import_avif=yes -+ can_export_avif=yes - if test "x$can_import_avif" = xyes; then - MIME_TYPES="$MIME_TYPES;image/avif" - fi -@@ -34797,9 +34797,9 @@ esac - ;; - esac - --gimpdatadir="$datadir/$PACKAGE/2.0" --gimpplugindir="$libdir/$PACKAGE/2.0" --gimpsysconfdir="$sysconfdir/$PACKAGE/2.0" -+gimpdatadir="$datadir/$PACKAGE" -+gimpplugindir="$libexecdir/$PACKAGE/2.2" -+gimpsysconfdir="$sysconfdir/$PACKAGE/2.2" - - - diff --git a/graphics/gimp-app/files/patch-configure.ac b/graphics/gimp-app/files/patch-configure.ac new file mode 100644 index 000000000000..21c829d243e0 --- /dev/null +++ b/graphics/gimp-app/files/patch-configure.ac @@ -0,0 +1,45 @@ +--- configure.ac.orig 2025-03-12 15:49:07 UTC ++++ configure.ac +@@ -28,11 +28,11 @@ m4_define([gimp_app_version], [2.10]) + # Versions used for apps, plugins, tools, pkg-config files, and data, + # as well as global and user prefs + m4_define([gimp_app_version], [2.10]) +-m4_define([gimp_plugin_version], [2.0]) ++m4_define([gimp_plugin_version], [2.2]) + m4_define([gimp_tool_version], [2.0]) + m4_define([gimp_pkgconfig_version], [2.0]) + m4_define([gimp_data_version], [2.0]) +-m4_define([gimp_sysconf_version], [2.0]) ++m4_define([gimp_sysconf_version], [2.2]) + m4_define([gimp_user_version], [2.10]) + + m4_define([gimp_unstable], +@@ -1843,13 +1843,13 @@ if test "x$have_libheif" = xyes; then + can_import_avif=no + can_export_avif=no + if test "x$have_libheif" = xyes; then +- can_import_heic=`$PKG_CONFIG --variable=builtin_h265_decoder libheif` +- can_export_heic=`$PKG_CONFIG --variable=builtin_h265_encoder libheif` ++ can_import_heic=yes ++ can_export_heic=yes + if test "x$can_import_heic" = xyes; then + MIME_TYPES="$MIME_TYPES;image/heif;image/heic" + fi +- can_import_avif=`$PKG_CONFIG --variable=builtin_avif_decoder libheif` +- can_export_avif=`$PKG_CONFIG --variable=builtin_avif_encoder libheif` ++ can_import_avif=yes ++ can_export_avif=yes + if test "x$can_import_avif" = xyes; then + MIME_TYPES="$MIME_TYPES;image/avif" + fi +@@ -2765,8 +2765,8 @@ esac + ;; + esac + +-gimpdatadir="$datadir/$PACKAGE/gimp_data_version" +-gimpplugindir="$libdir/$PACKAGE/gimp_plugin_version" ++gimpdatadir="$datadir/$PACKAGE" ++gimpplugindir="$libexecdir/$PACKAGE/gimp_plugin_version" + gimpsysconfdir="$sysconfdir/$PACKAGE/gimp_sysconf_version" + + AC_SUBST(gimpdir)