From ed16ce5c67144d9f9934bec4cf0ff7e643197197 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 14 Jun 2010 18:45:50 +0000 Subject: [PATCH] 2010-06-14 20:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * external/minizip/minizip.dif * external/minizip/ioapi.h + Update for MS-DOS from Tamas Tevesz. - contrib/hbqt/qth/QSyntaxHighlighter.qth - Deleted to try to fix the SVN update breakage caused by deleting a file and readding it in the same commit on a Windows machine. * config/qnx/libs.mk + Added x11 libs. QNX supports it, though not the ancient release I have. --- harbour/ChangeLog | 14 +++ harbour/config/qnx/libs.mk | 3 + .../contrib/hbqt/qth/QSyntaxHighlighter.qth | 104 ------------------ harbour/external/minizip/ioapi.h | 3 +- harbour/external/minizip/minizip.dif | 7 +- 5 files changed, 23 insertions(+), 108 deletions(-) delete mode 100644 harbour/contrib/hbqt/qth/QSyntaxHighlighter.qth diff --git a/harbour/ChangeLog b/harbour/ChangeLog index cbe45faa93..d655092bb3 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,20 @@ The license applies to all entries newer than 2009-04-28. */ +2010-06-14 20:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * external/minizip/minizip.dif + * external/minizip/ioapi.h + + Update for MS-DOS from Tamas Tevesz. + + - contrib/hbqt/qth/QSyntaxHighlighter.qth + - Deleted to try to fix the SVN update breakage caused by + deleting a file and readding it in the same commit on a + Windows machine. + + * config/qnx/libs.mk + + Added x11 libs. QNX supports it, though not the ancient + release I have. + 2010-06-14 15:59 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * external/zlib/zlib.dif * external/zlib/gzguts.h diff --git a/harbour/config/qnx/libs.mk b/harbour/config/qnx/libs.mk index 73d65b691a..453ca7aac5 100644 --- a/harbour/config/qnx/libs.mk +++ b/harbour/config/qnx/libs.mk @@ -14,6 +14,9 @@ ifneq ($(HB_LINKING_RTL),) ifneq ($(HB_HAS_SLANG),) SYSLIBS += slang endif + ifneq ($(HB_HAS_X11),) + SYSLIBS += X11 + endif ifneq ($(HB_HAS_PCRE),) ifeq ($(HB_HAS_PCRE_LOCAL),) SYSLIBS += pcre diff --git a/harbour/contrib/hbqt/qth/QSyntaxHighlighter.qth b/harbour/contrib/hbqt/qth/QSyntaxHighlighter.qth deleted file mode 100644 index dec899cd72..0000000000 --- a/harbour/contrib/hbqt/qth/QSyntaxHighlighter.qth +++ /dev/null @@ -1,104 +0,0 @@ -/* - * $Id$ - */ - -/* - * Harbour Project source code: - * QT Source Generator for Harbour - * - * Copyright 2009 Pritpal Bedi - * www - http://www.harbour-project.org - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). - * - * As a special exception, the Harbour Project gives permission for - * additional uses of the text contained in its release of Harbour. - * - * The exception is that, if you link the Harbour libraries with other - * files to produce an executable, this does not by itself cause the - * resulting executable to be covered by the GNU General Public License. - * Your use of that executable is in no way restricted on account of - * linking the Harbour library code into it. - * - * This exception does not however invalidate any other reasons why - * the executable file might be covered by the GNU General Public License. - * - * This exception applies only to the code released by the Harbour - * Project under the name Harbour. If you copy code from other - * Harbour Project or Free Software Foundation releases into a copy of - * Harbour, as the General Public License permits, the exception does - * not apply to the code that you add in this way. To avoid misleading - * anyone as to the status of such modified files, you must delete - * this exception notice from them. - * - * If you write modifications of your own for Harbour, it is your choice - * whether to permit this exception to apply to your modifications. - * If you do not wish that, delete this exception notice. - * - */ -/*----------------------------------------------------------------------*/ -; -; Header File to Generate QT Wrapper Sources -; - - -QObject = -Inherits = QObject -Type = -New = - - - - - - -oSynHiliter := HBQSyntaxHighlighter():new( pObject ) -oSynHiliter := HBQSyntaxHighlighter():new( "QTextDocument", pQTextDocument ) -oSynHiliter := HBQSyntaxHighlighter():new( "QTextEdit", pQTextEdit ) - - - -#include -#include "../hbqt_hbqsyntaxhighlighter.h" - -/* - * QSyntaxHighlighter ( QObject * parent ) - * QSyntaxHighlighter ( QTextDocument * parent ) - * QSyntaxHighlighter ( QTextEdit * parent ) - * virtual ~QSyntaxHighlighter () - */ -HB_FUNC( QT_QSYNTAXHIGHLIGHTER ) -{ - -} - - - - - - - -QTextDocument * document () const -void setDocument ( QTextDocument * doc ) - - - - -void rehighlight () - - - - diff --git a/harbour/external/minizip/ioapi.h b/harbour/external/minizip/ioapi.h index ab743a057b..80c579ec36 100644 --- a/harbour/external/minizip/ioapi.h +++ b/harbour/external/minizip/ioapi.h @@ -49,7 +49,8 @@ defined( __MINGW32CE__ ) || \ defined( HB_OS_BSD ) || \ defined( HB_OS_DARWIN ) || \ - defined( HB_OS_HAIKU ) + defined( HB_OS_HAIKU ) || \ + defined( HB_OS_DOS ) # define USE_FILE32API #endif diff --git a/harbour/external/minizip/minizip.dif b/harbour/external/minizip/minizip.dif index cedb296dda..4f461126a1 100644 --- a/harbour/external/minizip/minizip.dif +++ b/harbour/external/minizip/minizip.dif @@ -144,8 +144,8 @@ diff -urN minizip.orig/ioapi.c minizip/ioapi.c pzlib_filefunc_def->zread_file = fread_file_func; diff -urN minizip.orig/ioapi.h minizip/ioapi.h --- minizip.orig/ioapi.h 2010-02-15 04:59:40.000000000 +0100 -+++ minizip/ioapi.h 2010-06-10 20:04:43.560219246 +0200 -@@ -21,29 +21,38 @@ ++++ minizip/ioapi.h 2010-06-14 20:35:11.840218016 +0200 +@@ -21,29 +21,39 @@ #ifndef _ZLIBIOAPI64_H #define _ZLIBIOAPI64_H @@ -194,7 +194,8 @@ diff -urN minizip.orig/ioapi.h minizip/ioapi.h + defined( __MINGW32CE__ ) || \ + defined( HB_OS_BSD ) || \ + defined( HB_OS_DARWIN ) || \ -+ defined( HB_OS_HAIKU ) ++ defined( HB_OS_HAIKU ) || \ ++ defined( HB_OS_DOS ) +# define USE_FILE32API +#endif +