SOURCES: yiff-config_dir.patch, yiff-cpp.patch - updated for 2.14.5

qboosh qboosh at pld-linux.org
Sun Apr 23 19:43:00 CEST 2006


Author: qboosh                       Date: Sun Apr 23 17:43:00 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 2.14.5

---- Files affected:
SOURCES:
   yiff-config_dir.patch (1.3 -> 1.4) , yiff-cpp.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/yiff-config_dir.patch
diff -u SOURCES/yiff-config_dir.patch:1.3 SOURCES/yiff-config_dir.patch:1.4
--- SOURCES/yiff-config_dir.patch:1.3	Sun Jul 20 23:16:36 2003
+++ SOURCES/yiff-config_dir.patch	Sun Apr 23 19:42:55 2006
@@ -1,15 +1,14 @@
-diff -durN yiff2.12.3.orig/yiff/config.h yiff2.12.3/yiff/config.h
---- yiff2.12.3.orig/yiff/config.h	Tue Feb 13 11:57:08 2001
-+++ yiff2.12.3/yiff/config.h	Thu May  3 16:13:04 2001
-@@ -7,7 +7,7 @@
+--- yiff-2.14.5/yiff/config.h.orig	2005-09-26 10:41:59.000000000 +0200
++++ yiff-2.14.5/yiff/config.h	2006-04-23 19:25:25.548314000 +0200
+@@ -14,7 +14,7 @@
   *	Full path to the YIFF Sound Server configuration file, it
-  *	can also be specified from the command line at run time.
+  *	can also be specified from the command line at run time
   */
--#define DEF_RCFILE_NAME         "/usr/etc/yiffrc"
-+#define DEF_RCFILE_NAME         "/etc/yiffrc"
- /* Alternate name */
- /*
- #define DEF_RCFILE_NAME		"/usr/etc/YIFFConfig"
+-#define DEF_RCFILE_NAME		"/usr/etc/yiffrc"
++#define DEF_RCFILE_NAME		"/etc/yiffrc"
+ /* #define DEF_RCFILE_NAME	"/etc/yiff.conf" */
+ /* #define DEF_RCFILE_NAME	"/usr/etc/YIFFConfig" */
+ 
 diff -durN yiff2.12.4.orig/yiff/yiff.8 yiff2.12.4/yiff/yiff.8
 --- yiff2.12.4.orig/yiff/yiff.8	Tue Feb 13 11:57:08 2001
 +++ yiff2.12.4/yiff/yiff.8	Thu May  3 16:13:30 2001

================================================================
Index: SOURCES/yiff-cpp.patch
diff -u SOURCES/yiff-cpp.patch:1.2 SOURCES/yiff-cpp.patch:1.3
--- SOURCES/yiff-cpp.patch:1.2	Sun Jul 20 23:16:36 2003
+++ SOURCES/yiff-cpp.patch	Sun Apr 23 19:42:55 2006
@@ -1,14 +1,3 @@
---- yiff2.12.4/yiff/Makefile.orig	Sat May  5 10:53:24 2001
-+++ yiff2.12.4/yiff/Makefile	Sun Feb  2 11:03:57 2003
-@@ -148,7 +148,7 @@
- # Build Rules:
- #
- $(BIN): $(OBJ_C) $(OBJ_CPP)
--	$(CC) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB) $(LIB_DIR)
-+	$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB) $(LIB_DIR)
- 
- all: $(BIN)
- 
 --- yiff2.12.4/yiffconfig/Makefile.orig	Sat May  5 10:53:23 2001
 +++ yiff2.12.4/yiffconfig/Makefile	Sun Feb  2 11:08:37 2003
 @@ -117,7 +117,7 @@
@@ -73,3 +62,14 @@
  	string.cpp \
  	yshutdown.c -o yshutdown
  
+--- yiff-2.14.5/libY2/Makefile.orig	2005-09-26 10:41:57.000000000 +0200
++++ yiff-2.14.5/libY2/Makefile	2006-04-23 19:32:25.030530000 +0200
+@@ -139,7 +139,7 @@
+ 	+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS)
+ 
+ $(LIB): $(OBJ_C) $(OBJ_CPP)
+-	$(CC) $(OBJ_C) $(OBJ_CPP) -Wl,-soname=$(LIB) -shared -o $(LIB) $(LIBS) $(LIB_DIRS)
++	$(CPP) $(OBJ_C) $(OBJ_CPP) -Wl,-soname=$(LIB) -shared -o $(LIB) $(LIBS) $(LIB_DIRS)
+ 	$(LINK) $(LINKFLAGS) $(LIB) $(LIBPFX).so
+ 
+ all: $(LIB)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/yiff-config_dir.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SOURCES/yiff-cpp.patch?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list