From e50bf70b85fbd6d86875f61cca7f9743c20f2d4c Mon Sep 17 00:00:00 2001 From: Pav Lucistnik Date: Sun, 22 Oct 2006 17:36:11 +0000 Subject: [PATCH] - Fix a startup crash for anyone running non-latin-1 locale Approved by: portmgr (marcus) Obtained from: GIMP authors --- graphics/gimp-app/Makefile | 2 +- graphics/gimp-app/files/patch-plug-ins.c | 19 +++++++++++++++++++ graphics/gimp/Makefile | 2 +- graphics/gimp/files/patch-plug-ins.c | 19 +++++++++++++++++++ 4 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 graphics/gimp-app/files/patch-plug-ins.c create mode 100644 graphics/gimp/files/patch-plug-ins.c diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index 87d72307e68c..4a0434535bcd 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -7,7 +7,7 @@ PORTNAME= gimp PORTVERSION= 2.2.13 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= graphics gnome MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ diff --git a/graphics/gimp-app/files/patch-plug-ins.c b/graphics/gimp-app/files/patch-plug-ins.c new file mode 100644 index 000000000000..f7650f0e0529 --- /dev/null +++ b/graphics/gimp-app/files/patch-plug-ins.c @@ -0,0 +1,19 @@ +--- app/plug-in/plug-ins.c.orig Wed Nov 17 15:51:50 2004 ++++ app/plug-in/plug-ins.c Sun Oct 22 18:58:36 2006 +@@ -317,6 +317,8 @@ + + if (! gimp->no_interface) + { ++ gimp_menus_init (gimp, gimp->plug_in_defs, STD_PLUGINS_DOMAIN); ++ + gimp->load_procs = g_slist_sort_with_data (gimp->load_procs, + plug_ins_file_proc_compare, + gimp); +@@ -324,7 +326,6 @@ + plug_ins_file_proc_compare, + gimp); + +- gimp_menus_init (gimp, gimp->plug_in_defs, STD_PLUGINS_DOMAIN); + } + + /* build list of automatically started extensions */ diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile index 87d72307e68c..4a0434535bcd 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -7,7 +7,7 @@ PORTNAME= gimp PORTVERSION= 2.2.13 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= graphics gnome MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ diff --git a/graphics/gimp/files/patch-plug-ins.c b/graphics/gimp/files/patch-plug-ins.c new file mode 100644 index 000000000000..f7650f0e0529 --- /dev/null +++ b/graphics/gimp/files/patch-plug-ins.c @@ -0,0 +1,19 @@ +--- app/plug-in/plug-ins.c.orig Wed Nov 17 15:51:50 2004 ++++ app/plug-in/plug-ins.c Sun Oct 22 18:58:36 2006 +@@ -317,6 +317,8 @@ + + if (! gimp->no_interface) + { ++ gimp_menus_init (gimp, gimp->plug_in_defs, STD_PLUGINS_DOMAIN); ++ + gimp->load_procs = g_slist_sort_with_data (gimp->load_procs, + plug_ins_file_proc_compare, + gimp); +@@ -324,7 +326,6 @@ + plug_ins_file_proc_compare, + gimp); + +- gimp_menus_init (gimp, gimp->plug_in_defs, STD_PLUGINS_DOMAIN); + } + + /* build list of automatically started extensions */