git: 5516d0f67bf6 - main - graphics/gdk-pixbuf2: update to 2.42.8 release (+)
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 28 Jul 2022 19:55:50 UTC
The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=5516d0f67bf6abf1a18abafd9a23731fe9c26678 commit 5516d0f67bf6abf1a18abafd9a23731fe9c26678 Author: Dima Panov <fluffy@FreeBSD.org> AuthorDate: 2022-07-28 19:26:04 +0000 Commit: Dima Panov <fluffy@FreeBSD.org> CommitDate: 2022-07-28 19:55:41 +0000 graphics/gdk-pixbuf2: update to 2.42.8 release (+) Since 2.40.2 release GDK-Pixbuf library had splitted off XLib bindings as deprecated. Add it as dedicated port at version 2.40.2 and declare additional knob in Mk/Uses/gnome.mk Consumer ports will be bumped in separated commit. Changelog: https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/blob/2.42.8/NEWS With hat: desktop --- Mk/Uses/gnome.mk | 5 +++- graphics/Makefile | 1 + graphics/gdk-pixbuf2-xlib/Makefile | 26 ++++++++++++++++++++ graphics/gdk-pixbuf2-xlib/distinfo | 3 +++ .../files/gdk-pixbuf-query-loaders-xlib.ucl.in | 17 +++++++++++++ graphics/gdk-pixbuf2-xlib/pkg-descr | 4 ++++ graphics/gdk-pixbuf2-xlib/pkg-plist | 6 +++++ graphics/gdk-pixbuf2/Makefile | 28 +++++++--------------- graphics/gdk-pixbuf2/distinfo | 6 ++--- graphics/gdk-pixbuf2/files/patch-meson_build | 16 +++++++++++++ graphics/gdk-pixbuf2/pkg-plist | 9 +------ 11 files changed, 89 insertions(+), 32 deletions(-) diff --git a/Mk/Uses/gnome.mk b/Mk/Uses/gnome.mk index 59f4db16043b..7d845ff92354 100644 --- a/Mk/Uses/gnome.mk +++ b/Mk/Uses/gnome.mk @@ -59,7 +59,7 @@ _USE_GNOME_ALL= intlhack intltool introspection \ # GNOME 2 components _USE_GNOME_ALL+= atk cairo \ - gdkpixbuf2 gconf2 glib20 \ + gdkpixbuf2 gdkpixbuf2xlib gconf2 glib20 \ gtk-update-icon-cache gtk20 \ gtksharp20 gtksourceview2 gvfs libartlgpl2 \ libglade2 libgnomecanvas \ @@ -160,6 +160,9 @@ pangox-compat_USE_GNOME_IMPL= glib20 pango gdkpixbuf2_LIB_DEPENDS= libgdk_pixbuf-2.0.so:graphics/gdk-pixbuf2 gdkpixbuf2_USE_GNOME_IMPL=glib20 +gdkpixbuf2xlib_LIB_DEPENDS= libgdk_pixbuf_xlib-2.0.so:graphics/gdk-pixbuf2-xlib +gdkpixbuf2xlib_USE_GNOME_IMPL= glib20 gdkpixbuf2 + gtk-update-icon-cache_RUN_DEPENDS= gtk-update-icon-cache:graphics/gtk-update-icon-cache gtk-update-icon-cache_USE_GNOME_IMPL= atk pango gdkpixbuf2 diff --git a/graphics/Makefile b/graphics/Makefile index 753bdd747547..4863e09f4268 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -233,6 +233,7 @@ SUBDIR += gdal SUBDIR += gdchart SUBDIR += gdk-pixbuf2 + SUBDIR += gdk-pixbuf2-xlib SUBDIR += gdtclft SUBDIR += geeqie SUBDIR += gegl diff --git a/graphics/gdk-pixbuf2-xlib/Makefile b/graphics/gdk-pixbuf2-xlib/Makefile new file mode 100644 index 000000000000..de0a893fb835 --- /dev/null +++ b/graphics/gdk-pixbuf2-xlib/Makefile @@ -0,0 +1,26 @@ +PORTNAME= gdk-pixbuf-xlib +PORTVERSION= 2.40.2 +CATEGORIES= graphics +MASTER_SITES= GNOME +DIST_SUBDIR= gnome + +MAINTAINER= desktop@FreeBSD.org +COMMENT= deprecated API for integrating Xlib and GdkPixbuf + +LICENSE= LGPL20+ +LICENSE_FILE= ${WRKSRC}/COPYING + +BUILD_DEPENDS= docbook-xsl>0:textproc/docbook-xsl + +USES= cpe gettext gnome localbase:ldflags meson pkgconfig \ + python:3.7+,build shared-mime-info tar:xz trigger xorg +CPE_VENDOR= gnome +USE_GNOME= glib20 introspection:build libxslt:build gdkpixbuf2 +USE_XORG= x11 +USE_LDCONFIG= yes +TRIGGERS= gdk-pixbuf-query-loaders-xlib +SUB_LIST= GTK2_VERSION=${GTK2_VERSION} + +BINARY_ALIAS= python3=${PYTHON_VERSION} + +.include <bsd.port.mk> diff --git a/graphics/gdk-pixbuf2-xlib/distinfo b/graphics/gdk-pixbuf2-xlib/distinfo new file mode 100644 index 000000000000..adef6e1ad29a --- /dev/null +++ b/graphics/gdk-pixbuf2-xlib/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1658935761 +SHA256 (gnome/gdk-pixbuf-xlib-2.40.2.tar.xz) = 8b8e1c270ec16a06f665ea841f8e4e167eaa0118d0cbfeeade43745f09198ff7 +SIZE (gnome/gdk-pixbuf-xlib-2.40.2.tar.xz) = 53588 diff --git a/graphics/gdk-pixbuf2-xlib/files/gdk-pixbuf-query-loaders-xlib.ucl.in b/graphics/gdk-pixbuf2-xlib/files/gdk-pixbuf-query-loaders-xlib.ucl.in new file mode 100644 index 000000000000..9dc3cf170cc4 --- /dev/null +++ b/graphics/gdk-pixbuf2-xlib/files/gdk-pixbuf-query-loaders-xlib.ucl.in @@ -0,0 +1,17 @@ +path: "%%PREFIX%%/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders" +cleanup: { + type: lua + sandbox: false + script: <<EOS +print("Regenerate gdk-pixbuf cache directory") +pkg.exec({"%%PREFIX%%/bin/gdk-pixbuf-query-loaders", "--update-cache"}) +EOS +} +trigger: { + type: lua + sandbox: false + script: <<EOS +print("Generating gdk-pixbuf modules cache") +pkg.exec({"%%PREFIX%%/bin/gdk-pixbuf-query-loaders", "--update-cache"}) +EOS +} diff --git a/graphics/gdk-pixbuf2-xlib/pkg-descr b/graphics/gdk-pixbuf2-xlib/pkg-descr new file mode 100644 index 000000000000..d870ffda8597 --- /dev/null +++ b/graphics/gdk-pixbuf2-xlib/pkg-descr @@ -0,0 +1,4 @@ +GdkPixbuf-Xlib contains the deprecated API for integrating GdkPixbuf with +Xlib data types. + +WWW: https://developer.gnome.org/gdk-pixbuf/ diff --git a/graphics/gdk-pixbuf2-xlib/pkg-plist b/graphics/gdk-pixbuf2-xlib/pkg-plist new file mode 100644 index 000000000000..edd4bd862e0f --- /dev/null +++ b/graphics/gdk-pixbuf2-xlib/pkg-plist @@ -0,0 +1,6 @@ +include/gdk-pixbuf-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h +include/gdk-pixbuf-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h +lib/libgdk_pixbuf_xlib-2.0.so +lib/libgdk_pixbuf_xlib-2.0.so.0 +lib/libgdk_pixbuf_xlib-2.0.so.0.4000.2 +libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile index 7eb9475e0442..3def2c85671e 100644 --- a/graphics/gdk-pixbuf2/Makefile +++ b/graphics/gdk-pixbuf2/Makefile @@ -1,6 +1,5 @@ PORTNAME= gdk-pixbuf -PORTVERSION= 2.40.0 -PORTREVISION= 4 +PORTVERSION= 2.42.8 CATEGORIES= graphics MASTER_SITES= GNOME PKGNAMESUFFIX= 2 @@ -15,38 +14,27 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= docbook-xsl>0:textproc/docbook-xsl USES= cpe gettext gnome localbase:ldflags meson pkgconfig \ - python:3.4+,build shared-mime-info tar:xz trigger + python:3.7+,build shared-mime-info tar:xz trigger CPE_VENDOR= gnome USE_GNOME= glib20 introspection:build libxslt:build USE_LDCONFIG= yes -MESON_ARGS= -Dman=true +MESON_ARGS= -Dman=true -Dbuiltin_loaders="none" -Dinstalled_tests=false TRIGGERS= gdk-pixbuf-query-loaders SUB_LIST= GTK2_VERSION=${GTK2_VERSION} BINARY_ALIAS= python3=${PYTHON_VERSION} OPTIONS_SUB= yes -OPTIONS_DEFINE= JASPER JPEG PNG TIFF X11 -OPTIONS_DEFAULT=JPEG PNG TIFF X11 +OPTIONS_DEFINE= JPEG PNG TIFF +OPTIONS_DEFAULT=JPEG PNG TIFF -JASPER_MESON_TRUE= jasper -JASPER_LIB_DEPENDS= libjasper.so:graphics/jasper - -JPEG_MESON_TRUE= jpeg +JPEG_MESON_ENABLE= jpeg JPEG_USES= jpeg -PNG_MESON_TRUE= png +PNG_MESON_ENABLE= png PNG_LIB_DEPENDS= libpng.so:graphics/png -TIFF_MESON_TRUE= tiff +TIFF_MESON_ENABLE= tiff TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff -X11_MESON_TRUE= x11 -X11_USES= xorg -X11_USE= xorg=x11 - -post-install: - ${RM} -rf ${STAGEDIR}${PREFIX}/libexec/installed-tests - ${RM} -rf ${STAGEDIR}${PREFIX}/share/installed-tests - .include <bsd.port.mk> diff --git a/graphics/gdk-pixbuf2/distinfo b/graphics/gdk-pixbuf2/distinfo index d6ce355d2ada..2b9b80bd7a95 100644 --- a/graphics/gdk-pixbuf2/distinfo +++ b/graphics/gdk-pixbuf2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1576500435 -SHA256 (gnome/gdk-pixbuf-2.40.0.tar.xz) = 1582595099537ca8ff3b99c6804350b4c058bb8ad67411bbaae024ee7cead4e6 -SIZE (gnome/gdk-pixbuf-2.40.0.tar.xz) = 5512160 +TIMESTAMP = 1658871645 +SHA256 (gnome/gdk-pixbuf-2.42.8.tar.xz) = 84acea3acb2411b29134b32015a5b1aaa62844b19c4b1ef8b8971c6b0759f4c6 +SIZE (gnome/gdk-pixbuf-2.42.8.tar.xz) = 8503020 diff --git a/graphics/gdk-pixbuf2/files/patch-meson_build b/graphics/gdk-pixbuf2/files/patch-meson_build new file mode 100644 index 000000000000..de91b76c75b4 --- /dev/null +++ b/graphics/gdk-pixbuf2/files/patch-meson_build @@ -0,0 +1,16 @@ +https://gitlab.gnome.org/GNOME/gdk-pixbuf/issues/106 + +Index: meson.build +--- meson.build.orig ++++ meson.build +@@ -414,7 +414,9 @@ subdir('gdk-pixbuf') + subdir('po') + + if not meson.is_cross_build() +- subdir('tests') ++ if get_option('installed_tests') ++ subdir('tests') ++ endif + subdir('thumbnailer') + endif + diff --git a/graphics/gdk-pixbuf2/pkg-plist b/graphics/gdk-pixbuf2/pkg-plist index ab6263401d57..9131da84a18b 100644 --- a/graphics/gdk-pixbuf2/pkg-plist +++ b/graphics/gdk-pixbuf2/pkg-plist @@ -2,8 +2,6 @@ bin/gdk-pixbuf-csource bin/gdk-pixbuf-pixdata bin/gdk-pixbuf-query-loaders bin/gdk-pixbuf-thumbnailer -%%X11%%include/gdk-pixbuf-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h -%%X11%%include/gdk-pixbuf-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-animation.h include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-autocleanups.h include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-core.h @@ -22,7 +20,6 @@ lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-bmp.so lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-gif.so lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-icns.so lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-ico.so -%%JASPER%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-jasper.so %%JPEG%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-jpeg.so %%PNG%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-png.so lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-pnm.so @@ -35,12 +32,8 @@ lib/girepository-1.0/GdkPixbuf-2.0.typelib lib/girepository-1.0/GdkPixdata-2.0.typelib lib/libgdk_pixbuf-2.0.so lib/libgdk_pixbuf-2.0.so.0 -lib/libgdk_pixbuf-2.0.so.0.4000.0 -%%X11%%lib/libgdk_pixbuf_xlib-2.0.so -%%X11%%lib/libgdk_pixbuf_xlib-2.0.so.0 -%%X11%%lib/libgdk_pixbuf_xlib-2.0.so.0.4000.0 +lib/libgdk_pixbuf-2.0.so.0.4200.8 libdata/pkgconfig/gdk-pixbuf-2.0.pc -%%X11%%libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc man/man1/gdk-pixbuf-csource.1.gz man/man1/gdk-pixbuf-query-loaders.1.gz share/gir-1.0/GdkPixbuf-2.0.gir