diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2016-06-30 20:26:57 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 23:31:18 +0200 |
commit | d31c50870d0bee042ce660e445c9294a59a3a65b (patch) | |
tree | 6bfc0de3c95267b401b620c2c67859557dc60f97 /pasture/source/xfce4-mixer/0001-Make-Unique-support-optional.patch | |
parent | 76fc4757ac91ac7947a01fb7b53dddf9a78a01d1 (diff) | |
download | current-d31c50870d0bee042ce660e445c9294a59a3a65b.tar.gz current-d31c50870d0bee042ce660e445c9294a59a3a65b.tar.xz |
Slackware 14.2slackware-14.2
Thu Jun 30 20:26:57 UTC 2016
Slackware 14.2 x86_64 stable is released!
The long development cycle (the Linux community has lately been living in
"interesting times", as they say) is finally behind us, and we're proud to
announce the release of Slackware 14.2. The new release brings many updates
and modern tools, has switched from udev to eudev (no systemd), and adds
well over a hundred new packages to the system. Thanks to the team, the
upstream developers, the dedicated Slackware community, and everyone else
who pitched in to help make this release a reality.
The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided
32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware
project by picking up a copy from store.slackware.com. We're taking
pre-orders now, and offer a discount if you sign up for a subscription.
Have fun! :-)
Diffstat (limited to 'pasture/source/xfce4-mixer/0001-Make-Unique-support-optional.patch')
-rw-r--r-- | pasture/source/xfce4-mixer/0001-Make-Unique-support-optional.patch | 111 |
1 files changed, 111 insertions, 0 deletions
diff --git a/pasture/source/xfce4-mixer/0001-Make-Unique-support-optional.patch b/pasture/source/xfce4-mixer/0001-Make-Unique-support-optional.patch new file mode 100644 index 000000000..3817f02d2 --- /dev/null +++ b/pasture/source/xfce4-mixer/0001-Make-Unique-support-optional.patch @@ -0,0 +1,111 @@ +From 7a18841c988edb593127842ec5c919df537f9ce0 Mon Sep 17 00:00:00 2001 +From: Andrzej <ndrwrdck@gmail.com> +Date: Sat, 12 Apr 2014 08:53:09 +0100 +Subject: [PATCH] Make Unique support optional + +--- + configure.ac.in | 4 +++- + xfce4-mixer/main.c | 21 +++++++++++++++++++++ + 2 files changed, 24 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index b00fd75..57ae07c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -98,7 +98,6 @@ XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.24.0]) + XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.84]) + XDT_CHECK_PACKAGE([GST_PLUGINS_BASE], [gstreamer-plugins-base-0.10], [0.10.25]) + XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.20.0]) +-XDT_CHECK_PACKAGE([UNIQUE], [unique-1.0], [1.1]) + XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0]) + XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0]) + XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.10.0]) +@@ -109,6 +108,8 @@ dnl *** Check for optional packages *** + dnl *********************************** + XDT_CHECK_OPTIONAL_PACKAGE([KEYBINDER], [keybinder], [0.2.2], [keybinder], + [keybinder Support]) ++XDT_CHECK_OPTIONAL_PACKAGE([UNIQUE], [unique-1.0], [1.1], [unique], ++ [unique Support]) + + dnl *********************************** + dnl *** Check for debugging support *** +@@ -151,6 +152,7 @@ dnl *************************** + echo + echo "Build Configuration:" + echo ++echo " * unique Support: ${UNIQUE_FOUND:-no}" + echo " * keybinder Support: ${KEYBINDER_FOUND:-no}" + echo " * Debug Support: $enable_debug" + echo +diff --git a/xfce4-mixer/main.c b/xfce4-mixer/main.c +index 9e8417b..7fda388 100644 +--- a/xfce4-mixer/main.c ++++ b/xfce4-mixer/main.c +@@ -30,7 +30,10 @@ + #include <gst/gst.h> + + #include <gtk/gtk.h> ++ ++#ifdef HAVE_UNIQUE + #include <unique/unique.h> ++#endif + + #include <libxfce4util/libxfce4util.h> + #include <libxfce4ui/libxfce4ui.h> +@@ -42,6 +45,7 @@ + + + ++#ifdef HAVE_UNIQUE + static UniqueResponse + message_received (UniqueApp *app, + UniqueCommand command, +@@ -68,6 +72,7 @@ message_received (UniqueApp *app, + + return response; + } ++#endif + + + +@@ -75,7 +80,9 @@ int + main (int argc, + char **argv) + { ++#ifdef HAVE_UNIQUE + UniqueApp *app; ++#endif + GtkWidget *window; + GError *error = NULL; + gboolean debug_mode = FALSE; +@@ -162,6 +169,7 @@ main (int argc, + if (debug_mode) + xfce_mixer_dump_gst_data (); + ++#ifdef HAVE_UNIQUE + /* Create unique application */ + app = unique_app_new ("org.xfce.xfce4-mixer", NULL); + if (unique_app_is_running (app)) +@@ -192,6 +200,19 @@ main (int argc, + /* Destroy the window */ + gtk_widget_destroy (window); + } ++#else ++ /* Create the mixer window */ ++ window = xfce_mixer_window_new (); ++ ++ /* Display the mixer window */ ++ gtk_widget_show (window); ++ ++ /* Enter the GTK+ main loop */ ++ gtk_main (); ++ ++ /* Destroy the window */ ++ gtk_widget_destroy (window); ++#endif + + /* Shutdown the mixer library */ + xfce_mixer_shutdown (); +-- +2.3.1 + |