[149186] trunk/dports/multimedia/audacious-core

ionic at macports.org ionic at macports.org
Sat Jun 4 14:57:47 PDT 2016


Revision: 149186
          https://trac.macports.org/changeset/149186
Author:   ionic at macports.org
Date:     2016-06-04 14:57:47 -0700 (Sat, 04 Jun 2016)
Log Message:
-----------
audacious-core: update to 3.7.2 including patchset.

Modified Paths:
--------------
    trunk/dports/multimedia/audacious-core/Portfile
    trunk/dports/multimedia/audacious-core/files/patch-acinclude.m4-drop-libc++-switch-from-gnu++11-to-c++11.diff
    trunk/dports/multimedia/audacious-core/files/patch-buildsys.diff
    trunk/dports/multimedia/audacious-core/files/patch-gtk3.diff

Modified: trunk/dports/multimedia/audacious-core/Portfile
===================================================================
--- 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)
@@ -9,7 +9,7 @@
 set real_name       audacious
 
 # Please keep audacious, audacious-core and audacious-plugins synchronized.
-version             3.6.2
+version             3.7.2
 revision            0
 
 license             BSD
@@ -32,8 +32,8 @@
 master_sites        http://distfiles.audacious-media-player.org
 distname            ${real_name}-${version}
 use_bzip2           yes
-checksums           rmd160  49b90b59140577bc220ffd8fd08ada1befb7a83a \
-                    sha256  b2fdb9f3cafd65b2afc50efea6f17a7a329547f1d394f525870e42cb0483cb04
+checksums           rmd160  83faedd98deea056f319bf7723d3e8cc7383ede5 \
+                    sha256  04f9eaba4522ce9674e6ed8afc7bd6b5fa9a1e240f8090589fc1874f6659f340
 
 universal_variant   no
 
@@ -51,11 +51,12 @@
                     path:lib/pkgconfig/dbus-1.pc:dbus \
                     path:lib/pkgconfig/glib-2.0.pc:glib2
 
-# Note: rpath is required on Mac OS X.
+# Note: rpath is required on OS X.
 configure.args      --enable-nls \
                     --enable-rpath \
                     --enable-dbus \
-                    --disable-chardet \
+                    --disable-qt \
+                    --disable-gtk \
                     --disable-valgrind
 
 use_autoreconf      yes
@@ -69,12 +70,6 @@
          ${destroot}${prefix}/share/doc/${real_name}
 }
 
-# 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
-#}
-
 variant qt5 description {Add Qt5 support} {
     PortGroup   qt5 1.0
 
@@ -103,8 +98,8 @@
                             --enable-gtk
 }
 
-# Need either one of gtk2 or gtk3. Default to gtk2, which is preferred by upstream.
-if {![variant_isset gtk2] && ![variant_isset gtk3]} {
+# 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]} {
     default_variants-append +gtk2
 }
 

Modified: trunk/dports/multimedia/audacious-core/files/patch-acinclude.m4-drop-libc++-switch-from-gnu++11-to-c++11.diff
===================================================================
--- 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)
@@ -2,14 +2,14 @@
 +++ acinclude.m4
 @@ -83,8 +83,8 @@ AC_REQUIRE([AC_SYS_LARGEFILE])
  if test "x$GCC" = "xyes"; then
-     CFLAGS="$CFLAGS -std=gnu99 -ffast-math -Wall -pipe"
+     CFLAGS="$CFLAGS -std=gnu99 -ffast-math -Wall -pipe -Wno-deprecated-declarations"
      if test "x$HAVE_DARWIN" = "xyes"; then
--        CXXFLAGS="$CXXFLAGS -stdlib=libc++ -std=gnu++11 -ffast-math -Wall -pipe"
+-        CXXFLAGS="$CXXFLAGS -stdlib=libc++ -std=gnu++11 -ffast-math -Wall -pipe -Wno-deprecated-declarations"
 -        LDFLAGS="$LDFLAGS -lc++ -stdlib=libc++"
-+        CXXFLAGS="$CXXFLAGS -std=c++11 -ffast-math -Wall -pipe"
++        CXXFLAGS="$CXXFLAGS -std=c++11 -ffast-math -Wall -pipe -Wno-deprecated-declarations"
 +        LDFLAGS="$LDFLAGS"
      else
-         CXXFLAGS="$CXXFLAGS -std=gnu++11 -ffast-math -Wall -pipe"
+         CXXFLAGS="$CXXFLAGS -std=gnu++11 -ffast-math -Wall -pipe -Wno-deprecated-declarations"
      fi
 @@ -101,7 +101,7 @@ if test "x$HAVE_DARWIN" = "xyes"; then
      AC_PROG_OBJCXX

Modified: trunk/dports/multimedia/audacious-core/files/patch-buildsys.diff
===================================================================
--- 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)
@@ -1,6 +1,21 @@
 --- buildsys.mk.in.orig
 +++ buildsys.mk.in
-@@ -107,19 +107,24 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
+@@ -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 at 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}
  
  MO_FILES = ${LOCALES:.po=.mo}
  
@@ -28,7 +43,7 @@
  	for i in $@; do \
  		${DIR_ENTER}; \
  		${MAKE} ${MFLAGS} || exit $$?; \
-@@ -205,6 +210,7 @@ pre-depend:
+@@ -205,6 +211,7 @@ pre-depend:
  
  ${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
  	${LINK_STATUS}
@@ -36,7 +51,7 @@
  	if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LDFLAGS} ${LIBS}; then \
  		${LINK_OK}; \
  	else \
-@@ -228,7 +234,8 @@ ${JARFILE}: ${EXT_DEPS} ${JAR_MANIFEST} ${OBJS} ${OBJS_EXTRA}
+@@ -228,7 +235,8 @@ ${JARFILE}: ${EXT_DEPS} ${JAR_MANIFEST} ${OBJS} ${OBJS_EXTRA}
  	fi
  
  ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
