cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to gimp 2.2.8; input and ok from many.

Browse Source
This commit is contained in:
fgsch 2005-07-08 07:50:55 +00:00
parent 33bd68de4b
commit d4a86bfb54
22 changed files with 2185 additions and 1852 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
graphics/gimp/stable/Makefile
View File

@ -1,46 +1,66 @@
# $OpenBSD: Makefile,v 1.5 2004/12/14 11:09:54 espie Exp $
# $OpenBSD: Makefile,v 1.6 2005/07/08 07:50:55 fgsch Exp $
COMMENT= "GNU Image Manipulation Program"
VERSION= 1.2.5
DISTNAME= gimp-${VERSION}
DISTNAME= gimp-2.2.8
CATEGORIES= graphics
DIR= gimp/v1.2/v${VERSION}
DIR= gimp/v2.2
MASTER_SITES= ftp://ftp.gimp.org/pub/${DIR}/ \
ftp://ftp.sunet.se/pub/gnu/${DIR}/ \
ftp://ftp.cs.umn.edu/pub/${DIR}/ \
ftp://ftp.funet.fi/pub/mirrors/ftp.gimp.org/${DIR}/
ftp://ftp.funet.fi/pub/sci/graphics/packages/gimp/${DIR}/
HOMEPAGE= http://www.gimp.org/
LIB_DEPENDS+= gtk.1.2,gdk.1.2::x11/gtk+ \
BUILD_DEPENDS= :pkgconfig->=0.12.0p1:devel/pkgconfig \
:p5-XML-Parser-*:textproc/p5-XML-Parser
RUN_DEPENDS= :wget-*:net/wget
LIB_DEPENDS= gdk-x11-2.0.0.0,gdk_pixbuf-2.0.0.0,gtk-x11-2.0.0.0::x11/gtk+2 \
aa.1.3::graphics/aalib \
mpeg.13::graphics/mpeg-lib \
png.2::graphics/png \
tiff.35::graphics/tiff
BUILD_DEPENDS= :wget-*:net/wget
RUN_DEPENDS= :wget-*:net/wget
MAINTAINER= Brad Smith <brad@openbsd.org>
art_lgpl_2.5::graphics/libart \
exif::graphics/libexif \
mng::graphics/libmng \
tiff.35::graphics/tiff \
wmf.6,wmflite.6::graphics/libwmf
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= ICE SM X11 Xext Xi Xmu Xpm Xt c \
glib gmodule iconv intl jpeg m z
CONFDIR= ${SYSCONFDIR}/gimp/1.2
SUBST_VARS= CONFDIR
WANTLIB= ICE SM X11 Xft Xmu Xpm Xrender Xt atk-1.0.0.0 c fontconfig \
freetype glib-2.0.0.0 gmodule-2.0.0.0 gobject-2.0.0.0 \
jpeg.62 lcms.1 m pango-1.0.0.0 pangoft2-1.0.0.0 \
pangox-1.0.0.0 pangoxft-1.0.0.0 png.4 xml2 z
MODULES= devel/gettext
USE_X11= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --disable-perl --disable-print --disable-gtkdoc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
GNOME_CONFIG=/dev/null \
EMACS=/dev/null
USE_GMAKE= Yes
USE_LIBTOOL= Yes
AUTOCONF_VERSION= 2.59
CONFIGURE_STYLE= autoconf
CONFIGURE_ARGS= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --disable-print --disable-gtkhtml --disable-svg \
--disable-sse
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
FLAVORS= altivec
FLAVOR?=
.if ${FLAVOR:L} == "altivec"
ONLY_FOR_ARCHS= powerpc
CONFIGURE_ARGS+= --enable-altivec
.else
CONFIGURE_ARGS+= --disable-altivec
.endif
.if ${MACHINE_ARCH} == "i386" || ${MACHINE} == "amd64"
CONFIGURE_ARGS+= --enable-mmx
.endif
.include <bsd.port.mk>

8
graphics/gimp/stable/distinfo
View File

