4 files changed, 1290 insertions, 129 deletions

diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 48614c3c9b71..4ecc52c11049 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gimp
-PORTVERSION=	1.3.16
-PORTEPOCH=	1
+PORTVERSION=	1.3.17
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/%SUBDIR%/ \
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index fa3249fb5863..7e76f3a356c8 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.3.16.tar.bz2) = ccee1733b0f36320b248913274b586e2
+MD5 (gimp-1.3.17.tar.bz2) = d1fe81d77d9860ab47fda6f298cbf89a
diff --git a/graphics/gimp/files/patch-asm_old_gcc b/graphics/gimp/files/patch-asm_old_gcc
new file mode 100644
index 000000000000..56515dc5f61f
--- /dev/null
+++ b/graphics/gimp/files/patch-asm_old_gcc
@@ -0,0 +1,1139 @@
+--- app/composite/gimp-composite-mmx.c	Fri Jul 25 07:24:32 2003
++++ app/composite/gimp-composite-mmx.c	Sat Jul 26 03:29:59 2003
+@@ -165,7 +165,7 @@
+   asm volatile ("movq    %0,%%mm0"    
+ 																: /* empty */
+ 																: "m" (rgba8_alpha_mask)
+-																: "%mm0");
++																/* : "%mm0" */ );
+ 
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+     asm ("  movq    (%0), %%mm2; addl $8, %0\n"
+@@ -180,7 +180,7 @@
+ 									"\tmovq    %%mm1, (%2); addl $8, %2\n"
+ 									: "+r" (op.A), "+r" (op.B), "+r" (op.D)
+ 									: /* empty */
+-									: "0", "1", "2", "%mm0", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7");
++									/* : "0", "1", "2", "%mm0", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7" */ );
+   }
+ 
+   if (op.n_pixels) {
+@@ -196,7 +196,7 @@
+         "\tmovd    %%mm1, (%2);\n"
+         : /* empty */
+         : "r" (op.A), "r" (op.B), "r" (op.D)
+-        : "0", "1", "2", "%mm0", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7");
++        : "0", "1", "2" /* , "%mm0", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7"i */ );
+   }
+ 
+   asm("emms");
+@@ -209,7 +209,7 @@
+   asm volatile ("movq   %0,%%mm1"
+       : /* empty */
+       : "m" (rgba8_alpha_mask)
+-      : "%mm1");
++      /* : "%mm1" */ );
+ 
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+     asm ("  movq      (%0),%%mm0; addl $8,%0\n"
+@@ -258,7 +258,7 @@
+ 									"\tmovq      %%mm7,(%2); addl $8,%2\n"
+ 									: "+r" (op.A), "+r" (op.B), "+r" (op.D)
+ 									: "m" (rgba8_b255), "m" (rgba8_w1), "m" (rgba8_w255), "m" (rgba8_alpha_mask)
+-									: "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++									: "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+ 
+   if (op.n_pixels) {
+@@ -308,7 +308,7 @@
+                   "\tmovd      %%mm7,(%2)\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B), "r" (op.D), "m" (rgba8_b255), "m" (rgba8_w1), "m" (rgba8_w255), "m" (rgba8_alpha_mask)
+-                  : "0", "1", "2", "%mm0", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7");
++                  : "0", "1", "2" /* , "%mm0", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7" */ );
+   }
+ 
+   asm("emms");
+@@ -319,7 +319,7 @@
+ {
+   GimpCompositeContext op = *_op;
+ 
+-  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) : "%mm0");
++  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) /* : "%mm0" */ );
+ 
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+     asm volatile ("  movq    (%0), %%mm2; addl  $8, %0\n"
+@@ -329,7 +329,7 @@
+                   "\tmovq    %%mm1, (%2); addl  $8, %2\n"
+                   : "+r" (op.A), "+S" (op.B), "+D" (op.D)
+                   : /* empty */
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++                  : "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+ 
+   if (op.n_pixels) {
+@@ -339,7 +339,7 @@
+                   "\tmovd    %%mm1, (%2);\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B), "r" (op.D)
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++                  : "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+ 
+   asm("emms");
+@@ -358,7 +358,7 @@
+ 									"\tmovq    %%mm2, (%2); addl  $8, %2\n"
+ 									: "+r" (op.A), "+S" (op.B), "+D" (op.D)
+ 									: /* empty */
+-									: "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++									: "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+ 
+   if (op.n_pixels) {
+@@ -368,7 +368,7 @@
+                   "\tmovd    %%mm2, (%2);\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B), "r" (op.D)
+-                  : "0", "1", "2", "%mm2", "%mm3", "%mm4");
++                  : "0", "1", "2" /* , "%mm2", "%mm3", "%mm4" */ );
+   }
+         
+   asm("emms");
+@@ -379,7 +379,7 @@
+ {
+   GimpCompositeContext op = *_op;
+ 
+-  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) : "%mm0");
++  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) /* : "%mm0" */ );
+ 
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+     asm ("  movq    (%0), %%mm2; addl $8, %0\n"
+@@ -397,7 +397,7 @@
+ 									"\tmovq    %%mm1, (%2); addl $8, %2\n"
+ 									: "+r" (op.A), "+r" (op.B), "+r" (op.D)
+ 									: /* empty */
+-									: "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++									: "0", "1", "2" /*, "%mm1", "%mm2", "%mm3", "%mm4" */);
+   }
+   
+   if (op.n_pixels) {
+@@ -416,7 +416,7 @@
+                   "\tmovd    %%mm1, (%2);\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B), "r" (op.D)
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++                  : "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+ 
+   asm("emms");
+@@ -428,7 +428,7 @@
+ {
+   GimpCompositeContext op = *_op;
+ 
+-  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) : "%mm0");
++  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) /* : "%mm0" */ );
+ 
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+     asm volatile ("\tmovq    (%0), %%mm2; addl $8, %0\n"
+@@ -437,7 +437,7 @@
+                   "\tmovq      %%mm1, (%2); addl $8, %2\n"
+                   : "+r" (op.A), "+r" (op.B), "+r" (op.D)
+                   : /* empty */
+-                  : "%eax", "%ecx", "%edx", "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5");
++                  : "%eax", "%ecx", "%edx", "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4", "%mm5" */ );
+   }
+ 
+   if (op.n_pixels) {
+@@ -447,7 +447,7 @@
+                   "\tmovd      %%mm1, (%2);\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B), "r" (op.D)
+-                  : "%eax", "%ecx", "%edx", "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5");
++                  : "%eax", "%ecx", "%edx", "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4", "%mm5" */ );
+   }
+ 
+   asm("emms");
+@@ -462,7 +462,7 @@
+       "\tmovq    %1, %%mm7\n"
+       :
+       : "m" (rgba8_alpha_mask), "m" (rgba8_w1)
+-      : "%mm0", "%mm7");
++      /* : "%mm0", "%mm7" */ );
+   
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+     asm volatile ("  movq    (%0), %%mm0; addl $8, %0\n"
+@@ -502,7 +502,7 @@
+                   "\tmovq      %%mm3,(%2); addl $8, %2\n"
+                   : "+r" (op.A), "+r" (op.B), "+r" (op.D)
+                   : "m" (rgba8_alpha_mask)
+-                  : "%eax", "%ecx", "%edx", "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5");
++                  : "%eax", "%ecx", "%edx", "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4", "%mm5" */ );
+   }
+ 
+   if (op.n_pixels) {
+@@ -543,7 +543,7 @@
+                   "\tmovd      %%mm3,(%2); addl $8, %2\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B), "r" (op.D), "m" (rgba8_alpha_mask)
+-                  : "%eax", "%ecx", "%edx", "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5");
++                  : "%eax", "%ecx", "%edx", "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4", "%mm5" */ );
+   }
+ 
+   asm("emms");
+@@ -593,7 +593,7 @@
+                   "\tmovq    %%mm7, (%2); addl $8, %2\n"
+                   : "+r" (op.A), "+r" (op.B), "+r" (op.D)
+                   : /* empty */
+-                  : "0", "1", "2", "%mm0", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7");
++                  : "0", "1", "2" /* , "%mm0", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7" */ );
+   }
+ 
+   if (op.n_pixels) {
+@@ -632,7 +632,7 @@
+                   "\tmovd    %%mm7, (%2);\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B), "r" (op.D)
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5");
++                  : "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4", "%mm5" */ );
+   }
+ 
+   asm("emms");
+@@ -643,9 +643,9 @@
+ {
+   GimpCompositeContext op = *_op;
+ 
+-  asm volatile ("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) : "%mm0");
+-  asm volatile ("pxor    %%mm6,%%mm6"  :  :                        : "%mm6");
+-  asm volatile ("movq    %0,%%mm7"     :  : "m" (rgba8_w128)       : "%mm7");
++  asm volatile ("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) /* : "%mm0" */ );
++  asm volatile ("pxor    %%mm6,%%mm6"  :  :                        /* : "%mm6" */ );
++  asm volatile ("movq    %0,%%mm7"     :  : "m" (rgba8_w128)       /* : "%mm7" */ );
+ 
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+     asm ("  movq    (%0), %%mm2; addl $8, %0\n"
+@@ -680,7 +680,7 @@
+ 									"\tmovq      %%mm1, (%2); addl $8, %2\n"
+ 									: "+r" (op.A), "+r" (op.B), "+r" (op.D)
+ 									: /* empty */
+-									: "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++									: "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+ 
+   if (op.n_pixels) {
+@@ -716,7 +716,7 @@
+                   "\tmovd      %%mm1, (%2);\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B), "r" (op.D)
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++                  : "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+ 
+   asm("emms");
+@@ -728,9 +728,9 @@
+ {
+   GimpCompositeContext op = *_op;
+ 
+-  asm volatile ("movq    %0, %%mm0"     :  : "m" (rgba8_alpha_mask) : "%mm0");
+-  asm volatile ("pxor    %%mm6, %%mm6"  :  :                        : "%mm6");
+-  asm volatile ("movq    %0, %%mm7"     :  : "m" (rgba8_w128)       : "%mm7");
++  asm volatile ("movq    %0, %%mm0"     :  : "m" (rgba8_alpha_mask) /* : "%mm0" */ );
++  asm volatile ("pxor    %%mm6, %%mm6"  :  :                        /* : "%mm6" */ );
++  asm volatile ("movq    %0, %%mm7"     :  : "m" (rgba8_w128)       /* : "%mm7" */ );
+ 
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+     asm ("  movq    (%0), %%mm2; addl $8, %0\n"
+@@ -765,7 +765,7 @@
+ 									"\tmovq      %%mm1, (%2); addl $8, %2\n"
+ 									: "+r" (op.A), "+r" (op.B), "+r" (op.D)
+ 									: /* empty */
+-									: "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++									: "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+ 
+   if (op.n_pixels) {
+@@ -801,7 +801,7 @@
+                   "\tmovd      %%mm1, (%2);\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B), "r" (op.D)
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++                  : "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+ 
+   asm("emms");
+@@ -813,7 +813,7 @@
+ {
+   GimpCompositeContext op = *_op;
+ 
+-  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) : "%mm0");
++  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) /* : "%mm0" */ );
+ 
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+ 
+@@ -832,7 +832,7 @@
+ {
+   GimpCompositeContext op = *_op;
+ 
+-  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) : "%mm0");
++  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) /* : "%mm0" */ );
+ 
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+ 
+@@ -850,7 +850,7 @@
+ {
+   GimpCompositeContext op = *_op;
+ 
+-  asm volatile ("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) : "%mm0");
++  asm volatile ("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) /* : "%mm0" */ );
+ 
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+     asm ("  movq     (%0), %%mm2; addl $8, %0\n"
+@@ -865,7 +865,7 @@
+ 									"\tmovq    %%mm1, (%2); addl $8, %2\n"
+ 									: "+r" (op.A), "+r" (op.B), "+r" (op.D)
+ 									: /* empty */
+-									: "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5");
++									: "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4", "%mm5" */);
+   }
+ 
+   if (op.n_pixels) {
+@@ -884,7 +884,7 @@
+                   "\tmovd    %%mm1, (%2)\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B), "r" (op.D)
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5");
++                  : "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4", "%mm5" */ );
+   }
+ 
+   asm("emms");
+@@ -895,9 +895,9 @@
+ {
+   GimpCompositeContext op = *_op;
+ 
+-  asm volatile ("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) : "%mm0");
+-  asm volatile ("movq    %0,%%mm7"     :  : "m" (rgba8_w128) : "%mm7");
+-  asm volatile ("pxor    %%mm6,%%mm6"  :  :  : "%mm6");
++  asm volatile ("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) /* : "%mm0" */ );
++  asm volatile ("movq    %0,%%mm7"     :  : "m" (rgba8_w128) /* : "%mm7" */ );
++  asm volatile ("pxor    %%mm6,%%mm6"  :  :  /* : "%mm6" */ );
+ 
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+     asm ("  movq     (%0), %%mm2; addl $8, %0\n"
+@@ -929,7 +929,7 @@
+ 									"\tmovq    %%mm1, (%2); addl $8, %2\n"
+ 									: "+r" (op.A), "+r" (op.B), "+r" (op.D)
+ 									: /* empty */
+-									: "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5");
++									: "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4", "%mm5" */);
+   }
+ 
+   if (op.n_pixels) {
+@@ -962,7 +962,7 @@
+                   "\tmovd    %%mm1, (%2)\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B), "r" (op.D)
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5");
++                  : "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4", "%mm5" */);
+   }
+ 
+   asm("emms");
+@@ -1071,7 +1071,7 @@
+ {
+   GimpCompositeContext op = *_op;
+ 
+-  asm volatile ("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) : "%mm0");
++  asm volatile ("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) /* : "%mm0" */);
+ 
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+     asm ("  movq    (%0), %%mm2; addl  $8, %0\n"
+@@ -1082,7 +1082,7 @@
+ 									"\tmovq    %%mm1, (%2); addl  $8, %2\n"
+ 									: "+r" (op.A), "+S" (op.B), "+D" (op.D)
+ 									: /* empty */
+-									: "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++									: "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+ 
+   if (op.n_pixels) {
+@@ -1094,7 +1094,7 @@
+                   "\tmovd    %%mm1, (%2);\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B), "r" (op.D)
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++                  : "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+ 
+   asm("emms");
+@@ -1105,7 +1105,7 @@
+ {
+   GimpCompositeContext op = *_op;
+ 
+-  asm volatile ("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) : "%mm0");
++  asm volatile ("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) /* : "%mm0" */ );
+ 
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+     asm ("  movq    (%0), %%mm2; addl  $8, %0\n"
+@@ -1114,7 +1114,7 @@
+ 									"\tmovq    %%mm1, (%2); addl  $8, %2\n"
+ 									: "+r" (op.A), "+S" (op.B), "+D" (op.D)
+ 									: /* empty */
+-									: "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++									: "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+ 
+   if (op.n_pixels) {
+@@ -1124,7 +1124,7 @@
+                   "\tmovd    %%mm1, (%2);\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B), "r" (op.D)
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++                  : "0", "1", "2" /*, "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+ 
+   asm("emms");
+@@ -1147,7 +1147,7 @@
+                 "\tmovq  %1,%%mm7\n"
+                 : /* empty */
+                 : "m" (op.scale.scale), "m" (rgba8_w128)
+-                : "%eax", "%mm0", "%mm5", "%mm6", "%mm7");
++                : "%eax" /*, "%mm0", "%mm5", "%mm6", "%mm7" */ );
+ 
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+     asm ("movq      (%0),%%mm2; addl $8,%0\n"
+@@ -1168,7 +1168,7 @@
+ 									"\tmovq    %%mm1,(%1);  addl $8,%1\n"
+ 									: "+r" (op.A), "+r" (op.D)
+ 									: /* empty */
+-									: "0", "1", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7");
++									: "0", "1" /* , "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7" */ );
+   }
+ 
+   if (op.n_pixels) {
+@@ -1183,7 +1183,7 @@
+                   "\tmovd    %%mm1,(%1)\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.D)
+-                  : "0", "1", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7");
++                  : "0", "1" /* , "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7" */ );
+   }
+ 
+   asm("emms");
+@@ -1194,8 +1194,8 @@
+ {
+   GimpCompositeContext op = *_op;
+ 
+-  asm volatile ("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) : "%mm0");
+-  asm volatile ("movq    %0,%%mm7"     :  : "m" (rgba8_w128)  : "%mm7");
++  asm volatile ("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) /* : "%mm0" */);
++  asm volatile ("movq    %0,%%mm7"     :  : "m" (rgba8_w128)  /* : "%mm7" */ );
+   asm volatile ("pxor    %mm6, %mm6");
+ 
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+@@ -1246,7 +1246,7 @@
+ 									"\tmovq    %%mm1, (%2); addl $8, %2\n"
+ 									: "+r" (op.A), "+r" (op.B), "+r" (op.D)
+ 									: /* empty */
+-									: "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5");
++									: "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4", "%mm5" */ );
+   }
+ 
+   if (op.n_pixels) {
+@@ -1297,7 +1297,7 @@
+                   "\tmovd    %%mm1, (%2);\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B), "r" (op.D)
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5");
++                  : "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4", "%mm5" */ );
+   }
+ 
+   asm("emms");
+@@ -1308,7 +1308,7 @@
+ {
+   GimpCompositeContext op = *_op;
+ 
+-  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) : "%mm0");
++  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) /* : "%mm0" */ );
+ 
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+     asm volatile ("  movq    (%0), %%mm2; addl  $8, %0\n"
+@@ -1318,7 +1318,7 @@
+                   "\tmovq    %%mm1, (%2); addl  $8, %2\n"
+                   : "+r" (op.A), "+S" (op.B), "+D" (op.D)
+                   : /* empty */
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++                  : "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4" */);
+   }
+ 
+   if (op.n_pixels) {
+@@ -1328,7 +1328,7 @@
+                   "\tmovd    %%mm1, (%2);\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B), "r" (op.D)
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++                  : "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4" */);
+   }
+   
+   asm("emms");
+@@ -1339,7 +1339,7 @@
+ {
+   GimpCompositeContext op = *_op;
+ 
+-  asm volatile ("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) : "%mm0");
++  asm volatile ("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) /* : "%mm0" */);
+ 
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+     asm ("  movq     (%0), %%mm2; addl $8, %0\n"
+@@ -1358,7 +1358,7 @@
+ 									"\tmovq    %%mm1, (%2); addl $8, %2\n"
+ 									: "+r" (op.A), "+r" (op.B), "+r" (op.D)
+ 									: /* empty */
+-									: "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5");
++									: "0", "1", "2" /*, "%mm1", "%mm2", "%mm3", "%mm4", "%mm5" */ );
+   }
+ 
+   if (op.n_pixels) {
+@@ -1378,7 +1378,7 @@
+                   "\tmovd    %%mm1, (%2); addl $8, %2\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B), "r" (op.D)
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5");
++                  : "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4", "%mm5" */ );
+   }
+ 
+   asm("emms");
+@@ -1398,7 +1398,7 @@
+ 									"\taddl    $8, %1\n"
+ 									: "+r" (op.A), "+r" (op.B)
+ 									: /* empty */
+-									: "0", "1", "%mm1", "%mm2", "%mm3", "%mm4");
++									: "0", "1" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+ 
+   if (op.n_pixels) {
+@@ -1408,7 +1408,7 @@
+                   "\tmovd    %%mm2, (%1)\n"                  
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B)
+-                  : "0", "1", "%mm1", "%mm2", "%mm3", "%mm4");
++                  : "0", "1" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+   
+   asm("emms");
+@@ -1419,7 +1419,7 @@
+ {
+   GimpCompositeContext op = *_op;
+ 
+-  asm volatile ("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) : "%mm0");
++  asm volatile ("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) /* : "%mm0" */ );
+ 
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+     asm ("  movq    (%0), %%mm2; addl  $8, %0\n"
+@@ -1428,7 +1428,7 @@
+ 									"\tmovq    %%mm1, (%2); addl  $8, %2\n"
+ 									: "+r" (op.A), "+S" (op.B), "+D" (op.D)
+ 									: /* empty */
+-									: "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++									: "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+ 
+   if (op.n_pixels) {
+@@ -1438,7 +1438,7 @@
+                   "\tmovd    %%mm1, (%2);\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B), "r" (op.D)
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++                  : "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+   
+   asm("emms");
+@@ -1538,7 +1538,7 @@
+   asm("movq   %0,%%mm1"
+       :
+       : "m" (va8_alpha_mask)
+-      : "%mm1");
++      /* : "%mm1" */ );
+ 
+   for (; op.n_pixels >= 4; op.n_pixels -= 4) {
+     asm volatile ("  movq      (%0),%%mm0; addl $8,%0\n"
+@@ -1587,7 +1587,7 @@
+                   "\tmovq      %%mm7,(%2); addl $8,%2\n"
+                   : "+r" (op.A), "+r" (op.B), "+r" (op.D)
+                   : "m" (va8_b255), "m" (va8_w1), "m" (va8_w255), "m" (va8_alpha_mask)
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++                  : "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+ 
+   if (op.n_pixels) {
+@@ -1637,7 +1637,7 @@
+                   "\tmovd      %%mm7,(%2)\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B), "r" (op.D), "m" (va8_b255), "m" (va8_w1), "m" (va8_w255), "m" (va8_alpha_mask)
+-                  : "0", "1", "2", "%mm0", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7");
++                  : "0", "1", "2" /* , "%mm0", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7" */ );
+   }
+ 
+   asm("emms");
+--- app/composite/gimp-composite-sse.c	Fri Jul 25 07:24:32 2003
++++ app/composite/gimp-composite-sse.c	Sat Jul 26 03:29:59 2003
+@@ -155,7 +155,7 @@
+   asm volatile ("movq    %0,%%mm0"    
+ 																: /* empty */
+ 																: "m" (rgba8_alpha_mask)
+-																: "%mm0");
++																/* : "%mm0" */ );
+ 
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+     asm ("  movq    (%0), %%mm2; addl $8, %0\n"
+@@ -170,7 +170,7 @@
+ 									"\tmovq    %%mm1, (%2); addl $8, %2\n"
+ 									: "+r" (op.A), "+r" (op.B), "+r" (op.D)
+ 									: /* empty */
+-									: "0", "1", "2", "%mm0", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7");
++									: "0", "1", "2" /* , "%mm0", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7" */ );
+   }
+ 
+   if (op.n_pixels) {
+@@ -186,7 +186,7 @@
+         "\tmovd    %%mm1, (%2);\n"
+         : /* empty */
+         : "r" (op.A), "r" (op.B), "r" (op.D)
+-        : "0", "1", "2", "%mm0", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7");
++        : "0", "1", "2" /* , "%mm0", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7" */ );
+   }
+ 
+   asm("emms");
+@@ -199,7 +199,7 @@
+   asm volatile ("movq   %0,%%mm1"
+       : /* empty */
+       : "m" (rgba8_alpha_mask)
+-      : "%mm1");
++      /* : "%mm1" */ );
+ 
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+     asm ("  movq      (%0),%%mm0; addl $8,%0\n"
+@@ -248,7 +248,7 @@
+ 									"\tmovq      %%mm7,(%2); addl $8,%2\n"
+ 									: "+r" (op.A), "+r" (op.B), "+r" (op.D)
+ 									: "m" (rgba8_b255), "m" (rgba8_w1), "m" (rgba8_w255), "m" (rgba8_alpha_mask)
+-									: "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++									: "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+ 
+   if (op.n_pixels) {
+@@ -298,7 +298,7 @@
+                   "\tmovd      %%mm7,(%2)\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B), "r" (op.D), "m" (rgba8_b255), "m" (rgba8_w1), "m" (rgba8_w255), "m" (rgba8_alpha_mask)
+-                  : "0", "1", "2", "%mm0", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7");
++                  : "0", "1", "2" /* , "%mm0", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7" */ );
+   }
+ 
+   asm("emms");
+@@ -309,7 +309,7 @@
+ {
+   GimpCompositeContext op = *_op;
+ 
+-  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) : "%mm0");
++  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) /* : "%mm0" */ );
+ 
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+     asm volatile ("  movq    (%0), %%mm2; addl  $8, %0\n"
+@@ -319,7 +319,7 @@
+                   "\tmovq    %%mm1, (%2); addl  $8, %2\n"
+                   : "+r" (op.A), "+S" (op.B), "+D" (op.D)
+                   : /* empty */
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++                  : "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+ 
+   if (op.n_pixels) {
+@@ -329,7 +329,7 @@
+                   "\tmovd    %%mm1, (%2);\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B), "r" (op.D)
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++                  : "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+ 
+   asm("emms");
+@@ -348,7 +348,7 @@
+ 									"\tmovq    %%mm2, (%2); addl  $8, %2\n"
+ 									: "+r" (op.A), "+S" (op.B), "+D" (op.D)
+ 									: /* empty */
+-									: "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++									: "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+ 
+   if (op.n_pixels) {
+@@ -358,7 +358,7 @@
+                   "\tmovd    %%mm2, (%2);\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B), "r" (op.D)
+-                  : "0", "1", "2", "%mm2", "%mm3", "%mm4");
++                  : "0", "1", "2" /* , "%mm2", "%mm3", "%mm4" */ );
+   }
+         
+   asm("emms");
+@@ -369,7 +369,7 @@
+ {
+   GimpCompositeContext op = *_op;
+ 
+-  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) : "%mm0");
++  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) /* : "%mm0" */ );
+ 
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+     asm ("  movq    (%0), %%mm2; addl $8, %0\n"
+@@ -387,7 +387,7 @@
+ 									"\tmovq    %%mm1, (%2); addl $8, %2\n"
+ 									: "+r" (op.A), "+r" (op.B), "+r" (op.D)
+ 									: /* empty */
+-									: "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++									: "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+   
+   if (op.n_pixels) {
+@@ -406,7 +406,7 @@
+                   "\tmovd    %%mm1, (%2);\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B), "r" (op.D)
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++                  : "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+ 
+   asm("emms");
+@@ -418,7 +418,7 @@
+ {
+   GimpCompositeContext op = *_op;
+ 
+-  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) : "%mm0");
++  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) /* : "%mm0" */ );
+ 
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+     asm volatile ("\tmovq    (%0), %%mm2; addl $8, %0\n"
+@@ -427,7 +427,7 @@
+                   "\tmovq      %%mm1, (%2); addl $8, %2\n"
+                   : "+r" (op.A), "+r" (op.B), "+r" (op.D)
+                   : /* empty */
+-                  : "%eax", "%ecx", "%edx", "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5");
++                  : "%eax", "%ecx", "%edx", "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4", "%mm5" */ );
+   }
+ 
+   if (op.n_pixels) {
+@@ -437,7 +437,7 @@
+                   "\tmovd      %%mm1, (%2);\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B), "r" (op.D)
+-                  : "%eax", "%ecx", "%edx", "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5");
++                  : "%eax", "%ecx", "%edx", "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4", "%mm5" */ );
+   }
+ 
+   asm("emms");
+@@ -452,7 +452,7 @@
+       "\tmovq    %1, %%mm7\n"
+       :
+       : "m" (rgba8_alpha_mask), "m" (rgba8_w1)
+-      : "%mm0", "%mm7");
++      /* : "%mm0", "%mm7" */ );
+   
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+     asm volatile ("  movq    (%0), %%mm0; addl $8, %0\n"
+@@ -492,7 +492,7 @@
+                   "\tmovq      %%mm3,(%2); addl $8, %2\n"
+                   : "+r" (op.A), "+r" (op.B), "+r" (op.D)
+                   : "m" (rgba8_alpha_mask)
+-                  : "%eax", "%ecx", "%edx", "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5");
++                  : "%eax", "%ecx", "%edx", "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4", "%mm5" */ );
+   }
+ 
+   if (op.n_pixels) {
+@@ -533,7 +533,7 @@
+                   "\tmovd      %%mm3,(%2); addl $8, %2\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B), "r" (op.D), "m" (rgba8_alpha_mask)
+-                  : "%eax", "%ecx", "%edx", "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5");
++                  : "%eax", "%ecx", "%edx", "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4", "%mm5" */ );
+   }
+ 
+   asm("emms");
+@@ -583,7 +583,7 @@
+                   "\tmovq    %%mm7, (%2); addl $8, %2\n"
+                   : "+r" (op.A), "+r" (op.B), "+r" (op.D)
+                   : /* empty */
+-                  : "0", "1", "2", "%mm0", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7");
++                  : "0", "1", "2" /* , "%mm0", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7" */ );
+   }
+ 
+   if (op.n_pixels) {
+@@ -622,7 +622,7 @@
+                   "\tmovd    %%mm7, (%2);\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B), "r" (op.D)
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5");
++                  : "0", "1" , "2" /* , "%mm1", "%mm2", "%mm3", "%mm4", "%mm5" */ );
+   }
+ 
+   asm("emms");
+@@ -633,9 +633,9 @@
+ {
+   GimpCompositeContext op = *_op;
+ 
+-  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) : "%mm0");
+-  asm("pxor    %%mm6,%%mm6"  :  :                        : "%mm6");
+-  asm("movq    %0,%%mm7"     :  : "m" (rgba8_w128)       : "%mm7");
++  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) /* : "%mm0" */ );
++  asm("pxor    %%mm6,%%mm6"  :  :                        /* : "%mm6" */ );
++  asm("movq    %0,%%mm7"     :  : "m" (rgba8_w128)       /* : "%mm7" */ );
+ 
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+     asm volatile ("  movq    (%0), %%mm2; addl $8, %0\n"
+@@ -670,7 +670,7 @@
+                   "\tmovq      %%mm1, (%2); addl $8, %2\n"
+                   : "+r" (op.A), "+r" (op.B), "+r" (op.D)
+                   : /* empty */
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++                  : "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+ 
+   if (op.n_pixels) {
+@@ -706,7 +706,7 @@
+                   "\tmovd      %%mm1, (%2);\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B), "r" (op.D)
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++                  : "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+ 
+   asm("emms");
+@@ -718,9 +718,9 @@
+ {
+   GimpCompositeContext op = *_op;
+ 
+-  asm("movq    %0, %%mm0"     :  : "m" (rgba8_alpha_mask) : "%mm0");
+-  asm("pxor    %%mm6, %%mm6"  :  :                        : "%mm6");
+-  asm("movq    %0, %%mm7"     :  : "m" (rgba8_w128)       : "%mm7");
++  asm("movq    %0, %%mm0"     :  : "m" (rgba8_alpha_mask) /* : "%mm0" */ );
++  asm("pxor    %%mm6, %%mm6"  :  :                        /* : "%mm6" */ );
++  asm("movq    %0, %%mm7"     :  : "m" (rgba8_w128)       /* : "%mm7" */ );
+ 
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+     asm volatile ("  movq    (%0), %%mm2; addl $8, %0\n"
+@@ -755,7 +755,7 @@
+                   "\tmovq      %%mm1, (%2); addl $8, %2\n"
+                   : "+r" (op.A), "+r" (op.B), "+r" (op.D)
+                   : /* empty */
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++                  : "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+ 
+   if (op.n_pixels) {
+@@ -791,7 +791,7 @@
+                   "\tmovd      %%mm1, (%2);\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B), "r" (op.D)
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++                  : "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+ 
+   asm("emms");
+@@ -803,7 +803,7 @@
+ {
+   GimpCompositeContext op = *_op;
+ 
+-  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) : "%mm0");
++  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) /* : "%mm0" */ );
+ 
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+ 
+@@ -822,7 +822,7 @@
+ {
+   GimpCompositeContext op = *_op;
+ 
+-  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) : "%mm0");
++  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) /* : "%mm0" */ );
+ 
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+ 
+@@ -840,7 +840,7 @@
+ {
+   GimpCompositeContext op = *_op;
+ 
+-  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) : "%mm0");
++  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) /* : "%mm0" */ );
+ 
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+     asm volatile ("  movq     (%0), %%mm2; addl $8, %0\n"
+@@ -855,7 +855,7 @@
+                   "\tmovq    %%mm1, (%2); addl $8, %2\n"
+                   : "+r" (op.A), "+r" (op.B), "+r" (op.D)
+                   : /* empty */
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5");
++                  : "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4", "%mm5" */ );
+   }
+ 
+   if (op.n_pixels) {
+@@ -874,7 +874,7 @@
+                   "\tmovd    %%mm1, (%2)\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B), "r" (op.D)
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5");
++                  : "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4", "%mm5" */ );
+   }
+ 
+   asm("emms");
+@@ -885,9 +885,9 @@
+ {
+   GimpCompositeContext op = *_op;
+ 
+-  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) : "%mm0");
+-  asm("movq    %0,%%mm7"     :  : "m" (rgba8_w128) : "%mm7");
+-  asm("pxor    %%mm6,%%mm6"  :  :  : "%mm6");
++  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) /* : "%mm0" */ );
++  asm("movq    %0,%%mm7"     :  : "m" (rgba8_w128) /* : "%mm7" */ );
++  asm("pxor    %%mm6,%%mm6"  :  :  /* : "%mm6" */ );
+ 
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+     asm volatile ("  movq     (%0), %%mm2; addl $8, %0\n"
+@@ -919,7 +919,7 @@
+                   "\tmovq    %%mm1, (%2); addl $8, %2\n"
+                   : "+r" (op.A), "+r" (op.B), "+r" (op.D)
+                   : /* empty */
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5");
++                  : "0", "1" /* , "2", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5" */ );
+   }
+ 
+   if (op.n_pixels) {
+@@ -952,7 +952,7 @@
+                   "\tmovd    %%mm1, (%2)\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B), "r" (op.D)
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5");
++                  : "0", "1" /* , "2", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5" */ );
+   }
+ 
+   asm("emms");
+@@ -1061,7 +1061,7 @@
+ {
+   GimpCompositeContext op = *_op;
+ 
+-  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) : "%mm0");
++  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) /* : "%mm0" */ );
+ 
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+     asm volatile ("  movq    (%0), %%mm2; addl  $8, %0\n"
+@@ -1072,7 +1072,7 @@
+                   "\tmovq    %%mm1, (%2); addl  $8, %2\n"
+                   : "+r" (op.A), "+S" (op.B), "+D" (op.D)
+                   : /* empty */
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++                  : "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+ 
+   if (op.n_pixels) {
+@@ -1084,7 +1084,7 @@
+                   "\tmovd    %%mm1, (%2);\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B), "r" (op.D)
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++                  : "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+ 
+   asm("emms");
+@@ -1095,7 +1095,7 @@
+ {
+   GimpCompositeContext op = *_op;
+ 
+-  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) : "%mm0");
++  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) /* : "%mm0" */ );
+ 
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+     asm volatile ("  movq    (%0), %%mm2; addl  $8, %0\n"
+@@ -1105,7 +1105,7 @@
+                   "\tmovq    %%mm1, (%2); addl  $8, %2\n"
+                   : "+r" (op.A), "+S" (op.B), "+D" (op.D)
+                   : /* empty */
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++                  : "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+ 
+   if (op.n_pixels) {
+@@ -1115,7 +1115,7 @@
+                   "\tmovd    %%mm1, (%2);\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B), "r" (op.D)
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++                  : "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+ 
+   asm("emms");
+@@ -1138,7 +1138,7 @@
+                 "\tmovq  %1,%%mm7\n"
+                 : /* empty */
+                 : "m" (op.scale.scale), "m" (rgba8_w128)
+-                : "%eax", "%mm0", "%mm5", "%mm6", "%mm7");
++                : "%eax" /* , "%mm0", "%mm5", "%mm6", "%mm7" */ );
+ 
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+     asm volatile ("movq      (%0),%%mm2; addl $8,%0\n"
+@@ -1159,7 +1159,7 @@
+                   "\tmovq    %%mm1,(%1);  addl $8,%1\n"
+                   : "+r" (op.A), "+r" (op.D)
+                   : /* empty */
+-                  : "0", "1", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7");
++                  : "0", "1" /* , "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7" */ );
+ 
+   }
+ 
+@@ -1175,7 +1175,7 @@
+                   "\tmovd    %%mm1,(%1)\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.D)
+-                  : "0", "1", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7");
++                  : "0", "1" /* , "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7" */ );
+   }
+ 
+   asm("emms");
+@@ -1186,8 +1186,8 @@
+ {
+   GimpCompositeContext op = *_op;
+ 
+-  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) : "%mm0");
+-  asm("movq    %0,%%mm7"     :  : "m" (rgba8_w128)  : "%mm7");
++  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) /* : "%mm0" */ );
++  asm("movq    %0,%%mm7"     :  : "m" (rgba8_w128)  /* : "%mm7" */ );
+   asm("pxor    %mm6, %mm6");
+ 
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+@@ -1238,7 +1238,7 @@
+                   "\tmovq    %%mm1, (%2); addl $8, %2\n"
+                   : "+r" (op.A), "+r" (op.B), "+r" (op.D)
+                   : /* empty */
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5");
++                  : "0", "1", "2" /*, "%mm1", "%mm2", "%mm3", "%mm4", "%mm5" */ );
+   }
+ 
+   if (op.n_pixels) {
+@@ -1289,7 +1289,7 @@
+                   "\tmovd    %%mm1, (%2);\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B), "r" (op.D)
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5");
++                  : "0", "1", "2" /*, "%mm1", "%mm2", "%mm3", "%mm4", "%mm5" */ );
+   }
+ 
+   asm("emms");
+@@ -1300,7 +1300,7 @@
+ {
+   GimpCompositeContext op = *_op;
+ 
+-  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) : "%mm0");
++  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) /* : "%mm0" */ );
+ 
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+     asm volatile ("  movq    (%0), %%mm2; addl  $8, %0\n"
+@@ -1310,7 +1310,7 @@
+                   "\tmovq    %%mm1, (%2); addl  $8, %2\n"
+                   : "+r" (op.A), "+S" (op.B), "+D" (op.D)
+                   : /* empty */
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++                  : "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+ 
+   if (op.n_pixels) {
+@@ -1320,7 +1320,7 @@
+                   "\tmovd    %%mm1, (%2);\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B), "r" (op.D)
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++                  : "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+   
+   asm("emms");
+@@ -1331,7 +1331,7 @@
+ {
+   GimpCompositeContext op = *_op;
+ 
+-  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) : "%mm0");
++  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) /* : "%mm0" */ );
+ 
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+     asm volatile ("  movq     (%0), %%mm2; addl $8, %0\n"
+@@ -1350,7 +1350,7 @@
+                   "\tmovq    %%mm1, (%2); addl $8, %2\n"
+                   : "+r" (op.A), "+r" (op.B), "+r" (op.D)
+                   : /* empty */
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5");
++                  : "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4", "%mm5" */ );
+   }
+ 
+   if (op.n_pixels) {
+@@ -1370,7 +1370,7 @@
+                   "\tmovd    %%mm1, (%2); addl $8, %2\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B), "r" (op.D)
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5");
++                  : "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4", "%mm5" */ );
+   }
+ 
+   asm("emms");
+@@ -1390,7 +1390,7 @@
+                   "\taddl    $8, %1\n"
+                   : "+r" (op.A), "+r" (op.B)
+                   : /* empty */
+-                  : "0", "1", "%mm1", "%mm2", "%mm3", "%mm4");
++                  : "0", "1" /*, "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+ 
+   if (op.n_pixels) {
+@@ -1400,7 +1400,7 @@
+                   "\tmovd    %%mm2, (%1)\n"                  
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B)
+-                  : "0", "1", "%mm1", "%mm2", "%mm3", "%mm4");
++                  : "0", "1" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+   
+   asm("emms");
+@@ -1411,7 +1411,7 @@
+ {
+   GimpCompositeContext op = *_op;
+ 
+-  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) : "%mm0");
++  asm("movq    %0,%%mm0"     :  : "m" (rgba8_alpha_mask) /* : "%mm0" */ );
+ 
+   for (; op.n_pixels >= 2; op.n_pixels -= 2) {
+     asm volatile ("  movq    (%0), %%mm2; addl  $8, %0\n"
+@@ -1421,7 +1421,7 @@
+                   "\tmovq    %%mm1, (%2); addl  $8, %2\n"
+                   : "+r" (op.A), "+S" (op.B), "+D" (op.D)
+                   : /* empty */
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++                  : "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+ 
+   if (op.n_pixels) {
+@@ -1431,7 +1431,7 @@
+                   "\tmovd    %%mm1, (%2);\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B), "r" (op.D)
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++                  : "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+   
+   asm("emms");
+@@ -1580,7 +1580,7 @@
+                   "\tmovq      %%mm7,(%2); addl $8,%2\n"
+                   : "+r" (op.A), "+r" (op.B), "+r" (op.D)
+                   : "m" (va8_b255), "m" (va8_w1), "m" (va8_w255), "m" (va8_alpha_mask)
+-                  : "0", "1", "2", "%mm1", "%mm2", "%mm3", "%mm4");
++                  : "0", "1", "2" /* , "%mm1", "%mm2", "%mm3", "%mm4" */ );
+   }
+ 
+   if (op.n_pixels) {
+@@ -1630,7 +1630,7 @@
+                   "\tmovd      %%mm7,(%2)\n"
+                   : /* empty */
+                   : "r" (op.A), "r" (op.B), "r" (op.D), "m" (va8_b255), "m" (va8_w1), "m" (va8_w255), "m" (va8_alpha_mask)
+-                  : "0", "1", "2", "%mm0", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7");
++                  : "0", "1", "2" /* , "%mm0", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7" */ );
+   }
+ 
+   asm("emms");
diff --git a/graphics/gimp/pkg-plist b/graphics/gimp/pkg-plist
index 90b649cf2514..e6e2f670073e 100644
--- a/graphics/gimp/pkg-plist
+++ b/graphics/gimp/pkg-plist
@@ -11,6 +11,8 @@ include/gimp-1.3/gck/gck.h
 include/gimp-1.3/libgimp/gimp.h
 include/gimp-1.3/libgimp/gimp_pdb.h
 include/gimp-1.3/libgimp/gimpbrushes_pdb.h