@@ -46,7 +61,16 @@
  	objs=""; \
  	ars=""; \
  	for i in ${LIB_OBJS} ${LIB_OBJS_EXTRA}; do \
-@@ -264,6 +271,7 @@ ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
+@@ -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}
  
  ${PLUGIN} ${PLUGIN_NOINST}: ${EXT_DEPS} ${PLUGIN_OBJS}
  	${LINK_STATUS}
@@ -54,7 +78,7 @@
  	objs=""; \
  	ars=""; \
  	for i in ${PLUGIN_OBJS}; do \
-@@ -300,6 +308,7 @@ ${PLUGIN} ${PLUGIN_NOINST}: ${EXT_DEPS} ${PLUGIN_OBJS}
+@@ -300,6 +309,7 @@ ${PLUGIN} ${PLUGIN_NOINST}: ${EXT_DEPS} ${PLUGIN_OBJS}
  ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
  	${LINK_STATUS}
  	rm -f $@
@@ -62,7 +86,7 @@
  	objs=""; \
  	ars=""; \
  	for i in ${OBJS} ${OBJS_EXTRA}; do \
-@@ -337,6 +346,7 @@ ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
+@@ -337,6 +347,7 @@ ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
  ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
  	${LINK_STATUS}
  	rm -f $@
@@ -70,61 +94,69 @@
  	objs=""; \
  	ars=""; \
  	for i in ${LIB_OBJS} ${LIB_OBJS_EXTRA}; do \
-@@ -375,6 +385,8 @@ locales: ${MO_FILES}
+@@ -375,21 +386,27 @@ locales: ${MO_FILES}
  
  .c.o:
  	${COMPILE_STATUS}
+-	if ${CC} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
 +	in="$<"; \
 +	out="$@"; \
- 	if ${CC} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
++	if ${CC} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$@} -c -o $@ $<; then \
  		${COMPILE_OK}; \
  	else \
-@@ -382,6 +394,8 @@ locales: ${MO_FILES}
+ 		${COMPILE_FAILED}; \
  	fi
  .c.lib.o:
  	${COMPILE_LIB_STATUS}
+-	if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
 +	in="$<"; \
 +	out="$@"; \
- 	if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
++	if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$@} -c -o $@ $<; then \
  		${COMPILE_LIB_OK}; \
  	else \
-@@ -389,6 +403,8 @@ locales: ${MO_FILES}
+ 		${COMPILE_LIB_FAILED}; \
  	fi
  .c.plugin.o:
  	${COMPILE_PLUGIN_STATUS}
+-	if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
 +	in="$<"; \
 +	out="$@"; \
- 	if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
++	if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$@} -c -o $@ $<; then \
  		${COMPILE_PLUGIN_OK}; \
  	else \
-@@ -397,6 +413,8 @@ locales: ${MO_FILES}
+ 		${COMPILE_PLUGIN_FAILED}; \
+@@ -397,21 +414,27 @@ locales: ${MO_FILES}
  
  .cc.o .cxx.o:
  	${COMPILE_STATUS}
+-	if ${CXX} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
 +	in="$<"; \
 +	out="$@"; \
- 	if ${CXX} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
++	if ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXFLAGS_$@} -c -o $@ $<; then \
  		${COMPILE_OK}; \
  	else \
-@@ -404,6 +422,8 @@ locales: ${MO_FILES}
+ 		${COMPILE_FAILED}; \
  	fi
  .cc.lib.o .cxx.lib.o:
  	${COMPILE_LIB_STATUS}
