From 0755df96819f898e5d138feb743350ce9cf955bf Mon Sep 17 00:00:00 2001
From: Koop Mast <kwm@FreeBSD.org>
Date: Thu, 18 Nov 2004 09:55:04 +0000
Subject: Resurrect gimp-devel and update to version 2.2.pre1.

Approved by:	pav (mentor)
---
 graphics/gimp-app-devel/files/gimp.setfont         | 157 +++++++++++++++++++++
 graphics/gimp-app-devel/files/patch-aa             |  20 +++
 graphics/gimp-app-devel/files/patch-ab             |  13 ++
 graphics/gimp-app-devel/files/patch-am             |  19 +++
 graphics/gimp-app-devel/files/patch-configure      |  13 ++
 .../gimp-app-devel/files/patch-gimptool-2.0.in     |  29 ++++
 graphics/gimp-app-devel/files/patch-ltmain.sh      |  41 ++++++
 .../files/patch-plug-ins_print_print.c             |  11 ++
 8 files changed, 303 insertions(+)
 create mode 100644 graphics/gimp-app-devel/files/gimp.setfont
 create mode 100644 graphics/gimp-app-devel/files/patch-aa
 create mode 100644 graphics/gimp-app-devel/files/patch-ab
 create mode 100644 graphics/gimp-app-devel/files/patch-am
 create mode 100644 graphics/gimp-app-devel/files/patch-configure
 create mode 100644 graphics/gimp-app-devel/files/patch-gimptool-2.0.in
 create mode 100644 graphics/gimp-app-devel/files/patch-ltmain.sh
 create mode 100644 graphics/gimp-app-devel/files/patch-plug-ins_print_print.c

(limited to 'graphics/gimp-app-devel/files')