@ -1,4 +1,4 @@
MD5 (gimp-1.2.5.tar.gz) = 77a1aa0ed6c98e130432d412fd4a53a5
RMD160 (gimp-1.2.5.tar.gz) = f3328fa43fb823ed986552c80a1b328d46391963
SHA1 (gimp-1.2.5.tar.gz) = 5768d9b4d4ee59be38ca8fd384b60ca128aa194e
SIZE (gimp-1.2.5.tar.gz) = 15033710
MD5 (gimp-2.2.8.tar.gz) = 4147deec71221b3110f259901bbd2f27
RMD160 (gimp-2.2.8.tar.gz) = a22527536fb492ca630f7d8721f22884716deb27
SHA1 (gimp-2.2.8.tar.gz) = 1f6c9be3cc5feedf9b8526fee2ede4e2ac9de31e
SIZE (gimp-2.2.8.tar.gz) = 20186953

12
graphics/gimp/stable/patches/patch-Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-Makefile_in,v 1.1 2003/12/27 00:26:17 brad Exp $
--- Makefile.in.orig Mon May 19 19:07:20 2003
+++ Makefile.in Thu May 22 00:27:32 2003
@@ -172,7 +172,7 @@ brushdata = @brushdata@
gimpdatadir = @gimpdatadir@
gimpdir = @gimpdir@
gimpplugindir = @gimpplugindir@
-gimpsysconfdir = @gimpsysconfdir@
+gimpsysconfdir = $(datadir)/examples/gimp/1.2
gradientdata = @gradientdata@
localedir = @localedir@
ms_librarian = @ms_librarian@

