xmms/xmms.patch

Wed, 01 Aug 2012 23:49:03 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Wed, 01 Aug 2012 23:49:03 +0200
changeset 436
f26e9329b115
permissions
-rw-r--r--

Hack rpmconstant header file to allow targets to build, because...
Solaris studio cc(1) fails to build targets in rpmconstant with errors:
'undefined symbol first referenced in file constant.o' regarding symbols:
rpmdsInit, rpmdsNext, rpmdsTagN, rpmHeaderFormats, hdrVec, rpmTagTable,
rpmdsSearch, rpmdsResult, rpmTags, rpmdsIx, rpmdsDNEVR, rpmdsSetResult.
It seems that these symbols are not used by RPM in any way, and thus
the build configuration can succeed without including the nasty headers.

     1 diff -Naur xmms-1.2.8.orig/xmms/skin.c xmms-1.2.8/xmms/skin.c
     2 --- xmms-1.2.8.orig/xmms/skin.c	Mon Mar 17 15:49:08 2003
     3 +++ xmms-1.2.8/xmms/skin.c	Fri Sep  5 11:08:47 2003
     4 @@ -600,10 +600,10 @@
     6  	unzip = getenv("UNZIPCMD");
     7  	if (!unzip)
     8 -		unzip = "unzip";
     9 +		unzip = "@l_unzip@";
    10  	tar = getenv("TARCMD");
    11  	if (!tar)
    12 -		tar = "tar";
    13 +		tar = "@l_tar@";
    15  	if ((ending = strrchr(path, '.')) == NULL)
    16  		return NULL;
    17 @@ -621,9 +621,9 @@
    18  	if (!strcasecmp(ending, ".zip") || !strcasecmp(ending, ".wsz"))
    19  		tmp = g_strdup_printf("%s >/dev/null -o -j \"%s\" -d %s", unzip, escaped, tempdir);
    20  	if (!strcasecmp(ending, ".tgz") || !strcasecmp(ending, ".gz"))
    21 -		tmp = g_strdup_printf("%s >/dev/null xzf \"%s\" -C %s", tar, escaped, tempdir);
    22 +		tmp = g_strdup_printf("@l_gzip@ -dc \"%s\" | %s >/dev/null xf - -C %s", escaped, tar, tempdir);
    23  	if (!strcasecmp(ending, ".bz2"))
    24 -		tmp = g_strdup_printf("bzip2 -dc \"%s\" | %s >/dev/null xf - -C %s", escaped, tar, tempdir);
    25 +		tmp = g_strdup_printf("@l_bzip2@ -dc \"%s\" | %s >/dev/null xf - -C %s", escaped, tar, tempdir);
    26  	if (!strcasecmp(ending, ".tar"))
    27  		tmp = g_strdup_printf("%s >/dev/null xf \"%s\" -C %s", tar, escaped, tempdir);

mercurial