Author: arekm Date: Fri Jul 24 13:43:00 2009 GMT Module: packages Tag: HEAD ---- Log message: - rel 4; build fixed
---- Files affected: packages/libcabinet: libcabinet.spec (1.17 -> 1.18) , libcabinet-gcc4.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/libcabinet/libcabinet.spec diff -u packages/libcabinet/libcabinet.spec:1.17 packages/libcabinet/libcabinet.spec:1.18 --- packages/libcabinet/libcabinet.spec:1.17 Tue Feb 13 07:46:50 2007 +++ packages/libcabinet/libcabinet.spec Fri Jul 24 15:42:55 2009 @@ -3,7 +3,7 @@ Summary(pl.UTF-8): Biblioteka i narzędzia do obsługi plików Cabinet Name: libcabinet Version: 0.30 -Release: 3 +Release: 4 License: non-commercial, see readme.txt Group: Libraries Source0: http://Trill.cis.fordham.edu/~barbacha/cabinet_library/%{name}-%{version}.tar.gz @@ -11,6 +11,7 @@ Source1: %{name}-Makefile Patch0: %{name}-endl.patch Patch1: %{name}-gcc3.patch +Patch2: %{name}-gcc4.patch URL: http://Trill.cis.fordham.edu/~barbacha/cabinet_library/ # needed with gcc3 patch BuildRequires: libstdc++-devel >= 5:3.2 @@ -52,6 +53,8 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 + install -m644 %{SOURCE1} Makefile %build @@ -97,6 +100,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.18 2009/07/24 13:42:55 arekm +- rel 4; build fixed + Revision 1.17 2007/02/13 06:46:50 glen - tabs in preamble ================================================================ Index: packages/libcabinet/libcabinet-gcc4.patch diff -u /dev/null packages/libcabinet/libcabinet-gcc4.patch:1.1 --- /dev/null Fri Jul 24 15:43:01 2009 +++ packages/libcabinet/libcabinet-gcc4.patch Fri Jul 24 15:42:55 2009 @@ -0,0 +1,1033 @@ +diff -ur libcabinet-0.30.org/bstring.cpp libcabinet-0.30/bstring.cpp +--- libcabinet-0.30.org/bstring.cpp 2009-07-24 15:41:19.273903021 +0200 ++++ libcabinet-0.30/bstring.cpp 2009-07-24 15:39:28.878904770 +0200 +@@ -15,7 +15,7 @@ + + #include "bstring.h" + #include <string.h> +-#include <fstream.h> ++#include <fstream> + + ///////////////////////////////////////*************************************** + +@@ -207,7 +207,7 @@ + + //*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/ + +-istream& operator >> (istream& input, b_string& str) ++std::istream& operator >> (std::istream& input, b_string& str) + { + char buffer[128]; // Local buffer large enougth for 1 dos line + input >> buffer; // Get info from input stream +diff -ur libcabinet-0.30.org/bstring.h libcabinet-0.30/bstring.h +--- libcabinet-0.30.org/bstring.h 2009-07-24 15:41:19.269876185 +0200 ++++ libcabinet-0.30/bstring.h 2009-07-24 15:38:03.138876541 +0200 +@@ -21,12 +21,12 @@ + #ifndef __BSTRING_HPP__ + #define __BSTRING_HPP__ + +-#include <alloc.h> ++//#include <alloc.h> + #include <stdio.h> + #include <string.h> + #include <stdlib.h> +-#include <fstream.h> +-#include <iostream.h> ++#include <fstream> ++#include <iostream> + #include "dos_comp.h" + + ////////////////////////////////////////////////////////////////////////////// +@@ -127,12 +127,12 @@ + + //*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/ + +-inline ostream& operator << (ostream& output, b_string& str) ++inline std::ostream& operator << (std::ostream& output, b_string& str) + { + return output << (const char *) str; + } + +-istream& operator >> (istream& input, b_string& str); ++std::istream& operator >> (std::istream& input, b_string& str); + + //*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/ + +diff -ur libcabinet-0.30.org/cfcreate.cpp libcabinet-0.30/cfcreate.cpp +--- libcabinet-0.30.org/cfcreate.cpp 2009-07-24 15:41:19.273903021 +0200 ++++ libcabinet-0.30/cfcreate.cpp 2009-07-24 15:39:28.878904770 +0200 +@@ -10,7 +10,7 @@ + // Changes: Changed cfc_folderinfo::open function to return an error value. + // This is better than just dying if the compression failed to + // initiate. The cabinet_creator::new_folder function was updated to +-// take this error code into account. Removed cerr reference. ++// take this error code into account. Removed std::cerr reference. + + #ifndef __CFCREATE_CPP__ + #define __CFCREATE_CPP__ +@@ -32,7 +32,7 @@ + + ///////////////////////////////////////*************************************** + +-int cfc_fileinfo::write_entry(ostream& out) ++int cfc_fileinfo::write_entry(std::ostream& out) + { + struct file_fixed_header header; + +@@ -50,7 +50,7 @@ + ///////////////////////////////////////*************************************** + ///////////////////////////////////////*************************************** + +-int cfc_folderinfo::write_entry(ostream& out, dword hsize) ++int cfc_folderinfo::write_entry(std::ostream& out, dword hsize) + { + struct folder_fixed_header header; + +@@ -63,7 +63,7 @@ + + ///////////////////////////////////////*************************************** + +-int cfc_folderinfo::open(ostream& temp, dword soffset, word comptype, word fno, byte resrv_len, byte* resrv) ++int cfc_folderinfo::open(std::ostream& temp, dword soffset, word comptype, word fno, byte resrv_len, byte* resrv) + { + int r = OK; + +@@ -112,7 +112,7 @@ + #else + struct tm* ts = NULL; + #endif +- ifstream in(fname, ios::in | ios::binary); ++ std::ifstream in(fname, std::ios::in | std::ios::binary); + + if(!in) return FILE_OPEN_FAILURE; + +@@ -179,7 +179,7 @@ + // If enougth data was read to fill a block it will be returned through buf + // If operation fails, buf and/or buf_len return invalid data + +-int cfc_folderinfo::read_block(istream& in, byte* &buf, int& bytesread) ++int cfc_folderinfo::read_block(std::istream& in, byte* &buf, int& bytesread) + { + if(in.eof()) // If in is at the EOF + { +@@ -260,7 +260,7 @@ + + if((retval = compress_block(compdata, blockinfo.compressed_len, (byte *) data, datalen)) != OK) return retval; + +- // cout << compdata[0] << compdata[1] << endl; ++ // std::cout << compdata[0] << compdata[1] << std::endl; + + blockinfo.csum = CSUMCompute((byte *) &(blockinfo.compressed_len), + sizeof(blockinfo.compressed_len) +@@ -418,7 +418,7 @@ + + tmpnam(buf); + temp_file_name = buf; +- temp.open(buf, ios::in | ios::out | ios::binary | ios::trunc); ++ temp.open(buf, std::ios::in | std::ios::out | std::ios::binary | std::ios::trunc); + + if(!temp) // If open operation failed + { +@@ -467,7 +467,7 @@ + int cabinet_creator::close(const char* fname) + { + int retval = 0; +- ofstream out(fname, ios::out | ios::binary | ios::trunc); ++ std::ofstream out(fname, std::ios::out | std::ios::binary | std::ios::trunc); + + if(!out) + { +@@ -481,7 +481,7 @@ + + ///////////////////////////////////////*************************************** + +-int cabinet_creator::close(ostream& out) ++int cabinet_creator::close(std::ostream& out) + { + int retval = 0; + unsigned long header_size = sizeof(struct cabinet_fixed_header); +@@ -516,7 +516,7 @@ + delete fileq.Get(); // Delete folder entry + } + +- if(temp.seekg(0, ios::beg).fail()) return SEEK_ERROR; ++ if(temp.seekg(0, std::ios::beg).fail()) return SEEK_ERROR; + if((out << temp.rdbuf()).fail()) return WRITE_ERROR; + temp.close(); + +diff -ur libcabinet-0.30.org/cfcreate.h libcabinet-0.30/cfcreate.h +--- libcabinet-0.30.org/cfcreate.h 1999-10-24 13:29:53.000000000 +0200 ++++ libcabinet-0.30/cfcreate.h 2009-07-24 15:38:03.142876839 +0200 +@@ -142,7 +142,7 @@ + { + return sizeof(struct file_fixed_header) + strlen(name) + 1u; + } +- int write_entry(ostream& out); ++ int write_entry(std::ostream& out); + }; + + ////////////////////////////////////////////////////////////////////////////// +@@ -174,7 +174,7 @@ + word folderno; // This folder's number + + QueueOf<cfc_fileinfo> fileq; // Queue containing all added files +- ostream* tempfile; ++ std::ostream* tempfile; + byte* unprocessed_data; // Unprocessed data from last add_file(...) operation + word unprocessed_data_len; // Length of unprocessed data + unsigned long nbytes; // Number of bytes currently in folder +@@ -209,18 +209,18 @@ + } + protected: + int process_block(const byte* data, word datalen); +- int read_block(istream& in, byte* &buf, int& bytesread); ++ int read_block(std::istream& in, byte* &buf, int& bytesread); + int compress_block(byte* &dest, word &destlen, byte* src, word srclen); +- CHECKSUM cfc_folderinfo::CSUMCompute(byte* pb, unsigned cb, CHECKSUM seed); ++ CHECKSUM CSUMCompute(byte* pb, unsigned cb, CHECKSUM seed); + public: + cfc_folderinfo() { clear_variables(); } + virtual ~cfc_folderinfo() { free_buffers(); } + void reset() { free_buffers(); clear_variables(); } +- int open(ostream& temp, dword soffset, word comptype, word fno) ++ int open(std::ostream& temp, dword soffset, word comptype, word fno) + { + return open(temp, soffset, comptype, fno, 0, 0); + } +- int open(ostream& temp, dword soffset, word comptype, word fno, byte resrv_len, byte* resrv); ++ int open(std::ostream& temp, dword soffset, word comptype, word fno, byte resrv_len, byte* resrv); + int add_file(const char* fname); + int freeze(void); + void close(QueueOf<cfc_fileinfo> &cabfileq, unsigned long& size, unsigned long& hsize); +@@ -231,7 +231,7 @@ + unsigned long get_size() { return nbytes; } + const byte* get_reserved_area() { return (const byte *) reserved_area; } + unsigned long entry_size() { return sizeof(struct folder_fixed_header); } +- int write_entry(ostream& out, dword hsize); ++ int write_entry(std::ostream& out, dword hsize); + unsigned long get_processed_bytes() { return processed_bytes; } + }; + +@@ -266,7 +266,7 @@ + //byte* szDiskNext; // (optional) name of next disk + }; + protected: +- fstream temp; ++ std::fstream temp; + b_string temp_file_name; + QueueOf<cfc_folderinfo> folderq; + protected: +@@ -291,7 +291,7 @@ + int new_folder(word comptype); + int add_file(const char* fname); + int close(const char* fname); +- int close(ostream& out); ++ int close(std::ostream& out); + }; + + ////////////////////////////////////////////////////////////////////////////// +diff -ur libcabinet-0.30.org/cfdblock.cpp libcabinet-0.30/cfdblock.cpp +--- libcabinet-0.30.org/cfdblock.cpp 2009-07-24 15:41:19.273903021 +0200 ++++ libcabinet-0.30/cfdblock.cpp 2009-07-24 15:39:28.882903670 +0200 +@@ -17,14 +17,14 @@ + #ifndef __CFDBLOCK_CPP__ + #define __CFDBLOCK_CPP__ + +-#include <fstream.h> ++#include <fstream> + #include "cftypes.h" + #include "cfdblock.h" + #include "cfheader.h" + + ////////////////////////////////////////**************************************** + +-Error cabinet_datablock_fixed_header::read(istream& in) ++Error cabinet_datablock_fixed_header::read(std::istream& in) + { + return (in.read((char *) this, sizeof(*this)).bad()) + ? ((in.fail()) ? READ_ERROR : UNEXPECTED_EOF) : OK; +@@ -32,7 +32,7 @@ + + ////////////////////////////////////////**************************************** + +-Error cabinet_datablock_fixed_header::write(ostream& out) ++Error cabinet_datablock_fixed_header::write(std::ostream& out) + { + return (out.write((char *) this, sizeof(*this)).fail()) ? WRITE_ERROR : OK; + } +@@ -112,7 +112,7 @@ + + ///////////////////////////////////////*************************************** + +-int cabinet_datablock::read(istream& in, cabinet_header& cab_header) ++int cabinet_datablock::read(std::istream& in, cabinet_header& cab_header) + { + int err = OK; + +@@ -144,7 +144,7 @@ + + // Warning: as a safety measure this function computes and sets the checksum + +-int cabinet_datablock::write(ostream& out) ++int cabinet_datablock::write(std::ostream& out) + { + Error err = OK; + +diff -ur libcabinet-0.30.org/cfdblock.h libcabinet-0.30/cfdblock.h +--- libcabinet-0.30.org/cfdblock.h 1999-10-24 08:13:29.000000000 +0200 ++++ libcabinet-0.30/cfdblock.h 2009-07-24 15:38:03.142876839 +0200 +@@ -14,7 +14,7 @@ + #ifndef __CFDBLOCK_H__ + #define __CFDBLOCK_H__ + +-#include <fstream.h> ++#include <fstream> + #include "cftypes.h" + #include "cfheader.h" + +@@ -35,8 +35,8 @@ + ~cabinet_datablock_fixed_header() {} + + void clear() { clear_variables(); } +- Error read(istream& in); +- Error write(ostream& out); ++ Error read(std::istream& in); ++ Error write(std::ostream& out); + + dword get_checksum() { return csum; } + void set_checksum(dword c) { csum = c; } +@@ -77,8 +77,8 @@ + clear_variables(); + cabinet_datablock_fixed_header::clear(); + } +- int read(istream& in, cabinet_header& cab_header); +- int write(ostream& out); ++ int read(std::istream& in, cabinet_header& cab_header); ++ int write(std::ostream& out); + + int checksum_ok(void); + int checksum_not_ok(void); +diff -ur libcabinet-0.30.org/cffdrmgr.cpp libcabinet-0.30/cffdrmgr.cpp +--- libcabinet-0.30.org/cffdrmgr.cpp 1999-10-24 13:29:53.000000000 +0200 ++++ libcabinet-0.30/cffdrmgr.cpp 2009-07-24 15:39:28.882903670 +0200 +@@ -12,7 +12,7 @@ + #ifndef __CFFDRMGR_CPP__ + #define __CFFDRMGR_CPP__ + +-#include <fstream.h> ++#include <fstream> + #include "zlib.h" + #include "cftypes.h" + #include "cfdblock.h" +@@ -27,7 +27,7 @@ + // associated datablocks for this folder. Decompression is handled on the fly + // by this function. + +-int cabinet_folder_manager::extract_data(ostream& out, istream& in, ++int cabinet_folder_manager::extract_data(std::ostream& out, std::istream& in, + dword start, dword nbytes, + cabinet_header& cab_header) + { +@@ -83,7 +83,7 @@ + + // This function write data from a datablock to out. + +-int cabinet_folder_manager::write_data(ostream& out, cabinet_datablock& block, ++int cabinet_folder_manager::write_data(std::ostream& out, cabinet_datablock& block, + word offset, word nbytes, + COMPRESSION_STATE_FLAG state) + { +@@ -134,7 +134,7 @@ + byte* buf = new byte[block.get_uncompressed_size()]; + + stream->next_in = (byte *) block.get_compressed_data(); +- // cout << (stream->next_in)[0] << (stream->next_in)[1] << endl; ++ // std::cout << (stream->next_in)[0] << (stream->next_in)[1] << std::endl; + stream->avail_in = block.get_compressed_size(); + stream->next_out = buf; + stream->avail_out = block.get_uncompressed_size(); +diff -ur libcabinet-0.30.org/cffdrmgr.h libcabinet-0.30/cffdrmgr.h +--- libcabinet-0.30.org/cffdrmgr.h 1999-10-24 08:13:29.000000000 +0200 ++++ libcabinet-0.30/cffdrmgr.h 2009-07-24 15:38:03.142876839 +0200 +@@ -9,7 +9,7 @@ + #ifndef __CFFDRMGR_H__ + #define __CFFDRMGR_H__ + +-#include <fstream.h> ++#include <fstream> + #include "zlib.h" + #include "cftypes.h" + #include "cfdblock.h" +@@ -33,9 +33,9 @@ + public: + cabinet_folder_manager() { stream = NULL; } + ~cabinet_folder_manager() { if(stream != NULL) delete stream; } +- int extract_data(ostream& out, istream& in, dword start, ++ int extract_data(std::ostream& out, std::istream& in, dword start, + dword nbytes, cabinet_header& cab_header); +- int write_data(ostream& out, cabinet_datablock& block, word offset, ++ int write_data(std::ostream& out, cabinet_datablock& block, word offset, + word nbytes, COMPRESSION_STATE_FLAG state); + }; + +diff -ur libcabinet-0.30.org/cffile.cpp libcabinet-0.30/cffile.cpp +--- libcabinet-0.30.org/cffile.cpp 1999-10-24 08:13:29.000000000 +0200 ++++ libcabinet-0.30/cffile.cpp 2009-07-24 15:39:28.882903670 +0200 +@@ -17,14 +17,14 @@ + #ifndef __CFFILE_CPP__ + #define __CFFILE_CPP__ + +-#include <fstream.h> ++#include <fstream> + #include "cffile.h" + #include "cftypes.h" + #include "cfheader.h" + + ////////////////////////////////////////**************************************** + +-Error cabinet_file_fixed_header::read(istream& in) ++Error cabinet_file_fixed_header::read(std::istream& in) + { + return (in.read((char *) this, sizeof(*this)).bad()) + ? ((in.fail()) ? READ_ERROR : UNEXPECTED_EOF) : OK; +@@ -32,14 +32,14 @@ + + ////////////////////////////////////////**************************************** + +-Error cabinet_file_fixed_header::write(ostream& out) ++Error cabinet_file_fixed_header::write(std::ostream& out) + { + return (out.write((char *) this, sizeof(*this)).fail()) ? WRITE_ERROR : OK; + } + + ////////////////////////////////////////**************************************** + +-Error cabinet_file_header::read(istream& in) ++Error cabinet_file_header::read(std::istream& in) + { + Error err = OK; + +@@ -50,7 +50,7 @@ + + ////////////////////////////////////////**************************************** + +-Error cabinet_file_header::write(ostream& out) ++Error cabinet_file_header::write(std::ostream& out) + { + Error err = OK; + +diff -ur libcabinet-0.30.org/cffile.h libcabinet-0.30/cffile.h +--- libcabinet-0.30.org/cffile.h 2009-07-24 15:41:19.273903021 +0200 ++++ libcabinet-0.30/cffile.h 2009-07-24 15:38:03.146876438 +0200 +@@ -15,7 +15,7 @@ + #define __CFFILE_H__ + + #include <string.h> +-#include <fstream.h> ++#include <fstream> + #include "bstring.h" + #include "cftypes.h" + +@@ -67,8 +67,8 @@ + ~cabinet_file_fixed_header() {} + + void clear() { clear_variables(); } +- Error read(istream& in); +- Error write(ostream& out); ++ Error read(std::istream& in); ++ Error write(std::ostream& out); + + dword get_size() { return size; } + void set_size(dword len) { size = len; } +@@ -151,8 +151,8 @@ + clear_local_variables(); + cabinet_file_fixed_header::clear(); + } +- Error read(istream& in); +- Error write(ostream& out); ++ Error read(std::istream& in); ++ Error write(std::ostream& out); + + const char* get_name() { return (const char *) name; } + void set_name(const char* n) { name = n; } +diff -ur libcabinet-0.30.org/cffolder.cpp libcabinet-0.30/cffolder.cpp +--- libcabinet-0.30.org/cffolder.cpp 2009-07-24 15:41:19.277901711 +0200 ++++ libcabinet-0.30/cffolder.cpp 2009-07-24 15:39:28.886876450 +0200 +@@ -17,14 +17,14 @@ + #ifndef __CFFOLDER_CPP__ + #define __CFFOLDER_CPP__ + +-#include <fstream.h> ++#include <fstream> + #include "cftypes.h" + #include "cfheader.h" + #include "cffolder.h" + + ////////////////////////////////////////**************************************** + +-Error cabinet_folder_fixed_header::read(istream& in) ++Error cabinet_folder_fixed_header::read(std::istream& in) + { + return (in.read((char *) this, sizeof(*this)).bad()) + ? ((in.fail()) ? READ_ERROR : UNEXPECTED_EOF) : OK; +@@ -32,7 +32,7 @@ + + ////////////////////////////////////////**************************************** + +-Error cabinet_folder_fixed_header::write(ostream& out) ++Error cabinet_folder_fixed_header::write(std::ostream& out) + { + return (out.write((char *) this, sizeof(*this)).fail()) ? WRITE_ERROR : OK; + } +@@ -56,7 +56,7 @@ + + ////////////////////////////////////////**************************************** + +-Error cabinet_folder_header::read(istream& in, cabinet_header& cab_header) ++Error cabinet_folder_header::read(std::istream& in, cabinet_header& cab_header) + { + Error err = OK; + +@@ -82,7 +82,7 @@ + + ////////////////////////////////////////**************************************** + +-Error cabinet_folder_header::write(ostream& out) ++Error cabinet_folder_header::write(std::ostream& out) + { + Error err = OK; + +diff -ur libcabinet-0.30.org/cffolder.h libcabinet-0.30/cffolder.h +--- libcabinet-0.30.org/cffolder.h 2009-07-24 15:41:19.273903021 +0200 ++++ libcabinet-0.30/cffolder.h 2009-07-24 15:38:03.146876438 +0200 +@@ -15,7 +15,7 @@ + #define __CFFOLDER_H__ + + #include <string.h> +-#include <fstream.h> ++#include <fstream> + #include "cftypes.h" + #include "cfheader.h" + +@@ -40,8 +40,8 @@ + ~cabinet_folder_fixed_header() {} + + void clear() { clear_variables(); } +- Error read(istream& in); +- Error write(ostream& out); ++ Error read(std::istream& in); ++ Error write(std::ostream& out); + + dword get_data_offset() { return data_offset; } + void set_data_offset(dword offset) { data_offset = offset; } +@@ -77,8 +77,8 @@ + cabinet_folder_fixed_header::clear(); + } + void init(cabinet_header& cab_header); +- Error read(istream& in, cabinet_header& cab_header); +- Error write(ostream& out); ++ Error read(std::istream& in, cabinet_header& cab_header); ++ Error write(std::ostream& out); + + const byte* get_reserved_area() { return reserved_area; } + void set_reserved_area(const byte* newra) +diff -ur libcabinet-0.30.org/cfheader.cpp libcabinet-0.30/cfheader.cpp +--- libcabinet-0.30.org/cfheader.cpp 2009-07-24 15:41:19.277901711 +0200 ++++ libcabinet-0.30/cfheader.cpp 2009-07-24 15:39:28.886876450 +0200 +@@ -18,7 +18,7 @@ + #define __CFHEADER_CPP__ + + #include <string.h> +-#include <fstream.h> ++#include <fstream> + #include "bstring.h" + #include "cftypes.h" + #include "cfheader.h" +@@ -48,7 +48,7 @@ + + // Read the cabinet fixed header information from a input stream + +-Error cabinet_fixed_header::read(istream& in) <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libcabinet/libcabinet.spec?r1=1.17&r2=1.18&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