21
graphics/gimp/stable/patches/patch-app_blob_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-app_blob_c,v 1.1 2004/08/04 03:58:13 david Exp $
--- app/blob.c.orig Sat Dec 16 15:36:51 2000
+++ app/blob.c Wed Jul 28 12:08:51 2004
@@ -239,7 +239,7 @@ blob_make_convex (Blob *b, EdgeType *pre
{
present[i2] &= ~EDGE_LEFT;
i2 = i1;
- while (!(present[--i1] & EDGE_LEFT) && i1>=start);
+ while ((--i1) >= start && (! (present[i1] & EDGE_LEFT)));
if (i1<start)
{
@@ -279,7 +279,7 @@ blob_make_convex (Blob *b, EdgeType *pre
{
present[i2] &= ~EDGE_RIGHT;
i2 = i1;
- while (!(present[--i1] & EDGE_RIGHT) && i1>=start);
+ while ((--i1) >= start && (! (present[i1] & EDGE_RIGHT)));
if (i1<start)
{

106
graphics/gimp/stable/patches/patch-configure_in Normal file
View File

@ -0,0 +1,106 @@
$OpenBSD: patch-configure_in,v 1.1 2005/07/08 07:50:56 fgsch Exp $
--- configure.in.orig Fri May 13 13:01:31 2005
+++ configure.in Wed Jul 6 02:37:31 2005
@@ -883,7 +883,7 @@ AC_ARG_WITH(libtiff, [ --without-libti
if test x$with_libtiff != xno && test -z "$LIBTIFF"; then
AC_CHECK_LIB(tiff, TIFFReadScanline,
[AC_CHECK_HEADER(tiffio.h,
- TIFF='tiff$(EXEEXT)'; LIBTIFF='-ltiff',
+ TIFF='tiff$(EXEEXT)'; LIBTIFF='-ltiff -ljpeg -lz',
[AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)])],
[AC_CHECK_LIB(tiff, TIFFWriteScanline,
[AC_CHECK_HEADER(tiffio.h,
@@ -893,7 +893,7 @@ AC_ARG_WITH(libtiff, [ --without-libti
[AC_CHECK_HEADER(tiffio.h,
TIFF='tiff$(EXEEXT)'; LIBTIFF='-ltiff34 -ljpeg -lz',
[AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)])],
- [AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***)], -ljpeg -lz -lm)], -ljpeg -lz -lm)], -lm)
+ [AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***)], -ljpeg -lz -lm)], -ljpeg -lz -lm)], -ljpeg -lz -lm)
fi
if test x$with_libtiff != xno && test -z "$LIBTIFF"; then
@@ -1019,9 +1019,9 @@ AC_ARG_WITH(libmng, [ --without-libmng
test -n "$LIBPNG" && test -n "$LIBJPEG" && test -n "$LIBZ"; then
AC_CHECK_LIB(mng, mng_create,
[AC_CHECK_HEADER(libmng.h, mng_ok=yes)],
- [AC_MSG_WARN(*** MNG plug-in will not be built (MNG library not found) ***)], -lz -lm)
+ [AC_MSG_WARN(*** MNG plug-in will not be built (MNG library not found) ***)], -llcms $LIBJPEG -lz -lm)
if test "$mng_ok" = yes; then
- MNG='mng$(EXEEXT)'; LIBMNG="-lmng $LIBJPEG $LIBPNG"
+ MNG='mng$(EXEEXT)'; LIBMNG="-lmng -llcms $LIBJPEG $LIBPNG"
else
AC_MSG_WARN(*** MNG plug-in will not be built (MNG header file not found) ***)
fi
@@ -1058,9 +1058,9 @@ AC_ARG_WITH(aa, [ --without-aa
if test x$with_aa != xno && test -z "$LIBAA"; then
AC_CHECK_LIB(aa, aa_printf,
[AC_CHECK_HEADER(aalib.h,
- AA='aa$(EXEEXT)'; LIBAA='-laa',
+ AA='aa$(EXEEXT)'; LIBAA='-laa -L/usr/X11R6/lib -lX11',
[AC_MSG_WARN(*** AA plug-in will not be built (AA header file not found) ***)])],
- [AC_MSG_WARN(*** AA plug-in will not be built (AA library not found) ***)])
+ [AC_MSG_WARN(*** AA plug-in will not be built (AA library not found) ***)], -L/usr/X11R6/lib -lX11)
fi
AC_SUBST(AA)
@@ -1096,11 +1096,17 @@ AC_SUBST(LIBXPM)
# Check for gtkhtml2
####################
-PKG_CHECK_MODULES(GTKHTML2, libgtkhtml-2.0 >= gtkhtml2_required_version,
- have_gtkhtml2=yes,
- AC_MSG_WARN([*** Help browser plug-in will not be built (GtkHtml2 not found) ***]))
-AC_SUBST(GTKHTML2_CFLAGS)
-AC_SUBST(GTKHTML2_LIBS)
+AC_ARG_ENABLE(gtkhtml, [ --disable-gtkhtml do not build the Help Browser plug-in])
+
+have_gtkhtml2=no
+if test "x$enable_gtkhtml" != "xno"; then
+ have_gtkhtml2=yes
+ PKG_CHECK_MODULES(GTKHTML2, libgtkhtml-2.0 >= gtkhtml2_required_version,
+ have_gtkhtml2=yes,
+ AC_MSG_WARN([*** Help browser plug-in will not be built (GtkHtml2 not found) ***]))
+ AC_SUBST(GTKHTML2_CFLAGS)
+ AC_SUBST(GTKHTML2_LIBS)
+fi
AM_CONDITIONAL(BUILD_HELPBROWSER, test x$have_gtkhtml2 = xyes)
@@ -1108,14 +1114,17 @@ AM_CONDITIONAL(BUILD_HELPBROWSER, test x
# Check for librsvg
###################
-PKG_CHECK_MODULES(SVG, librsvg-2.0 >= rsvg_required_version,
- SVG='svg$(EXEEXT)'
- LIBSVG=$SVG_LIBS,
- AC_MSG_WARN([*** SVG import plug-in will not be built (librsvg not found) ***]))
-AC_SUBST(SVG)
-AC_SUBST(SVG_CFLAGS)
-AC_SUBST(LIBSVG)
+AC_ARG_ENABLE(svg, [ --enable-svg do not build the SVG import plug-in])
+if test "x$enable_svg" != "xno"; then
+ PKG_CHECK_MODULES(SVG, librsvg-2.0 >= rsvg_required_version,
+ SVG='svg$(EXEEXT)'
+ LIBSVG=$SVG_LIBS,
+ AC_MSG_WARN([*** SVG import plug-in will not be built (librsvg not found) ***]))
+ AC_SUBST(SVG)
+ AC_SUBST(SVG_CFLAGS)
+ AC_SUBST(LIBSVG)
+fi
######################
# Check for gimp-print
@@ -1193,10 +1202,10 @@ AC_CHECK_LIB(lcms, cmsCreate_sRGBProfile
AC_DEFINE(HAVE_LCMS_LCMS_H, 1,
[Define to 1 if the lcms header must be included as lcms/lcms.h]))
])
-])
+], , -lm)
if test $have_lcms = yes; then
- LCMS_LIBS="-llcms"
+ LCMS_LIBS="-llcms -lm"
else
AC_MSG_WARN([*** color proof module will not be built (lcms not found or unuseable) ***])
fi

