From nobody Thu Jul 28 19:55:50 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Lv1bq0rVyz4Xl5C; Thu, 28 Jul 2022 19:55:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Lv1bq0Grbz3jPq; Thu, 28 Jul 2022 19:55:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659038151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x+OVbWcuGxwxgCc26qpOL0Z5r52vzdKkWoNjxC5IXlM=; b=QP9TsqvO3CsVU+PirUX7jzjxrgQa9MalxI+j3rr+MlfxaPuHMlF52INRQ8opWzRBU+QFHP Ens/uert0yOxdMto0bmdOZ6Fnw2PzXEi3ShamAvlImUr7qhIIDcEjoJopwWFrTns9S9XDf Owl53OeOsaS2FvExyP1GS2ctKMBMkFgzozkc81gbWiUD0gLBaM/J5UCCuBNEbs9yKQR5ki 7GPOv5A0pTTJXl7LbZA7V9g8JdMnIAGeF+LgAMHG/679fqWUOY76fz2OeQlg99u/H0A/7/ vXsd6rNrESsLqHP/LmRd2nLyKXuMQPsAn1LpLjdhY6VHv8JfIm41ULsNvhcrQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Lv1bp6PVyz17bm; Thu, 28 Jul 2022 19:55:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26SJto1P064990; Thu, 28 Jul 2022 19:55:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26SJto99064989; Thu, 28 Jul 2022 19:55:50 GMT (envelope-from git) Date: Thu, 28 Jul 2022 19:55:50 GMT Message-Id: <202207281955.26SJto99064989@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 5516d0f67bf6 - main - graphics/gdk-pixbuf2: update to 2.42.8 release (+) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5516d0f67bf6abf1a18abafd9a23731fe9c26678 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659038151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x+OVbWcuGxwxgCc26qpOL0Z5r52vzdKkWoNjxC5IXlM=; b=jKeo7x8aLpGGUn97S+uJHrAxqF2F0KesAlRcy+griV1PhKPgVJOgzUZ2Uu+uuY6Uk5/xnh FGINqU8U7w+fcbpz5iFRvm4X6oAnHhRxkX/NstQ/ThiZa4fLWdTDg7nSDWF433WprV3xdp CUcRVkVt5+UpQjfYZ4hPW1qp1uW15S95oH9G3Kvn14sDYyYA0leKy5Z/+cRSsRTtPd/9O5 YI2wm8I7llzboONCsJ16QBbes3reSSON/TnwEiNL4GavkSWE8bJE3+NRGJsS1xXkHdnGNQ WMpgub9w60ip0JnxKZYy600/s1sUqhykwHhx67LZi6H8fADit9uFyEJm6dKzSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659038151; a=rsa-sha256; cv=none; b=piFaVDlGicWxhZac0FBjVBkKk4ysJf5HDtJOzEQ9t4ZlgzVjh6oXCbYeMdJvVSBRbak+mA EwU9DxjFhDWOjirAZ+kT5pVubxyHaxMraCCItmpypV1Vgwsmi+FMfD19izkjgFDOjzvQ5S GKmq3jF77iMR/sh0N1TXEPManVqBBjhzVtQgX/KcnGSxYLgozsLUjGqRPHcdw4/Y4fzfw/ mWJuQn6aqBer1BqY/hbDht13l2du6EqbYD1f5omz770xhvGXSB98bpiBj29oLIVBU5yv5v SL5SoHxd6LE43vrPQ2LACZEr1vdHl6rGLu7cf4wst8SgZEwOJ3SZJp1bu1alaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=5516d0f67bf6abf1a18abafd9a23731fe9c26678 commit 5516d0f67bf6abf1a18abafd9a23731fe9c26678 Author: Dima Panov AuthorDate: 2022-07-28 19:26:04 +0000 Commit: Dima Panov 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 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: <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 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