+include/gimp-1.3/libgimp/gimpbrushmenu.h
+include/gimp-1.3/libgimp/gimpbrushselect.h
 include/gimp-1.3/libgimp/gimpbrushselect_pdb.h
 include/gimp-1.3/libgimp/gimpchannel.h
 include/gimp-1.3/libgimp/gimpchannel_pdb.h
@@ -25,9 +27,13 @@ include/gimp-1.3/libgimp/gimpenums.h
 include/gimp-1.3/libgimp/gimpexport.h
 include/gimp-1.3/libgimp/gimpfileops_pdb.h
 include/gimp-1.3/libgimp/gimpfloatingsel_pdb.h
+include/gimp-1.3/libgimp/gimpfontmenu.h
+include/gimp-1.3/libgimp/gimpfontselect.h
 include/gimp-1.3/libgimp/gimpfontselect_pdb.h
 include/gimp-1.3/libgimp/gimpgimprc_pdb.h
 include/gimp-1.3/libgimp/gimpgradients_pdb.h
+include/gimp-1.3/libgimp/gimpgradientmenu.h
+include/gimp-1.3/libgimp/gimpgradientselect.h
 include/gimp-1.3/libgimp/gimpgradientselect_pdb.h
 include/gimp-1.3/libgimp/gimpguides_pdb.h
 include/gimp-1.3/libgimp/gimphelp_pdb.h
