git: 51053b01d4bd - main - graphics/xviewer: update to 3.4.8

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Max Brazhnikov <makc_at_FreeBSD.org>
Date: Mon, 10 Feb 2025 21:20:33 UTC
The branch main has been updated by makc:

URL: https://cgit.FreeBSD.org/ports/commit/?id=51053b01d4bd445c34bfb4a8766f3f2b12ba2637

commit 51053b01d4bd445c34bfb4a8766f3f2b12ba2637
Author:     Pavel Timofeev <timp87@gmail.com>
AuthorDate: 2025-02-10 21:18:57 +0000
Commit:     Max Brazhnikov <makc@FreeBSD.org>
CommitDate: 2025-02-10 21:18:57 +0000

    graphics/xviewer: update to 3.4.8
    
    - Migrate to meson
    - Add DOCS option
    - Add license file
    
    PR:     282315
---
 graphics/xviewer/Makefile                 |  26 +++----
 graphics/xviewer/distinfo                 |   6 +-
 graphics/xviewer/files/patch-Makefile.am  |  11 ---
 graphics/xviewer/files/patch-configure.ac |  21 ------
 graphics/xviewer/pkg-plist                | 108 +++++++++++++++++++++++-------
 5 files changed, 100 insertions(+), 72 deletions(-)

diff --git a/graphics/xviewer/Makefile b/graphics/xviewer/Makefile
index 6d29e23cebf4..5985e0936a25 100644
--- a/graphics/xviewer/Makefile
+++ b/graphics/xviewer/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	xviewer
-PORTVERSION=	3.2.4
-PORTREVISION=	4
+PORTVERSION=	3.4.8
 CATEGORIES=	graphics gnome
 DIST_SUBDIR=	gnome
 
@@ -9,6 +8,7 @@ COMMENT=	Fast and functional image viewer
 WWW=		https://github.com/linuxmint/xviewer
 
 LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 PORTSCOUT=	limit:^[0-9.]+$$	# ignore non-numeric tags
 
@@ -19,33 +19,35 @@ LIB_DEPENDS=	libcinnamon-desktop.so:x11/cinnamon-desktop \
 		libpeas-1.0.so:devel/libpeas
 RUN_DEPENDS=	yelp:x11/yelp
 
-USES=		autoreconf compiler:c++11-lang desktop-file-utils gettext-tools \
-		gmake gnome libtool localbase pkgconfig xorg
-GNU_CONFIGURE=	yes
+USES=		meson compiler:c++11-lang desktop-file-utils gettext-tools \
+		gnome localbase pkgconfig xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
-USE_GNOME=	atk cairo gdkpixbuf2 gtk30 intltool introspection pango
+USE_GNOME=	atk cairo gdkpixbuf2 gtk30 introspection pango
 USE_XORG=	x11
 GLIB_SCHEMAS=	org.x.viewer.enums.xml org.x.viewer.gschema.xml
 
-OPTIONS_DEFINE=	JPEG LCMS2 LIBEXIF LIBRSVG2 XMP
+OPTIONS_DEFINE=	DOCS JPEG LCMS2 LIBEXIF LIBRSVG2 XMP
 OPTIONS_DEFAULT=	JPEG LCMS2 LIBEXIF LIBRSVG2 XMP
 XMP_DESC=	Adobe Extensible Metadata Platform support
 OPTIONS_SUB=	yes
 
+DOCS_BUILD_DEPENDS=	gtk-doc>0:textproc/gtk-doc
+DOCS_MESON_TRUE=	docs
+
 JPEG_USES=		jpeg
-JPEG_CONFIGURE_OFF=	--without-libjpeg
+JPEG_MESON_ENABLED=	jpeg
 
 LCMS2_LIB_DEPENDS=	liblcms2.so:graphics/lcms2
-LCMS2_CONFIGURE_OFF=	--without-cms
+LCMS2_MESON_ENABLED=	lcms
 
 LIBEXIF_LIB_DEPENDS=	libexif.so:graphics/libexif
-LIBEXIF_CONFIGURE_OFF=	--without-libexif
+LIBEXIF_MESON_ENABLED=	exif
 
 LIBRSVG2_USE=		GNOME=librsvg2
