fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2010-06-14 20:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* 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.
This commit is contained in:
Viktor Szakats
2010-06-14 18:45:50 +00:00
parent fde8e82faf
commit ed16ce5c67
5 changed files with 23 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
harbour/ChangeLog
View File

@@ -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

3
harbour/config/qnx/libs.mk
View File

@@ -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

104
harbour/contrib/hbqt/qth/QSyntaxHighlighter.qth
View File

@@ -1,104 +0,0 @@
/*
* $Id$
*/
/*
* Harbour Project source code:
* QT Source Generator for Harbour
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* 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
;
<CLASS>
QObject =
Inherits = QObject
Type =
New =
</CLASS>
<SUBCLASS>
</SUBCLASS>
<DOC>
oSynHiliter := HBQSyntaxHighlighter():new( pObject )
oSynHiliter := HBQSyntaxHighlighter():new( "QTextDocument", pQTextDocument )
oSynHiliter := HBQSyntaxHighlighter():new( "QTextEdit", pQTextEdit )
</DOC>
<CODE>
#include <QtGui/QSyntaxHighlighter>
#include "../hbqt_hbqsyntaxhighlighter.h"
/*
* QSyntaxHighlighter ( QObject * parent )
* QSyntaxHighlighter ( QTextDocument * parent )
* QSyntaxHighlighter ( QTextEdit * parent )
* virtual ~QSyntaxHighlighter ()
*/
HB_FUNC( QT_QSYNTAXHIGHLIGHTER )
{
}
</CODE>
<ENUMS>
</ENUMS>
<PROTOS>
QTextDocument * document () const
void setDocument ( QTextDocument * doc )
</PROTOS>
<SLOTS>
void rehighlight ()
</SLOTS>
<SIGNALS>
</SIGNALS>

3
harbour/external/minizip/ioapi.h vendored
View File

@@ -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

7
harbour/external/minizip/minizip.dif vendored
View File

@@ -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
+