diff options
Diffstat (limited to 'x11-plugins/wmmixer/files/wmmixer-1.5-restore_pristine_code.patch')
-rw-r--r-- | x11-plugins/wmmixer/files/wmmixer-1.5-restore_pristine_code.patch | 74 |
1 files changed, 0 insertions, 74 deletions
diff --git a/x11-plugins/wmmixer/files/wmmixer-1.5-restore_pristine_code.patch b/x11-plugins/wmmixer/files/wmmixer-1.5-restore_pristine_code.patch deleted file mode 100644 index d34a300b7ad3..000000000000 --- a/x11-plugins/wmmixer/files/wmmixer-1.5-restore_pristine_code.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -ur wmmixer-1.5.orig/exception.h wmmixer-1.5/exception.h ---- wmmixer-1.5.orig/exception.h 2002-06-25 22:22:20.000000000 +0300 -+++ wmmixer-1.5/exception.h 2008-12-23 00:24:36.000000000 +0200 -@@ -37,4 +37,4 @@ - // virtual ~MixerDeviceException(); - }; - --#endif _exception_h__ -+#endif //_exception_h__ -diff -ur wmmixer-1.5.orig/mixctl.cc wmmixer-1.5/mixctl.cc ---- wmmixer-1.5.orig/mixctl.cc 2002-06-25 22:44:55.000000000 +0300 -+++ wmmixer-1.5/mixctl.cc 2008-12-23 00:24:36.000000000 +0200 -@@ -243,16 +243,16 @@ - //---------------------------------------------------------------------- - bool MixCtl::hasChanged() - { -- struct mixer_info mixer_info; -- ioctl(mixfd, SOUND_MIXER_INFO, &mixer_info); -+ struct mixer_info mixer_info1; -+ ioctl(mixfd, SOUND_MIXER_INFO, &mixer_info1); - -- if (mixer_info.modify_counter == modify_counter) -+ if (mixer_info1.modify_counter == modify_counter) - { - return false; - } - else - { -- modify_counter = mixer_info.modify_counter; -+ modify_counter = mixer_info1.modify_counter; - return true; - } - } -diff -ur wmmixer-1.5.orig/mixctl.h wmmixer-1.5/mixctl.h ---- wmmixer-1.5.orig/mixctl.h 2002-06-25 23:13:30.000000000 +0300 -+++ wmmixer-1.5/mixctl.h 2008-12-23 00:24:36.000000000 +0200 -@@ -23,8 +23,8 @@ - #ifdef __NetBSD__ - #include <soundcard.h> - #endif --#ifdef __FreeBSD__ --#include <machine/soundcard.h> -+#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__) -+#include <sys/soundcard.h> - #endif - #ifdef __linux__ - #include <linux/soundcard.h> -diff -ur wmmixer-1.5.orig/README wmmixer-1.5/README ---- wmmixer-1.5.orig/README 2002-06-25 23:20:09.000000000 +0300 -+++ wmmixer-1.5/README 2008-12-23 00:24:36.000000000 +0200 -@@ -82,10 +82,10 @@ - to reduce the size of the window to 56x56 pixels. - The "-position position" option has also been added, so you can push - wmcdplay off the edge of the screen while it gets swallowed. --To put wmmount in your Wharf, add the following line in the appropriate -+To put wmmixer in your Wharf, add the following line in the appropriate - part of your .steprc - --*Wharf wmmixer nil MaxSwallow "wmmount" wmmixer -a -g -0-0 & -+*Wharf wmmixer nil MaxSwallow "wmmixer" wmmixer -a -g -0-0 & - - It is also possible (by editing and recompiling the afterstep sources), - to make Wharf handle the new 56x56 pixel window properly - yes, I add -diff -ur wmmixer-1.5.orig/xhandler.cc wmmixer-1.5/xhandler.cc ---- wmmixer-1.5.orig/xhandler.cc 2002-06-25 23:13:40.000000000 +0300 -+++ wmmixer-1.5/xhandler.cc 2008-12-23 00:24:36.000000000 +0200 -@@ -24,6 +24,7 @@ - strcpy(backcolor_name_, BACKCOLOR); - - button_state_ = 0; -+ icon_list_ = NULL; - } - - //-------------------------------------------------------------------- |