Hello community,
here is the log from the commit of package wsndpref for openSUSE:Factory
checked in at Wed Dec 16 15:06:05 CET 2009.
--------
--- wsndpref/wsndpref.changes 2008-04-28 00:06:33.000000000 +0200
+++ /mounts/work_src_done/STABLE/wsndpref/wsndpref.changes 2009-11-03 20:23:35.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Nov 3 19:09:51 UTC 2009 - coolo@novell.com
+
+- updated patches to apply with fuzz=0
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wsndpref.spec ++++++
--- /var/tmp/diff_new_pack.igs9NR/_old 2009-12-16 15:04:54.000000000 +0100
+++ /var/tmp/diff_new_pack.igs9NR/_new 2009-12-16 15:04:54.000000000 +0100
@@ -20,14 +20,14 @@
Name: wsndpref
BuildRequires: WindowMaker-devel esound-devel freetype2-devel wsndsrv
-License: BSD 3-Clause
+License: BSD3c
Group: System/GUI/Other
Url: ftp://shadowmere.student.utwente.nl/pub/WindowMaker/
Provides: WSoundPrefs
AutoReqProv: on
Summary: A Setup Program for the WSoundServer
Version: 1.1.1
-Release: 1174
+Release: 1175
Source: WSoundPrefs-%{version}.tar.gz
Patch1: WSoundPrefs-1.1.1-wstrappend.patch
Patch2: WSoundPrefs-1.1.1-imake.patch
++++++ WSoundPrefs-1.1.1-noPropList.patch ++++++
--- /var/tmp/diff_new_pack.igs9NR/_old 2009-12-16 15:04:54.000000000 +0100
+++ /var/tmp/diff_new_pack.igs9NR/_new 2009-12-16 15:04:54.000000000 +0100
@@ -1,6 +1,9 @@
---- wsoundprefs-1.1.1.orig/src/Imakefile
-+++ wsoundprefs-1.1.1/src/Imakefile
-@@ -7,16 +7,18 @@
+Index: WSoundPrefs-1.1.1/src/Imakefile
+===================================================================
+--- WSoundPrefs-1.1.1.orig/src/Imakefile
++++ WSoundPrefs-1.1.1/src/Imakefile
+@@ -13,17 +13,19 @@ XCOMM EFENCELIB = -lefence
+ EFENCELIB =
WSOUNDCFLAGS = `get-wsound-flags --cflags`
-WSOUNDLFLAGS = `get-wsound-flags --lflags`
@@ -24,17 +27,19 @@
LINTLIBS = $(LINTXLIB)
-@@ -32,7 +35,7 @@
+@@ -32,7 +34,7 @@ OBJS = PLFunctions.o SoundEvents.o Sound
- ComplexProgramTarget(WSoundPrefs)
+ ComplexProgramTargetNoMan(WSoundPrefs)
-InstallMultiple($(ICONS),$(BINDIR))
+InstallMultiple($(ICONS),$(APPDIR))
MakeSubdirs($(SUBDIRS))
DependSubdirs($(SUBDIRS))
---- wsoundprefs-1.1.1.orig/src/PLFunctions.c
-+++ wsoundprefs-1.1.1/src/PLFunctions.c
+Index: WSoundPrefs-1.1.1/src/PLFunctions.c
+===================================================================
+--- WSoundPrefs-1.1.1.orig/src/PLFunctions.c
++++ WSoundPrefs-1.1.1/src/PLFunctions.c
@@ -32,90 +32,90 @@
#include "WSoundPrefs.h"
#include "PLFunctions.h"
@@ -148,7 +153,7 @@
return NULL;
return val;
-@@ -125,7 +125,7 @@
+@@ -125,7 +125,7 @@ GetDictionaryForKey(char *defaultName)
int
GetIntegerForKey(char *defaultName)
{
@@ -157,7 +162,7 @@
char *str;
int value;
-@@ -134,10 +134,10 @@
+@@ -134,10 +134,10 @@ GetIntegerForKey(char *defaultName)
if (!val)
return 0;
@@ -170,7 +175,7 @@
if (!str)
return 0;
-@@ -175,14 +175,14 @@
+@@ -175,14 +175,14 @@ GetBoolForKey(char *defaultName)
void
SetIntegerForKey(int value, char *defaultName)
{
@@ -188,7 +193,7 @@
}
-@@ -190,23 +190,23 @@
+@@ -190,23 +190,23 @@ SetIntegerForKey(int value, char *defaul
void
SetStringForKey(char *value, char *defaultName)
{
@@ -218,8 +223,10 @@
}
SetObjectForKey(value ? yes : no, defaultName);
---- wsoundprefs-1.1.1.orig/src/PLFunctions.h
-+++ wsoundprefs-1.1.1/src/PLFunctions.h
+Index: WSoundPrefs-1.1.1/src/PLFunctions.h
+===================================================================
+--- WSoundPrefs-1.1.1.orig/src/PLFunctions.h
++++ WSoundPrefs-1.1.1/src/PLFunctions.h
@@ -35,12 +35,12 @@
#include
#include
@@ -236,9 +243,11 @@
void RemoveObjectForKey(char *defaultName);
---- wsoundprefs-1.1.1.orig/src/SoundEvents.c
-+++ wsoundprefs-1.1.1/src/SoundEvents.c
-@@ -50,7 +50,7 @@
+Index: WSoundPrefs-1.1.1/src/SoundEvents.c
+===================================================================
+--- WSoundPrefs-1.1.1.orig/src/SoundEvents.c
++++ WSoundPrefs-1.1.1/src/SoundEvents.c
+@@ -50,7 +50,7 @@ static char *eventkey[] = {
NULL
};
@@ -247,7 +256,7 @@
static char* expandSoundPath (WMWidget *w, void *data, char* file);
static char* getPathFromName (char *name);
-@@ -159,6 +159,7 @@
+@@ -159,6 +159,7 @@ playClick(WMWidget *w, void *data)
text = WMGetTextFieldText(panel->sndfileT);
@@ -255,7 +264,7 @@
soundfile = expandSoundPath(w, data, text);
if ((SPlaySound(soundfile) == -1)) {
if (SErrorCode == SERR_NOSERVER) {
-@@ -169,13 +170,14 @@
+@@ -169,13 +170,14 @@ playClick(WMWidget *w, void *data)
swarning(SMessageForError(SErrorCode));
WMSoundDBLoaded = False;
@@ -271,7 +280,7 @@
}
void
-@@ -195,9 +197,9 @@
+@@ -195,9 +197,9 @@ browseClick(WMWidget *w, void *data)
char path[PATH_MAX] = "\0";
char *spath = NULL;
@@ -284,7 +293,7 @@
if ((strcmp(panel->lastBrowseDir,"\0") == 0)) {
strcpy(path, wexpandpath("~/GNUstep/Library/WindowMaker/Sounds"));
-@@ -210,8 +212,8 @@
+@@ -210,8 +212,8 @@ browseClick(WMWidget *w, void *data)
}
browseP = WMGetOpenPanel(WMWidgetScreen(w));
@@ -295,7 +304,7 @@
if (WMRunModalFilePanelForDirectory(browseP, panel->win, spath , NULL, NULL)) {
char *filename;
filename = WMGetFilePanelFileName(browseP);
-@@ -223,9 +225,9 @@
+@@ -223,9 +225,9 @@ browseClick(WMWidget *w, void *data)
}
WMFreeFilePanel(browseP);
@@ -308,7 +317,7 @@
free(spath);
}
-@@ -234,13 +236,13 @@
+@@ -234,13 +236,13 @@ loadClick(WMWidget *w, void *data)
{
Panel *panel = (Panel*)data;
WMOpenPanel *loadP;
@@ -326,7 +335,7 @@
if ((strcmp(panel->lastLoadDir,"\0") == 0)) {
strcpy(path, wexpandpath("~/GNUstep/Library/WindowMaker/SoundSets"));
-@@ -253,30 +255,30 @@
+@@ -253,30 +255,30 @@ loadClick(WMWidget *w, void *data)
}
loadP = WMGetOpenPanel(WMWidgetScreen(w));
@@ -365,7 +374,7 @@
free(spath);
}
-@@ -286,15 +288,15 @@
+@@ -286,15 +288,15 @@ saveClick(WMWidget *w, void *data)
{
Panel *panel = (Panel*)data;
WMSavePanel *saveP;
@@ -385,7 +394,7 @@
if ((strcmp(panel->lastSaveDir,"\0") == 0)) {
strcpy(path, wexpandpath("~/GNUstep/Library/WindowMaker/SoundSets"));
-@@ -307,8 +309,8 @@
+@@ -307,8 +309,8 @@ saveClick(WMWidget *w, void *data)
}
saveP = WMGetSavePanel(WMWidgetScreen(w));
@@ -396,7 +405,7 @@
if (WMRunModalFilePanelForDirectory(saveP, panel->win, spath , NULL, NULL)) {
char *filename = NULL;
filename = WMGetFilePanelFileName(saveP);
-@@ -316,17 +318,19 @@
+@@ -316,17 +318,19 @@ saveClick(WMWidget *w, void *data)
file = fopen (filename, "w+");
if (file) {
@@ -423,7 +432,7 @@
fclose (file);
}
else
-@@ -337,9 +341,9 @@
+@@ -337,9 +341,9 @@ saveClick(WMWidget *w, void *data)
}
WMFreeFilePanel(saveP);
@@ -436,7 +445,7 @@
free(spath);
}
-@@ -352,11 +356,10 @@
+@@ -352,11 +356,10 @@ static char*
expandSoundPath (WMWidget *w, void *data, char* file)
{
Panel *panel = (Panel*)data;
@@ -449,7 +458,7 @@
assert(file!=NULL);
-@@ -365,22 +368,15 @@
+@@ -365,22 +368,15 @@ expandSoundPath (WMWidget *w, void *data
}
array = GetObjectForKey("SoundPath");
@@ -478,7 +487,7 @@
if (access(path, F_OK) == 0) {
#ifdef DEBUG
-@@ -422,7 +418,7 @@
+@@ -422,7 +418,7 @@ getPathFromName(char *name)
static char*
checkSoundPath(char* file)
{
@@ -487,7 +496,7 @@
int nr_elem;
int i = 0;
char *path;
-@@ -431,11 +427,11 @@
+@@ -431,11 +427,11 @@ checkSoundPath(char* file)
assert(file!=NULL);
array = GetObjectForKey("SoundPath");
@@ -502,8 +511,10 @@
if ((path+strlen(path)-1) != "/") {
tmp = wstrappend(path, "/");
---- wsoundprefs-1.1.1.orig/src/SoundPaths.c
-+++ wsoundprefs-1.1.1/src/SoundPaths.c
+Index: WSoundPrefs-1.1.1/src/SoundPaths.c
+===================================================================
+--- WSoundPrefs-1.1.1.orig/src/SoundPaths.c
++++ WSoundPrefs-1.1.1/src/SoundPaths.c
@@ -30,7 +30,7 @@
#include "WSoundPrefs.h"
#include "SoundPaths.h"
@@ -513,7 +524,7 @@
static void addPathToList(WMList *list, int index, char *path);
-@@ -62,19 +62,19 @@
+@@ -62,19 +62,19 @@ paintItem(WMList *lPtr, int index, Drawa
void
setSoundPathData(Panel *panel)
{
@@ -539,7 +550,7 @@
}
}
}
-@@ -82,19 +82,19 @@
+@@ -82,19 +82,19 @@ setSoundPathData(Panel *panel)
void
setSoundSetPathData(Panel *panel)
{
@@ -565,7 +576,7 @@
}
}
}
-@@ -140,7 +140,7 @@
+@@ -140,7 +140,7 @@ browseForPath(WMWidget *w, void *data)
if (w == panel->sndaB)
lPtr = panel->sndL;
@@ -574,8 +585,10 @@
lPtr = panel->sndsetL;
i = WMGetListSelectedItemRow(lPtr);
---- wsoundprefs-1.1.1.orig/src/SystemInfo.c
-+++ wsoundprefs-1.1.1/src/SystemInfo.c
+Index: WSoundPrefs-1.1.1/src/SystemInfo.c
+===================================================================
+--- WSoundPrefs-1.1.1.orig/src/SystemInfo.c
++++ WSoundPrefs-1.1.1/src/SystemInfo.c
@@ -32,8 +32,6 @@
#include
#include
@@ -585,9 +598,11 @@
#include "WSoundPrefs.h"
#include "SystemInfo.h"
---- wsoundprefs-1.1.1.orig/src/WSoundPrefs.c
-+++ wsoundprefs-1.1.1/src/WSoundPrefs.c
-@@ -40,7 +40,7 @@
+Index: WSoundPrefs-1.1.1/src/WSoundPrefs.c
+===================================================================
+--- WSoundPrefs-1.1.1.orig/src/WSoundPrefs.c
++++ WSoundPrefs-1.1.1/src/WSoundPrefs.c
+@@ -40,7 +40,7 @@ static void loadConfigurations(WMScreen
char* locateImage(char *name);
Bool isFormatSupported(char *format);
@@ -596,7 +611,7 @@
/* ------------------------------------------------------------------------- */
-@@ -48,7 +48,7 @@
+@@ -48,7 +48,7 @@ void
quit(WMWidget *w, void *data)
{
if (WMSoundDomain)
@@ -605,7 +620,7 @@
exit(0);
}
-@@ -57,28 +57,30 @@
+@@ -57,28 +57,30 @@ void
save(WMWidget *w, void *data)
{
Panel *panel = WMGetHangedData(w);
@@ -645,7 +660,7 @@
}
void
-@@ -124,7 +126,7 @@
+@@ -124,7 +126,7 @@ Initialize(WMScreen *scr)
/* Main Window */
panel->win = WMCreateWindow(scr, "wsoundprefs");
WMResizeWidget(panel->win, 482, 268);
@@ -654,7 +669,7 @@
WMSetWindowCloseAction(panel->win, quit, NULL);
WMSetWindowMaxSize(panel->win, 482, 268);
WMSetWindowMinSize(panel->win, 482, 268);
-@@ -189,6 +191,7 @@
+@@ -189,6 +191,7 @@ Initialize(WMScreen *scr)
WMResizeWidget(panel->sndevntL, 196, 60);
WMMoveWidget(panel->sndevntL, 8, 40);
WMSetLabelTextAlignment(panel->sndevntL, WACenter);
@@ -662,7 +677,7 @@
WMMapSubwidgets(panel->sndevntF);
-@@ -269,6 +272,7 @@
+@@ -269,6 +272,7 @@ Initialize(WMScreen *scr)
WMResizeWidget(panel->sndsetsL, 108, 48);
WMMoveWidget(panel->sndsetsL, 112, 16);
WMSetLabelTextAlignment(panel->sndsetsL, WALeft);
@@ -670,7 +685,7 @@
WMSetLabelText(panel->sndsetsL, _("Load and save an entire soundset."));
WMMapSubwidgets(panel->sndsetF);
-@@ -290,6 +294,7 @@
+@@ -290,6 +294,7 @@ Initialize(WMScreen *scr)
WMResizeWidget(panel->devL, 212, 54);
WMMoveWidget(panel->devL, 8, 44);
WMSetLabelTextAlignment(panel->devL, WACenter);
@@ -678,7 +693,7 @@
WMSetLabelText(panel->devL, _("Specify the sound device that should be "
"used to play the sounds through."));
-@@ -502,15 +507,15 @@
+@@ -502,15 +507,15 @@ Initialize(WMScreen *scr)
static void
loadConfigurations(WMScreen *scr, WMWindow *mainw)
{
@@ -698,7 +713,7 @@
db = NULL;
sprintf(mbuf, _("WMSound domain (%s) is corrupted!"), path);
WMRunAlertPanel(scr, mainw, _("Error"), mbuf, _("OK"), NULL, NULL);
-@@ -522,7 +527,7 @@
+@@ -522,7 +527,7 @@ loadConfigurations(WMScreen *scr, WMWind
free(path);
if (!db) {
@@ -707,8 +722,10 @@
}
WMSoundDomain = db;
---- wsoundprefs-1.1.1.orig/src/WSoundPrefs.h
-+++ wsoundprefs-1.1.1/src/WSoundPrefs.h
+Index: WSoundPrefs-1.1.1/src/WSoundPrefs.h
+===================================================================
+--- WSoundPrefs-1.1.1.orig/src/WSoundPrefs.h
++++ WSoundPrefs-1.1.1/src/WSoundPrefs.h
@@ -38,20 +38,17 @@
#include
@@ -733,8 +750,10 @@
/*
* Needed for HAVE_LIBINTL_H
---- wsoundprefs-1.1.1.orig/src/xpm/Imakefile
-+++ wsoundprefs-1.1.1/src/xpm/Imakefile
+Index: WSoundPrefs-1.1.1/src/xpm/Imakefile
+===================================================================
+--- WSoundPrefs-1.1.1.orig/src/xpm/Imakefile
++++ WSoundPrefs-1.1.1/src/xpm/Imakefile
@@ -1,4 +1,5 @@
-XPMDIR = /Apps/WSoundPrefs.app/xpm/
+APPDIR = /usr/lib/GNUstep/Apps/WSoundPrefs.app
@@ -742,9 +761,11 @@
XPMS = loadset.xpm saveset.xpm
---- wsoundprefs-1.1.1.orig/Imakefile
-+++ wsoundprefs-1.1.1/Imakefile
-@@ -6,15 +6,13 @@
+Index: WSoundPrefs-1.1.1/Imakefile
+===================================================================
+--- WSoundPrefs-1.1.1.orig/Imakefile
++++ WSoundPrefs-1.1.1/Imakefile
+@@ -6,15 +6,13 @@ XCOMM Specify Your Installation Prefix H
XCOMM Installation Path: $(PREFIX)/Apps/WSoundPrefs.app
XCOMM -------------------------------------------------
XCOMM PREFIX = /usr/GNUstep/Local
@@ -758,8 +779,8 @@
+CDEBUGFLAGS ?= -g -O2 -Wall
SUBDIRS = src
--
--DESTDIR = $(PREFIX)
+-DESTDIR = $(PREFIX)
+-
MakeSubdirs($(SUBDIRS))
DependSubdirs($(SUBDIRS))
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
