Skip to content

Commit

Permalink
Unconditionally require gio-2.0, gio-unix-2.0
Browse files Browse the repository at this point in the history
Fixes the following on NixOS:

pulseaudio-mpris-player.c:25:10: fatal error: gio/gdesktopappinfo.h: No such file or directory
   25 | #include <gio/gdesktopappinfo.h>
      |          ^~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.

The reason here is the same as https://gitlab.xfce.org/xfce/xfce4-session/-/merge_requests/51.

It looks like the associated code paths are built unconditionally.
  • Loading branch information
bobby285271 committed Mar 25, 2024
1 parent 58bbbee commit a7eb9b9
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
13 changes: 10 additions & 3 deletions configure.ac.in
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ AC_SUBST([LIBXFCE4PANEL_VERSION_API])

XDT_CHECK_PACKAGE([PULSEAUDIO], [libpulse-mainloop-glib], [0.9.19])
XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.44.0])
XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.44.0])
XDT_CHECK_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.44.0])
XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.20.0])
XDT_CHECK_PACKAGE([EXO], [exo-2], [0.11.0])
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.9.0])
Expand Down Expand Up @@ -104,8 +106,13 @@ AC_SUBST(LIBM)
dnl *******************************
dnl *** Optional MPRIS2 Support ***
dnl *******************************
XDT_CHECK_OPTIONAL_PACKAGE([MPRIS2], [gio-2.0], [2.42], [mpris2],
[mpris2 support])
AC_ARG_ENABLE([mpris2],
[AS_HELP_STRING([--disable-mpris2],
[Do not build MPRIS2 support])],
[enable_mpris2=$enableval], [enable_mpris2=yes])
if test x"$enable_mpris2" != x"no"; then
AC_DEFINE([HAVE_MPRIS2], [1], [Define to enable MPRIS2 support])
fi

dnl *********************************************************
dnl *** Optional (experimental) Libxfce4windowing Support ***
Expand Down Expand Up @@ -169,7 +176,7 @@ echo "* Debug Support: $enable_debug"
echo "* Use keybinder: ${KEYBINDER_FOUND:-no}"
echo "* Use libnotify: ${LIBNOTIFY_FOUND:-no}"
echo "* Use libcanberra: ${LIBCANBERRA_FOUND:-no}"
echo "* Use MPRIS2: ${MPRIS2_FOUND:-no}"
echo "* Use MPRIS2: $enable_mpris2"
if test "$LIBXFCE4WINDOWING_FOUND" = "yes"; then
echo "* Libxfce4windowing support: ${LIBXFCE4WINDOWING_FOUND:-no}"
else
Expand Down
6 changes: 4 additions & 2 deletions panel-plugin/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ libpulseaudio_plugin_la_SOURCES = \
libpulseaudio_plugin_la_CFLAGS = \
$(PULSEAUDIO_CFLAGS) \
$(GLIB_CFLAGS) \
$(GIO_CFLAGS) \
$(GIO_UNIX_CFLAGS) \
$(GTK_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS) \
$(LIBXFCE4UI_CFLAGS) \
Expand All @@ -60,7 +62,6 @@ libpulseaudio_plugin_la_CFLAGS = \
$(KEYBINDER_CFLAGS) \
$(LIBNOTIFY_CFLAGS) \
$(LIBCANBERRA_CFLAGS) \
$(MPRIS2_CFLAGS) \
$(EXO_CFLAGS) \
$(WNCK_CFLAGS) \
$(LIBXFCE4WINDOWING_CFLAGS) \
Expand All @@ -76,6 +77,8 @@ libpulseaudio_plugin_la_LDFLAGS = \
libpulseaudio_plugin_la_LIBADD = \
$(PULSEAUDIO_LIBS) \
$(GLIB_LIBS) \
$(GIO_LIBS) \
$(GIO_UNIX_LIBS) \
$(GTK_LIBS) \
$(LIBXFCE4UTIL_LIBS) \
$(LIBXFCE4UI_LIBS) \
Expand All @@ -84,7 +87,6 @@ libpulseaudio_plugin_la_LIBADD = \
$(KEYBINDER_LIBS) \
$(LIBNOTIFY_LIBS) \
$(LIBCANBERRA_LIBS) \
$(MPRIS2_LIBS) \
$(EXO_LIBS) \
$(WNCK_LIBS) \
$(LIBXFCE4WINDOWING_LIBS) \
Expand Down

0 comments on commit a7eb9b9

Please sign in to comment.