Hello community, here is the log from the commit of package fondu for openSUSE:Factory checked in at Tue Sep 20 09:38:20 CEST 2011.
-------- --- fondu/fondu.changes 2010-10-22 13:23:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/fondu/fondu.changes 2011-09-19 17:14:17.000000000 +0200 @@ -1,0 +2,8 @@ +Sun Sep 18 17:17:12 UTC 2011 - [email protected] + +- Apply packaging guidelines (remove redundant/obsolete + tags/sections from specfile, etc.) +- Add patch fondu-flags.diff to make package not forget our CFLAGS +- Add patch fondu-shadow.diff to fix compile error when using -O + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- fondu-flags.diff fondu-shadow.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fondu.spec ++++++ --- /var/tmp/diff_new_pack.7Vf9Rg/_old 2011-09-20 09:38:16.000000000 +0200 +++ /var/tmp/diff_new_pack.7Vf9Rg/_new 2011-09-20 09:38:16.000000000 +0200 @@ -27,6 +27,10 @@ Group: System/X11/Fonts Source0: http://fondu.sourceforge.net/fondu_src-060102.tgz +# PATCH-FIX-UPSTREAM fondu-flags.diff status=notsentyet +Patch1: fondu-flags.diff +# PATCH-FIX-UPSTREAM fondu-shadow.diff status=notsentyet +Patch2: fondu-shadow.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -37,19 +41,16 @@ %prep %setup -T -b 0 -n fondu-060102 +%patch -P 1 -P 2 -p1 %build -CFLAGS="%{optflags}" %configure -make +make %{?_smp_mflags} %install mkdir -p %{buildroot}%{_bindir} %makeinstall -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root) %{_bindir}/fondu ++++++ fondu-flags.diff ++++++ From: Jan Engelhardt <[email protected]> Date: 2011-09-19 16:53:13.076262120 +0200 Passing CFLAGS to configure.in has no effect because the flags are not propagated into the Makefile. Fix this. -g is included in configure's default flags, which is why it does not show up in Makefile.in anymore. --- Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: fondu-060102/Makefile.in =================================================================== --- fondu-060102.orig/Makefile.in +++ fondu-060102/Makefile.in @@ -13,7 +13,7 @@ HOST= @HOST@ DARWIN_CORE = $(if $(findstring apple-darwin,$(HOST)),/System/Library/Frameworks/CoreServices.framework/CoreServices,) WFLAGS = -Wmissing-prototypes -Wunused -Wimplicit -Wreturn-type -Wparentheses -pedantic -CFLAGS = -g $(WFLAGS) +CFLAGS = ${WFLAGS} @CFLAGS@ FONDUOBJS = fondu.o readnfnt.o fondups.o UFONDOBJS = ufond.o ufondbdf.o ufondpfb.o ufondttf.o crctab.o DFONT2RESOBJS = dfont2res.o crctab.o ++++++ fondu-shadow.diff ++++++ From: Jan Engelhardt <[email protected]> Date: 2011-09-19 17:09:20.582742817 +0200 build: fix compilation of fondu.c in optimizing mode Glibc expands strdup to a big statement involving strlen(). Since there however is a local variable with the same name, *boom*. $ gcc -Wmissing-prototypes -Wunused -Wimplicit -Wreturn-type -Wparentheses -pedantic -g -O2 -c -o fondu.o fondu.c fondu.c: In function ‘BuildFondList’: fondu.c:429:18: warning: value computed is not used [-Wunused-value] fondu.c:515:20: error: called object ‘strlen’ is not a function --- fondu.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) Index: fondu-060102/fondu.c =================================================================== --- fondu-060102.orig/fondu.c +++ fondu-060102/fondu.c @@ -473,7 +473,7 @@ static FOND *BuildFondList(FILE *f,long } if ( styleoff!=0 ) { unsigned char stringoffsets[48]; - int strcnt, strlen, format; + int strcnt, slen, format; char **strings, *pt; fseek(f,styleoff,SEEK_SET); /* class = */ getushort(f); @@ -484,11 +484,11 @@ static FOND *BuildFondList(FILE *f,long strcnt = getushort(f); strings = malloc(strcnt*sizeof(char *)); for ( j=0; j<strcnt; ++j ) { - strlen = getc(f); - strings[j] = malloc(strlen+2); - strings[j][0] = strlen; - strings[j][strlen+1] = '\0'; - for ( k=0; k<strlen; ++k ) + slen = getc(f); + strings[j] = malloc(slen+2); + strings[j][0] = slen; + strings[j][slen+1] = '\0'; + for ( k=0; k<slen; ++k ) strings[j][k+1] = getc(f); } for ( j=0; j<48; ++j ) { @@ -498,11 +498,11 @@ static FOND *BuildFondList(FILE *f,long if ( k!=-1 || stringoffsets[j]==0 ) continue; /* this style doesn't exist */ format = stringoffsets[j]-1; - strlen = strings[0][0]; + slen = strings[0][0]; if ( format!=0 && format!=-1 ) for ( k=0; k<strings[format][0]; ++k ) - strlen += strings[ strings[format][k+1]-1 ][0]; - pt = cur->psnames[j] = malloc(strlen+1); + slen += strings[ strings[format][k+1]-1 ][0]; + pt = cur->psnames[j] = malloc(slen+1); strcpy(pt,strings[ 0 ]+1); pt += strings[ 0 ][0]; if ( format!=0 && format!=-1 ) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
