svn commit: r481476 - in head: deskutils/gnome-photos deskutils/gnome-photos/files graphics/mypaint graphics/mypaint/files

Koop Mast kwm at FreeBSD.org
Sun Oct 7 19:03:59 UTC 2018 

Author: kwm
Date: Sun Oct  7 19:03:57 2018
New Revision: 481476
URL: https://svnweb.freebsd.org/changeset/ports/481476

Log:
  Chase gegl changes.

Added:
  head/deskutils/gnome-photos/files/
  head/deskutils/gnome-photos/files/patch-configure   (contents, props changed)
Modified:
  head/deskutils/gnome-photos/Makefile
  head/graphics/mypaint/Makefile
  head/graphics/mypaint/files/patch-SConstruct

Modified: head/deskutils/gnome-photos/Makefile
==============================================================================
--- head/deskutils/gnome-photos/Makefile	Sun Oct  7 19:02:47 2018	(r481475)
+++ head/deskutils/gnome-photos/Makefile	Sun Oct  7 19:03:57 2018	(r481476)
@@ -3,6 +3,7 @@
 
 PORTNAME=	gnome-photos
 PORTVERSION=	3.28.0
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -18,7 +19,7 @@ BUILD_DEPENDS=	geoclue>=0:net/geoclue \
 LIB_DEPENDS=	libexempi.so:textproc/exempi \
 		libfribidi.so:converters/fribidi \
 		libgfbgraph-0.2.so:net/gfbgraph \
-		libgegl-0.3.so:graphics/gegl3 \
+		libgegl-0.4.so:graphics/gegl \
 		libgrilo-0.3.so:net/grilo \
 		libexiv2.so:graphics/exiv2 \
 		libgexiv2.so:graphics/gexiv2 \

Added: head/deskutils/gnome-photos/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/deskutils/gnome-photos/files/patch-configure	Sun Oct  7 19:03:57 2018	(r481476)
@@ -0,0 +1,61 @@
+--- configure.orig	2018-09-30 15:09:19.044612000 +0200
++++ configure	2018-09-30 15:10:32.457663000 +0200
+@@ -6940,7 +6940,7 @@
+ DAZZLE_MIN_VERSION=3.26.0
+ GDATA_MIN_VERSION=0.15.2
+ GDK_PIXBUF_MIN_VERSION=2.32
+-GEGL_MIN_VERSION=0.3.28
++GEGL_MIN_VERSION=0.4.0
+ GFBGRAPH_MIN_VERSION=0.2.1
+ GLIB_MIN_VERSION=2.44.0
+ GOA_MIN_VERSION=3.8.0
+@@ -17403,12 +17403,12 @@
+     pkg_cv_GEGL_CFLAGS="$GEGL_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gegl-0.3 >= \$GEGL_MIN_VERSION\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "gegl-0.3 >= $GEGL_MIN_VERSION") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gegl-0.4 >= \$GEGL_MIN_VERSION\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "gegl-0.4 >= $GEGL_MIN_VERSION") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_GEGL_CFLAGS=`$PKG_CONFIG --cflags "gegl-0.3 >= $GEGL_MIN_VERSION" 2>/dev/null`
++  pkg_cv_GEGL_CFLAGS=`$PKG_CONFIG --cflags "gegl-0.4 >= $GEGL_MIN_VERSION" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -17420,12 +17420,12 @@
+     pkg_cv_GEGL_LIBS="$GEGL_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gegl-0.3 >= \$GEGL_MIN_VERSION\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "gegl-0.3 >= $GEGL_MIN_VERSION") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gegl-0.4 >= \$GEGL_MIN_VERSION\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "gegl-0.4 >= $GEGL_MIN_VERSION") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_GEGL_LIBS=`$PKG_CONFIG --libs "gegl-0.3 >= $GEGL_MIN_VERSION" 2>/dev/null`
++  pkg_cv_GEGL_LIBS=`$PKG_CONFIG --libs "gegl-0.4 >= $GEGL_MIN_VERSION" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -17446,14 +17446,14 @@
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        GEGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gegl-0.3 >= $GEGL_MIN_VERSION" 2>&1`
++	        GEGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gegl-0.4 >= $GEGL_MIN_VERSION" 2>&1`
+         else
+-	        GEGL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gegl-0.3 >= $GEGL_MIN_VERSION" 2>&1`
++	        GEGL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gegl-0.4 >= $GEGL_MIN_VERSION" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$GEGL_PKG_ERRORS" >&5
+ 
+-	as_fn_error $? "Package requirements (gegl-0.3 >= $GEGL_MIN_VERSION) were not met:
++	as_fn_error $? "Package requirements (gegl-0.4 >= $GEGL_MIN_VERSION) were not met:
+ 
+ $GEGL_PKG_ERRORS
+ 