@@ -48,6 +54,8 @@ include/gimp-1.3/libgimp/gimppalette_pdb.h
 include/gimp-1.3/libgimp/gimpparasite_pdb.h
 include/gimp-1.3/libgimp/gimppaths_pdb.h
 include/gimp-1.3/libgimp/gimppatterns_pdb.h
+include/gimp-1.3/libgimp/gimppatternmenu.h
+include/gimp-1.3/libgimp/gimppatternselect.h
 include/gimp-1.3/libgimp/gimppatternselect_pdb.h
 include/gimp-1.3/libgimp/gimppixelrgn.h
 include/gimp-1.3/libgimp/gimpplugin_pdb.h
@@ -77,6 +85,7 @@ include/gimp-1.3/libgimpbase/gimputils.h
 include/gimp-1.3/libgimpbase/gimpversion.h
 include/gimp-1.3/libgimpcolor/gimpadaptivesupersample.h
 include/gimp-1.3/libgimpcolor/gimpbilinear.h
+include/gimp-1.3/libgimpcolor/gimpcmyk.h
 include/gimp-1.3/libgimpcolor/gimpcolor.h
 include/gimp-1.3/libgimpcolor/gimpcolorspace.h
 include/gimp-1.3/libgimpcolor/gimpcolortypes.h