-LIBRSVG2_CONFIGURE_OFF=	--without-librsvg
+LIBRSVG2_MESON_ENABLED=	rsvg
 
 XMP_LIB_DEPENDS=	libexempi.so:textproc/exempi
-XMP_CONFIGURE_OFF=	--without-xmp
+XMP_MESON_ENABLED=	exempi
 
 .include <bsd.port.mk>
diff --git a/graphics/xviewer/distinfo b/graphics/xviewer/distinfo
index 13bd284e1bdb..6cfccac85978 100644
--- a/graphics/xviewer/distinfo
+++ b/graphics/xviewer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1640956330
-SHA256 (gnome/linuxmint-xviewer-3.2.4_GH0.tar.gz) = e96e9811ae5f7cb3e000d0035d27d85c00bed762c439504256854b8cb6022707
-SIZE (gnome/linuxmint-xviewer-3.2.4_GH0.tar.gz) = 2554461
+TIMESTAMP = 1737906844
+SHA256 (gnome/linuxmint-xviewer-3.4.8_GH0.tar.gz) = c8abe0e9a19ba867c620a1c417bb719b6c1e07e5baa444697d1e71ad8f676889
+SIZE (gnome/linuxmint-xviewer-3.4.8_GH0.tar.gz) = 2547011
diff --git a/graphics/xviewer/files/patch-Makefile.am b/graphics/xviewer/files/patch-Makefile.am
deleted file mode 100644
index 22ce638adbaf..000000000000
--- a/graphics/xviewer/files/patch-Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.orig	2021-12-31 13:12:10 UTC
-+++ Makefile.am
-@@ -2,7 +2,7 @@ endif
- jpeg_DIRS = jpegutils
- endif
- 
--SUBDIRS = $(jpeg_DIRS) cut-n-paste src po help data doc
-+SUBDIRS = $(jpeg_DIRS) cut-n-paste src po help data
- 
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
- 
diff --git a/graphics/xviewer/files/patch-configure.ac b/graphics/xviewer/files/patch-configure.ac
deleted file mode 100644
index 609e581c4666..000000000000
--- a/graphics/xviewer/files/patch-configure.ac
+++ /dev/null
@@ -1,21 +0,0 @@
---- configure.ac.orig	2021-12-31 13:12:10 UTC
-+++ configure.ac
-@@ -43,7 +43,6 @@ PKG_PROG_PKG_CONFIG
- 
- PKG_PROG_PKG_CONFIG
- 
--GTK_DOC_CHECK(1.16)
- 
- AC_CHECK_FUNCS(strptime)
- 
-@@ -350,10 +349,6 @@ data/icons/scalable/Makefile
- data/icons/32x32/Makefile
- data/icons/48x48/Makefile
- data/icons/scalable/Makefile
--doc/Makefile
--doc/reference/Makefile
--doc/reference/version.xml
--doc/reference/xviewer-docs.xml
- ])
- 
- AC_OUTPUT
diff --git a/graphics/xviewer/pkg-plist b/graphics/xviewer/pkg-plist
index 31935c401658..7845b7ff8db2 100644
--- a/graphics/xviewer/pkg-plist
+++ b/graphics/xviewer/pkg-plist
@@ -1,31 +1,79 @@
 bin/xviewer