Modified: head/graphics/mypaint/Makefile
==============================================================================
--- head/graphics/mypaint/Makefile	Sun Oct  7 19:02:47 2018	(r481475)
+++ head/graphics/mypaint/Makefile	Sun Oct  7 19:03:57 2018	(r481476)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mypaint
 PORTVERSION=	1.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/mypaint/mypaint/releases/download/${PORTVERSION:S/^/v/}/
 
@@ -21,6 +21,9 @@ LIB_DEPENDS=	libjson-c.so:devel/json-c \
 		liblcms2.so:graphics/lcms2
 RUN_DEPENDS=	${PYNUMPY}
 
+# XXX Embed RPATH via USES=fortran for py-numpy to load libgcc_s.so from ports
+USES=		desktop-file-utils fortran gettext gnome localbase \
+		pkgconfig python:2.7 scons tar:xz
 BINARY_ALIAS=	swig=swig3.0
 USE_GNOME=	gtk30 pygobject3 librsvg2:run
 CFLAGS+=	${CFLAGS_${CHOSEN_COMPILER_TYPE}}
@@ -30,9 +33,6 @@ MAKE_ARGS=	prefix=${PREFIX} \
 		use_sharedlib=True \
 		python_binary="${PYTHON_CMD}" \
 		python_config="${PYTHON_CMD}-config"
-# XXX Embed RPATH via USES=fortran for py-numpy to load libgcc_s.so from ports
-USES=		desktop-file-utils fortran gettext localbase \
-		pkgconfig python:2.7 scons tar:xz
 INSTALL_TARGET=	${STAGEDIR} --install-sandbox=${STAGEDIR}
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
@@ -42,7 +42,7 @@ OPTIONS_DEFAULT=	OPENMP
 OPTIONS_SUB=		yes
 
 GEGL_DESC=		Graph based image processing framework support
-GEGL_LIB_DEPENDS=	libgegl-0.3.so:graphics/gegl3
+GEGL_LIB_DEPENDS=	libgegl-0.4.so:graphics/gegl
 GEGL_MAKE_ARGS=		enable_gegl=True
 
 OPENMP_USES=		compiler:openmp

Modified: head/graphics/mypaint/files/patch-SConstruct
==============================================================================
--- head/graphics/mypaint/files/patch-SConstruct	Sun Oct  7 19:02:47 2018	(r481475)
+++ head/graphics/mypaint/files/patch-SConstruct	Sun Oct  7 19:03:57 2018	(r481476)
@@ -1,4 +1,4 @@
---- SConstruct.orig	2016-01-15 19:42:54 UTC
+--- SConstruct.orig	2017-01-21 17:51:52 UTC
 +++ SConstruct
 @@ -95,14 +95,14 @@ if "$CCFLAGS" in env['CXXCOM']:
  
@@ -11,7 +11,8 @@
 +#env.Append(CCFLAGS='-Wall')
 +#env.Append(CFLAGS='-std=c99')
  
- env['GEGL_VERSION'] = 0.3
+-env['GEGL_VERSION'] = 0.3
++env['GEGL_VERSION'] = 0.4
  
  # Define strdup() in string.h under glibc >= 2.10 (POSIX.1-2008)
 -env.Append(CFLAGS='-D_POSIX_C_SOURCE=200809L')

More information about the svn-ports-head mailing list