@@ -145,6 +154,7 @@ libexec/gimp/1.3/environ/default.env
 libexec/gimp/1.3/modules/libcdisplay_colorblind.so
 libexec/gimp/1.3/modules/libcdisplay_gamma.so
 libexec/gimp/1.3/modules/libcdisplay_highcontrast.so
+libexec/gimp/1.3/modules/libcolorsel_cmyk.so
 libexec/gimp/1.3/modules/libcolorsel_triangle.so
 libexec/gimp/1.3/modules/libcolorsel_water.so
 libexec/gimp/1.3/plug-ins/AlienMap
@@ -327,7 +337,7 @@ libexec/gimp/1.3/plug-ins/zealouscrop
 %%PYTHON:%%libexec/gimp/1.3/python/gimpui.py
 %%PYTHON:%%libexec/gimp/1.3/python/gimpui.pyc
 %%PYTHON:%%libexec/gimp/1.3/python/gimpui.pyo
-share/aclocal/gimp-1.4.m4
+share/aclocal/gimp-2.0.m4
 share/doc/gimp/libgimp/gimpdefinitions.html
 share/doc/gimp/libgimp/home.png
 share/doc/gimp/libgimp/index.html
@@ -335,6 +345,8 @@ share/doc/gimp/libgimp/index.sgml
 share/doc/gimp/libgimp/left.png
 share/doc/gimp/libgimp/libgimp-gimp.html
 share/doc/gimp/libgimp/libgimp-gimpbrushes.html
