|
|
|
|
diff -Naur xmms-1.2.7.orig/configure xmms-1.2.7/configure
|
|
|
|
|
--- xmms-1.2.7.orig/configure 2003-08-03 00:44:27.915287000 +0200
|
|
|
|
|
+++ xmms-1.2.7/configure 2003-08-03 00:59:20.419469000 +0200
|
|
|
|
|
@@ -11885,10 +11885,13 @@
|
|
|
|
|
*-hpux-*)
|
|
|
|
|
ARCH_DEFINES="-DHPUX"
|
|
|
|
|
;;
|
|
|
|
|
- *-sun-*)
|
|
|
|
|
- have_solaris=yes
|
|
|
|
|
- ;;
|
|
|
|
|
esac
|
|
|
|
|
+case "$host_os" in
|
|
|
|
|
+ *solaris*)
|
|
|
|
|
+ have_solaris=yes
|
|
|
|
|
+ ;;
|
|
|
|
|
+esac
|
|
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff -Naur xmms-1.2.7.orig/libxmms/util.c xmms-1.2.7/libxmms/util.c
|
|
|
|
|
--- xmms-1.2.7.orig/libxmms/util.c 2003-08-03 00:59:03.308605000 +0200
|
|
|
|
|
+++ xmms-1.2.7/libxmms/util.c 2003-08-03 00:09:20.631805000 +0200
|
|
|
|
|
@@ -11,6 +11,7 @@
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#ifdef __FreeBSD__
|
|
|
|
|
+#include <sys/types.h>
|
|
|
|
|
#include <sys/sysctl.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
diff -Naur xmms-1.2.7.orig/xmms/skin.c xmms-1.2.7/xmms/skin.c
|
|
|
|
|
--- xmms-1.2.7.orig/xmms/skin.c 2003-08-03 18:41:49.234488000 +0200
|
|
|
|
|
+++ xmms-1.2.7/xmms/skin.c 2003-08-03 18:43:11.513838000 +0200
|
|
|
|
|
@@ -562,10 +562,10 @@
|
|
|
|
|
|
|
|
|
|
unzip = getenv("UNZIPCMD");
|
|
|
|
|
if (!unzip)
|
|
|
|
|
- unzip = "unzip";
|
|
|
|
|
+ unzip = "@l_unzip@";
|
|
|
|
|
tar = getenv("TARCMD");
|
|
|
|
|
if (!tar)
|
|
|
|
|
- tar = "tar";
|
|
|
|
|
+ tar = "@l_tar@";
|
|
|
|
|
|
|
|
|
|
if ((ending = strrchr(path, '.')) == NULL)
|
|
|
|
|
return NULL;
|
|
|
|
|
@@ -581,9 +581,9 @@
|
|
|
|
|
if (!strcasecmp(ending, ".zip") || !strcasecmp(ending, ".wsz"))
|
|
|
|
|
tmp = g_strdup_printf("%s >/dev/null -o -j \"%s\" -d %s", unzip, path, tempdir);
|
|
|
|
|
if (!strcasecmp(ending, ".tgz") || !strcasecmp(ending, ".gz"))
|
|
|
|
|
- tmp = g_strdup_printf("%s >/dev/null xzf \"%s\" -C %s", tar, path, tempdir);
|
|
|
|
|
+ tmp = g_strdup_printf("@l_gzip@ -dc \"%s\" | %s >/dev/null xf - -C %s", path, tar, tempdir);
|
|
|
|
|
if (!strcasecmp(ending, ".bz2"))
|
|
|
|
|
- tmp = g_strdup_printf("bzip2 -dc \"%s\" | %s >/dev/null xf - -C %s", path, tar, tempdir);
|
|
|
|
|
+ tmp = g_strdup_printf("@l_bzip2@ -dc \"%s\" | %s >/dev/null xf - -C %s", path, tar, tempdir);
|
|
|
|
|
if (!strcasecmp(ending, ".tar"))
|
|
|
|
|
tmp = g_strdup_printf("%s >/dev/null xf \"%s\" -C %s", tar, path, tempdir);
|
|
|
|
|
|