<!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>[120079] trunk/dports/gnome/libgtkhtml3</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/120079">120079</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-05-14 16:39:01 -0700 (Wed, 14 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>libgtkhtml3: update m4/intltool.m4 and autoreconf to fix intltool configuration, add +glade variant to enable build of glade3 catalog items.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomelibgtkhtml3Portfile">trunk/dports/gnome/libgtkhtml3/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgnomelibgtkhtml3filespatchcomponentseditorMakefileamdiff">trunk/dports/gnome/libgtkhtml3/files/patch-components-editor-Makefile.am.diff</a></li>
<li><a href="#trunkdportsgnomelibgtkhtml3filespatchconfigureacdiff">trunk/dports/gnome/libgtkhtml3/files/patch-configure.ac.diff</a></li>
<li><a href="#trunkdportsgnomelibgtkhtml3filespatchgtkhtmleditorxmldiff">trunk/dports/gnome/libgtkhtml3/files/patch-gtkhtml-editor.xml.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgnomelibgtkhtml3filespatchconfigurediff">trunk/dports/gnome/libgtkhtml3/files/patch-configure.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomelibgtkhtml3Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/libgtkhtml3/Portfile (120078 => 120079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/libgtkhtml3/Portfile 2014-05-14 23:02:47 UTC (rev 120078)
+++ trunk/dports/gnome/libgtkhtml3/Portfile 2014-05-14 23:39:01 UTC (rev 120079)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> name libgtkhtml3
</span><span class="cx"> set my_name gtkhtml
</span><span class="cx"> version 3.32.2
</span><del>-revision 4
</del><ins>+revision 5
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx">
</span><span class="cx"> maintainers nomaintainer
</span><span class="lines">@@ -42,12 +42,31 @@
</span><span class="cx">
</span><span class="cx"> depends_run port:gnome-icon-theme
</span><span class="cx">
</span><del>-patchfiles patch-configure.diff
</del><ins>+patchfiles patch-configure.ac.diff \
+ patch-components-editor-Makefile.am.diff \
+ patch-gtkhtml-editor.xml.diff
</ins><span class="cx">
</span><ins>+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
+configure.args --enable-deprecated-warning-flags=no \
+ --disable-silent-rules
+
</ins><span class="cx"> test.run yes
</span><span class="cx"> test.dir $worksrcpath/gtkhtml
</span><span class="cx"> test.target test-verbose
</span><span class="cx">
</span><ins>+variant glade description {Build glade widget catalog} {
+ depends_lib-append port:glade3
+ configure.args-append --with-glade-catalog
+}
+
</ins><span class="cx"> livecheck.type gnome
</span><span class="cx"> livecheck.name ${my_name}
</span><span class="cx"> livecheck.regex {LATEST-IS-(3\.\d*[02468](?:\.\d+)*)}
</span></span></pre></div>
<a id="trunkdportsgnomelibgtkhtml3filespatchcomponentseditorMakefileamdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/gnome/libgtkhtml3/files/patch-components-editor-Makefile.am.diff (0 => 120079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/libgtkhtml3/files/patch-components-editor-Makefile.am.diff (rev 0)
+++ trunk/dports/gnome/libgtkhtml3/files/patch-components-editor-Makefile.am.diff 2014-05-14 23:39:01 UTC (rev 120079)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- components/editor/Makefile.am.orig 2014-05-14 16:22:58.000000000 -0700
++++ components/editor/Makefile.am 2014-05-14 16:24:07.000000000 -0700
+@@ -138,7 +138,7 @@
+ gtkhtml-color-swatch.c \
+ gtkhtml-combo-box.c
+
+-libglade_gtkhtml_editor_la_LDFLAGS = -module -avoid-version -no-undefined
++libglade_gtkhtml_editor_la_LDFLAGS = -module -avoid-version
+
+ libglade_gtkhtml_editor_la_LIBADD = @GTKHTML_CFLAGS@
+
</ins></span></pre></div>
<a id="trunkdportsgnomelibgtkhtml3filespatchconfigureacdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/gnome/libgtkhtml3/files/patch-configure.ac.diff (0 => 120079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/libgtkhtml3/files/patch-configure.ac.diff (rev 0)
+++ trunk/dports/gnome/libgtkhtml3/files/patch-configure.ac.diff 2014-05-14 23:39:01 UTC (rev 120079)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- configure.ac.orig 2014-05-14 14:51:10.000000000 -0700
++++ configure.ac 2014-05-14 14:52:07.000000000 -0700
+@@ -174,7 +174,7 @@
+ dnl **********************************
+ dnl GTKHTML modules
+ dnl **********************************
+-GTKHTML_MODULES="$GTK_PACKAGE >= $gtk_minimum_version enchant >= enchant_minimum_version gconf-2.0 iso-codes"
++GTKHTML_MODULES="$GTK_PACKAGE >= $gtk_minimum_version enchant >= enchant_minimum_version gconf-2.0 gthread-2.0 iso-codes"
+ PKG_CHECK_MODULES(GTKHTML, $GTKHTML_MODULES)
+ AC_SUBST(GTKHTML_CFLAGS)
+ AC_SUBST(GTKHTML_LIBS)
</ins></span></pre></div>
<a id="trunkdportsgnomelibgtkhtml3filespatchconfigurediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/gnome/libgtkhtml3/files/patch-configure.diff (120078 => 120079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/libgtkhtml3/files/patch-configure.diff 2014-05-14 23:02:47 UTC (rev 120078)
+++ trunk/dports/gnome/libgtkhtml3/files/patch-configure.diff 2014-05-14 23:39:01 UTC (rev 120079)
</span><span class="lines">@@ -1,24 +0,0 @@
</span><del>---- configure.orig 2011-02-05 22:12:31.000000000 -0600
-+++ configure 2012-04-30 12:35:34.000000000 -0500
-@@ -5761,11 +5761,8 @@
-
- if test "x${enable_deprecated_flags}" = "xyes"; then
-
-- list="-DG_DISABLE_DEPRECATED
-- -DPANGO_DISABLE_DEPRECATED
-- -DGDK_DISABLE_DEPRECATED
-+ list="-DPANGO_DISABLE_DEPRECATED
- -DGDK_PIXBUF_DISABLE_DEPRECATED
-- -DGTK_DISABLE_DEPRECATED
- -DGNOME_DISABLE_DEPRECATED"
- flags_supported=""
- flags_unsupported=""
-@@ -17350,7 +17350,7 @@ fi
-
-
-
--GTKHTML_MODULES="$GTK_PACKAGE >= $gtk_minimum_version enchant >= 1.1.7 gconf-2.0 iso-codes"
-+GTKHTML_MODULES="$GTK_PACKAGE >= $gtk_minimum_version enchant >= 1.1.7 gconf-2.0 gthread-2.0 iso-codes"
-
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKHTML" >&5
</del></span></pre></div>
<a id="trunkdportsgnomelibgtkhtml3filespatchgtkhtmleditorxmldiff"></a>
<div class="addfile"><h4>Added: trunk/dports/gnome/libgtkhtml3/files/patch-gtkhtml-editor.xml.diff (0 => 120079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/libgtkhtml3/files/patch-gtkhtml-editor.xml.diff (rev 0)
+++ trunk/dports/gnome/libgtkhtml3/files/patch-gtkhtml-editor.xml.diff 2014-05-14 23:39:01 UTC (rev 120079)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+From 6319f07b1cb4d4aabe4741a9ecc941378f1896fe Mon Sep 17 00:00:00 2001
+From: Matthew Barnes <mbarnes@redhat.com>
+Date: Mon, 5 Oct 2009 21:41:23 -0500
+Subject: Restore Glade catalog file.
+
+
+diff --git a/components/editor/gtkhtml-editor.xml b/components/editor/gtkhtml-editor.xml
+new file mode 100644
+index 0000000..cd91de3
+--- /dev/null
++++ components/editor/gtkhtml-editor.xml
+@@ -0,0 +1,28 @@
++<glade-catalog name="gtkhtml-editor" library="glade-gtkhtml-editor" depends="gtk+">
++
++ <glade-widget-classes>
++ <glade-widget-class name="GtkhtmlColorCombo" generic-name="color-combo" title="Color Combo Box">
++ <properties>
++ <property id="color"/>
++ <property id="popup-shown"/>
++ </properties>
++ </glade-widget-class>
++ <glade-widget-class name="GtkhtmlColorSwatch" generic-name="color-swatch" title="Color Swatch">
++ <properties>
++ <property id="color"/>
++ </properties>
++ </glade-widget-class>
++ <glade-widget-class name="GtkhtmlComboBox" generic-name="combo-box" title="Radio Action Combo Box">
++ <properties>
++ <property id="action"/>
++ </properties>
++ </glade-widget-class>
++ </glade-widget-classes>
++
++ <glade-widget-group name="widgets" title="GtkHTML Editor">
++ <glade-widget-class-ref name="GtkhtmlColorCombo"/>
++ <glade-widget-class-ref name="GtkhtmlColorSwatch"/>
++ <glade-widget-class-ref name="GtkhtmlComboBox"/>
++ </glade-widget-group>
++
++</glade-catalog>
+--
+cgit v0.10.1
+
</ins></span></pre>
</div>
</div>
</body>
</html>