+share/doc/gimp/libgimp/libgimp-gimpbrushmenu.html
+share/doc/gimp/libgimp/libgimp-gimpbrushselect.html
 share/doc/gimp/libgimp/libgimp-gimpchannel.html
 share/doc/gimp/libgimp/libgimp-gimpcolor.html
 share/doc/gimp/libgimp/libgimp-gimpconvert.html
@@ -345,9 +357,12 @@ share/doc/gimp/libgimp/libgimp-gimpenums.html
 share/doc/gimp/libgimp/libgimp-gimpexport.html
 share/doc/gimp/libgimp/libgimp-gimpfileops.html
 share/doc/gimp/libgimp/libgimp-gimpfloatingsel.html
-share/doc/gimp/libgimp/libgimp-gimpfonts.html
+share/doc/gimp/libgimp/libgimp-gimpfontmenu.html
+share/doc/gimp/libgimp/libgimp-gimpfontselect.html
 share/doc/gimp/libgimp/libgimp-gimpgimprc.html
 share/doc/gimp/libgimp/libgimp-gimpgradients.html
+share/doc/gimp/libgimp/libgimp-gimpgradientmenu.html
+share/doc/gimp/libgimp/libgimp-gimpgradientselect.html
 share/doc/gimp/libgimp/libgimp-gimpguides.html
 share/doc/gimp/libgimp/libgimp-gimphelp.html
 share/doc/gimp/libgimp/libgimp-gimpimage.html
