From: Richard W.M. Jones <"Richard W.M. Jones "> Date: Fri, 9 Jan 2009 14:20:21 +0000 (+0000) Subject: Directories removed - projects have been moved into Fedora. X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=384b9e0cff93bbd8bc086f61ab8ae681c661554a;p=fedora-mingw.git Directories removed - projects have been moved into Fedora. --- diff --git a/bzip2/bzip2-1.0.4-bzip2recover.patch b/bzip2/bzip2-1.0.4-bzip2recover.patch deleted file mode 100644 index e2bfe1c..0000000 --- a/bzip2/bzip2-1.0.4-bzip2recover.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- bzip2-1.0.4/bzip2recover.c.pom 2007-01-03 03:00:55.000000000 +0100 -+++ bzip2-1.0.4/bzip2recover.c 2007-02-05 11:55:17.000000000 +0100 -@@ -309,7 +309,8 @@ - UInt32 buffHi, buffLo, blockCRC; - Char* p; - -- strcpy ( progName, argv[0] ); -+ strncpy ( progName, argv[0], BZ_MAX_FILENAME-1); -+ progName[BZ_MAX_FILENAME-1]='\0'; - inFileName[0] = outFileName[0] = 0; - - fprintf ( stderr, diff --git a/bzip2/bzip2-1.0.4-cflags.patch b/bzip2/bzip2-1.0.4-cflags.patch deleted file mode 100644 index cd3ba90..0000000 --- a/bzip2/bzip2-1.0.4-cflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bzip2-1.0.4/Makefile-libbz2_so.cflags 2007-01-08 09:47:27.000000000 +0100 -+++ bzip2-1.0.4/Makefile-libbz2_so 2007-01-08 09:48:47.000000000 +0100 -@@ -35,7 +35,7 @@ - bzlib.o - - all: $(OBJS) -- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.4 $(OBJS) -+ $(CC) $(CFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.4 $(OBJS) - $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4 - rm -f libbz2.so.1.0 - ln -s libbz2.so.1.0.4 libbz2.so.1.0 diff --git a/bzip2/bzip2-1.0.4-saneso.patch b/bzip2/bzip2-1.0.4-saneso.patch deleted file mode 100644 index d3b3cbc..0000000 --- a/bzip2/bzip2-1.0.4-saneso.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bzip2-1.0.4/Makefile-libbz2_so.senaso 2007-01-03 03:00:55.000000000 +0100 -+++ bzip2-1.0.4/Makefile-libbz2_so 2007-01-08 09:12:42.000000000 +0100 -@@ -35,7 +35,7 @@ - bzlib.o - - all: $(OBJS) -- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.4 $(OBJS) -+ $(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.4 $(OBJS) - $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4 - rm -f libbz2.so.1.0 - ln -s libbz2.so.1.0.4 libbz2.so.1.0 diff --git a/bzip2/mingw32-bzip2-1.0.5-dll.patch b/bzip2/mingw32-bzip2-1.0.5-dll.patch deleted file mode 100644 index 0b6f23c..0000000 --- a/bzip2/mingw32-bzip2-1.0.5-dll.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- bzip2-1.0.5/Makefile-libbz2_so 2008-09-25 12:52:11.000000000 +0100 -+++ bzip2-1.0.5.dll/Makefile-libbz2_so 2008-09-25 12:59:22.000000000 +0100 -@@ -35,10 +35,8 @@ - bzlib.o - - all: $(OBJS) -- $(CC) $(CFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.4 $(OBJS) -- $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4 -- rm -f libbz2.so.1.0 -- ln -s libbz2.so.1.0.4 libbz2.so.1.0 -+ $(CC) $(CFLAGS) -shared -Wl,--out-implib -Wl,bz2.dll.a -Wl,-soname -Wl,bz2-1.dll -o bz2-1.dll $(OBJS) -+ $(CC) $(CFLAGS) -o bzip2-shared bzip2.c bz2-1.dll - - clean: - rm -f $(OBJS) bzip2.o libbz2.so.1.0.4 libbz2.so.1.0 bzip2-shared diff --git a/bzip2/mingw32-bzip2-1.0.5-slash.patch b/bzip2/mingw32-bzip2-1.0.5-slash.patch deleted file mode 100644 index 3b5ed14..0000000 --- a/bzip2/mingw32-bzip2-1.0.5-slash.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bzip2-1.0.5.orig/bzip2.c 2007-12-09 12:22:06.000000000 +0000 -+++ bzip2-1.0.5/bzip2.c 2008-09-25 12:31:02.000000000 +0100 -@@ -128,7 +128,7 @@ - #if BZ_LCCWIN32 - # include - # include --# include -+# include - - # define NORETURN /**/ - # define PATH_SEP '\\' diff --git a/bzip2/mingw32-bzip2.spec b/bzip2/mingw32-bzip2.spec deleted file mode 100644 index 84b4ce6..0000000 --- a/bzip2/mingw32-bzip2.spec +++ /dev/null @@ -1,153 +0,0 @@ -%define __strip %{_mingw32_strip} -%define __objdump %{_mingw32_objdump} -%define _use_internal_dependency_generator 0 -%define __find_requires %{_mingw32_findrequires} -%define __find_provides %{_mingw32_findprovides} - -%define library_version 1.0.4 - -# Running the tests requires Wine. -%define run_tests 0 - -Name: mingw32-bzip2 -Version: 1.0.5 -Release: 5%{?dist} -Summary: MinGW port of bzip2 file compression utility - -License: BSD -Group: Development/Libraries -URL: http://www.bzip.org/ -Source0: http://www.bzip.org/%{version}/bzip2-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildArch: noarch - -Patch0: bzip2-1.0.4-saneso.patch -Patch5: bzip2-1.0.4-cflags.patch -Patch6: bzip2-1.0.4-bzip2recover.patch - -Patch10: mingw32-bzip2-1.0.5-slash.patch -Patch11: mingw32-bzip2-1.0.5-dll.patch - -BuildRequires: mingw32-filesystem >= 26 -BuildRequires: mingw32-gcc -BuildRequires: mingw32-binutils - -%if %{run_tests} -BuildRequires: wine -%endif - - -%description -Bzip2 is a freely available, patent-free, high quality data compressor. -Bzip2 compresses files to within 10 to 15 percent of the capabilities -of the best techniques available. However, bzip2 has the added benefit -of being approximately two times faster at compression and six times -faster at decompression than those techniques. Bzip2 is not the -fastest compression utility, but it does strike a balance between speed -and compression capability. - -This package contains development tools and libraries for use when -cross-compiling Windows software in Fedora. - - -%prep -%setup -q -n bzip2-%{version} - -%patch0 -p1 -b .saneso -%patch5 -p1 -b .cflags -%patch6 -p1 -b .bz2recover - -%patch10 -p1 -b .slash -%patch11 -p1 -b .dll - - -%build -make -f Makefile-libbz2_so \ - CC="%{_mingw32_cc}" \ - AR="%{_mingw32_ar}" \ - RANLIB="%{_mingw32_ranlib}" \ - CFLAGS="%{_mingw32_cflags} -D_FILE_OFFSET_BITS=64" \ - %{?_smp_mflags} all - -rm -f *.o -make CC="%{_mingw32_cc}" \ - AR="%{_mingw32_ar}" \ - RANLIB="%{_mingw32_ranlib}" \ - CFLAGS="%{_mingw32_cflags} -D_FILE_OFFSET_BITS=64" \ - %{?_smp_mflags} \ -%if %{run_tests} - all -%else - libbz2.a bzip2 bzip2recover -%endif - - -%install -rm -rf $RPM_BUILD_ROOT -make PREFIX=$RPM_BUILD_ROOT%{_mingw32_prefix} install - -# The binaries which are symlinks contain the full buildroot -# name in the symlink, so replace those. -pushd $RPM_BUILD_ROOT%{_mingw32_bindir} -rm bzcmp bzegrep bzfgrep bzless -ln -s bzdiff bzcmp -ln -s bzgrep bzegrep -ln -s bzgrep bzfgrep -ln -s bzmore bzless -popd - -# Remove the manpages, they're duplicates of the native package, -# and located in the wrong place anyway. -rm -rf $RPM_BUILD_ROOT%{_mingw32_prefix}/man - -# The Makefile doesn't install the DLL. -# Rename the library so that libtool can find it. -install bz2.dll.a $RPM_BUILD_ROOT%{_mingw32_libdir}/libbz2.dll.a -install bz2-1.dll $RPM_BUILD_ROOT%{_mingw32_bindir}/ - -# Remove the static library. -rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libbz2.a - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root) -%doc LICENSE - -%{_mingw32_bindir}/bz2-1.dll -%{_mingw32_libdir}/libbz2.dll.a - -%{_mingw32_bindir}/bunzip2 -%{_mingw32_bindir}/bzcat -%{_mingw32_bindir}/bzcmp -%{_mingw32_bindir}/bzdiff -%{_mingw32_bindir}/bzegrep -%{_mingw32_bindir}/bzfgrep -%{_mingw32_bindir}/bzgrep -%{_mingw32_bindir}/bzip2 -%{_mingw32_bindir}/bzip2recover -%{_mingw32_bindir}/bzless -%{_mingw32_bindir}/bzmore - -%{_mingw32_includedir}/bzlib.h - - -%changelog -* Thu Dec 18 2008 Richard Jones - 1.0.5-5 -- Include the LICENSE file in doc section. - -* Sat Nov 22 2008 Richard Jones - 1.0.5-4 -- Rename the implib as libbz2.dll.a so that libtool can find it. - -* Wed Oct 29 2008 Richard Jones - 1.0.5-3 -- Fix mixed spaces/tabs in specfile. - -* Fri Oct 10 2008 Richard Jones - 1.0.5-2 -- Allow the tests to be disabled selectively. - -* Thu Sep 25 2008 Richard Jones - 1.0.5-1 -- Initial RPM release. diff --git a/iconv/mingw32-iconv.spec b/iconv/mingw32-iconv.spec deleted file mode 100644 index 7ad0d73..0000000 --- a/iconv/mingw32-iconv.spec +++ /dev/null @@ -1,98 +0,0 @@ -%define __strip %{_mingw32_strip} -%define __objdump %{_mingw32_objdump} -%define _use_internal_dependency_generator 0 -%define __find_requires %{_mingw32_findrequires} -%define __find_provides %{_mingw32_findprovides} - -Name: mingw32-iconv -Version: 1.12 -Release: 7%{?dist} -Summary: GNU libraries and utilities for character set conversion - -License: GPLv2+ and LGPLv2+ -Group: Development/Libraries -URL: http://www.gnu.org/software/libiconv/ -Source0: http://ftp.gnu.org/pub/gnu/libiconv/libiconv-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch - -BuildRequires: mingw32-filesystem >= 23 -BuildRequires: mingw32-gcc -BuildRequires: mingw32-binutils - -# There's a quasi-circular dependency between mingw32-iconv and -# mingw32-gettext. If gettext is installed when you build this then -# iconv will create *.mo files. When this package is added to Fedora -# we can consider adding this circular dep: -#BuildRequires: mingw32-gettext - - -%description -MinGW Windows Iconv library - - -%prep -%setup -q -n libiconv-%{version} - - -%build -%{_mingw32_configure} -make - - -%install -rm -rf $RPM_BUILD_ROOT - -make DESTDIR=$RPM_BUILD_ROOT install - -# Remove documentation which duplicates what is already in -# Fedora native packages. -rm -rf $RPM_BUILD_ROOT%{_mingw32_docdir}/libiconv/ -rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir} - -# If mingw32-gettext was installed during the build, remove the *.mo -# files. If mingw32-gettext wasn't installed then there won't be any. -rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/locale - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root) -%doc COPYING COPYING.LIB -%{_mingw32_bindir}/iconv -%{_mingw32_bindir}/libcharset-1.dll -%{_mingw32_bindir}/libiconv-2.dll -%{_mingw32_includedir}/iconv.h -%{_mingw32_includedir}/libcharset.h -%{_mingw32_includedir}/localcharset.h -%{_mingw32_libdir}/charset.alias -%{_mingw32_libdir}/libcharset.a -%{_mingw32_libdir}/libcharset.dll.a -%{_mingw32_libdir}/libcharset.la -%{_mingw32_libdir}/libiconv.dll.a -%{_mingw32_libdir}/libiconv.la - - -%changelog -* Fri Dec 19 2008 Richard W.M. Jones - 1.12-7 -- Include the license files in doc section. -- Fix the changelog entry numbering. - -* Mon Nov 3 2008 Richard W.M. Jones - 0.17-5 -- Changed the summary (Bruno Haible). -- Note about mingw32-gettext / Remove *.mo files. - -* Wed Sep 24 2008 Richard W.M. Jones - 0.17-4 -- Rename mingw -> mingw32. - -* Thu Sep 4 2008 Richard W.M. Jones - 0.17-3 -- Remove documentation which duplicates what is in Fedora native packages. - -* Thu Sep 4 2008 Richard W.M. Jones - 0.17-2 -- Use RPM macros from mingw-filesystem. - -* Tue Sep 2 2008 Daniel P. Berrange - 0.17-1 -- Initial RPM release, largely based on earlier work from several sources. diff --git a/sqlite/mingw32-sqlite-3.6.6.2-no-undefined.patch b/sqlite/mingw32-sqlite-3.6.6.2-no-undefined.patch deleted file mode 100644 index 3da0b54..0000000 --- a/sqlite/mingw32-sqlite-3.6.6.2-no-undefined.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- sqlite-3.6.6.2/Makefile.in.orig 2008-12-16 15:43:08.000000000 +0000 -+++ sqlite-3.6.6.2/Makefile.in 2008-12-16 15:43:27.000000000 +0000 -@@ -448,13 +448,14 @@ - - libsqlite3.la: $(LIBOBJ) - $(LTLINK) -o $@ $(LIBOBJ) $(TLIBS) \ -- ${ALLOWRELEASE} -rpath "$(libdir)" -version-info "8:6:8" -+ ${ALLOWRELEASE} -rpath "$(libdir)" -version-info "8:6:8" \ -+ -no-undefined - - libtclsqlite3.la: tclsqlite.lo libsqlite3.la - $(LTLINK) -o $@ tclsqlite.lo \ - libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \ - -rpath "$(libdir)/sqlite" \ -- -version-info "8:6:8" -+ -version-info "8:6:8" -no-undefined - - sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la sqlite3.h - $(LTLINK) $(READLINE_FLAGS) \ diff --git a/sqlite/mingw32-sqlite.spec b/sqlite/mingw32-sqlite.spec deleted file mode 100644 index 32b96aa..0000000 --- a/sqlite/mingw32-sqlite.spec +++ /dev/null @@ -1,121 +0,0 @@ -%define __strip %{_mingw32_strip} -%define __objdump %{_mingw32_objdump} -%define _use_internal_dependency_generator 0 -%define __find_requires %{_mingw32_findrequires} -%define __find_provides %{_mingw32_findprovides} - -Name: mingw32-sqlite -Version: 3.6.6.2 -Release: 1%{?dist} -Summary: MinGW Windows port of sqlite embeddable SQL database engine - -License: Public Domain -Group: Applications/Databases -URL: http://www.sqlite.org/ -Source0: http://www.sqlite.org/sqlite-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildArch: noarch - -# Patches from Fedora native package. -Patch1: sqlite-3.6.6.2-libdl.patch -Patch2: sqlite-3.6.6.2-lemon-snprintf.patch - -# Patches for MinGW port. -Patch1000: mingw32-sqlite-3.6.6.2-no-undefined.patch - -BuildRequires: mingw32-filesystem >= 26 -BuildRequires: mingw32-gcc -BuildRequires: mingw32-binutils - -BuildRequires: mingw32-pdcurses -BuildRequires: mingw32-readline -BuildRequires: mingw32-termcap >= 1.3.1-3 - -BuildRequires: autoconf -BuildRequires: libtool - -Requires: pkgconfig - - -%description -SQLite is a C library that implements an SQL database engine. A large -subset of SQL92 is supported. A complete database is stored in a -single disk file. The API is designed for convenience and ease of use. -Applications that link against SQLite can enjoy the power and -flexibility of an SQL database without the administrative hassles of -supporting a separate database server. Version 2 and version 3 binaries -are named to permit each to be installed on a single host - -This package contains cross-compiled libraries and development tools -for Windows. - - -%prep -%setup -q -n sqlite-%{version} -%patch1 -p1 -b .libdl -%patch2 -p1 -b .lemon-sprintf -%patch1000 -p1 - -# Ships with an old/broken version of libtool which cannot create -# Windows libraries properly. So pull in the current version. -autoreconf -libtoolize --force - - -%build -# I think there's a bug in the configure script where, if -# cross-compiling, it cannot correctly determine the target executable -# extension (ie. .exe). As a result it doesn't correctly detect that -# the target is Windows and so tries to use Unix-specific functions -# which don't exist. In any case we can work around this by forcing -# the extension via this export. -# - RWMJ 2008-09-30 -export config_TARGET_EXEEXT=.exe - -%{_mingw32_configure} -make - - -%install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install - -# Remove static libraries but DON'T remove *.dll.a files. -rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libsqlite3.a - -chmod 0644 $RPM_BUILD_ROOT%{_mingw32_libdir}/libsqlite3.dll.a - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root) -%doc README VERSION -%{_mingw32_bindir}/sqlite3.exe -%{_mingw32_bindir}/libsqlite3-0.dll -%{_mingw32_libdir}/libsqlite3.dll.a -%{_mingw32_libdir}/libsqlite3.la -%{_mingw32_includedir}/sqlite3.h -%{_mingw32_includedir}/sqlite3ext.h -%{_mingw32_libdir}/pkgconfig/sqlite3.pc - - -%changelog -* Tue Dec 16 2008 Richard Jones - 3.6.6.2-1 -- New upstream release (to match Fedora native), 3.6.6.2. -- Replace patches with ones from native. -- Rebase -no-undefined patch. -- Remove spurious +x permissions on libsqlite3.dll.a. -- Requires pkgconfig. - -* Sat Nov 22 2008 Richard Jones - 3.5.9-3 -- Rebuild against new readline. - -* Fri Oct 31 2008 Richard Jones - 3.5.9-2 -- Rebuild against latest termcap. - -* Thu Sep 25 2008 Richard Jones - 3.5.9-1 -- Initial RPM release. diff --git a/sqlite/sqlite-3.6.6.2-lemon-snprintf.patch b/sqlite/sqlite-3.6.6.2-lemon-snprintf.patch deleted file mode 100644 index 299f5e3..0000000 --- a/sqlite/sqlite-3.6.6.2-lemon-snprintf.patch +++ /dev/null @@ -1,111 +0,0 @@ -diff -up sqlite-3.6.6.2/tool/lemon.c.lemparpath sqlite-3.6.6.2/tool/lemon.c ---- sqlite-3.6.6.2/tool/lemon.c.lemparpath 2008-12-05 20:37:49.000000000 +0200 -+++ sqlite-3.6.6.2/tool/lemon.c 2008-12-05 20:44:08.000000000 +0200 -@@ -1324,15 +1324,15 @@ void ErrorMsg(const char *filename, int - va_start(ap, format); - /* Prepare a prefix to be prepended to every output line */ - if( lineno>0 ){ -- sprintf(prefix,"%.*s:%d: ",PREFIXLIMIT-10,filename,lineno); -+ snprintf(prefix,sizeof prefix,"%.*s:%d: ",PREFIXLIMIT-10,filename,lineno); - }else{ -- sprintf(prefix,"%.*s: ",PREFIXLIMIT-10,filename); -+ snprintf(prefix,sizeof prefix,"%.*s: ",PREFIXLIMIT-10,filename); - } - prefixsize = lemonStrlen(prefix); - availablewidth = LINEWIDTH - prefixsize; - - /* Generate the error message */ -- vsprintf(errmsg,format,ap); -+ vsnprintf(errmsg,sizeof errmsg,format,ap); - va_end(ap); - errmsgsize = lemonStrlen(errmsg); - /* Remove trailing '\n's from the error message. */ -@@ -2911,7 +2911,7 @@ struct lemon *lemp; - while( cfp ){ - char buf[20]; - if( cfp->dot==cfp->rp->nrhs ){ -- sprintf(buf,"(%d)",cfp->rp->index); -+ snprintf(buf,sizeof buf,"(%d)",cfp->rp->index); - fprintf(fp," %5s ",buf); - }else{ - fprintf(fp," "); -@@ -2966,6 +2966,7 @@ int modemask; - { - char *pathlist; - char *path,*cp; -+ size_t pathsz; - char c; - - #ifdef __WIN32__ -@@ -2976,21 +2977,21 @@ int modemask; - if( cp ){ - c = *cp; - *cp = 0; -- path = (char *)malloc( lemonStrlen(argv0) + lemonStrlen(name) + 2 ); -- if( path ) sprintf(path,"%s/%s",argv0,name); -+ path = (char *)malloc((pathsz=lemonStrlen(argv0) + lemonStrlen(name) + 2)); -+ if( path ) snprintf(path,pathsz,"%s/%s",argv0,name); - *cp = c; - }else{ - extern char *getenv(); - pathlist = getenv("PATH"); - if( pathlist==0 ) pathlist = ".:/bin:/usr/bin"; -- path = (char *)malloc( lemonStrlen(pathlist)+lemonStrlen(name)+2 ); -+ path = (char *)malloc((pathsz=lemonStrlen(pathlist)+lemonStrlen(name)+2)); - if( path!=0 ){ - while( *pathlist ){ - cp = strchr(pathlist,':'); - if( cp==0 ) cp = &pathlist[lemonStrlen(pathlist)]; - c = *cp; - *cp = 0; -- sprintf(path,"%s/%s",pathlist,name); -+ snprintf(path,pathsz,"%s/%s",pathlist,name); - *cp = c; - if( c==0 ) pathlist = ""; - else pathlist = &cp[1]; -@@ -3070,14 +3071,16 @@ struct lemon *lemp; - - cp = strrchr(lemp->filename,'.'); - if( cp ){ -- sprintf(buf,"%.*s.lt",(int)(cp-lemp->filename),lemp->filename); -+ snprintf(buf,sizeof buf,"%.*s.lt",(int)(cp-lemp->filename),lemp->filename); - }else{ -- sprintf(buf,"%s.lt",lemp->filename); -+ snprintf(buf,sizeof buf,"%s.lt",lemp->filename); - } - if( access(buf,004)==0 ){ - tpltname = buf; - }else if( access(templatename,004)==0 ){ - tpltname = templatename; -+ }else if( access("/usr/share/lemon/lempar.c",004)==0 ){ -+ tpltname = "/usr/share/lemon/lempar.c"; - }else{ - tpltname = pathsearch(lemp->argv0,templatename,0); - } -@@ -3089,7 +3092,7 @@ struct lemon *lemp; - } - in = fopen(tpltname,"rb"); - if( in==0 ){ -- fprintf(stderr,"Can't open the template file \"%s\".\n",templatename); -+ fprintf(stderr,"Can't open the template file \"%s\".\n",tpltname); - lemp->errorcnt++; - return 0; - } -@@ -3827,7 +3830,7 @@ int mhflag; /* Output in makeheaders - /* Generate a table containing the symbolic name of every symbol - */ - for(i=0; insymbol; i++){ -- sprintf(line,"\"%s\",",lemp->symbols[i]->name); -+ snprintf(line,sizeof line,"\"%s\",",lemp->symbols[i]->name); - fprintf(out," %-15s",line); - if( (i&3)==3 ){ fprintf(out,"\n"); lineno++; } - } -@@ -3983,7 +3986,7 @@ struct lemon *lemp; - in = file_open(lemp,".h","rb"); - if( in ){ - for(i=1; interminal && fgets(line,LINESIZE,in); i++){ -- sprintf(pattern,"#define %s%-30s %2d\n",prefix,lemp->symbols[i]->name,i); -+ snprintf(pattern,sizeof pattern,"#define %s%-30s %2d\n",prefix,lemp->symbols[i]->name,i); - if( strcmp(line,pattern) ) break; - } - fclose(in); diff --git a/sqlite/sqlite-3.6.6.2-libdl.patch b/sqlite/sqlite-3.6.6.2-libdl.patch deleted file mode 100644 index 19d10ba..0000000 --- a/sqlite/sqlite-3.6.6.2-libdl.patch +++ /dev/null @@ -1,240 +0,0 @@ -diff -up sqlite-3.6.4/configure.ac.orig sqlite-3.6.4/configure.ac ---- sqlite-3.6.4/configure.ac.orig 2008-11-08 11:37:15.000000000 +0200 -+++ sqlite-3.6.4/configure.ac 2008-11-08 11:35:50.000000000 +0200 -@@ -606,6 +606,7 @@ AC_ARG_ENABLE(load-extension, AC_HELP_ST - [use_loadextension=$enableval],[use_loadextension=no]) - if test "${use_loadextension}" = "yes" ; then - OPT_FEATURE_FLAGS="" -+ AC_SEARCH_LIBS(dlopen, [dl]) - else - OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1" - fi -diff -up sqlite-3.6.4/configure.orig sqlite-3.6.4/configure ---- sqlite-3.6.4/configure.orig 2008-11-08 11:39:22.000000000 +0200 -+++ sqlite-3.6.4/configure 2008-11-08 11:39:29.000000000 +0200 -@@ -1,6 +1,6 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.59 for sqlite 3.6.1. -+# Generated by GNU Autoconf 2.59 for sqlite 3.6.4. - # - # Copyright (C) 2003 Free Software Foundation, Inc. - # This configure script is free software; the Free Software Foundation -@@ -416,8 +416,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} - # Identity of this package. - PACKAGE_NAME='sqlite' - PACKAGE_TARNAME='sqlite' --PACKAGE_VERSION='3.6.1' --PACKAGE_STRING='sqlite 3.6.1' -+PACKAGE_VERSION='3.6.4' -+PACKAGE_STRING='sqlite 3.6.4' - PACKAGE_BUGREPORT='' - - # Factoring default headers for most tests. -@@ -926,7 +926,7 @@ if test "$ac_init_help" = "long"; then - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<_ACEOF --\`configure' configures sqlite 3.6.1 to adapt to many kinds of systems. -+\`configure' configures sqlite 3.6.4 to adapt to many kinds of systems. - - Usage: $0 [OPTION]... [VAR=VALUE]... - -@@ -987,7 +987,7 @@ fi - - if test -n "$ac_init_help"; then - case $ac_init_help in -- short | recursive ) echo "Configuration of sqlite 3.6.1:";; -+ short | recursive ) echo "Configuration of sqlite 3.6.4:";; - esac - cat <<\_ACEOF - -@@ -1137,7 +1137,7 @@ fi - test -n "$ac_init_help" && exit 0 - if $ac_init_version; then - cat <<\_ACEOF --sqlite configure 3.6.1 -+sqlite configure 3.6.4 - generated by GNU Autoconf 2.59 - - Copyright (C) 2003 Free Software Foundation, Inc. -@@ -1151,7 +1151,7 @@ cat >&5 <<_ACEOF - This file contains any messages produced by compilers while - running configure, to aid debugging if configure makes a mistake. - --It was created by sqlite $as_me 3.6.1, which was -+It was created by sqlite $as_me 3.6.4, which was - generated by GNU Autoconf 2.59. Invocation command line was - - $ $0 $@ -@@ -1489,7 +1489,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - # The following RCS revision string applies to configure.in --# $Revision: 1.65 $ -+# $Revision: 1.49 $ - - ######### - # Programs needed -@@ -11266,10 +11266,6 @@ if test "$TARGET_EXEEXT" = ".exe"; then - SQLITE_OS_WIN=0 - SQLITE_OS_OS2=1 - CFLAGS="$CFLAGS -DSQLITE_OS_OS2=1" -- if test "$ac_compiler_gnu" = "yes" ; then -- CFLAGS="$CFLAGS -Zomf -Zexe -Zmap" -- BUILD_CFLAGS="$BUILD_CFLAGS -Zomf -Zexe" -- fi - else - SQLITE_OS_UNIX=0 - SQLITE_OS_WIN=1 -@@ -12066,6 +12062,132 @@ else - fi; - if test "${use_loadextension}" = "yes" ; then - OPT_FEATURE_FLAGS="" -+ echo "$as_me:$LINENO: checking for library containing dlopen" >&5 -+echo $ECHO_N "checking for library containing dlopen... $ECHO_C" >&6 -+if test "${ac_cv_search_dlopen+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_func_search_save_LIBS=$LIBS -+ac_cv_search_dlopen=no -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char dlopen (); -+int -+main () -+{ -+dlopen (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_search_dlopen="none required" -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+if test "$ac_cv_search_dlopen" = no; then -+ for ac_lib in dl; do -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char dlopen (); -+int -+main () -+{ -+dlopen (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_search_dlopen="-l$ac_lib" -+break -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ done -+fi -+LIBS=$ac_func_search_save_LIBS -+fi -+echo "$as_me:$LINENO: result: $ac_cv_search_dlopen" >&5 -+echo "${ECHO_T}$ac_cv_search_dlopen" >&6 -+if test "$ac_cv_search_dlopen" != no; then -+ test "$ac_cv_search_dlopen" = "none required" || LIBS="$ac_cv_search_dlopen $LIBS" -+ -+fi -+ - else - OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1" - fi -@@ -12506,7 +12628,7 @@ _ASBOX - } >&5 - cat >&5 <<_CSEOF - --This file was extended by sqlite $as_me 3.6.1, which was -+This file was extended by sqlite $as_me 3.6.4, which was - generated by GNU Autoconf 2.59. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES -@@ -12569,7 +12691,7 @@ _ACEOF - - cat >>$CONFIG_STATUS <<_ACEOF - ac_cs_version="\\ --sqlite config.status 3.6.1 -+sqlite config.status 3.6.4 - configured by $0, generated by GNU Autoconf 2.59, - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" - diff --git a/termcap/mingw32-termcap.spec b/termcap/mingw32-termcap.spec deleted file mode 100644 index ef8bea1..0000000 --- a/termcap/mingw32-termcap.spec +++ /dev/null @@ -1,111 +0,0 @@ -# Note: Termcap was deprecated and removed from Fedora after F-8. It -# has been replaced by ncurses. However ncurses cannot be compiled on -# Windows so we have to supply termcap. In addition, the last stand- -# alone Fedora termcap package was actually just /etc/termcap from -# ncurses. So here we are using the GNU termcap library which is -# regretably GPL'd. - -%define __strip %{_mingw32_strip} -%define __objdump %{_mingw32_objdump} -%define _use_internal_dependency_generator 0 -%define __find_requires %{_mingw32_findrequires} -%define __find_provides %{_mingw32_findprovides} - -Name: mingw32-termcap -Version: 1.3.1 -Release: 5%{?dist} -Summary: MinGW terminal feature database - -License: GPLv2+ -Group: Development/Libraries -URL: ftp://ftp.gnu.org/gnu/termcap/ -Source0: ftp://ftp.gnu.org/gnu/termcap/termcap-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildArch: noarch - -BuildRequires: mingw32-filesystem >= 28 -BuildRequires: mingw32-gcc -BuildRequires: mingw32-binutils - -BuildRequires: autoconf - - -%description -This is the GNU termcap library -- a library of C functions that -enable programs to send control strings to terminals in a way -independent of the terminal type. The GNU termcap library does not -place an arbitrary limit on the size of termcap entries, unlike most -other termcap libraries. - -This package contains libraries and development tools for the MinGW -cross-compiled version. - - -%prep -%setup -q -n termcap-%{version} - -# Packaged script doesn't understand --bindir, so rebuild: -autoconf - - -%build -%{_mingw32_configure} -make - -# Build a shared library. No need for -fPIC on Windows. -%{_mingw32_cc} -shared \ - -Wl,--out-implib,libtermcap.dll.a \ - -o libtermcap-0.dll \ - termcap.o tparam.o version.o - - -%install -rm -rf $RPM_BUILD_ROOT - -make install \ - prefix=$RPM_BUILD_ROOT%{_mingw32_prefix} \ - exec_prefix=$RPM_BUILD_ROOT%{_mingw32_prefix} \ - oldincludedir= - -# Move the shared library to the correct locations. -mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir} -install -m 0755 libtermcap-0.dll $RPM_BUILD_ROOT%{_mingw32_bindir} -install -m 0755 libtermcap.dll.a $RPM_BUILD_ROOT%{_mingw32_libdir} - -# Don't want the static library, thank you. -rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libtermcap.a - -# Move the info files to the correct location. -mkdir -p $RPM_BUILD_ROOT%{_mingw32_infodir} -mv $RPM_BUILD_ROOT%{_mingw32_prefix}/info/* $RPM_BUILD_ROOT%{_mingw32_infodir} - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root) -%doc COPYING -%{_mingw32_bindir}/libtermcap-0.dll -%{_mingw32_libdir}/libtermcap.dll.a -%{_mingw32_includedir}/termcap.h -# Note that we want the info files in this package because -# there is no equivalent native Fedora package. -%{_mingw32_infodir}/* - - -%changelog -* Fri Dec 19 2008 Richard W.M. Jones - 1.3.1-5 -- Added license file to doc section. - -* Wed Nov 19 2008 Richard W.M. Jones - 1.3.1-4 -- Rerun autoconf because the standard configure doesn't know --bindir. -- Set exec_prefix during make install step. - -* Fri Oct 31 2008 Richard W.M. Jones - 1.3.1-3 -- Fix so it builds a working DLL. - -* Thu Sep 25 2008 Richard W.M. Jones - 1.3.1-1 -- Initial RPM release. diff --git a/zlib/compare.supp b/zlib/compare.supp deleted file mode 100644 index a2b588c..0000000 --- a/zlib/compare.supp +++ /dev/null @@ -1 +0,0 @@ -extra patch 'zlib-win32.patch' diff --git a/zlib/mingw32-zlib.spec b/zlib/mingw32-zlib.spec deleted file mode 100644 index 5582c77..0000000 --- a/zlib/mingw32-zlib.spec +++ /dev/null @@ -1,112 +0,0 @@ -%define __strip %{_mingw32_strip} -%define __objdump %{_mingw32_objdump} -%define _use_internal_dependency_generator 0 -%define __find_requires %{_mingw32_findrequires} -%define __find_provides %{_mingw32_findprovides} - -Name: mingw32-zlib -Version: 1.2.3 -Release: 11%{?dist} -Summary: MinGW Windows zlib compression library - -License: zlib -Group: Development/Libraries -URL: http://www.zlib.net/ -Source0: http://www.zlib.net/zlib-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch - -# From Fedora native package, none is applicable to us. -#Patch3: zlib-1.2.3-autotools.patch -#Patch4: minizip-1.2.3-autotools.patch -#Patch5: zlib-1.2.3-minizip.patch - -# MinGW-specific patches. -Patch100: zlib-win32.patch - -BuildRequires: mingw32-filesystem >= 23 -BuildRequires: mingw32-gcc -BuildRequires: mingw32-binutils - - -%description -MinGW Windows zlib compression library. - - -%prep -%setup -q -n zlib-1.2.3 - -%patch100 -p1 - - -%build -CC=%{_mingw32_cc} \ -CFLAGS="%{_mingw32_cflags}" \ -RANLIB=%{_mingw32_ranlib} \ -./configure - -make -f win32/Makefile.gcc \ - CFLAGS="%{_mingw32_cflags}" \ - CC=%{_mingw32_cc} \ - AR=%{_mingw32_ar} \ - RC=i686-pc-mingw32-windres \ - DLLWRAP=i686-pc-mingw32-dllwrap \ - STRIP=%{_mingw32_strip} \ - all - - -%install -rm -rf $RPM_BUILD_ROOT - -mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir} -mkdir -p $RPM_BUILD_ROOT%{_mingw32_includedir} -mkdir -p $RPM_BUILD_ROOT%{_mingw32_libdir} - -make -f win32/Makefile.gcc \ - INCLUDE_PATH=$RPM_BUILD_ROOT%{_mingw32_includedir} \ - LIBRARY_PATH=$RPM_BUILD_ROOT%{_mingw32_libdir} \ - BINARY_PATH=$RPM_BUILD_ROOT%{_mingw32_bindir} \ - install - -# .dll.a file is misnamed for some reason - fix that. -mv $RPM_BUILD_ROOT%{_mingw32_libdir}/libzdll.a \ - $RPM_BUILD_ROOT%{_mingw32_libdir}/libz.dll.a - -# Remove static library. -rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libz.a - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root) -%{_mingw32_includedir}/zconf.h -%{_mingw32_includedir}/zlib.h -%{_mingw32_libdir}/libz.dll.a -%{_mingw32_bindir}/zlib1.dll - - -%changelog -* Thu Dec 18 2008 Richard W.M. Jones - 1.2.3-11 -- Pass correct CFLAGS to build. - -* Thu Oct 16 2008 Richard W.M. Jones - 1.2.3-10 -- Consider native patches. - -* Wed Sep 24 2008 Richard W.M. Jones - 1.2.3-9 -- Rename mingw -> mingw32. - -* Sun Sep 21 2008 Richard W.M. Jones - 1.2.3-8 -- Remove manpage. - -* Wed Sep 10 2008 Richard W.M. Jones - 1.2.3-7 -- Remove static library. - -* Fri Sep 5 2008 Richard W.M. Jones - 1.2.3-5 -- Fix misnamed file: zlibdll.a -> zlib.dll.a -- Explicitly provide mingw(zlib1.dll). - -* Thu Sep 4 2008 Richard W.M. Jones - 1.2.3-3 -- Initial RPM release, largely based on earlier work from several sources. diff --git a/zlib/zlib-win32.patch b/zlib/zlib-win32.patch deleted file mode 100644 index 23beea6..0000000 --- a/zlib/zlib-win32.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -rup zlib-1.2.3.orig/win32/Makefile.gcc zlib-1.2.3.new/win32/Makefile.gcc ---- zlib-1.2.3.orig/win32/Makefile.gcc 2003-08-01 23:49:00.000000000 -0400 -+++ zlib-1.2.3.new/win32/Makefile.gcc 2008-09-02 08:24:44.000000000 -0400 -@@ -45,6 +45,9 @@ ARFLAGS = rcs - RC = windres - RCFLAGS = --define GCC_WINDRES - -+DLLWARP = dllwrap -+STRIP = strip -+ - CP = cp -fp - # If GNU install is available, replace $(CP) with install. - INSTALL = $(CP) -@@ -79,9 +82,9 @@ $(STATICLIB): $(OBJS) $(OBJA) - $(IMPLIB): $(SHAREDLIB) - - $(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlibrc.o -- dllwrap --driver-name $(CC) --def win32/zlib.def \ -+ $(DLLWRAP) --driver-name $(CC) --def win32/zlib.def \ - --implib $(IMPLIB) -o $@ $(OBJS) $(OBJA) zlibrc.o -- strip $@ -+ $(STRIP) $@ - - example: example.o $(STATICLIB) - $(LD) $(LDFLAGS) -o $@ example.o $(STATICLIB) -@@ -104,12 +107,13 @@ zlibrc.o: win32/zlib1.rc - .PHONY: install uninstall clean - - install: zlib.h zconf.h $(LIB) -- -@if not exist $(INCLUDE_PATH)/nul mkdir $(INCLUDE_PATH) -- -@if not exist $(LIBRARY_PATH)/nul mkdir $(LIBRARY_PATH) -+ -mkdir -p $(INCLUDE_PATH) -+ -mkdir -p $(LIBRARY_PATH) - -$(INSTALL) zlib.h $(INCLUDE_PATH) - -$(INSTALL) zconf.h $(INCLUDE_PATH) - -$(INSTALL) $(STATICLIB) $(LIBRARY_PATH) - -$(INSTALL) $(IMPLIB) $(LIBRARY_PATH) -+ -$(INSTALL) $(SHAREDLIB) $(BINARY_PATH) - - uninstall: - -$(RM) $(INCLUDE_PATH)/zlib.h