Changeset 29366 for main/trunk
- Timestamp:
- 2014-10-13T16:55:46+13:00 (10 years ago)
- Location:
- main/trunk/greenstone2/build-src/packages
- Files:
-
- 1 added
- 4 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/build-src/packages/Makefile
r27776 r29366 38 38 39 39 PACKAGEDIRS += rtftohtml/rtftohtml_src pdftohtml/pdftohtml_gs \ 40 wget/wget-1.1 3.4cpan/XML-Parser-2.41 \40 wget/wget-1.15-gs cpan/XML-Parser-2.41 \ 41 41 xlhtml/xlhtml-0.4.9.0 isis-gdl html-tidy/tidy 42 42 -
main/trunk/greenstone2/build-src/packages/Makefile.in
r27776 r29366 38 38 39 39 PACKAGEDIRS += rtftohtml/rtftohtml_src pdftohtml/pdftohtml_gs \ 40 wget/wget-1.1 3.4cpan/XML-Parser-2.41 \40 wget/wget-1.15-gs cpan/XML-Parser-2.41 \ 41 41 xlhtml/xlhtml-0.4.9.0 isis-gdl html-tidy/tidy 42 42 -
main/trunk/greenstone2/build-src/packages/configure
r27799 r29366 208 208 echo "" 209 209 cd "$PACKAGES/wget" 210 gzip -dc wget .tar.gz | tar -xf -210 gzip -dc wget-1.15-gs.tar.gz | tar -xf - 211 211 if test x$crossOS = "xandroid" ; 212 212 then … … 216 216 fi 217 217 218 cd "$PACKAGES/wget/wget-1.1 3.4" && \218 cd "$PACKAGES/wget/wget-1.15-gs" && \ 219 219 #./configure $CACHE_FILE --prefix=$PACKAGES/wget --with-ssl=openssl --bindir="$bindir" -disable-nls $HOSTTARGETFLAGS $wget_extraargs 220 220 ./configure $CACHE_FILE --prefix=$PACKAGES/wget --without-ssl --bindir="$bindir" -disable-nls $HOSTTARGETFLAGS $wget_extraargs -
main/trunk/greenstone2/build-src/packages/wget/README
r29365 r29366 6 6 The GNU wget homepage is http://www.cg.tuwien.ac.at/~prikryl/wget.html 7 7 8 A couple of very small changes were made to this package by Stefan Boddie8 1) A couple of very small changes were made to this package by Stefan Boddie 9 9 ([email protected]). The USE_STDARG preprocessor definition was 10 10 added to the VC++ makefile as it appeared to need it to compile on either … … 12 12 mistakenly being converted to "@5c" on windows. 13 13 14 2 003/11/27 - [email protected] made a few more small changes to fix14 2) 2003/11/27 - [email protected] made a few more small changes to fix 15 15 h_errno bug preventing code from compiling on latest versions of GCC. 16 16 17 2004/06/30 - [email protected] replaced version 1.5.3 with version 1.9.17 3) 2004/06/30 - [email protected] replaced version 1.5.3 with version 1.9. 18 18 It compiled as is under Windows XP, using VC++ 6.0, under Linux using GCC 3.2.3 19 19 and GCC 2.95.3. So I haven't made any changes. … … 24 24 it in. 25 25 26 2008/07/03 - [email protected] replaced version 1.9 with version 1.11.4.26 4) 2008/07/03 - [email protected] replaced version 1.9 with version 1.11.4. 27 27 Version 1.9 didn't compile statically with the new libraries which come with 28 28 fedora, so upgrading. Had to apply the patch at … … 34 34 35 35 36 2013/01/09 - [email protected] Make minor change to src/Makefile.in so the code compiles under minGW cross-compiler running on Linux36 5) 2013/01/09 - [email protected] Make minor change to src/Makefile.in so the code compiles under minGW cross-compiler running on Linux 37 37 diff -r wget-1.13.4/src/Makefile.in wget-1.13.4.MINGW/src/Makefile.in 38 38 1136a1137,1143 … … 45 45 > 46 46 47 2013/01/29 - [email protected] added some #ifdef __ANDROID__ blocks into src/util.c to cope with the fact that this OS lacks localeconv()47 6) 2013/01/29 - [email protected] added some #ifdef __ANDROID__ blocks into src/util.c to cope with the fact that this OS lacks localeconv() 48 48 49 49 diff wget-1.13.4-orig/src/utils.c wget-1.13.4-gs/src/utils.c … … 57 57 > #endif 58 58 59 7) 2014/10/13 - ak19 60 Moved to wget version 1.15. 61 Only the changes numbered 5 and 6 above have been ported into it, following Dr Bainbridge's instructions, as there were both changes made to the previous wget version Greenstone used (1.13.4). 62 The wget tar file name (wget-1.15-gs) now indicates the version number and that it has been modified by Greenstone, so the Makefile and configure file in build-src/packages/ have been updated to reflect this. 63
Note:
See TracChangeset
for help on using the changeset viewer.