build-sys: drop gconf support

Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/499>

configure.ac

@@ -926,43 +926,20 @@ AS_IF([test "x$enable_gtk3" = "xyes" && test "x$HAVE_GTK30" = "x0"],
 AM_CONDITIONAL([HAVE_GTK30], [test "x$HAVE_GTK30" = x1])
 AS_IF([test "x$HAVE_GTK30" = "x1"], AC_DEFINE([HAVE_GTK], 1, [Have GTK?]))
 
-#### GSettings and GConf support (optional) ####
+#### GSettings support (optional) ####
 
 AC_ARG_ENABLE([gsettings],
     AS_HELP_STRING([--disable-gsettings],[Disable optional GSettings support]))
 
-AC_ARG_ENABLE([gconf],
-    AS_HELP_STRING([--disable-gconf],[Disable optional GConf support]))
-
 AS_IF([test "x$enable_gsettings" != "xno"],
     [PKG_CHECK_MODULES(GSETTINGS, [ gio-2.0 >= 2.26.0 ], [HAVE_GSETTINGS=1], [HAVE_GSETTINGS=0])],
     HAVE_GSETTINGS=0)
 
 AS_IF([test "x$enable_gsettings" = "xyes" && test "x$HAVE_GSETTINGS" = "x0"],
     [AC_MSG_ERROR([*** GSettings support not found])])
 
-AS_IF([test "x$enable_gconf" != "xno"],
-    [PKG_CHECK_MODULES(GCONF, [ gconf-2.0 >= 2.4.0 gobject-2.0 ], HAVE_GCONF=1, HAVE_GCONF=0)],
-    HAVE_GCONF=0)
-
-AS_IF([test "x$enable_gconf" = "xyes" && test "x$HAVE_GCONF" = "x0"],
-    [AC_MSG_ERROR([*** GConf support not found])])
-
-# Enable only one of GSettings and GConf, unless both were explicitly
-# requested. If neither was explicitly requested and both are available, prefer
-# GSettings. This is done, because if module-gsettings and module-gconf are
-# both loaded, they can cause conflicting or at least confusing configuration.
-# Distributions may want to enable both modules when building PulseAudio, if
-# they ensure that both modules are never installed at the same time.
-AS_IF([test "x$HAVE_GSETTINGS" = "x1" && test "x$enable_gconf" != "xyes"],
-      [HAVE_GCONF=0])
-AS_IF([test "x$HAVE_GCONF" = "x1" && test "x$enable_gsettings" != "xyes"],
-      [HAVE_GSETTINGS=0])
-
 AM_CONDITIONAL([HAVE_GSETTINGS], [test "x$HAVE_GSETTINGS" = "x1"])
 AC_SUBST([HAVE_GSETTINGS])
-AM_CONDITIONAL([HAVE_GCONF], [test "x$HAVE_GCONF" = "x1"])
-AC_SUBST([HAVE_GCONF])
 
 if test "x$HAVE_GSETTINGS" = "x1" ; then
     GLIB_GSETTINGS
@@ -1635,7 +1612,6 @@ AS_IF([test "x$HAVE_SOLARIS" = "x1"], ENABLE_SOLARIS=yes, ENABLE_SOLARIS=no)
 AS_IF([test "x$HAVE_WAVEOUT" = "x1"], ENABLE_WAVEOUT=yes, ENABLE_WAVEOUT=no)
 AS_IF([test "x$HAVE_GLIB20" = "x1"], ENABLE_GLIB20=yes, ENABLE_GLIB20=no)
 AS_IF([test "x$HAVE_GTK30" = "x1"], ENABLE_GTK30=yes, ENABLE_GTK30=no)
-AS_IF([test "x$HAVE_GCONF" = "x1"], ENABLE_GCONF=yes, ENABLE_GCONF=no)
 AS_IF([test "x$HAVE_GSETTINGS" = "x1"], ENABLE_GSETTINGS=yes, ENABLE_GSETTINGS=no)
 AS_IF([test "x$HAVE_AVAHI" = "x1"], ENABLE_AVAHI=yes, ENABLE_AVAHI=no)
 AS_IF([test "x$HAVE_JACK" = "x1"], ENABLE_JACK=yes, ENABLE_JACK=no)
@@ -1701,7 +1677,6 @@ echo "
     Enable WaveOut:                ${ENABLE_WAVEOUT}
     Enable GLib 2.0:               ${ENABLE_GLIB20}
     Enable Gtk+ 3.0:               ${ENABLE_GTK30}
-    Enable GConf:                  ${ENABLE_GCONF}
     Enable GSettings:              ${ENABLE_GSETTINGS}
     Enable Avahi:                  ${ENABLE_AVAHI}
     Enable Jack:                   ${ENABLE_JACK}

meson.build

@@ -880,7 +880,6 @@ summary = [
 #  'Enable Solaris:                @0@'.format(${ENABLE_SOLARIS}),
 #  'Enable WaveOut:                @0@'.format(${ENABLE_WAVEOUT}),
   'Enable GLib 2:                 @0@'.format(glib_dep.found()),
-#  'Enable GConf:                  @0@'.format(${ENABLE_GCONF}),
   'Enable GSettings:              @0@'.format(gio_dep.found()),
   'Enable Gtk+ 3:                 @0@'.format(gtk_dep.found()),
   'Enable Avahi:                  @0@'.format(avahi_dep.found()),

po/POTFILES.in

@@ -16,8 +16,6 @@ src/modules/alsa/module-alsa-sink.c
 src/modules/alsa/module-alsa-source.c
 src/modules/bluetooth/module-bluez5-device.c
 src/modules/echo-cancel/module-echo-cancel.c
-src/modules/gconf/gconf-helper.c
-src/modules/gconf/module-gconf.c
 src/modules/jack/module-jack-sink.c
 src/modules/jack/module-jack-source.c
 src/modules/macosx/module-coreaudio-device.c

src/.gitignore

@@ -14,7 +14,6 @@ daemon.conf
 default.pa
 echo-cancel-test
 esdcompat
-gconf-helper
 gsettings-helper
 org.freedesktop.pulseaudio.gschema.valid
 pacat

src/Makefile.am

@@ -1461,14 +1461,6 @@ endif
 
 endif
 
-if HAVE_GCONF
-modlibexec_LTLIBRARIES += \
-		module-gconf.la
-
-pulselibexec_PROGRAMS += \
-		gconf-helper
-endif
-
 if HAVE_GSETTINGS
 modlibexec_LTLIBRARIES += \
 		module-gsettings.la
@@ -2122,20 +2114,6 @@ module_systemd_login_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_systemd_login_la_LIBADD = $(MODULE_LIBADD) $(SYSTEMD_LIBS) $(SYSTEMDLOGIN_LIBS)
 module_systemd_login_la_CFLAGS = $(AM_CFLAGS) $(SYSTEMD_CFLAGS) $(SYSTEMDLOGIN_CFLAGS) -DPA_MODULE_NAME=module_systemd_login
 
-# GConf support
-module_gconf_la_SOURCES = \
-		 modules/stdin-util.c modules/stdin-util.h \
-		 modules/gconf/module-gconf.c
-
-module_gconf_la_LDFLAGS = $(MODULE_LDFLAGS)
-module_gconf_la_LIBADD = $(MODULE_LIBADD)
-module_gconf_la_CFLAGS = $(AM_CFLAGS) -DPA_GCONF_HELPER=\"$(pulselibexecdir)/gconf-helper\" -DPA_MODULE_NAME=module_gconf
-
-gconf_helper_SOURCES = modules/gconf/gconf-helper.c
-gconf_helper_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la $(GCONF_LIBS)
-gconf_helper_CFLAGS = $(AM_CFLAGS) $(GCONF_CFLAGS)
-gconf_helper_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
-
 # GSettings support
 module_gsettings_la_SOURCES = \
 		modules/stdin-util.c modules/stdin-util.h \

src/daemon/default.pa.in

@@ -127,17 +127,6 @@ load-module module-gsettings
 .endif
 ])dnl
 
-ifelse(@HAVE_GCONF@, 1, [dnl
-### Load additional modules from GConf settings. This can be configured with the paprefs tool.
-### Please keep in mind that the modules configured by paprefs might conflict with manually
-### loaded modules.
-.ifexists module-gconf@PA_SOEXT@
-.nofail
-load-module module-gconf
-.fail
-.endif
-])dnl
-
 ### Automatically restore the default sink/source when changed by the user
 ### during runtime
 ### NOTE: This should be loaded as early as possible so that subsequent modules

src/daemon/meson.build

@@ -103,8 +103,6 @@ default_conf.set('PA_SOEXT', cdata.get_unquoted('PA_SOEXT'))
 default_conf.set10('HAVE_AF_UNIX', cc.has_header('sys/un.h'))
 default_conf.set10('OS_IS_WIN32', host_machine.system() == 'windows')
 default_conf.set10('HAVE_MKFIFO', cc.has_function('mkfifo'))
-# We don't support the deprecated GConf option in meson
-default_conf.set10('HAVE_GCONF', 0)
 
 default_template_file = configure_file(
   input : 'default.pa.in',