This patch fixes problems with ascd form AfterStep-APPS.

Changed files:
    as-apps-ascd-configure_and_install_bugfix.patch -> 1.1

diff --git a/as-apps-ascd-configure_and_install_bugfix.patch b/as-apps-ascd-configure_and_install_bugfix.patch
new file mode 100644 (file)
index 0000000..40b9420
--- /dev/null
+++ b/as-apps-ascd-configure_and_install_bugfix.patch
@@ -0,0 +1,205 @@
+diff -Naur AfterStep-APPS-991125/ascd-0.12.1.orig/ascd/Imakefile AfterStep-APPS-991125/ascd-0.12.1/ascd/Imakefile
+--- AfterStep-APPS-991125/ascd-0.12.1.orig/ascd/Imakefile      Fri Nov 30 13:20:26 2001
++++ AfterStep-APPS-991125/ascd-0.12.1/ascd/Imakefile   Fri Nov 30 13:24:04 2001
+@@ -28,22 +28,22 @@
+ 
+ install::
+       @echo "Installing themes..."
+-      @cp themes/default.tar $(THEMESDIR)
+-      @cp themes/sands.tar $(THEMESDIR)
+-      @cp themes/clean.tar $(THEMESDIR)
+-      @cp themes/vintage.tar $(THEMESDIR)
+-      @cp themes/night.tar $(THEMESDIR)
+-      @cd $(THEMESDIR) ; tar xf default.tar
+-      @cd $(THEMESDIR) ; tar xf sands.tar
+-      @cd $(THEMESDIR) ; tar xf clean.tar
+-      @cd $(THEMESDIR) ; tar xf vintage.tar
+-      @cd $(THEMESDIR) ; tar xf night.tar
+-      @cd $(THEMESDIR) ; rm default.tar
+-      @cd $(THEMESDIR) ; rm sands.tar
+-      @cd $(THEMESDIR) ; rm clean.tar
+-      @cd $(THEMESDIR) ; rm vintage.tar
+-      @cd $(THEMESDIR) ; rm night.tar
+-      @cd $(THEMESDIR) ; rm .dir
+-      @cd $(THEMESDIR) ; /bin/ls -1 > /tmp/.dir
+-      @cd $(THEMESDIR) ; cp /tmp/.dir .
++      @cp themes/default.tar $(DESTDIR)$(THEMESDIR)
++      @cp themes/sands.tar $(DESTDIR)$(THEMESDIR)
++      @cp themes/clean.tar $(DESTDIR)$(THEMESDIR)
++      @cp themes/vintage.tar $(DESTDIR)$(THEMESDIR)
++      @cp themes/night.tar $(DESTDIR)$(THEMESDIR)
++      @cd $(DESTDIR)$(THEMESDIR) ; tar xf default.tar
++      @cd $(DESTDIR)$(THEMESDIR) ; tar xf sands.tar
++      @cd $(DESTDIR)$(THEMESDIR) ; tar xf clean.tar
++      @cd $(DESTDIR)$(THEMESDIR) ; tar xf vintage.tar
++      @cd $(DESTDIR)$(THEMESDIR) ; tar xf night.tar
++      @cd $(DESTDIR)$(THEMESDIR) ; rm default.tar
++      @cd $(DESTDIR)$(THEMESDIR) ; rm sands.tar
++      @cd $(DESTDIR)$(THEMESDIR) ; rm clean.tar
++      @cd $(DESTDIR)$(THEMESDIR) ; rm vintage.tar
++      @cd $(DESTDIR)$(THEMESDIR) ; rm night.tar
++      @cd $(DESTDIR)$(THEMESDIR) ; rm .dir
++      @cd $(DESTDIR)$(THEMESDIR) ; /bin/ls -1 > /tmp/.dir
++      @cd $(DESTDIR)$(THEMESDIR) ; cp /tmp/.dir .
+       @echo "Done."
+diff -Naur AfterStep-APPS-991125/ascd-0.12.1.orig/ascd/configure AfterStep-APPS-991125/ascd-0.12.1/ascd/configure
+--- AfterStep-APPS-991125/ascd-0.12.1.orig/ascd/configure      Fri Nov 30 13:20:26 2001
++++ AfterStep-APPS-991125/ascd-0.12.1/ascd/configure   Fri Nov 30 13:24:04 2001
+@@ -97,7 +97,7 @@
+         echo "#define CTHDIR /usr/local/share/AScd" >> dirs.h
+         echo "Pixmaps will be installed in /usr/local/share/AScd."
+       ;;
+-    *)        echo "#define  \"$THDIR\"" >> config.h
++    *)        echo "#define THDIR \"$THDIR\"" >> config.h
+         echo "#define CTHDIR $THDIR" >> dirs.h
+         echo "Pixmaps will be installed in $THDIR."
+       ;;
+diff -Naur AfterStep-APPS-991125/ascd-0.12.1.orig/ascd/workman/wm_cdda.h AfterStep-APPS-991125/ascd-0.12.1/ascd/workman/wm_cdda.h
+--- AfterStep-APPS-991125/ascd-0.12.1.orig/ascd/workman/wm_cdda.h      Fri Nov 30 13:20:26 2001
++++ AfterStep-APPS-991125/ascd-0.12.1/ascd/workman/wm_cdda.h   Fri Nov 30 13:22:40 2001
+@@ -91,7 +91,6 @@
+  * if there is no support.
+  */
+ #ifdef linux
+-# include <bytesex.h>
+ # include <endian.h>
+ /*
+  * XXX could this be a problem? The results are only 0 and 1 because
+diff -Naur AfterStep-APPS-991125/ascd-0.12.1.orig/ascd/workman/wm_cdda.h.compile AfterStep-APPS-991125/ascd-0.12.1/ascd/workman/wm_cdda.h.compile
+--- AfterStep-APPS-991125/ascd-0.12.1.orig/ascd/workman/wm_cdda.h.compile      Thu Jan  1 00:00:00 1970
++++ AfterStep-APPS-991125/ascd-0.12.1/ascd/workman/wm_cdda.h.compile   Sun Feb 14 09:50:46 1999
+@@ -0,0 +1,117 @@
++#ifndef WM_CDDA_H
++#define WM_CDDA_H
++/*
++ * $Id$
++ *
++ * This file is part of WorkMan, the civilized CD player library
++ * (c) 1991-1997 by Steven Grimm (original author)
++ * (c) by Dirk Försterling (current 'author' = maintainer)
++ * The maintainer can be contacted by his e-mail address:
++ * milliByte@DeathsDoor.com 
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Library General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public
++ * License along with this library; if not, write to the Free
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ */
++
++/*
++ * Information about a particular block of CDDA data.
++ */
++struct cdda_block {
++      unsigned char   status;         /* see below */
++      unsigned char   track;
++      unsigned char   index;
++      unsigned char   minute;
++      unsigned char   second;
++      unsigned char   frame;
++
++      /* Average volume levels, for level meters */
++      unsigned char   lev_chan0;
++      unsigned char   lev_chan1;
++
++      /* Current volume setting (0-255) */
++      unsigned char   volume;
++
++      /* Current balance setting (0-255, 128 = balanced) */
++      unsigned char   balance;
++};
++
++/*
++ * cdda_block status codes.
++ */
++#define WMCDDA_ERROR  0       /* Couldn't read CDDA from disc */
++#define WMCDDA_OK     1       /* Read this block successfully (raw data) */
++#define WMCDDA_PLAYED 2       /* Just played the block in question */
++#define WMCDDA_STOPPED        3       /* Block data invalid; we've just stopped */
++#define WMCDDA_ACK    4       /* Acknowledgement of command from parent */
++#define WMCDDA_DONE   5       /* Chunk of data is done playing */
++#define WMCDDA_EJECTED        6       /* Disc ejected or offline */
++
++/*
++ * Enable or disable CDDA building depending on platform capabilities, and
++ * determine endianness based on architecture.  (Gross!)
++ *
++ * For header-comfort, the macros LITTLE_ENDIAN and BIG_ENDIAN had to be
++ * renamed. At least Linux does have bytesex.h and endian.h for easy
++ * byte-order examination.
++ */
++
++#ifdef sun
++# ifdef SYSV
++#  include <sys/types.h>
++#  include <sys/cdio.h>
++#  ifndef CDROMCDDA
++#   undef BUILD_CDDA
++#  endif
++#  ifdef i386
++#   define WM_LITTLE_ENDIAN 1
++#   define WM_BIG_ENDIAN 0
++#  else
++#   define WM_BIG_ENDIAN 1
++#   define WM_LITTLE_ENDIAN 0
++#  endif
++# else
++#  undef BUILD_CDDA
++# endif
++#endif
++
++/* Linux only allows definition of endianness, because there's no
++ * standard interface for CDROM CDDA functions that aren't available
++ * if there is no support.
++ */
++#ifdef linux
++# include <bytesex.h>
++# include <endian.h>
++/*
++ * XXX could this be a problem? The results are only 0 and 1 because
++ * of the ! operator. How about other linux compilers than gcc ?
++ */
++# define WM_LITTLE_ENDIAN !(__BYTE_ORDER - __LITTLE_ENDIAN)
++# define WM_BIG_ENDIAN !(__BYTE_ORDER - __BIG_ENDIAN)
++#endif
++
++/*
++ * The following code shouldn't take effect now. 
++ * In 1998, the WorkMan platforms don't support __PDP_ENDIAN
++ * architectures.
++ *
++ */
++
++#if !WM_LITTLE_ENDIAN
++#  if !WM_BIG_ENDIAN
++#    error yet unsupported architecture
++      foo bar this is to stop the compiler. 
++#  endif
++#endif
++#endif /* WM_CDDA_H */
+diff -Naur AfterStep-APPS-991125/ascd-0.12.1.orig/libworkman/Config AfterStep-APPS-991125/ascd-0.12.1/libworkman/Config
+--- AfterStep-APPS-991125/ascd-0.12.1.orig/libworkman/Config   Fri Nov 30 13:20:26 2001
++++ AfterStep-APPS-991125/ascd-0.12.1/libworkman/Config        Fri Nov 30 13:24:04 2001
+@@ -38,11 +38,11 @@
+ XCOMM -------------------------------------------------------------------
+ XCOMM          LibWorkMan include file target relative to DSTDIR
+ XCOMM -------------------------------------------------------------------
+-WMINCDIR=/usr/local/include/workman
++WMINCDIR=/usr/X11R6/include/workman
+ 
+ 
+ 
+ XCOMM -------------------------------------------------------------------
+ #define SHARED_LIBWORKMAN
+-LIBDIR=/usr/local/lib
++LIBDIR=/usr/X11R6/lib
+