gimp3-devel: reconcile with gimp-macos-build

Author: mascguy

graphics/gimp3-devel/Portfile

@@ -12,8 +12,9 @@ set my_name         gimp3
 conflicts           gimp2 gimp2-devel
 version             3.0.4
 revision            0
-license             GPL-3+
+
 categories          graphics
+license             GPL-3+
 maintainers         {devans @dbevans} {mascguy @mascguy}
 
 description         The GNU Image Manipulation Program
@@ -68,34 +69,48 @@ depends_lib-append \
                     path:lib/pkgconfig/gobject-introspection-1.0.pc:gobject-introspection \
                     path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
                     path:lib/pkgconfig/harfbuzz.pc:harfbuzz \
+                    path:lib/pkgconfig/icu-uc.pc:icu \
                     port:iso-codes \
+                    port:jasper \
+                    port:json-c \
                     port:json-glib \
                     port:lcms2 \
+                    port:libarchive \
+                    port:libde265 \
                     port:libheif \
                     path:include/turbojpeg.h:libjpeg-turbo \
                     port:libjxl \
                     port:libmng \
                     port:libmypaint \
                     port:libpng \
+                    port:libraw \
                     path:lib/pkgconfig/librsvg-2.0.pc:librsvg \
                     port:libwmf \
                     port:libxml2 \
                     port:libxslt \
+                    port:libyaml \
                     port:mypaint-brushes1 \
+                    port:nasm \
                     port:openexr \
                     port:openjpeg \
                     path:lib/pkgconfig/pango.pc:pango \
+                    port:poly2tri-c \
                     path:lib/pkgconfig/poppler.pc:poppler \
+                    port:poppler-data \
+                    port:qoi \
                     port:shared-mime-info \
                     port:tiff \
                     port:webp \
+                    port:x265 \
                     port:xdg-utils \
+                    port:xmlto \
                     port:xpm \
                     port:xz \
                     port:zlib
 
 depends_run-append \
-                    port:adwaita-icon-theme
+                    port:adwaita-icon-theme \
+                    port:hicolor-icon-theme
 
 # gcc-4.2 5493 and 5666.3_13: gimpcpuaccel.c:180: error: can't find a register in class 'BREG' while reloading 'asm'
 # redefinition of typedef is invalid in C [-Wtypedef-redefinition] (#50329)
@@ -106,7 +121,7 @@ compiler.blacklist-append \
                     *gcc-3.* *gcc-4.* {clang < 700}
 
 patchfiles-append   patch-etc-gimprc.in.diff
-patchfiles-append   patch-quartz-32bit.diff
+#patchfiles-append   patch-quartz-32bit.diff
 patchfiles-append   MYPAINT_BRUSHES_DIR.patch
 
 platform darwin {
@@ -153,11 +168,10 @@ configure.args-append \
                     -Dgi-docgen=disabled \
                     -Dgudev=disabled \
                     -Dheif=enabled \
-                    -Djpeg2000=enabled \
-                    -Djpeg-xl=enabled \
-                    -Dheif=enabled \
                     -Dilbm=disabled \
                     -Djavascript=disabled \
+                    -Djpeg2000=enabled \
+                    -Djpeg-xl=enabled \
                     -Dlibbacktrace=false \
                     -Dlibunwind=false \
                     -Dlua=false \
@@ -231,4 +245,4 @@ post-activate {
 
 livecheck.type      regex
 livecheck.url       https://download.gimp.org/mirror/pub/gimp/v${branch}/
-livecheck.regex     "gimp-(${branch}(?:\\.\\d+)*)${extract.suffix}"
+livecheck.regex     "${my_name}-(${branch}(?:\\.\\d+)*)${extract.suffix}"