diff --git a/graphics/gimp-app-devel/files/gimp.setfont b/graphics/gimp-app-devel/files/gimp.setfont
new file mode 100644
index 000000000000..f81fa5d9b9ad
--- /dev/null
+++ b/graphics/gimp-app-devel/files/gimp.setfont
@@ -0,0 +1,157 @@
+#!/usr/bin/perl
+
+# Font setting Perl script for GIMP
+#
+# by MANTANI Nobutaka <nobutaka@nobutaka.com>
+
+$progname = "gimp.setfont";
+$version = "Version 0.4 Feb 07 2000";
+
+$fontset{'chinese'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1,-*-kai-medium-r-normal--16-*-*-*-*-*-big5-0";
+$fontset{'czech'} = "-*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-2";
+$fontset{'danish'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
+$fontset{'dutch'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
+$fontset{'english'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
+$fontset{'finnish'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
+$fontset{'french'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
+$fontset{'german'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
+$fontset{'hungarian'} = "-*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-2";
+$fontset{'italian'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
+$fontset{'japanese'} = "-*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-1,-*-fixed-medium-r-normal--14-*-*-*-*-*-jisx0201.1976-0,-*-fixed-medium-r-normal--14-*-*-*-*-*-jisx0208.1983-0";
+$fontset{'korean'} = "-*-fixed-medium-r-normal--16-*-*-*-*-*-iso8859-1,-daewoo-gothic-medium-r-normal--16-*-*-*-*-*-ksc5601.1987-0";
+$fontset{'norwegian'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
+$fontset{'polish'} = "-*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-2";
+$fontset{'russian'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-koi8-r";
+$fontset{'slovak'} = "-*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-2";
+$fontset{'swedish'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
+$fontset{'ukrainian'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-koi8-r";
+
+$locale{'chinese'} = "zh_TW.Big5";
+$locale{'czech'} = "cs_CZ.ISO8859-2";
+$locale{'danish'} = "da_DK.ISO_8859-1";
+$locale{'dutch'} = "nl_NL.ISO_8859-1";
+$locale{'english'} = "C";
+$locale{'finnish'} = "fi_FI.ISO_8859-1";
+$locale{'french'} = "fr_FR.ISO_8859-1";
+$locale{'german'} = "de_DE.ISO_8859-1";
+$locale{'hungarian'} = "hu_HU.ISO_8859-2";
+$locale{'italian'} = "it_IT.ISO_8859-1";
+$locale{'japanese'} = "ja_JP.EUC";
+$locale{'korean'} = "ko_KR.EUC";
+$locale{'norwegian'} = "no_NO.ISO_8859-1";
+$locale{'polish'} = "pl_PL.ISO_8859-2";
+$locale{'russian'} = "ru_SU.KOI8-R";
+$locale{'slovak'} = "sk_SK.ISO_8859-2";
+$locale{'swedish'} = "sv_SE.ISO_8859-1";
+$locale{'ukrainian'} = "uk_UA.KOI8-U";
+
+# Show usage
+sub usage() {
+    print <<EOF;
+Usage: gimp.setfont <language>
+
+----------------------------------------------------------------
+[language]          [fontset]
+ chinese             -*-helvetica-(iso8859-1),-*-kai-(big5-0)
+ czech               -*-fixed-(iso8859-2)
+ danish              -*-helvetica-(iso8859-1)
+ dutch               -*-helvetica-(iso8859-1)
+ english             -*-helvetica-(iso8859-1)
+ finnish             -*-helvetica-(iso8859-1)
+ french              -*-helvetica-(iso8859-1)
+ german              -*-helvetica-(iso8859-1)
+ hungarian           -*-fixed-(iso8859-2)
+ italian             -*-helvetica-(iso8859-1)
+ japanese            -*-fixed-(iso8859-1,jisx0201,jisx0208)
+ korean              -*-fixed-(iso8859-1),-daewoo-gothic-(ksc5601)
+ norwegian           -*-helvetica-(iso8859-1)
+ polish              -*-fixed-(iso8859-2)
+ russian             -*-helvetica-(koi8-r)
+ slovak              -*-fixed-(iso8869-2)
+ swedish             -*-helvetica-(iso8859-1)
+ ukrainian           -*-helvetica-(koi8-r)
+----------------------------------------------------------------
+
+If you need iso8859-2 fonts, please install etlfonts
+(x11-fonts/etlfonts).
+
+EOF
+}
+
+# Write gtkrc of user's .gimp-1.2 directory
+sub write_gtkrc($) {
+    my $fontset = shift;
+    my $path = "$ENV{'HOME'}/.gimp-1.2";
+
+    if (-d $path) {
+	if (-e "$path/gtkrc") {
+	    chmod(0644, "$path/gtkrc");
+	    print "Renaming $path/gtkrc to $path/gtkrc.old...\n";
+	    rename("$path/gtkrc", "$path/gtkrc.old");
+	}
+
+	print "Writing $path/gtkrc...\n";
+	open(FILE, ">$path/gtkrc");
+	print FILE <<EOF;
+\# style <name> [= <name>]
+\# {
+\#   <option>
+\# }
+\#
+\# widget <widget_set> style <style_name>
+\# widget_class <widget_class_set> style <style_name>
+
+style "default"
+{
+  fontset = "$fontset"
+}
+
+widget_class "*" style "default"
+EOF
+        close(FILE);
+        print "Done.\n\n";
+    } else {
+        print <<EOF;
+Directory $path is not found. 
+Please execute "gimp" and install files into $path
+directory first. 
+
+EOF
+    exit;
+    }
+}
+
+sub main() {
+    my $lang = $ARGV[0];
+    my $tmp = ucfirst($lang);
+
+    print <<EOF;
+
+$progname - Font setting utility for GIMP ($version)
+
+EOF
+
+    if (@ARGV != 1) {
+	usage();
+	exit;
+    }
+
+    print "Setting for $tmp language...\n\n";
+
+    print qq(Please set "LANG" environment variable to "$locale{$lang}" and execute "gimp".\n\n);
+
+    if ($lang eq "slovak") {
+	print <<EOF;
+And please make symbolic link from lt_LN.ISO_8859-2 to sk_SK.ISO_8859-2 in 
+/usr/share/locale.
+
+EOF
+    }
+
+    write_gtkrc($fontset{$lang});
+
+    exit;
+}
+
+
+main();
diff --git a/graphics/gimp-app-devel/files/patch-aa b/graphics/gimp-app-devel/files/patch-aa
new file mode 100644
index 000000000000..411ac92c931b
--- /dev/null
+++ b/graphics/gimp-app-devel/files/patch-aa
@@ -0,0 +1,20 @@
+--- app/main.c.orig	Sun Oct  5 09:16:02 2003
++++ app/main.c	Mon Oct  6 12:14:34 2003
+@@ -23,6 +23,7 @@
+ #include <signal.h>
+ #include <string.h>
+ #include <sys/types.h>
++#include <floatingpoint.h>
+ 
+ #ifdef HAVE_SYS_WAIT_H
+ #include <sys/wait.h>
+@@ -113,6 +114,9 @@
+   /* Initialize variables */
+ 
+   full_prog_name = argv[0];
++
++  /* Ignore floating point exceptions */
++  fpsetmask(0);
+ 
+   /* Initialize i18n support */
+ 
diff --git a/graphics/gimp-app-devel/files/patch-ab b/graphics/gimp-app-devel/files/patch-ab
new file mode 100644
index 000000000000..9b41f6891b45
--- /dev/null
+++ b/graphics/gimp-app-devel/files/patch-ab
@@ -0,0 +1,13 @@
+--- plug-ins/common/url.c.orig	Thu Jun 26 15:45:03 2003
++++ plug-ins/common/url.c	Sat Jun 28 18:17:59 2003
+@@ -187,8 +187,8 @@
+       putenv ("LANG=C");
+ #endif
+ 
+-      execlp ("wget", "wget", "-T", TIMEOUT, filename, "-O", tmpname, NULL);
+-      g_message ("exec() failed: wget: %s", g_strerror (errno));
++      execlp ("fetch", "fetch", "-T", TIMEOUT, filename, "-p", "-o", tmpname, NULL);
++      g_message ("exec() failed: fetch: %s", g_strerror (errno));
+       g_free (tmpname);
+       _exit (127);
+     }
diff --git a/graphics/gimp-app-devel/files/patch-am b/graphics/gimp-app-devel/files/patch-am
new file mode 100644
index 000000000000..45c58cbe59fe
--- /dev/null
+++ b/graphics/gimp-app-devel/files/patch-am
@@ -0,0 +1,19 @@
+--- libgimp/gimp.c.orig	Fri May 12 12:37:27 2000
++++ libgimp/gimp.c	Thu May 18 16:42:21 2000
+@@ -26,6 +26,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/types.h>
++#include <floatingpoint.h>
+ 
+ #ifdef HAVE_SYS_TIME_H
+ #include <sys/time.h>
+@@ -211,6 +212,9 @@
+     }
+ 
+   progname = argv[0];
++
++  /* Ignore floating point exceptions */
++  fpsetmask(0);
+ 
+   g_set_prgname (g_basename (progname));
diff --git a/graphics/gimp-app-devel/files/patch-configure b/graphics/gimp-app-devel/files/patch-configure
new file mode 100644
index 000000000000..3d3ad15c49f5
--- /dev/null
+++ b/graphics/gimp-app-devel/files/patch-configure
@@ -0,0 +1,13 @@
+--- configure.orig	Sun Nov  7 10:44:21 2004
++++ configure	Sun Nov  7 10:45:48 2004
+@@ -33311,8 +33311,8 @@
+ fi
+ fi;
+ 
+-gimpdatadir="$datadir/$PACKAGE/2.0"
+-gimpplugindir="$libdir/$PACKAGE/2.0"
++gimpdatadir="$datadir/$PACKAGE"
++gimpplugindir="$libexecdir/$PACKAGE/2.0"
+ gimpsysconfdir="$sysconfdir/$PACKAGE/2.0"
+ 
+ localedir='${prefix}/${DATADIRNAME}/locale'
diff --git a/graphics/gimp-app-devel/files/patch-gimptool-2.0.in b/graphics/gimp-app-devel/files/patch-gimptool-2.0.in
new file mode 100644
index 000000000000..bb5c013c578e
--- /dev/null
+++ b/graphics/gimp-app-devel/files/patch-gimptool-2.0.in
@@ -0,0 +1,29 @@
+
+$FreeBSD$
+
+--- gimptool-2.0.in.orig	Tue Jan 15 12:21:05 2002
++++ gimptool-2.0.in	Fri May 17 20:46:18 2002
+@@ -215,19 +215,19 @@
+     | --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)
diff --git a/graphics/gimp-app-devel/files/patch-ltmain.sh b/graphics/gimp-app-devel/files/patch-ltmain.sh
new file mode 100644
index 000000000000..14cb2f8c753b
--- /dev/null
+++ b/graphics/gimp-app-devel/files/patch-ltmain.sh
@@ -0,0 +1,41 @@
+--- ltmain.sh.orig	Sun Sep  7 16:23:57 2003
++++ ltmain.sh	Sat Sep 13 01:29:14 2003
+@@ -1278,7 +1278,7 @@
+ 	  esac
+ 	elif test "X$arg" = "X-lc_r"; then
+ 	 case $host in
+-	 *-*-openbsd* | *-*-freebsd*)
++	 *-*-openbsd* | *-*-freebsd4*)
+ 	   # Do not include libc_r directly, use -pthread flag.
+ 	   continue
+ 	   ;;
+@@ -1288,8 +1288,16 @@
+ 	continue
+ 	;;
+ 
++      -pthread)
++	compile_command="$compile_command -pthread"
++	finalize_command="$finalize_command -pthread"
++	compiler_flags="$compiler_flags -pthread"
++	continue
++	;;
++
+       -module)
+ 	module=yes
++	build_old_libs=no
+ 	continue
+ 	;;
+ 
+@@ -5457,10 +5465,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/graphics/gimp-app-devel/files/patch-plug-ins_print_print.c b/graphics/gimp-app-devel/files/patch-plug-ins_print_print.c
new file mode 100644
index 000000000000..36f4bf7148cf
--- /dev/null
+++ b/graphics/gimp-app-devel/files/patch-plug-ins_print_print.c
@@ -0,0 +1,11 @@
+--- plug-ins/print/print.c.orig	Tue Dec 26 07:43:54 2000
++++ plug-ins/print/print.c	Tue Dec 26 07:44:07 2000
+@@ -1417,7 +1417,7 @@
+ 
+     if (i < (sizeof(lpcs) / sizeof(lpcs[0])))
+     {
+-      strcat(command, " status < /dev/null");
++      strcat(command, " status all < /dev/null");
+       type = PRINTERS_LPC;
+     }
+     else
-- 
cgit v1.2.3