Index: head/deskutils/gnome-photos/Makefile =================================================================== --- head/deskutils/gnome-photos/Makefile (revision 481475) +++ head/deskutils/gnome-photos/Makefile (revision 481476) @@ -1,50 +1,51 @@ # Created by: Gustau Perez # $FreeBSD$ PORTNAME= gnome-photos PORTVERSION= 3.28.0 +PORTREVISION= 1 CATEGORIES= deskutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= Photo application for GNOME 3 LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= geoclue>=0:net/geoclue \ itstool:textproc/itstool 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 \ libtracker-control-2.0.so:sysutils/tracker \ libgeocode-glib.so:net/geocode-glib \ libgjs.so:lang/gjs \ libbabl-0.1.so:x11/babl \ librest-0.7.so:devel/librest \ libsoup-2.4.so:devel/libsoup \ libjson-glib-1.0.so:devel/json-glib \ libgoa-1.0.so:net/gnome-online-accounts \ libdazzle-1.0.so:x11-toolkits/libdazzle \ libpng.so:graphics/png \ libgdata.so:devel/libgdata RUN_DEPENDS= geoclue>=0:net/geoclue PORTSCOUT= limitw:1,even USES= compiler:c11 gettext gmake gnome jpeg libtool \ localbase pathfix pkgconfig tar:xz USE_GNOME= cairo gnomedesktop3 gtk30 libxml2 USE_LDCONFIG= yes GNU_CONFIGURE= yes INSTALLS_ICONS= yes INSTALL_TARGET= install-strip GLIB_SCHEMAS= org.gnome.photos.gschema.xml .include Index: head/deskutils/gnome-photos/files/patch-configure =================================================================== --- head/deskutils/gnome-photos/files/patch-configure (nonexistent) +++ head/deskutils/gnome-photos/files/patch-configure (revision 481476) @@ -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 + Property changes on: head/deskutils/gnome-photos/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/mypaint/Makefile =================================================================== --- head/graphics/mypaint/Makefile (revision 481475) +++ head/graphics/mypaint/Makefile (revision 481476) @@ -1,56 +1,56 @@ # Created by: Andrew Pantyukhin # $FreeBSD$ PORTNAME= mypaint PORTVERSION= 1.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= https://github.com/mypaint/mypaint/releases/download/${PORTVERSION:S/^/v/}/ MAINTAINER= ports@FreeBSD.org COMMENT= Fast painting/scribbling program LICENSE= GPLv2+ ISCL LICENSE_COMB= multi LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING LICENSE_FILE_ISCL= ${WRKSRC}/brushlib/COPYING BUILD_DEPENDS= swig3.0:devel/swig30 \ ${PYNUMPY} 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}} CFLAGS_gcc= -std=c99 MAKE_ARGS= prefix=${PREFIX} \ enable_profiling=False \ 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 OPTIONS_DEFINE= GEGL OPENMP 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 OPENMP_USES_OFF= compiler # XXX ports/199603 OPENMP_MAKE_ARGS_OFF= enable_openmp=False post-install: ${INSTALL_LIB} ${WRKSRC}/brushlib/libmypaint*.so ${STAGEDIR}${PREFIX}/lib ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mypaint/_mypaintlib.so .include Index: head/graphics/mypaint/files/patch-SConstruct =================================================================== --- head/graphics/mypaint/files/patch-SConstruct (revision 481475) +++ head/graphics/mypaint/files/patch-SConstruct (revision 481476) @@ -1,30 +1,31 @@ ---- 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']: opts.Update(env) -env.Append(CXXFLAGS=' -Wall -Wno-sign-compare -Wno-write-strings') -env.Append(CCFLAGS='-Wall') -env.Append(CFLAGS='-std=c99') +#env.Append(CXXFLAGS=' -Wall -Wno-sign-compare -Wno-write-strings') +#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') +#env.Append(CFLAGS='-D_POSIX_C_SOURCE=200809L') if env.get('CPPDEFINES'): # make sure assertions are enabled @@ -113,7 +113,7 @@ if env['debug']: env.Append(CCFLAGS='-O0', LINKFLAGS='-O0') else: # Overridable defaults - env.Prepend(CCFLAGS='-O3', LINKFLAGS='-O3') + env.Prepend(CCFLAGS='', LINKFLAGS='') if env['enable_profiling'] or env['debug']: env.Append(CCFLAGS='-g')