Nuke logic to disable the help browser. Somewhere along the line, gtkhtml
was made an unconditional dependency (gtkhtml is used for the help browser now; gnome-libs is old and crusty), so this only removes something that was useless to start out with. If the consensus is that gtkhtml is too heavy (it requires various GNOME libraries) to be used by default, we can do something about it later. Update to 2.0pre1. Changes: * Replaced old "About" dialog [Simon] * Allow removal of text attributes from text layer [Sven] * Add optimisation option to png (clear transparent pixels) [Joao] * Add POSIX shared memory implementation, and use it on MacOS X [Yosh] * Dashed selection and path stroking [Simon] * Grey picker in Levels dialog conserves lightness [Bolsh] * Created a library for handling thumbnails [Sven] * Support for multipage TIFFs [Andrey Kiselev] * Added a channel mixer plug-in [Martin Guldahl, Yosh] * PDB cleanup and compatibility mode [Mitch] * Cleaned up libgimp API [David Odin] * Lots of bug fixes
This commit is contained in:
Soren Jacobsen
Thomas Klausner
parent
05612b2979
commit
e51693a114
4 changed files with 77 additions and 51 deletions
|
|
@ -1,13 +1,13 @@
|
|||
# $NetBSD: Makefile,v 1.17 2003/12/30 23:33:24 cjep Exp $
|
||||
# $NetBSD: Makefile,v 1.18 2004/01/12 03:45:29 blef Exp $
|
||||
#
|
||||
|
||||
DISTNAME= gimp-${GIMP_VER}
|
||||
PKGNAME= gimp-current-${GIMP_VER}
|
||||
CATEGORIES= graphics
|
||||
MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/v1.3/v${GIMP_VER}/ \
|
||||
ftp://ftp.fu-berlin.de/unix/X11/graphics/gimp/v1.3/v${GIMP_VER}/ \
|
||||
ftp://ftp.cs.umn.edu/pub/gimp/gimp/v1.3/v${GIMP_VER}/ \
|
||||
ftp://ftp.tuwien.ac.at/graphics/gimp/gimp/v1.3/v${GIMP_VER}/
|
||||
MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/v2.0/testing/ \
|
||||
ftp://ftp.fu-berlin.de/unix/X11/graphics/gimp/v2.0/testing/ \
|
||||
ftp://ftp.cs.umn.edu/pub/gimp/gimp/v2.0/testing/ \
|
||||
ftp://ftp.tuwien.ac.at/graphics/gimp/gimp/v2.0/testing/
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
MAINTAINER= adam@NetBSD.org
|
||||
|
|
@ -19,7 +19,7 @@ BUILDLINK_DEPENDS.freetype2= freetype2>=2.1.4
|
|||
|
||||
CONFLICTS+= gimp<=1.2.3
|
||||
|
||||
GIMP_VER= 1.3.23
|
||||
GIMP_VER= 2.0pre1
|
||||
|
||||
USE_BUILDLINK2= yes
|
||||
USE_PKGLOCALEDIR= yes
|
||||
|
|
@ -38,7 +38,7 @@ CONFIGURE_ARGS+= --disable-python
|
|||
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html/${PKGNAME}
|
||||
|
||||
# Add settings for MPEG, LIBMPEG, and GAP_DECODE_MPEG to properly support
|
||||
# the MPEG library from graphics/mpeg-lib that changed it's name, as the
|
||||
# the MPEG library from graphics/mpeg-lib that changed its name, as the
|
||||
# configure script will default to searching from -lmpeg.
|
||||
#
|
||||
CONFIGURE_ENV+= MPEG="mpeg"
|
||||
|
|
@ -51,8 +51,6 @@ LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS}
|
|||
MAKE_ENV+= X11BASE=${X11BASE}
|
||||
PLIST_SUBST+= LOCALBASE=${LOCALBASE}
|
||||
|
||||
BUILD_DEFS+= GIMP_WITH_HELPBROWSER
|
||||
|
||||
pre-build:
|
||||
${BUILDLINK_CC} -o ${WRKSRC}/docs/pdb_self_doc \
|
||||
${FILESDIR}/pdb_self_doc.c
|
||||
|
|
@ -64,11 +62,6 @@ post-install:
|
|||
|
||||
.include "../../devel/gettext-lib/buildlink2.mk"
|
||||
.include "../../graphics/mpeg-lib/buildlink2.mk"
|
||||
.if defined(GIMP_WITH_HELPBROWSER) && ${GIMP_WITH_HELPBROWSER} != "no"
|
||||
PLIST_SUBST+= HELPBROWSER=""
|
||||
.include "../../x11/gnome-libs/buildlink2.mk"
|
||||
.else
|
||||
PLIST_SUBST+= HELPBROWSER="@comment "
|
||||
.include "../../graphics/freetype2/buildlink2.mk"
|
||||
.include "../../graphics/jpeg/buildlink2.mk"
|
||||
.include "../../graphics/libart2/buildlink2.mk"
|
||||
|
|
@ -78,6 +71,5 @@ PLIST_SUBST+= HELPBROWSER="@comment "
|
|||
.include "../../graphics/tiff/buildlink2.mk"
|
||||
.include "../../www/libgtkhtml/buildlink2.mk"
|
||||
.include "../../x11/gtk2/buildlink2.mk"
|
||||
.endif
|
||||
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
@comment $NetBSD: PLIST,v 1.12 2003/11/24 14:10:53 moubctez Exp $
|
||||
@comment $NetBSD: PLIST,v 1.13 2004/01/12 03:45:29 blef Exp $
|
||||
bin/gimp-1.3
|
||||
bin/gimp-remote-1.3
|
||||
bin/gimptool-1.3
|
||||
|
|
@ -46,8 +46,6 @@ include/gimp-1.3/libgimp/gimpmenu.h
|
|||
include/gimp-1.3/libgimp/gimpmessage_pdb.h
|
||||
include/gimp-1.3/libgimp/gimpmisc.h
|
||||
include/gimp-1.3/libgimp/gimpmisc_pdb.h
|
||||
include/gimp-1.3/libgimp/gimpmisctools_pdb.h
|
||||
include/gimp-1.3/libgimp/gimpmiscui.h
|
||||
include/gimp-1.3/libgimp/gimppainttools_pdb.h
|
||||
include/gimp-1.3/libgimp/gimppalette_pdb.h
|
||||
include/gimp-1.3/libgimp/gimppalettes_pdb.h
|
||||
|
|
@ -100,6 +98,12 @@ include/gimp-1.3/libgimpmath/gimpvector.h
|
|||
include/gimp-1.3/libgimpmodule/gimpmodule.h
|
||||
include/gimp-1.3/libgimpmodule/gimpmoduledb.h
|
||||
include/gimp-1.3/libgimpmodule/gimpmoduletypes.h
|
||||
include/gimp-1.3/libgimpthumb/gimpthumb-enums.h
|
||||
include/gimp-1.3/libgimpthumb/gimpthumb-error.h
|
||||
include/gimp-1.3/libgimpthumb/gimpthumb-types.h
|
||||
include/gimp-1.3/libgimpthumb/gimpthumb-utils.h
|
||||
include/gimp-1.3/libgimpthumb/gimpthumb.h
|
||||
include/gimp-1.3/libgimpthumb/gimpthumbnail.h
|
||||
include/gimp-1.3/libgimpwidgets/gimpbutton.h
|
||||
include/gimp-1.3/libgimpwidgets/gimpchainbutton.h
|
||||
include/gimp-1.3/libgimpwidgets/gimpcolorarea.h
|
||||
|
|
@ -166,6 +170,7 @@ lib/gimp/1.3/plug-ins/bumpmap
|
|||
lib/gimp/1.3/plug-ins/bz2
|
||||
lib/gimp/1.3/plug-ins/c_astretch
|
||||
lib/gimp/1.3/plug-ins/ccanalyze
|
||||
lib/gimp/1.3/plug-ins/channel_mixer
|
||||
lib/gimp/1.3/plug-ins/checkerboard
|
||||
lib/gimp/1.3/plug-ins/color_enhance
|
||||
lib/gimp/1.3/plug-ins/colorify
|
||||
|
|
@ -303,39 +308,45 @@ lib/gimp/1.3/plug-ins/zealouscrop
|
|||
lib/libgimp-1.3.a
|
||||
lib/libgimp-1.3.la
|
||||
lib/libgimp-1.3.so
|
||||
lib/libgimp-1.3.so.23
|
||||
lib/libgimp-1.3.so.23.0
|
||||
lib/libgimp-1.3.so.24
|
||||
lib/libgimp-1.3.so.24.0
|
||||
lib/libgimpbase-1.3.a
|
||||
lib/libgimpbase-1.3.la
|
||||
lib/libgimpbase-1.3.so
|
||||
lib/libgimpbase-1.3.so.23
|
||||
lib/libgimpbase-1.3.so.23.0
|
||||
lib/libgimpbase-1.3.so.24
|
||||
lib/libgimpbase-1.3.so.24.0
|
||||
lib/libgimpcolor-1.3.a
|
||||
lib/libgimpcolor-1.3.la
|
||||
lib/libgimpcolor-1.3.so
|
||||
lib/libgimpcolor-1.3.so.23
|
||||
lib/libgimpcolor-1.3.so.23.0
|
||||
lib/libgimpcolor-1.3.so.24
|
||||
lib/libgimpcolor-1.3.so.24.0
|
||||
lib/libgimpmath-1.3.a
|
||||
lib/libgimpmath-1.3.la
|
||||
lib/libgimpmath-1.3.so
|
||||
lib/libgimpmath-1.3.so.23
|
||||
lib/libgimpmath-1.3.so.23.0
|
||||
lib/libgimpmath-1.3.so.24
|
||||
lib/libgimpmath-1.3.so.24.0
|
||||
lib/libgimpmodule-1.3.a
|
||||
lib/libgimpmodule-1.3.la
|
||||
lib/libgimpmodule-1.3.so
|
||||
lib/libgimpmodule-1.3.so.23
|
||||
lib/libgimpmodule-1.3.so.23.0
|
||||
lib/libgimpmodule-1.3.so.24
|
||||
lib/libgimpmodule-1.3.so.24.0
|
||||
lib/libgimpthumb-1.3.a
|
||||
lib/libgimpthumb-1.3.la
|
||||
lib/libgimpthumb-1.3.so
|
||||
lib/libgimpthumb-1.3.so.24
|
||||
lib/libgimpthumb-1.3.so.24.0
|
||||
lib/libgimpui-1.3.a
|
||||
lib/libgimpui-1.3.la
|
||||
lib/libgimpui-1.3.so
|
||||
lib/libgimpui-1.3.so.23
|
||||
lib/libgimpui-1.3.so.23.0
|
||||
lib/libgimpui-1.3.so.24
|
||||
lib/libgimpui-1.3.so.24.0
|
||||
lib/libgimpwidgets-1.3.a
|
||||
lib/libgimpwidgets-1.3.la
|
||||
lib/libgimpwidgets-1.3.so
|
||||
lib/libgimpwidgets-1.3.so.23
|
||||
lib/libgimpwidgets-1.3.so.23.0
|
||||
lib/libgimpwidgets-1.3.so.24
|
||||
lib/libgimpwidgets-1.3.so.24.0
|
||||
lib/pkgconfig/gimp-1.3.pc
|
||||
lib/pkgconfig/gimpthumb-1.3.pc
|
||||
lib/pkgconfig/gimpui-1.3.pc
|
||||
man/man1/gimp-1.3.1
|
||||
man/man1/gimp-remote-1.3.1
|
||||
|
|
@ -420,8 +431,8 @@ share/doc/html/${PKGNAME}/libgimpcolor/index.sgml
|
|||
share/doc/html/${PKGNAME}/libgimpcolor/left.png
|
||||
share/doc/html/${PKGNAME}/libgimpcolor/libgimpcolor-GimpAdaptiveSupersample.html
|
||||
share/doc/html/${PKGNAME}/libgimpcolor/libgimpcolor-GimpBilinear.html
|
||||
share/doc/html/${PKGNAME}/libgimpcolor/libgimpcolor-GimpColorSpace.html
|
||||
share/doc/html/${PKGNAME}/libgimpcolor/libgimpcolor-GimpCMYK.html
|
||||
share/doc/html/${PKGNAME}/libgimpcolor/libgimpcolor-GimpColorSpace.html
|
||||
share/doc/html/${PKGNAME}/libgimpcolor/libgimpcolor-GimpHSV.html
|
||||
share/doc/html/${PKGNAME}/libgimpcolor/libgimpcolor-GimpRGB.html
|
||||
share/doc/html/${PKGNAME}/libgimpcolor/libgimpcolor.devhelp
|
||||
|
|
@ -450,6 +461,18 @@ share/doc/html/${PKGNAME}/libgimpmodule/libgimpmodule.devhelp
|
|||
share/doc/html/${PKGNAME}/libgimpmodule/libgimpmodule.html
|
||||
share/doc/html/${PKGNAME}/libgimpmodule/right.png
|
||||
share/doc/html/${PKGNAME}/libgimpmodule/up.png
|
||||
share/doc/html/${PKGNAME}/libgimpthumb/GimpThumbnail.html
|
||||
share/doc/html/${PKGNAME}/libgimpthumb/home.png
|
||||
share/doc/html/${PKGNAME}/libgimpthumb/index.html
|
||||
share/doc/html/${PKGNAME}/libgimpthumb/index.sgml
|
||||
share/doc/html/${PKGNAME}/libgimpthumb/left.png
|
||||
share/doc/html/${PKGNAME}/libgimpthumb/libgimpthumb-gimpthumb-enums.html
|
||||
share/doc/html/${PKGNAME}/libgimpthumb/libgimpthumb-gimpthumb-error.html
|
||||
share/doc/html/${PKGNAME}/libgimpthumb/libgimpthumb-gimpthumb-utils.html
|
||||
share/doc/html/${PKGNAME}/libgimpthumb/libgimpthumb.devhelp
|
||||
share/doc/html/${PKGNAME}/libgimpthumb/libgimpthumb.html
|
||||
share/doc/html/${PKGNAME}/libgimpthumb/right.png
|
||||
share/doc/html/${PKGNAME}/libgimpthumb/up.png
|
||||
share/doc/html/${PKGNAME}/libgimpwidgets/GimpButton.html
|
||||
share/doc/html/${PKGNAME}/libgimpwidgets/GimpChainButton.html
|
||||
share/doc/html/${PKGNAME}/libgimpwidgets/GimpColorArea.html
|
||||
|
|
@ -1061,6 +1084,8 @@ share/gimp/1.3/palettes/Web.gpl
|
|||
share/gimp/1.3/patterns/3dgreen.pat
|
||||
share/gimp/1.3/patterns/Craters.pat
|
||||
share/gimp/1.3/patterns/Moonfoot.pat
|
||||
share/gimp/1.3/patterns/Stripes1px.pat
|
||||
share/gimp/1.3/patterns/Stripes2px.pat
|
||||
share/gimp/1.3/patterns/amethyst.pat
|
||||
share/gimp/1.3/patterns/bark.pat
|
||||
share/gimp/1.3/patterns/blue.pat
|
||||
|
|
@ -1291,12 +1316,12 @@ share/gimp/1.3/themes/Default/images/stock-edit-16.png
|
|||
share/gimp/1.3/themes/Default/images/stock-error-64.png
|
||||
share/gimp/1.3/themes/Default/images/stock-eye-12.png
|
||||
share/gimp/1.3/themes/Default/images/stock-eye-20.png
|
||||
share/gimp/1.3/themes/Default/images/stock-flip-horizontal-16.png
|
||||
share/gimp/1.3/themes/Default/images/stock-flip-vertical-16.png
|
||||
share/gimp/1.3/themes/Default/images/stock-floating-selection-16.png
|
||||
share/gimp/1.3/themes/Default/images/stock-floating-selection-24.png
|
||||
share/gimp/1.3/themes/Default/images/stock-floating-selection-32.png
|
||||
share/gimp/1.3/themes/Default/images/stock-floating-selection-48.png
|
||||
share/gimp/1.3/themes/Default/images/stock-flip-horizontal-16.png
|
||||
share/gimp/1.3/themes/Default/images/stock-flip-vertical-16.png
|
||||
share/gimp/1.3/themes/Default/images/stock-gradient-bilinear-16.png
|
||||
share/gimp/1.3/themes/Default/images/stock-gradient-conical-asymmetric-16.png
|
||||
share/gimp/1.3/themes/Default/images/stock-gradient-conical-symmetric-16.png
|
||||
|
|
@ -1661,12 +1686,14 @@ share/mime-info/gimp-1.3.keys
|
|||
@dirrm share/gimp/1.3/gimpressionist
|
||||
@dirrm share/gimp/1.3/gflare
|
||||
@dirrm share/gimp/1.3/gfig
|
||||
@dirrm share/gimp/1.3/fonts
|
||||
@dirrm share/gimp/1.3/fractalexplorer
|
||||
@exec ${MKDIR} %D/share/gimp/1.3/fonts
|
||||
@dirrm share/gimp/1.3/fonts
|
||||
@dirrm share/gimp/1.3/brushes
|
||||
@dirrm share/gimp/1.3
|
||||
@dirrm share/gimp
|
||||
@dirrm share/doc/html/${PKGNAME}/libgimpwidgets
|
||||
@dirrm share/doc/html/${PKGNAME}/libgimpthumb
|
||||
@dirrm share/doc/html/${PKGNAME}/libgimpmodule
|
||||
@dirrm share/doc/html/${PKGNAME}/libgimpmath
|
||||
@dirrm share/doc/html/${PKGNAME}/libgimpcolor
|
||||
|
|
@ -1681,6 +1708,7 @@ share/mime-info/gimp-1.3.keys
|
|||
@dirrm lib/gimp/1.3
|
||||
@dirrm lib/gimp
|
||||
@dirrm include/gimp-1.3/libgimpwidgets
|
||||
@dirrm include/gimp-1.3/libgimpthumb
|
||||
@dirrm include/gimp-1.3/libgimpmodule
|
||||
@dirrm include/gimp-1.3/libgimpmath
|
||||
@dirrm include/gimp-1.3/libgimpcolor
|
||||
|
|
|
|||
|
|
@ -1,24 +1,30 @@
|
|||
# $NetBSD: buildlink2.mk,v 1.3 2003/06/30 08:28:20 moubctez Exp $
|
||||
# $NetBSD: buildlink2.mk,v 1.4 2004/01/12 03:45:29 blef Exp $
|
||||
#
|
||||
# This Makefile fragment is included by packages that use gimp-current.
|
||||
#
|
||||
# This file was created automatically using createbuildlink 2.9.
|
||||
#
|
||||
|
||||
.if !defined(GIMP_CURRENT_BUILDLINK2_MK)
|
||||
GIMP_CURRENT_BUILDLINK2_MK= # defined
|
||||
|
||||
BUILDLINK_PACKAGES+= gimp-current
|
||||
BUILDLINK_DEPENDS.gimp-current?= gimp-current>=1.3.16
|
||||
BUILDLINK_PKGSRCDIR.gimp-current?= ../../wip/gimp-current
|
||||
BUILDLINK_DEPENDS.gimp-current?= gimp-current>=2.0pre1
|
||||
BUILDLINK_PKGSRCDIR.gimp-current?= ../../wip/gimp-current
|
||||
|
||||
EVAL_PREFIX+= BUILDLINK_PREFIX.gimp-current=gimp-current
|
||||
BUILDLINK_PREFIX.gimp-current_DEFAULT= ${LOCALBASE}
|
||||
BUILDLINK_FILES.gimp-current+= include/gimp-1.3/*
|
||||
BUILDLINK_FILES.gimp-current+= lib/libgck*
|
||||
BUILDLINK_FILES.gimp-current+= lib/libgimp*
|
||||
BUILDLINK_FILES.gimp-current+= include/gimp-1.3/libgimp/*.h
|
||||
BUILDLINK_FILES.gimp-current+= lib/libgimp-1.3.*
|
||||
BUILDLINK_FILES.gimp-current+= lib/libgimpbase-1.3.*
|
||||
BUILDLINK_FILES.gimp-current+= lib/libgimpcolor-1.3.*
|
||||
BUILDLINK_FILES.gimp-current+= lib/libgimpmath-1.3.*
|
||||
BUILDLINK_FILES.gimp-current+= lib/libgimpmodule-1.3.*
|
||||
BUILDLINK_FILES.gimp-current+= lib/libgimpthumb-1.3.*
|
||||
BUILDLINK_FILES.gimp-current+= lib/libgimpui-1.3.*
|
||||
BUILDLINK_FILES.gimp-current+= lib/libgimpwidgets-1.3.*
|
||||
|
||||
.include "../../devel/gettext-lib/buildlink2.mk"
|
||||
.include "../../graphics/jpeg/buildlink2.mk"
|
||||
.include "../../graphics/mpeg-lib/buildlink2.mk"
|
||||
.include "../../graphics/png/buildlink2.mk"
|
||||
.include "../../graphics/tiff/buildlink2.mk"
|
||||
.include "../../graphics/libart2/buildlink2.mk"
|
||||
.include "../../devel/glib2/buildlink2.mk"
|
||||
.include "../../x11/gtk2/buildlink2.mk"
|
||||
|
||||
BUILDLINK_TARGETS+= gimp-current-buildlink
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
$NetBSD: distinfo,v 1.10 2003/11/24 14:10:53 moubctez Exp $
|
||||
$NetBSD: distinfo,v 1.11 2004/01/12 03:45:29 blef Exp $
|
||||
|
||||
SHA1 (gimp-1.3.23.tar.bz2) = 924a8cbae726f7caf353200baab7822d9a0799d0
|
||||
Size (gimp-1.3.23.tar.bz2) = 12002664 bytes
|
||||
SHA1 (gimp-2.0pre1.tar.bz2) = d12476377068adb3a43451ee08dcd8837e9e5899
|
||||
Size (gimp-2.0pre1.tar.bz2) = 12065700 bytes
|
||||
|
|
|
|||
Loading…
Reference in a new issue