From owner-svn-ports-all@freebsd.org Tue May 23 19:36:58 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2D135D7BE91; Tue, 23 May 2017 19:36:58 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 09E9018C6; Tue, 23 May 2017 19:36:57 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4NJavHV080848; Tue, 23 May 2017 19:36:57 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4NJau6I080843; Tue, 23 May 2017 19:36:56 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201705231936.v4NJau6I080843@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Tue, 23 May 2017 19:36:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r441550 - in head/graphics: gimp gimp-app X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 May 2017 19:36:58 -0000 Author: kwm Date: Tue May 23 19:36:56 2017 New Revision: 441550 URL: https://svnweb.freebsd.org/changeset/ports/441550 Log: Update gimp to 2.8.22. (1) * Move libsoup to the helpbrowser dependancy (2) * Gimp plugins need kern.ipc.shm_allow_removed=1, which is default for 11.0-R and newer. Add pkg-message for 10.x (3) * Move desktop-file-utils so it only applies to the gimp-app port. PR: 219156 (based on)(1), 214751 (2), 204919 (3), 206097 (3) Submitted by: mi@ (1), Christian Heckendorf (2) Added: head/graphics/gimp-app/pkg-message (contents, props changed) Modified: head/graphics/gimp-app/Makefile head/graphics/gimp-app/distinfo head/graphics/gimp-app/pkg-plist head/graphics/gimp/Makefile Modified: head/graphics/gimp-app/Makefile ============================================================================== --- head/graphics/gimp-app/Makefile Tue May 23 19:00:01 2017 (r441549) +++ head/graphics/gimp-app/Makefile Tue May 23 19:36:56 2017 (r441550) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME?= gimp-app -PORTVERSION= 2.8.18 -PORTREVISION= 2 +PORTVERSION= 2.8.22 PORTEPOCH?= 1 CATEGORIES?= graphics gnome MASTER_SITES= GIMP/gimp/v${PORTVERSION:R} @@ -23,18 +22,21 @@ LIB_DEPENDS= libpng.so:graphics/png \ libbabl-0.1.so:x11/babl \ libfontconfig.so:x11-fonts/fontconfig \ libdbus-1.so:devel/dbus \ - libsoup-2.4.so:devel/libsoup \ libfreetype.so:print/freetype2 RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes GNU_CONFIGURE= yes -USES+= cpe desktop-file-utils execinfo gettext gmake jpeg libtool \ - localbase pathfix pkgconfig tar:bzip2 +USES+= cpe execinfo gettext gmake jpeg libtool \ + localbase pathfix pkgconfig shebangfix tar:bzip2 USE_XORG= ice sm xcursor xext xfixes xmu xpm xt x11 USE_GNOME+= cairo gtk20 intlhack USE_LDCONFIG= yes INSTALLS_ICONS= yes INSTALL_TARGET= install-strip +TEST_TARGET= check +.if !defined(XAUTHORITY) +TEST_ENV= XAUTHORITY=${HOME}/.Xauthority +.endif CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc/gimp \ --disable-gtk-doc \ --without-linux-input \ @@ -51,10 +53,14 @@ LIBS+= -lexecinfo CPE_PRODUCT= gimp CPE_VENDOR= gnu -PLIST_SUB+= LIBVER=0.800.18 +SHEBANG_FILES= plug-ins/pygimp/plug-ins/*.py + +PLIST_SUB+= LIBVER=0.800.${PORTVERSION:E} .if !defined(GIMP_SLAVE) +USES+= desktop-file-utils + OPTIONS_DEFINE?= AA DBUS LIBEXIF GHOSTSCRIPT GVFS HELPBROWSER JASPER \ LIBMNG LIBRSVG2 POPPLER SIMD WMF OPTIONS_DEFAULT= AA DBUS LIBEXIF GVFS HELPBROWSER LIBMNG LIBRSVG2 \ @@ -90,7 +96,8 @@ GVFS_USE= GNOME=gvfs GVFS_LIB_DEPENDS_OFF= libcurl.so:ftp/curl GVFS_CONFIGURE_OFF= --without-gvfs -HELPBROWSER_LIB_DEPENDS= libwebkitgtk-1.0.so:www/webkit-gtk2 +HELPBROWSER_LIB_DEPENDS= libwebkitgtk-1.0.so:www/webkit-gtk2 \ + libsoup-2.4.so:devel/libsoup HELPBROWSER_CONFIGURE_WITH= webkit JASPER_LIB_DEPENDS= libjasper.so:graphics/jasper Modified: head/graphics/gimp-app/distinfo ============================================================================== --- head/graphics/gimp-app/distinfo Tue May 23 19:00:01 2017 (r441549) +++ head/graphics/gimp-app/distinfo Tue May 23 19:36:56 2017 (r441550) @@ -1,3 +1,3 @@ -TIMESTAMP = 1468525766 -SHA256 (gimp-2.8.18.tar.bz2) = 39dd2247c678deaf5cc664397d3c6bd4fb910d3472290fd54b52b441b5815441 -SIZE (gimp-2.8.18.tar.bz2) = 20824198 +TIMESTAMP = 1494885183 +SHA256 (gimp-2.8.22.tar.bz2) = 9187a35cc52b110d78124d7b27b68a68ade14a794c2721314bac6134d2a5638a +SIZE (gimp-2.8.22.tar.bz2) = 20873278 Added: head/graphics/gimp-app/pkg-message ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/gimp-app/pkg-message Tue May 23 19:36:56 2017 (r441550) @@ -0,0 +1,7 @@ +On FreeBSD 10.3 gimp can cause the following error. + +(script-fu:3985): LibGimp-ERROR **: shmat() failed: Invalid argument +Could not attach to gimp shared memory segment + +This can be fixed by setting kern.ipc.shm_allow_removed=1 in /etc/sysctl.conf. +FreeBSD 11.0-R and newer have this set by default. Modified: head/graphics/gimp-app/pkg-plist ============================================================================== --- head/graphics/gimp-app/pkg-plist Tue May 23 19:00:01 2017 (r441549) +++ head/graphics/gimp-app/pkg-plist Tue May 23 19:36:56 2017 (r441550) @@ -225,32 +225,32 @@ include/gimp-2.0/libgimpwidgets/gimpwidg include/gimp-2.0/libgimpwidgets/gimpwidgetstypes.h include/gimp-2.0/libgimpwidgets/gimpzoommodel.h lib/libgimp-2.0.so -lib/libgimp-2.0.so.%%LIBVER%% lib/libgimp-2.0.so.0 +lib/libgimp-2.0.so.%%LIBVER%% lib/libgimpbase-2.0.so -lib/libgimpbase-2.0.so.%%LIBVER%% lib/libgimpbase-2.0.so.0 +lib/libgimpbase-2.0.so.%%LIBVER%% lib/libgimpcolor-2.0.so -lib/libgimpcolor-2.0.so.%%LIBVER%% lib/libgimpcolor-2.0.so.0 +lib/libgimpcolor-2.0.so.%%LIBVER%% lib/libgimpconfig-2.0.so -lib/libgimpconfig-2.0.so.%%LIBVER%% lib/libgimpconfig-2.0.so.0 +lib/libgimpconfig-2.0.so.%%LIBVER%% lib/libgimpmath-2.0.so -lib/libgimpmath-2.0.so.%%LIBVER%% lib/libgimpmath-2.0.so.0 +lib/libgimpmath-2.0.so.%%LIBVER%% lib/libgimpmodule-2.0.so -lib/libgimpmodule-2.0.so.%%LIBVER%% lib/libgimpmodule-2.0.so.0 +lib/libgimpmodule-2.0.so.%%LIBVER%% lib/libgimpthumb-2.0.so -lib/libgimpthumb-2.0.so.%%LIBVER%% lib/libgimpthumb-2.0.so.0 +lib/libgimpthumb-2.0.so.%%LIBVER%% lib/libgimpui-2.0.so -lib/libgimpui-2.0.so.%%LIBVER%% lib/libgimpui-2.0.so.0 +lib/libgimpui-2.0.so.%%LIBVER%% lib/libgimpwidgets-2.0.so -lib/libgimpwidgets-2.0.so.%%LIBVER%% lib/libgimpwidgets-2.0.so.0 +lib/libgimpwidgets-2.0.so.%%LIBVER%% libdata/pkgconfig/gimp-2.0.pc libdata/pkgconfig/gimpthumb-2.0.pc libdata/pkgconfig/gimpui-2.0.pc @@ -464,11 +464,11 @@ share/doc/gimp/libgimp/home.png share/doc/gimp/libgimp/index.html share/doc/gimp/libgimp/left-insensitive.png share/doc/gimp/libgimp/left.png -share/doc/gimp/libgimp/libgimp-Gimp.html share/doc/gimp/libgimp/libgimp-GimpItemComboBox.html share/doc/gimp/libgimp/libgimp-GimpProcView.html share/doc/gimp/libgimp/libgimp-data.html share/doc/gimp/libgimp/libgimp-general.html +share/doc/gimp/libgimp/libgimp-gimp.html share/doc/gimp/libgimp/libgimp-gimpbrush.html share/doc/gimp/libgimp/libgimp-gimpbrushes.html share/doc/gimp/libgimp/libgimp-gimpbrushmenu.html Modified: head/graphics/gimp/Makefile ============================================================================== --- head/graphics/gimp/Makefile Tue May 23 19:00:01 2017 (r441549) +++ head/graphics/gimp/Makefile Tue May 23 19:36:56 2017 (r441550) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gimp -DISTVERSION?= 2.8.18 +DISTVERSION?= 2.8.22 PORTREVISION?= 0 PORTEPOCH?= 2 CATEGORIES= graphics gnome