[Pkgbuild-sfe-commits] SF.net SVN: pkgbuild:[1335] spec-files-extra/trunk

[<yi...@us...>]

Revision: 1335
          http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=1335&view=rev
Author:   yippi
Date:     2008-08-21 05:42:59 +0000 (Thu, 21 Aug 2008)

Log Message:
-----------
2008-08-21  Brian Cameron  <bri...@su...>

        * patches/libcanberra-01-solaris.diff:  Update patch based on
          maintainers comments.

Modified Paths:
--------------
    spec-files-extra/trunk/ChangeLog
    spec-files-extra/trunk/patches/libcanberra-01-solaris.diff

Modified: spec-files-extra/trunk/ChangeLog
===================================================================
--- spec-files-extra/trunk/ChangeLog	2008-08-21 01:57:32 UTC (rev 1334)
+++ spec-files-extra/trunk/ChangeLog	2008-08-21 05:42:59 UTC (rev 1335)
@@ -1,3 +1,8 @@
+2008-08-21  Brian Cameron  <bri...@su...>
+
+	* patches/libcanberra-01-solaris.diff:  Update patch based on 
+	  maintainers comments.
+
 2008-08-21  Halton Huo <no...@us...>
 
 	* patches/anjuta-04-miss-vala-sgml.diff: (rework)

Modified: spec-files-extra/trunk/patches/libcanberra-01-solaris.diff
===================================================================
--- spec-files-extra/trunk/patches/libcanberra-01-solaris.diff	2008-08-21 01:57:32 UTC (rev 1334)
+++ spec-files-extra/trunk/patches/libcanberra-01-solaris.diff	2008-08-21 05:42:59 UTC (rev 1335)
@@ -1,64 +1,58 @@
 --- libcanberra-0.6/src/Makefile.am-orig	2008-08-14 13:06:45.705560000 -0500
 +++ libcanberra-0.6/src/Makefile.am	2008-08-14 13:08:01.465327000 -0500
-@@ -59,9 +59,7 @@ libcanberra_la_CFLAGS = \
- libcanberra_la_LIBADD = \
+@@ -60,8 +60,7 @@ libcanberra_la_LIBADD = \
  	$(VORBIS_LIBS)
  libcanberra_la_LDFLAGS = \
--	-export-dynamic \
+ 	-export-dynamic \
 -	-version-info $(LIBCANBERRA_VERSION_INFO) \
 -	-Wl,-version-script=$(srcdir)/map-file
-+	-export-dynamic 
++	-version-info $(LIBCANBERRA_VERSION_INFO)
  
  plugin_LTLIBRARIES =
  
-@@ -215,7 +213,7 @@ libcanberra_gtk_la_LIBADD = \
- 	$(GTK_LIBS) \
- 	libcanberra.la
- libcanberra_gtk_la_LDFLAGS = \
--	-export-dynamic -version-info $(LIBCANBERRA_GTK_VERSION_INFO)
-+	-export-dynamic $(LIBCANBERRA_GTK_VERSION_INFO)
- 
- libcanberra_gtk_module_la_SOURCES = \
- 	canberra-gtk-module.c
---- libcanberra-0.6/src/common.h-orig	2008-08-14 13:00:23.334879000 -0500
-+++ libcanberra-0.6/src/common.h	2008-08-14 13:06:24.572488000 -0500
-@@ -21,6 +21,8 @@
+--- libcanberra-0.6/src/common.h-orig	2008-08-21 00:21:50.594788000 -0500
++++ libcanberra-0.6/src/common.h	2008-08-21 00:22:25.218467000 -0500
+@@ -21,6 +21,10 @@
    <http://www.gnu.org/licenses/>.
  ***/
  
-+#include <varargs.h>
++#ifdef __sun
++#include <sys/varargs.h>
++#endif
 +
  #include "canberra.h"
  #include "macro.h"
  #include "mutex.h"
---- libcanberra-0.6/src/sound-theme-spec.c-orig	2008-08-14 13:18:10.752437000 -0500
-+++ libcanberra-0.6/src/sound-theme-spec.c	2008-08-14 13:15:04.375888000 -0500
-@@ -36,6 +36,28 @@
- #define DEFAULT_OUTPUT_PROFILE "stereo"
- #define N_THEME_DIR_MAX 8
- 
+--- libcanberra-0.6/src/malloc.c-orig	2008-08-21 00:32:28.025248000 -0500
++++ libcanberra-0.6/src/malloc.c	2008-08-21 00:31:54.646231000 -0500
+@@ -58,3 +58,30 @@ char *ca_sprintf_malloc(const char *form
+             size *= 2;
+     }
+ }
++
 +#ifndef strndup
-+static char *strndup (const char *s, size_t n)
++char *strndup (const char *s, size_t n)
 +{
 +    size_t length;
 +    char *ret;
 +
 +    if (!s)
-+        return 0;
++        return NULL;
 +
-+    if (strlen(s)+1 < n+1)
-+       length = strlen(s)+1;
-+    else
++    length = strlen(s)+1;
++    if (strlen(s)+1 > n+1)
 +       length = n+1;
 +
 +    ret = malloc (length * sizeof (char));
++    if (ret == NULL)
++       return ret;
 +
-+    memcpy (ret, s, length);
++    ret = memcpy (ret, s, length);
++    if (ret == NULL)
++       return ret;
++
 +    ret[length-1] = '\0';
 +    return ret;
 +}
 +#endif
 +
- typedef struct ca_data_dir ca_data_dir;
- 
- struct ca_data_dir {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.