-include/xviewer-3.0/xviewer/xviewer-application-activatable.h
-include/xviewer-3.0/xviewer/xviewer-application.h
-include/xviewer-3.0/xviewer/xviewer-clipboard-handler.h
-include/xviewer-3.0/xviewer/xviewer-debug.h
-include/xviewer-3.0/xviewer/xviewer-enums.h
-%%LIBEXIF%%include/xviewer-3.0/xviewer/xviewer-exif-util.h
-include/xviewer-3.0/xviewer/xviewer-file-chooser.h
-include/xviewer-3.0/xviewer/xviewer-image-save-info.h
-include/xviewer-3.0/xviewer/xviewer-image.h
-include/xviewer-3.0/xviewer/xviewer-job-scheduler.h
-include/xviewer-3.0/xviewer/xviewer-jobs.h
-include/xviewer-3.0/xviewer/xviewer-list-store.h
-include/xviewer-3.0/xviewer/xviewer-properties-dialog.h
-include/xviewer-3.0/xviewer/xviewer-scroll-view.h
-include/xviewer-3.0/xviewer/xviewer-sidebar.h
-include/xviewer-3.0/xviewer/xviewer-statusbar.h
-include/xviewer-3.0/xviewer/xviewer-thumb-nav.h
-include/xviewer-3.0/xviewer/xviewer-thumb-view.h
-include/xviewer-3.0/xviewer/xviewer-thumbnail.h
-include/xviewer-3.0/xviewer/xviewer-transform.h
-include/xviewer-3.0/xviewer/xviewer-uri-converter.h
-include/xviewer-3.0/xviewer/xviewer-window-activatable.h
-include/xviewer-3.0/xviewer/xviewer-window.h
+include/xviewer/xviewer-application-activatable.h
+include/xviewer/xviewer-application.h
+include/xviewer/xviewer-clipboard-handler.h
+include/xviewer/xviewer-debug.h
+include/xviewer/xviewer-enums.h
+%%LIBEXIF%%include/xviewer/xviewer-exif-util.h
+include/xviewer/xviewer-file-chooser.h
+include/xviewer/xviewer-image-save-info.h
+include/xviewer/xviewer-image.h
+include/xviewer/xviewer-job-scheduler.h
+include/xviewer/xviewer-jobs.h
+include/xviewer/xviewer-list-store.h
+include/xviewer/xviewer-properties-dialog.h
+include/xviewer/xviewer-scroll-view.h
+include/xviewer/xviewer-sidebar.h
+include/xviewer/xviewer-statusbar.h
+include/xviewer/xviewer-thumb-nav.h
+include/xviewer/xviewer-thumb-view.h
+include/xviewer/xviewer-thumbnail.h
+include/xviewer/xviewer-transform.h
+include/xviewer/xviewer-uri-converter.h
+include/xviewer/xviewer-window-activatable.h
+include/xviewer/xviewer-window.h
+%%PORTDOCS%%share/gtk-doc/html/xviewer/annotation-glossary.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/api-index.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/ch01.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/ch02.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/ch03.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/ch04.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/ch05.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/ch06.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/home.png
+%%PORTDOCS%%share/gtk-doc/html/xviewer/index.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/left-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/xviewer/left.png
+%%PORTDOCS%%share/gtk-doc/html/xviewer/pt01.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/right-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/xviewer/right.png
+%%PORTDOCS%%share/gtk-doc/html/xviewer/rn01.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/style.css
+%%PORTDOCS%%share/gtk-doc/html/xviewer/up-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/xviewer/up.png
+%%PORTDOCS%%share/gtk-doc/html/xviewer/xviewer-XviewerClipboardHandler.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/xviewer-XviewerFileChooser.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/xviewer-XviewerImageSaveInfo.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/xviewer-XviewerJobScheduler.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/xviewer-XviewerScrollView.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/xviewer-XviewerSidebar.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/xviewer-XviewerStatusbar.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/xviewer-XviewerWindowActivatable.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/xviewer-xviewer-application.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/xviewer-xviewer-config-keys.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/xviewer-xviewer-debug.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/xviewer-xviewer-error-message-area.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/xviewer-xviewer-exif-util.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/xviewer-xviewer-image.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/xviewer-xviewer-jobs.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/xviewer-xviewer-list-store.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/xviewer-xviewer-pixbuf-util.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/xviewer-xviewer-print.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/xviewer-xviewer-properties-dialog.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/xviewer-xviewer-save-as-dialog-helper.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/xviewer-xviewer-session.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/xviewer-xviewer-thumb-nav.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/xviewer-xviewer-thumb-view.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/xviewer-xviewer-thumbnail.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/xviewer-xviewer-transform.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/xviewer-xviewer-uri-converter.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/xviewer-xviewer-util.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/xviewer-xviewer-window.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/xviewer-zoom.html
+%%PORTDOCS%%share/gtk-doc/html/xviewer/xviewer.devhelp2
 lib/xviewer/girepository-1.0/Xviewer-3.0.typelib
 lib/xviewer/libxviewer.so
 libdata/pkgconfig/xviewer.pc
-share/appdata/xviewer.appdata.xml
 share/applications/xviewer.desktop
 share/help/C/xviewer/commandline.page
 share/help/C/xviewer/copy-paste.page