+-	if ${CXX} ${LIB_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
 +	in="$<"; \
 +	out="$@"; \
- 	if ${CXX} ${LIB_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
++	if ${CXX} ${LIB_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${CXXFLAGS_$@} -c -o $@ $<; then \
  		${COMPILE_LIB_OK}; \
  	else \
-@@ -411,6 +431,8 @@ locales: ${MO_FILES}
+ 		${COMPILE_LIB_FAILED}; \
  	fi
  .cc.plugin.o .cxx.plugin.o:
  	${COMPILE_PLUGIN_STATUS}
+-	if ${CXX} ${PLUGIN_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
 +	in="$<"; \
 +	out="$@"; \
- 	if ${CXX} ${PLUGIN_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
++	if ${CXX} ${PLUGIN_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${CXXFLAGS_$@} -c -o $@ $<; then \
  		${COMPILE_PLUGIN_OK}; \
  	else \
-@@ -419,6 +441,8 @@ locales: ${MO_FILES}
+ 		${COMPILE_PLUGIN_FAILED}; \
+@@ -419,6 +442,8 @@ locales: ${MO_FILES}
  
  .d.o:
  	${COMPILE_STATUS}
@@ -133,7 +165,7 @@
  	if test x"$(basename ${DC})" = x"dmd"; then \
  		if ${DC} ${DFLAGS} -c -of$@ $<; then \
  			${COMPILE_OK}; \
-@@ -435,6 +459,8 @@ locales: ${MO_FILES}
+@@ -435,6 +460,8 @@ locales: ${MO_FILES}
  
  .erl.beam:
  	${COMPILE_STATUS}
@@ -142,7 +174,7 @@
  	if ${ERLC} ${ERLCFLAGS} -o $@ $<; then \
  		${COMPILE_OK}; \
  	else \
-@@ -443,6 +469,8 @@ locales: ${MO_FILES}
+@@ -443,6 +470,8 @@ locales: ${MO_FILES}
  
  .java.class:
  	${COMPILE_STATUS}
@@ -151,61 +183,69 @@
  	if ${JAVAC} ${JAVACFLAGS} $<; then \
  		${COMPILE_OK}; \
  	else \
-@@ -451,6 +479,8 @@ locales: ${MO_FILES}
+@@ -451,21 +480,27 @@ locales: ${MO_FILES}
  
  .m.o:
  	${COMPILE_STATUS}
+-	if ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
 +	in="$<"; \
 +	out="$@"; \
- 	if ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
++	if ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} ${OBJCFLAGS_$@} -c -o $@ $<; then \
  		${COMPILE_OK}; \
  	else \
-@@ -458,6 +488,8 @@ locales: ${MO_FILES}
+ 		${COMPILE_FAILED}; \
  	fi
  .m.lib.o:
  	${COMPILE_LIB_STATUS}
+-	if ${OBJC} ${LIB_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
 +	in="$<"; \
 +	out="$@"; \
- 	if ${OBJC} ${LIB_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
++	if ${OBJC} ${LIB_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} ${OBJCFLAGS_$@} -c -o $@ $<; then \
  		${COMPILE_LIB_OK}; \
  	else \
-@@ -465,6 +497,8 @@ locales: ${MO_FILES}
+ 		${COMPILE_LIB_FAILED}; \
  	fi
  .m.plugin.o:
  	${COMPILE_PLUGIN_STATUS}
+-	if ${OBJC} ${PLUGIN_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
 +	in="$<"; \
 +	out="$@"; \
- 	if ${OBJC} ${PLUGIN_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
++	if ${OBJC} ${PLUGIN_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} ${OBJCFLAGS_$@} -c -o $@ $<; then \
  		${COMPILE_PLUGIN_OK}; \
  	else \
-@@ -473,6 +507,8 @@ locales: ${MO_FILES}
+ 		${COMPILE_PLUGIN_FAILED}; \
+@@ -473,21 +508,27 @@ locales: ${MO_FILES}
  
  .mm.o:
  	${COMPILE_STATUS}
+-	if ${OBJCXX} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
 +	in="$<"; \
 +	out="$@"; \
- 	if ${OBJCXX} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
++	if ${OBJCXX} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${OBJCXXFLAGS_$@} -c -o $@ $<; then \
  		${COMPILE_OK}; \
  	else \
-@@ -480,6 +516,8 @@ locales: ${MO_FILES}
+ 		${COMPILE_FAILED}; \
  	fi
  .mm.lib.o:
  	${COMPILE_LIB_STATUS}
+-	if ${OBJCXX} ${LIB_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
 +	in="$<"; \
 +	out="$@"; \
- 	if ${OBJCXX} ${LIB_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
++	if ${OBJCXX} ${LIB_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${OBJCXXFLAGS_$@} -c -o $@ $<; then \
  		${COMPILE_LIB_OK}; \
  	else \
-@@ -487,6 +525,8 @@ locales: ${MO_FILES}
+ 		${COMPILE_LIB_FAILED}; \
  	fi
  .mm.plugin.o:
  	${COMPILE_PLUGIN_STATUS}
+-	if ${OBJCXX} ${PLUGIN_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
 +	in="$<"; \
 +	out="$@"; \
- 	if ${OBJCXX} ${PLUGIN_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
++	if ${OBJCXX} ${PLUGIN_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${OBJCXXFLAGS_$@} -c -o $@ $<; then \
  		${COMPILE_PLUGIN_OK}; \
  	else \
-@@ -495,6 +535,8 @@ locales: ${MO_FILES}
+ 		${COMPILE_PLUGIN_FAILED}; \
+@@ -495,6 +536,8 @@ locales: ${MO_FILES}
  
  .po.mo:
  	${COMPILE_STATUS}
@@ -214,7 +254,7 @@
  	if ${MSGFMT} -c -o $@ $<; then \
  		${COMPILE_OK}; \
  	else \
-@@ -503,6 +545,8 @@ locales: ${MO_FILES}
+@@ -503,6 +546,8 @@ locales: ${MO_FILES}
  
  .py.pyc:
  	${COMPILE_STATUS}
@@ -223,7 +263,7 @@
  	if ${PYTHON} ${PYTHON_FLAGS} -c "import py_compile; py_compile.compile('$<')"; then \
  		${COMPILE_OK}; \
  	else \
-@@ -511,7 +555,9 @@ locales: ${MO_FILES}
+@@ -511,7 +556,9 @@ locales: ${MO_FILES}
  
  .rc.o .rc.lib.o .rc.plugin.o:
  	${COMPILE_STATUS}
@@ -234,58 +274,65 @@
  		${COMPILE_OK}; \
  	else \
  		${COMPILE_FAILED}; \
-@@ -519,6 +565,8 @@ locales: ${MO_FILES}
+@@ -519,21 +566,27 @@ locales: ${MO_FILES}
  
  .S.o:
  	${COMPILE_STATUS}
+-	if ${AS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
 +	in="$<"; \
 +	out="$@"; \
- 	if ${AS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
++	if ${AS} ${ASFLAGS} ${CPPFLAGS} ${ASFLAGS_$@} -c -o $@ $<; then \
  		${COMPILE_OK}; \
  	else \
-@@ -526,6 +574,8 @@ locales: ${MO_FILES}
+ 		${COMPILE_FAILED}; \
  	fi
  .S.lib.o:
  	${COMPILE_LIB_STATUS}
+-	if ${AS} ${LIB_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
 +	in="$<"; \
 +	out="$@"; \
- 	if ${AS} ${LIB_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
++	if ${AS} ${LIB_CFLAGS} ${ASFLAGS} ${CPPFLAGS} ${ASFLAGS_$@} -c -o $@ $<; then \
  		${COMPILE_LIB_OK}; \
  	else \
-@@ -533,6 +583,8 @@ locales: ${MO_FILES}
+ 		${COMPILE_LIB_FAILED}; \
  	fi
  .S.plugin.o:
  	${COMPILE_PLUGIN_STATUS}
+-	if ${AS} ${PLUGIN_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
 +	in="$<"; \
 +	out="$@"; \
- 	if ${AS} ${PLUGIN_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
++	if ${AS} ${PLUGIN_CFLAGS} ${ASFLAGS} ${CPPFLAGS} ${ASFLAGS_$@} -c -o $@ $<; then \
  		${COMPILE_PLUGIN_OK}; \
  	else \
-@@ -541,6 +593,8 @@ locales: ${MO_FILES}
+ 		${COMPILE_PLUGIN_FAILED}; \
+@@ -541,28 +594,34 @@ locales: ${MO_FILES}
  
  .xpm.o:
  	${COMPILE_STATUS}
+-	if ${CC} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
 +	in="$<"; \
 +	out="$@"; \
- 	if ${CC} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
++	if ${CC} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$@} -x c -c -o $@ $<; then \
  		${COMPILE_OK}; \
  	else \
-@@ -548,6 +602,8 @@ locales: ${MO_FILES}
+ 		${COMPILE_FAILED}; \
  	fi
  .xpm.lib.o:
  	${COMPILE_LIB_STATUS}
+-	if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
 +	in="$<"; \
 +	out="$@"; \
- 	if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
++	if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$@} -x c -c -o $@ $<; then \
  		${COMPILE_LIB_OK}; \
  	else \
-@@ -555,14 +611,16 @@ locales: ${MO_FILES}
+ 		${COMPILE_LIB_FAILED}; \
  	fi
  .xpm.plugin.o:
  	${COMPILE_PLUGIN_STATUS}
+-	if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
 +	in="$<"; \
 +	out="$@"; \
- 	if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
++	if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$@} -x c -c -o $@ $<; then \
  		${COMPILE_PLUGIN_OK}; \
  	else \
  		${COMPILE_PLUGIN_FAILED}; \
@@ -298,7 +345,7 @@
  		${DIR_ENTER}; \
  		${MAKE} ${MFLAGS} install || exit $$?; \
  		${DIR_LEAVE}; \
-@@ -643,7 +701,7 @@ install: install-extra
+@@ -643,7 +702,7 @@ install: install-extra
  install-extra:
  
  uninstall: uninstall-extra
@@ -307,7 +354,7 @@
  		${DIR_ENTER}; \
  		${MAKE} ${MFLAGS} uninstall || exit $$?; \
  		${DIR_LEAVE}; \
-@@ -736,7 +794,7 @@ uninstall: uninstall-extra
+@@ -736,7 +795,7 @@ uninstall: uninstall-extra
  uninstall-extra:
  
  clean:
@@ -316,7 +363,7 @@
  		${DIR_ENTER}; \
  		${MAKE} ${MFLAGS} clean || exit $$?; \
  		${DIR_LEAVE}; \
-@@ -753,7 +811,7 @@ clean:
+@@ -753,7 +812,7 @@ clean:
  	done
  
  distclean: clean
@@ -325,7 +372,7 @@
  		${DIR_ENTER}; \
  		${MAKE} ${MFLAGS} distclean || exit $$?; \
  		${DIR_LEAVE}; \
-@@ -769,27 +827,39 @@ distclean: clean
+@@ -769,27 +828,39 @@ distclean: clean
  		fi \
  	done
  
@@ -340,7 +387,7 @@
 +	done
 +
 +print-var:
-+	echo '${${VAR}}'
++	printf '%s\n' '${${VAR}}'
 +
 +DIR_ENTER = printf "@TERM_EL@@TERM_SETAF6 at Entering directory @TERM_BOLD@%s at TERM_SGR0@@TERM_SETAF6 at .@TERM_SGR0@\n" "$$i"; cd $$i || exit $$?
 +DIR_LEAVE = printf "@TERM_EL@@TERM_SETAF6 at Leaving directory @TERM_BOLD@%s at TERM_SGR0@@TERM_SETAF6 at .@TERM_SGR0@\n" "$$i"; cd .. || exit $$?
@@ -383,23 +430,241 @@
 +
 +.CURDIR ?= .
 +include ${.CURDIR}/.deps
+--- 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])
 --- m4/buildsys.m4.orig
 +++ m4/buildsys.m4
-@@ -108,13 +108,13 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
+@@ -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 at 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], [
  	case "$host_os" in
  		darwin*)
  			AC_MSG_RESULT(Darwin)
 -			LIB_CFLAGS='-fPIC -DPIC -mmacosx-version-min=10.7'
 -			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}"'
 +			LIB_CFLAGS='-fPIC -DPIC'
-+			LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR} -Wl,-install_name,${libdir}/$${out%.dylib}.${LIB_MAJOR}.dylib'
++			LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
  			LIB_PREFIX='lib'
  			LIB_SUFFIX='.dylib'
  			LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
 -			PLUGIN_CFLAGS='-fPIC -DPIC -mmacosx-version-min=10.7'
 -			PLUGIN_LDFLAGS='-bundle -undefined dynamic_lookup -mmacosx-version-min=10.7'
++			LDFLAGS_INSTALL_NAME='-Wl,-install_name,${libdir}/$${out%.dylib}.${LIB_MAJOR}.dylib'
 +			PLUGIN_CFLAGS='-fPIC -DPIC'
 +			PLUGIN_LDFLAGS='-bundle -undefined dynamic_lookup'
  			PLUGIN_SUFFIX='.bundle'
  			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'
  			UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib'
+ 			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)

Modified: trunk/dports/multimedia/audacious-core/files/patch-gtk3.diff
===================================================================
--- 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)
@@ -11,7 +11,7 @@
  
 --- src/libaudgui/about.cc.old
 +++ src/libaudgui/about.cc
-@@ -72,7 +72,7 @@ static GtkWidget * create_about_window ()
+@@ -74,7 +74,7 @@ static GtkWidget * create_about_window ()
  
      audgui_destroy_on_escape (about_window);
  
@@ -20,7 +20,7 @@
      gtk_container_add ((GtkContainer *) about_window, vbox);
  
      StringBuf logo_path = filename_build ({data_dir, "images", "about-logo.png"});
-@@ -84,11 +84,9 @@ static GtkWidget * create_about_window ()
+@@ -86,11 +86,9 @@ static GtkWidget * create_about_window ()
      gtk_label_set_justify ((GtkLabel *) label, GTK_JUSTIFY_CENTER);
      gtk_box_pack_start ((GtkBox *) vbox, label, false, false, 0);
  
@@ -34,9 +34,40 @@
  
      char * credits, * license;
  
+--- 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",
 --- src/libaudgui/equalizer.cc.old
 +++ src/libaudgui/equalizer.cc
-@@ -63,13 +63,14 @@ static void slider_moved (GtkRange * slider)
+@@ -68,13 +68,14 @@ static void slider_moved (GtkRange * slider)
  
  static GtkWidget * create_slider (const char * name, int band, GtkWidget * hbox)
  {
@@ -53,7 +84,7 @@
      gtk_scale_set_draw_value ((GtkScale *) slider, true);
      gtk_scale_set_value_pos ((GtkScale *) slider, GTK_POS_BOTTOM);
      gtk_range_set_inverted ((GtkRange *) slider, true);
-@@ -127,18 +128,19 @@ static GtkWidget * create_window ()
+@@ -132,10 +133,10 @@ static GtkWidget * create_window ()
      gtk_container_set_border_width ((GtkContainer *) window, 6);
      audgui_destroy_on_escape (window);
  
@@ -61,8 +92,15 @@
 +    GtkWidget * vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
      gtk_container_add ((GtkContainer *) window, vbox);
  
-     gtk_box_pack_start ((GtkBox *) vbox, create_on_off (), false, false, 0);
+-    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);
  
+     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);
+ 
 -    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);
@@ -78,10 +116,10 @@
      {
 --- src/libaudgui/file-opener.cc.old
 +++ src/libaudgui/file-opener.cc
-@@ -96,9 +96,8 @@ static GtkWidget * create_filebrowser (gboolean open)
+@@ -98,9 +98,8 @@ static GtkWidget * create_filebrowser (gboolean open)
      gtk_window_set_type_hint ((GtkWindow *) window, GDK_WINDOW_TYPE_HINT_DIALOG);
      gtk_window_set_title ((GtkWindow *) window, window_title);
-     gtk_window_set_default_size ((GtkWindow *) window, 700, 450);
+     gtk_window_set_default_size ((GtkWindow *) window, 7 * dpi, 5 * dpi);
 -    gtk_container_set_border_width ((GtkContainer *) window, 10);
  
 -    GtkWidget * vbox = gtk_vbox_new (false, 0);
@@ -89,7 +127,7 @@
      gtk_container_add ((GtkContainer *) window, vbox);
  
      GtkWidget * chooser = gtk_file_chooser_widget_new (GTK_FILE_CHOOSER_ACTION_OPEN);
-@@ -108,17 +107,24 @@ static GtkWidget * create_filebrowser (gboolean open)
+@@ -110,17 +109,24 @@ static GtkWidget * create_filebrowser (gboolean open)
      if (path[0])
          gtk_file_chooser_set_current_folder ((GtkFileChooser *) chooser, path);
  
@@ -120,7 +158,7 @@
      gtk_box_pack_end ((GtkBox *) hbox, bbox, true, true, 0);
 --- src/libaudgui/infopopup.cc.old
 +++ src/libaudgui/infopopup.cc
-@@ -37,9 +37,6 @@
+@@ -35,9 +35,6 @@
  
  static void infopopup_move_to_mouse (GtkWidget * infopopup);
  
@@ -130,8 +168,8 @@
  static struct {
      GtkWidget * title_header, * title_label;
      GtkWidget * artist_header, * artist_label;
-@@ -107,56 +104,21 @@ static gboolean infopopup_progress_cb (void *)
-     return true;
+@@ -102,56 +99,21 @@ static void infopopup_progress_cb (void *)
+         gtk_widget_hide (widgets.progress);
  }
  
 -static void infopopup_realized (GtkWidget * widget)
@@ -191,7 +229,7 @@
  
      gtk_widget_set_no_show_all (* header, true);
      gtk_widget_set_no_show_all (* label, true);
-@@ -185,7 +147,7 @@ static GtkWidget * infopopup_create ()
+@@ -178,7 +140,7 @@ static GtkWidget * infopopup_create ()
      gtk_window_set_decorated ((GtkWindow *) infopopup, false);
      gtk_container_set_border_width ((GtkContainer *) infopopup, 4);
  
@@ -200,7 +238,7 @@
      gtk_container_add ((GtkContainer *) infopopup, hbox);
  
      widgets.image = gtk_image_new ();
-@@ -193,8 +155,8 @@ static GtkWidget * infopopup_create ()
+@@ -186,8 +148,8 @@ static GtkWidget * infopopup_create ()
      gtk_box_pack_start ((GtkBox *) hbox, widgets.image, false, false, 0);
      gtk_widget_set_no_show_all (widgets.image, true);
  
@@ -211,7 +249,7 @@
      gtk_box_pack_start ((GtkBox *) hbox, grid, true, true, 0);
  
      infopopup_add_category (grid, 0, _("Title"), & widgets.title_header, & widgets.title_label);
-@@ -207,23 +169,15 @@ static GtkWidget * infopopup_create ()
+@@ -200,23 +162,15 @@ static GtkWidget * infopopup_create ()
  
      /* track progress */
      widgets.progress = gtk_progress_bar_new ();
@@ -241,7 +279,7 @@
  }
 --- src/libaudgui/infowin.cc.old
 +++ src/libaudgui/infowin.cc
-@@ -132,7 +132,7 @@ static GtkWidget * small_label_new (const char * text)
+@@ -133,7 +133,7 @@ static GtkWidget * small_label_new (const char * text)
  
      GtkWidget * label = gtk_label_new (text);
      gtk_label_set_attributes ((GtkLabel *) label, attrs);
@@ -250,7 +288,7 @@
  
      return label;
  }
-@@ -301,10 +301,11 @@ static void add_entry (GtkWidget * grid, const char * title, GtkWidget * entry,
+@@ -287,10 +287,11 @@ static void add_entry (GtkWidget * grid, const char * title, GtkWidget * entry,
  {
      GtkWidget * label = small_label_new (title);
  
@@ -266,7 +304,7 @@
  
      g_signal_connect (entry, "changed", (GCallback) entry_changed, nullptr);
  }
-@@ -317,44 +318,41 @@ static void create_infowin ()
+@@ -305,44 +306,41 @@ static void create_infowin ()
      gtk_window_set_type_hint ((GtkWindow *) infowin,
       GDK_WINDOW_TYPE_HINT_DIALOG);
  
@@ -285,7 +323,7 @@
 +    gtk_grid_attach ((GtkGrid *) main_grid, widgets.image, 0, 0, 1, 1);
  
      widgets.location = gtk_label_new ("");
--    gtk_widget_set_size_request (widgets.location, 200, -1);
+-    gtk_widget_set_size_request (widgets.location, 2 * dpi, -1);
 +    gtk_label_set_max_width_chars ((GtkLabel *) widgets.location, 40);
      gtk_label_set_line_wrap ((GtkLabel *) widgets.location, true);
      gtk_label_set_line_wrap_mode ((GtkLabel *) widgets.location, PANGO_WRAP_WORD_CHAR);
@@ -328,8 +366,8 @@
 +    gtk_grid_attach ((GtkGrid *) main_grid, grid, 1, 0, 1, 3);
  
      widgets.title = gtk_entry_new ();
-     add_entry (grid, _("Title"), widgets.title, 0, 0, 2);
-@@ -381,9 +379,8 @@ static void create_infowin ()
+     gtk_widget_set_size_request (widgets.title, 3 * dpi, -1);
+@@ -370,9 +368,8 @@ static void create_infowin ()
      widgets.track = gtk_entry_new ();
      add_entry (grid, _("Track Number"), widgets.track, 1, 12, 1);
  
@@ -354,16 +392,16 @@
  static void update_cb (void * data, void *);
  static void activate_cb (void * data, void *);
  
-@@ -243,7 +247,7 @@ static GtkWidget * create_window ()
+@@ -245,7 +249,7 @@ static GtkWidget * create_window ()
      gtk_container_set_border_width ((GtkContainer *) jump_to_track_win, 10);
-     gtk_window_set_default_size ((GtkWindow *) jump_to_track_win, 600, 500);
+     gtk_window_set_default_size ((GtkWindow *) jump_to_track_win, 6 * dpi, 5 * dpi);
  
 -    GtkWidget * vbox = gtk_vbox_new (false, 6);
 +    GtkWidget * vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
      gtk_container_add ((GtkContainer *) jump_to_track_win, vbox);
  
      treeview = audgui_list_new (& callbacks, nullptr, 0);
-@@ -256,7 +260,7 @@ static GtkWidget * create_window ()
+@@ -258,7 +262,7 @@ static GtkWidget * create_window ()
       "changed", (GCallback) selection_changed, nullptr);
      g_signal_connect (treeview, "row-activated", (GCallback) do_jump, nullptr);
  
@@ -372,7 +410,7 @@
      gtk_box_pack_start ((GtkBox *) vbox, hbox, false, false, 3);
  
      /* filter box */
-@@ -280,17 +284,14 @@ static GtkWidget * create_window ()
+@@ -282,17 +286,14 @@ static GtkWidget * create_window ()
      gtk_scrolled_window_set_shadow_type ((GtkScrolledWindow *) scrollwin, GTK_SHADOW_IN);
      gtk_box_pack_start ((GtkBox *) vbox, scrollwin, true, true, 0);
  
@@ -396,33 +434,33 @@
      GtkWidget * toggle = gtk_check_button_new_with_mnemonic (_("C_lose on jump"));
 --- src/libaudgui/list.cc.old
 +++ src/libaudgui/list.cc
-@@ -386,7 +386,7 @@ static gboolean autoscroll (GtkWidget * widget)
+@@ -385,7 +385,7 @@ static void autoscroll (void * widget)
      ListModel * model = (ListModel *) gtk_tree_view_get_model
       ((GtkTreeView *) widget);
  
 -    GtkAdjustment * adj = gtk_tree_view_get_vadjustment ((GtkTreeView *) widget);
 +    GtkAdjustment * adj = gtk_scrollable_get_vadjustment ((GtkScrollable *) widget);
-     if (! adj)
-     {
-         stop_autoscroll (model);
-@@ -458,7 +458,7 @@ static gboolean drag_motion (GtkWidget * widget, GdkDragContext * context,
+     g_return_if_fail (adj);
  
-     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);
+     int pos, end;
+@@ -402,7 +402,7 @@ static void autoscroll (void * widget)
  
-@@ -534,6 +534,10 @@ static void drag_data_received (GtkWidget * widget, GdkDragContext * context, in
+ 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);
  
+     int pos, end;
+@@ -532,6 +532,10 @@ static void drag_data_received (GtkWidget * widget, GdkDragContext * context, in
+ 
  static void destroy_cb (GtkWidget * list, ListModel * model)
  {
 +    /* workaround for Gnome bug #679291 */
 +    g_signal_handlers_disconnect_matched (list, G_SIGNAL_MATCH_DATA, 0, 0, NULL,
 +     NULL, model);
 +
-     stop_autoscroll (model);
+     stop_autoscroll (model, list);
      g_list_free (model->column_types);
      g_object_unref (model);
 --- src/libaudgui/menu.cc.old
@@ -500,11 +538,28 @@
  }
  
  /* WIDGET_SPIN_BTN */
-@@ -206,13 +210,15 @@ void create_font_btn (const PreferencesWidget * widget, GtkWidget * * label,
+@@ -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,
   GtkWidget * * font_btn, const char * domain)
  {
      * font_btn = gtk_font_button_new ();
-+    gtk_widget_set_hexpand (* font_btn, true);
 +
      gtk_font_button_set_use_font ((GtkFontButton *) * font_btn, true);
      gtk_font_button_set_use_size ((GtkFontButton *) * font_btn, true);
@@ -517,7 +572,7 @@
      }
  
      if (widget->data.font_btn.title)
-@@ -228,12 +234,13 @@ static void create_entry (const PreferencesWidget * widget, GtkWidget * * label,
+@@ -236,12 +241,13 @@ static void create_entry (const PreferencesWidget * widget, GtkWidget * * label,
   GtkWidget * * entry, const char * domain)
  {
      * entry = gtk_entry_new ();
@@ -532,7 +587,7 @@
      }
  
      widget_init (* entry, widget);
-@@ -251,8 +258,7 @@ static void combobox_update (GtkWidget * combobox, const PreferencesWidget * wid
+@@ -259,8 +265,7 @@ static void combobox_update (GtkWidget * combobox, const PreferencesWidget * wid
  
      g_object_set_data ((GObject *) combobox, "comboitems", (void *) items.data);
  
@@ -542,7 +597,16 @@
  
      for (const ComboItem & item : items)
          gtk_combo_box_text_append_text ((GtkComboBoxText *) combobox,
-@@ -306,7 +312,6 @@ static void fill_table (GtkWidget * table,
+@@ -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,
      for (const PreferencesWidget & w : widgets)
      {
          GtkWidget * widget_left = nullptr, * widget_middle = nullptr, * widget_right = nullptr;
@@ -550,25 +614,15 @@
  
          switch (w.type)
          {
-@@ -321,17 +326,14 @@ static void fill_table (GtkWidget * table,
+@@ -336,7 +340,6 @@ static void fill_table (GtkWidget * table,
  
-             case PreferencesWidget::FontButton:
-                 create_font_btn (& w, & widget_left, & widget_middle, domain);
--                middle_policy = (GtkAttachOptions) (GTK_EXPAND | GTK_FILL);
-                 break;
- 
              case PreferencesWidget::Entry:
                  create_entry (& w, & widget_left, & widget_middle, domain);
 -                middle_policy = (GtkAttachOptions) (GTK_EXPAND | GTK_FILL);
                  break;
  
              case PreferencesWidget::ComboBox:
-                 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,
+@@ -350,16 +353,13 @@ static void fill_table (GtkWidget * table,
          int i = & w - widgets.data;
  
          if (widget_left)
@@ -588,7 +642,7 @@
      }
  }
  
-@@ -371,13 +370,11 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
+@@ -384,13 +384,11 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
          {
              if (! child_box)
              {
@@ -603,36 +657,39 @@
 +                gtk_widget_set_margin_left (child_box, 12);
 +                gtk_box_pack_start ((GtkBox *) box, child_box, false, false, 0);
  
-                 if (GTK_IS_TOGGLE_BUTTON (widget))
-                     gtk_widget_set_sensitive (child_box,
-@@ -387,15 +384,13 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
+                 if (disable_child)
+                     gtk_widget_set_sensitive (child_box, false);
+@@ -399,16 +397,15 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
          else
              child_box = nullptr;
  
 -        GtkWidget * alignment = gtk_alignment_new (0.5, 0.5, 1, 1);
--        gtk_alignment_set_padding ((GtkAlignment *) alignment, 6, 0, 12, 0);
+-        gtk_alignment_set_padding ((GtkAlignment *) alignment, spacing, 0, indent, 0);
 -        gtk_box_pack_start ((GtkBox *) (child_box ? child_box : box), alignment, false, false, 0);
 -
          widget = nullptr;
+         disable_child = false;
  
          if (radio_btn_group && w.type != PreferencesWidget::RadioButton)
              radio_btn_group = nullptr;
  
-+        int pad_left = 12, pad_top = 6;
++        int pad_left = indent;
++        int pad_top = spacing;
 +
          switch (w.type)
          {
              case PreferencesWidget::Button:
-@@ -410,22 +405,24 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
+@@ -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;
  
-             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);
+                     /* set indent for items below the heading */
+                     indent = 12;
+@@ -438,7 +436,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
  
                  if (icon)
                  {
@@ -641,20 +698,8 @@
                      gtk_box_pack_start ((GtkBox *) widget, icon, false, false, 0);
                      gtk_box_pack_start ((GtkBox *) widget, label, false, false, 0);
                  }
-                 else
-                     widget = label;
+@@ -457,7 +455,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
  
-+                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,
- 
              case PreferencesWidget::SpinButton:
              {
 -                widget = gtk_hbox_new (false, 6);
@@ -662,7 +707,7 @@
  
                  GtkWidget * label_pre = nullptr, * spin_btn = nullptr, * label_past = nullptr;
                  create_spin_button (& w, & label_pre, & spin_btn, & label_past, domain);
-@@ -461,7 +458,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
+@@ -480,7 +478,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
  
              case PreferencesWidget::FontButton:
              {
@@ -671,7 +716,7 @@
  
                  GtkWidget * font_btn = nullptr;
                  create_font_btn (& w, & label, & font_btn, domain);
-@@ -475,9 +472,9 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
+@@ -494,9 +492,9 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
              }
  
              case PreferencesWidget::Table:
@@ -684,7 +729,7 @@
  
                  fill_table (widget, w.data.table.widgets, domain);
  
-@@ -485,7 +482,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
+@@ -504,7 +502,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
  
              case PreferencesWidget::Entry:
              {
@@ -693,7 +738,7 @@
  
                  GtkWidget * entry = nullptr;
                  create_entry (& w, & label, & entry, domain);
-@@ -500,7 +497,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
+@@ -519,7 +517,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
  
              case PreferencesWidget::ComboBox:
              {
@@ -702,7 +747,7 @@
  
                  GtkWidget * combo = nullptr;
                  create_cbox (& w, & label, & combo, domain);
-@@ -515,9 +512,9 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
+@@ -534,9 +532,9 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
  
              case PreferencesWidget::Box:
                  if (w.data.box.horizontal)
@@ -714,7 +759,7 @@
  
                  audgui_create_widgets_with_domain (widget, w.data.box.widgets, domain);
  
-@@ -531,13 +528,11 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
+@@ -550,13 +548,11 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
                  break;
  
              case PreferencesWidget::Notebook:
@@ -729,7 +774,7 @@
                      gtk_container_set_border_width ((GtkContainer *) vbox, 6);
  
                      audgui_create_widgets_with_domain (vbox, tab.widgets, domain);
-@@ -546,11 +541,13 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
+@@ -565,11 +561,13 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
                       gtk_label_new (dgettext (domain, tab.name)));
                  }
  
@@ -745,27 +790,22 @@
                  break;
  
              default:
-@@ -560,11 +557,14 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
+@@ -577,7 +575,11 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
+         }
+ 
          if (widget)
-         {
-             /* 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);
-+            }
- 
 -            gtk_container_add ((GtkContainer *) alignment, widget);
++        {
++            gtk_widget_set_margin_left (widget, pad_left);
++            gtk_widget_set_margin_top (widget, pad_top);
 +            gtk_box_pack_start ((GtkBox *) (child_box ? child_box : box), widget, false, false, 0);
-         }
-     }
- }
++        }
+ 
+         /* wait till after first widget to set item spacing */
+         if (gtk_orientable_get_orientation ((GtkOrientable *) box) == GTK_ORIENTATION_VERTICAL)
 --- src/libaudgui/prefs-window.cc.old
 +++ src/libaudgui/prefs-window.cc
-@@ -498,29 +498,32 @@ static void create_titlestring_widgets (GtkWidget * * cbox, GtkWidget * * entry)
+@@ -516,29 +516,32 @@ static void create_titlestring_widgets (GtkWidget * * cbox, GtkWidget * * entry)
  
  static void * create_titlestring_table ()
  {
@@ -809,7 +849,7 @@
  
      GtkWidget * titlestring_tag_menu = create_titlestring_tag_menu ();
  
-@@ -535,14 +538,14 @@ static void * create_titlestring_table ()
+@@ -553,14 +556,14 @@ static void * create_titlestring_table ()
  
  static void create_playlist_category ()
  {
@@ -826,7 +866,7 @@
      gtk_container_add ((GtkContainer *) category_notebook, vbox);
      audgui_create_widgets (vbox, song_info_page_widgets);
  }
-@@ -593,14 +596,14 @@ static ArrayRef<ComboItem> iface_combo_fill ()
+@@ -603,14 +606,14 @@ static ArrayRef<ComboItem> iface_combo_fill ()
  
  static void * iface_create_prefs_box ()
  {
@@ -843,7 +883,7 @@
      gtk_container_add ((GtkContainer *) category_notebook, vbox);
      audgui_create_widgets (vbox, appearance_page_widgets);
  }
-@@ -666,17 +669,17 @@ static void * output_create_about_button ()
+@@ -734,17 +737,17 @@ static void record_update (void * = nullptr, void * = nullptr)
  
  static void create_audio_category ()
  {
@@ -864,9 +904,17 @@
      gtk_box_pack_start ((GtkBox *) connectivity_page_vbox, vbox, true, true, 0);
  
      audgui_create_widgets (vbox, connectivity_page_widgets);
-@@ -711,10 +714,10 @@ static void create_prefs_window ()
+@@ -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);
      gtk_window_set_title ((GtkWindow *) prefswin, _("Audacious Settings"));
-     gtk_window_set_default_size ((GtkWindow *) prefswin, 680, 400);
  
 -    GtkWidget * vbox = gtk_vbox_new (false, 0);
 +    GtkWidget * vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
@@ -877,7 +925,7 @@
      gtk_box_pack_start ((GtkBox *) vbox, hbox, true, true, 0);
  
      GtkWidget * scrolledwindow = gtk_scrolled_window_new (nullptr, nullptr);
-@@ -744,17 +747,17 @@ static void create_prefs_window ()
+@@ -813,17 +817,17 @@ static void create_prefs_window ()
      create_song_info_category ();
      create_plugin_category ();
  
@@ -931,7 +979,7 @@
      progress_label = gtk_label_new (nullptr);
 --- src/libaudgui/util.cc.old
 +++ src/libaudgui/util.cc
-@@ -46,12 +46,27 @@ EXPORT int audgui_get_digit_width (GtkWidget * widget)
+@@ -66,12 +66,27 @@ EXPORT int audgui_get_digit_width (GtkWidget * widget)
  
  EXPORT void audgui_get_mouse_coords (GtkWidget * widget, int * x, int * y)
  {
@@ -961,7 +1009,7 @@
  }
  
  EXPORT void audgui_get_monitor_geometry (GdkScreen * screen, int x, int y, GdkRectangle * geom)
-@@ -105,6 +120,22 @@ EXPORT GtkWidget * audgui_button_new (const char * text, const char * icon,
+@@ -125,6 +140,22 @@ EXPORT GtkWidget * audgui_button_new (const char * text, const char * icon,
      return button;
  }
  
@@ -984,7 +1032,7 @@
  EXPORT GtkWidget * audgui_dialog_new (GtkMessageType type, const char * title,
   const char * text, GtkWidget * button1, GtkWidget * button2)
  {
-@@ -112,6 +143,13 @@ EXPORT GtkWidget * audgui_dialog_new (GtkMessageType type, const char * title,
+@@ -132,6 +163,13 @@ EXPORT GtkWidget * audgui_dialog_new (GtkMessageType type, const char * title,
       GTK_BUTTONS_NONE, "%s", text);
      gtk_window_set_title ((GtkWindow *) dialog, title);
  
@@ -998,7 +1046,7 @@
      if (button2)
      {
          gtk_dialog_add_action_widget ((GtkDialog *) dialog, button2, GTK_RESPONSE_NONE);
-@@ -127,6 +165,8 @@ EXPORT GtkWidget * audgui_dialog_new (GtkMessageType type, const char * title,
+@@ -147,6 +185,8 @@ EXPORT GtkWidget * audgui_dialog_new (GtkMessageType type, const char * title,
      return dialog;
  }
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160604/7c6343cb/attachment-0001.html>


More information about the macports-changes mailing list