<!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>[141008] trunk/dports/gnome/gthumb</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/141008">141008</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-10-07 13:26:53 -0700 (Wed, 07 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>gthumb: update to version 3.4.1, dependencies, reconfigure using upstream autogen.sh for intltool 0.51 compatibility, add +x11 variant.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegthumbPortfile">trunk/dports/gnome/gthumb/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegthumbfilesautogensh">trunk/dports/gnome/gthumb/files/autogen.sh</a></li>
<li><a href="#trunkdportsgnomegthumbfilespatchconfigureacdiff">trunk/dports/gnome/gthumb/files/patch-configure.ac.diff</a></li>
<li><a href="#trunkdportsgnomegthumbfilespatchgthumbgthtoolboxcdiff">trunk/dports/gnome/gthumb/files/patch-gthumb-gth-toolbox.c.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegthumbfilespatchconfigurediff">trunk/dports/gnome/gthumb/files/patch-configure.diff</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkdportsgnomegthumb">trunk/dports/gnome/gthumb/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomegthumb"></a>
<div class="propset"><h4>Property changes: trunk/dports/gnome/gthumb</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="addfile"><h4>Added: svn:mergeinfo</h4></div>
<span class="cx">/users/devans/GNOME-3/stable/dports/gnome/gthumb:126753-141002
</span><span class="cx">/users/rmstonecipher/gnome/gthumb:102363-103172
</span><a id="trunkdportsgnomegthumbPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gthumb/Portfile (141007 => 141008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gthumb/Portfile 2015-10-07 20:26:05 UTC (rev 141007)
+++ trunk/dports/gnome/gthumb/Portfile 2015-10-07 20:26:53 UTC (rev 141008)
</span><span class="lines">@@ -4,11 +4,10 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name gthumb
</span><del>-version 2.14.4
-revision 6
</del><ins>+version 3.4.1
</ins><span class="cx"> license GPL-2+
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><del>-description Image viewer and browser for the gnome desktop.
</del><ins>+description Image viewer and browser for the GNOME desktop.
</ins><span class="cx"> long_description ${description}
</span><span class="cx"> maintainers nomaintainer
</span><span class="cx"> categories gnome
</span><span class="lines">@@ -17,32 +16,49 @@
</span><span class="cx"> master_sites gnome:sources/gthumb/${branch}
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums sha256 1561ca52f9b60fbcd0e8fc976de8b30f0447019c698bfe1051d421935b5a51b5 \
- rmd160 384b4441ed3d4022b6e5c5301b5a3c422f8b101b
</del><ins>+checksums sha256 1ec2cf49f499ed06eda851a3bd5c28a1768839a6ff06bc4efc5fbde46cabc857 \
+ rmd160 4e0b5581064a726ab716965ab8fe8fe3754e31c6
</ins><span class="cx">
</span><del>-depends_build port:gnome-doc-utils \
- port:intltool \
- port:pkgconfig
</del><ins>+depends_build port:intltool \
+ port:pkgconfig \
+ port:gnome-common \
+ port:yelp-tools \
+ port:itstool \
+ port:autoconf \
+ port:automake \
+ port:libtool
</ins><span class="cx">
</span><span class="cx"> depends_lib port:desktop-file-utils \
</span><del>- port:gconf \
- port:gstreamer010-gst-plugins-base \
- port:libgnome-keyring \
</del><ins>+ port:gtk3 \
+ port:exiv2 \
+ port:gstreamer1-gst-plugins-base \
+ port:lcms2 \
+ port:libraw \
</ins><span class="cx"> port:libsoup \
</span><del>- port:libunique \
- port:exiv2 \
- port:libopenraw
-
</del><ins>+ port:libsecret \
+ port:librsvg \
+ port:webp \
+ port:json-glib
+
</ins><span class="cx"> depends_run port:yelp
</span><span class="cx">
</span><del>-patchfiles patch-configure.diff
</del><ins>+patchfiles patch-configure.ac.diff \
+ patch-gthumb-gth-toolbox.c.diff
</ins><span class="cx">
</span><del>-configure.args --enable-libopenraw \
</del><ins>+# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
+
+post-patch {
+ xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
+}
+
+configure.cmd ./autogen.sh
+
+configure.args --enable-libraw \
</ins><span class="cx"> --disable-clutter \
</span><del>- --disable-gnome-3 \
</del><span class="cx"> --disable-libbrasero \
</span><del>- --disable-scrollkeeper \
- --disable-schemas-install \
</del><ins>+ --disable-webkit2 \
+ --enable-compile-warnings=minimum \
+ --disable-schemas-compile \
</ins><span class="cx"> --disable-silent-rules
</span><span class="cx">
</span><span class="cx"> universal_variant no
</span><span class="lines">@@ -56,11 +72,18 @@
</span><span class="cx"> configure.args-append --enable-debug
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+variant x11 {
+ depends_lib-append port:xorg-libsm \
+ port:xorg-libice
+ configure.args-replace --with-smclient=no --with-smclient=xsmp
+}
+
+default_variants +x11
+
</ins><span class="cx"> post-activate {
</span><del>- system "gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</del><ins>+ system "gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</ins><span class="cx"> system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
</span><del>- system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \
- gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas"
</del><ins>+ system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> livecheck.type gnome
</span></span></pre></div>
<a id="trunkdportsgnomegthumbfilesautogenshfromrev141002usersdevansGNOME3stabledportsgnomegthumbfilesautogensh"></a>
<div class="copfile"><h4>Copied: trunk/dports/gnome/gthumb/files/autogen.sh (from rev 141002, users/devans/GNOME-3/stable/dports/gnome/gthumb/files/autogen.sh) (0 => 141008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gthumb/files/autogen.sh (rev 0)
+++ trunk/dports/gnome/gthumb/files/autogen.sh 2015-10-07 20:26:53 UTC (rev 141008)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+PKG_NAME="gthumb"
+REQUIRED_AUTOMAKE_VERSION=1.8
+
+(test -f $srcdir/configure.ac \
+ && test -d $srcdir/gthumb) || {
+ echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+ echo " top-level $PKG_NAME directory"
+ exit 1
+}
+
+which gnome-autogen.sh || {
+ echo "You need to install gnome-common from the GNOME git"
+ exit 1
+}
+
+USE_GNOME2_MACROS=1 . gnome-autogen.sh
</ins></span></pre></div>
<a id="trunkdportsgnomegthumbfilespatchconfigureacdifffromrev141002usersdevansGNOME3stabledportsgnomegthumbfilespatchconfigureacdiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/gnome/gthumb/files/patch-configure.ac.diff (from rev 141002, users/devans/GNOME-3/stable/dports/gnome/gthumb/files/patch-configure.ac.diff) (0 => 141008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gthumb/files/patch-configure.ac.diff (rev 0)
+++ trunk/dports/gnome/gthumb/files/patch-configure.ac.diff 2015-10-07 20:26:53 UTC (rev 141008)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+--- configure.ac.orig 2015-04-14 08:12:09.000000000 -0700
++++ configure.ac 2015-04-24 14:26:29.000000000 -0700
+@@ -77,7 +77,7 @@
+ dnl ===========================================================================
+
+ CFLAGS=${CFLAGS-:""}
+-CFLAGS="$CFLAGS -fPIC -DPIC -Wl,--as-needed"
++CFLAGS="$CFLAGS -fPIC -DPIC"
+
+ AC_ARG_ENABLE(deprecated,
+ AS_HELP_STRING([--disable-deprecated], [do not use deprecated API]),
+@@ -106,7 +106,7 @@
+ dnl ===========================================================================
+
+ if test x$ENABLE_DEBUG = xyes; then
+-WARN_CFLAGS="-Wall -Wcast-align -Wtype-limits -Wclobbered -Wempty-body -Wignored-qualifiers -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wno-sign-compare -Wformat-security"
++WARN_CFLAGS="-Wall -Wcast-align -Wtype-limits -Wempty-body -Wignored-qualifiers -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wno-sign-compare -Wformat-security"
+ else
+ WARN_CFLAGS="-Wall"
+ fi
</ins></span></pre></div>
<a id="trunkdportsgnomegthumbfilespatchconfigurediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/gnome/gthumb/files/patch-configure.diff (141007 => 141008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gthumb/files/patch-configure.diff 2015-10-07 20:26:05 UTC (rev 141007)
+++ trunk/dports/gnome/gthumb/files/patch-configure.diff 2015-10-07 20:26:53 UTC (rev 141008)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- configure.orig 2013-01-15 17:43:51.000000000 -0800
-+++ configure 2013-01-15 17:46:15.000000000 -0800
-@@ -17306,7 +17306,7 @@
-
-
- CFLAGS=${CFLAGS-:""}
--CFLAGS="$CFLAGS -fPIC -DPIC -Wl,--as-needed"
-+CFLAGS="$CFLAGS -fPIC -DPIC"
-
- # Check whether --enable-deprecated was given.
- if test "${enable_deprecated+set}" = set; then :
</del></span></pre></div>
<a id="trunkdportsgnomegthumbfilespatchgthumbgthtoolboxcdifffromrev141002usersdevansGNOME3stabledportsgnomegthumbfilespatchgthumbgthtoolboxcdiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/gnome/gthumb/files/patch-gthumb-gth-toolbox.c.diff (from rev 141002, users/devans/GNOME-3/stable/dports/gnome/gthumb/files/patch-gthumb-gth-toolbox.c.diff) (0 => 141008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gthumb/files/patch-gthumb-gth-toolbox.c.diff (rev 0)
+++ trunk/dports/gnome/gthumb/files/patch-gthumb-gth-toolbox.c.diff 2015-10-07 20:26:53 UTC (rev 141008)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- gthumb/gth-toolbox.c.orig 2015-05-27 15:17:29.000000000 -0700
++++ gthumb/gth-toolbox.c 2015-05-27 15:18:43.000000000 -0700
+@@ -315,7 +315,7 @@
+ column[i] = -1;
+ }
+
+- for (i = 0; i < children->len; i++) {
++ for (i = 0; i < children->len - 1; i++) {
+ GType child_type;
+ GtkWidget *child;
+ int section;
</ins></span></pre>
</div>
</div>
</body>
</html>