12
graphics/gimp/stable/patches/patch-etc_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-etc_Makefile_in,v 1.1 2005/07/08 07:50:56 fgsch Exp $
--- etc/Makefile.in.orig Tue Jun 28 02:55:14 2005
+++ etc/Makefile.in Tue Jun 28 02:55:38 2005
@@ -341,7 +341,7 @@ exec_prefix = @exec_prefix@
gimpdatadir = @gimpdatadir@
gimpdir = @gimpdir@
gimpplugindir = @gimpplugindir@
-gimpsysconfdir = @gimpsysconfdir@
+gimpsysconfdir = ${datadir}/examples/gimp/@GIMP_SYSCONF_VERSION@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@

27
graphics/gimp/stable/patches/patch-gimptool-1_2_in
View File

@ -1,27 +0,0 @@
$OpenBSD: patch-gimptool-1_2_in,v 1.2 2003/12/27 00:26:17 brad Exp $
--- gimptool-1.2.in.orig Tue Oct 29 06:29:28 2002
+++ gimptool-1.2.in Fri Feb 14 21:29:34 2003
@@ -227,19 +227,19 @@ while test $# -gt 0; do
| --uninstall-script | --uninstall-admin-script )
case $1 in
--*install-bin)
- install_cmd="@INSTALL_PROGRAM@"
+ install_cmd="@INSTALL_SCRIPT@"
install_dir="$HOME/@gimpdir@/plug-ins"
;;
--install-bin-strip)
- install_cmd="@INSTALL_PROGRAM@ -s"
+ install_cmd="@INSTALL_SCRIPT@ -s"
install_dir="$HOME/@gimpdir@/plug-ins"
;;
--*install-admin-bin)
- install_cmd="@INSTALL_PROGRAM@"
+ install_cmd="@INSTALL_SCRIPT@"
install_dir="$gimpplugindir/plug-ins"
;;
--install-admin-bin-strip)
- install_cmd="@INSTALL_PROGRAM@ -s"
+ install_cmd="@INSTALL_SCRIPT@ -s"
install_dir="$gimpplugindir/plug-ins"
;;
--*install-script)

28
graphics/gimp/stable/patches/patch-libgimp_Makefile_in
View File

@ -1,28 +0,0 @@
$OpenBSD: patch-libgimp_Makefile_in,v 1.1 2003/12/27 00:26:17 brad Exp $
--- libgimp/Makefile.in.orig Mon May 19 19:07:25 2003
+++ libgimp/Makefile.in Thu May 22 09:16:49 2003
@@ -192,7 +192,7 @@ prefix = @prefix@
@MS_LIB_AVAILABLE_TRUE@noinst_DATA = gimp.lib gimpui.lib
-gimpincludedir = $(includedir)/libgimp
+gimpincludedir = $(includedir)/gimp-$(LT_RELEASE)/libgimp
AM_CPPFLAGS = -DPREFIX=\""$(prefix)"\" -DGIMPDIR=\""$(gimpdir)"\" -DDATADIR=\""$(gimpdatadir)"\" -DSYSCONFDIR=\""$(gimpsysconfdir)"\" -DG_LOG_DOMAIN=\"LibGimp\" @GIMP_THREAD_FLAGS@
@@ -226,13 +226,13 @@ libgimpui_la_SOURCES = gimpmenu.c gi
gimpinclude_HEADERS = gimp.h ${PDB_WRAPPERS_H} gimpchainbutton.h gimpchannel.h gimpcolorbutton.h gimpcolordisplay.h gimpcolorselector.h gimpcolorspace.h gimpcompat.h gimpdrawable.h gimpdialog.h gimpenums.h gimpenv.h gimpexport.h gimpfeatures.h gimpfileselection.h gimpgradientselect.h gimphelpui.h gimpimage.h gimplayer.h gimplimits.h gimpmath.h gimpmatrix.h gimpmenu.h gimpmodule.h gimpparasite.h gimpparasiteio.h gimppatheditor.h gimppixelrgn.h gimppixmap.h gimpproceduraldb.h gimpquerybox.h gimpselection.h gimpsignal.h gimpsizeentry.h gimptile.h gimptypes.h gimpui.h gimpunit.h gimpunitmenu.h gimputils.h gimpvector.h gimpwidgets.h gimpintl.h
-libgimp_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) $(no_undefined) $(libgimp_export_symbols)
+libgimp_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(no_undefined) $(libgimp_export_symbols)
libgimp_la_LIBADD = $(GLIB_LIBS) $(libmath)
libgimp_la_DEPENDENCIES = $(gimp_def)
-libgimpui_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) $(no_undefined) $(libgimpui_export_symbols)
+libgimpui_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(no_undefined) $(libgimpui_export_symbols)
libgimpui_la_LIBADD = $(GTK_LIBS) $(conditional_libgimp_la)

