<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[121425] trunk/dports/gnome/gnome-libs</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/121425">121425</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-06-24 21:05:55 -0700 (Tue, 24 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>gnome-libs: configure to build with db46 +compat185 and patch for API compatibility with libpng16, add missing dependencies (#44039).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegnomelibsPortfile">trunk/dports/gnome/gnome-libs/Portfile</a></li>
<li><a href="#trunkdportsgnomegnomelibsfilespatch_configure">trunk/dports/gnome/gnome-libs/files/patch_configure</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegnomelibsfilespatchgtkxmhtmlreadPNGcdiff">trunk/dports/gnome/gnome-libs/files/patch-gtk-xmhtml-readPNG.c.diff</a></li>
<li><a href="#trunkdportsgnomegnomelibsfilespatchlibgnomeMakefileindiff">trunk/dports/gnome/gnome-libs/files/patch-libgnome-Makefile.in.diff</a></li>
<li><a href="#trunkdportsgnomegnomelibsfilespatchtoolsconvertrgbloadpngcdiff">trunk/dports/gnome/gnome-libs/files/patch-tools-convertrgb-loadpng.c.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomegnomelibsPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gnome-libs/Portfile (121424 => 121425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-libs/Portfile 2014-06-25 03:23:06 UTC (rev 121424)
+++ trunk/dports/gnome/gnome-libs/Portfile 2014-06-25 04:05:55 UTC (rev 121425)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><ins>+PortGroup active_variants 1.1
</ins><span class="cx">
</span><span class="cx"> name gnome-libs
</span><span class="cx"> version 1.4.2
</span><span class="lines">@@ -24,8 +25,17 @@
</span><span class="cx"> depends_lib port:oaf \
</span><span class="cx"> port:gtk1 \
</span><span class="cx"> port:libghttp \
</span><del>- port:imlib
</del><ins>+ port:imlib \
+ port:db46 \
+ port:esound \
+ port:tiff \
+ port:jpeg \
+ port:libpng \
+ port:giflib \
+ port:xpm
</ins><span class="cx">
</span><ins>+require_active_variants db46 compat185
+
</ins><span class="cx"> # imlib is not universal
</span><span class="cx"> universal_variant no
</span><span class="cx">
</span><span class="lines">@@ -34,13 +44,18 @@
</span><span class="cx"> patch-XmHTMLP.h \
</span><span class="cx"> patch-XmHTMLI.h \
</span><span class="cx"> install.diff \
</span><del>- patch-libart_lgpl_libart.m4
</del><ins>+ patch-libart_lgpl_libart.m4 \
+ patch-tools-convertrgb-loadpng.c.diff \
+ patch-libgnome-Makefile.in.diff \
+ patch-gtk-xmhtml-readPNG.c.diff
</ins><span class="cx">
</span><span class="cx"> configure.args --mandir=${prefix}/share/man \
</span><span class="cx"> --disable-gtk-doc \
</span><span class="cx"> --disable-test-gnome
</span><span class="cx">
</span><del>-configure.cppflags-append "-L${prefix}/lib"
</del><ins>+configure.env-append CPP="${configure.cc} -E"
+configure.cppflags-append "-I${prefix}/include/db46"
+configure.ldflags-append "-L${prefix}/lib/db46"
</ins><span class="cx"> configure.cflags-append "-fstrict-aliasing -funroll-loops"
</span><span class="cx">
</span><span class="cx"> post-configure {
</span></span></pre></div>
<a id="trunkdportsgnomegnomelibsfilespatchgtkxmhtmlreadPNGcdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/gnome/gnome-libs/files/patch-gtk-xmhtml-readPNG.c.diff (0 => 121425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-libs/files/patch-gtk-xmhtml-readPNG.c.diff (rev 0)
+++ trunk/dports/gnome/gnome-libs/files/patch-gtk-xmhtml-readPNG.c.diff 2014-06-25 04:05:55 UTC (rev 121425)
</span><span class="lines">@@ -0,0 +1,168 @@
</span><ins>+--- gtk-xmhtml/readPNG.c.orig 2002-08-06 14:25:46.000000000 -0700
++++ gtk-xmhtml/readPNG.c 2014-06-19 08:34:04.000000000 -0700
+@@ -208,7 +208,7 @@
+
+ _XmHTMLWarning(__WFUNC__(NULL, "png_error"),
+ "libpng error on image %s: %s", ib->file, msg);
+- longjmp(png_ptr->jmpbuf, 1);
++ longjmp(png_jmpbuf(png_ptr), 1);
+ }
+
+ /*****
+@@ -256,11 +256,12 @@
+ {
+ png_structp png_ptr;
+ png_infop info_ptr;
++ png_colorp palette;
+ Byte *data;
+ int i, idx, npass;
+ int width, height, color_type;
+ int ncolors, max_colors;
+- float gamma, fg_gamma;
++ double gamma, fg_gamma;
+ Boolean has_alpha = False, has_cmap = False, do_gamma = True;
+ png_bytep *row_ptrs;
+ char msg[128];
+@@ -308,7 +309,7 @@
+ return((XmHTMLRawImageData*)NULL);
+ }
+ /* now set error handler */
+- if(setjmp(png_ptr->jmpbuf))
++ if(setjmp(png_jmpbuf(png_ptr)))
+ {
+ /*
+ * PNG signalled an error. Destroy image data, free any allocated
+@@ -342,17 +343,18 @@
+ ResetRawImage(img_data);
+
+ /* save width & height */
+- width = img_data->width = info_ptr->width;
+- height = img_data->height = info_ptr->height;
++ width = img_data->width = png_get_image_width(png_ptr, info_ptr);
++ height = img_data->height = png_get_image_height(png_ptr, info_ptr);
+
+ /* image depth */
+- ib->depth = info_ptr->bit_depth;
++ ib->depth = png_get_bit_depth(png_ptr, info_ptr);
+
+ /* no of colors */
+- ncolors = img_data->cmapsize = info_ptr->num_palette;
++ png_get_PLTE(png_ptr, info_ptr, &palette, &ncolors);
++ img_data->cmapsize = ncolors;
+
+ /* type of image */
+- color_type = info_ptr->color_type;
++ color_type = png_get_color_type(png_ptr, info_ptr);
+
+ /*
+ * The fun stuff. This is based on readPNG by Greg Roelofs as found
+@@ -383,7 +385,7 @@
+ * Actual image creation is postponed until the image is
+ * needed.
+ */
+- if(info_ptr->valid & PNG_INFO_tRNS)
++ if(png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
+ {
+ _XmHTMLDebug(15, ("readPNG.c: tRNS chunk present\n"));
+ png_set_expand(png_ptr);
+@@ -396,9 +398,9 @@
+ AllocRawImageCmap(img_data, ncolors);
+ for(i = 0; i < ncolors; i++)
+ {
+- img_data->cmap[i].red = info_ptr->palette[i].red;
+- img_data->cmap[i].green = info_ptr->palette[i].green;
+- img_data->cmap[i].blue = info_ptr->palette[i].blue;
++ img_data->cmap[i].red = palette[i].red;
++ img_data->cmap[i].green = palette[i].green;
++ img_data->cmap[i].blue = palette[i].blue;
+ }
+ has_cmap = True;
+ data = (Byte*)malloc(width*height*sizeof(Byte));
+@@ -432,7 +434,7 @@
+ * grayscale with transparency is expanded to RGB with alpha
+ * channel.
+ */
+- if(info_ptr->valid & PNG_INFO_tRNS)
++ if(png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
+ {
+ _XmHTMLDebug(15, ("readPNG.c: tRNS chunk present\n"));
+ png_set_gray_to_rgb(png_ptr);
+@@ -511,7 +513,7 @@
+ break;
+ default:
+ sprintf(msg, "bad PNG image: unknown color type (%d)",
+- info_ptr->color_type);
++ png_get_color_type(png_ptr, info_ptr));
+ my_png_error(png_ptr, msg);
+ break;
+ }
+@@ -521,16 +523,18 @@
+ * Doing that for alpha channel images would change the colortype of the
+ * current image, leading to weird results.
+ */
+- if(!has_alpha && info_ptr->valid & PNG_INFO_bKGD)
++ if(!has_alpha && png_get_valid(png_ptr, info_ptr, PNG_INFO_bKGD))
+ {
+- png_set_background(png_ptr, &(info_ptr->background),
++ png_color_16p background;
++ png_get_bKGD(png_ptr, info_ptr, &background);
++ png_set_background(png_ptr, background,
+ PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
+- img_data->bg = info_ptr->background.index;
++ img_data->bg = background->index;
+ }
+
+ /* handle gamma correction */
+- if(info_ptr->valid & PNG_INFO_gAMA)
+- fg_gamma = info_ptr->gamma;
++ if(png_get_valid(png_ptr, info_ptr, PNG_INFO_gAMA))
++ png_get_gAMA(png_ptr, info_ptr, &fg_gamma);
+ else
+ fg_gamma = 0.45;
+
+@@ -541,20 +545,20 @@
+ /* dithering gets handled by caller */
+
+ /* one byte per pixel */
+- if(info_ptr->bit_depth < 8)
++ if(png_get_bit_depth(png_ptr, info_ptr) < 8)
+ png_set_packing(png_ptr);
+
+ /* no tRNS chunk handling, we've expanded it to an alpha channel. */
+
+ /* handle interlacing */
+- if(info_ptr->interlace_type)
++ if(png_get_interlace_type(png_ptr, info_ptr))
+ npass = png_set_interlace_handling(png_ptr);
+
+ /* and now update everything */
+ png_read_update_info(png_ptr, info_ptr);
+
+ /* has possibly changed if we have promoted GrayScale or tRNS chunks */
+- color_type = info_ptr->color_type;
++ color_type = png_get_color_type(png_ptr, info_ptr);
+
+ /* new color_type? */
+ if(color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+@@ -574,10 +578,10 @@
+ * will call doAlphaChannel to do the actual image creation.
+ */
+ row_ptrs = (png_bytep*)malloc(height*sizeof(png_bytep));
+- png_data = (png_bytep)malloc(height*info_ptr->rowbytes);
++ png_data = (png_bytep)malloc(height*png_get_rowbytes(png_ptr, info_ptr));
+
+ for(i = 0; i < height; i++)
+- row_ptrs[i] = (png_bytep)png_data + i*info_ptr->rowbytes;
++ row_ptrs[i] = (png_bytep)png_data + i*png_get_rowbytes(png_ptr, info_ptr);
+
+ /* read it */
+ png_read_image(png_ptr, row_ptrs);
+@@ -606,7 +610,7 @@
+ row_ptrs = (png_bytep*)malloc(height*sizeof(png_bytep));
+
+ for(i = 0; i < height; ++i)
+- row_ptrs[i] = (png_bytep)data + i*info_ptr->rowbytes;
++ row_ptrs[i] = (png_bytep)data + i*png_get_rowbytes(png_ptr, info_ptr);
+
+ /* read it */
+ png_read_image(png_ptr, row_ptrs);
</ins></span></pre></div>
<a id="trunkdportsgnomegnomelibsfilespatchlibgnomeMakefileindiff"></a>
<div class="addfile"><h4>Added: trunk/dports/gnome/gnome-libs/files/patch-libgnome-Makefile.in.diff (0 => 121425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-libs/files/patch-libgnome-Makefile.in.diff (rev 0)
+++ trunk/dports/gnome/gnome-libs/files/patch-libgnome-Makefile.in.diff 2014-06-25 04:05:55 UTC (rev 121425)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- libgnome/Makefile.in.orig 2014-06-18 11:34:06.000000000 -0700
++++ libgnome/Makefile.in 2014-06-18 11:35:16.000000000 -0700
+@@ -251,7 +251,7 @@
+ gnome_dump_metadata_LDADD = libgnome.la $(LIBSUPPORT) \
+ $(LIBGNOME_LIBS) $(INTLLIBS)
+
+-gnome_dump_metadata_LDFLAGS = $(GLIB_LIBS)
++gnome_dump_metadata_LDFLAGS = $(GLIB_LIBS) -ldb
+
+ gnome_moz_remote_SOURCES = gnome-moz-remote.c vroot.h
+ gnome_moz_remote_LDADD = libgnome.la $(LIBSUPPORT) $(LIBGNOME_LIBS) \
</ins></span></pre></div>
<a id="trunkdportsgnomegnomelibsfilespatchtoolsconvertrgbloadpngcdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/gnome/gnome-libs/files/patch-tools-convertrgb-loadpng.c.diff (0 => 121425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-libs/files/patch-tools-convertrgb-loadpng.c.diff (rev 0)
+++ trunk/dports/gnome/gnome-libs/files/patch-tools-convertrgb-loadpng.c.diff 2014-06-25 04:05:55 UTC (rev 121425)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+--- tools/convertrgb/loadpng.c.orig 2014-06-18 09:31:06.000000000 -0700
++++ tools/convertrgb/loadpng.c 2014-06-18 09:37:08.000000000 -0700
+@@ -29,13 +29,13 @@
+ return NULL;
+ }
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ return NULL;
+ }
+
+- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ return NULL;
</ins></span></pre></div>
<a id="trunkdportsgnomegnomelibsfilespatch_configure"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gnome-libs/files/patch_configure (121424 => 121425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-libs/files/patch_configure 2014-06-25 03:23:06 UTC (rev 121424)
+++ trunk/dports/gnome/gnome-libs/files/patch_configure 2014-06-25 04:05:55 UTC (rev 121425)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx">
</span><span class="cx"> darwin* | rhapsody*)
</span><span class="cx"> - allow_undefined_flag='-undefined suppress'
</span><del>-+ allow_undefined_flag='-flat_namespace -undefined suppress'
</del><ins>++ allow_undefined_flag=''
</ins><span class="cx"> # FIXME: Relying on posixy $() will cause problems for
</span><span class="cx"> # cross-compilation, but unfortunately the echo tests do not
</span><span class="cx"> # yet detect zsh echo's removal of \ escapes.
</span></span></pre>
</div>
</div>
</body>
</html>