diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 0b7782fe43..8294540658 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,15 @@ The license applies to all entries newer than 2009-04-28. */ +2010-06-25 08:46 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * external/libhpdf/Makefile + - external/libhpdf/libhpdf.dif + * external/patchup.prg + + Applied three patches sent to the list by Tamas Tevesz, + tweaking patchup tool and pcre metadata. + Pls check me, there was one hunk failure which I redid + manually. + 2010-06-25 03:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbide/hbide.hbp - contrib/hbide/resources/themesex.ui diff --git a/harbour/external/libhpdf/Makefile b/harbour/external/libhpdf/Makefile index d9e76d75fa..ae2ca58839 100644 --- a/harbour/external/libhpdf/Makefile +++ b/harbour/external/libhpdf/Makefile @@ -140,86 +140,85 @@ endif # ORIGIN http://libharu.org/ # VER 2.1.0 # URL http://libharu.org/files/libharu-2.1.0.tar.gz -# DIFF libhpdf.dif +# DIFF # # MAP README -# MAP hpdf_annotation.c hpdfanno.c -# MAP hpdf_array.c hpdfarra.c -# MAP hpdf_binary.c hpdfbina.c -# MAP hpdf_boolean.c hpdfbool.c -# MAP hpdf_catalog.c hpdfcata.c -# MAP hpdf_destination.c hpdfdest.c -# MAP hpdf_dict.c hpdfdict.c -# MAP hpdf_doc.c hpdfdoc.c -# MAP hpdf_doc_png.c hpdfdocp.c -# MAP hpdf_encoder.c hpdfenco.c -# MAP hpdf_encoder_cns.c hpdfencc.c -# MAP hpdf_encoder_cnt.c hpdfencn.c -# MAP hpdf_encoder_jp.c hpdfencj.c -# MAP hpdf_encoder_kr.c hpdfenck.c -# MAP hpdf_encrypt.c hpdfecy.c -# MAP hpdf_encryptdict.c hpdfecyd.c -# MAP hpdf_error.c hpdferro.c -# MAP hpdf_ext_gstate.c hpdfextg.c -# MAP hpdf_font.c hpdffont.c -# MAP hpdf_font_cid.c hpdffonc.c -# MAP hpdf_font_tt.c hpdffott.c -# MAP hpdf_font_type1.c hpdffon1.c -# MAP hpdf_fontdef.c hpdffdf.c -# MAP hpdf_fontdef_base14.c hpdffdfb.c -# MAP hpdf_fontdef_cid.c hpdffdfi.c -# MAP hpdf_fontdef_cns.c hpdffdfc.c -# MAP hpdf_fontdef_cnt.c hpdffdfn.c -# MAP hpdf_fontdef_jp.c hpdffdfj.c -# MAP hpdf_fontdef_kr.c hpdffdfk.c -# MAP hpdf_fontdef_tt.c hpdffdft.c -# MAP hpdf_fontdef_type1.c hpdffdf1.c -# MAP hpdf_gstate.c hpdfgsta.c -# MAP hpdf_image.c hpdfimag.c -# MAP hpdf_image_png.c hpdfimap.c -# MAP hpdf_info.c hpdfinfo.c -# MAP hpdf_list.c hpdflist.c -# MAP hpdf_mmgr.c hpdfmmgr.c -# MAP hpdf_name.c hpdfname.c -# MAP hpdf_null.c hpdfnull.c -# MAP hpdf_number.c hpdfnumb.c -# MAP hpdf_objects.c hpdfobje.c -# MAP hpdf_outline.c hpdfoutl.c -# MAP hpdf_page_label.c hpdfpage.c -# MAP hpdf_page_operator.c hpdfpago.c -# MAP hpdf_pages.c hpdfpags.c -# MAP hpdf_real.c hpdfreal.c -# MAP hpdf_streams.c hpdfstre.c -# MAP hpdf_string.c hpdfstri.c -# MAP hpdf_u3d.c hpdfu3d.c -# MAP hpdf_utils.c hpdfutil.c -# MAP hpdf_xref.c hpdfxref.c -# MAP hpdf.h -# MAP hpdf_annotation.h hpdfanno.h -# MAP hpdf_catalog.h hpdfcata.h -# MAP hpdf_conf.h hpdfconf.h -# MAP hpdf_config.h hpdfcfg.h -# MAP hpdf_consts.h hpdfcons.h -# MAP hpdf_destination.h hpdfdest.h -# MAP hpdf_doc.h hpdfdoc.h -# MAP hpdf_encoder.h hpdfenco.h -# MAP hpdf_encrypt.h hpdfencr.h -# MAP hpdf_encryptdict.h hpdfency.h -# MAP hpdf_error.h hpdferro.h -# MAP hpdf_ext_gstate.h hpdfextg.h -# MAP hpdf_font.h hpdffont.h -# MAP hpdf_fontdef.h hpdffond.h -# MAP hpdf_gstate.h hpdfgsta.h -# MAP hpdf_image.h hpdfimag.h -# MAP hpdf_info.h hpdfinfo.h -# MAP hpdf_list.h hpdflist.h -# MAP hpdf_mmgr.h hpdfmmgr.h -# MAP hpdf_objects.h hpdfobje.h -# MAP hpdf_outline.h hpdfoutl.h -# MAP hpdf_page_label.h hpdfpage.h -# MAP hpdf_pages.h hpdfpags.h -# MAP hpdf_streams.h hpdfstre.h -# MAP hpdf_types.h hpdftype.h -# MAP hpdf_u3d.h hpdfu3d.h -# MAP hpdf_utils.h hpdfutil.h -# MAP hpdf_version.h hpdfvers.h +# MAP src/hpdf_annotation.c hpdfanno.c +# MAP src/hpdf_array.c hpdfarra.c +# MAP src/hpdf_binary.c hpdfbina.c +# MAP src/hpdf_boolean.c hpdfbool.c +# MAP src/hpdf_catalog.c hpdfcata.c +# MAP src/hpdf_destination.c hpdfdest.c +# MAP src/hpdf_dict.c hpdfdict.c +# MAP src/hpdf_doc.c hpdfdoc.c +# MAP src/hpdf_doc_png.c hpdfdocp.c +# MAP src/hpdf_encoder.c hpdfenco.c +# MAP src/hpdf_encoder_cns.c hpdfencc.c +# MAP src/hpdf_encoder_cnt.c hpdfencn.c +# MAP src/hpdf_encoder_jp.c hpdfencj.c +# MAP src/hpdf_encoder_kr.c hpdfenck.c +# MAP src/hpdf_encrypt.c hpdfecy.c +# MAP src/hpdf_encryptdict.c hpdfecyd.c +# MAP src/hpdf_error.c hpdferro.c +# MAP src/hpdf_ext_gstate.c hpdfextg.c +# MAP src/hpdf_font.c hpdffont.c +# MAP src/hpdf_font_cid.c hpdffonc.c +# MAP src/hpdf_font_tt.c hpdffott.c +# MAP src/hpdf_font_type1.c hpdffon1.c +# MAP src/hpdf_fontdef.c hpdffdf.c +# MAP src/hpdf_fontdef_base14.c hpdffdfb.c +# MAP src/hpdf_fontdef_cid.c hpdffdfi.c +# MAP src/hpdf_fontdef_cns.c hpdffdfc.c +# MAP src/hpdf_fontdef_cnt.c hpdffdfn.c +# MAP src/hpdf_fontdef_jp.c hpdffdfj.c +# MAP src/hpdf_fontdef_kr.c hpdffdfk.c +# MAP src/hpdf_fontdef_tt.c hpdffdft.c +# MAP src/hpdf_fontdef_type1.c hpdffdf1.c +# MAP src/hpdf_gstate.c hpdfgsta.c +# MAP src/hpdf_image.c hpdfimag.c +# MAP src/hpdf_image_png.c hpdfimap.c +# MAP src/hpdf_info.c hpdfinfo.c +# MAP src/hpdf_list.c hpdflist.c +# MAP src/hpdf_mmgr.c hpdfmmgr.c +# MAP src/hpdf_name.c hpdfname.c +# MAP src/hpdf_null.c hpdfnull.c +# MAP src/hpdf_number.c hpdfnumb.c +# MAP src/hpdf_objects.c hpdfobje.c +# MAP src/hpdf_outline.c hpdfoutl.c +# MAP src/hpdf_page_label.c hpdfpage.c +# MAP src/hpdf_page_operator.c hpdfpago.c +# MAP src/hpdf_pages.c hpdfpags.c +# MAP src/hpdf_real.c hpdfreal.c +# MAP src/hpdf_streams.c hpdfstre.c +# MAP src/hpdf_string.c hpdfstri.c +# MAP src/hpdf_u3d.c hpdfu3d.c +# MAP src/hpdf_utils.c hpdfutil.c +# MAP src/hpdf_xref.c hpdfxref.c +# MAP include/hpdf.h hpdf.h +# MAP include/hpdf_annotation.h hpdfanno.h +# MAP include/hpdf_catalog.h hpdfcata.h +# MAP include/hpdf_conf.h hpdfconf.h +# MAP include/hpdf_consts.h hpdfcons.h +# MAP include/hpdf_destination.h hpdfdest.h +# MAP include/hpdf_doc.h hpdfdoc.h +# MAP include/hpdf_encoder.h hpdfenco.h +# MAP include/hpdf_encrypt.h hpdfencr.h +# MAP include/hpdf_encryptdict.h hpdfency.h +# MAP include/hpdf_error.h hpdferro.h +# MAP include/hpdf_ext_gstate.h hpdfextg.h +# MAP include/hpdf_font.h hpdffont.h +# MAP include/hpdf_fontdef.h hpdffond.h +# MAP include/hpdf_gstate.h hpdfgsta.h +# MAP include/hpdf_image.h hpdfimag.h +# MAP include/hpdf_info.h hpdfinfo.h +# MAP include/hpdf_list.h hpdflist.h +# MAP include/hpdf_mmgr.h hpdfmmgr.h +# MAP include/hpdf_objects.h hpdfobje.h +# MAP include/hpdf_outline.h hpdfoutl.h +# MAP include/hpdf_page_label.h hpdfpage.h +# MAP include/hpdf_pages.h hpdfpags.h +# MAP include/hpdf_streams.h hpdfstre.h +# MAP include/hpdf_types.h hpdftype.h +# MAP include/hpdf_u3d.h hpdfu3d.h +# MAP include/hpdf_utils.h hpdfutil.h +# MAP include/hpdf_version.h hpdfvers.h diff --git a/harbour/external/libhpdf/libhpdf.dif b/harbour/external/libhpdf/libhpdf.dif deleted file mode 100644 index fec2ed848f..0000000000 --- a/harbour/external/libhpdf/libhpdf.dif +++ /dev/null @@ -1,13 +0,0 @@ -diff -u ori\hpdf_config.h .\hpdf_config.h ---- ori\hpdf_config.h Thu Sep 10 10:02:45 2009 -+++ .\hpdf_config.h Mon Apr 12 21:36:13 2010 -@@ -34,7 +34,7 @@ - #undef HAVE_SYS_TYPES_H - - /* Define to 1 if you have the header file. */ --#define HAVE_UNISTD_H 1 -+#undef HAVE_UNISTD_H - - /* define pi */ - #ifndef M_PI -Only in .: ori diff --git a/harbour/external/patchup.prg b/harbour/external/patchup.prg index 8e6bd65f54..2e1b42a612 100644 --- a/harbour/external/patchup.prg +++ b/harbour/external/patchup.prg @@ -740,7 +740,7 @@ STATIC FUNCTION URL_GetFileName( cURL ) ENDIF cName := aComponents[ nIdx ] - cName := Left( cName, At( "?", cName ) - 1 ) /* strip params */ + cName := iif( "?" $ cName, Left( cName, At( "?", cName ) - 1 ), cName ) /* strip params */ DO WHILE !( "." $ cName ) cName := aComponents[ --nIdx ]