Author: qboosh Date: Sun Oct 10 11:07:58 2010 GMT Module: packages Tag: HEAD ---- Log message: - updated to 3.1.1 (new soname, no libxerces-depdom) - updated iso88592 patch - removed obsolete link,opt,lib64 patches - added (new) link patch to avoid unnecessary -lnsl
---- Files affected: packages/xerces-c: xerces-c-iso88592.patch (1.7 -> 1.8) , xerces-c-link.patch (1.2 -> 1.3) , xerces-c.spec (1.39 -> 1.40) , xerces-c-lib64.patch (1.2 -> NONE) (REMOVED), xerces-c-opt.patch (1.5 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/xerces-c/xerces-c-iso88592.patch diff -u packages/xerces-c/xerces-c-iso88592.patch:1.7 packages/xerces-c/xerces-c-iso88592.patch:1.8 --- packages/xerces-c/xerces-c-iso88592.patch:1.7 Fri Feb 10 15:02:59 2006 +++ packages/xerces-c/xerces-c-iso88592.patch Sun Oct 10 13:07:53 2010 @@ -1,26 +1,21 @@ -diff -uNr xercesc/src/xercesc/util/Makefile.in xercesc/src/xercesc/util.new/Makefile.in ---- xercesc/src/xercesc/util/Makefile.in Fri Feb 7 01:53:51 2003 -+++ xercesc/src/xercesc/util.new/Makefile.in Wed Apr 30 23:50:16 2003 -@@ -506,7 +506,8 @@ - XMLUTF8Transcoder.hpp \ - XMLWin1252Transcoder.hpp \ - XML256TableTranscoder.hpp \ -- XML88591Transcoder.hpp -+ XML88591Transcoder.hpp \ -+ XML88592Transcoder.hpp - - UTIL_CPP_PRIVHEADERS = - -@@ -573,7 +574,8 @@ - XMLUTF8Transcoder.$(TO) \ - XMLWin1252Transcoder.$(TO) \ - XML256TableTranscoder.$(TO) \ -- XML88591Transcoder.$(TO) -+ XML88591Transcoder.$(TO) \ -+ XML88592Transcoder.$(TO) - - - all:: includes $(UTIL_CPP_OBJECTS) platforms transcoders \ +--- xerces-c-3.1.1/src/Makefile.am.orig 2009-11-23 09:17:49.000000000 +0100 ++++ xerces-c-3.1.1/src/Makefile.am 2010-10-10 09:23:01.247741882 +0200 +@@ -682,6 +682,7 @@ + xercesc/util/XMemory.hpp \ + xercesc/util/XML256TableTranscoder.hpp \ + xercesc/util/XML88591Transcoder.hpp \ ++ xercesc/util/XML88592Transcoder.hpp \ + xercesc/util/XMLAbstractDoubleFloat.hpp \ + xercesc/util/XMLASCIITranscoder.hpp \ + xercesc/util/XMLBigDecimal.hpp \ +@@ -764,6 +765,7 @@ + xercesc/util/XMemory.cpp \ + xercesc/util/XML256TableTranscoder.cpp \ + xercesc/util/XML88591Transcoder.cpp \ ++ xercesc/util/XML88592Transcoder.cpp \ + xercesc/util/XMLAbstractDoubleFloat.cpp \ + xercesc/util/XMLASCIITranscoder.cpp \ + xercesc/util/XMLBigDecimal.cpp \ diff -uNr xercesc/src/xercesc/util/TransService.cpp xercesc/src/xercesc/util.new/TransService.cpp --- xercesc/src/xercesc/util/TransService.cpp Fri Feb 7 01:54:05 2003 +++ xercesc/src/xercesc/util.new/TransService.cpp Wed Apr 30 23:36:53 2003 @@ -58,7 +53,7 @@ diff -uNr xercesc/src/xercesc/util/XML88592Transcoder.cpp xercesc/src/xercesc/util.new/XML88592Transcoder.cpp --- xercesc/src/xercesc/util/XML88592Transcoder.cpp Thu Jan 1 01:00:00 1970 +++ xercesc/src/xercesc/util.new/XML88592Transcoder.cpp Thu May 1 00:00:20 2003 -@@ -0,0 +1,329 @@ +@@ -0,0 +1,330 @@ +/* + * The Apache Software License, Version 1.1 + * @@ -258,7 +253,7 @@ +// XML88592Transcoder: Constructors and Destructor +// --------------------------------------------------------------------------- +XML88592Transcoder::XML88592Transcoder( const XMLCh* const encodingName -+ , const unsigned int blockSize ++ , const XMLSize_t blockSize + , MemoryManager* const manager) : + + XMLTranscoder(encodingName, blockSize) @@ -274,12 +269,12 @@ +// --------------------------------------------------------------------------- +// XML88592Transcoder: Implementation of the transcoder API +// --------------------------------------------------------------------------- -+unsigned int ++XMLSize_t +XML88592Transcoder::transcodeFrom( const XMLByte* const srcData -+ , const unsigned int srcCount ++ , const XMLSize_t srcCount + , XMLCh* const toFill -+ , const unsigned int maxChars -+ , unsigned int& bytesEaten ++ , const XMLSize_t maxChars ++ , XMLSize_t& bytesEaten + , unsigned char* const charSizes) +{ + // If debugging, make sure that the block size is legal @@ -291,7 +286,7 @@ + // Calculate the max chars we can do here. Its the lesser of the + // max output chars and the number of bytes in the source. + // -+ const unsigned int countToDo = srcCount < maxChars ? srcCount : maxChars; ++ const XMLSize_t countToDo = srcCount < maxChars ? srcCount : maxChars; + + // + // Loop through the bytes to do and convert over each byte. Its just @@ -312,12 +307,12 @@ +} + + -+unsigned int ++XMLSize_t +XML88592Transcoder::transcodeTo(const XMLCh* const srcData -+ , const unsigned int srcCount ++ , const XMLSize_t srcCount + , XMLByte* const toFill -+ , const unsigned int maxBytes -+ , unsigned int& charsEaten ++ , const XMLSize_t maxBytes ++ , XMLSize_t& charsEaten + , const UnRepOpts options) +{ + // If debugging, make sure that the block size is legal @@ -329,7 +324,7 @@ + // Calculate the max chars we can do here. Its the lesser of the + // max output bytes and the number of chars in the source. + // -+ const unsigned int countToDo = srcCount < maxBytes ? srcCount : maxBytes; ++ const XMLSize_t countToDo = srcCount < maxBytes ? srcCount : maxBytes; + + // + // Loop through the bytes to do and convert over each byte. Its just @@ -357,14 +352,15 @@ + // + if (options == UnRep_Throw) + { -+ XMLCh tmpBuf[16]; -+ XMLString::binToText((unsigned int)*srcPtr, tmpBuf, 16, 16); -+ ThrowXML2 ++ XMLCh tmpBuf[17]; ++ XMLString::binToText((unsigned int)*srcPtr, tmpBuf, 16, 16, getMemoryManager()); ++ ThrowXMLwithMemMgr2 + ( + TranscodingException + , XMLExcepts::Trans_Unrepresentable + , tmpBuf + , getEncodingName() ++ , getMemoryManager() + ); + } + *destPtr++ = 0x1A; @@ -379,7 +375,7 @@ +} + + -+bool XML88592Transcoder::canTranscodeTo(const unsigned int toCheck) const ++bool XML88592Transcoder::canTranscodeTo(const unsigned int toCheck) +{ + if (toCheck>=sizeof(utf_iso8859_2))return false; + if (utf_iso8859_2[toCheck]!=0)return true; @@ -473,8 +469,8 @@ + XML88592Transcoder + ( + const XMLCh* const encodingName -+ , const unsigned int blockSize -+ , MemoryManager* const manager ++ , const XMLSize_t blockSize ++ , MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager + ); + + virtual ~XML88592Transcoder(); @@ -486,27 +482,27 @@ + virtual unsigned int transcodeFrom + ( + const XMLByte* const srcData -+ , const unsigned int srcCount ++ , const XMLSize_t srcCount + , XMLCh* const toFill -+ , const unsigned int maxChars -+ , unsigned int& bytesEaten ++ , const XMLSize_t maxChars ++ , XMLSize_t& bytesEaten + , unsigned char* const charSizes + ); + -+ virtual unsigned int transcodeTo ++ virtual XMLSize_t transcodeTo + ( + const XMLCh* const srcData -+ , const unsigned int srcCount ++ , const XMLSize_t srcCount + , XMLByte* const toFill -+ , const unsigned int maxBytes -+ , unsigned int& charsEaten ++ , const XMLSize_t maxBytes ++ , XMLSize_t& charsEaten + , const UnRepOpts options + ); + + virtual bool canTranscodeTo + ( + const unsigned int toCheck -+ ) const; ++ ); + + +private : @@ -514,7 +510,7 @@ + // Unimplemented constructors and operators + // ----------------------------------------------------------------------- + XML88592Transcoder(const XML88592Transcoder&); -+ void operator=(const XML88592Transcoder&); ++ XML88592Transcoder& operator=(const XML88592Transcoder&); +}; + +XERCES_CPP_NAMESPACE_END ================================================================ Index: packages/xerces-c/xerces-c-link.patch diff -u packages/xerces-c/xerces-c-link.patch:1.2 packages/xerces-c/xerces-c-link.patch:1.3 --- packages/xerces-c/xerces-c-link.patch:1.2 Wed Sep 5 15:38:11 2007 +++ packages/xerces-c/xerces-c-link.patch Sun Oct 10 13:07:53 2010 @@ -1,11 +1,13 @@ ---- xerces-c-src_2_7_0/obj/Makefile.in~ 2005-09-07 17:56:58.000000000 +0200 -+++ xerces-c-src_2_7_0/obj/Makefile.in 2006-02-10 15:28:23.543075250 +0100 -@@ -158,7 +158,7 @@ - ${MAKE_SHARED} ${LD_SODEPDOM} -o $...@} ${^} $(TEMPLATESOBJS) $(PLATFORM_LIBRARIES) $(DEPDOM_LINK_OPTIONS) $(ALLLIBS) ${LIB}/${LIBNAME}${VER}${OS390SIDEDECK} - $(CP) ${LIBDEPDOM}${VER}${OS390SIDEDECK} ${LIB} - else -- ${MAKE_SHARED} ${LD_SODEPDOM} -o $...@} ${^} $(TEMPLATESOBJS) $(PLATFORM_LIBRARIES) $(DEPDOM_LINK_OPTIONS) $(ALLLIBS) -L${LIB} -l${LINK_LIBNAME} -+ ${MAKE_SHARED} ${LD_SODEPDOM} -o $...@} ${^} $(TEMPLATESOBJS) $(PLATFORM_LIBRARIES) $(DEPDOM_LINK_OPTIONS) -L${LIB} -l${LINK_LIBNAME} $(ALLLIBS) - endif - endif - ifneq (${FQ_SO_DEPDOM},${FQ_REAL_DEPDOM}) +--- xerces-c-3.1.1/m4/xerces_netaccessor_selection.m4.orig 2009-11-12 06:57:31.000000000 +0100 ++++ xerces-c-3.1.1/m4/xerces_netaccessor_selection.m4 2010-10-10 10:08:42.231734339 +0200 +@@ -26,8 +26,8 @@ + if test x"$network" = xyes; then + + # Checks for libraries. +- AC_CHECK_LIB([socket], [socket]) +- AC_CHECK_LIB([nsl], [gethostbyname]) ++ AC_SEARCH_LIBS([socket], [socket]) ++ AC_SEARCH_LIBS([gethostbyname], [nsl]) + + ###################################################### + # Test for availability of each netaccessor on this host. ================================================================ Index: packages/xerces-c/xerces-c.spec diff -u packages/xerces-c/xerces-c.spec:1.39 packages/xerces-c/xerces-c.spec:1.40 --- packages/xerces-c/xerces-c.spec:1.39 Mon Sep 29 21:53:52 2008 +++ packages/xerces-c/xerces-c.spec Sun Oct 10 13:07:53 2010 @@ -1,34 +1,35 @@ # $Revision$, $Date$ -%define ver %(echo %{version} | tr . _) -Summary: XML parser -Summary(pl.UTF-8): Analizator składniowy XML-a +Summary: Xerces C++ - XML parser for C++ +Summary(pl.UTF-8): Xerces C++ - analizator składniowy XML-a dla C++ Name: xerces-c -Version: 2.8.0 -Release: 3 -License: Apache -Group: Applications/Publishing/XML -Source0: http://www.apache.org/dist/xerces/c/sources/%{name}-src_%{ver}.tar.gz -# Source0-md5: 5daf514b73f3e0de9e3fce704387c0d2 +Version: 3.1.1 +Release: 1 +License: Apache v2.0 +Group: Libraries +Source0: http://www.apache.org/dist/xerces/c/3/sources/%{name}-%{version}.tar.gz +# Source0-md5: 6a8ec45d83c8cfb1584c5a5345cb51ae Patch0: %{name}-iso88592.patch Patch1: %{name}-link.patch -Patch2: %{name}-opt.patch -Patch3: %{name}-lib64.patch -URL: http://xml.apache.org/ -BuildRequires: autoconf +URL: http://xerces.apache.org/xerces-c/ +BuildRequires: autoconf >= 2.60 +BuildRequires: automake +BuildRequires: curl-devel BuildRequires: libstdc++-devel +BuildRequires: libtool BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -XML parser. +Xerces C++ - XML parser for C++. %description -l pl.UTF-8 -Analizator składniowy XML-a. +Xerces C++ - analizator składniowy XML-a dla C++. %package devel Summary: Header files for xerces-c library Summary(pl.UTF-8): Pliki nagłówkowe biblioteki xerces-c Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: curl-devel Requires: libstdc++-devel %description devel @@ -37,60 +38,71 @@ %description devel -l pl.UTF-8 Pliki nagłówkowe biblioteki xerces-c. +%package static +Summary: Static xerces-c library +Summary(pl.UTF-8): Statyczna biblioteka xerces-c +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} + +%description static +Static xerces-c library. + +%description static -l pl.UTF-8 +Statyczna biblioteka xerces-c. + %package doc -Summary: Extensive xerces-c documentation -Summary(pl.UTF-8): Obszerna dokumentacja biblioteki xerces-c +Summary: Extensive Xerces C++ documentation +Summary(pl.UTF-8): Obszerna dokumentacja biblioteki Xerces C++ Group: Documentation Requires: %{name} = %{version}-%{release} %description doc -Extensive xerces-c documentation. +Extensive Xerces C++ documentation. %description doc -l pl.UTF-8 -Obszerna dokumentacja biblioteki xerces-c. +Obszerna dokumentacja biblioteki Xerces C++. %package examples -Summary: xerces-c examples -Summary(pl.UTF-8): Przykłady do biblioteki xerces-c +Summary: Xerces C++ examples +Summary(pl.UTF-8): Przykłady do biblioteki Xerces C++ Group: Documentation Requires: %{name} = %{version}-%{release} %description examples -xerces-c examples. +Xerces C++ examples. %description examples -l pl.UTF-8 -Przykłady do biblioteki xerces-c. +Przykłady do biblioteki Xerces C++. %prep -%setup -q -n %{name}-src_%{ver} +%setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%if "%{_lib}" == "lib64" -%patch3 -p1 -%endif %build -## What a shit!!! -XERCESCROOT=`pwd`; export XERCESCROOT -cd src/xercesc +%{__libtoolize} +%{__aclocal} -I m4 %{__autoconf} -chmod 755 runConfigure -./runConfigure -plinux -cgcc -xg++ -minmem -nsocket -tnative -rpthread \ - -z%(echo %{rpmcflags} | sed -e 's/\(.\) \+\(.\)/\1 -z\2/g') +%{__autoheader} +%{__automake} +%configure \ + --disable-pretty-make \ +%ifnarch pentium4 %{x8664} + --disable-sse2 +%endif -%{__make} -j1 +%{__make} %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} install -d $RPM_BUILD_ROOT%{_docdir}/%{name}-doc-%{version} -%{__make} -C src/xercesc install \ - XERCESCROOT=`pwd` \ - PREFIX=%{_prefix} \ +%{__make} install \ DESTDIR=$RPM_BUILD_ROOT +find samples -name .deps | xargs -r rm -rf +find samples -name '*.o' -o -name .dirstamp | xargs rm -f cp -a samples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} cp -a doc/html/* $RPM_BUILD_ROOT%{_docdir}/%{name}-doc-%{version} @@ -102,17 +114,19 @@ %files %defattr(644,root,root,755) -%doc LICENSE.txt credits.txt -%attr(755,root,root) %{_libdir}/libxerces-c.so.*.* -%attr(755,root,root) %ghost %{_libdir}/libxerces-c.so.28 -%attr(755,root,root) %{_libdir}/libxerces-depdom.so.*.* -%attr(755,root,root) %ghost %{_libdir}/libxerces-depdom.so.28 +%doc CREDITS LICENSE NOTICE +%attr(755,root,root) %{_libdir}/libxerces-c-3.1.so %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libxerces-c.so -%attr(755,root,root) %{_libdir}/libxerces-depdom.so +%{_libdir}/libxerces-c.la %{_includedir}/xercesc +%{_pkgconfigdir}/xerces-c.pc + +%files static +%defattr(644,root,root,755) +%{_libdir}/libxerces-c.a %files doc %defattr(644,root,root,755) @@ -120,6 +134,22 @@ %files examples %defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/CreateDOMDocument +%attr(755,root,root) %{_bindir}/DOMCount +%attr(755,root,root) %{_bindir}/DOMPrint +%attr(755,root,root) %{_bindir}/EnumVal +%attr(755,root,root) %{_bindir}/MemParse +%attr(755,root,root) %{_bindir}/PParse +%attr(755,root,root) %{_bindir}/PSVIWriter +%attr(755,root,root) %{_bindir}/Redirect +%attr(755,root,root) %{_bindir}/SAX2Count +%attr(755,root,root) %{_bindir}/SAX2Print +%attr(755,root,root) %{_bindir}/SAXCount +%attr(755,root,root) %{_bindir}/SAXPrint +%attr(755,root,root) %{_bindir}/SCMPrint +%attr(755,root,root) %{_bindir}/SEnumVal +%attr(755,root,root) %{_bindir}/StdInParse +%attr(755,root,root) %{_bindir}/XInclude %{_examplesdir}/%{name}-%{version} %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -128,6 +158,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.40 2010/10/10 11:07:53 qboosh +- updated to 3.1.1 (new soname, no libxerces-depdom) +- updated iso88592 patch +- removed obsolete link,opt,lib64 patches +- added (new) link patch to avoid unnecessary -lnsl + Revision 1.39 2008/09/29 19:53:52 qboosh - desc fixes - killed x86-centrism ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xerces-c/xerces-c-iso88592.patch?r1=1.7&r2=1.8&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xerces-c/xerces-c-link.patch?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xerces-c/xerces-c.spec?r1=1.39&r2=1.40&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit