<!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>[149186] trunk/dports/multimedia/audacious-core</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/149186">149186</a></dd>
<dt>Author</dt> <dd>ionic@macports.org</dd>
<dt>Date</dt> <dd>2016-06-04 14:57:47 -0700 (Sat, 04 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>audacious-core: update to 3.7.2 including patchset.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaaudaciouscorePortfile">trunk/dports/multimedia/audacious-core/Portfile</a></li>
<li><a href="#trunkdportsmultimediaaudaciouscorefilespatchacincludem4droplibcswitchfromgnu11toc11diff">trunk/dports/multimedia/audacious-core/files/patch-acinclude.m4-drop-libc++-switch-from-gnu++11-to-c++11.diff</a></li>
<li><a href="#trunkdportsmultimediaaudaciouscorefilespatchbuildsysdiff">trunk/dports/multimedia/audacious-core/files/patch-buildsys.diff</a></li>
<li><a href="#trunkdportsmultimediaaudaciouscorefilespatchgtk3diff">trunk/dports/multimedia/audacious-core/files/patch-gtk3.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmultimediaaudaciouscorePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/audacious-core/Portfile (149185 => 149186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/audacious-core/Portfile 2016-06-04 21:57:39 UTC (rev 149185)
+++ trunk/dports/multimedia/audacious-core/Portfile 2016-06-04 21:57:47 UTC (rev 149186)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> set real_name audacious
</span><span class="cx">
</span><span class="cx"> # Please keep audacious, audacious-core and audacious-plugins synchronized.
</span><del>-version 3.6.2
</del><ins>+version 3.7.2
</ins><span class="cx"> revision 0
</span><span class="cx">
</span><span class="cx"> license BSD
</span><span class="lines">@@ -32,8 +32,8 @@
</span><span class="cx"> master_sites http://distfiles.audacious-media-player.org
</span><span class="cx"> distname ${real_name}-${version}
</span><span class="cx"> use_bzip2 yes
</span><del>-checksums rmd160 49b90b59140577bc220ffd8fd08ada1befb7a83a \
- sha256 b2fdb9f3cafd65b2afc50efea6f17a7a329547f1d394f525870e42cb0483cb04
</del><ins>+checksums rmd160 83faedd98deea056f319bf7723d3e8cc7383ede5 \
+ sha256 04f9eaba4522ce9674e6ed8afc7bd6b5fa9a1e240f8090589fc1874f6659f340
</ins><span class="cx">
</span><span class="cx"> universal_variant no
</span><span class="cx">
</span><span class="lines">@@ -51,11 +51,12 @@
</span><span class="cx"> path:lib/pkgconfig/dbus-1.pc:dbus \
</span><span class="cx"> path:lib/pkgconfig/glib-2.0.pc:glib2
</span><span class="cx">
</span><del>-# Note: rpath is required on Mac OS X.
</del><ins>+# Note: rpath is required on OS X.
</ins><span class="cx"> configure.args --enable-nls \
</span><span class="cx"> --enable-rpath \
</span><span class="cx"> --enable-dbus \
</span><del>- --disable-chardet \
</del><ins>+ --disable-qt \
+ --disable-gtk \
</ins><span class="cx"> --disable-valgrind
</span><span class="cx">
</span><span class="cx"> use_autoreconf yes
</span><span class="lines">@@ -69,12 +70,6 @@
</span><span class="cx"> ${destroot}${prefix}/share/doc/${real_name}
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# Needs libguess, which is currently not ported.
-#variant chardet description {Try to handle non-UTF8 chinese/japanese/korean ID3 tags} {
-# configure.args-replace --disable-chardet \
-# --enable-chardet
-#}
-
</del><span class="cx"> variant qt5 description {Add Qt5 support} {
</span><span class="cx"> PortGroup qt5 1.0
</span><span class="cx">
</span><span class="lines">@@ -103,8 +98,8 @@
</span><span class="cx"> --enable-gtk
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# Need either one of gtk2 or gtk3. Default to gtk2, which is preferred by upstream.
-if {![variant_isset gtk2] && ![variant_isset gtk3]} {
</del><ins>+# Need either one of gtk2, gtk3 or Qt5 to have a GUI. Default to gtk2, which is preferred by upstream.
+if {![variant_isset gtk2] && ![variant_isset gtk3] && ![variant_isset qt5]} {
</ins><span class="cx"> default_variants-append +gtk2
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsmultimediaaudaciouscorefilespatchacincludem4droplibcswitchfromgnu11toc11diff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/audacious-core/files/patch-acinclude.m4-drop-libc++-switch-from-gnu++11-to-c++11.diff (149185 => 149186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/audacious-core/files/patch-acinclude.m4-drop-libc++-switch-from-gnu++11-to-c++11.diff 2016-06-04 21:57:39 UTC (rev 149185)
+++ trunk/dports/multimedia/audacious-core/files/patch-acinclude.m4-drop-libc++-switch-from-gnu++11-to-c++11.diff 2016-06-04 21:57:47 UTC (rev 149186)
</span><span class="lines">@@ -2,14 +2,14 @@
</span><span class="cx"> +++ acinclude.m4
</span><span class="cx"> @@ -83,8 +83,8 @@ AC_REQUIRE([AC_SYS_LARGEFILE])
</span><span class="cx"> if test "x$GCC" = "xyes"; then
</span><del>- CFLAGS="$CFLAGS -std=gnu99 -ffast-math -Wall -pipe"
</del><ins>+ CFLAGS="$CFLAGS -std=gnu99 -ffast-math -Wall -pipe -Wno-deprecated-declarations"
</ins><span class="cx"> if test "x$HAVE_DARWIN" = "xyes"; then
</span><del>-- CXXFLAGS="$CXXFLAGS -stdlib=libc++ -std=gnu++11 -ffast-math -Wall -pipe"
</del><ins>+- CXXFLAGS="$CXXFLAGS -stdlib=libc++ -std=gnu++11 -ffast-math -Wall -pipe -Wno-deprecated-declarations"
</ins><span class="cx"> - LDFLAGS="$LDFLAGS -lc++ -stdlib=libc++"
</span><del>-+ CXXFLAGS="$CXXFLAGS -std=c++11 -ffast-math -Wall -pipe"
</del><ins>++ CXXFLAGS="$CXXFLAGS -std=c++11 -ffast-math -Wall -pipe -Wno-deprecated-declarations"
</ins><span class="cx"> + LDFLAGS="$LDFLAGS"
</span><span class="cx"> else
</span><del>- CXXFLAGS="$CXXFLAGS -std=gnu++11 -ffast-math -Wall -pipe"
</del><ins>+ CXXFLAGS="$CXXFLAGS -std=gnu++11 -ffast-math -Wall -pipe -Wno-deprecated-declarations"
</ins><span class="cx"> fi
</span><span class="cx"> @@ -101,7 +101,7 @@ if test "x$HAVE_DARWIN" = "xyes"; then
</span><span class="cx"> AC_PROG_OBJCXX
</span></span></pre></div>
<a id="trunkdportsmultimediaaudaciouscorefilespatchbuildsysdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/audacious-core/files/patch-buildsys.diff (149185 => 149186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/audacious-core/files/patch-buildsys.diff 2016-06-04 21:57:39 UTC (rev 149185)
+++ trunk/dports/multimedia/audacious-core/files/patch-buildsys.diff 2016-06-04 21:57:47 UTC (rev 149186)
</span><span class="lines">@@ -1,6 +1,21 @@
</span><span class="cx"> --- buildsys.mk.in.orig
</span><span class="cx"> +++ buildsys.mk.in
</span><del>-@@ -107,19 +107,24 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
</del><ins>+@@ -1,5 +1,5 @@
+ #
+-# Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012
++# Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+ # Jonathan Schleifer <js@webkeks.org>
+ #
+ # https://webkeks.org/git/?p=buildsys.git
+@@ -45,6 +45,7 @@ OBJCFLAGS = @OBJCFLAGS@
+ OBJCXXFLAGS = @OBJCXXFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LDFLAGS_RPATH = @LDFLAGS_RPATH@
++LDFLAGS_INSTALL_NAME = @LDFLAGS_INSTALL_NAME@
+ LIBS = @LIBS@
+ PYTHON_FLAGS = @PYTHON_FLAGS@
+ PROG_IMPLIB_NEEDED = @PROG_IMPLIB_NEEDED@
+@@ -107,19 +108,24 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
</ins><span class="cx">
</span><span class="cx"> MO_FILES = ${LOCALES:.po=.mo}
</span><span class="cx">
</span><span class="lines">@@ -28,7 +43,7 @@
</span><span class="cx"> for i in $@; do \
</span><span class="cx"> ${DIR_ENTER}; \
</span><span class="cx"> ${MAKE} ${MFLAGS} || exit $$?; \
</span><del>-@@ -205,6 +210,7 @@ pre-depend:
</del><ins>+@@ -205,6 +211,7 @@ pre-depend:
</ins><span class="cx">
</span><span class="cx"> ${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
</span><span class="cx"> ${LINK_STATUS}
</span><span class="lines">@@ -36,7 +51,7 @@
</span><span class="cx"> if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LDFLAGS} ${LIBS}; then \
</span><span class="cx"> ${LINK_OK}; \
</span><span class="cx"> else \
</span><del>-@@ -228,7 +234,8 @@ ${JARFILE}: ${EXT_DEPS} ${JAR_MANIFEST} ${OBJS} ${OBJS_EXTRA}
</del><ins>+@@ -228,7 +235,8 @@ ${JARFILE}: ${EXT_DEPS} ${JAR_MANIFEST} ${OBJS} ${OBJS_EXTRA}
</ins><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
</span><span class="lines">@@ -46,7 +61,16 @@
</span><span class="cx"> objs=""; \
</span><span class="cx"> ars=""; \
</span><span class="cx"> for i in ${LIB_OBJS} ${LIB_OBJS_EXTRA}; do \
</span><del>-@@ -264,6 +271,7 @@ ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
</del><ins>+@@ -252,7 +260,7 @@ ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
+ done; \
+ cd ..; \
+ done; \
+- if ${LD} -o $@ $$objs ${LIB_LDFLAGS} ${LDFLAGS} ${LIBS}; then \
++ if ${LD} -o $@ $$objs ${LIB_LDFLAGS} ${LDFLAGS_INSTALL_NAME} ${LDFLAGS} ${LIBS}; then \
+ ${LINK_OK}; \
+ else \
+ ${LINK_FAILED}; \
+@@ -264,6 +272,7 @@ ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
</ins><span class="cx">
</span><span class="cx"> ${PLUGIN} ${PLUGIN_NOINST}: ${EXT_DEPS} ${PLUGIN_OBJS}
</span><span class="cx"> ${LINK_STATUS}
</span><span class="lines">@@ -54,7 +78,7 @@
</span><span class="cx"> objs=""; \
</span><span class="cx"> ars=""; \
</span><span class="cx"> for i in ${PLUGIN_OBJS}; do \
</span><del>-@@ -300,6 +308,7 @@ ${PLUGIN} ${PLUGIN_NOINST}: ${EXT_DEPS} ${PLUGIN_OBJS}
</del><ins>+@@ -300,6 +309,7 @@ ${PLUGIN} ${PLUGIN_NOINST}: ${EXT_DEPS} ${PLUGIN_OBJS}
</ins><span class="cx"> ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
</span><span class="cx"> ${LINK_STATUS}
</span><span class="cx"> rm -f $@
</span><span class="lines">@@ -62,7 +86,7 @@
</span><span class="cx"> objs=""; \
</span><span class="cx"> ars=""; \
</span><span class="cx"> for i in ${OBJS} ${OBJS_EXTRA}; do \
</span><del>-@@ -337,6 +346,7 @@ ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
</del><ins>+@@ -337,6 +347,7 @@ ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
</ins><span class="cx"> ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
</span><span class="cx"> ${LINK_STATUS}
</span><span class="cx"> rm -f $@
</span><span class="lines">@@ -70,61 +94,69 @@
</span><span class="cx"> objs=""; \
</span><span class="cx"> ars=""; \
</span><span class="cx"> for i in ${LIB_OBJS} ${LIB_OBJS_EXTRA}; do \
</span><del>-@@ -375,6 +385,8 @@ locales: ${MO_FILES}
</del><ins>+@@ -375,21 +386,27 @@ locales: ${MO_FILES}
</ins><span class="cx">
</span><span class="cx"> .c.o:
</span><span class="cx"> ${COMPILE_STATUS}
</span><ins>+- if ${CC} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
</ins><span class="cx"> + in="$<"; \
</span><span class="cx"> + out="$@"; \
</span><del>- if ${CC} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
</del><ins>++ if ${CC} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$@} -c -o $@ $<; then \
</ins><span class="cx"> ${COMPILE_OK}; \
</span><span class="cx"> else \
</span><del>-@@ -382,6 +394,8 @@ locales: ${MO_FILES}
</del><ins>+ ${COMPILE_FAILED}; \
</ins><span class="cx"> fi
</span><span class="cx"> .c.lib.o:
</span><span class="cx"> ${COMPILE_LIB_STATUS}
</span><ins>+- if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
</ins><span class="cx"> + in="$<"; \
</span><span class="cx"> + out="$@"; \
</span><del>- if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
</del><ins>++ if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$@} -c -o $@ $<; then \
</ins><span class="cx"> ${COMPILE_LIB_OK}; \
</span><span class="cx"> else \
</span><del>-@@ -389,6 +403,8 @@ locales: ${MO_FILES}
</del><ins>+ ${COMPILE_LIB_FAILED}; \
</ins><span class="cx"> fi
</span><span class="cx"> .c.plugin.o:
</span><span class="cx"> ${COMPILE_PLUGIN_STATUS}
</span><ins>+- if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
</ins><span class="cx"> + in="$<"; \
</span><span class="cx"> + out="$@"; \
</span><del>- if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
</del><ins>++ if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$@} -c -o $@ $<; then \
</ins><span class="cx"> ${COMPILE_PLUGIN_OK}; \
</span><span class="cx"> else \
</span><del>-@@ -397,6 +413,8 @@ locales: ${MO_FILES}
</del><ins>+ ${COMPILE_PLUGIN_FAILED}; \
+@@ -397,21 +414,27 @@ locales: ${MO_FILES}
</ins><span class="cx">
</span><span class="cx"> .cc.o .cxx.o:
</span><span class="cx"> ${COMPILE_STATUS}
</span><ins>+- if ${CXX} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
</ins><span class="cx"> + in="$<"; \
</span><span class="cx"> + out="$@"; \
</span><del>- if ${CXX} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
</del><ins>++ if ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXFLAGS_$@} -c -o $@ $<; then \
</ins><span class="cx"> ${COMPILE_OK}; \
</span><span class="cx"> else \
</span><del>-@@ -404,6 +422,8 @@ locales: ${MO_FILES}
</del><ins>+ ${COMPILE_FAILED}; \
</ins><span class="cx"> fi
</span><span class="cx"> .cc.lib.o .cxx.lib.o:
</span><span class="cx"> ${COMPILE_LIB_STATUS}
</span><ins>+- if ${CXX} ${LIB_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
</ins><span class="cx"> + in="$<"; \
</span><span class="cx"> + out="$@"; \
</span><del>- if ${CXX} ${LIB_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
</del><ins>++ if ${CXX} ${LIB_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${CXXFLAGS_$@} -c -o $@ $<; then \
</ins><span class="cx"> ${COMPILE_LIB_OK}; \
</span><span class="cx"> else \
</span><del>-@@ -411,6 +431,8 @@ locales: ${MO_FILES}
</del><ins>+ ${COMPILE_LIB_FAILED}; \
</ins><span class="cx"> fi
</span><span class="cx"> .cc.plugin.o .cxx.plugin.o:
</span><span class="cx"> ${COMPILE_PLUGIN_STATUS}
</span><ins>+- if ${CXX} ${PLUGIN_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
</ins><span class="cx"> + in="$<"; \
</span><span class="cx"> + out="$@"; \
</span><del>- if ${CXX} ${PLUGIN_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
</del><ins>++ if ${CXX} ${PLUGIN_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${CXXFLAGS_$@} -c -o $@ $<; then \
</ins><span class="cx"> ${COMPILE_PLUGIN_OK}; \
</span><span class="cx"> else \
</span><del>-@@ -419,6 +441,8 @@ locales: ${MO_FILES}
</del><ins>+ ${COMPILE_PLUGIN_FAILED}; \
+@@ -419,6 +442,8 @@ locales: ${MO_FILES}
</ins><span class="cx">
</span><span class="cx"> .d.o:
</span><span class="cx"> ${COMPILE_STATUS}
</span><span class="lines">@@ -133,7 +165,7 @@
</span><span class="cx"> if test x"$(basename ${DC})" = x"dmd"; then \
</span><span class="cx"> if ${DC} ${DFLAGS} -c -of$@ $<; then \
</span><span class="cx"> ${COMPILE_OK}; \
</span><del>-@@ -435,6 +459,8 @@ locales: ${MO_FILES}
</del><ins>+@@ -435,6 +460,8 @@ locales: ${MO_FILES}
</ins><span class="cx">
</span><span class="cx"> .erl.beam:
</span><span class="cx"> ${COMPILE_STATUS}
</span><span class="lines">@@ -142,7 +174,7 @@
</span><span class="cx"> if ${ERLC} ${ERLCFLAGS} -o $@ $<; then \
</span><span class="cx"> ${COMPILE_OK}; \
</span><span class="cx"> else \
</span><del>-@@ -443,6 +469,8 @@ locales: ${MO_FILES}
</del><ins>+@@ -443,6 +470,8 @@ locales: ${MO_FILES}
</ins><span class="cx">
</span><span class="cx"> .java.class:
</span><span class="cx"> ${COMPILE_STATUS}
</span><span class="lines">@@ -151,61 +183,69 @@
</span><span class="cx"> if ${JAVAC} ${JAVACFLAGS} $<; then \
</span><span class="cx"> ${COMPILE_OK}; \
</span><span class="cx"> else \
</span><del>-@@ -451,6 +479,8 @@ locales: ${MO_FILES}
</del><ins>+@@ -451,21 +480,27 @@ locales: ${MO_FILES}
</ins><span class="cx">
</span><span class="cx"> .m.o:
</span><span class="cx"> ${COMPILE_STATUS}
</span><ins>+- if ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
</ins><span class="cx"> + in="$<"; \
</span><span class="cx"> + out="$@"; \
</span><del>- if ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
</del><ins>++ if ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} ${OBJCFLAGS_$@} -c -o $@ $<; then \
</ins><span class="cx"> ${COMPILE_OK}; \
</span><span class="cx"> else \
</span><del>-@@ -458,6 +488,8 @@ locales: ${MO_FILES}
</del><ins>+ ${COMPILE_FAILED}; \
</ins><span class="cx"> fi
</span><span class="cx"> .m.lib.o:
</span><span class="cx"> ${COMPILE_LIB_STATUS}
</span><ins>+- if ${OBJC} ${LIB_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
</ins><span class="cx"> + in="$<"; \
</span><span class="cx"> + out="$@"; \
</span><del>- if ${OBJC} ${LIB_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
</del><ins>++ if ${OBJC} ${LIB_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} ${OBJCFLAGS_$@} -c -o $@ $<; then \
</ins><span class="cx"> ${COMPILE_LIB_OK}; \
</span><span class="cx"> else \
</span><del>-@@ -465,6 +497,8 @@ locales: ${MO_FILES}
</del><ins>+ ${COMPILE_LIB_FAILED}; \
</ins><span class="cx"> fi
</span><span class="cx"> .m.plugin.o:
</span><span class="cx"> ${COMPILE_PLUGIN_STATUS}
</span><ins>+- if ${OBJC} ${PLUGIN_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
</ins><span class="cx"> + in="$<"; \
</span><span class="cx"> + out="$@"; \
</span><del>- if ${OBJC} ${PLUGIN_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
</del><ins>++ if ${OBJC} ${PLUGIN_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} ${OBJCFLAGS_$@} -c -o $@ $<; then \
</ins><span class="cx"> ${COMPILE_PLUGIN_OK}; \
</span><span class="cx"> else \
</span><del>-@@ -473,6 +507,8 @@ locales: ${MO_FILES}
</del><ins>+ ${COMPILE_PLUGIN_FAILED}; \
+@@ -473,21 +508,27 @@ locales: ${MO_FILES}
</ins><span class="cx">
</span><span class="cx"> .mm.o:
</span><span class="cx"> ${COMPILE_STATUS}
</span><ins>+- if ${OBJCXX} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
</ins><span class="cx"> + in="$<"; \
</span><span class="cx"> + out="$@"; \
</span><del>- if ${OBJCXX} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
</del><ins>++ if ${OBJCXX} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${OBJCXXFLAGS_$@} -c -o $@ $<; then \
</ins><span class="cx"> ${COMPILE_OK}; \
</span><span class="cx"> else \
</span><del>-@@ -480,6 +516,8 @@ locales: ${MO_FILES}
</del><ins>+ ${COMPILE_FAILED}; \
</ins><span class="cx"> fi
</span><span class="cx"> .mm.lib.o:
</span><span class="cx"> ${COMPILE_LIB_STATUS}
</span><ins>+- if ${OBJCXX} ${LIB_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
</ins><span class="cx"> + in="$<"; \
</span><span class="cx"> + out="$@"; \
</span><del>- if ${OBJCXX} ${LIB_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
</del><ins>++ if ${OBJCXX} ${LIB_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${OBJCXXFLAGS_$@} -c -o $@ $<; then \
</ins><span class="cx"> ${COMPILE_LIB_OK}; \
</span><span class="cx"> else \
</span><del>-@@ -487,6 +525,8 @@ locales: ${MO_FILES}
</del><ins>+ ${COMPILE_LIB_FAILED}; \
</ins><span class="cx"> fi
</span><span class="cx"> .mm.plugin.o:
</span><span class="cx"> ${COMPILE_PLUGIN_STATUS}
</span><ins>+- if ${OBJCXX} ${PLUGIN_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
</ins><span class="cx"> + in="$<"; \
</span><span class="cx"> + out="$@"; \
</span><del>- if ${OBJCXX} ${PLUGIN_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
</del><ins>++ if ${OBJCXX} ${PLUGIN_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${OBJCXXFLAGS_$@} -c -o $@ $<; then \
</ins><span class="cx"> ${COMPILE_PLUGIN_OK}; \
</span><span class="cx"> else \
</span><del>-@@ -495,6 +535,8 @@ locales: ${MO_FILES}
</del><ins>+ ${COMPILE_PLUGIN_FAILED}; \
+@@ -495,6 +536,8 @@ locales: ${MO_FILES}
</ins><span class="cx">
</span><span class="cx"> .po.mo:
</span><span class="cx"> ${COMPILE_STATUS}
</span><span class="lines">@@ -214,7 +254,7 @@
</span><span class="cx"> if ${MSGFMT} -c -o $@ $<; then \
</span><span class="cx"> ${COMPILE_OK}; \
</span><span class="cx"> else \
</span><del>-@@ -503,6 +545,8 @@ locales: ${MO_FILES}
</del><ins>+@@ -503,6 +546,8 @@ locales: ${MO_FILES}
</ins><span class="cx">
</span><span class="cx"> .py.pyc:
</span><span class="cx"> ${COMPILE_STATUS}
</span><span class="lines">@@ -223,7 +263,7 @@
</span><span class="cx"> if ${PYTHON} ${PYTHON_FLAGS} -c "import py_compile; py_compile.compile('$<')"; then \
</span><span class="cx"> ${COMPILE_OK}; \
</span><span class="cx"> else \
</span><del>-@@ -511,7 +555,9 @@ locales: ${MO_FILES}
</del><ins>+@@ -511,7 +556,9 @@ locales: ${MO_FILES}
</ins><span class="cx">
</span><span class="cx"> .rc.o .rc.lib.o .rc.plugin.o:
</span><span class="cx"> ${COMPILE_STATUS}
</span><span class="lines">@@ -234,58 +274,65 @@
</span><span class="cx"> ${COMPILE_OK}; \
</span><span class="cx"> else \
</span><span class="cx"> ${COMPILE_FAILED}; \
</span><del>-@@ -519,6 +565,8 @@ locales: ${MO_FILES}
</del><ins>+@@ -519,21 +566,27 @@ locales: ${MO_FILES}
</ins><span class="cx">
</span><span class="cx"> .S.o:
</span><span class="cx"> ${COMPILE_STATUS}
</span><ins>+- if ${AS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
</ins><span class="cx"> + in="$<"; \
</span><span class="cx"> + out="$@"; \
</span><del>- if ${AS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
</del><ins>++ if ${AS} ${ASFLAGS} ${CPPFLAGS} ${ASFLAGS_$@} -c -o $@ $<; then \
</ins><span class="cx"> ${COMPILE_OK}; \
</span><span class="cx"> else \
</span><del>-@@ -526,6 +574,8 @@ locales: ${MO_FILES}
</del><ins>+ ${COMPILE_FAILED}; \
</ins><span class="cx"> fi
</span><span class="cx"> .S.lib.o:
</span><span class="cx"> ${COMPILE_LIB_STATUS}
</span><ins>+- if ${AS} ${LIB_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
</ins><span class="cx"> + in="$<"; \
</span><span class="cx"> + out="$@"; \
</span><del>- if ${AS} ${LIB_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
</del><ins>++ if ${AS} ${LIB_CFLAGS} ${ASFLAGS} ${CPPFLAGS} ${ASFLAGS_$@} -c -o $@ $<; then \
</ins><span class="cx"> ${COMPILE_LIB_OK}; \
</span><span class="cx"> else \
</span><del>-@@ -533,6 +583,8 @@ locales: ${MO_FILES}
</del><ins>+ ${COMPILE_LIB_FAILED}; \
</ins><span class="cx"> fi
</span><span class="cx"> .S.plugin.o:
</span><span class="cx"> ${COMPILE_PLUGIN_STATUS}
</span><ins>+- if ${AS} ${PLUGIN_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
</ins><span class="cx"> + in="$<"; \
</span><span class="cx"> + out="$@"; \
</span><del>- if ${AS} ${PLUGIN_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
</del><ins>++ if ${AS} ${PLUGIN_CFLAGS} ${ASFLAGS} ${CPPFLAGS} ${ASFLAGS_$@} -c -o $@ $<; then \
</ins><span class="cx"> ${COMPILE_PLUGIN_OK}; \
</span><span class="cx"> else \
</span><del>-@@ -541,6 +593,8 @@ locales: ${MO_FILES}
</del><ins>+ ${COMPILE_PLUGIN_FAILED}; \
+@@ -541,28 +594,34 @@ locales: ${MO_FILES}
</ins><span class="cx">
</span><span class="cx"> .xpm.o:
</span><span class="cx"> ${COMPILE_STATUS}
</span><ins>+- if ${CC} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
</ins><span class="cx"> + in="$<"; \
</span><span class="cx"> + out="$@"; \
</span><del>- if ${CC} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
</del><ins>++ if ${CC} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$@} -x c -c -o $@ $<; then \
</ins><span class="cx"> ${COMPILE_OK}; \
</span><span class="cx"> else \
</span><del>-@@ -548,6 +602,8 @@ locales: ${MO_FILES}
</del><ins>+ ${COMPILE_FAILED}; \
</ins><span class="cx"> fi
</span><span class="cx"> .xpm.lib.o:
</span><span class="cx"> ${COMPILE_LIB_STATUS}
</span><ins>+- if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
</ins><span class="cx"> + in="$<"; \
</span><span class="cx"> + out="$@"; \
</span><del>- if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
</del><ins>++ if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$@} -x c -c -o $@ $<; then \
</ins><span class="cx"> ${COMPILE_LIB_OK}; \
</span><span class="cx"> else \
</span><del>-@@ -555,14 +611,16 @@ locales: ${MO_FILES}
</del><ins>+ ${COMPILE_LIB_FAILED}; \
</ins><span class="cx"> fi
</span><span class="cx"> .xpm.plugin.o:
</span><span class="cx"> ${COMPILE_PLUGIN_STATUS}
</span><ins>+- if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
</ins><span class="cx"> + in="$<"; \
</span><span class="cx"> + out="$@"; \
</span><del>- if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
</del><ins>++ if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$@} -x c -c -o $@ $<; then \
</ins><span class="cx"> ${COMPILE_PLUGIN_OK}; \
</span><span class="cx"> else \
</span><span class="cx"> ${COMPILE_PLUGIN_FAILED}; \
</span><span class="lines">@@ -298,7 +345,7 @@
</span><span class="cx"> ${DIR_ENTER}; \
</span><span class="cx"> ${MAKE} ${MFLAGS} install || exit $$?; \
</span><span class="cx"> ${DIR_LEAVE}; \
</span><del>-@@ -643,7 +701,7 @@ install: install-extra
</del><ins>+@@ -643,7 +702,7 @@ install: install-extra
</ins><span class="cx"> install-extra:
</span><span class="cx">
</span><span class="cx"> uninstall: uninstall-extra
</span><span class="lines">@@ -307,7 +354,7 @@
</span><span class="cx"> ${DIR_ENTER}; \
</span><span class="cx"> ${MAKE} ${MFLAGS} uninstall || exit $$?; \
</span><span class="cx"> ${DIR_LEAVE}; \
</span><del>-@@ -736,7 +794,7 @@ uninstall: uninstall-extra
</del><ins>+@@ -736,7 +795,7 @@ uninstall: uninstall-extra
</ins><span class="cx"> uninstall-extra:
</span><span class="cx">
</span><span class="cx"> clean:
</span><span class="lines">@@ -316,7 +363,7 @@
</span><span class="cx"> ${DIR_ENTER}; \
</span><span class="cx"> ${MAKE} ${MFLAGS} clean || exit $$?; \
</span><span class="cx"> ${DIR_LEAVE}; \
</span><del>-@@ -753,7 +811,7 @@ clean:
</del><ins>+@@ -753,7 +812,7 @@ clean:
</ins><span class="cx"> done
</span><span class="cx">
</span><span class="cx"> distclean: clean
</span><span class="lines">@@ -325,7 +372,7 @@
</span><span class="cx"> ${DIR_ENTER}; \
</span><span class="cx"> ${MAKE} ${MFLAGS} distclean || exit $$?; \
</span><span class="cx"> ${DIR_LEAVE}; \
</span><del>-@@ -769,27 +827,39 @@ distclean: clean
</del><ins>+@@ -769,27 +828,39 @@ distclean: clean
</ins><span class="cx"> fi \
</span><span class="cx"> done
</span><span class="cx">
</span><span class="lines">@@ -340,7 +387,7 @@
</span><span class="cx"> + done
</span><span class="cx"> +
</span><span class="cx"> +print-var:
</span><del>-+ echo '${${VAR}}'
</del><ins>++ printf '%s\n' '${${VAR}}'
</ins><span class="cx"> +
</span><span class="cx"> +DIR_ENTER = printf "@TERM_EL@@TERM_SETAF6@Entering directory @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n" "$$i"; cd $$i || exit $$?
</span><span class="cx"> +DIR_LEAVE = printf "@TERM_EL@@TERM_SETAF6@Leaving directory @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n" "$$i"; cd .. || exit $$?
</span><span class="lines">@@ -383,23 +430,241 @@
</span><span class="cx"> +
</span><span class="cx"> +.CURDIR ?= .
</span><span class="cx"> +include ${.CURDIR}/.deps
</span><ins>+--- configure.ac.old
++++ configure.ac
+@@ -8,6 +8,8 @@ AC_PREREQ([2.59])
+ AC_INIT([audacious], [3.7.2])
+ AC_COPYRIGHT([Copyright (C) 2001-2016 Audacious developers and others])
+
++BUILDSYS_INIT
++
+ AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE_NAME", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$PACKAGE_VERSION", [Version number of package])
+ AC_DEFINE_UNQUOTED(COPYRIGHT, "Copyright © 2001-2016 Audacious developers and others", [Copyright])
</ins><span class="cx"> --- m4/buildsys.m4.orig
</span><span class="cx"> +++ m4/buildsys.m4
</span><del>-@@ -108,13 +108,13 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
</del><ins>+@@ -1,5 +1,5 @@
+ dnl
+-dnl Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012
++dnl Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+ dnl Jonathan Schleifer <js@webkeks.org>
+ dnl
+ dnl https://webkeks.org/git/?p=buildsys.git
+@@ -21,65 +21,76 @@ dnl ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ dnl POSSIBILITY OF SUCH DAMAGE.
+ dnl
+
+-AC_CONFIG_COMMANDS_PRE([
+- AC_SUBST(CC_DEPENDS, $GCC)
+- AC_SUBST(CXX_DEPENDS, $GXX)
+- AC_SUBST(OBJC_DEPENDS, $GOBJC)
+- AC_SUBST(OBJCXX_DEPENDS, $GOBJCXX)
++AC_DEFUN([BUILDSYS_INIT], [
++ AC_CONFIG_COMMANDS_PRE([
++ AC_SUBST(CC_DEPENDS, $GCC)
++ AC_SUBST(CXX_DEPENDS, $GXX)
++ AC_SUBST(OBJC_DEPENDS, $GOBJC)
++ AC_SUBST(OBJCXX_DEPENDS, $GOBJCXX)
+
+- AC_PATH_PROG(TPUT, tput)
++ AC_PATH_PROG(TPUT, tput)
+
+- AS_IF([test x"$TPUT" != x""], [
+- if x=$($TPUT el 2>/dev/null); then
+- AC_SUBST(TERM_EL, "$x")
+- else
+- AC_SUBST(TERM_EL, "$($TPUT ce 2>/dev/null)")
+- fi
++ AS_IF([test x"$TPUT" != x""], [
++ if x=$($TPUT el 2>/dev/null); then
++ AC_SUBST(TERM_EL, "$x")
++ else
++ AC_SUBST(TERM_EL, "$($TPUT ce 2>/dev/null)")
++ fi
+
+- if x=$($TPUT sgr0 2>/dev/null); then
+- AC_SUBST(TERM_SGR0, "$x")
+- else
+- AC_SUBST(TERM_SGR0, "$($TPUT me 2>/dev/null)")
+- fi
++ if x=$($TPUT sgr0 2>/dev/null); then
++ AC_SUBST(TERM_SGR0, "$x")
++ else
++ AC_SUBST(TERM_SGR0, "$($TPUT me 2>/dev/null)")
++ fi
+
+- if x=$($TPUT bold 2>/dev/null); then
+- AC_SUBST(TERM_BOLD, "$x")
+- else
+- AC_SUBST(TERM_BOLD, "$($TPUT md 2>/dev/null)")
+- fi
++ if x=$($TPUT bold 2>/dev/null); then
++ AC_SUBST(TERM_BOLD, "$x")
++ else
++ AC_SUBST(TERM_BOLD, "$($TPUT md 2>/dev/null)")
++ fi
+
+- if x=$($TPUT setaf 1 2>/dev/null); then
+- AC_SUBST(TERM_SETAF1, "$x")
+- AC_SUBST(TERM_SETAF2, "$($TPUT setaf 2 2>/dev/null)")
+- AC_SUBST(TERM_SETAF3, "$($TPUT setaf 3 2>/dev/null)")
+- AC_SUBST(TERM_SETAF4, "$($TPUT setaf 4 2>/dev/null)")
+- AC_SUBST(TERM_SETAF6, "$($TPUT setaf 6 2>/dev/null)")
+- else
+- AC_SUBST(TERM_SETAF1, "$($TPUT AF 1 2>/dev/null)")
+- AC_SUBST(TERM_SETAF2, "$($TPUT AF 2 2>/dev/null)")
+- AC_SUBST(TERM_SETAF3, "$($TPUT AF 3 2>/dev/null)")
+- AC_SUBST(TERM_SETAF4, "$($TPUT AF 4 2>/dev/null)")
+- AC_SUBST(TERM_SETAF6, "$($TPUT AF 6 2>/dev/null)")
+- fi
+- ], [
+- AC_SUBST(TERM_EL, '\033\133K')
+- AC_SUBST(TERM_SGR0, '\033\133m')
+- AC_SUBST(TERM_BOLD, '\033\1331m')
+- AC_SUBST(TERM_SETAF1, '\033\13331m')
+- AC_SUBST(TERM_SETAF2, '\033\13332m')
+- AC_SUBST(TERM_SETAF3, '\033\13333m')
+- AC_SUBST(TERM_SETAF4, '\033\13334m')
+- AC_SUBST(TERM_SETAF6, '\033\13336m')
++ if x=$($TPUT setaf 1 2>/dev/null); then
++ AC_SUBST(TERM_SETAF1, "$x")
++ AC_SUBST(TERM_SETAF2,
++ "$($TPUT setaf 2 2>/dev/null)")
++ AC_SUBST(TERM_SETAF3,
++ "$($TPUT setaf 3 2>/dev/null)")
++ AC_SUBST(TERM_SETAF4,
++ "$($TPUT setaf 4 2>/dev/null)")
++ AC_SUBST(TERM_SETAF6,
++ "$($TPUT setaf 6 2>/dev/null)")
++ else
++ AC_SUBST(TERM_SETAF1,
++ "$($TPUT AF 1 2>/dev/null)")
++ AC_SUBST(TERM_SETAF2,
++ "$($TPUT AF 2 2>/dev/null)")
++ AC_SUBST(TERM_SETAF3,
++ "$($TPUT AF 3 2>/dev/null)")
++ AC_SUBST(TERM_SETAF4,
++ "$($TPUT AF 4 2>/dev/null)")
++ AC_SUBST(TERM_SETAF6,
++ "$($TPUT AF 6 2>/dev/null)")
++ fi
++ ], [
++ AC_SUBST(TERM_EL, '\033\133K')
++ AC_SUBST(TERM_SGR0, '\033\133m')
++ AC_SUBST(TERM_BOLD, '\033\1331m')
++ AC_SUBST(TERM_SETAF1, '\033\13331m')
++ AC_SUBST(TERM_SETAF2, '\033\13332m')
++ AC_SUBST(TERM_SETAF3, '\033\13333m')
++ AC_SUBST(TERM_SETAF4, '\033\13334m')
++ AC_SUBST(TERM_SETAF6, '\033\13336m')
++ ])
+ ])
+-])
+
+-AC_CONFIG_COMMANDS_POST([
+- ${as_echo:="echo"} ${as_me:="configure"}": touching .deps files"
+- for i in $(find . -name Makefile); do
+- DEPSFILE="$(dirname $i)/.deps"
+- test -f "$DEPSFILE" && rm "$DEPSFILE"
+- touch -t 0001010000 "$DEPSFILE"
+- done
++ AC_CONFIG_COMMANDS_POST([
++ ${as_echo:="echo"} ${as_me:="configure"}": touching .deps files"
++ for i in $(find . -name Makefile); do
++ DEPSFILE="$(dirname $i)/.deps"
++ test -f "$DEPSFILE" && rm "$DEPSFILE"
++ touch -t 0001010000 "$DEPSFILE"
++ done
++ ])
+ ])
+
+ AC_DEFUN([BUILDSYS_PROG_IMPLIB], [
+@@ -108,31 +119,32 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
</ins><span class="cx"> case "$host_os" in
</span><span class="cx"> darwin*)
</span><span class="cx"> AC_MSG_RESULT(Darwin)
</span><span class="cx"> - LIB_CFLAGS='-fPIC -DPIC -mmacosx-version-min=10.7'
</span><span class="cx"> - LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR} -mmacosx-version-min=10.7 -install_name "${libdir}/$$(i=${SHARED_LIB}; echo $${i%${LIB_SUFFIX}}).${LIB_MAJOR}${LIB_SUFFIX}"'
</span><span class="cx"> + LIB_CFLAGS='-fPIC -DPIC'
</span><del>-+ LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR} -Wl,-install_name,${libdir}/$${out%.dylib}.${LIB_MAJOR}.dylib'
</del><ins>++ LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
</ins><span class="cx"> LIB_PREFIX='lib'
</span><span class="cx"> LIB_SUFFIX='.dylib'
</span><span class="cx"> LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
</span><span class="cx"> - PLUGIN_CFLAGS='-fPIC -DPIC -mmacosx-version-min=10.7'
</span><span class="cx"> - PLUGIN_LDFLAGS='-bundle -undefined dynamic_lookup -mmacosx-version-min=10.7'
</span><ins>++ LDFLAGS_INSTALL_NAME='-Wl,-install_name,${libdir}/$${out%.dylib}.${LIB_MAJOR}.dylib'
</ins><span class="cx"> + PLUGIN_CFLAGS='-fPIC -DPIC'
</span><span class="cx"> + PLUGIN_LDFLAGS='-bundle -undefined dynamic_lookup'
</span><span class="cx"> PLUGIN_SUFFIX='.bundle'
</span><span class="cx"> INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i'
</span><span class="cx"> UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib'
</span><ins>+ CLEAN_LIB=''
+ ;
+- solaris*)
+- AC_MSG_RESULT(Solaris)
+- LIB_CFLAGS='-fPIC -DPIC'
+- LIB_LDFLAGS='-shared -Wl,-soname=${SHARED_LIB}.${LIB_MAJOR}.${LIB_MINOR}'
++ mingw* | cygwin*)
++ AC_MSG_RESULT(MinGW / Cygwin)
++ LIB_CFLAGS=''
++ LIB_LDFLAGS='-shared -Wl,--out-implib,${SHARED_LIB}.a'
+ LIB_PREFIX='lib'
+- LIB_SUFFIX='.so'
++ LIB_SUFFIX='.dll'
+ LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
+- PLUGIN_CFLAGS='-fPIC -DPIC'
++ PLUGIN_CFLAGS=''
+ PLUGIN_LDFLAGS='-shared'
+- PLUGIN_SUFFIX='.so'
+- INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR} && rm -f ${DESTDIR}${libdir}/$$i && ${LN_S} $$i.${LIB_MAJOR}.${LIB_MINOR} ${DESTDIR}${libdir}/$$i'
+- UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}'
+- CLEAN_LIB=''
++ PLUGIN_SUFFIX='.dll'
++ INSTALL_LIB='&& ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i && ${INSTALL} -m 755 $$i.a ${DESTDIR}${libdir}/$$i.a'
++ UNINSTALL_LIB='&& rm -f ${DESTDIR}${bindir}/$$i ${DESTDIR}${libdir}/$$i.a'
++ CLEAN_LIB='${SHARED_LIB}.a'
+ ;
+ openbsd* | mirbsd*)
+ AC_MSG_RESULT(OpenBSD)
+@@ -148,22 +160,22 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
+ UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i'
+ CLEAN_LIB=''
+ ;
+- cygwin* | mingw*)
+- AC_MSG_RESULT(Win32)
+- LIB_CFLAGS=''
+- LIB_LDFLAGS='-shared -Wl,--out-implib,${SHARED_LIB}.a'
++ solaris*)
++ AC_MSG_RESULT(Solaris)
++ LIB_CFLAGS='-fPIC -DPIC'
++ LIB_LDFLAGS='-shared -Wl,-soname=${SHARED_LIB}.${LIB_MAJOR}.${LIB_MINOR}'
+ LIB_PREFIX='lib'
+- LIB_SUFFIX='.dll'
++ LIB_SUFFIX='.so'
+ LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
+- PLUGIN_CFLAGS=''
++ PLUGIN_CFLAGS='-fPIC -DPIC'
+ PLUGIN_LDFLAGS='-shared'
+- PLUGIN_SUFFIX='.dll'
+- INSTALL_LIB='&& ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i && ${INSTALL} -m 755 $$i.a ${DESTDIR}${libdir}/$$i.a'
+- UNINSTALL_LIB='&& rm -f ${DESTDIR}${bindir}/$$i ${DESTDIR}${libdir}/$$i.a'
+- CLEAN_LIB='${SHARED_LIB}.a'
++ PLUGIN_SUFFIX='.so'
++ INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR} && rm -f ${DESTDIR}${libdir}/$$i && ${LN_S} $$i.${LIB_MAJOR}.${LIB_MINOR} ${DESTDIR}${libdir}/$$i'
++ UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}'
++ CLEAN_LIB=''
+ ;
+ *)
+- AC_MSG_RESULT(GNU)
++ AC_MSG_RESULT(ELF)
+ LIB_CFLAGS='-fPIC -DPIC'
+ LIB_LDFLAGS='-shared -Wl,-soname=${SHARED_LIB}.${LIB_MAJOR}'
+ LIB_PREFIX='lib'
+@@ -183,6 +195,7 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
+ AC_SUBST(LIB_PREFIX)
+ AC_SUBST(LIB_SUFFIX)
+ AC_SUBST(LDFLAGS_RPATH)
++ AC_SUBST(LDFLAGS_INSTALL_NAME)
+ AC_SUBST(PLUGIN_CFLAGS)
+ AC_SUBST(PLUGIN_LDFLAGS)
+ AC_SUBST(PLUGIN_SUFFIX)
</ins></span></pre></div>
<a id="trunkdportsmultimediaaudaciouscorefilespatchgtk3diff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/audacious-core/files/patch-gtk3.diff (149185 => 149186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/audacious-core/files/patch-gtk3.diff 2016-06-04 21:57:39 UTC (rev 149185)
+++ trunk/dports/multimedia/audacious-core/files/patch-gtk3.diff 2016-06-04 21:57:47 UTC (rev 149186)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx">
</span><span class="cx"> --- src/libaudgui/about.cc.old
</span><span class="cx"> +++ src/libaudgui/about.cc
</span><del>-@@ -72,7 +72,7 @@ static GtkWidget * create_about_window ()
</del><ins>+@@ -74,7 +74,7 @@ static GtkWidget * create_about_window ()
</ins><span class="cx">
</span><span class="cx"> audgui_destroy_on_escape (about_window);
</span><span class="cx">
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> gtk_container_add ((GtkContainer *) about_window, vbox);
</span><span class="cx">
</span><span class="cx"> StringBuf logo_path = filename_build ({data_dir, "images", "about-logo.png"});
</span><del>-@@ -84,11 +84,9 @@ static GtkWidget * create_about_window ()
</del><ins>+@@ -86,11 +86,9 @@ static GtkWidget * create_about_window ()
</ins><span class="cx"> gtk_label_set_justify ((GtkLabel *) label, GTK_JUSTIFY_CENTER);
</span><span class="cx"> gtk_box_pack_start ((GtkBox *) vbox, label, false, false, 0);
</span><span class="cx">
</span><span class="lines">@@ -34,9 +34,40 @@
</span><span class="cx">
</span><span class="cx"> char * credits, * license;
</span><span class="cx">
</span><ins>+--- src/libaudgui/eq-preset.cc.old
++++ src/libaudgui/eq-preset.cc
+@@ -241,16 +241,16 @@ static GtkWidget * create_eq_preset_window ()
+
+ g_signal_connect (window, "destroy", (GCallback) cleanup_eq_preset_window, nullptr);
+
+- GtkWidget * outer = gtk_vbox_new (false, 0);
++ GtkWidget * outer = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ gtk_container_add ((GtkContainer *) window, outer);
+
+ gtk_box_pack_start ((GtkBox *) outer, create_menu_bar (), false, false, 0);
+
+- GtkWidget * vbox = gtk_vbox_new (false, 6);
++ GtkWidget * vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+ gtk_container_set_border_width ((GtkContainer *) vbox, 6);
+ gtk_box_pack_start ((GtkBox *) outer, vbox, true, true, 0);
+
+- GtkWidget * hbox = gtk_hbox_new (false, 6);
++ GtkWidget * hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+ gtk_box_pack_start ((GtkBox *) vbox, hbox, false, false, 0);
+
+ entry = gtk_entry_new ();
+@@ -275,7 +275,7 @@ static GtkWidget * create_eq_preset_window ()
+ audgui_list_add_column (list, nullptr, 0, G_TYPE_STRING, -1);
+ gtk_container_add ((GtkContainer *) scrolled, list);
+
+- GtkWidget * hbox2 = gtk_hbox_new (false, 6);
++ GtkWidget * hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+ gtk_box_pack_start ((GtkBox *) vbox, hbox2, false, false, 0);
+
+ GtkWidget * remove = audgui_button_new (_("Delete Selected"), "edit-delete",
</ins><span class="cx"> --- src/libaudgui/equalizer.cc.old
</span><span class="cx"> +++ src/libaudgui/equalizer.cc
</span><del>-@@ -63,13 +63,14 @@ static void slider_moved (GtkRange * slider)
</del><ins>+@@ -68,13 +68,14 @@ static void slider_moved (GtkRange * slider)
</ins><span class="cx">
</span><span class="cx"> static GtkWidget * create_slider (const char * name, int band, GtkWidget * hbox)
</span><span class="cx"> {
</span><span class="lines">@@ -53,7 +84,7 @@
</span><span class="cx"> gtk_scale_set_draw_value ((GtkScale *) slider, true);
</span><span class="cx"> gtk_scale_set_value_pos ((GtkScale *) slider, GTK_POS_BOTTOM);
</span><span class="cx"> gtk_range_set_inverted ((GtkRange *) slider, true);
</span><del>-@@ -127,18 +128,19 @@ static GtkWidget * create_window ()
</del><ins>+@@ -132,10 +133,10 @@ static GtkWidget * create_window ()
</ins><span class="cx"> gtk_container_set_border_width ((GtkContainer *) window, 6);
</span><span class="cx"> audgui_destroy_on_escape (window);
</span><span class="cx">
</span><span class="lines">@@ -61,8 +92,15 @@
</span><span class="cx"> + GtkWidget * vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
</span><span class="cx"> gtk_container_add ((GtkContainer *) window, vbox);
</span><span class="cx">
</span><del>- gtk_box_pack_start ((GtkBox *) vbox, create_on_off (), false, false, 0);
</del><ins>+- GtkWidget * top_row = gtk_hbox_new (false, 6);
++ GtkWidget * top_row = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+ gtk_box_pack_start ((GtkBox *) vbox, top_row, false, false, 0);
</ins><span class="cx">
</span><ins>+ gtk_box_pack_start ((GtkBox *) top_row, create_on_off (), false, false, 0);
+@@ -148,13 +149,14 @@ static GtkWidget * create_window ()
+ (AudguiCallback) reset_to_zero, nullptr);
+ gtk_box_pack_end ((GtkBox *) top_row, zero, false, false, 0);
+
</ins><span class="cx"> - GtkWidget * hbox = gtk_hbox_new (false, 6);
</span><span class="cx"> + GtkWidget * hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
</span><span class="cx"> gtk_box_pack_start ((GtkBox *) vbox, hbox, false, false, 0);
</span><span class="lines">@@ -78,10 +116,10 @@
</span><span class="cx"> {
</span><span class="cx"> --- src/libaudgui/file-opener.cc.old
</span><span class="cx"> +++ src/libaudgui/file-opener.cc
</span><del>-@@ -96,9 +96,8 @@ static GtkWidget * create_filebrowser (gboolean open)
</del><ins>+@@ -98,9 +98,8 @@ static GtkWidget * create_filebrowser (gboolean open)
</ins><span class="cx"> gtk_window_set_type_hint ((GtkWindow *) window, GDK_WINDOW_TYPE_HINT_DIALOG);
</span><span class="cx"> gtk_window_set_title ((GtkWindow *) window, window_title);
</span><del>- gtk_window_set_default_size ((GtkWindow *) window, 700, 450);
</del><ins>+ gtk_window_set_default_size ((GtkWindow *) window, 7 * dpi, 5 * dpi);
</ins><span class="cx"> - gtk_container_set_border_width ((GtkContainer *) window, 10);
</span><span class="cx">
</span><span class="cx"> - GtkWidget * vbox = gtk_vbox_new (false, 0);
</span><span class="lines">@@ -89,7 +127,7 @@
</span><span class="cx"> gtk_container_add ((GtkContainer *) window, vbox);
</span><span class="cx">
</span><span class="cx"> GtkWidget * chooser = gtk_file_chooser_widget_new (GTK_FILE_CHOOSER_ACTION_OPEN);
</span><del>-@@ -108,17 +107,24 @@ static GtkWidget * create_filebrowser (gboolean open)
</del><ins>+@@ -110,17 +109,24 @@ static GtkWidget * create_filebrowser (gboolean open)
</ins><span class="cx"> if (path[0])
</span><span class="cx"> gtk_file_chooser_set_current_folder ((GtkFileChooser *) chooser, path);
</span><span class="cx">
</span><span class="lines">@@ -120,7 +158,7 @@
</span><span class="cx"> gtk_box_pack_end ((GtkBox *) hbox, bbox, true, true, 0);
</span><span class="cx"> --- src/libaudgui/infopopup.cc.old
</span><span class="cx"> +++ src/libaudgui/infopopup.cc
</span><del>-@@ -37,9 +37,6 @@
</del><ins>+@@ -35,9 +35,6 @@
</ins><span class="cx">
</span><span class="cx"> static void infopopup_move_to_mouse (GtkWidget * infopopup);
</span><span class="cx">
</span><span class="lines">@@ -130,8 +168,8 @@
</span><span class="cx"> static struct {
</span><span class="cx"> GtkWidget * title_header, * title_label;
</span><span class="cx"> GtkWidget * artist_header, * artist_label;
</span><del>-@@ -107,56 +104,21 @@ static gboolean infopopup_progress_cb (void *)
- return true;
</del><ins>+@@ -102,56 +99,21 @@ static void infopopup_progress_cb (void *)
+ gtk_widget_hide (widgets.progress);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> -static void infopopup_realized (GtkWidget * widget)
</span><span class="lines">@@ -191,7 +229,7 @@
</span><span class="cx">
</span><span class="cx"> gtk_widget_set_no_show_all (* header, true);
</span><span class="cx"> gtk_widget_set_no_show_all (* label, true);
</span><del>-@@ -185,7 +147,7 @@ static GtkWidget * infopopup_create ()
</del><ins>+@@ -178,7 +140,7 @@ static GtkWidget * infopopup_create ()
</ins><span class="cx"> gtk_window_set_decorated ((GtkWindow *) infopopup, false);
</span><span class="cx"> gtk_container_set_border_width ((GtkContainer *) infopopup, 4);
</span><span class="cx">
</span><span class="lines">@@ -200,7 +238,7 @@
</span><span class="cx"> gtk_container_add ((GtkContainer *) infopopup, hbox);
</span><span class="cx">
</span><span class="cx"> widgets.image = gtk_image_new ();
</span><del>-@@ -193,8 +155,8 @@ static GtkWidget * infopopup_create ()
</del><ins>+@@ -186,8 +148,8 @@ static GtkWidget * infopopup_create ()
</ins><span class="cx"> gtk_box_pack_start ((GtkBox *) hbox, widgets.image, false, false, 0);
</span><span class="cx"> gtk_widget_set_no_show_all (widgets.image, true);
</span><span class="cx">
</span><span class="lines">@@ -211,7 +249,7 @@
</span><span class="cx"> gtk_box_pack_start ((GtkBox *) hbox, grid, true, true, 0);
</span><span class="cx">
</span><span class="cx"> infopopup_add_category (grid, 0, _("Title"), & widgets.title_header, & widgets.title_label);
</span><del>-@@ -207,23 +169,15 @@ static GtkWidget * infopopup_create ()
</del><ins>+@@ -200,23 +162,15 @@ static GtkWidget * infopopup_create ()
</ins><span class="cx">
</span><span class="cx"> /* track progress */
</span><span class="cx"> widgets.progress = gtk_progress_bar_new ();
</span><span class="lines">@@ -241,7 +279,7 @@
</span><span class="cx"> }
</span><span class="cx"> --- src/libaudgui/infowin.cc.old
</span><span class="cx"> +++ src/libaudgui/infowin.cc
</span><del>-@@ -132,7 +132,7 @@ static GtkWidget * small_label_new (const char * text)
</del><ins>+@@ -133,7 +133,7 @@ static GtkWidget * small_label_new (const char * text)
</ins><span class="cx">
</span><span class="cx"> GtkWidget * label = gtk_label_new (text);
</span><span class="cx"> gtk_label_set_attributes ((GtkLabel *) label, attrs);
</span><span class="lines">@@ -250,7 +288,7 @@
</span><span class="cx">
</span><span class="cx"> return label;
</span><span class="cx"> }
</span><del>-@@ -301,10 +301,11 @@ static void add_entry (GtkWidget * grid, const char * title, GtkWidget * entry,
</del><ins>+@@ -287,10 +287,11 @@ static void add_entry (GtkWidget * grid, const char * title, GtkWidget * entry,
</ins><span class="cx"> {
</span><span class="cx"> GtkWidget * label = small_label_new (title);
</span><span class="cx">
</span><span class="lines">@@ -266,7 +304,7 @@
</span><span class="cx">
</span><span class="cx"> g_signal_connect (entry, "changed", (GCallback) entry_changed, nullptr);
</span><span class="cx"> }
</span><del>-@@ -317,44 +318,41 @@ static void create_infowin ()
</del><ins>+@@ -305,44 +306,41 @@ static void create_infowin ()
</ins><span class="cx"> gtk_window_set_type_hint ((GtkWindow *) infowin,
</span><span class="cx"> GDK_WINDOW_TYPE_HINT_DIALOG);
</span><span class="cx">
</span><span class="lines">@@ -285,7 +323,7 @@
</span><span class="cx"> + gtk_grid_attach ((GtkGrid *) main_grid, widgets.image, 0, 0, 1, 1);
</span><span class="cx">
</span><span class="cx"> widgets.location = gtk_label_new ("");
</span><del>-- gtk_widget_set_size_request (widgets.location, 200, -1);
</del><ins>+- gtk_widget_set_size_request (widgets.location, 2 * dpi, -1);
</ins><span class="cx"> + gtk_label_set_max_width_chars ((GtkLabel *) widgets.location, 40);
</span><span class="cx"> gtk_label_set_line_wrap ((GtkLabel *) widgets.location, true);
</span><span class="cx"> gtk_label_set_line_wrap_mode ((GtkLabel *) widgets.location, PANGO_WRAP_WORD_CHAR);
</span><span class="lines">@@ -328,8 +366,8 @@
</span><span class="cx"> + gtk_grid_attach ((GtkGrid *) main_grid, grid, 1, 0, 1, 3);
</span><span class="cx">
</span><span class="cx"> widgets.title = gtk_entry_new ();
</span><del>- add_entry (grid, _("Title"), widgets.title, 0, 0, 2);
-@@ -381,9 +379,8 @@ static void create_infowin ()
</del><ins>+ gtk_widget_set_size_request (widgets.title, 3 * dpi, -1);
+@@ -370,9 +368,8 @@ static void create_infowin ()
</ins><span class="cx"> widgets.track = gtk_entry_new ();
</span><span class="cx"> add_entry (grid, _("Track Number"), widgets.track, 1, 12, 1);
</span><span class="cx">
</span><span class="lines">@@ -354,16 +392,16 @@
</span><span class="cx"> static void update_cb (void * data, void *);
</span><span class="cx"> static void activate_cb (void * data, void *);
</span><span class="cx">
</span><del>-@@ -243,7 +247,7 @@ static GtkWidget * create_window ()
</del><ins>+@@ -245,7 +249,7 @@ static GtkWidget * create_window ()
</ins><span class="cx"> gtk_container_set_border_width ((GtkContainer *) jump_to_track_win, 10);
</span><del>- gtk_window_set_default_size ((GtkWindow *) jump_to_track_win, 600, 500);
</del><ins>+ gtk_window_set_default_size ((GtkWindow *) jump_to_track_win, 6 * dpi, 5 * dpi);
</ins><span class="cx">
</span><span class="cx"> - GtkWidget * vbox = gtk_vbox_new (false, 6);
</span><span class="cx"> + GtkWidget * vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
</span><span class="cx"> gtk_container_add ((GtkContainer *) jump_to_track_win, vbox);
</span><span class="cx">
</span><span class="cx"> treeview = audgui_list_new (& callbacks, nullptr, 0);
</span><del>-@@ -256,7 +260,7 @@ static GtkWidget * create_window ()
</del><ins>+@@ -258,7 +262,7 @@ static GtkWidget * create_window ()
</ins><span class="cx"> "changed", (GCallback) selection_changed, nullptr);
</span><span class="cx"> g_signal_connect (treeview, "row-activated", (GCallback) do_jump, nullptr);
</span><span class="cx">
</span><span class="lines">@@ -372,7 +410,7 @@
</span><span class="cx"> gtk_box_pack_start ((GtkBox *) vbox, hbox, false, false, 3);
</span><span class="cx">
</span><span class="cx"> /* filter box */
</span><del>-@@ -280,17 +284,14 @@ static GtkWidget * create_window ()
</del><ins>+@@ -282,17 +286,14 @@ static GtkWidget * create_window ()
</ins><span class="cx"> gtk_scrolled_window_set_shadow_type ((GtkScrolledWindow *) scrollwin, GTK_SHADOW_IN);
</span><span class="cx"> gtk_box_pack_start ((GtkBox *) vbox, scrollwin, true, true, 0);
</span><span class="cx">
</span><span class="lines">@@ -396,33 +434,33 @@
</span><span class="cx"> GtkWidget * toggle = gtk_check_button_new_with_mnemonic (_("C_lose on jump"));
</span><span class="cx"> --- src/libaudgui/list.cc.old
</span><span class="cx"> +++ src/libaudgui/list.cc
</span><del>-@@ -386,7 +386,7 @@ static gboolean autoscroll (GtkWidget * widget)
</del><ins>+@@ -385,7 +385,7 @@ static void autoscroll (void * widget)
</ins><span class="cx"> ListModel * model = (ListModel *) gtk_tree_view_get_model
</span><span class="cx"> ((GtkTreeView *) widget);
</span><span class="cx">
</span><span class="cx"> - GtkAdjustment * adj = gtk_tree_view_get_vadjustment ((GtkTreeView *) widget);
</span><span class="cx"> + GtkAdjustment * adj = gtk_scrollable_get_vadjustment ((GtkScrollable *) widget);
</span><del>- if (! adj)
- {
- stop_autoscroll (model);
-@@ -458,7 +458,7 @@ static gboolean drag_motion (GtkWidget * widget, GdkDragContext * context,
</del><ins>+ g_return_if_fail (adj);
</ins><span class="cx">
</span><del>- int height;
- gdk_window_get_geometry (gtk_tree_view_get_bin_window ((GtkTreeView *)
-- widget), nullptr, nullptr, nullptr, & height, nullptr);
-+ widget), nullptr, nullptr, nullptr, & height);
- gtk_tree_view_convert_widget_to_bin_window_coords ((GtkTreeView *) widget,
- x, y, & x, & y);
</del><ins>+ int pos, end;
+@@ -402,7 +402,7 @@ static void autoscroll (void * widget)
</ins><span class="cx">
</span><del>-@@ -534,6 +534,10 @@ static void drag_data_received (GtkWidget * widget, GdkDragContext * context, in
</del><ins>+ static void start_autoscroll (ListModel * model, GtkWidget * widget, int speed)
+ {
+- GtkAdjustment * adj = gtk_tree_view_get_vadjustment ((GtkTreeView *) widget);
++ GtkAdjustment * adj = gtk_scrollable_get_vadjustment ((GtkScrollable *) widget);
+ g_return_if_fail (adj);
</ins><span class="cx">
</span><ins>+ int pos, end;
+@@ -532,6 +532,10 @@ static void drag_data_received (GtkWidget * widget, GdkDragContext * context, in
+
</ins><span class="cx"> static void destroy_cb (GtkWidget * list, ListModel * model)
</span><span class="cx"> {
</span><span class="cx"> + /* workaround for Gnome bug #679291 */
</span><span class="cx"> + g_signal_handlers_disconnect_matched (list, G_SIGNAL_MATCH_DATA, 0, 0, NULL,
</span><span class="cx"> + NULL, model);
</span><span class="cx"> +
</span><del>- stop_autoscroll (model);
</del><ins>+ stop_autoscroll (model, list);
</ins><span class="cx"> g_list_free (model->column_types);
</span><span class="cx"> g_object_unref (model);
</span><span class="cx"> --- src/libaudgui/menu.cc.old
</span><span class="lines">@@ -500,11 +538,28 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* WIDGET_SPIN_BTN */
</span><del>-@@ -206,13 +210,15 @@ void create_font_btn (const PreferencesWidget * widget, GtkWidget * * label,
</del><ins>+@@ -193,7 +197,7 @@ static void create_spin_button (const PreferencesWidget * widget,
+ if (widget->label)
+ {
+ * label_pre = gtk_label_new (dgettext (domain, widget->label));
+- gtk_misc_set_alignment ((GtkMisc *) * label_pre, 1, 0.5);
++ gtk_widget_set_halign (* label_pre, GTK_ALIGN_END);
+ }
+
+ * spin_btn = gtk_spin_button_new_with_range (widget->data.spin_btn.min,
+@@ -202,7 +206,7 @@ static void create_spin_button (const PreferencesWidget * widget,
+ if (widget->data.spin_btn.right_label)
+ {
+ * label_past = gtk_label_new (dgettext (domain, widget->data.spin_btn.right_label));
+- gtk_misc_set_alignment ((GtkMisc *) * label_past, 0, 0.5);
++ gtk_widget_set_halign (* label_past, GTK_ALIGN_START);
+ }
+
+ widget_init (* spin_btn, widget);
+@@ -214,13 +218,14 @@ void create_font_btn (const PreferencesWidget * widget, GtkWidget * * label,
</ins><span class="cx"> GtkWidget * * font_btn, const char * domain)
</span><span class="cx"> {
</span><span class="cx"> * font_btn = gtk_font_button_new ();
</span><del>-+ gtk_widget_set_hexpand (* font_btn, true);
</del><span class="cx"> +
</span><span class="cx"> gtk_font_button_set_use_font ((GtkFontButton *) * font_btn, true);
</span><span class="cx"> gtk_font_button_set_use_size ((GtkFontButton *) * font_btn, true);
</span><span class="lines">@@ -517,7 +572,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (widget->data.font_btn.title)
</span><del>-@@ -228,12 +234,13 @@ static void create_entry (const PreferencesWidget * widget, GtkWidget * * label,
</del><ins>+@@ -236,12 +241,13 @@ static void create_entry (const PreferencesWidget * widget, GtkWidget * * label,
</ins><span class="cx"> GtkWidget * * entry, const char * domain)
</span><span class="cx"> {
</span><span class="cx"> * entry = gtk_entry_new ();
</span><span class="lines">@@ -532,7 +587,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> widget_init (* entry, widget);
</span><del>-@@ -251,8 +258,7 @@ static void combobox_update (GtkWidget * combobox, const PreferencesWidget * wid
</del><ins>+@@ -259,8 +265,7 @@ static void combobox_update (GtkWidget * combobox, const PreferencesWidget * wid
</ins><span class="cx">
</span><span class="cx"> g_object_set_data ((GObject *) combobox, "comboitems", (void *) items.data);
</span><span class="cx">
</span><span class="lines">@@ -542,7 +597,16 @@
</span><span class="cx">
</span><span class="cx"> for (const ComboItem & item : items)
</span><span class="cx"> gtk_combo_box_text_append_text ((GtkComboBoxText *) combobox,
</span><del>-@@ -306,7 +312,6 @@ static void fill_table (GtkWidget * table,
</del><ins>+@@ -302,7 +307,7 @@ static void create_cbox (const PreferencesWidget * widget, GtkWidget * * label,
+ if (widget->label)
+ {
+ * label = gtk_label_new (dgettext (domain, widget->label));
+- gtk_misc_set_alignment ((GtkMisc *) * label, 1, 0.5);
++ gtk_widget_set_halign (* label, GTK_ALIGN_END);
+ }
+
+ g_object_set_data ((GObject *) * combobox, "combodomain", (void *) domain);
+@@ -317,7 +322,6 @@ static void fill_table (GtkWidget * table,
</ins><span class="cx"> for (const PreferencesWidget & w : widgets)
</span><span class="cx"> {
</span><span class="cx"> GtkWidget * widget_left = nullptr, * widget_middle = nullptr, * widget_right = nullptr;
</span><span class="lines">@@ -550,25 +614,15 @@
</span><span class="cx">
</span><span class="cx"> switch (w.type)
</span><span class="cx"> {
</span><del>-@@ -321,17 +326,14 @@ static void fill_table (GtkWidget * table,
</del><ins>+@@ -336,7 +340,6 @@ static void fill_table (GtkWidget * table,
</ins><span class="cx">
</span><del>- case PreferencesWidget::FontButton:
- create_font_btn (& w, & widget_left, & widget_middle, domain);
-- middle_policy = (GtkAttachOptions) (GTK_EXPAND | GTK_FILL);
- break;
-
</del><span class="cx"> case PreferencesWidget::Entry:
</span><span class="cx"> create_entry (& w, & widget_left, & widget_middle, domain);
</span><span class="cx"> - middle_policy = (GtkAttachOptions) (GTK_EXPAND | GTK_FILL);
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case PreferencesWidget::ComboBox:
</span><del>- create_cbox (& w, & widget_left, & widget_middle, domain);
-- middle_policy = (GtkAttachOptions) (GTK_EXPAND | GTK_FILL);
- break;
-
- default:
-@@ -341,16 +343,13 @@ static void fill_table (GtkWidget * table,
</del><ins>+@@ -350,16 +353,13 @@ static void fill_table (GtkWidget * table,
</ins><span class="cx"> int i = & w - widgets.data;
</span><span class="cx">
</span><span class="cx"> if (widget_left)
</span><span class="lines">@@ -588,7 +642,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@@ -371,13 +370,11 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</del><ins>+@@ -384,13 +384,11 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</ins><span class="cx"> {
</span><span class="cx"> if (! child_box)
</span><span class="cx"> {
</span><span class="lines">@@ -603,36 +657,39 @@
</span><span class="cx"> + gtk_widget_set_margin_left (child_box, 12);
</span><span class="cx"> + gtk_box_pack_start ((GtkBox *) box, child_box, false, false, 0);
</span><span class="cx">
</span><del>- if (GTK_IS_TOGGLE_BUTTON (widget))
- gtk_widget_set_sensitive (child_box,
-@@ -387,15 +384,13 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</del><ins>+ if (disable_child)
+ gtk_widget_set_sensitive (child_box, false);
+@@ -399,16 +397,15 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</ins><span class="cx"> else
</span><span class="cx"> child_box = nullptr;
</span><span class="cx">
</span><span class="cx"> - GtkWidget * alignment = gtk_alignment_new (0.5, 0.5, 1, 1);
</span><del>-- gtk_alignment_set_padding ((GtkAlignment *) alignment, 6, 0, 12, 0);
</del><ins>+- gtk_alignment_set_padding ((GtkAlignment *) alignment, spacing, 0, indent, 0);
</ins><span class="cx"> - gtk_box_pack_start ((GtkBox *) (child_box ? child_box : box), alignment, false, false, 0);
</span><span class="cx"> -
</span><span class="cx"> widget = nullptr;
</span><ins>+ disable_child = false;
</ins><span class="cx">
</span><span class="cx"> if (radio_btn_group && w.type != PreferencesWidget::RadioButton)
</span><span class="cx"> radio_btn_group = nullptr;
</span><span class="cx">
</span><del>-+ int pad_left = 12, pad_top = 6;
</del><ins>++ int pad_left = indent;
++ int pad_top = spacing;
</ins><span class="cx"> +
</span><span class="cx"> switch (w.type)
</span><span class="cx"> {
</span><span class="cx"> case PreferencesWidget::Button:
</span><del>-@@ -410,22 +405,24 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</del><ins>+@@ -427,7 +424,8 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
+ if (strstr (w.label, "<b>"))
+ {
+ /* headings get double spacing and no indent */
+- gtk_alignment_set_padding ((GtkAlignment *) alignment, 2 * spacing, 0, 0, 0);
++ pad_left = 0;
++ pad_top = 2 * spacing;
</ins><span class="cx">
</span><del>- case PreferencesWidget::Label:
- {
-- if (strstr (w.label, "<b>"))
-- gtk_alignment_set_padding ((GtkAlignment *) alignment,
-- (& w == widgets.data) ? 0 : 12, 0, 0, 0);
--
- GtkWidget * icon = nullptr;
- create_label (& w, & label, & icon, domain);
</del><ins>+ /* set indent for items below the heading */
+ indent = 12;
+@@ -438,7 +436,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</ins><span class="cx">
</span><span class="cx"> if (icon)
</span><span class="cx"> {
</span><span class="lines">@@ -641,20 +698,8 @@
</span><span class="cx"> gtk_box_pack_start ((GtkBox *) widget, icon, false, false, 0);
</span><span class="cx"> gtk_box_pack_start ((GtkBox *) widget, label, false, false, 0);
</span><span class="cx"> }
</span><del>- else
- widget = label;
</del><ins>+@@ -457,7 +455,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</ins><span class="cx">
</span><del>-+ if (strstr (w.label, "<b>"))
-+ {
-+ pad_left = 0;
-+ pad_top = (& w == widgets.data) ? 0 : 12;
-+ }
-+
- break;
- }
-
-@@ -438,7 +435,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
-
</del><span class="cx"> case PreferencesWidget::SpinButton:
</span><span class="cx"> {
</span><span class="cx"> - widget = gtk_hbox_new (false, 6);
</span><span class="lines">@@ -662,7 +707,7 @@
</span><span class="cx">
</span><span class="cx"> GtkWidget * label_pre = nullptr, * spin_btn = nullptr, * label_past = nullptr;
</span><span class="cx"> create_spin_button (& w, & label_pre, & spin_btn, & label_past, domain);
</span><del>-@@ -461,7 +458,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</del><ins>+@@ -480,7 +478,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</ins><span class="cx">
</span><span class="cx"> case PreferencesWidget::FontButton:
</span><span class="cx"> {
</span><span class="lines">@@ -671,7 +716,7 @@
</span><span class="cx">
</span><span class="cx"> GtkWidget * font_btn = nullptr;
</span><span class="cx"> create_font_btn (& w, & label, & font_btn, domain);
</span><del>-@@ -475,9 +472,9 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</del><ins>+@@ -494,9 +492,9 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case PreferencesWidget::Table:
</span><span class="lines">@@ -684,7 +729,7 @@
</span><span class="cx">
</span><span class="cx"> fill_table (widget, w.data.table.widgets, domain);
</span><span class="cx">
</span><del>-@@ -485,7 +482,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</del><ins>+@@ -504,7 +502,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</ins><span class="cx">
</span><span class="cx"> case PreferencesWidget::Entry:
</span><span class="cx"> {
</span><span class="lines">@@ -693,7 +738,7 @@
</span><span class="cx">
</span><span class="cx"> GtkWidget * entry = nullptr;
</span><span class="cx"> create_entry (& w, & label, & entry, domain);
</span><del>-@@ -500,7 +497,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</del><ins>+@@ -519,7 +517,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</ins><span class="cx">
</span><span class="cx"> case PreferencesWidget::ComboBox:
</span><span class="cx"> {
</span><span class="lines">@@ -702,7 +747,7 @@
</span><span class="cx">
</span><span class="cx"> GtkWidget * combo = nullptr;
</span><span class="cx"> create_cbox (& w, & label, & combo, domain);
</span><del>-@@ -515,9 +512,9 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</del><ins>+@@ -534,9 +532,9 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</ins><span class="cx">
</span><span class="cx"> case PreferencesWidget::Box:
</span><span class="cx"> if (w.data.box.horizontal)
</span><span class="lines">@@ -714,7 +759,7 @@
</span><span class="cx">
</span><span class="cx"> audgui_create_widgets_with_domain (widget, w.data.box.widgets, domain);
</span><span class="cx">
</span><del>-@@ -531,13 +528,11 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</del><ins>+@@ -550,13 +548,11 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case PreferencesWidget::Notebook:
</span><span class="lines">@@ -729,7 +774,7 @@
</span><span class="cx"> gtk_container_set_border_width ((GtkContainer *) vbox, 6);
</span><span class="cx">
</span><span class="cx"> audgui_create_widgets_with_domain (vbox, tab.widgets, domain);
</span><del>-@@ -546,11 +541,13 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</del><ins>+@@ -565,11 +561,13 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</ins><span class="cx"> gtk_label_new (dgettext (domain, tab.name)));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -745,27 +790,22 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> default:
</span><del>-@@ -560,11 +557,14 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</del><ins>+@@ -577,7 +575,11 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
+ }
+
</ins><span class="cx"> if (widget)
</span><del>- {
- /* use uniform spacing for horizontal boxes */
-- if (gtk_orientable_get_orientation ((GtkOrientable *) box) ==
-+ if (gtk_orientable_get_orientation ((GtkOrientable *) box) !=
- GTK_ORIENTATION_HORIZONTAL)
-- gtk_alignment_set_padding ((GtkAlignment *) alignment, 0, 0, 0, 0);
-+ {
-+ gtk_widget_set_margin_left (widget, pad_left);
-+ gtk_widget_set_margin_top (widget, pad_top);
-+ }
-
</del><span class="cx"> - gtk_container_add ((GtkContainer *) alignment, widget);
</span><ins>++ {
++ gtk_widget_set_margin_left (widget, pad_left);
++ gtk_widget_set_margin_top (widget, pad_top);
</ins><span class="cx"> + gtk_box_pack_start ((GtkBox *) (child_box ? child_box : box), widget, false, false, 0);
</span><del>- }
- }
- }
</del><ins>++ }
+
+ /* wait till after first widget to set item spacing */
+ if (gtk_orientable_get_orientation ((GtkOrientable *) box) == GTK_ORIENTATION_VERTICAL)
</ins><span class="cx"> --- src/libaudgui/prefs-window.cc.old
</span><span class="cx"> +++ src/libaudgui/prefs-window.cc
</span><del>-@@ -498,29 +498,32 @@ static void create_titlestring_widgets (GtkWidget * * cbox, GtkWidget * * entry)
</del><ins>+@@ -516,29 +516,32 @@ static void create_titlestring_widgets (GtkWidget * * cbox, GtkWidget * * entry)
</ins><span class="cx">
</span><span class="cx"> static void * create_titlestring_table ()
</span><span class="cx"> {
</span><span class="lines">@@ -809,7 +849,7 @@
</span><span class="cx">
</span><span class="cx"> GtkWidget * titlestring_tag_menu = create_titlestring_tag_menu ();
</span><span class="cx">
</span><del>-@@ -535,14 +538,14 @@ static void * create_titlestring_table ()
</del><ins>+@@ -553,14 +556,14 @@ static void * create_titlestring_table ()
</ins><span class="cx">
</span><span class="cx"> static void create_playlist_category ()
</span><span class="cx"> {
</span><span class="lines">@@ -826,7 +866,7 @@
</span><span class="cx"> gtk_container_add ((GtkContainer *) category_notebook, vbox);
</span><span class="cx"> audgui_create_widgets (vbox, song_info_page_widgets);
</span><span class="cx"> }
</span><del>-@@ -593,14 +596,14 @@ static ArrayRef<ComboItem> iface_combo_fill ()
</del><ins>+@@ -603,14 +606,14 @@ static ArrayRef<ComboItem> iface_combo_fill ()
</ins><span class="cx">
</span><span class="cx"> static void * iface_create_prefs_box ()
</span><span class="cx"> {
</span><span class="lines">@@ -843,7 +883,7 @@
</span><span class="cx"> gtk_container_add ((GtkContainer *) category_notebook, vbox);
</span><span class="cx"> audgui_create_widgets (vbox, appearance_page_widgets);
</span><span class="cx"> }
</span><del>-@@ -666,17 +669,17 @@ static void * output_create_about_button ()
</del><ins>+@@ -734,17 +737,17 @@ static void record_update (void * = nullptr, void * = nullptr)
</ins><span class="cx">
</span><span class="cx"> static void create_audio_category ()
</span><span class="cx"> {
</span><span class="lines">@@ -864,9 +904,17 @@
</span><span class="cx"> gtk_box_pack_start ((GtkBox *) connectivity_page_vbox, vbox, true, true, 0);
</span><span class="cx">
</span><span class="cx"> audgui_create_widgets (vbox, connectivity_page_widgets);
</span><del>-@@ -711,10 +714,10 @@ static void create_prefs_window ()
</del><ins>+@@ -753,6 +756,7 @@ static void create_connectivity_category ()
+ static void create_plugin_category ()
+ {
+ plugin_notebook = gtk_notebook_new ();
++ gtk_notebook_set_scrollable ((GtkNotebook *) plugin_notebook, true);
+ gtk_container_add ((GtkContainer *) category_notebook, plugin_notebook);
+
+ for (const PluginCategory & category : plugin_categories)
+@@ -780,10 +784,10 @@ static void create_prefs_window ()
+ gtk_container_set_border_width ((GtkContainer *) prefswin, 12);
</ins><span class="cx"> gtk_window_set_title ((GtkWindow *) prefswin, _("Audacious Settings"));
</span><del>- gtk_window_set_default_size ((GtkWindow *) prefswin, 680, 400);
</del><span class="cx">
</span><span class="cx"> - GtkWidget * vbox = gtk_vbox_new (false, 0);
</span><span class="cx"> + GtkWidget * vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
</span><span class="lines">@@ -877,7 +925,7 @@
</span><span class="cx"> gtk_box_pack_start ((GtkBox *) vbox, hbox, true, true, 0);
</span><span class="cx">
</span><span class="cx"> GtkWidget * scrolledwindow = gtk_scrolled_window_new (nullptr, nullptr);
</span><del>-@@ -744,17 +747,17 @@ static void create_prefs_window ()
</del><ins>+@@ -813,17 +817,17 @@ static void create_prefs_window ()
</ins><span class="cx"> create_song_info_category ();
</span><span class="cx"> create_plugin_category ();
</span><span class="cx">
</span><span class="lines">@@ -931,7 +979,7 @@
</span><span class="cx"> progress_label = gtk_label_new (nullptr);
</span><span class="cx"> --- src/libaudgui/util.cc.old
</span><span class="cx"> +++ src/libaudgui/util.cc
</span><del>-@@ -46,12 +46,27 @@ EXPORT int audgui_get_digit_width (GtkWidget * widget)
</del><ins>+@@ -66,12 +66,27 @@ EXPORT int audgui_get_digit_width (GtkWidget * widget)
</ins><span class="cx">
</span><span class="cx"> EXPORT void audgui_get_mouse_coords (GtkWidget * widget, int * x, int * y)
</span><span class="cx"> {
</span><span class="lines">@@ -961,7 +1009,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> EXPORT void audgui_get_monitor_geometry (GdkScreen * screen, int x, int y, GdkRectangle * geom)
</span><del>-@@ -105,6 +120,22 @@ EXPORT GtkWidget * audgui_button_new (const char * text, const char * icon,
</del><ins>+@@ -125,6 +140,22 @@ EXPORT GtkWidget * audgui_button_new (const char * text, const char * icon,
</ins><span class="cx"> return button;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -984,7 +1032,7 @@
</span><span class="cx"> EXPORT GtkWidget * audgui_dialog_new (GtkMessageType type, const char * title,
</span><span class="cx"> const char * text, GtkWidget * button1, GtkWidget * button2)
</span><span class="cx"> {
</span><del>-@@ -112,6 +143,13 @@ EXPORT GtkWidget * audgui_dialog_new (GtkMessageType type, const char * title,
</del><ins>+@@ -132,6 +163,13 @@ EXPORT GtkWidget * audgui_dialog_new (GtkMessageType type, const char * title,
</ins><span class="cx"> GTK_BUTTONS_NONE, "%s", text);
</span><span class="cx"> gtk_window_set_title ((GtkWindow *) dialog, title);
</span><span class="cx">
</span><span class="lines">@@ -998,7 +1046,7 @@
</span><span class="cx"> if (button2)
</span><span class="cx"> {
</span><span class="cx"> gtk_dialog_add_action_widget ((GtkDialog *) dialog, button2, GTK_RESPONSE_NONE);
</span><del>-@@ -127,6 +165,8 @@ EXPORT GtkWidget * audgui_dialog_new (GtkMessageType type, const char * title,
</del><ins>+@@ -147,6 +185,8 @@ EXPORT GtkWidget * audgui_dialog_new (GtkMessageType type, const char * title,
</ins><span class="cx"> return dialog;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>