<!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>[134424] trunk/dports/multimedia/hdhomerun_gui</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/134424">134424</a></dd>
<dt>Author</dt> <dd>ctreleaven@macports.org</dd>
<dt>Date</dt> <dd>2015-03-25 07:13:19 -0700 (Wed, 25 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>hdhomerun_gui: bump to v20141210, only use X11 flavour of GTK, fixes 47238</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediahdhomerun_guiPortfile">trunk/dports/multimedia/hdhomerun_gui/Portfile</a></li>
<li><a href="#trunkdportsmultimediahdhomerun_guifilespatchlibhdhomerundiff">trunk/dports/multimedia/hdhomerun_gui/files/patch-libhdhomerun.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediahdhomerun_guifilespatchnoQuartzdiff">trunk/dports/multimedia/hdhomerun_gui/files/patch-noQuartz.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmultimediahdhomerun_guiPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/hdhomerun_gui/Portfile (134423 => 134424)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/hdhomerun_gui/Portfile 2015-03-25 14:06:09 UTC (rev 134423)
+++ trunk/dports/multimedia/hdhomerun_gui/Portfile 2015-03-25 14:13:19 UTC (rev 134424)
</span><span class="lines">@@ -3,10 +3,10 @@
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> PortGroup app 1.0
</span><ins>+PortGroup active_variants 1.1
</ins><span class="cx">
</span><span class="cx"> name hdhomerun_gui
</span><del>-version 20140604
-revision 1
</del><ins>+version 20141210
</ins><span class="cx"> categories multimedia
</span><span class="cx"> platforms darwin
</span><span class="cx"> license GPL-3
</span><span class="lines">@@ -22,12 +22,13 @@
</span><span class="cx"> distname hdhomerun_config_gui_${version}
</span><span class="cx"> patchfiles patch-libhdhomerun.diff \
</span><span class="cx"> patch-firmware_path.diff \
</span><del>- patch-missing_frameworks.diff
</del><ins>+ patch-missing_frameworks.diff \
+ patch-noQuartz.diff
</ins><span class="cx"> patch.args -p1
</span><span class="cx"> extract.suffix .tgz
</span><span class="cx"> worksrcdir hdhomerun_config_gui
</span><del>-checksums rmd160 0a43472f32c471d9bb675797e305ad31c02246e0 \
- sha256 aa0b330d99612fe25035074463ac40d1e2d7879040d6d8b3e2e9681032d82208
</del><ins>+checksums rmd160 768cbed2989e3e83e8d398c57b7ca68ff2caea1e \
+ sha256 23460550c6c9a085a6de54032fab8047aed1fe60e473fdb61f6efe124c5461e5
</ins><span class="cx">
</span><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url http://www.silicondust.com/support/hdhomerun/downloads/
</span><span class="lines">@@ -38,6 +39,9 @@
</span><span class="cx"> depends_run port:VLC \
</span><span class="cx"> path:bin/Xquartz:xorg-server
</span><span class="cx">
</span><ins>+require_active_variants port:VLC dvb
+require_active_variants port:gtk2 x11
+
</ins><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|@FIRMWARE_DIR@|${prefix}/share/hdhomerun/|g" \
</span><span class="cx"> ${worksrcpath}/src/HDHRConfig.cpp
</span><span class="lines">@@ -52,6 +56,8 @@
</span><span class="cx"> file attributes ${worksrcpath}/install-sh -permissions +x
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+use_autoconf yes
+
</ins><span class="cx"> app.name HDHomerun
</span><span class="cx"> app.executable hdhomerun_config_gui
</span><span class="cx"> app.icon ${worksrcpath}/OSX/hdhr.icns
</span></span></pre></div>
<a id="trunkdportsmultimediahdhomerun_guifilespatchlibhdhomerundiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/hdhomerun_gui/files/patch-libhdhomerun.diff (134423 => 134424)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/hdhomerun_gui/files/patch-libhdhomerun.diff 2015-03-25 14:06:09 UTC (rev 134423)
+++ trunk/dports/multimedia/hdhomerun_gui/files/patch-libhdhomerun.diff 2015-03-25 14:13:19 UTC (rev 134424)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> diff -ur hdhomerun_config_gui/Makefile.in.orig hdhomerun_config_gui/Makefile.in
</span><del>---- hdhomerun_config_gui/Makefile.in.orig 2014-05-19 18:41:10.000000000 -0400
-+++ hdhomerun_config_gui/Makefile.in 2014-10-12 10:42:47.000000000 -0400
-@@ -238,7 +238,7 @@
</del><ins>+--- hdhomerun_config_gui/Makefile.in.orig 2015-03-22 07:46:06.000000000 -0400
++++ hdhomerun_config_gui/Makefile.in 2015-03-22 07:59:13.000000000 -0400
+@@ -304,7 +304,7 @@
</ins><span class="cx"> top_build_prefix = @top_build_prefix@
</span><span class="cx"> top_builddir = @top_builddir@
</span><span class="cx"> top_srcdir = @top_srcdir@
</span><span class="lines">@@ -11,9 +11,9 @@
</span><span class="cx"> autogen.sh \
</span><span class="cx"> hdhomerun_config.glade \
</span><span class="cx"> diff -ur hdhomerun_config_gui/src/Makefile.in.orig hdhomerun_config_gui/src/Makefile.in
</span><del>---- hdhomerun_config_gui/src/Makefile.in.orig 2014-05-19 18:41:10.000000000 -0400
-+++ hdhomerun_config_gui/src/Makefile.in 2014-10-12 10:37:07.000000000 -0400
-@@ -205,7 +205,6 @@
</del><ins>+--- hdhomerun_config_gui/src/Makefile.in.orig 2015-03-22 07:50:13.000000000 -0400
++++ hdhomerun_config_gui/src/Makefile.in 2015-03-22 07:55:36.000000000 -0400
+@@ -279,7 +279,6 @@
</ins><span class="cx"> top_builddir = @top_builddir@
</span><span class="cx"> top_srcdir = @top_srcdir@
</span><span class="cx"> INCLUDES = \
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
</span><span class="cx"> -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
</span><span class="cx"> @PACKAGE_CFLAGS@
</span><del>-@@ -221,7 +220,7 @@
</del><ins>+@@ -295,7 +294,7 @@
</ins><span class="cx"> HDHRConfig.cpp HDHRConfig.h
</span><span class="cx">
</span><span class="cx"> hdhomerun_config_gui_LDADD = \
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> @PACKAGE_LIBS@ $(INTLLIBS)
</span><span class="cx">
</span><span class="cx"> all: all-am
</span><del>-@@ -478,7 +477,7 @@
</del><ins>+@@ -555,7 +554,7 @@
</ins><span class="cx">
</span><span class="cx"> install-dvi-am:
</span><span class="cx">
</span><span class="lines">@@ -39,12 +39,12 @@
</span><span class="cx">
</span><span class="cx"> install-html: install-html-am
</span><span class="cx">
</span><del>-@@ -526,7 +525,7 @@
- distclean-generic distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-binPROGRAMS \
- install-data install-data-am install-dvi install-dvi-am \
-- install-exec install-exec-am install-exec-local install-html \
-+ install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
</del><ins>++@@ -604,7 +603,7 @@
++ distdir dvi dvi-am html html-am info info-am install \
++ install-am install-binPROGRAMS install-data install-data-am \
++ install-dvi install-dvi-am install-exec install-exec-am \
++- install-exec-local install-html install-html-am install-info \
+++ install-html install-html-am install-info \
++ install-info-am install-man install-pdf install-pdf-am \
++ install-ps install-ps-am install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
</ins></span></pre></div>
<a id="trunkdportsmultimediahdhomerun_guifilespatchnoQuartzdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/hdhomerun_gui/files/patch-noQuartz.diff (0 => 134424)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/hdhomerun_gui/files/patch-noQuartz.diff (rev 0)
+++ trunk/dports/multimedia/hdhomerun_gui/files/patch-noQuartz.diff 2015-03-25 14:13:19 UTC (rev 134424)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+diff -ur hdhomerun_config_gui/configure.in.orig work/hdhomerun_config_gui/configure.in
+--- hdhomerun_config_gui/configure.in.orig 2015-03-25 09:12:30.000000000 -0400
++++ hdhomerun_config_gui/configure.in 2015-03-25 09:12:49.000000000 -0400
+@@ -7,7 +7,7 @@
+
+ case ${OSTYPE} in
+ darwin*)
+- LIBS="${LIBS} -framework CoreFoundation -framework CoreServices -lgtkmacintegration"
++ LIBS="${LIBS} -framework CoreFoundation -framework CoreServices"
+ ;
+ esac
+
+
+diff -u hdhomerun_config_gui/src/main.cpp.orig hdhomerun_config_gui/src/main.cpp
+--- hdhomerun_config_gui/src/main.cpp.orig 2015-03-23 14:56:45.000000000 -0400
++++ hdhomerun_config_gui/src/main.cpp 2015-03-23 14:58:50.000000000 -0400
+@@ -22,14 +22,6 @@
+ gtk_set_locale();
+ gtk_init(&argc, &argv);
+
+-#ifdef __APPLE__
+- GtkosxApplication *osx = (GtkosxApplication *)g_object_new (GTKOSX_TYPE_APPLICATION, NULL);
+- GtkWidget *menubar = gtk_menu_bar_new ();
+- gtkosx_application_set_menu_bar (osx, GTK_MENU_SHELL (menubar));
+- gtkosx_application_set_use_quartz_accelerators (osx, TRUE);
+- gtkosx_application_ready(osx);
+-#endif
+-
+ HDHRConfig HDHomeRunConfig;
+
+ gtk_main();
+diff -u hdhomerun_config_gui/src/Appinclude.h.orig hdhomerun_config_gui/src/Appinclude.h
+--- hdhomerun_config_gui/src/Appinclude.h.orig 2015-03-23 14:57:58.000000000 -0400
++++ hdhomerun_config_gui/src/Appinclude.h 2015-03-23 14:59:26.000000000 -0400
+@@ -13,7 +13,6 @@
+ # include <ApplicationServices/ApplicationServices.h>
+ # include <CoreServices/CoreServices.h>
+ # include <CoreFoundation/CoreFoundation.h>
+-# include <gtkmacintegration/gtkosxapplication.h>
+ #endif
+
+ #include "hdhomerun.h"
</ins></span></pre>
</div>
</div>
</body>
</html>