diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7c01d4c076..42c1a8cd58 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,29 @@ The license applies to all entries newer than 2009-04-28. */ +2011-03-05 19:34 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * debian/control + * Update. + * contrib/hbmzip/3rd/minizip/minizip.dif + * contrib/hbmzip/3rd/minizip/ioapi.h + ! Fixed type for haiku/beos. + ; [Tamas Tevesz] + + * contrib/hbxbp/xbpappevent.prg + ! Renamed XbpAppEventToQKeyEvent() to hbxbp_AppEventToQKeyEvent() + ; TOFIX: Demessify these public function names: + HBXBPAPPDESKTOP + HBXBP_APPEVENTTOQKEYEVENT + HBXBP_CLEAREVENTBUFFER + HBXBP_CONVERTAFACTFROMXBP + HBXBP_GETNEXTID + HBXBP_INITIALIZEEVENTBUFFER + HBXBP_SETEVENTLOOP + XBP_SETPRESPARAM + XBP_SETPRESPARAMIFNIL + XBP_XBPTOQTNAME + Probably HBXBP_ should be used consistently in all above. + 2011-03-05 15:41 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbexprb.c + enabled o:var += optimization when -ko switch is used diff --git a/harbour/contrib/hbmzip/3rd/minizip/ioapi.h b/harbour/contrib/hbmzip/3rd/minizip/ioapi.h index fa391ebf0f..c733f79f39 100644 --- a/harbour/contrib/hbmzip/3rd/minizip/ioapi.h +++ b/harbour/contrib/hbmzip/3rd/minizip/ioapi.h @@ -64,7 +64,7 @@ defined( HB_OS_VXWORKS ) || \ defined( HB_OS_BSD ) || \ defined( HB_OS_DARWIN ) || \ - defined( HB_OS_HAIKU ) || \ + defined( HB_OS_BEOS ) || \ defined( HB_OS_DOS ) || \ defined( HB_OS_OS2 ) || \ defined( HB_OS_CYGWIN ) || \ diff --git a/harbour/contrib/hbmzip/3rd/minizip/minizip.dif b/harbour/contrib/hbmzip/3rd/minizip/minizip.dif index 5318a5e192..22d19b5e44 100644 --- a/harbour/contrib/hbmzip/3rd/minizip/minizip.dif +++ b/harbour/contrib/hbmzip/3rd/minizip/minizip.dif @@ -1,6 +1,6 @@ diff -urN minizip.orig/crypt.h minizip/crypt.h ---- minizip.orig/crypt.h 2011-03-03 21:33:00.020930338 +0100 -+++ minizip/crypt.h 2011-03-03 21:33:00.020930338 +0100 +--- minizip.orig/crypt.h 2011-03-05 00:00:34.050927442 +0100 ++++ minizip/crypt.h 2011-03-05 00:00:34.050927442 +0100 @@ -38,6 +38,8 @@ * unpredictable manner on 16-bit systems; not a problem * with any known compiler so far, though */ @@ -11,8 +11,8 @@ diff -urN minizip.orig/crypt.h minizip/crypt.h return (int)(((temp * (temp ^ 1)) >> 8) & 0xff); } diff -urN minizip.orig/ioapi.c minizip/ioapi.c ---- minizip.orig/ioapi.c 2011-03-03 21:33:00.020930338 +0100 -+++ minizip/ioapi.c 2011-03-03 21:33:00.020930338 +0100 +--- minizip.orig/ioapi.c 2011-03-05 00:00:34.050927442 +0100 ++++ minizip/ioapi.c 2011-03-05 00:00:34.050927442 +0100 @@ -15,6 +15,7 @@ #endif @@ -143,8 +143,8 @@ diff -urN minizip.orig/ioapi.c minizip/ioapi.c pzlib_filefunc_def->zopen_file = fopen_file_func; pzlib_filefunc_def->zread_file = fread_file_func; diff -urN minizip.orig/ioapi.h minizip/ioapi.h ---- minizip.orig/ioapi.h 2011-03-03 21:33:00.030928894 +0100 -+++ minizip/ioapi.h 2011-03-03 21:33:00.030928894 +0100 +--- minizip.orig/ioapi.h 2011-03-05 00:00:34.060929341 +0100 ++++ minizip/ioapi.h 2011-03-05 00:00:34.060929341 +0100 @@ -21,29 +21,57 @@ #ifndef _ZLIBIOAPI64_H #define _ZLIBIOAPI64_H @@ -209,7 +209,7 @@ diff -urN minizip.orig/ioapi.h minizip/ioapi.h + defined( HB_OS_VXWORKS ) || \ + defined( HB_OS_BSD ) || \ + defined( HB_OS_DARWIN ) || \ -+ defined( HB_OS_HAIKU ) || \ ++ defined( HB_OS_BEOS ) || \ + defined( HB_OS_DOS ) || \ + defined( HB_OS_OS2 ) || \ + defined( HB_OS_CYGWIN ) || \ @@ -221,8 +221,8 @@ diff -urN minizip.orig/ioapi.h minizip/ioapi.h #define fopen64 fopen #define ftello64 ftell diff -urN minizip.orig/unzip.c minizip/unzip.c ---- minizip.orig/unzip.c 2011-03-03 21:33:00.080927820 +0100 -+++ minizip/unzip.c 2011-03-03 21:33:00.080927820 +0100 +--- minizip.orig/unzip.c 2011-03-05 00:00:34.090927497 +0100 ++++ minizip/unzip.c 2011-03-05 00:00:34.090927497 +0100 @@ -68,13 +68,17 @@ #include #include @@ -310,8 +310,8 @@ diff -urN minizip.orig/unzip.c minizip/unzip.c pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc; pfile_in_zip_read_info->crc32=0; diff -urN minizip.orig/zip.c minizip/zip.c ---- minizip.orig/zip.c 2011-03-03 21:33:00.130927025 +0100 -+++ minizip/zip.c 2011-03-03 21:33:00.130927025 +0100 +--- minizip.orig/zip.c 2011-03-05 00:00:34.140927217 +0100 ++++ minizip/zip.c 2011-03-05 00:00:34.140927217 +0100 @@ -29,16 +29,20 @@ #include "zlib.h" #include "zip.h" diff --git a/harbour/contrib/hbxbp/xbpappevent.prg b/harbour/contrib/hbxbp/xbpappevent.prg index 697bd0acf9..9d9bd50efc 100644 --- a/harbour/contrib/hbxbp/xbpappevent.prg +++ b/harbour/contrib/hbxbp/xbpappevent.prg @@ -169,7 +169,7 @@ STATIC FUNCTION hbqt_QTranslateKeyKP( kbm, key, shiftkey, altkey, controlkey, ; RETURN c -FUNCTION XbpQKeyEventToAppEvent( oKeyEvent ) +FUNCTION hbxbp_QKeyEventToAppEvent( oKeyEvent ) LOCAL c := 0 LOCAL key, kbm, txt, x diff --git a/harbour/debian/control b/harbour/debian/control index bb337f6f74..b0950b6fd7 100644 --- a/harbour/debian/control +++ b/harbour/debian/control @@ -2,8 +2,9 @@ Source: harbour Section: devel Priority: optional Maintainer: Luis Mayoral -Build-Depends: debhelper (>= 4.0.0), libsqlite3-dev, liballegro4.2-dev, - libbz2-dev, libcairo2-dev, libcups2-dev, libexpat1-dev, libfreeimage-dev, +Build-Depends: debhelper (>= 5.0.0), libjpeg62-dev, libpcre3-dev, + libpng12-dev, zlib1g-dev, libsqlite3-dev, liballegro4.2-dev, libbz2-dev, + libcairo2-dev, libcups2-dev, libexpat1-dev, libfreeimage-dev, libcurl4-openssl-dev | libcurl4-gnutls-dev, firebird2.0-dev | firebird2.1-dev, libgd2-noxpm-dev | libgd2-xpm-dev, libmagic-dev, libmysqlclient-dev, unixodbc-dev, libpq-dev, libqt4-dev, qt4-dev-tools, libssl-dev,