@@ -356,6 +371,8 @@ share/doc/gimp/libgimp/libgimp-gimpmenu.html
 share/doc/gimp/libgimp/libgimp-gimpmessage.html
 share/doc/gimp/libgimp/libgimp-gimppalette.html
 share/doc/gimp/libgimp/libgimp-gimppatterns.html
+share/doc/gimp/libgimp/libgimp-gimppatternmenu.html
+share/doc/gimp/libgimp/libgimp-gimppatternselect.html
 share/doc/gimp/libgimp/libgimp-gimppixelrgn.html
 share/doc/gimp/libgimp/libgimp-gimpplugin.html
 share/doc/gimp/libgimp/libgimp-gimpproceduraldb.html
@@ -397,6 +414,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-GimpColorSpace.html
+share/doc/gimp/libgimpcolor/libgimpcolor-GimpCMYK.html
 share/doc/gimp/libgimpcolor/libgimpcolor-GimpHSV.html
 share/doc/gimp/libgimpcolor/libgimpcolor-GimpRGB.html
 share/doc/gimp/libgimpcolor/libgimpcolor.devhelp
@@ -1172,6 +1190,7 @@ share/gimp/themes/Default/images/preferences/folders-modules.png
 share/gimp/themes/Default/images/preferences/folders-palettes.png
 share/gimp/themes/Default/images/preferences/folders-patterns.png
 share/gimp/themes/Default/images/preferences/folders-plug-ins.png
