diff --git a/graphics/fotoxx/Makefile b/graphics/fotoxx/Makefile index 0777cfd55e55..18224fcfac7a 100644 --- a/graphics/fotoxx/Makefile +++ b/graphics/fotoxx/Makefile @@ -1,47 +1,47 @@ # Created by: Rod Person PORTNAME= fotoxx -PORTVERSION= 22.16 +PORTVERSION= 22.18 CATEGORIES= graphics MASTER_SITES= https://kornelix.net/downloads/downloads/ MAINTAINER= danfe@FreeBSD.org COMMENT= Application to organize and edit image collections LICENSE= GPLv3+ LIB_DEPENDS= libchamplain-gtk-0.12.so:graphics/libchamplain \ libclutter-gtk-1.0.so:graphics/clutter-gtk3 \ liblcms2.so:graphics/lcms2 \ libpng.so:graphics/png \ libtiff.so:graphics/tiff RUN_DEPENDS= xdg-open:devel/xdg-utils \ exiftool:graphics/p5-Image-ExifTool \ ufraw-batch:graphics/ufraw USES= desktop-file-utils gmake gnome jpeg pkgconfig USE_GNOME= cairo glib20 gdkpixbuf2 gtk30 ALL_TARGET= fotoxx WRKSRC= ${WRKDIR}/${PORTNAME} PORTDOCS= * OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e \ 's,= thread,= cartoon::thread,' ${WRKSRC}/f.effects.cc @${REINPLACE_CMD} -e \ '/#include /d' ${WRKSRC}/f.meta.cc @${REINPLACE_CMD} -e \ 's,pidof,pgrep -d\\\\ ,' ${WRKSRC}/fotoxx.cc @${REINPLACE_CMD} -e \ '/#include/s,wait\.h,sys/&,' ${WRKSRC}/fotoxx.h @${REINPLACE_CMD} -e \ 's|/usr/share/fotoxx|${DATADIR}|' ${WRKSRC}/fotoxx.desktop post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/fotoxx .include diff --git a/graphics/fotoxx/distinfo b/graphics/fotoxx/distinfo index 21d32d4d370a..91a8060f221b 100644 --- a/graphics/fotoxx/distinfo +++ b/graphics/fotoxx/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1651395361 -SHA256 (fotoxx-22.16.tar.gz) = 50dfc7dd3c2d85c3df2d77ac15d410a188fd06e69a248432b9ea7591c8d4503a -SIZE (fotoxx-22.16.tar.gz) = 8984376 +TIMESTAMP = 1654073472 +SHA256 (fotoxx-22.18.tar.gz) = 413c078e7cac275e297e743b6e6f5266ad770ac17c8a438d3b7888d7b9e1d576 +SIZE (fotoxx-22.18.tar.gz) = 8917288 diff --git a/graphics/fotoxx/files/patch-Makefile b/graphics/fotoxx/files/patch-Makefile index 3222b7d395b7..4019f6afe15e 100644 --- a/graphics/fotoxx/files/patch-Makefile +++ b/graphics/fotoxx/files/patch-Makefile @@ -1,44 +1,44 @@ --- Makefile.orig 2022-04-01 11:30:07 UTC +++ Makefile @@ -1,40 +1,12 @@ # fotoxx Makefile -# -# export CXX=g++ gnu compiler -# export CXX=clang++ clang compiler -# export DEBUG=x debug build with address checking - -# Try to fix warning from champlain-tile.h but none of this works -# CXXFLAGS += -D GTimeVal=GDateTime -# MAKEDIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))) -# CXXFLAGS += -I $(MAKEDIR) - - -ifeq ($(CXX), clang++) # CLANG - ifdef DEBUG - CXXFLAGS += -Wall -g -O0 -fsanitize=address -Wno-stringop-truncation - LDFLAGS += -fsanitize=address - else - CXXFLAGS += -Wall -g -O2 - endif -else # GCC - ifdef DEBUG - CXXFLAGS += -Wall -g -rdynamic -O0 -fsanitize=address \ - -Wno-format-truncation -Wno-stringop-truncation - LDFLAGS += -fsanitize=address - else - CXXFLAGS += -Wall -g -rdynamic -O2 -Wno-format-truncation -Wno-stringop-truncation - endif -endif - PKG_CONFIG ?= pkg-config CFLAGS = $(CXXFLAGS) $(CPPFLAGS) -c \ `$(PKG_CONFIG) --cflags gtk+-3.0 --libs champlain-gtk-0.12` LIBS = `$(PKG_CONFIG) --libs gtk+-3.0` \ - -lrt -lpthread -llcms2 -ltiff -lpng -ljpeg \ -+ -lrt -lexecinfo -llcms2 -ltiff -lpng -ljpeg \ ++ -lrt -lpthread -llcms2 -ltiff -lpng -ljpeg -lexecinfo \ -lclutter-1.0 -lclutter-gtk-1.0 -lchamplain-0.12 -lchamplain-gtk-0.12 ALLFILES = fotoxx.o f.widgets.o f.file.o f.gallery.o f.albums.o f.area.o f.meta.o \