From 90969ea0fdaca5ae7e5dc1910d0a0dd59a6fa0d3 Mon Sep 17 00:00:00 2001 From: adamw Date: Wed, 28 Dec 2005 19:35:45 +0000 Subject: Update to 2.2.10. Works with GNOME 2.15 too! --- graphics/gimp-app/Makefile | 3 +-- graphics/gimp-app/distinfo | 6 +++--- graphics/gimp-app/files/patch-plug-ins_common_svg.c | 20 -------------------- graphics/gimp-app/files/patch-plug-ins_common_url.c | 18 +++++++++++------- graphics/gimp/Makefile | 3 +-- graphics/gimp/distinfo | 6 +++--- graphics/gimp/files/patch-plug-ins_common_svg.c | 20 -------------------- graphics/gimp/files/patch-plug-ins_common_url.c | 18 +++++++++++------- graphics/gimpshop/Makefile | 3 +-- graphics/gimpshop/distinfo | 6 +++--- graphics/gimpshop/files/patch-plug-ins_common_svg.c | 20 -------------------- graphics/gimpshop/files/patch-plug-ins_common_url.c | 18 +++++++++++------- 12 files changed, 45 insertions(+), 96 deletions(-) delete mode 100644 graphics/gimp-app/files/patch-plug-ins_common_svg.c delete mode 100644 graphics/gimp/files/patch-plug-ins_common_svg.c delete mode 100644 graphics/gimpshop/files/patch-plug-ins_common_svg.c (limited to 'graphics') diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index d9e03cd7973b..16defd724159 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gimp -PORTVERSION= 2.2.9 -PORTREVISION= 1 +PORTVERSION= 2.2.10 PORTEPOCH= 1 CATEGORIES= graphics gnome MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo index d8a11ae9a424..1ad65c7b44db 100644 --- a/graphics/gimp-app/distinfo +++ b/graphics/gimp-app/distinfo @@ -1,3 +1,3 @@ -MD5 (gimp-2.2.9.tar.bz2) = 737f4e74044427c12e30217dff0f29f5 -SHA256 (gimp-2.2.9.tar.bz2) = 7790a634e8a47e01c7108afeea933f9b614743eb1abd89dce4cb78adeec911fb -SIZE (gimp-2.2.9.tar.bz2) = 12811906 +MD5 (gimp-2.2.10.tar.bz2) = aa29506ed2272af02941a7a601a7a097 +SHA256 (gimp-2.2.10.tar.bz2) = 41f4befa851177e2ca9bbab2fad19926178c831454ca51f2cb91fec0ed9e243e +SIZE (gimp-2.2.10.tar.bz2) = 12916552 diff --git a/graphics/gimp-app/files/patch-plug-ins_common_svg.c b/graphics/gimp-app/files/patch-plug-ins_common_svg.c deleted file mode 100644 index 5c915dc67bab..000000000000 --- a/graphics/gimp-app/files/patch-plug-ins_common_svg.c +++ /dev/null @@ -1,20 +0,0 @@ ---- plug-ins/common/svg.c.orig Sun Nov 6 14:24:49 2005 -+++ plug-ins/common/svg.c Sun Nov 6 14:25:01 2005 -@@ -437,7 +437,7 @@ load_rsvg_pixbuf (const gchar *filename - - handle = rsvg_handle_new (); - --#if (LIBRSVG_MAJOR_VERSION == 2 && LIBRSVG_MINOR_VERSION < 99) -+#if (LIBRSVG_MAJOR_VERSION == 2 && LIBRSVG_MINOR_VERSION < 13) - rsvg_handle_set_dpi_x_y (handle, vals->resolution, vals->resolution); - #else - rsvg_handle_set_dpi (handle, vals->resolution, vals->resolution); -@@ -538,7 +538,7 @@ load_rsvg_size (const gchar *filename, - - handle = rsvg_handle_new (); - --#if (LIBRSVG_MAJOR_VERSION == 2 && LIBRSVG_MINOR_VERSION < 99) -+#if (LIBRSVG_MAJOR_VERSION == 2 && LIBRSVG_MINOR_VERSION < 13) - rsvg_handle_set_dpi_x_y (handle, vals->resolution, vals->resolution); - #else - rsvg_handle_set_dpi (handle, vals->resolution, vals->resolution); diff --git a/graphics/gimp-app/files/patch-plug-ins_common_url.c b/graphics/gimp-app/files/patch-plug-ins_common_url.c index 70c31c3617f8..bceff6df101c 100644 --- a/graphics/gimp-app/files/patch-plug-ins_common_url.c +++ b/graphics/gimp-app/files/patch-plug-ins_common_url.c @@ -1,13 +1,17 @@ ---- plug-ins/common/url.c.orig Mon Mar 14 05:00:40 2005 -+++ plug-ins/common/url.c Sun Apr 10 11:45:50 2005 -@@ -186,8 +186,8 @@ +--- plug-ins/common/url.c.orig Wed Dec 28 13:56:48 2005 ++++ plug-ins/common/url.c Wed Dec 28 13:58:33 2005 +@@ -186,10 +186,10 @@ putenv ("LANG=C"); #endif -- execlp ("wget", "wget", "-e", "server-response=off", "-T", TIMEOUT, +- execlp ("wget", +- "wget", "-v", "-e", "server-response=off", "-T", TIMEOUT, - filename, "-O", tmpname, NULL); -+ execlp ("fetch", "fetch", "-T", TIMEOUT, filename, "-p", "-o", -+ tmpname, NULL); - g_message ("exec() failed: wget: %s", g_strerror (errno)); +- 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/Makefile b/graphics/gimp/Makefile index d9e03cd7973b..16defd724159 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gimp -PORTVERSION= 2.2.9 -PORTREVISION= 1 +PORTVERSION= 2.2.10 PORTEPOCH= 1 CATEGORIES= graphics gnome MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo index d8a11ae9a424..1ad65c7b44db 100644 --- a/graphics/gimp/distinfo +++ b/graphics/gimp/distinfo @@ -1,3 +1,3 @@ -MD5 (gimp-2.2.9.tar.bz2) = 737f4e74044427c12e30217dff0f29f5 -SHA256 (gimp-2.2.9.tar.bz2) = 7790a634e8a47e01c7108afeea933f9b614743eb1abd89dce4cb78adeec911fb -SIZE (gimp-2.2.9.tar.bz2) = 12811906 +MD5 (gimp-2.2.10.tar.bz2) = aa29506ed2272af02941a7a601a7a097 +SHA256 (gimp-2.2.10.tar.bz2) = 41f4befa851177e2ca9bbab2fad19926178c831454ca51f2cb91fec0ed9e243e +SIZE (gimp-2.2.10.tar.bz2) = 12916552 diff --git a/graphics/gimp/files/patch-plug-ins_common_svg.c b/graphics/gimp/files/patch-plug-ins_common_svg.c deleted file mode 100644 index 5c915dc67bab..000000000000 --- a/graphics/gimp/files/patch-plug-ins_common_svg.c +++ /dev/null @@ -1,20 +0,0 @@ ---- plug-ins/common/svg.c.orig Sun Nov 6 14:24:49 2005 -+++ plug-ins/common/svg.c Sun Nov 6 14:25:01 2005 -@@ -437,7 +437,7 @@ load_rsvg_pixbuf (const gchar *filename - - handle = rsvg_handle_new (); - --#if (LIBRSVG_MAJOR_VERSION == 2 && LIBRSVG_MINOR_VERSION < 99) -+#if (LIBRSVG_MAJOR_VERSION == 2 && LIBRSVG_MINOR_VERSION < 13) - rsvg_handle_set_dpi_x_y (handle, vals->resolution, vals->resolution); - #else - rsvg_handle_set_dpi (handle, vals->resolution, vals->resolution); -@@ -538,7 +538,7 @@ load_rsvg_size (const gchar *filename, - - handle = rsvg_handle_new (); - --#if (LIBRSVG_MAJOR_VERSION == 2 && LIBRSVG_MINOR_VERSION < 99) -+#if (LIBRSVG_MAJOR_VERSION == 2 && LIBRSVG_MINOR_VERSION < 13) - rsvg_handle_set_dpi_x_y (handle, vals->resolution, vals->resolution); - #else - rsvg_handle_set_dpi (handle, vals->resolution, vals->resolution); diff --git a/graphics/gimp/files/patch-plug-ins_common_url.c b/graphics/gimp/files/patch-plug-ins_common_url.c index 70c31c3617f8..bceff6df101c 100644 --- a/graphics/gimp/files/patch-plug-ins_common_url.c +++ b/graphics/gimp/files/patch-plug-ins_common_url.c @@ -1,13 +1,17 @@ ---- plug-ins/common/url.c.orig Mon Mar 14 05:00:40 2005 -+++ plug-ins/common/url.c Sun Apr 10 11:45:50 2005 -@@ -186,8 +186,8 @@ +--- plug-ins/common/url.c.orig Wed Dec 28 13:56:48 2005 ++++ plug-ins/common/url.c Wed Dec 28 13:58:33 2005 +@@ -186,10 +186,10 @@ putenv ("LANG=C"); #endif -- execlp ("wget", "wget", "-e", "server-response=off", "-T", TIMEOUT, +- execlp ("wget", +- "wget", "-v", "-e", "server-response=off", "-T", TIMEOUT, - filename, "-O", tmpname, NULL); -+ execlp ("fetch", "fetch", "-T", TIMEOUT, filename, "-p", "-o", -+ tmpname, NULL); - g_message ("exec() failed: wget: %s", g_strerror (errno)); +- 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/gimpshop/Makefile b/graphics/gimpshop/Makefile index d9e03cd7973b..16defd724159 100644 --- a/graphics/gimpshop/Makefile +++ b/graphics/gimpshop/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gimp -PORTVERSION= 2.2.9 -PORTREVISION= 1 +PORTVERSION= 2.2.10 PORTEPOCH= 1 CATEGORIES= graphics gnome MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ diff --git a/graphics/gimpshop/distinfo b/graphics/gimpshop/distinfo index d8a11ae9a424..1ad65c7b44db 100644 --- a/graphics/gimpshop/distinfo +++ b/graphics/gimpshop/distinfo @@ -1,3 +1,3 @@ -MD5 (gimp-2.2.9.tar.bz2) = 737f4e74044427c12e30217dff0f29f5 -SHA256 (gimp-2.2.9.tar.bz2) = 7790a634e8a47e01c7108afeea933f9b614743eb1abd89dce4cb78adeec911fb -SIZE (gimp-2.2.9.tar.bz2) = 12811906 +MD5 (gimp-2.2.10.tar.bz2) = aa29506ed2272af02941a7a601a7a097 +SHA256 (gimp-2.2.10.tar.bz2) = 41f4befa851177e2ca9bbab2fad19926178c831454ca51f2cb91fec0ed9e243e +SIZE (gimp-2.2.10.tar.bz2) = 12916552 diff --git a/graphics/gimpshop/files/patch-plug-ins_common_svg.c b/graphics/gimpshop/files/patch-plug-ins_common_svg.c deleted file mode 100644 index 5c915dc67bab..000000000000 --- a/graphics/gimpshop/files/patch-plug-ins_common_svg.c +++ /dev/null @@ -1,20 +0,0 @@ ---- plug-ins/common/svg.c.orig Sun Nov 6 14:24:49 2005 -+++ plug-ins/common/svg.c Sun Nov 6 14:25:01 2005 -@@ -437,7 +437,7 @@ load_rsvg_pixbuf (const gchar *filename - - handle = rsvg_handle_new (); - --#if (LIBRSVG_MAJOR_VERSION == 2 && LIBRSVG_MINOR_VERSION < 99) -+#if (LIBRSVG_MAJOR_VERSION == 2 && LIBRSVG_MINOR_VERSION < 13) - rsvg_handle_set_dpi_x_y (handle, vals->resolution, vals->resolution); - #else - rsvg_handle_set_dpi (handle, vals->resolution, vals->resolution); -@@ -538,7 +538,7 @@ load_rsvg_size (const gchar *filename, - - handle = rsvg_handle_new (); - --#if (LIBRSVG_MAJOR_VERSION == 2 && LIBRSVG_MINOR_VERSION < 99) -+#if (LIBRSVG_MAJOR_VERSION == 2 && LIBRSVG_MINOR_VERSION < 13) - rsvg_handle_set_dpi_x_y (handle, vals->resolution, vals->resolution); - #else - rsvg_handle_set_dpi (handle, vals->resolution, vals->resolution); diff --git a/graphics/gimpshop/files/patch-plug-ins_common_url.c b/graphics/gimpshop/files/patch-plug-ins_common_url.c index 70c31c3617f8..bceff6df101c 100644 --- a/graphics/gimpshop/files/patch-plug-ins_common_url.c +++ b/graphics/gimpshop/files/patch-plug-ins_common_url.c @@ -1,13 +1,17 @@ ---- plug-ins/common/url.c.orig Mon Mar 14 05:00:40 2005 -+++ plug-ins/common/url.c Sun Apr 10 11:45:50 2005 -@@ -186,8 +186,8 @@ +--- plug-ins/common/url.c.orig Wed Dec 28 13:56:48 2005 ++++ plug-ins/common/url.c Wed Dec 28 13:58:33 2005 +@@ -186,10 +186,10 @@ putenv ("LANG=C"); #endif -- execlp ("wget", "wget", "-e", "server-response=off", "-T", TIMEOUT, +- execlp ("wget", +- "wget", "-v", "-e", "server-response=off", "-T", TIMEOUT, - filename, "-O", tmpname, NULL); -+ execlp ("fetch", "fetch", "-T", TIMEOUT, filename, "-p", "-o", -+ tmpname, NULL); - g_message ("exec() failed: wget: %s", g_strerror (errno)); +- 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); + } -- cgit