<!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>[121763] users/devans/GNOME-3/stable/dports/gnome</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/121763">121763</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-07-07 09:39:19 -0700 (Mon, 07 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME-3/stable: glom, copy from trunk and merge wip changes to update to version 1.26.0 for testing.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomeglomPortfile">users/devans/GNOME-3/stable/dports/gnome/glom/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>users/devans/GNOME-3/stable/dports/gnome/glom/</li>
<li>users/devans/GNOME-3/stable/dports/gnome/glom/files/</li>
<li><a href="#usersdevansGNOME3stabledportsgnomeglomfilespatchconfigureacdiff">users/devans/GNOME-3/stable/dports/gnome/glom/files/patch-configure.ac.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeglomfilespatchglomframe_glomccdiff">users/devans/GNOME-3/stable/dports/gnome/glom/files/patch-glom-frame_glom.cc.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeglomfilespatchglomlibglomconnectionpoolccdiff">users/devans/GNOME-3/stable/dports/gnome/glom/files/patch-glom-libglom-connectionpool.cc.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeglomfilespatchmacrosax_python_develm4diff">users/devans/GNOME-3/stable/dports/gnome/glom/files/patch-macros-ax_python_devel.m4.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansGNOME3stabledportsgnomeglom"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/glom</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/rmstonecipher/gnome/glom:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomeglomPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/glom/Portfile (121762 => 121763)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/glom/Portfile 2014-07-07 16:15:07 UTC (rev 121762)
+++ users/devans/GNOME-3/stable/dports/gnome/glom/Portfile 2014-07-07 16:39:19 UTC (rev 121763)
</span><span class="lines">@@ -1,43 +1,94 @@
</span><ins>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</ins><span class="cx"> # $Id$
</span><del>-PortSystem 1.0
-name glom
-version 1.4.2
</del><span class="cx">
</span><del>-description Glom is an easy-to-use database designer and user interface.
-long_description ${description}
-maintainers landonf
-categories gnome databases
-platforms darwin
</del><ins>+PortSystem 1.0
+PortGroup active_variants 1.1
</ins><span class="cx">
</span><del>-homepage http://www.glom.org/
-master_sites gnome:sources/glom/1.4/
</del><ins>+name glom
+version 1.26.0
+set branch [join [lrange [split ${version} .] 0 1] .]
+license GPL-2
+description Glom is an easy-to-use database designer and user interface.
+long_description \
+ ${description} This version supports GTK+ 3 and the libgda-5.0 API.
+maintainers landonf
+categories gnome databases
+platforms darwin
</ins><span class="cx">
</span><del>-checksums md5 71c868a2e8e85e96bdbbf78608228bc8
-use_bzip2 yes
</del><ins>+homepage http://www.glom.org/
+master_sites gnome:sources/${name}/${branch}/
</ins><span class="cx">
</span><del>-depends_lib port:bakery port:libgdamm port:libgnomecanvasmm \
- port:gnome-session port:python24 \
- port:iso-codes port:libgtksourceviewmm \
- port:libiconv port:postgresql81 port:gettext \
- port:gnome-python-extras
</del><ins>+use_xz yes
</ins><span class="cx">
</span><del>-post-patch {
- reinplace s/-lutil//g ${worksrcpath}/glom/libglom/Makefile.in \
- ${worksrcpath}/glom/Makefile.in \
- ${worksrcpath}/glom/python_embed/python_module/Makefile.in
</del><ins>+checksums rmd160 3f48af233fba992dbd86a99dc276d20d631a9a82 \
+ sha256 f53a2d46f766d4e50b1cde0edc4408b443f22db7662f47dd80f7b1a545050024
+
+depends_build port:pkgconfig \
+ port:intltool \
+ port:itstool \
+ port:yelp-tools \
+ port:mm-common \
+ port:graphviz \
+ port:doxygen \
+ port:libxslt \
+ port:py27-sphinx
+
+depends_lib port:libarchive \
+ port:boost \
+ port:libxml2 \
+ port:libxmlxx2 \
+ port:libgda5 \
+ port:libgdamm5 \
+ port:goocanvasmm2\
+ port:gtksourceviewmm3 \
+ port:postgresql93 \
+ port:py27-gobject3 \
+ port:libepc \
+ port:evince \
+ port:shared-mime-info
+
+depends_run port:gnome-keyring
+
+post-extract {
+ copy ${worksrcpath}/configure.ac ${worksrcpath}/configure.ac.orig
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-configure.cflags-append "-I${prefix}/include -L${prefix}/lib"
-configure.env PYTHON_EXEC_PREFIX="${prefix}" \
- PYTHON_PREFIX="${prefix}"
</del><ins>+patchfiles patch-configure.ac.diff \
+ patch-glom-libglom-connectionpool.cc.diff
</ins><span class="cx">
</span><del>-configure.args --with-postgres-utils=${prefix}/lib/postgresql81/bin \
- --disable-scrollkeeper
</del><ins>+require_active_variants libgda5 postgresql93
</ins><span class="cx">
</span><del>-build.args MSGFMT="${prefix}/bin/msgfmt" GMSGFMT="${prefix}/bin/msgfmt"
</del><ins>+# update macros/intltool.m4 and autoreconf
</ins><span class="cx">
</span><del>-post-destroot {
- file delete "${destpath}${prefix}/share/mime/globs"
- file delete "${destpath}${prefix}/share/mime/magic"
- file delete "${destpath}${prefix}/share/mime/XMLnamespaces"
</del><ins>+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/macros
</ins><span class="cx"> }
</span><ins>+
+use_autoreconf yes
+autoreconf.args -fvi
+
+set python.branch 2.7
+set python.prefix ${frameworks_dir}/Python.framework/Versions/${python.branch}
+
+configure.pkg_config_path ${python.prefix}/lib/pkgconfig
+configure.python ${prefix}/bin/python${python.branch}
+
+configure.env SPHINX_BUILD=${prefix}/bin/sphinx-build-${python.branch} \
+ PYTHON_EXTRA_LDFLAGS=' '
+configure.perl ${prefix}/bin/perl5.16
+
+
+configure.args --with-boost-python=mt \
+ --with-postgres-utils=${prefix}/lib/postgresql93/bin \
+ --disable-mysql \
+ --disable-silent-rules \
+ --disable-update-mime-database \
+ --disable-documentation
+
+universal_variant no
+
+post-activate {
+ system "${prefix}/bin/update-mime-database ${prefix}/share/mime"
+}
+
+livecheck.type gnome
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeglomfilespatchconfigureacdiff"></a>
<div class="addfile"><h4>Added: users/devans/GNOME-3/stable/dports/gnome/glom/files/patch-configure.ac.diff (0 => 121763)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/glom/files/patch-configure.ac.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/glom/files/patch-configure.ac.diff 2014-07-07 16:39:19 UTC (rev 121763)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+--- configure.ac.orig 2014-03-06 07:48:22.000000000 -0800
++++ configure.ac 2014-04-11 01:13:02.000000000 -0700
+@@ -63,8 +63,8 @@
+ # i18n
+ IT_PROG_INTLTOOL([0.35])
+
+-AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION([0.17])
++#AM_GNU_GETTEXT([external])
++#AM_GNU_GETTEXT_VERSION([0.17])
+
+ AC_SUBST([GETTEXT_PACKAGE], [glom])
+ AC_DEFINE([GETTEXT_PACKAGE], [PACKAGE_TARNAME], [Define to the gettext package name.])
+@@ -157,7 +157,10 @@
+
+
+ # Libraries used by libglom:
+-REQUIRED_LIBGLOM_LIBS='giomm-2.4 >= 2.32.0 libxml++-2.6 >= 2.23.1 libxslt >= 1.1.10 pygobject-3.0 >= 2.29.0 libgdamm-5.0 >= 4.99.6 libgda-5.0 >= 5.2.1 libgda-postgres-5.0 libgda-postgres-5.0 libgda-mysql-5.0 libarchive >= 3.0'
++REQUIRED_LIBGLOM_LIBS='giomm-2.4 >= 2.32.0 libxml++-2.6 >= 2.23.1 libxslt >= 1.1.10 pygobject-3.0 >= 2.29.0 libgdamm-5.0 >= 4.99.6 libgda-5.0 >= 5.2.1 libgda-postgres-5.0 libgda-postgres-5.0 libarchive >= 3.0'
++
++AS_IF([test "x$glom_enable_mysql" = xyes],
++ [REQUIRED_LIBGLOM_LIBS="$REQUIRED_LIBGLOM_LIBS libgda-mysql-5.0"])
+
+ AS_IF([test "x$glom_host_win32" != xyes],
+ [REQUIRED_LIBGLOM_LIBS="$REQUIRED_LIBGLOM_LIBS libepc-1.0 >= 0.4.0"])
+@@ -224,6 +227,17 @@
+ # so we can use pyexec_LTLIBRARIES in the .am files:
+ AM_PATH_PYTHON
+
++dnl Override standard python locations with MacPorts version specific ones
++
++AC_SUBST([PYTHON_PREFIX], [`$PYTHON -c 'import sys; print(sys.prefix);'`])
++AC_SUBST([PYTHON_EXEC_PREFIX], [`$PYTHON -c 'import sys; print(sys.exec_prefix)'`])
++
++am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
++am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
++
++AC_SUBST([pythondir], [$am_cv_python_pythondir])
++AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
++
+ # Get the compiler and linker flags for embedding Python.
+ # To specify a particular python version you must set an environment variable.
+ # For instance:
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeglomfilespatchglomframe_glomccdiff"></a>
<div class="addfile"><h4>Added: users/devans/GNOME-3/stable/dports/gnome/glom/files/patch-glom-frame_glom.cc.diff (0 => 121763)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/glom/files/patch-glom-frame_glom.cc.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/glom/files/patch-glom-frame_glom.cc.diff 2014-07-07 16:39:19 UTC (rev 121763)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- glom/frame_glom.cc.orig 2013-04-16 00:35:35.000000000 -0700
++++ glom/frame_glom.cc 2013-04-16 00:35:55.000000000 -0700
+@@ -1576,7 +1576,7 @@
+ //Get the fields information from the database:
+ DbUtils::type_vec_fields fieldsDatabase = DbUtils::get_fields_for_table_from_database(m_table_name);
+
+- Document* pDoc = dynamic_cast<const Document*>(get_document());
++ Document* pDoc = dynamic_cast<Document*>(get_document());
+ if(pDoc)
+ {
+ bool document_must_be_updated = false;
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeglomfilespatchglomlibglomconnectionpoolccdiff"></a>
<div class="addfile"><h4>Added: users/devans/GNOME-3/stable/dports/gnome/glom/files/patch-glom-libglom-connectionpool.cc.diff (0 => 121763)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/glom/files/patch-glom-libglom-connectionpool.cc.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/glom/files/patch-glom-libglom-connectionpool.cc.diff 2014-07-07 16:39:19 UTC (rev 121763)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- glom/libglom/connectionpool.cc.orig 2014-01-28 03:01:43.000000000 -0800
++++ glom/libglom/connectionpool.cc 2014-04-10 15:16:29.000000000 -0700
+@@ -612,7 +612,7 @@
+ // TODO: This is probably mingw specific
+ static __p_sig_fn_t previous_sig_handler = SIG_DFL;
+ #else
+-static sighandler_t previous_sig_handler = SIG_DFL; /* Arbitrary default */
++static sig_t previous_sig_handler = SIG_DFL; /* Arbitrary default */
+ #endif
+
+ /* This is a Linux/Unix signal handler,
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeglomfilespatchmacrosax_python_develm4diff"></a>
<div class="addfile"><h4>Added: users/devans/GNOME-3/stable/dports/gnome/glom/files/patch-macros-ax_python_devel.m4.diff (0 => 121763)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/glom/files/patch-macros-ax_python_devel.m4.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/glom/files/patch-macros-ax_python_devel.m4.diff 2014-07-07 16:39:19 UTC (rev 121763)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- macros/ax_python_devel.m4.orig 2014-04-10 15:29:03.000000000 -0700
++++ macros/ax_python_devel.m4 2014-04-10 15:32:54.000000000 -0700
+@@ -289,7 +289,7 @@
+ # save current global flags
+ ac_save_LIBS="$LIBS"
+ ac_save_CPPFLAGS="$CPPFLAGS"
+- LIBS="$ac_save_LIBS $PYTHON_LDFLAGS $PYTHON_EXTRA_LDFLAGS $PYTHON_EXTRA_LIBS"
++ LIBS="$ac_save_LIBS $PYTHON_LDFLAGS $PYTHON_EXTRA_LIBS"
+ CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
+ AC_LANG_PUSH([C])
+ AC_LINK_IFELSE([
</ins></span></pre>
</div>
</div>
</body>
</html>