@@ -1382,6 +1430,7 @@ share/locale/br/LC_MESSAGES/xviewer.mo
 share/locale/bs/LC_MESSAGES/xviewer.mo
 share/locale/ca/LC_MESSAGES/xviewer.mo
 share/locale/ca@valencia/LC_MESSAGES/xviewer.mo
+share/locale/ckb/LC_MESSAGES/xviewer.mo
 share/locale/cs/LC_MESSAGES/xviewer.mo
 share/locale/cy/LC_MESSAGES/xviewer.mo
 share/locale/da/LC_MESSAGES/xviewer.mo
@@ -1398,6 +1447,7 @@ share/locale/eu/LC_MESSAGES/xviewer.mo
 share/locale/fa/LC_MESSAGES/xviewer.mo
 share/locale/fi/LC_MESSAGES/xviewer.mo
 share/locale/fr/LC_MESSAGES/xviewer.mo
+share/locale/fr_CA/LC_MESSAGES/xviewer.mo
 share/locale/fur/LC_MESSAGES/xviewer.mo
 share/locale/fy/LC_MESSAGES/xviewer.mo
 share/locale/ga/LC_MESSAGES/xviewer.mo
@@ -1462,6 +1512,7 @@ share/locale/th/LC_MESSAGES/xviewer.mo
 share/locale/tk/LC_MESSAGES/xviewer.mo
 share/locale/tr/LC_MESSAGES/xviewer.mo
 share/locale/ts/LC_MESSAGES/xviewer.mo
+share/locale/tt/LC_MESSAGES/xviewer.mo
 share/locale/ug/LC_MESSAGES/xviewer.mo
 share/locale/uk/LC_MESSAGES/xviewer.mo
 share/locale/ur/LC_MESSAGES/xviewer.mo
@@ -1475,21 +1526,28 @@ share/locale/zh_CN/LC_MESSAGES/xviewer.mo
 share/locale/zh_HK/LC_MESSAGES/xviewer.mo
 share/locale/zh_TW/LC_MESSAGES/xviewer.mo
 share/locale/zu/LC_MESSAGES/xviewer.mo
+share/metainfo/xviewer.appdata.xml
 %%DATADIR%%/gir-1.0/Xviewer-3.0.gir
 %%DATADIR%%/icons/hicolor/16x16/actions/slideshow-play.png
+%%DATADIR%%/icons/hicolor/16x16/actions/slideshow-play.svg
 %%DATADIR%%/icons/hicolor/16x16/actions/xviewer-image-gallery.png
 %%DATADIR%%/icons/hicolor/16x16/actions/xviewer-plugin.png
+%%DATADIR%%/icons/hicolor/16x16/actions/xviewer-plugin.svg
 %%DATADIR%%/icons/hicolor/22x22/actions/slideshow-play.png
+%%DATADIR%%/icons/hicolor/22x22/actions/slideshow-play.svg
 %%DATADIR%%/icons/hicolor/22x22/actions/xviewer-image-gallery.png
 %%DATADIR%%/icons/hicolor/22x22/actions/xviewer-plugin.png
+%%DATADIR%%/icons/hicolor/22x22/actions/xviewer-plugin.svg
 %%DATADIR%%/icons/hicolor/24x24/actions/slideshow-play.png
 %%DATADIR%%/icons/hicolor/24x24/actions/xviewer-image-gallery.png
 %%DATADIR%%/icons/hicolor/32x32/actions/slideshow-play.png
+%%DATADIR%%/icons/hicolor/32x32/actions/slideshow-play.svg
 %%DATADIR%%/icons/hicolor/32x32/actions/xviewer-image-gallery.png
+%%DATADIR%%/icons/hicolor/32x32/actions/xviewer-image-gallery.svg
 %%DATADIR%%/icons/hicolor/32x32/actions/xviewer-plugin.png
+%%DATADIR%%/icons/hicolor/32x32/actions/xviewer-plugin.svg
 %%DATADIR%%/icons/hicolor/48x48/actions/slideshow-play.png
 %%DATADIR%%/icons/hicolor/scalable/actions/slideshow-play.svg
 %%DATADIR%%/icons/hicolor/scalable/actions/xviewer-image-gallery.svg
 %%DATADIR%%/icons/hicolor/scalable/actions/xviewer-plugin.svg
 %%DATADIR%%/pixmaps/thumbnail-frame.png
-%%DATADIR%%/xviewer-toolbar.xml