From owner-svn-ports-head@FreeBSD.ORG Mon Mar 11 12:19:10 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 42A7FBE; Mon, 11 Mar 2013 12:19:10 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 2FB61DB1; Mon, 11 Mar 2013 12:19:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2BCJANi024984; Mon, 11 Mar 2013 12:19:10 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2BCJ966024974; Mon, 11 Mar 2013 12:19:09 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201303111219.r2BCJ966024974@svn.freebsd.org> From: Koop Mast Date: Mon, 11 Mar 2013 12:19:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r313872 - in head/graphics: gimp gimp-app gimp-app/files py-gimp X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Mar 2013 12:19:10 -0000 Author: kwm Date: Mon Mar 11 12:19:08 2013 New Revision: 313872 URL: http://svnweb.freebsd.org/changeset/ports/313872 Log: Update to 2.8.4. Convert to OptionsNG, remove shlib versions, update Makefile header. Disable helpbrowser for now, need newer webkit. Use USE_PKGCONFIG and switch to pathfix instead of gnomehack Requested by many. Obtained from: gnome team repo Added: head/graphics/gimp-app/files/patch-app_base_base-utils.c (contents, props changed) Modified: head/graphics/gimp-app/Makefile (contents, props changed) head/graphics/gimp-app/distinfo (contents, props changed) head/graphics/gimp-app/files/patch-configure (contents, props changed) head/graphics/gimp-app/files/patch-plug-ins_pygimp_Makefile.in (contents, props changed) head/graphics/gimp-app/pkg-plist (contents, props changed) head/graphics/gimp/Makefile (contents, props changed) head/graphics/py-gimp/Makefile (contents, props changed) head/graphics/py-gimp/pkg-plist (contents, props changed) Modified: head/graphics/gimp-app/Makefile ============================================================================== --- head/graphics/gimp-app/Makefile Mon Mar 11 12:18:11 2013 (r313871) +++ head/graphics/gimp-app/Makefile Mon Mar 11 12:19:08 2013 (r313872) @@ -1,80 +1,76 @@ -# New ports collection makefile for: The GIMP -# Date created: Mon Nov 18 21:28:43 CST 1996 -# Whom: erich@FreeBSD.org -# +# Created by: erich@FreeBSD.org # $FreeBSD$ -# $MCom: ports/graphics/gimp-app/Makefile,v 1.53 2010/10/08 08:29:33 kwm Exp $ -# +# $MCom: ports/graphics/gimp-app/Makefile,v 1.65 2012/12/30 18:09:11 mezz Exp $ PORTNAME= gimp-app -DISTVERSION= 2.6.12 -PORTREVISION?= 1 +PORTVERSION= 2.8.4 +PORTREVISION?= 0 PORTEPOCH?= 1 CATEGORIES?= graphics gnome MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ http://gimp.mirrors.hoobly.com/%SUBDIR%/ \ http://ftp.gwdg.de/pub/misc/grafik/gimp/%SUBDIR%/ \ - ftp://ftp.fh-heilbronn.de/mirrors/ftp.gimp.org/%SUBDIR%/ \ - ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/%SUBDIR%/ \ + ftp://ftp.is.co.za/mirror/ftp.gimp.org/gimp/%SUBDIR%/ \ + ftp://ftp.cc.uoc.gr/mirrors/gimp/%SUBDIR%/ \ http://www.mirrorservice.org/sites/ftp.gimp.org/pub/%SUBDIR%/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/%SUBDIR%,} MASTER_SITE_SUBDIR= gimp/v${PORTVERSION:R} -DISTNAME= gimp-${DISTVERSION} +DISTNAME= gimp-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org -COMMENT= A GNU Image Manipulation Program +COMMENT= GNU Image Manipulation Program + +LICENSE= GPLv3 LGPL3 +LICENSE_COMB= multi BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ - jpeg.11:${PORTSDIR}/graphics/jpeg \ - tiff.4:${PORTSDIR}/graphics/tiff \ - lcms.1:${PORTSDIR}/graphics/lcms \ - gegl-0.1.107:${PORTSDIR}/graphics/gegl \ + jpeg:${PORTSDIR}/graphics/jpeg \ + tiff:${PORTSDIR}/graphics/tiff \ + lcms:${PORTSDIR}/graphics/lcms \ + gegl-0.2:${PORTSDIR}/graphics/gegl \ babl-0.1:${PORTSDIR}/x11/babl RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes -CONFLICTS= gimp-app-devel-[0-9]* - USE_BZIP2= yes USE_GETTEXT= yes USE_XORG= xpm xmu xext USE_GMAKE= yes USE_AUTOTOOLS= libtool -USE_GNOME+= gnomehack intltool intlhack gtk20 libartlgpl2 ltverhack \ +USE_GNOME+= intltool intlhack gtk20 libartlgpl2 ltverhack gnomehier \ desktopfileutils +USES= pathfix +USE_PKGCONFIG= build USE_LDCONFIG= yes INSTALLS_ICONS= yes LIBTOOLFLAGS= --disable-ltlibs --release-ignore CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc/gimp \ --disable-gtk-doc \ --without-linux-input \ - --without-print \ + --with-print \ + --enable-default-binary \ + --disable-gimp-console \ --disable-python \ --with-desktop-dir=${PREFIX}/share \ --docdir=${PREFIX}/share/doc/gimp \ - --enable-default-binary \ - --without-gnomevfs + --enable-default-binary CONFIGURE_ENV= GIMP_THREAD_LIBS=${PTHREAD_LIBS} CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib .if !defined(GIMP_SLAVE) -WANT_GNOME= yes -OPTIONS?= AA "Ascii Art plug-in" on \ - DBUS "D-BUS support" on \ - EXIF "reading meta-data from camera/scanner" on \ - GVFS "Use GVFS for the URI plug-in" on \ - HELPBROWSER "internal help browser" on \ - MNG "MNG format support" on \ - MP "multiple processor support" off \ - POPPLER "PDF format support" on \ - RSVG "SVG format support" on \ - SIMD "Use cpu-specific optimizations if available" off \ - WMF "wmf plugin" on +OPTIONS_DEFINE?= AA DBUS LIBEXIF GHOSTSCRIPT GVFS JASPER \ + LIBMNG LIBRSVG2 POPPLER SIMD WMF +OPTIONS_DEFAULT= AA DBUS LIBEXIF GVFS LIBMNG LIBRSVG2 \ + POPPLER WMF +# HELPBROWSER (default on) needs webkit 1.6+ +AA_DESC= Ascii-art Plug-in +HELPBROWSER_DESC= Internal help browser + .endif -.include +.include .if defined(GIMP_SLAVE) PKG_CONFIG?= ${LOCALBASE}/bin/pkg-config @@ -82,109 +78,115 @@ GIMP_LIBS= `${PKG_CONFIG} --libs gimp-2. GIMP_THUMB_LIBS=`${PKG_CONFIG} --libs gimpthumb-2.0` GIMP_UI_LIBS= `${PKG_CONFIG} --libs gimpui-2.0` -LIB_DEPENDS+= gimp-2.0.0:${PORTSDIR}/graphics/gimp-app +LIB_DEPENDS+= gimp-2.0:${PORTSDIR}/graphics/gimp-app .else -MAN1+= gimp-2.6.1 gimptool-2.0.1 -MAN5+= gimprc-2.6.5 -MLINKS= gimp-2.6.1 gimp.1 \ - gimp-2.6.1 gimp-console-2.6.1 \ - gimp-console-2.6.1 gimp-console.1 \ - gimprc-2.6.5 gimprc.5 +MAN1+= gimp-2.8.1 gimptool-2.0.1 +MAN5+= gimprc-2.8.5 +MLINKS= gimp-2.8.1 gimp.1 \ + gimprc-2.8.5 gimprc.5 -.if defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --enable-debug .endif -.if ${HAVE_GNOME:Mgnomehier}!="" || defined(WITH_GNOME) -USE_GNOME+= desktopfileutils gnomehier -PLIST_SUB+= GNOME="" -.else -PLIST_SUB+= GNOME="@comment " -.endif - -.if defined(WITH_AA) -LIB_DEPENDS+= aa.1:${PORTSDIR}/graphics/aalib +.if ${PORT_OPTIONS:MAA} +LIB_DEPENDS+= aa:${PORTSDIR}/graphics/aalib PLIST_SUB+= AA="" .else CONFIGURE_ARGS+= --without-aa PLIST_SUB+= AA="@comment " .endif -.if defined(WITH_DBUS) -LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib +.if ${PORT_OPTIONS:MDBUS} +LIB_DEPENDS+= dbus-glib-1:${PORTSDIR}/devel/dbus-glib CONFIGURE_ARGS+= --with-dbus .else CONFIGURE_ARGS+= --without-dbus .endif -.if defined(WITH_EXIF) -LIB_DEPENDS+= exif.12:${PORTSDIR}/graphics/libexif +.if ${PORT_OPTIONS:MGHOSTSCRIPT} +USE_GHOSTSCRIPT= yes +CONFIGURE_ARGS+= --with-gs +PLIST_SUB+= GS="" .else -CONFIGURE_ARGS+= --without-libexif +CONFIGURE_ARGS+= --without-gs +PLIST_SUB+= GS="@comment " .endif -.if defined(WITH_GVFS) +.if ${PORT_OPTIONS:MGVFS} USE_GNOME+= gvfs .else -LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl +LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl CONFIGURE_ARGS+= --without-gvfs .endif -.if defined(WITH_HELPBROWSER) -LIB_DEPENDS+= webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 -CONFIGURE_ARGS+= --with-webkit -PLIST_SUB+= HELPBROWSER="" -.else +#.if ${PORT_OPTIONS:MHELPBROWSER} +#LIB_DEPENDS+= webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2 +#CONFIGURE_ARGS+= --with-webkit +#PLIST_SUB+= HELPBROWSER="" +#.else CONFIGURE_ARGS+= --without-webkit PLIST_SUB+= HELPBROWSER="@comment " -.endif +#.endif -.if defined(WITH_MNG) -LIB_DEPENDS+= mng.1:${PORTSDIR}/graphics/libmng -PLIST_SUB+= MNG="" +.if ${PORT_OPTIONS:MJASPER} +LIB_DEPENDS+= jasper:${PORTSDIR}/graphics/jasper +CONFIGURE_ARGS+= --with-libjasper +PLIST_SUB+= JASPER="" .else -CONFIGURE_ARGS+= --without-libmng -PLIST_SUB+= MNG="@comment " +CONFIGURE_ARGS+= --without-libjasper +PLIST_SUB+= JASPER="@comment " .endif -.if defined(WITH_MP) -CONFIGURE_ARGS+= --enable-mp +.if ${PORT_OPTIONS:MLIBEXIF} +LIB_DEPENDS+= exif:${PORTSDIR}/graphics/libexif +PLIST_SUB+= EXIF="" .else -CONFIGURE_ARGS+= --disable-mp +CONFIGURE_ARGS+= --without-libexif +PLIST_SUB+= EXIF="@comment " .endif -.if defined(WITH_POPPLER) -LIB_DEPENDS+= poppler-glib.8:${PORTSDIR}/graphics/poppler-glib -PLIST_SUB+= POPPLER="" +.if ${PORT_OPTIONS:MLIBMNG} +LIB_DEPENDS+= mng:${PORTSDIR}/graphics/libmng +PLIST_SUB+= MNG="" .else -CONFIGURE_ARGS+= --without-poppler -PLIST_SUB+= POPPLER="@comment " +CONFIGURE_ARGS+= --without-libmng +PLIST_SUB+= MNG="@comment " .endif -.if defined(WITH_RSVG) +.if ${PORT_OPTIONS:MLIBRSVG2} USE_GNOME+= librsvg2 +CONFIGURE_ARGS+= --with-librsvg PLIST_SUB+= SVG="" .else CONFIGURE_ARGS+= --without-librsvg PLIST_SUB+= SVG="@comment " .endif -.if defined(WITH_WMF) -LIB_DEPENDS+= wmf.2:${PORTSDIR}/graphics/libwmf -PLIST_SUB+= WMF="" +.if ${PORT_OPTIONS:MPOPPLER} +LIB_DEPENDS+= poppler-glib:${PORTSDIR}/graphics/poppler-glib +PLIST_SUB+= POPPLER="" .else -CONFIGURE_ARGS+= --without-wmf -PLIST_SUB+= WMF="@comment " +CONFIGURE_ARGS+= --without-poppler +PLIST_SUB+= POPPLER="@comment " .endif -.if !defined(WITH_SIMD) +.if !${PORT_OPTIONS:MSIMD} CONFIGURE_ARGS+= --disable-mmx \ --disable-sse \ --disable-altivec .endif +.if ${PORT_OPTIONS:MWMF} +LIB_DEPENDS+= wmf:${PORTSDIR}/graphics/libwmf +PLIST_SUB+= WMF="" +.else +CONFIGURE_ARGS+= --without-wmf +PLIST_SUB+= WMF="@comment " +.endif + .endif post-patch: @@ -197,9 +199,8 @@ post-patch: @${REINPLACE_CMD} -e 's|"libpng"|"libpng15"|' \ -e 's|x86_64|amd64|g' \ ${WRKSRC}/configure - @${REINPLACE_CMD} '/curl.types.h/d' ${WRKSRC}/plug-ins/file-uri/uri-backend-libcurl.c post-install: @-update-desktop-database -.include +.include Modified: head/graphics/gimp-app/distinfo ============================================================================== --- head/graphics/gimp-app/distinfo Mon Mar 11 12:18:11 2013 (r313871) +++ head/graphics/gimp-app/distinfo Mon Mar 11 12:19:08 2013 (r313872) @@ -1,2 +1,2 @@ -SHA256 (gimp-2.6.12.tar.bz2) = d553c9f1c07f59fa7b7ce9cc5f84ce59bf4e9dfb5b6ee4bd8718b74b947aec62 -SIZE (gimp-2.6.12.tar.bz2) = 16745411 +SHA256 (gimp-2.8.4.tar.bz2) = e24a9f826e7c30edb83d96f4cf4787cf1a0ed98f28ea947d19736b4f49787ab5 +SIZE (gimp-2.8.4.tar.bz2) = 20214383 Added: head/graphics/gimp-app/files/patch-app_base_base-utils.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/gimp-app/files/patch-app_base_base-utils.c Mon Mar 11 12:19:08 2013 (r313872) @@ -0,0 +1,20 @@ +--- app/base/base-utils.c~ ++++ app/base/base-utils.c +@@ -29,7 +29,7 @@ + #include + #endif + +-#ifdef G_OS_UNIX ++#ifdef __GLIBC__ + /* For get_backtrace() */ + #include + #include +@@ -112,7 +112,7 @@ get_physical_memory_size (void) + char * + get_backtrace (void) + { +-#ifdef G_OS_UNIX ++#ifdef __GLIBC__ + void *functions[MAX_FUNC]; + char **function_names; + int n_functions; Modified: head/graphics/gimp-app/files/patch-configure ============================================================================== --- head/graphics/gimp-app/files/patch-configure Mon Mar 11 12:18:11 2013 (r313871) +++ head/graphics/gimp-app/files/patch-configure Mon Mar 11 12:19:08 2013 (r313872) @@ -1,14 +1,6 @@ ---- configure.orig Thu Nov 23 15:16:53 2006 -+++ configure Sun Dec 31 19:29:32 2006 -@@ -29404,6 +29404,7 @@ - if test "x$enable_gtktest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" -+ GTK_LIBS="$GIMP_THREAD_LIBS $GTK_LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$GTK_LIBS $LIBS" - rm -f conf.gtktest -@@ -38514,9 +38515,9 @@ +--- configure.orig 2013-02-03 09:15:30.000000000 +0000 ++++ configure 2013-02-03 09:15:31.000000000 +0000 +@@ -23307,9 +23307,9 @@ fi Modified: head/graphics/gimp-app/files/patch-plug-ins_pygimp_Makefile.in ============================================================================== --- head/graphics/gimp-app/files/patch-plug-ins_pygimp_Makefile.in Mon Mar 11 12:18:11 2013 (r313871) +++ head/graphics/gimp-app/files/patch-plug-ins_pygimp_Makefile.in Mon Mar 11 12:19:08 2013 (r313872) @@ -1,7 +1,7 @@ ---- plug-ins/pygimp/Makefile.in.orig 2008-08-31 09:39:24.157774518 -0500 -+++ plug-ins/pygimp/Makefile.in 2008-08-31 09:42:47.663351903 -0500 -@@ -61,7 +61,7 @@ - pygimpLTLIBRARIES_INSTALL = $(INSTALL) +--- plug-ins/pygimp/Makefile.in.orig 2012-05-05 10:19:33.000000000 +0200 ++++ plug-ins/pygimp/Makefile.in 2012-05-05 10:22:53.000000000 +0200 +@@ -99,7 +99,7 @@ + "$(DESTDIR)$(pygimpdir)" LTLIBRARIES = $(pygimp_LTLIBRARIES) am__DEPENDENCIES_1 = -_gimpenums_la_DEPENDENCIES = $(libgimp) $(libgimpcolor) $(libgimpbase) \ @@ -9,8 +9,8 @@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) am__gimpenums_la_OBJECTS = gimpenumsmodule.lo -@@ -69,16 +69,15 @@ - _gimpenums_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +@@ -110,16 +110,15 @@ + _gimpenums_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(_gimpenums_la_LDFLAGS) $(LDFLAGS) -o $@ -_gimpui_la_DEPENDENCIES = $(libgimpui) $(libgimpwidgets) \ @@ -21,32 +21,32 @@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am__gimpui_la_OBJECTS = gimpuimodule.lo gimpui.lo _gimpui_la_OBJECTS = $(am__gimpui_la_OBJECTS) - _gimpui_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + _gimpui_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(_gimpui_la_LDFLAGS) $(LDFLAGS) -o $@ -gimp_la_DEPENDENCIES = $(libgimp) $(libgimpcolor) $(libgimpbase) \ +gimp_la_DEPENDENCIES = \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) - am_gimp_la_OBJECTS = gimpmodule.lo pygimp-display.lo \ -@@ -88,14 +87,14 @@ - gimp_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(gimp_la_LDFLAGS) \ - $(LDFLAGS) -o $@ + am_gimp_la_OBJECTS = gimpmodule.lo pygimp-item.lo pygimp-display.lo \ +@@ -129,14 +128,14 @@ + gimp_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(gimp_la_LDFLAGS) $(LDFLAGS) -o $@ -gimpcolor_la_DEPENDENCIES = $(libgimpcolor) $(am__DEPENDENCIES_1) \ +gimpcolor_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) am_gimpcolor_la_OBJECTS = gimpcolormodule.lo pygimp-colors.lo gimpcolor_la_OBJECTS = $(am_gimpcolor_la_OBJECTS) - gimpcolor_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + gimpcolor_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(gimpcolor_la_LDFLAGS) $(LDFLAGS) -o $@ -gimpthumb_la_DEPENDENCIES = $(libgimpthumb) $(am__DEPENDENCIES_1) \ -+gimpthumb_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ ++gimpthumb_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) am_gimpthumb_la_OBJECTS = gimpthumbmodule.lo gimpthumb.lo gimpthumb_la_OBJECTS = $(am_gimpthumb_la_OBJECTS) -@@ -486,9 +485,7 @@ +@@ -588,9 +587,7 @@ -export-symbols-regex initgimp gimp_la_LIBADD = \ @@ -57,7 +57,7 @@ $(GLIB_LIBS) \ $(PYLINK_LIBS) \ $(RT_LIBS) -@@ -500,9 +497,7 @@ +@@ -602,9 +599,7 @@ -export-symbols-regex init_gimpenums _gimpenums_la_LIBADD = \ @@ -68,7 +68,7 @@ $(GLIB_LIBS) \ $(PYLINK_LIBS) \ $(RT_LIBS) -@@ -517,7 +512,7 @@ +@@ -619,7 +614,7 @@ -export-symbols-regex initgimpcolor gimpcolor_la_LIBADD = \ @@ -77,7 +77,7 @@ $(GLIB_LIBS) \ $(PYLINK_LIBS) -@@ -529,13 +524,8 @@ +@@ -631,13 +626,7 @@ -export-symbols-regex init_gimpui _gimpui_la_LIBADD = \ @@ -89,16 +89,15 @@ - $(libgimpcolor) \ - $(libgimpbase) \ + %%GIMP_LIBS%% \ -+ %%GIMP_UI_LIBS%% \ $(GTK_LIBS) \ $(PYLINK_LIBS) \ $(RT_LIBS) \ -@@ -549,7 +539,7 @@ +@@ -651,7 +640,7 @@ -export-symbols-regex initgimpthumb gimpthumb_la_LIBADD = \ - $(libgimpthumb) \ -+ %%GIMP_THUMB_LIBS%% \ ++ %%GIMP_LIBS%% \ $(GDK_PIXBUF_LIBS) \ $(PYLINK_LIBS) Modified: head/graphics/gimp-app/pkg-plist ============================================================================== --- head/graphics/gimp-app/pkg-plist Mon Mar 11 12:18:11 2013 (r313871) +++ head/graphics/gimp-app/pkg-plist Mon Mar 11 12:19:08 2013 (r313872) @@ -1,17 +1,15 @@ bin/gimp -bin/gimp-2.6 -bin/gimp-console -bin/gimp-console-2.6 +bin/gimp-2.8 bin/gimptool-2.0 etc/gimp/2.2/controllerrc etc/gimp/2.2/gimprc etc/gimp/2.2/gtkrc etc/gimp/2.2/menurc -etc/gimp/2.2/ps-menurc etc/gimp/2.2/sessionrc etc/gimp/2.2/templaterc etc/gimp/2.2/unitrc include/gimp-2.0/libgimp/gimp.h +include/gimp-2.0/libgimp/gimp_pdb_headers.h include/gimp-2.0/libgimp/gimp_pdb.h include/gimp-2.0/libgimp/gimpaspectpreview.h include/gimp-2.0/libgimp/gimpbrush_pdb.h @@ -33,6 +31,7 @@ include/gimp-2.0/libgimp/gimpdrawable.h include/gimp-2.0/libgimp/gimpdrawable_pdb.h include/gimp-2.0/libgimp/gimpdrawablepreview.h include/gimp-2.0/libgimp/gimpdrawabletransform_pdb.h +include/gimp-2.0/libgimp/gimpdynamics_pdb.h include/gimp-2.0/libgimp/gimpedit_pdb.h include/gimp-2.0/libgimp/gimpenums.h include/gimp-2.0/libgimp/gimpexport.h @@ -58,12 +57,14 @@ include/gimp-2.0/libgimp/gimphelp_pdb.h include/gimp-2.0/libgimp/gimpimage.h include/gimp-2.0/libgimp/gimpimage_pdb.h include/gimp-2.0/libgimp/gimpimagecombobox.h +include/gimp-2.0/libgimp/gimpimageselect_pdb.h +include/gimp-2.0/libgimp/gimpitem_pdb.h include/gimp-2.0/libgimp/gimpitemcombobox.h +include/gimp-2.0/libgimp/gimpitemtransform_pdb.h include/gimp-2.0/libgimp/gimplayer.h include/gimp-2.0/libgimp/gimplayer_pdb.h include/gimp-2.0/libgimp/gimpmenu.h include/gimp-2.0/libgimp/gimpmessage_pdb.h -include/gimp-2.0/libgimp/gimpmisc_pdb.h include/gimp-2.0/libgimp/gimppainttools_pdb.h include/gimp-2.0/libgimp/gimppalette.h include/gimp-2.0/libgimp/gimppalette_pdb.h @@ -73,7 +74,6 @@ include/gimp-2.0/libgimp/gimppalettes_pd include/gimp-2.0/libgimp/gimppaletteselect.h include/gimp-2.0/libgimp/gimppaletteselect_pdb.h include/gimp-2.0/libgimp/gimppaletteselectbutton.h -include/gimp-2.0/libgimp/gimpparasite_pdb.h include/gimp-2.0/libgimp/gimppaths_pdb.h include/gimp-2.0/libgimp/gimppattern_pdb.h include/gimp-2.0/libgimp/gimppatternmenu.h @@ -109,6 +109,7 @@ include/gimp-2.0/libgimp/gimpuitypes.h include/gimp-2.0/libgimp/gimpundo_pdb.h include/gimp-2.0/libgimp/gimpunit_pdb.h include/gimp-2.0/libgimp/gimpvectors_pdb.h +include/gimp-2.0/libgimp/gimpvectors.h include/gimp-2.0/libgimp/gimpzoompreview.h include/gimp-2.0/libgimpbase/gimpbase.h include/gimp-2.0/libgimpbase/gimpbaseenums.h @@ -129,6 +130,7 @@ include/gimp-2.0/libgimpbase/gimputils.h include/gimp-2.0/libgimpbase/gimpversion.h include/gimp-2.0/libgimpcolor/gimpadaptivesupersample.h include/gimp-2.0/libgimpcolor/gimpbilinear.h +include/gimp-2.0/libgimpcolor/gimpcairocolor.h include/gimp-2.0/libgimpcolor/gimpcmyk.h include/gimp-2.0/libgimpcolor/gimpcolor.h include/gimp-2.0/libgimpcolor/gimpcolormanaged.h @@ -164,6 +166,7 @@ include/gimp-2.0/libgimpthumb/gimpthumb- include/gimp-2.0/libgimpthumb/gimpthumb-utils.h include/gimp-2.0/libgimpthumb/gimpthumb.h include/gimp-2.0/libgimpthumb/gimpthumbnail.h +include/gimp-2.0/libgimpwidgets/gimp3migration.h include/gimp-2.0/libgimpwidgets/gimpbrowser.h include/gimp-2.0/libgimpwidgets/gimpbutton.h include/gimp-2.0/libgimpwidgets/gimpcairo-utils.h @@ -213,7 +216,10 @@ include/gimp-2.0/libgimpwidgets/gimpscro include/gimp-2.0/libgimpwidgets/gimpsizeentry.h include/gimp-2.0/libgimpwidgets/gimpstock.h include/gimp-2.0/libgimpwidgets/gimpstringcombobox.h +include/gimp-2.0/libgimpwidgets/gimpunitcombobox.h include/gimp-2.0/libgimpwidgets/gimpunitmenu.h +include/gimp-2.0/libgimpwidgets/gimpunitstore.h +include/gimp-2.0/libgimpwidgets/gimpwidgets-error.h include/gimp-2.0/libgimpwidgets/gimpwidgets.h include/gimp-2.0/libgimpwidgets/gimpwidgetsenums.h include/gimp-2.0/libgimpwidgets/gimpwidgetstypes.h @@ -352,15 +358,17 @@ libexec/gimp/2.2/plug-ins/file-glob libexec/gimp/2.2/plug-ins/file-header libexec/gimp/2.2/plug-ins/file-html-table libexec/gimp/2.2/plug-ins/file-ico +%%JASPER%%libexec/gimp/2.2/plug-ins/file-jp2-load libexec/gimp/2.2/plug-ins/file-jpeg %%MNG%%libexec/gimp/2.2/plug-ins/file-mng libexec/gimp/2.2/plug-ins/file-pat libexec/gimp/2.2/plug-ins/file-pcx -%%POPPLER%%libexec/gimp/2.2/plug-ins/file-pdf +%%POPPLER%%libexec/gimp/2.2/plug-ins/file-pdf-load +libexec/gimp/2.2/plug-ins/file-pdf-save libexec/gimp/2.2/plug-ins/file-pix libexec/gimp/2.2/plug-ins/file-png libexec/gimp/2.2/plug-ins/file-pnm -libexec/gimp/2.2/plug-ins/file-ps +%%GS%%libexec/gimp/2.2/plug-ins/file-ps libexec/gimp/2.2/plug-ins/file-psd-load libexec/gimp/2.2/plug-ins/file-psd-save libexec/gimp/2.2/plug-ins/file-psp @@ -375,6 +383,7 @@ libexec/gimp/2.2/plug-ins/file-uri %%WMF%%libexec/gimp/2.2/plug-ins/file-wmf libexec/gimp/2.2/plug-ins/file-xbm libexec/gimp/2.2/plug-ins/file-xjt +libexec/gimp/2.2/plug-ins/file-xmc libexec/gimp/2.2/plug-ins/file-xpm libexec/gimp/2.2/plug-ins/file-xwd libexec/gimp/2.2/plug-ins/film @@ -382,8 +391,6 @@ libexec/gimp/2.2/plug-ins/filter-pack libexec/gimp/2.2/plug-ins/flame libexec/gimp/2.2/plug-ins/fractal-explorer libexec/gimp/2.2/plug-ins/fractal-trace -libexec/gimp/2.2/plug-ins/gee -libexec/gimp/2.2/plug-ins/gee-zoom libexec/gimp/2.2/plug-ins/gfig libexec/gimp/2.2/plug-ins/gimpressionist libexec/gimp/2.2/plug-ins/gradient-flare @@ -407,7 +414,7 @@ libexec/gimp/2.2/plug-ins/mail libexec/gimp/2.2/plug-ins/map-object libexec/gimp/2.2/plug-ins/max-rgb libexec/gimp/2.2/plug-ins/maze -libexec/gimp/2.2/plug-ins/metadata +%%EXIF%%libexec/gimp/2.2/plug-ins/metadata libexec/gimp/2.2/plug-ins/mosaic libexec/gimp/2.2/plug-ins/newsprint libexec/gimp/2.2/plug-ins/nl-filter @@ -424,6 +431,7 @@ libexec/gimp/2.2/plug-ins/pixelize libexec/gimp/2.2/plug-ins/plasma libexec/gimp/2.2/plug-ins/plugin-browser libexec/gimp/2.2/plug-ins/polar-coords +libexec/gimp/2.2/plug-ins/print libexec/gimp/2.2/plug-ins/procedure-browser libexec/gimp/2.2/plug-ins/qbist libexec/gimp/2.2/plug-ins/red-eye-removal @@ -456,6 +464,7 @@ libexec/gimp/2.2/plug-ins/video libexec/gimp/2.2/plug-ins/warp libexec/gimp/2.2/plug-ins/waves libexec/gimp/2.2/plug-ins/web-browser +%%HELPBROWSER%%libexec/gimp/2.2/plug-ins/web-page libexec/gimp/2.2/plug-ins/whirl-pinch libexec/gimp/2.2/plug-ins/wind share/aclocal/gimp-2.0.m4 @@ -476,10 +485,11 @@ share/doc/gimp/libgimp/home.png share/doc/gimp/libgimp/index.html share/doc/gimp/libgimp/index.sgml 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 @@ -492,6 +502,7 @@ share/doc/gimp/libgimp/libgimp-gimpconve share/doc/gimp/libgimp/libgimp-gimpdisplay.html share/doc/gimp/libgimp/libgimp-gimpdrawable.html share/doc/gimp/libgimp/libgimp-gimpdrawabletransform.html +share/doc/gimp/libgimp/libgimp-gimpdynamics.html share/doc/gimp/libgimp/libgimp-gimpedit.html share/doc/gimp/libgimp/libgimp-gimpenums.html share/doc/gimp/libgimp/libgimp-gimpexport.html @@ -509,9 +520,13 @@ share/doc/gimp/libgimp/libgimp-gimpgrid. share/doc/gimp/libgimp/libgimp-gimpguides.html share/doc/gimp/libgimp/libgimp-gimphelp.html share/doc/gimp/libgimp/libgimp-gimpimage.html +share/doc/gimp/libgimp/libgimp-gimpimageselect.html +share/doc/gimp/libgimp/libgimp-gimpitem.html +share/doc/gimp/libgimp/libgimp-gimpitemtransform.html share/doc/gimp/libgimp/libgimp-gimplayer.html share/doc/gimp/libgimp/libgimp-gimpmenu.html share/doc/gimp/libgimp/libgimp-gimpmessage.html +share/doc/gimp/libgimp/libgimp-gimppainttools.html share/doc/gimp/libgimp/libgimp-gimppalette.html share/doc/gimp/libgimp/libgimp-gimppalettemenu.html share/doc/gimp/libgimp/libgimp-gimppalettes.html @@ -526,14 +541,14 @@ share/doc/gimp/libgimp/libgimp-gimppixel share/doc/gimp/libgimp/libgimp-gimppixelrgn.html share/doc/gimp/libgimp/libgimp-gimpplugin.html share/doc/gimp/libgimp/libgimp-gimpproceduraldb.html -share/doc/gimp/libgimp/libgimp-gimpprocview.html share/doc/gimp/libgimp/libgimp-gimpprogress.html share/doc/gimp/libgimp/libgimp-gimpregioniterator.html share/doc/gimp/libgimp/libgimp-gimpselection.html +share/doc/gimp/libgimp/libgimp-gimpselectiontools.html share/doc/gimp/libgimp/libgimp-gimptextlayer.html share/doc/gimp/libgimp/libgimp-gimptexttool.html share/doc/gimp/libgimp/libgimp-gimptile.html -share/doc/gimp/libgimp/libgimp-gimptools.html +share/doc/gimp/libgimp/libgimp-gimptransformtools.html share/doc/gimp/libgimp/libgimp-gimpui.html share/doc/gimp/libgimp/libgimp-gimpundo.html share/doc/gimp/libgimp/libgimp-gimpvectors.html @@ -542,6 +557,7 @@ share/doc/gimp/libgimp/libgimp-index-dep share/doc/gimp/libgimp/libgimp-index-new-in-2-2.html share/doc/gimp/libgimp/libgimp-index-new-in-2-4.html share/doc/gimp/libgimp/libgimp-index-new-in-2-6.html +share/doc/gimp/libgimp/libgimp-index-new-in-2-8.html share/doc/gimp/libgimp/libgimp-index.html share/doc/gimp/libgimp/libgimp-selectors.html share/doc/gimp/libgimp/libgimp.devhelp2 @@ -575,6 +591,7 @@ share/doc/gimp/libgimpbase/libgimpbase-i share/doc/gimp/libgimpbase/libgimpbase-index-new-in-2-2.html share/doc/gimp/libgimpbase/libgimpbase-index-new-in-2-4.html share/doc/gimp/libgimpbase/libgimpbase-index-new-in-2-6.html +share/doc/gimp/libgimpbase/libgimpbase-index-new-in-2-8.html share/doc/gimp/libgimpbase/libgimpbase-index.html share/doc/gimp/libgimpbase/libgimpbase.devhelp2 share/doc/gimp/libgimpbase/libgimpbase.html @@ -588,6 +605,7 @@ share/doc/gimp/libgimpcolor/left.png share/doc/gimp/libgimpcolor/libgimpcolor-GimpAdaptiveSupersample.html share/doc/gimp/libgimpcolor/libgimpcolor-GimpBilinear.html share/doc/gimp/libgimpcolor/libgimpcolor-GimpCMYK.html +share/doc/gimp/libgimpcolor/libgimpcolor-GimpCairoColor.html share/doc/gimp/libgimpcolor/libgimpcolor-GimpColorManaged.html share/doc/gimp/libgimpcolor/libgimpcolor-GimpColorSpace.html share/doc/gimp/libgimpcolor/libgimpcolor-GimpHSV.html @@ -596,6 +614,7 @@ share/doc/gimp/libgimpcolor/libgimpcolor share/doc/gimp/libgimpcolor/libgimpcolor-index-new-in-2-2.html share/doc/gimp/libgimpcolor/libgimpcolor-index-new-in-2-4.html share/doc/gimp/libgimpcolor/libgimpcolor-index-new-in-2-6.html +share/doc/gimp/libgimpcolor/libgimpcolor-index-new-in-2-8.html share/doc/gimp/libgimpcolor/libgimpcolor-index.html share/doc/gimp/libgimpcolor/libgimpcolor.devhelp2 share/doc/gimp/libgimpcolor/libgimpcolor.html @@ -607,19 +626,20 @@ share/doc/gimp/libgimpconfig/home.png share/doc/gimp/libgimpconfig/index.html share/doc/gimp/libgimpconfig/index.sgml share/doc/gimp/libgimpconfig/left.png +share/doc/gimp/libgimpconfig/libgimpconfig-GimpConfig-deserialize.html +share/doc/gimp/libgimpconfig/libgimpconfig-GimpConfig-params.html +share/doc/gimp/libgimpconfig/libgimpconfig-GimpConfig-path.html +share/doc/gimp/libgimpconfig/libgimpconfig-GimpConfig-serialize.html +share/doc/gimp/libgimpconfig/libgimpconfig-GimpConfig-utils.html share/doc/gimp/libgimpconfig/libgimpconfig-GimpConfig.html share/doc/gimp/libgimpconfig/libgimpconfig-GimpConfigError.html share/doc/gimp/libgimpconfig/libgimpconfig-GimpConfigWriter.html share/doc/gimp/libgimpconfig/libgimpconfig-GimpScanner.html -share/doc/gimp/libgimpconfig/libgimpconfig-gimpconfig-deserialize.html -share/doc/gimp/libgimpconfig/libgimpconfig-gimpconfig-params.html -share/doc/gimp/libgimpconfig/libgimpconfig-gimpconfig-path.html -share/doc/gimp/libgimpconfig/libgimpconfig-gimpconfig-serialize.html -share/doc/gimp/libgimpconfig/libgimpconfig-gimpconfig-utils.html share/doc/gimp/libgimpconfig/libgimpconfig-hierarchy.html share/doc/gimp/libgimpconfig/libgimpconfig-index-deprecated.html share/doc/gimp/libgimpconfig/libgimpconfig-index-new-in-2-4.html share/doc/gimp/libgimpconfig/libgimpconfig-index-new-in-2-6.html +share/doc/gimp/libgimpconfig/libgimpconfig-index-new-in-2-8.html share/doc/gimp/libgimpconfig/libgimpconfig-index.html share/doc/gimp/libgimpconfig/libgimpconfig.devhelp2 share/doc/gimp/libgimpconfig/libgimpconfig.html @@ -644,16 +664,17 @@ share/doc/gimp/libgimpmath/libgimpmath.h share/doc/gimp/libgimpmath/right.png share/doc/gimp/libgimpmath/style.css share/doc/gimp/libgimpmath/up.png +share/doc/gimp/libgimpmodule/GimpModule.html +share/doc/gimp/libgimpmodule/GimpModuleDB.html share/doc/gimp/libgimpmodule/home.png share/doc/gimp/libgimpmodule/index.html share/doc/gimp/libgimpmodule/index.sgml share/doc/gimp/libgimpmodule/left.png -share/doc/gimp/libgimpmodule/libgimpmodule-gimpmodule.html -share/doc/gimp/libgimpmodule/libgimpmodule-gimpmoduledb.html share/doc/gimp/libgimpmodule/libgimpmodule-index-deprecated.html share/doc/gimp/libgimpmodule/libgimpmodule-index-new-in-2-2.html share/doc/gimp/libgimpmodule/libgimpmodule-index-new-in-2-4.html share/doc/gimp/libgimpmodule/libgimpmodule-index-new-in-2-6.html +share/doc/gimp/libgimpmodule/libgimpmodule-index-new-in-2-8.html share/doc/gimp/libgimpmodule/libgimpmodule-index.html share/doc/gimp/libgimpmodule/libgimpmodule.devhelp2 share/doc/gimp/libgimpmodule/libgimpmodule.html @@ -665,9 +686,9 @@ share/doc/gimp/libgimpthumb/home.png share/doc/gimp/libgimpthumb/index.html share/doc/gimp/libgimpthumb/index.sgml share/doc/gimp/libgimpthumb/left.png -share/doc/gimp/libgimpthumb/libgimpthumb-gimpthumb-enums.html -share/doc/gimp/libgimpthumb/libgimpthumb-gimpthumb-error.html -share/doc/gimp/libgimpthumb/libgimpthumb-gimpthumb-utils.html +share/doc/gimp/libgimpthumb/libgimpthumb-GimpThumb-enums.html +share/doc/gimp/libgimpthumb/libgimpthumb-GimpThumb-error.html +share/doc/gimp/libgimpthumb/libgimpthumb-GimpThumb-utils.html share/doc/gimp/libgimpthumb/libgimpthumb-index-deprecated.html share/doc/gimp/libgimpthumb/libgimpthumb-index-new-in-2-2.html share/doc/gimp/libgimpthumb/libgimpthumb-index-new-in-2-4.html @@ -718,7 +739,9 @@ share/doc/gimp/libgimpwidgets/GimpRuler. share/doc/gimp/libgimpwidgets/GimpScrolledPreview.html share/doc/gimp/libgimpwidgets/GimpSizeEntry.html share/doc/gimp/libgimpwidgets/GimpStringComboBox.html +share/doc/gimp/libgimpwidgets/GimpUnitComboBox.html share/doc/gimp/libgimpwidgets/GimpUnitMenu.html +share/doc/gimp/libgimpwidgets/GimpUnitStore.html share/doc/gimp/libgimpwidgets/GimpZoomModel.html share/doc/gimp/libgimpwidgets/gimp-browser.png share/doc/gimp/libgimpwidgets/gimp-button.png @@ -753,6 +776,7 @@ share/doc/gimp/libgimpwidgets/libgimpwid share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpEnumWidgets.html share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpHelpUI.html share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpHintBox.html +share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpOldWidgets.html share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpPropWidgets.html share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpQueryBox.html share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpStock.html @@ -763,12 +787,12 @@ share/doc/gimp/libgimpwidgets/libgimpwid share/doc/gimp/libgimpwidgets/libgimpwidgets-controller.html share/doc/gimp/libgimpwidgets/libgimpwidgets-deprecated.html share/doc/gimp/libgimpwidgets/libgimpwidgets-gallery.html -share/doc/gimp/libgimpwidgets/libgimpwidgets-gimpoldwidgets.html share/doc/gimp/libgimpwidgets/libgimpwidgets-hierarchy.html share/doc/gimp/libgimpwidgets/libgimpwidgets-index-deprecated.html share/doc/gimp/libgimpwidgets/libgimpwidgets-index-new-in-2-2.html share/doc/gimp/libgimpwidgets/libgimpwidgets-index-new-in-2-4.html share/doc/gimp/libgimpwidgets/libgimpwidgets-index-new-in-2-6.html +share/doc/gimp/libgimpwidgets/libgimpwidgets-index-new-in-2-8.html share/doc/gimp/libgimpwidgets/libgimpwidgets-index.html share/doc/gimp/libgimpwidgets/libgimpwidgets-utils.html share/doc/gimp/libgimpwidgets/libgimpwidgets-widgets.html @@ -852,6 +876,8 @@ share/doc/gimp/libgimpwidgets/stock-disp share/doc/gimp/libgimpwidgets/stock-display-filter-proof-16.png share/doc/gimp/libgimpwidgets/stock-display-filter-proof-24.png share/doc/gimp/libgimpwidgets/stock-duplicate-16.png +share/doc/gimp/libgimpwidgets/stock-dynamics-16.png +share/doc/gimp/libgimpwidgets/stock-dynamics-22.png share/doc/gimp/libgimpwidgets/stock-edit-16.png share/doc/gimp/libgimpwidgets/stock-error-64.png share/doc/gimp/libgimpwidgets/stock-eye-12.png @@ -901,6 +927,8 @@ share/doc/gimp/libgimpwidgets/stock-imag share/doc/gimp/libgimpwidgets/stock-info-16.png share/doc/gimp/libgimpwidgets/stock-info-24.png share/doc/gimp/libgimpwidgets/stock-info-64.png +share/doc/gimp/libgimpwidgets/stock-input-device-16.png +share/doc/gimp/libgimpwidgets/stock-input-device-22.png share/doc/gimp/libgimpwidgets/stock-invert-16.png share/doc/gimp/libgimpwidgets/stock-join-bevel-16.png share/doc/gimp/libgimpwidgets/stock-join-miter-16.png @@ -995,6 +1023,8 @@ share/doc/gimp/libgimpwidgets/stock-tool share/doc/gimp/libgimpwidgets/stock-tool-bucket-fill-22.png share/doc/gimp/libgimpwidgets/stock-tool-by-color-select-16.png share/doc/gimp/libgimpwidgets/stock-tool-by-color-select-22.png +share/doc/gimp/libgimpwidgets/stock-tool-cage-16.png +share/doc/gimp/libgimpwidgets/stock-tool-cage-22.png share/doc/gimp/libgimpwidgets/stock-tool-clone-16.png share/doc/gimp/libgimpwidgets/stock-tool-clone-22.png share/doc/gimp/libgimpwidgets/stock-tool-color-balance-16.png @@ -1007,6 +1037,8 @@ share/doc/gimp/libgimpwidgets/stock-tool share/doc/gimp/libgimpwidgets/stock-tool-crop-22.png share/doc/gimp/libgimpwidgets/stock-tool-curves-16.png share/doc/gimp/libgimpwidgets/stock-tool-curves-22.png +share/doc/gimp/libgimpwidgets/stock-tool-desaturate-16.png +share/doc/gimp/libgimpwidgets/stock-tool-desaturate-22.png share/doc/gimp/libgimpwidgets/stock-tool-dodge-16.png share/doc/gimp/libgimpwidgets/stock-tool-dodge-22.png share/doc/gimp/libgimpwidgets/stock-tool-ellipse-select-16.png @@ -1049,6 +1081,8 @@ share/doc/gimp/libgimpwidgets/stock-tool share/doc/gimp/libgimpwidgets/stock-tool-perspective-clone-22.png share/doc/gimp/libgimpwidgets/stock-tool-posterize-16.png share/doc/gimp/libgimpwidgets/stock-tool-posterize-22.png +share/doc/gimp/libgimpwidgets/stock-tool-preset-16.png +share/doc/gimp/libgimpwidgets/stock-tool-preset-22.png share/doc/gimp/libgimpwidgets/stock-tool-rect-select-16.png share/doc/gimp/libgimpwidgets/stock-tool-rect-select-22.png share/doc/gimp/libgimpwidgets/stock-tool-rotate-16.png @@ -1092,52 +1126,116 @@ share/doc/gimp/libgimpwidgets/stock-wilb share/doc/gimp/libgimpwidgets/stock-zoom-follow-window-12.png share/doc/gimp/libgimpwidgets/style.css share/doc/gimp/libgimpwidgets/up.png -share/gimp/brushes/10x10square.gbr -share/gimp/brushes/10x10squareBlur.gbr -share/gimp/brushes/20x20square.gbr -share/gimp/brushes/20x20squareBlur.gbr -share/gimp/brushes/5x5square.gbr -share/gimp/brushes/5x5squareBlur.gbr -share/gimp/brushes/Calligraphic-Brush-0.vbr -share/gimp/brushes/Calligraphic-Brush-1.vbr -share/gimp/brushes/Calligraphic-Brush-2.vbr -share/gimp/brushes/Calligraphic-Brush-3.vbr -share/gimp/brushes/Circle-1.vbr -share/gimp/brushes/Circle-11.vbr -share/gimp/brushes/Circle-13.vbr -share/gimp/brushes/Circle-15.vbr -share/gimp/brushes/Circle-17.vbr -share/gimp/brushes/Circle-19.vbr -share/gimp/brushes/Circle-3.vbr -share/gimp/brushes/Circle-5.vbr -share/gimp/brushes/Circle-7.vbr -share/gimp/brushes/Circle-9.vbr -share/gimp/brushes/Circle-Fuzzy-11.vbr -share/gimp/brushes/Circle-Fuzzy-13.vbr -share/gimp/brushes/Circle-Fuzzy-15.vbr -share/gimp/brushes/Circle-Fuzzy-17.vbr -share/gimp/brushes/Circle-Fuzzy-19.vbr -share/gimp/brushes/Circle-Fuzzy-3.vbr -share/gimp/brushes/Circle-Fuzzy-5.vbr -share/gimp/brushes/Circle-Fuzzy-7.vbr -share/gimp/brushes/Circle-Fuzzy-9.vbr -share/gimp/brushes/Diagonal-Star-11.vbr -share/gimp/brushes/Diagonal-Star-17.vbr -share/gimp/brushes/Diagonal-Star-25.vbr -share/gimp/brushes/SketchBrush-16.gih -share/gimp/brushes/SketchBrush-32.gih -share/gimp/brushes/SketchBrush-64.gih -share/gimp/brushes/confetti.gbr -share/gimp/brushes/confetti.gih -share/gimp/brushes/dunes.gbr -share/gimp/brushes/feltpen.gih -share/gimp/brushes/galaxy.gbr -share/gimp/brushes/galaxy_big.gbr -share/gimp/brushes/galaxy_small.gbr -share/gimp/brushes/hsparks.gih -share/gimp/brushes/pepper.gbr -share/gimp/brushes/pixel.gbr -share/gimp/brushes/vine.gih +share/gimp/brushes/Basic/1-pixel.vbr +share/gimp/brushes/Basic/Block-01.vbr +share/gimp/brushes/Basic/Block-02.vbr +share/gimp/brushes/Basic/Block-03.vbr +share/gimp/brushes/Basic/Hardness-025.vbr +share/gimp/brushes/Basic/Hardness-050.vbr +share/gimp/brushes/Basic/Hardness-075.vbr +share/gimp/brushes/Basic/Hardness-100.vbr +share/gimp/brushes/Basic/Star.vbr +share/gimp/brushes/Basic/pixel.gbr +share/gimp/brushes/Legacy/confetti.gbr +share/gimp/brushes/Legacy/confetti.gih +share/gimp/brushes/Legacy/dunes.gbr +share/gimp/brushes/Legacy/galaxy-big.gbr +share/gimp/brushes/Legacy/galaxy.gbr +share/gimp/brushes/Legacy/pepper.gbr +share/gimp/brushes/Legacy/vine.gih +share/gimp/brushes/Media/Acrylic-01.gih +share/gimp/brushes/Media/Acrylic-02.gih +share/gimp/brushes/Media/Acrylic-03.gih +share/gimp/brushes/Media/Acrylic-04.gih +share/gimp/brushes/Media/Acrylic-05.gih +share/gimp/brushes/Media/Bristles-01.gbr +share/gimp/brushes/Media/Bristles-02.gbr +share/gimp/brushes/Media/Bristles-03.gbr +share/gimp/brushes/Media/Oils-01.gbr +share/gimp/brushes/Media/Oils-02.gbr +share/gimp/brushes/Media/Oils-03.gbr +share/gimp/brushes/Sketch/Chalk-01.gih +share/gimp/brushes/Sketch/Chalk-02.gih +share/gimp/brushes/Sketch/Chalk-03.gih +share/gimp/brushes/Sketch/Charcoal-01.gbr +share/gimp/brushes/Sketch/Charcoal-02.gbr +share/gimp/brushes/Sketch/Pencil-01.gih +share/gimp/brushes/Sketch/Pencil-02.gih +share/gimp/brushes/Sketch/Pencil-Scratch.gbr +share/gimp/brushes/Splatters/Sparks-Hose.gih +share/gimp/brushes/Splatters/Splats-01.gih +share/gimp/brushes/Splatters/Splats-02.gih +share/gimp/brushes/Splatters/Sponge-01.gbr +share/gimp/brushes/Splatters/Sponge-02.gbr +share/gimp/brushes/Texture/Cell-01.gbr +share/gimp/brushes/Texture/Cell-02.gbr +share/gimp/brushes/Texture/Grass.gih +share/gimp/brushes/Texture/Smoke.gbr +share/gimp/brushes/Texture/Structure.gbr +share/gimp/brushes/Texture/Texture-01.gbr +share/gimp/brushes/Texture/Texture-02.gbr +share/gimp/brushes/Texture/Texture-Hose-01.gih +share/gimp/brushes/Texture/Texture-Hose-02.gih +share/gimp/brushes/Texture/Texture-Hose-03.gih +share/gimp/brushes/Texture/Vegetation-01.gbr +share/gimp/brushes/Texture/Vegetation-02.gih +share/gimp/brushes/gimp-obsolete-files/10x10square.gbr +share/gimp/brushes/gimp-obsolete-files/10x10squareBlur.gbr +share/gimp/brushes/gimp-obsolete-files/20x20square.gbr +share/gimp/brushes/gimp-obsolete-files/20x20squareBlur.gbr +share/gimp/brushes/gimp-obsolete-files/5x5square.gbr +share/gimp/brushes/gimp-obsolete-files/5x5squareBlur.gbr +share/gimp/brushes/gimp-obsolete-files/Calligraphic-Brush-0.vbr +share/gimp/brushes/gimp-obsolete-files/Calligraphic-Brush-1.vbr +share/gimp/brushes/gimp-obsolete-files/Calligraphic-Brush-2.vbr +share/gimp/brushes/gimp-obsolete-files/Calligraphic-Brush-3.vbr +share/gimp/brushes/gimp-obsolete-files/Circle-1.vbr +share/gimp/brushes/gimp-obsolete-files/Circle-11.vbr +share/gimp/brushes/gimp-obsolete-files/Circle-13.vbr +share/gimp/brushes/gimp-obsolete-files/Circle-15.vbr +share/gimp/brushes/gimp-obsolete-files/Circle-17.vbr +share/gimp/brushes/gimp-obsolete-files/Circle-19.vbr +share/gimp/brushes/gimp-obsolete-files/Circle-3.vbr +share/gimp/brushes/gimp-obsolete-files/Circle-5.vbr +share/gimp/brushes/gimp-obsolete-files/Circle-7.vbr +share/gimp/brushes/gimp-obsolete-files/Circle-9.vbr +share/gimp/brushes/gimp-obsolete-files/Circle-Fuzzy-11.vbr +share/gimp/brushes/gimp-obsolete-files/Circle-Fuzzy-13.vbr +share/gimp/brushes/gimp-obsolete-files/Circle-Fuzzy-15.vbr +share/gimp/brushes/gimp-obsolete-files/Circle-Fuzzy-17.vbr +share/gimp/brushes/gimp-obsolete-files/Circle-Fuzzy-19.vbr +share/gimp/brushes/gimp-obsolete-files/Circle-Fuzzy-3.vbr +share/gimp/brushes/gimp-obsolete-files/Circle-Fuzzy-5.vbr +share/gimp/brushes/gimp-obsolete-files/Circle-Fuzzy-7.vbr +share/gimp/brushes/gimp-obsolete-files/Circle-Fuzzy-9.vbr +share/gimp/brushes/gimp-obsolete-files/Diagonal-Star-11.vbr +share/gimp/brushes/gimp-obsolete-files/Diagonal-Star-17.vbr +share/gimp/brushes/gimp-obsolete-files/Diagonal-Star-25.vbr +share/gimp/brushes/gimp-obsolete-files/Grass1.gih +share/gimp/brushes/gimp-obsolete-files/SketchBrush-16.gih +share/gimp/brushes/gimp-obsolete-files/SketchBrush-32.gih +share/gimp/brushes/gimp-obsolete-files/SketchBrush-64.gih +share/gimp/brushes/gimp-obsolete-files/feltpen.gih +share/gimp/brushes/gimp-obsolete-files/galaxy_small.gbr +share/gimp/brushes/gimp-obsolete-files/pepper.gbr +share/gimp/brushes/gimp-obsolete-files/pixel.gbr +share/gimp/dynamics/Basic-Dynamics.gdyn +share/gimp/dynamics/Basic/Basic-Simple.gdyn +share/gimp/dynamics/Basic/Dynamics-Random.gdyn +share/gimp/dynamics/Basic/Negative-Size-Pressure.gdyn +share/gimp/dynamics/Basic/Pen-Generic.gdyn +share/gimp/dynamics/Basic/Pencil-Generic.gdyn +share/gimp/dynamics/Basic/Pencil-Shader.gdyn +share/gimp/dynamics/Basic/Pressure-Opacity.gdyn +share/gimp/dynamics/Dynamics-Off.gdyn +share/gimp/dynamics/FX/Confetti.gdyn +share/gimp/dynamics/FX/Perspective.gdyn +share/gimp/dynamics/FX/Speed_Size_Opacity.gdyn +share/gimp/dynamics/Fade-Tapering.gdyn +share/gimp/dynamics/Random-Color.gdyn +share/gimp/dynamics/Tilt-Angle.gdyn +share/gimp/dynamics/Track-Direction.gdyn +share/gimp/dynamics/Velocity-Tapering.gdyn share/gimp/fractalexplorer/Asteroid_Field share/gimp/fractalexplorer/Bar_Code_Label share/gimp/fractalexplorer/Beauty_of_Nature @@ -1315,12 +1413,8 @@ share/gimp/gradients/Flare_Rays_Radial_2 share/gimp/gradients/Flare_Rays_Size_1.ggr share/gimp/gradients/Flare_Sizefac_101.ggr share/gimp/gradients/Four_bars.ggr -share/gimp/gradients/French_flag.ggr -share/gimp/gradients/French_flag_smooth.ggr share/gimp/gradients/Full_saturation_spectrum_CCW.ggr share/gimp/gradients/Full_saturation_spectrum_CW.ggr -share/gimp/gradients/German_flag.ggr -share/gimp/gradients/German_flag_smooth.ggr share/gimp/gradients/Golden.ggr share/gimp/gradients/Greens.ggr *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***