74
graphics/gimp/stable/patches/patch-ltmain_sh
View File

@ -1,74 +0,0 @@
$OpenBSD: patch-ltmain_sh,v 1.1 2003/12/27 00:26:17 brad Exp $
--- ltmain.sh.orig Mon May 19 18:45:50 2003
+++ ltmain.sh Thu May 22 00:27:33 2003
@@ -1082,6 +1082,17 @@ compiler."
continue
;;
+ -pthread)
+ case $host in
+ *-*-openbsd*)
+ deplibs="$deplibs $arg"
+ ;;
+ *)
+ continue
+ ;;
+ esac
+ ;;
+
-module)
module=yes
continue
@@ -1767,11 +1778,6 @@ compiler."
continue
fi
- if test "$installed" = no; then
- notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
- fi
-
if test -n "$old_archive_from_expsyms_cmds"; then
# figure out the soname
set dummy $library_names
@@ -4569,40 +4575,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = ":" && exit 0
- echo "----------------------------------------------------------------------"
- echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- echo " $libdir"
- done
- echo
- echo "If you ever happen to want to link against installed libraries"
- echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- echo " during execution"
- fi
- if test -n "$runpath_var"; then
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
- echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- echo " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- echo " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- echo
- echo "See any operating system documentation about shared libraries for"
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
- echo "----------------------------------------------------------------------"
exit 0
;;

