Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 5 Dec 2020 01:42:47 +0000 (UTC)
From:      Matthias Andree <mandree@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r557036 - in head/graphics/geeqie: . files
Message-ID:  <202012050142.0B51glLs037285@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mandree
Date: Sat Dec  5 01:42:46 2020
New Revision: 557036
URL: https://svnweb.freebsd.org/changeset/ports/557036

Log:
  graphics/geeqie: add missing dependencies, patch useless warning
  
  This adds missing dependencies for nondefault options.
  (Two items for USE_GNOME actually snuck into the previous commit already,
  my apologies for missing that in the commit message. r557035)
  
  It also patches out a useless "CFLAGS+=... not found" warning from
  the "make configure" phase. We can't currently use -Werror anyways
  for building geeqie with our GTK3 version (deprecation warnings).
  
  Approved by:	portmgr@ (blanket, dependencies)

Modified:
  head/graphics/geeqie/Makefile
  head/graphics/geeqie/files/patch-configure.ac

Modified: head/graphics/geeqie/Makefile
==============================================================================
--- head/graphics/geeqie/Makefile	Sat Dec  5 01:11:52 2020	(r557035)
+++ head/graphics/geeqie/Makefile	Sat Dec  5 01:42:46 2020	(r557036)
@@ -55,9 +55,15 @@ LIRC_CONFIGURE_ON=	--with-lirc-prefix="${LOCALBASE}"
 LIRC_BROKEN=		does not build with old lirc from ports
 
 MAP_LIB_DEPENDS=	libchamplain-0.12.so:graphics/libchamplain \
-			libclutter-gtk-1.0.so:graphics/clutter-gtk3
+			libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
+			libclutter-1.0.so:graphics/clutter \
+			libcogl.so:graphics/cogl \
+			libjson-glib-1.0.so:devel/json-glib
+
 MAP_CONFIGURE_ENABLE=	map gpu-accel
 MAP_REQUIRES=		GTK3
+MAP_USES=		gl xorg
+MAP_USE=		GL=egl XORG=xrandr,x11,xext,xdamage,xfixes,xcomposite,xi
 
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_CONFIGURE_ENABLE=	tiff
@@ -73,6 +79,9 @@ PDF_REQUIRES=		GTK3
 FFMPEGTHUMBNAILER_DESC=	Video file thumbnails generating support
 FFMPEGTHUMBNAILER_CONFIGURE_ENABLE=	ffmpegthumbnailer
 FFMPEGTHUMBNAILER_LIB_DEPENDS=	libffmpegthumbnailer.so:multimedia/ffmpegthumbnailer
+
+GTK2_LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+			libfontconfig.so:x11-fonts/fontconfig
 
 NLS_CONFIGURE_ENABLE=	nls
 

Modified: head/graphics/geeqie/files/patch-configure.ac
==============================================================================
--- head/graphics/geeqie/files/patch-configure.ac	Sat Dec  5 01:11:52 2020	(r557035)
+++ head/graphics/geeqie/files/patch-configure.ac	Sat Dec  5 01:42:46 2020	(r557036)
@@ -1,5 +1,14 @@
 --- configure.ac.orig	2020-11-20 21:36:33 UTC
 +++ configure.ac
+@@ -18,7 +18,7 @@ AC_PREREQ(2.57)
+ AC_INIT([geeqie], 1.6, [https://github.com/BestImageViewer/geeqie/issues], [], [http://www.geeqie.org/])
+ 
+ # Add -Werror to the default CFLAGS
+-CFLAGS+=" -Werror -Wno-error=deprecated-declarations -Wno-error=sign-compare -Wno-error=return-type"
++#CFLAGS+=" -Werror -Wno-error=deprecated-declarations -Wno-error=sign-compare -Wno-error=return-type"
+ 
+ # Check for rightly dirs
+ AC_CONFIG_SRCDIR([src/main.c])
 @@ -525,7 +525,7 @@ AC_ARG_ENABLE([lua],
      [liblua=$enableval], [liblua=auto])
  



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012050142.0B51glLs037285>