[90340] trunk/dports/graphics/gimp2
devans at macports.org
devans at macports.org
Fri Mar 2 12:41:53 PST 2012
Revision: 90340
http://trac.macports.org/changeset/90340
Author: devans at macports.org
Date: 2012-03-02 12:41:53 -0800 (Fri, 02 Mar 2012)
Log Message:
-----------
gimp2: update to version 2.6.12, add help dependency and set default settings for help browser.
Modified Paths:
--------------
trunk/dports/graphics/gimp2/Portfile
trunk/dports/graphics/gimp2/files/patch-etc-gimprc.diff
Removed Paths:
-------------
trunk/dports/graphics/gimp2/files/patch-plugins-common-file-pdf.c.diff
Modified: trunk/dports/graphics/gimp2/Portfile
===================================================================
--- trunk/dports/graphics/gimp2/Portfile 2012-03-02 20:16:51 UTC (rev 90339)
+++ trunk/dports/graphics/gimp2/Portfile 2012-03-02 20:41:53 UTC (rev 90340)
@@ -6,8 +6,7 @@
name gimp2
conflicts gimp2-devel
# please remember to update the gimp metapackage to match
-version 2.6.11
-revision 9
+version 2.6.12
license {GPL-2+ LGPL}
categories graphics
maintainers devans
@@ -30,9 +29,9 @@
set branch [join [lrange [split ${version} .] 0 1] .]
master_sites gimp:gimp/v${branch}/
-checksums md5 bb2939fe13e54fc7255cef5d097bb5dd \
- sha1 2f9d596e727bdbf304fa78257c1731d9faf3934c \
- rmd160 a116377499e58dc2bfe231ab3c057d0be94091ff
+checksums md5 9f876ee63a0c4a4c83f50f32fb3bbe63 \
+ sha1 82964e3d4eb003239f3443a1bccac53f5d780e15 \
+ rmd160 3c7ae863474dea670eaeb914e333ba6bf50c7fcc
distname gimp-${version}
@@ -55,9 +54,10 @@
port:xorg-libXmu \
port:xpm
+depends_run path:share/gimp/2.0/help:gimp-help-en
+
patchfiles patch-etc-gimprc.diff \
- patch-plug-ins-twain-tw_mac.c.diff \
- patch-plugins-common-file-pdf.c.diff
+ patch-plug-ins-twain-tw_mac.c.diff
platform darwin 9 {
post-patch {
@@ -135,6 +135,9 @@
variant help_browser description {Enable Gimp help browser} {
depends_lib-append port:webkit-gtk
configure.args-delete --without-webkit
+ post-patch {
+ reinplace "s|help-browser web-browser|help-browser gimp|" ${worksrcpath}/etc/gimprc
+ }
}
variant debug description {Enable debugging} {
Modified: trunk/dports/graphics/gimp2/files/patch-etc-gimprc.diff
===================================================================
--- trunk/dports/graphics/gimp2/files/patch-etc-gimprc.diff 2012-03-02 20:16:51 UTC (rev 90339)
+++ trunk/dports/graphics/gimp2/files/patch-etc-gimprc.diff 2012-03-02 20:41:53 UTC (rev 90340)
@@ -1,5 +1,5 @@
---- etc/gimprc.orig 2008-10-15 15:35:04.000000000 -0700
-+++ etc/gimprc 2008-10-15 15:39:58.000000000 -0700
+--- etc/gimprc.orig 2011-12-12 14:10:42.000000000 -0800
++++ etc/gimprc 2011-12-12 14:13:46.000000000 -0800
@@ -619,6 +619,8 @@
#
# (help-browser gimp)
@@ -9,16 +9,24 @@
# Sets the external web browser to be used. This can be an absolute path or
# the name of an executable to search for in the user's PATH. If the command
# contains '%s' it will be replaced with the URL, else the URL will be
-@@ -633,6 +635,8 @@
+@@ -627,12 +629,16 @@
#
+ # (web-browser "firefox %s")
+
++(web-browser "open %s")
++
+ # When enabled, the online user manual will be used by the help system.
+ # Otherwise the locally installed copy is used. Possible values are yes and
+ # no.
+ #
# (user-manual-online no)
-+(user-manual-online yes)
++(user-manual-online no)
+
# The location of the online user manual. This is used if
# 'user-manual-online' is enabled. This is a string value.
#
-@@ -644,12 +648,16 @@
+@@ -644,12 +650,16 @@
#
# (toolbox-window-hint utility)
Deleted: trunk/dports/graphics/gimp2/files/patch-plugins-common-file-pdf.c.diff
===================================================================
--- trunk/dports/graphics/gimp2/files/patch-plugins-common-file-pdf.c.diff 2012-03-02 20:16:51 UTC (rev 90339)
+++ trunk/dports/graphics/gimp2/files/patch-plugins-common-file-pdf.c.diff 2012-03-02 20:41:53 UTC (rev 90340)
@@ -1,143 +0,0 @@
---- plug-ins/common/file-pdf.c.orig 2011-10-03 13:21:54.000000000 -0700
-+++ plug-ins/common/file-pdf.c 2011-10-03 13:45:16.000000000 -0700
-@@ -91,6 +91,14 @@
- gdouble progress_start,
- gdouble progress_scale);
-
-+static void copy_cairo_surface_to_pixbuf (cairo_surface_t *surface,
-+ GdkPixbuf *pixbuf);
-+
-+static GdkPixbuf * render_page_to_pixbuf (PopplerPage *page,
-+ int width,
-+ int height,
-+ double scale);
-+
- /**
- ** the following was formerly part of
- ** gimpresolutionentry.h and gimpresolutionentry.c,
-@@ -317,6 +325,84 @@
- }
-
- static void
-+copy_cairo_surface_to_pixbuf (cairo_surface_t *surface,
-+ GdkPixbuf *pixbuf)
-+{
-+ int cairo_width, cairo_height, cairo_rowstride;
-+ unsigned char *pixbuf_data, *dst, *cairo_data;
-+ int pixbuf_rowstride, pixbuf_n_channels;
-+ unsigned int *src;
-+ int x, y;
-+
-+ cairo_width = cairo_image_surface_get_width (surface);
-+ cairo_height = cairo_image_surface_get_height (surface);
-+ cairo_rowstride = cairo_image_surface_get_stride (surface);
-+ cairo_data = cairo_image_surface_get_data (surface);
-+
-+ pixbuf_data = gdk_pixbuf_get_pixels (pixbuf);
-+ pixbuf_rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-+ pixbuf_n_channels = gdk_pixbuf_get_n_channels (pixbuf);
-+
-+ if (cairo_width > gdk_pixbuf_get_width (pixbuf))
-+ cairo_width = gdk_pixbuf_get_width (pixbuf);
-+ if (cairo_height > gdk_pixbuf_get_height (pixbuf))
-+ cairo_height = gdk_pixbuf_get_height (pixbuf);
-+
-+ for (y = 0; y < cairo_height; y++)
-+ {
-+ src = (unsigned int *) (cairo_data + y * cairo_rowstride);
-+ dst = pixbuf_data + y * pixbuf_rowstride;
-+
-+ for (x = 0; x < cairo_width; x++)
-+ {
-+ dst[0] = (*src >> 16) & 0xff;
-+ dst[1] = (*src >> 8) & 0xff;
-+ dst[2] = (*src >> 0) & 0xff;
-+
-+ if (pixbuf_n_channels == 4)
-+ dst[3] = (*src >> 24) & 0xff;
-+
-+ dst += pixbuf_n_channels;
-+ src++;
-+ }
-+ }
-+}
-+
-+static GdkPixbuf *
-+render_page_to_pixbuf (PopplerPage *page,
-+ int width,
-+ int height,
-+ double scale)
-+{
-+ GdkPixbuf *pixbuf;
-+ cairo_surface_t *surface;
-+ cairo_t *cr;
-+
-+ pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height);
-+ surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height);
-+ cr = cairo_create (surface);
-+
-+ cairo_save (cr);
-+ cairo_translate (cr, 0.0, 0.0);
-+
-+ if (scale != 1.0)
-+ cairo_scale (cr, scale, scale);
-+
-+ poppler_page_render (page, cr);
-+ cairo_restore (cr);
-+
-+ cairo_set_operator (cr, CAIRO_OPERATOR_DEST_OVER);
-+ cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
-+ cairo_paint (cr);
-+
-+ cairo_destroy (cr);
-+ copy_cairo_surface_to_pixbuf (surface, pixbuf);
-+ cairo_surface_destroy (surface);
-+
-+ return pixbuf;
-+}
-+
-+static void
- run (const gchar *name,
- gint nparams,
- const GimpParam *param,
-@@ -597,7 +683,7 @@
- gdouble page_width;
- gdouble page_height;
-
-- GdkPixbuf *buf;
-+ GdkPixbuf *pixbuf;
- gint width;
- gint height;
-
-@@ -627,15 +713,13 @@
- gimp_image_set_resolution (image_ID, resolution, resolution);
- }
-
-- buf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height);
-+ pixbuf = render_page_to_pixbuf (page, width, height, scale);
-
-- poppler_page_render_to_pixbuf (page, 0, 0, width, height, scale, 0, buf);
--
-- layer_from_pixbuf (image_ID, page_label, i, buf,
-+ layer_from_pixbuf (image_ID, page_label, i, pixbuf,
- doc_progress, 1.0 / pages->n_pages);
-
- g_free (page_label);
-- g_object_unref (buf);
-+ g_object_unref (pixbuf);
-
- doc_progress = (double) (i + 1) / pages->n_pages;
- gimp_progress_update (doc_progress);
-@@ -712,11 +796,7 @@
- width *= scale;
- height *= scale;
-
-- pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
-- width, height);
--
-- poppler_page_render_to_pixbuf (page,
-- 0, 0, width, height, scale, 0, pixbuf);
-+ pixbuf = render_page_to_pixbuf (page, width, height, scale);
- }
-
- g_object_unref (page);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120302/9573f3fb/attachment.html>
More information about the macports-changes
mailing list