<!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>[114039] users/devans/GNOME-3/stable/dports/gnome/gedit</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/114039">114039</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2013-11-27 10:09:40 -0800 (Wed, 27 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME-3/stable/dports: gedit, update to version 3.10.2, build fails 'duplicate symbol _gedit_app_x11_get_type'.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomegeditPortfile">users/devans/GNOME-3/stable/dports/gnome/gedit/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegeditfilespatchconfigurediff">users/devans/GNOME-3/stable/dports/gnome/gedit/files/patch-configure.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansGNOME3stabledportsgnomegeditPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gedit/Portfile (114038 => 114039)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gedit/Portfile 2013-11-27 18:00:06 UTC (rev 114038)
+++ users/devans/GNOME-3/stable/dports/gnome/gedit/Portfile 2013-11-27 18:09:40 UTC (rev 114039)
</span><span class="lines">@@ -1,11 +1,10 @@
</span><span class="cx"> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><del>-PortSystem 1.0
</del><ins>+PortSystem 1.0
</ins><span class="cx">
</span><span class="cx"> name gedit
</span><del>-version 2.30.4
-revision 7
</del><ins>+version 3.10.2
</ins><span class="cx"> license GPL-2
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description GNOME editor.
</span><span class="lines">@@ -17,63 +16,73 @@
</span><span class="cx"> homepage http://www.gnome.org/projects/gedit/
</span><span class="cx"> master_sites gnome:sources/${name}/${branch}/
</span><span class="cx">
</span><del>-checksums md5 e1eecb0a92a1a363b3d375ec5ac0fb3b \
- sha1 ff7f4088d0b89224b84406557a7d9970323fdcc3 \
- rmd160 b2659b8847ef02c66a70acd2f4a492555e1e4d21
</del><ins>+use_xz yes
</ins><span class="cx">
</span><del>-depends_build port:gtk-doc \
</del><ins>+checksums rmd160 1cb59a4259f208274ad48d409eba58bdc85030b4 \
+ sha256 cc607f877fb925af5c9a71935c70fb76238a62bf133b163471369bd183f15b69
+
+depends_build port:pkgconfig \
</ins><span class="cx"> port:intltool \
</span><del>- port:gnome-doc-utils \
- port:pkgconfig
</del><ins>+ port:itstool
</ins><span class="cx">
</span><span class="cx"> depends_lib port:desktop-file-utils \
</span><del>- port:gconf \
</del><ins>+ port:gnome-icon-theme \
+ port:gnome-icon-theme-symbolic \
+ port:gsettings-desktop-schemas \
+ port:gtk3 \
+ port:gvfs \
+ port:gtksourceview3 \
+ port:libpeas \
+ port:libsoup \
+ port:libxml2 \
+ port:enchant \
</ins><span class="cx"> port:iso-codes \
</span><del>- port:enchant \
- port:xorg-libsm \
- port:rarian
</del><ins>+ port:zeitgeist
</ins><span class="cx">
</span><span class="cx"> depends_run port:gnome-settings-daemon \
</span><span class="cx"> port:yelp
</span><span class="cx">
</span><del>-use_bzip2 yes
</del><ins>+pre-patch {
+ copy ${worksrcpath}/gedit ${worksrcpath}/gedit.orig
+}
</ins><span class="cx">
</span><del>-patchfiles patch-configure.diff
</del><ins>+patchfiles patch-configure.diff \
+ patch-gedit-gedit-app.c.diff
</ins><span class="cx">
</span><del>-configure.args --mandir=${prefix}/share/man \
- --disable-scrollkeeper \
- --disable-schemas-install \
- --disable-gvfs-metadata \
- --disable-updater
</del><ins>+configure.cflags-append \
+ -Wno-format-nonliteral
</ins><span class="cx">
</span><del>-variant python25 conflicts python26 python27 description {Use python 2.5} {
- configure.python ${prefix}/bin/python2.5
- depends_lib-append port:py25-pygtksourceview
-}
</del><ins>+configure.args --enable-zeitgeist \
+ --disable-python \
+ --disable-schemas-compile \
+ --disable-silent-rules
</ins><span class="cx">
</span><del>-variant python26 conflicts python25 python27 description {Use python 2.6} {
- configure.python ${prefix}/bin/python2.6
- depends_lib-append port:py26-pygtksourceview
- set python_framework ${frameworks_dir}/Python.framework/Versions/2.6
</del><ins>+# libpeas is not universal
+
+universal_variant no
+
+# minimum python version is 3.2.3
+
+variant python32 description {Use python 3.2} {
+ depends_lib-append port:py32-gobject3
+ configure.python ${prefix}/bin/python3.2
+ set python_framework ${frameworks_dir}/Python.framework/Versions/3.2
</ins><span class="cx"> configure.pkg_config_path ${python_framework}/lib/pkgconfig
</span><ins>+ configure.args-replace --disable-python --enable-python
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-variant python27 conflicts python25 python26 description {Use python 2.7} {
- configure.python ${prefix}/bin/python2.7
- depends_lib-append port:py27-pygtksourceview
- set python_framework ${frameworks_dir}/Python.framework/Versions/2.7
</del><ins>+variant python33 description {Use python 3.3} {
+ depends_lib-append port:py33-gobject3
+ configure.python ${prefix}/bin/python3.3
+ set python_framework ${frameworks_dir}/Python.framework/Versions/3.3
</ins><span class="cx"> configure.pkg_config_path ${python_framework}/lib/pkgconfig
</span><ins>+ configure.args-replace --disable-python --enable-python
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-if {![variant_isset python25] && ![variant_isset python26]} {
- default_variants +python27
-}
</del><ins>+default_variants +python32
</ins><span class="cx">
</span><span class="cx"> post-activate {
</span><del>- system "${prefix}/bin/scrollkeeper-update"
</del><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><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> livecheck.type gnome
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegeditfilespatchconfigurediff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gedit/files/patch-configure.diff (114038 => 114039)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gedit/files/patch-configure.diff 2013-11-27 18:00:06 UTC (rev 114038)
+++ users/devans/GNOME-3/stable/dports/gnome/gedit/files/patch-configure.diff 2013-11-27 18:09:40 UTC (rev 114039)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- configure.orig 2013-06-25 00:06:32.000000000 -0700
-+++ configure 2013-08-30 11:35:54.000000000 -0700
-@@ -16310,9 +16310,9 @@
</del><ins>+--- configure.orig 2013-11-13 02:04:23.000000000 -0800
++++ configure 2013-11-27 08:02:31.000000000 -0800
+@@ -16455,9 +16455,9 @@
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>