[Gimp-developer] [PATCH] mandrake patches dump

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



hello, i'm the gimp maintainer in mandrake linux distribution.

here're the patches i currently apply on gimp-1.2.3:

explaination note for a default that make perl programmers behave
strangely with gimp. by default, gimp perl modules doesn't export
functions, which makes perl programmers became fool ...
--- plug-ins/perl/Gimp.pm.orig	Fri Nov  9 19:16:45 2001
+++ plug-ins/perl/Gimp.pm	Fri Nov  9 19:17:14 2001
@@ -651,8 +651,13 @@
 
 =head2 IMPORT TAGS
 
-If you don't specify any import tags, Gimp assumes C<qw/:consts main xlfd_size/>
-which is usually what you want.
+If you don't specify any import tags, Gimp assumes
+"qw/:consts main xlfd_size/" which is -NOT- usually
+what you want. You want to add :auto. You should thus
+use the following, for example:
+
+       use Gimp qw(:consts main xlfd_size :auto);
+
 
 =over 4
 
this one is needed so that perl plugins're able to be compiled :
--- gimp-1.1.23/plug-ins/perl/Gimp/Lib.xs.perlpath	Sat Jun  3 19:42:06 2000
+++ gimp-1.1.23/plug-ins/perl/Gimp/Lib.xs	Sat Jun  3 19:42:55 2000
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "../CORE/config.h"
 
 #include <assert.h>
 #include <stdio.h>
--- gimp-1.1.23/plug-ins/perl/UI/UI.xs.perlpath	Sat Jun  3 19:41:29 2000
+++ gimp-1.1.23/plug-ins/perl/UI/UI.xs	Sat Jun  3 19:41:40 2000
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "../CORE/config.h"
 
 /* dunno where this comes from */
 #undef VOIDUSED
--- gimp-1.1.23/plug-ins/perl/Net/Net.xs.perlpath	Sat Jun  3 19:43:04 2000
+++ gimp-1.1.23/plug-ins/perl/Net/Net.xs	Sat Jun  3 19:43:09 2000
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "../CORE/config.h"
 
 /* dunno where this comes from */
 #undef VOIDUSED
--- gimp-1.1.23/plug-ins/perl/Gimp.xs.perlpath	Sat Jun  3 19:41:48 2000
+++ gimp-1.1.23/plug-ins/perl/Gimp.xs	Sat Jun  3 19:41:55 2000
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "../CORE/config.h"
 
 #include <libgimp/gimp.h>
 #ifdef GIMP_HAVE_EXPORT
this one forces the font selection dialog to only accept scalable
fonts (which isneeded since gimp forces the dpi of the font to dpi of
the image, and so fails on non-scalable fonts) :

--- gimp-1.2.2-pre3/app/text_tool.c.pix	Sat Dec 16 20:38:38 2000
+++ gimp-1.2.2-pre3/app/text_tool.c	Fri Sep 21 01:02:31 2001
@@ -403,6 +403,13 @@
 {
   /* Create the shell */
   text_tool_shell = gtk_font_selection_dialog_new (_("Text Tool"));
+
+  /* As we need fully scalable font, only accept scalable fonts */
+  gtk_font_selection_dialog_set_filter(GTK_FONT_SELECTION_DIALOG(text_tool_shell), 
+				       GTK_FONT_FILTER_BASE, 
+				       GTK_FONT_SCALABLE, 
+				       NULL, NULL, NULL, NULL, NULL, NULL);
+
   gtk_window_set_wmclass (GTK_WINDOW (text_tool_shell), "text_tool", "Gimp");
   gtk_window_set_policy (GTK_WINDOW (text_tool_shell), FALSE, TRUE, FALSE);
   gtk_window_set_position (GTK_WINDOW (text_tool_shell), GTK_WIN_POS_MOUSE);
latest releases of wget print "Resolving hostname... done" which broke
some gimp assumptions (this patch also enforce old wget progress report):
--- gimp-1.2.3.orig/plug-ins/common/url.c
+++ gimp-1.2.3/plug-ins/common/url.c
@@ -189,7 +189,7 @@
       putenv ("LANG=C");
 #endif
 
-      execlp ("wget", "wget", "-T", TIMEOUT, filename, "-O", tmpname, NULL);
+      execlp ("wget", "wget", "--progress=dot", "-T", TIMEOUT, filename, "-O", tmpname, NULL);
       g_message ("url: exec() failed: wget: %s", g_strerror (errno));
       g_free (tmpname);
       _exit (127);
@@ -257,7 +257,17 @@
 
 	  DEBUG (buf);
 
+	  /*  New wget print "Resolving hostname... done." */
+	  if (fgets (buf, BUFSIZE, input) == NULL)
+	    {
+	      g_message ("url: wget exited abnormally on URL\n%s", filename);
+	      g_free (tmpname);
+	      *status = GIMP_PDB_EXECUTION_ERROR;
+	      return -1;
+	    }
+
+
-	  /*  The third line is "Connecting to..."  */
+	  /*  The fourth line is "Connecting to..."  */
 	  gimp_progress_init ("Connecting to server... "
 			      "(timeout is "TIMEOUT" seconds)");
 
@@ -275,7 +285,7 @@
 
 	  DEBUG (buf);
 
-	  /*  The fourth line is either the network request or an error  */
+	  /*  The fifth line is either the network request or an error  */
 	  gimp_progress_init ("Opening URL... "
 			      "(timeout is "TIMEOUT" seconds)");
 


i've also another patch that changes the dependancy on libmpeg to
libbmpeg but i won't submit it to you since not all distributions've
renamed mpeg_lib's libmpeg to libbmpeg (we did this in order to
prevent a clash with kdemutlimedia)

see you
-- 
"ca fait pas "homme" d'aller voir le medecin" (gc)

[Index of Archives]     [Video For Linux]     [Photo]     [Yosemite News]     [gtk]     [GIMP for Windows]     [KDE]     [GEGL]     [Gimp's Home]     [Gimp on GUI]     [Gimp on Windows]     [Steve's Art]

  Powered by Linux