21
graphics/gimp/stable/patches/patch-plug-ins_common_bz2_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-plug-ins_common_bz2_c,v 1.1 2002/12/29 00:10:47 pvalchev Exp $
--- plug-ins/common/bz2.c.orig Sat Dec 28 14:57:07 2002
+++ plug-ins/common/bz2.c Sat Dec 28 14:57:21 2002
@@ -306,7 +306,7 @@ save_image (gchar *filename,
g_message ("bz2: dup2 failed: %s\n", g_strerror (errno));
/* and bzip2 into it */
- execlp ("bzip2", "bzip2", "-cf", tmpname, NULL);
+ execlp ("bzip2", "bzip2", "-cf", tmpname, (void *)NULL);
g_message ("bz2: exec failed: bzip2: %s\n", g_strerror (errno));
g_free (tmpname);
_exit (127);
@@ -385,7 +385,7 @@ load_image (gchar *filename,
g_message ("bz2: dup2 failed: %s\n", g_strerror (errno));
/* and unzip into it */
- execlp ("bzip2", "bzip2", "-cfd", filename, NULL);
+ execlp ("bzip2", "bzip2", "-cfd", filename, (void *)NULL);
g_message ("bz2: exec failed: bunzip2: %s\n", g_strerror (errno));
g_free (tmpname);
_exit (127);

21
graphics/gimp/stable/patches/patch-plug-ins_common_compressor_c Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-plug-ins_common_compressor_c,v 1.1 2005/07/08 07:50:56 fgsch Exp $
--- plug-ins/common/compressor.c.orig Fri Jun 24 12:21:14 2005
+++ plug-ins/common/compressor.c Fri Jun 24 12:21:30 2005
@@ -414,7 +414,7 @@ save_image (const Compressor *compressor
/* and compress into it */
execlp (compressor->save_program,
compressor->save_program,
- compressor->save_options, tmpname, NULL);
+ compressor->save_options, tmpname, (char *)NULL);
g_message ("execlp(\"%s %s\") failed: %s",
compressor->save_program,
@@ -548,7 +548,7 @@ load_image (const Compressor *compresso
/* and uncompress into it */
execlp (compressor->load_program,
compressor->load_program,
- compressor->load_options, filename, NULL);
+ compressor->load_options, filename, (char *)NULL);
g_message ("execlp(\"%s %s\") failed: %s",
compressor->load_program,

21
graphics/gimp/stable/patches/patch-plug-ins_common_gz_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-plug-ins_common_gz_c,v 1.2 2003/12/27 00:26:17 brad Exp $
--- plug-ins/common/gz.c.orig Tue Sep 10 10:19:52 2002
+++ plug-ins/common/gz.c Fri Feb 14 21:19:28 2003
@@ -368,7 +368,7 @@ save_image (gchar *filename,
g_message ("gz: dup2 failed: %s\n", g_strerror (errno));
/* and gzip into it */
- execlp ("gzip", "gzip", "-cf", tmpname, NULL);
+ execlp ("gzip", "gzip", "-cf", tmpname, (void *)NULL);
g_message ("gz: exec failed: gzip: %s\n", g_strerror (errno));
g_free (tmpname);
_exit(127);
@@ -488,7 +488,7 @@ load_image (gchar *filename,
}
/* and unzip into it */
- execlp ("gzip", "gzip", "-cfd", filename, NULL);
+ execlp ("gzip", "gzip", "-cfd", filename, (void *)NULL);
g_message ("gz: exec failed: gunzip: %s\n", g_strerror (errno));
g_free (tmpname);
_exit(127);

14
graphics/gimp/stable/patches/patch-plug-ins_common_mail_c
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-plug-ins_common_mail_c,v 1.1 2002/12/29 00:10:47 pvalchev Exp $
--- plug-ins/common/mail.c.orig Sat Dec 28 14:57:55 2002
+++ plug-ins/common/mail.c Sat Dec 28 14:58:01 2002
@@ -368,7 +368,7 @@ save_image (gchar *filename,
g_message ("mail: dup2 failed: %s\n", g_strerror (errno));
$OpenBSD: patch-plug-ins_common_mail_c,v 1.2 2005/07/08 07:50:56 fgsch Exp $
--- plug-ins/common/mail.c.orig Fri Jun 24 12:21:59 2005
+++ plug-ins/common/mail.c Fri Jun 24 12:22:09 2005
@@ -402,7 +402,7 @@ save_image (const gchar *filename,
g_message ("dup2() failed: %s", g_strerror (errno));
}
- execlp (UUENCODE, UUENCODE, tmpname, filename, NULL);
+ execlp (UUENCODE, UUENCODE, tmpname, filename, (void *)NULL);
+ execlp (UUENCODE, UUENCODE, tmpname, filename, (char *)NULL);
/* What are we doing here? exec must have failed */
g_message ("mail: exec failed: uuencode: %s\n", g_strerror (errno));
g_message ("exec failed: uuencode: %s", g_strerror (errno));

16
graphics/gimp/stable/patches/patch-plug-ins_common_url_c
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-plug-ins_common_url_c,v 1.1 2002/12/29 00:10:47 pvalchev Exp $
--- plug-ins/common/url.c.orig Sat Dec 28 14:58:06 2002
+++ plug-ins/common/url.c Sat Dec 28 14:58:16 2002
@@ -189,7 +189,7 @@ load_image (gchar *filename,
putenv ("LANG=C");
$OpenBSD: patch-plug-ins_common_url_c,v 1.2 2005/07/08 07:50:56 fgsch Exp $
--- plug-ins/common/url.c.orig Fri Jun 24 12:22:21 2005
+++ plug-ins/common/url.c Fri Jun 24 12:22:28 2005
@@ -187,7 +187,7 @@ load_image (const gchar *filename,
#endif
- execlp ("wget", "wget", "-T", TIMEOUT, filename, "-O", tmpname, NULL);
+ execlp ("wget", "wget", "-T", TIMEOUT, filename, "-O", tmpname, (void *)NULL);
g_message ("url: exec() failed: wget: %s", g_strerror (errno));
execlp ("wget", "wget", "-e", "server-response=off", "-T", TIMEOUT,
- filename, "-O", tmpname, NULL);
+ filename, "-O", tmpname, (char *)NULL);
g_message ("exec() failed: wget: %s", g_strerror (errno));
g_free (tmpname);
_exit (127);

61
graphics/gimp/stable/patches/patch-plug-ins_gflare_gflare_c Normal file
View File

@ -0,0 +1,61 @@
$OpenBSD: patch-plug-ins_gflare_gflare_c,v 1.1 2005/07/08 07:50:56 fgsch Exp $
--- plug-ins/gflare/gflare.c.orig Tue Jun 28 14:06:04 2005
+++ plug-ins/gflare/gflare.c Tue Jun 28 14:09:07 2005
@@ -1347,7 +1347,7 @@ static void
gflare_read_double (gdouble *dblvar,
GFlareFile *gf)
{
- gchar buf[30];
+ gchar buf[31];
if (gf->error)
return;
@@ -1362,14 +1362,14 @@ static void
gflare_read_gradient_name (GradientName name,
GFlareFile *gf)
{
- gchar tmp[1024], dec[1024];
+ gchar tmp[1025], dec[1025];
if (gf->error)
return;
/* FIXME: this is buggy */
- if (fscanf (gf->fp, "%s", tmp) == 1)
+ if (fscanf (gf->fp, "%1024s", tmp) == 1)
{
/* @GRADIENT_NAME */
gradient_name_decode (dec, tmp);
@@ -1383,13 +1383,13 @@ static void
gflare_read_shape (GFlareShape *shape,
GFlareFile *gf)
{
- gchar tmp[1024];
+ gchar tmp[1025];
gint i;
if (gf->error)
return;
- if (fscanf (gf->fp, "%s", tmp) == 1)
+ if (fscanf (gf->fp, "%1024s", tmp) == 1)
{
for (i = 0; i < GF_NUM_SHAPES; i++)
if (strcmp (tmp, gflare_shapes[i]) == 0)
@@ -1405,13 +1405,13 @@ static void
gflare_read_mode (GFlareMode *mode,
GFlareFile *gf)
{
- gchar tmp[1024];
+ gchar tmp[1025];
gint i;
if (gf->error)
return;
- if (fscanf (gf->fp, "%s", tmp) == 1)
+ if (fscanf (gf->fp, "%1024s", tmp) == 1)
{
for (i = 0; i < GF_NUM_MODES; i++)
if (strcmp (tmp, gflare_modes[i]) == 0)

21
graphics/gimp/stable/patches/patch-plug-ins_libgck_gck_Makefile_in
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-plug-ins_libgck_gck_Makefile_in,v 1.1 2003/12/27 00:26:17 brad Exp $
--- plug-ins/libgck/gck/Makefile.in.orig Mon May 19 19:07:32 2003
+++ plug-ins/libgck/gck/Makefile.in Thu May 22 09:17:41 2003
@@ -182,7 +182,7 @@ prefix = @prefix@
@OS_WIN32_TRUE@no_undefined = -no-undefined
-gckincludedir = $(includedir)/gck
+gckincludedir = $(includedir)/gimp-$(LT_RELEASE)/gck
lib_LTLIBRARIES = libgck.la
@@ -192,7 +192,7 @@ libgck_la_SOURCES = gckcolor.c
gckinclude_HEADERS = gck.h
-libgck_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) $(no_undefined)
+libgck_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(no_undefined)
INCLUDES = -I.. -I$(srcdir)/.. -I$(top_srcdir) $(GTK_CFLAGS) -I$(includedir)

12
graphics/gimp/stable/patches/patch-plug-ins_print_print_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-plug-ins_print_print_c,v 1.2 2003/12/27 00:26:17 brad Exp $
--- plug-ins/print/print.c.orig Fri Jul 19 20:35:02 2002
+++ plug-ins/print/print.c Tue May 20 23:56:58 2003
@@ -451,7 +451,7 @@ run (char *name, /* I - Name of print
dup2 (pipefd[0], 0);
close (pipefd[0]);
close (pipefd[1]);
- execl("/bin/sh", "/bin/sh", "-c", stp_get_output_to(vars), NULL);
+ execl("/bin/sh", "/bin/sh", "-c", stp_get_output_to(vars), (void *)NULL);
/* NOTREACHED */
exit (1);
} else {

12
graphics/gimp/stable/patches/patch-plug-ins_webbrowser_webbrowser_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-plug-ins_webbrowser_webbrowser_c,v 1.1 2002/12/29 00:10:47 pvalchev Exp $
--- plug-ins/webbrowser/webbrowser.c.orig Sat Dec 28 14:56:48 2002
+++ plug-ins/webbrowser/webbrowser.c Sat Dec 28 14:56:55 2002
@@ -229,7 +229,7 @@ start_browser (gchar *prog,
if ((cpid = fork()) == 0)
{
- execlp (prog, prog, url, NULL);
+ execlp (prog, prog, url, (void *)NULL);
exit (1);
}

12
graphics/gimp/stable/patches/patch-po-plug-ins_Makefile_in_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-po-plug-ins_Makefile_in_in,v 1.1 2003/12/27 00:26:17 brad Exp $
--- po-plug-ins/Makefile.in.in.orig Thu May 8 18:05:39 2003
+++ po-plug-ins/Makefile.in.in Thu May 22 00:27:33 2003
@@ -18,7 +18,7 @@ VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
-datadir = $(prefix)/@DATADIRNAME@
+datadir = $(prefix)/share
localedir = $(datadir)/locale
gnulocaledir = $(prefix)/share/locale
gettextsrcdir = $(prefix)/share/gettext/po

33
graphics/gimp/stable/pkg/DESCR
View File

@ -1,24 +1,13 @@
The GNU Image Manipulation Program (GIMP) is a powerful tool for the
preparation and manipulation of digital images. The GIMP provides the user
with a wide variety of image manipulation, painting, processing, and
rendering tools. The key to the GIMP's power lies in its flexible
core and easily extensible design. The GIMP's open design and
extensible architecture make for a very powerful end product which can
continue to be extended to meet the needs of the photo compositor,
image retoucher, web graphics designer, or digital illustrator for a
very long time.
GIMP is an acronym for GNU Image Manipulation Program. It is a
freely distributed program for such tasks as photo retouching, image
composition and image authoring.
The GIMP's extensible plug-in architecture allows for image
manipulation procedures and other functionality to be easily added
without requiring any change to the application core. A plug-in can
provide functionality as simple as rotating an image, or as
complicated as rendering iterated function system fractals. There are
over 140+ plug-ins available in version 1.1, and more are sure to
follow.
It has many capabilities. It can be used as a simple paint program,
an expert quality photo retouching program, an online batch processing
system, a mass production image renderer, an image format converter,
etc.
The plug-in architecture also allows the GIMP to support a wide
variety of file formats. File operations are implemented by special
file plug-ins, allowing additional file formats to be added
without modification to the core. File formats supported in version
1.1 include the popular GIF and JPEG standards, as well as PNG, TIFF,
XPM, SGI, PCX, and Windows BMP.
GIMP is expandable and extensible. It is designed to be augmented
with plug-ins and extensions to do just about anything. The advanced
scripting interface allows everything from the simplest task to the
most complex image manipulation procedures to be easily scripted.

24
graphics/gimp/stable/pkg/PFRAG.shared
View File

@ -1,7 +1,17 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2004/09/15 00:50:09 espie Exp $
lib/gimp/1.2/modules/libcolorsel_gtk.so
lib/gimp/1.2/modules/libcolorsel_triangle.so
lib/gimp/1.2/modules/libcolorsel_water.so
@lib lib/libgck.so.0.5
@lib lib/libgimp.so.0.5
@lib lib/libgimpui.so.0.5
@comment $OpenBSD: PFRAG.shared,v 1.4 2005/07/08 07:50:56 fgsch Exp $
lib/gimp/2.0/modules/libcdisplay_colorblind.so
lib/gimp/2.0/modules/libcdisplay_gamma.so
lib/gimp/2.0/modules/libcdisplay_highcontrast.so
lib/gimp/2.0/modules/libcdisplay_proof.so
lib/gimp/2.0/modules/libcolorsel_cmyk.so
lib/gimp/2.0/modules/libcolorsel_triangle.so
lib/gimp/2.0/modules/libcolorsel_water.so
lib/gimp/2.0/modules/libcontroller_midi.so
@lib lib/libgimp-2.0.so.200.8
@lib lib/libgimpbase-2.0.so.200.8
@lib lib/libgimpcolor-2.0.so.200.8
@lib lib/libgimpmath-2.0.so.200.8
@lib lib/libgimpmodule-2.0.so.200.8
@lib lib/libgimpthumb-2.0.so.200.8
@lib lib/libgimpui-2.0.so.200.8
@lib lib/libgimpwidgets-2.0.so.200.8

3413
graphics/gimp/stable/pkg/PLIST
View File

File diff suppressed because it is too large Load Diff