+share/gimp/themes/Default/images/preferences/folders-scripts.png
 share/gimp/themes/Default/images/preferences/folders-themes.png
 share/gimp/themes/Default/images/preferences/folders-tool-plug-ins.png
 share/gimp/themes/Default/images/preferences/folders.png
@@ -1413,130 +1432,134 @@ share/gimp/tips/gimp-tips.xml
 %%GNOME:%%share/gnome/application-registry/gimp-1.3.applications
 %%GNOME:%%share/gnome/applications/gimp-1.3.desktop
 %%GNOME:%%share/gnome/mime-info/gimp-1.3.keys
-share/locale/ca/LC_MESSAGES/gimp14-libgimp.mo
-share/locale/ca/LC_MESSAGES/gimp14-script-fu.mo
-share/locale/ca/LC_MESSAGES/gimp14-std-plug-ins.mo
-share/locale/ca/LC_MESSAGES/gimp14.mo
-share/locale/cs/LC_MESSAGES/gimp14-libgimp.mo
-share/locale/cs/LC_MESSAGES/gimp14-script-fu.mo
-share/locale/cs/LC_MESSAGES/gimp14-std-plug-ins.mo
-share/locale/cs/LC_MESSAGES/gimp14.mo
-share/locale/da/LC_MESSAGES/gimp14-libgimp.mo
-share/locale/da/LC_MESSAGES/gimp14-script-fu.mo
-share/locale/da/LC_MESSAGES/gimp14-std-plug-ins.mo
-share/locale/da/LC_MESSAGES/gimp14.mo
-share/locale/de/LC_MESSAGES/gimp14-libgimp.mo
-share/locale/de/LC_MESSAGES/gimp14-script-fu.mo
-share/locale/de/LC_MESSAGES/gimp14-std-plug-ins.mo
-share/locale/de/LC_MESSAGES/gimp14.mo
-share/locale/el/LC_MESSAGES/gimp14-libgimp.mo
-share/locale/el/LC_MESSAGES/gimp14-script-fu.mo
-share/locale/el/LC_MESSAGES/gimp14-std-plug-ins.mo
-share/locale/el/LC_MESSAGES/gimp14.mo
-share/locale/en_GB/LC_MESSAGES/gimp14-libgimp.mo
-share/locale/en_GB/LC_MESSAGES/gimp14-script-fu.mo
-share/locale/en_GB/LC_MESSAGES/gimp14-std-plug-ins.mo
-share/locale/en_GB/LC_MESSAGES/gimp14.mo
-share/locale/es/LC_MESSAGES/gimp14-libgimp.mo
-share/locale/es/LC_MESSAGES/gimp14-script-fu.mo
-share/locale/es/LC_MESSAGES/gimp14-std-plug-ins.mo
-share/locale/es/LC_MESSAGES/gimp14.mo
-share/locale/fi/LC_MESSAGES/gimp14-libgimp.mo
-share/locale/fi/LC_MESSAGES/gimp14-script-fu.mo
-share/locale/fi/LC_MESSAGES/gimp14-std-plug-ins.mo
-share/locale/fi/LC_MESSAGES/gimp14.mo
-share/locale/fr/LC_MESSAGES/gimp14-libgimp.mo
-share/locale/fr/LC_MESSAGES/gimp14-script-fu.mo
-share/locale/fr/LC_MESSAGES/gimp14-std-plug-ins.mo
-share/locale/fr/LC_MESSAGES/gimp14.mo
-share/locale/ga/LC_MESSAGES/gimp14-libgimp.mo
-share/locale/ga/LC_MESSAGES/gimp14-script-fu.mo
-share/locale/ga/LC_MESSAGES/gimp14-std-plug-ins.mo
-share/locale/ga/LC_MESSAGES/gimp14.mo
-share/locale/gl/LC_MESSAGES/gimp14-libgimp.mo
-share/locale/gl/LC_MESSAGES/gimp14-script-fu.mo
-share/locale/gl/LC_MESSAGES/gimp14-std-plug-ins.mo
-share/locale/gl/LC_MESSAGES/gimp14.mo
-share/locale/hr/LC_MESSAGES/gimp14-libgimp.mo
-share/locale/hr/LC_MESSAGES/gimp14-script-fu.mo
-share/locale/hr/LC_MESSAGES/gimp14-std-plug-ins.mo
-share/locale/hr/LC_MESSAGES/gimp14.mo
-share/locale/hu/LC_MESSAGES/gimp14-libgimp.mo
-share/locale/hu/LC_MESSAGES/gimp14-script-fu.mo
-share/locale/hu/LC_MESSAGES/gimp14-std-plug-ins.mo
-share/locale/hu/LC_MESSAGES/gimp14.mo
-share/locale/it/LC_MESSAGES/gimp14-libgimp.mo
-share/locale/it/LC_MESSAGES/gimp14-script-fu.mo
-share/locale/it/LC_MESSAGES/gimp14-std-plug-ins.mo
-share/locale/it/LC_MESSAGES/gimp14.mo
-share/locale/ja/LC_MESSAGES/gimp14-libgimp.mo
-share/locale/ja/LC_MESSAGES/gimp14-script-fu.mo
-share/locale/ja/LC_MESSAGES/gimp14-std-plug-ins.mo
-share/locale/ja/LC_MESSAGES/gimp14.mo
-share/locale/ko/LC_MESSAGES/gimp14-libgimp.mo
-share/locale/ko/LC_MESSAGES/gimp14-script-fu.mo
-share/locale/ko/LC_MESSAGES/gimp14-std-plug-ins.mo
-share/locale/ko/LC_MESSAGES/gimp14.mo
-share/locale/nl/LC_MESSAGES/gimp14-libgimp.mo
-share/locale/nl/LC_MESSAGES/gimp14-script-fu.mo
-share/locale/nl/LC_MESSAGES/gimp14-std-plug-ins.mo
-share/locale/nl/LC_MESSAGES/gimp14.mo
-share/locale/no/LC_MESSAGES/gimp14-libgimp.mo
-share/locale/no/LC_MESSAGES/gimp14-script-fu.mo
-share/locale/no/LC_MESSAGES/gimp14-std-plug-ins.mo
-share/locale/no/LC_MESSAGES/gimp14.mo
-share/locale/pl/LC_MESSAGES/gimp14-libgimp.mo
-share/locale/pl/LC_MESSAGES/gimp14-script-fu.mo
-share/locale/pl/LC_MESSAGES/gimp14-std-plug-ins.mo
-share/locale/pl/LC_MESSAGES/gimp14.mo
-share/locale/pt/LC_MESSAGES/gimp14-libgimp.mo
-share/locale/pt/LC_MESSAGES/gimp14-script-fu.mo
-share/locale/pt/LC_MESSAGES/gimp14-std-plug-ins.mo
-share/locale/pt/LC_MESSAGES/gimp14.mo
-share/locale/pt_BR/LC_MESSAGES/gimp14-libgimp.mo
-share/locale/pt_BR/LC_MESSAGES/gimp14-script-fu.mo
-share/locale/pt_BR/LC_MESSAGES/gimp14-std-plug-ins.mo
-share/locale/pt_BR/LC_MESSAGES/gimp14.mo
-share/locale/ro/LC_MESSAGES/gimp14-libgimp.mo
-share/locale/ro/LC_MESSAGES/gimp14-script-fu.mo
-share/locale/ro/LC_MESSAGES/gimp14-std-plug-ins.mo
-share/locale/ro/LC_MESSAGES/gimp14.mo
-share/locale/ru/LC_MESSAGES/gimp14-libgimp.mo
-share/locale/ru/LC_MESSAGES/gimp14-script-fu.mo
-share/locale/ru/LC_MESSAGES/gimp14-std-plug-ins.mo
-share/locale/ru/LC_MESSAGES/gimp14.mo
-share/locale/sk/LC_MESSAGES/gimp14-libgimp.mo
-share/locale/sk/LC_MESSAGES/gimp14-script-fu.mo
-share/locale/sk/LC_MESSAGES/gimp14-std-plug-ins.mo
-share/locale/sk/LC_MESSAGES/gimp14.mo
-share/locale/sv/LC_MESSAGES/gimp14-libgimp.mo
-share/locale/sv/LC_MESSAGES/gimp14-script-fu.mo
-share/locale/sv/LC_MESSAGES/gimp14-std-plug-ins.mo
-share/locale/sv/LC_MESSAGES/gimp14.mo
-share/locale/tr/LC_MESSAGES/gimp14-libgimp.mo
-share/locale/tr/LC_MESSAGES/gimp14-script-fu.mo
-share/locale/tr/LC_MESSAGES/gimp14-std-plug-ins.mo
-share/locale/tr/LC_MESSAGES/gimp14.mo
-share/locale/uk/LC_MESSAGES/gimp14-libgimp.mo
-share/locale/uk/LC_MESSAGES/gimp14-script-fu.mo
-share/locale/uk/LC_MESSAGES/gimp14-std-plug-ins.mo
-share/locale/uk/LC_MESSAGES/gimp14.mo
-share/locale/vi/LC_MESSAGES/gimp14-libgimp.mo
-share/locale/vi/LC_MESSAGES/gimp14-script-fu.mo
-share/locale/vi/LC_MESSAGES/gimp14-std-plug-ins.mo
-share/locale/vi/LC_MESSAGES/gimp14.mo
-share/locale/yi/LC_MESSAGES/gimp14-libgimp.mo
-share/locale/yi/LC_MESSAGES/gimp14-script-fu.mo
-share/locale/yi/LC_MESSAGES/gimp14-std-plug-ins.mo
-share/locale/yi/LC_MESSAGES/gimp14.mo
-share/locale/zh_CN/LC_MESSAGES/gimp14-libgimp.mo
-share/locale/zh_CN/LC_MESSAGES/gimp14-script-fu.mo
-share/locale/zh_CN/LC_MESSAGES/gimp14-std-plug-ins.mo
-share/locale/zh_CN/LC_MESSAGES/gimp14.mo
-share/locale/zh_TW/LC_MESSAGES/gimp14-libgimp.mo
-share/locale/zh_TW/LC_MESSAGES/gimp14-script-fu.mo
-share/locale/zh_TW/LC_MESSAGES/gimp14-std-plug-ins.mo
-share/locale/zh_TW/LC_MESSAGES/gimp14.mo
+share/locale/ca/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/ca/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/ca/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/ca/LC_MESSAGES/gimp20.mo
+share/locale/cs/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/cs/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/cs/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/cs/LC_MESSAGES/gimp20.mo
+share/locale/da/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/da/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/da/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/da/LC_MESSAGES/gimp20.mo
+share/locale/de/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/de/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/de/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/de/LC_MESSAGES/gimp20.mo
+share/locale/el/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/el/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/el/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/el/LC_MESSAGES/gimp20.mo
+share/locale/en_GB/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/en_GB/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/en_GB/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/en_GB/LC_MESSAGES/gimp20.mo
+share/locale/es/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/es/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/es/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/es/LC_MESSAGES/gimp20.mo
+share/locale/fi/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/fi/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/fi/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/fi/LC_MESSAGES/gimp20.mo
+share/locale/fr/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/fr/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/fr/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/fr/LC_MESSAGES/gimp20.mo
+share/locale/ga/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/ga/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/ga/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/ga/LC_MESSAGES/gimp20.mo
+share/locale/gl/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/gl/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/gl/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/gl/LC_MESSAGES/gimp20.mo
+share/locale/hr/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/hr/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/hr/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/hr/LC_MESSAGES/gimp20.mo
+share/locale/hu/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/hu/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/hu/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/hu/LC_MESSAGES/gimp20.mo
+share/locale/id/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/id/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/id/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/id/LC_MESSAGES/gimp20.mo
+share/locale/it/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/it/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/it/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/it/LC_MESSAGES/gimp20.mo
+share/locale/ja/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/ja/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/ja/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/ja/LC_MESSAGES/gimp20.mo
+share/locale/ko/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/ko/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/ko/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/ko/LC_MESSAGES/gimp20.mo
+share/locale/nl/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/nl/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/nl/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/nl/LC_MESSAGES/gimp20.mo
+share/locale/no/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/no/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/no/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/no/LC_MESSAGES/gimp20.mo
+share/locale/pl/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/pl/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/pl/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/pl/LC_MESSAGES/gimp20.mo
+share/locale/pt/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/pt/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/pt/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/pt/LC_MESSAGES/gimp20.mo
+share/locale/pt_BR/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/pt_BR/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/pt_BR/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/pt_BR/LC_MESSAGES/gimp20.mo
+share/locale/ro/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/ro/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/ro/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/ro/LC_MESSAGES/gimp20.mo
+share/locale/ru/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/ru/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/ru/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/ru/LC_MESSAGES/gimp20.mo
+share/locale/sk/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/sk/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/sk/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/sk/LC_MESSAGES/gimp20.mo
+share/locale/sv/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/sv/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/sv/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/sv/LC_MESSAGES/gimp20.mo
+share/locale/tr/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/tr/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/tr/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/tr/LC_MESSAGES/gimp20.mo
+share/locale/uk/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/uk/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/uk/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/uk/LC_MESSAGES/gimp20.mo
+share/locale/vi/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/vi/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/vi/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/vi/LC_MESSAGES/gimp20.mo
+share/locale/yi/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/yi/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/yi/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/yi/LC_MESSAGES/gimp20.mo
+share/locale/zh_CN/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/zh_CN/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/zh_CN/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/zh_CN/LC_MESSAGES/gimp20.mo
+share/locale/zh_TW/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/zh_TW/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/zh_TW/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm share/doc/gimp/libgimpwidgets
 @dirrm share/doc/gimp/libgimpmodule
 @dirrm share/doc/gimp/libgimpmath