<!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>[114047] users/devans/GNOME-3/stable/dports/gnome/dconf</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/114047">114047</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2013-11-27 11:18:58 -0800 (Wed, 27 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME-3/stable/dports: dconf, sync with trunk, version 0.18.0.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomedconfPortfile">users/devans/GNOME-3/stable/dports/gnome/dconf/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomedconffilespatchfixlibnamesdiff">users/devans/GNOME-3/stable/dports/gnome/dconf/files/patch-fix-lib-names.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansGNOME3stabledportsgnomedconfPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/dconf/Portfile (114046 => 114047)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/dconf/Portfile 2013-11-27 19:16:48 UTC (rev 114046)
+++ users/devans/GNOME-3/stable/dports/gnome/dconf/Portfile 2013-11-27 19:18:58 UTC (rev 114047)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name dconf
</span><del>-version 0.16.1
</del><ins>+version 0.18.0
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> maintainers devans openmaintainer
</span><span class="cx"> categories gnome
</span><span class="lines">@@ -23,13 +23,15 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 3f2080c28b9a09289f4c44542b11cfaf1ef8709c \
- sha256 a551d04d06599ee9adde500c71ad8567d68f45420b6dbca10ca51e2834d80fee
</del><ins>+checksums rmd160 2d010c1998f093878f4be4ce8b46ee6066c9f9af \
+ sha256 109b1bc6078690af1ed88cb144ef5c5aee7304769d8bdc82ed48c3696f10c955
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><del>- port:intltool
</del><ins>+ port:intltool \
+ port:gtk-doc
</ins><span class="cx">
</span><del>-depends_lib port:gtk3 \
</del><ins>+depends_lib port:desktop-file-utils \
+ port:gtk3 \
</ins><span class="cx"> port:dbus \
</span><span class="cx"> port:libxml2
</span><span class="cx">
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomedconffilespatchfixlibnamesdiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/dconf/files/patch-fix-lib-names.diff (114046 => 114047)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/dconf/files/patch-fix-lib-names.diff 2013-11-27 19:16:48 UTC (rev 114046)
+++ users/devans/GNOME-3/stable/dports/gnome/dconf/files/patch-fix-lib-names.diff 2013-11-27 19:18:58 UTC (rev 114047)
</span><span class="lines">@@ -1,6 +1,5 @@
</span><del>-diff -ur dconf-0.16.1.orig/bin/Makefile.in dconf-0.16.1/bin/Makefile.in
---- bin/Makefile.in 2013-07-16 09:43:48.000000000 -0700
-+++ bin/Makefile.in 2013-09-10 13:49:03.000000000 -0700
</del><ins>+--- bin/Makefile.in.orig 2013-09-23 14:29:28.000000000 -0700
++++ bin/Makefile.in 2013-11-16 09:55:50.000000000 -0800
</ins><span class="cx"> @@ -98,7 +98,7 @@
</span><span class="cx"> dconf-dconf.$(OBJEXT)
</span><span class="cx"> dconf_OBJECTS = $(am_dconf_OBJECTS)
</span><span class="lines">@@ -10,7 +9,7 @@
</span><span class="cx"> dconf_LINK = $(CCLD) $(dconf_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
</span><span class="cx"> $(LDFLAGS) -o $@
</span><span class="cx"> AM_V_P = $(am__v_P_@AM_V@)
</span><del>-@@ -351,7 +351,7 @@
</del><ins>+@@ -352,7 +352,7 @@
</ins><span class="cx"> -w
</span><span class="cx">
</span><span class="cx"> dconf_LDADD = \
</span><span class="lines">@@ -19,9 +18,8 @@
</span><span class="cx"> $(gio_LIBS)
</span><span class="cx">
</span><span class="cx"> dconf_SOURCES = \
</span><del>-diff -ur dconf-0.16.1.orig/client/Makefile.in dconf-0.16.1/client/Makefile.in
---- client/Makefile.in 2013-07-16 09:43:48.000000000 -0700
-+++ client/Makefile.in 2013-09-10 13:49:03.000000000 -0700
</del><ins>+--- client/Makefile.in.orig 2013-09-23 14:29:28.000000000 -0700
++++ client/Makefile.in 2013-11-16 09:55:50.000000000 -0800
</ins><span class="cx"> @@ -83,7 +83,7 @@
</span><span class="cx"> $(srcdir)/Makefile.am $(srcdir)/dconf.pc.in \
</span><span class="cx"> $(top_srcdir)/aux/depcomp $(dconfclientinclude_HEADERS) \
</span><span class="lines">@@ -31,7 +29,7 @@
</span><span class="cx"> subdir = client
</span><span class="cx"> ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
</span><span class="cx"> am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
</span><del>-@@ -362,7 +362,7 @@
</del><ins>+@@ -363,7 +363,7 @@
</ins><span class="cx"> # initialize variables for unconditional += appending
</span><span class="cx"> TEST_PROGS =
</span><span class="cx"> shlibdir = $(libdir)
</span><span class="lines">@@ -40,7 +38,7 @@
</span><span class="cx"> noinst_LIBRARIES = libdconf-client.a
</span><span class="cx"> dconfinclude_HEADERS = dconf.h
</span><span class="cx"> dconfclientinclude_HEADERS = dconf-client.h
</span><del>-@@ -380,14 +380,14 @@
</del><ins>+@@ -381,14 +381,14 @@
</ins><span class="cx"> ../shm/libdconf-shm-shared.a \
</span><span class="cx"> $(gio_LIBS)
</span><span class="cx">
</span><span class="lines">@@ -57,7 +55,7 @@
</span><span class="cx"> all: all-am
</span><span class="cx">
</span><span class="cx"> .SUFFIXES:
</span><del>-@@ -476,8 +476,8 @@
</del><ins>+@@ -477,8 +477,8 @@
</ins><span class="cx"> clean-shlibPROGRAMS:
</span><span class="cx"> -test -z "$(shlib_PROGRAMS)" || rm -f $(shlib_PROGRAMS)
</span><span class="cx">
</span><span class="lines">@@ -68,7 +66,7 @@
</span><span class="cx"> $(AM_V_CCLD)$(libdconf_so_1_0_0_LINK) $(libdconf_so_1_0_0_OBJECTS) $(libdconf_so_1_0_0_LDADD) $(LIBS)
</span><span class="cx">
</span><span class="cx"> mostlyclean-compile:
</span><del>-@@ -899,16 +899,16 @@
</del><ins>+@@ -900,16 +900,16 @@
</ins><span class="cx"> # run tests in cwd as part of make check
</span><span class="cx"> check-local: test-nonrecursive
</span><span class="cx">
</span><span class="lines">@@ -91,9 +89,8 @@
</span><span class="cx">
</span><span class="cx"> # Tell versions [3.59,3.63) of GNU make to not export all variables.
</span><span class="cx"> # Otherwise a system limit (for SysV at least) may be exceeded.
</span><del>-diff -ur dconf-0.16.1.orig/dbus-1/Makefile.in dconf-0.16.1/dbus-1/Makefile.in
---- dbus-1/Makefile.in 2013-07-16 09:43:49.000000000 -0700
-+++ dbus-1/Makefile.in 2013-09-10 13:49:03.000000000 -0700
</del><ins>+--- dbus-1/Makefile.in.orig 2013-09-23 14:29:28.000000000 -0700
++++ dbus-1/Makefile.in 2013-11-16 09:55:50.000000000 -0800
</ins><span class="cx"> @@ -82,7 +82,7 @@
</span><span class="cx"> DIST_COMMON = $(top_srcdir)/Makefile.gtester $(srcdir)/Makefile.in \
</span><span class="cx"> $(srcdir)/Makefile.am $(srcdir)/dconf-dbus-1.pc.in \
</span><span class="lines">@@ -103,7 +100,7 @@
</span><span class="cx"> subdir = dbus-1
</span><span class="cx"> ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
</span><span class="cx"> am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
</span><del>-@@ -394,10 +394,10 @@
</del><ins>+@@ -395,10 +395,10 @@
</ins><span class="cx"> $(dbus_LIBS) \
</span><span class="cx"> $(glib_LIBS)
</span><span class="cx">
</span><span class="lines">@@ -117,7 +114,7 @@
</span><span class="cx"> all: all-am
</span><span class="cx">
</span><span class="cx"> .SUFFIXES:
</span><del>-@@ -491,8 +491,8 @@
</del><ins>+@@ -492,8 +492,8 @@
</ins><span class="cx"> clean-shlibPROGRAMS:
</span><span class="cx"> -test -z "$(shlib_PROGRAMS)" || rm -f $(shlib_PROGRAMS)
</span><span class="cx">
</span><span class="lines">@@ -128,7 +125,7 @@
</span><span class="cx"> $(AM_V_CCLD)$(libdconf_dbus_1_so_0_0_0_LINK) $(libdconf_dbus_1_so_0_0_0_OBJECTS) $(libdconf_dbus_1_so_0_0_0_LDADD) $(LIBS)
</span><span class="cx">
</span><span class="cx"> mostlyclean-compile:
</span><del>-@@ -882,16 +882,16 @@
</del><ins>+@@ -883,16 +883,16 @@
</ins><span class="cx"> # run tests in cwd as part of make check
</span><span class="cx"> check-local: test-nonrecursive
</span><span class="cx">
</span><span class="lines">@@ -151,20 +148,19 @@
</span><span class="cx">
</span><span class="cx"> # Tell versions [3.59,3.63) of GNU make to not export all variables.
</span><span class="cx"> # Otherwise a system limit (for SysV at least) may be exceeded.
</span><del>-diff -ur dconf-0.16.1.orig/editor/Makefile.in dconf-0.16.1/editor/Makefile.in
---- editor/Makefile.in 2013-07-16 09:43:49.000000000 -0700
-+++ editor/Makefile.in 2013-09-10 13:50:04.000000000 -0700
-@@ -101,7 +101,7 @@
- dconf_editor-dconf-view.$(OBJEXT)
- dconf_editor_OBJECTS = $(am_dconf_editor_OBJECTS)
</del><ins>+--- editor/Makefile.in.orig 2013-09-23 14:29:28.000000000 -0700
++++ editor/Makefile.in 2013-11-16 09:55:50.000000000 -0800
+@@ -103,7 +103,7 @@
+ dconf_editor_OBJECTS = $(am_dconf_editor_OBJECTS) \
+ $(nodist_dconf_editor_OBJECTS)
</ins><span class="cx"> am__DEPENDENCIES_1 =
</span><span class="cx"> -dconf_editor_DEPENDENCIES = ../client/libdconf.so.1 \
</span><span class="cx"> +dconf_editor_DEPENDENCIES = ../client/libdconf.1.dylib \
</span><span class="cx"> $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
</span><span class="cx"> $(am__DEPENDENCIES_1)
</span><span class="cx"> dconf_editor_LINK = $(CCLD) $(dconf_editor_CFLAGS) $(CFLAGS) \
</span><del>-@@ -353,7 +353,7 @@
- INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/client
</del><ins>+@@ -355,7 +355,7 @@
+ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/client
</ins><span class="cx"> dconf_editor_VALAFLAGS = --vapidir ../client --pkg gtk+-3.0 --pkg gmodule-2.0 --pkg libxml-2.0 --pkg dconf
</span><span class="cx"> dconf_editor_LDADD = \
</span><span class="cx"> - ../client/libdconf.so.1 \
</span></span></pre>
</div>
</div>
</body>
</html>