Commit Graph

54575 Commits

Author SHA1 Message Date
michael
0c3f0c5682 * Merging revisions 45202 from trunk:
------------------------------------------------------------------------
    r45202 | michael | 2020-05-01 14:16:47 +0200 (Fri, 01 May 2020) | 1 line
    
    * Always initialize autoincvalue in createdataset
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@45203 -
2020-05-01 12:17:16 +00:00
michael
9c83b6b8e7 * Merging revisions r45047 from trunk:
------------------------------------------------------------------------
    r45047 | michael | 2020-04-24 07:41:19 +0200 (Fri, 24 Apr 2020) | 1 line
    
    * V2 may not contain error object
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@45200 -
2020-05-01 10:37:36 +00:00
michael
561a02b4e1 * Merging revisions r45190 from trunk:
------------------------------------------------------------------------
    r45190 | michael | 2020-04-30 15:39:07 +0200 (Thu, 30 Apr 2020) | 1 line
    
    * Fix from Ondrej Pokorny to fix reading large TIFFs (bug ID 36998)
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@45194 -
2020-04-30 16:24:00 +00:00
michael
6166daf414 * Merging revisions 45189,45192 from trunk:
------------------------------------------------------------------------
    r45189 | michael | 2020-04-30 12:43:03 +0200 (Thu, 30 Apr 2020) | 1 line
    
    * Avoid errors when dataset is not active while constructing update SQL.
    ------------------------------------------------------------------------
    r45192 | michael | 2020-04-30 18:20:16 +0200 (Thu, 30 Apr 2020) | 1 line
    
    * Fix clearing of arrays and recursive definitions for arrays
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@45193 -
2020-04-30 16:23:46 +00:00
marco
85e6640553 --- Merging r43182 into '.':
U    compiler/dbgdwarf.pas
--- Recording mergeinfo for merge of r43182 into '.':
 U   .

# revisions: 43182

git-svn-id: branches/fixes_3_2@45074 -
2020-04-25 16:06:26 +00:00
svenbarth
364db85ec9 Merged revision(s) 44887 from trunk:
* fix WinAPI directive: the purpose is to present the OS' default calling convention which for Windows means stdcall (at least on those platforms that support stdcall) on other platforms it is cdecl (for now)
........

git-svn-id: branches/fixes_3_2@45070 -
2020-04-25 14:08:12 +00:00
michael
d2deae41f2 * Merging revisions r44373 from trunk:
------------------------------------------------------------------------
    r44373 | michael | 2020-03-27 07:28:20 +0100 (Fri, 27 Mar 2020) | 1 line
    
    * Remove debug statements
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@45049 -
2020-04-24 07:07:04 +00:00
michael
97f098786c * Merging revisions 44775 from trunk:
------------------------------------------------------------------------
    r44775 | michael | 2020-04-18 12:36:03 +0200 (Sat, 18 Apr 2020) | 1 line
    
    * Fix bug #36851: Content-Length header needs to be removed if automatically added
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@45048 -
2020-04-24 07:04:58 +00:00
marco
47edf85831 --- Merging r44845 into '.':
U    packages/rtl-extra/src/inc/sockets.inc
--- Recording mergeinfo for merge of r44845 into '.':
 U   .

# revisions: 44845

git-svn-id: branches/fixes_3_2@44880 -
2020-04-20 11:41:46 +00:00
svenbarth
c3f5006c86 Merged revision(s) 43769 from trunk:
* fixed output of line numbers/columns with -vR
........

git-svn-id: branches/fixes_3_2@44874 -
2020-04-19 21:11:37 +00:00
marco
b087c236b5 # revisions: 44457,44777
git-svn-id: branches/fixes_3_2@44865 -
2020-04-19 18:20:20 +00:00
marco
32b4647870 # revisions: 44443,44667,44714,44724
git-svn-id: branches/fixes_3_2@44864 -
2020-04-19 18:13:59 +00:00
marco
8250336193 # revisions: 44496,44529,44632,44635,44643,44644,44664
git-svn-id: branches/fixes_3_2@44863 -
2020-04-19 18:06:48 +00:00
Jonas Maebe
89025f241c --- Merging r42501 into '.':
U    packages/cocoaint/src/AVFoundation.pas
U    packages/cocoaint/src/AVKit.pas
U    packages/cocoaint/src/Accounts.pas
U    packages/cocoaint/src/AddressBook.pas
U    packages/cocoaint/src/AppKit.pas
U    packages/cocoaint/src/AppleScriptObjC.pas
U    packages/cocoaint/src/AudioVideoBridging.pas
U    packages/cocoaint/src/Automator.pas
U    packages/cocoaint/src/CFOpenDirectory.pas
U    packages/cocoaint/src/CalendarStore.pas
U    packages/cocoaint/src/CloudKit.pas
U    packages/cocoaint/src/CocoaAll.pas
U    packages/cocoaint/src/Collaboration.pas
U    packages/cocoaint/src/CoreAudio.pas
U    packages/cocoaint/src/CoreAudioKit.pas
U    packages/cocoaint/src/CoreBluetooth.pas
U    packages/cocoaint/src/CoreData.pas
U    packages/cocoaint/src/CoreImage.pas
U    packages/cocoaint/src/CoreLocation.pas
U    packages/cocoaint/src/CoreMedia.pas
U    packages/cocoaint/src/CoreMediaIO.pas
U    packages/cocoaint/src/CoreVideo.pas
U    packages/cocoaint/src/CryptoTokenKit.pas
U    packages/cocoaint/src/DefinedClassesAVFoundation.pas
U    packages/cocoaint/src/DefinedClassesAVKit.pas
U    packages/cocoaint/src/DefinedClassesAccounts.pas
U    packages/cocoaint/src/DefinedClassesAddressBook.pas
U    packages/cocoaint/src/DefinedClassesAppKit.pas
U    packages/cocoaint/src/DefinedClassesAppleScriptObjC.pas
U    packages/cocoaint/src/DefinedClassesAudioVideoBridging.pas
U    packages/cocoaint/src/DefinedClassesAutomator.pas
U    packages/cocoaint/src/DefinedClassesCFOpenDirectory.pas
U    packages/cocoaint/src/DefinedClassesCalendarStore.pas
U    packages/cocoaint/src/DefinedClassesCloudKit.pas
U    packages/cocoaint/src/DefinedClassesCollaboration.pas
U    packages/cocoaint/src/DefinedClassesCoreAudio.pas
U    packages/cocoaint/src/DefinedClassesCoreAudioKit.pas
U    packages/cocoaint/src/DefinedClassesCoreBluetooth.pas
U    packages/cocoaint/src/DefinedClassesCoreData.pas
U    packages/cocoaint/src/DefinedClassesCoreImage.pas
U    packages/cocoaint/src/DefinedClassesCoreLocation.pas
U    packages/cocoaint/src/DefinedClassesCoreMedia.pas
U    packages/cocoaint/src/DefinedClassesCoreMediaIO.pas
U    packages/cocoaint/src/DefinedClassesCoreVideo.pas
U    packages/cocoaint/src/DefinedClassesCryptoTokenKit.pas
U    packages/cocoaint/src/DefinedClassesEventKit.pas
U    packages/cocoaint/src/DefinedClassesFinderSync.pas
U    packages/cocoaint/src/DefinedClassesFoundation.pas
U    packages/cocoaint/src/DefinedClassesGLKit.pas
U    packages/cocoaint/src/DefinedClassesGameController.pas
U    packages/cocoaint/src/DefinedClassesGameKit.pas
U    packages/cocoaint/src/DefinedClassesIOBluetooth.pas
U    packages/cocoaint/src/DefinedClassesIOBluetoothUI.pas
U    packages/cocoaint/src/DefinedClassesImageCaptureCore.pas
U    packages/cocoaint/src/DefinedClassesImageKit.pas
U    packages/cocoaint/src/DefinedClassesInputMethodKit.pas
U    packages/cocoaint/src/DefinedClassesInstallerPlugins.pas
U    packages/cocoaint/src/DefinedClassesInstantMessage.pas
U    packages/cocoaint/src/DefinedClassesLocalAuthentication.pas
U    packages/cocoaint/src/DefinedClassesMapKit.pas
U    packages/cocoaint/src/DefinedClassesMediaAccessibility.pas
U    packages/cocoaint/src/DefinedClassesMediaLibrary.pas
U    packages/cocoaint/src/DefinedClassesMultipeerConnectivity.pas
U    packages/cocoaint/src/DefinedClassesNotificationCenter.pas
U    packages/cocoaint/src/DefinedClassesOSAKit.pas
U    packages/cocoaint/src/DefinedClassesOpenDirectory.pas
U    packages/cocoaint/src/DefinedClassesPDFKit.pas
U    packages/cocoaint/src/DefinedClassesPreferencePanes.pas
U    packages/cocoaint/src/DefinedClassesPubSub.pas
U    packages/cocoaint/src/DefinedClassesQTKit.pas
U    packages/cocoaint/src/DefinedClassesQuartzComposer.pas
U    packages/cocoaint/src/DefinedClassesQuartzCore.pas
U    packages/cocoaint/src/DefinedClassesQuartzFilters.pas
U    packages/cocoaint/src/DefinedClassesQuickLook.pas
U    packages/cocoaint/src/DefinedClassesQuickLookUI.pas
U    packages/cocoaint/src/DefinedClassesSceneKit.pas
U    packages/cocoaint/src/DefinedClassesScreenSaver.pas
U    packages/cocoaint/src/DefinedClassesScriptingBridge.pas
U    packages/cocoaint/src/DefinedClassesSecurityFoundation.pas
U    packages/cocoaint/src/DefinedClassesSecurityInterface.pas
U    packages/cocoaint/src/DefinedClassesServiceManagement.pas
U    packages/cocoaint/src/DefinedClassesSocial.pas
U    packages/cocoaint/src/DefinedClassesSpriteKit.pas
U    packages/cocoaint/src/DefinedClassesStoreKit.pas
U    packages/cocoaint/src/DefinedClassesSyncServices.pas
U    packages/cocoaint/src/DefinedClassesWebKit.pas
U    packages/cocoaint/src/DefinedClassesiTunesLibrary.pas
U    packages/cocoaint/src/EventKit.pas
U    packages/cocoaint/src/FinderSync.pas
U    packages/cocoaint/src/Foundation.pas
U    packages/cocoaint/src/GLKit.pas
U    packages/cocoaint/src/GameController.pas
U    packages/cocoaint/src/GameKit.pas
U    packages/cocoaint/src/IOBluetooth.pas
U    packages/cocoaint/src/IOBluetoothUI.pas
U    packages/cocoaint/src/ImageCaptureCore.pas
U    packages/cocoaint/src/ImageKit.pas
U    packages/cocoaint/src/InputMethodKit.pas
U    packages/cocoaint/src/InstallerPlugins.pas
U    packages/cocoaint/src/InstantMessage.pas
U    packages/cocoaint/src/LocalAuthentication.pas
U    packages/cocoaint/src/MapKit.pas
U    packages/cocoaint/src/MediaAccessibility.pas
U    packages/cocoaint/src/MediaLibrary.pas
U    packages/cocoaint/src/MultipeerConnectivity.pas
U    packages/cocoaint/src/NotificationCenter.pas
U    packages/cocoaint/src/OSAKit.pas
U    packages/cocoaint/src/OpenDirectory.pas
U    packages/cocoaint/src/PDFKit.pas
U    packages/cocoaint/src/PreferencePanes.pas
U    packages/cocoaint/src/PubSub.pas
U    packages/cocoaint/src/QTKit.pas
U    packages/cocoaint/src/QuartzComposer.pas
U    packages/cocoaint/src/QuartzCore.pas
U    packages/cocoaint/src/QuartzFilters.pas
U    packages/cocoaint/src/QuickLook.pas
U    packages/cocoaint/src/QuickLookUI.pas
U    packages/cocoaint/src/SceneKit.pas
U    packages/cocoaint/src/ScreenSaver.pas
U    packages/cocoaint/src/ScriptingBridge.pas
U    packages/cocoaint/src/SecurityFoundation.pas
U    packages/cocoaint/src/SecurityInterface.pas
U    packages/cocoaint/src/ServiceManagement.pas
U    packages/cocoaint/src/Social.pas
U    packages/cocoaint/src/SpriteKit.pas
U    packages/cocoaint/src/StoreKit.pas
U    packages/cocoaint/src/SyncServices.pas
U    packages/cocoaint/src/WebKit.pas
U    packages/cocoaint/src/addressbook/ABAddressBook.inc
U    packages/cocoaint/src/appkit/NSAnimation.inc
U    packages/cocoaint/src/appkit/NSApplication.inc
U    packages/cocoaint/src/appkit/NSArrayController.inc
U    packages/cocoaint/src/appkit/NSBitmapImageRep.inc
U    packages/cocoaint/src/appkit/NSBox.inc
U    packages/cocoaint/src/appkit/NSClipView.inc
U    packages/cocoaint/src/appkit/NSColorList.inc
U    packages/cocoaint/src/appkit/NSColorWell.inc
U    packages/cocoaint/src/appkit/NSComboBoxCell.inc
U    packages/cocoaint/src/appkit/NSControl.inc
U    packages/cocoaint/src/appkit/NSController.inc
U    packages/cocoaint/src/appkit/NSCursor.inc
U    packages/cocoaint/src/appkit/NSDatePickerCell.inc
U    packages/cocoaint/src/appkit/NSDictionaryController.inc
U    packages/cocoaint/src/appkit/NSDocument.inc
U    packages/cocoaint/src/appkit/NSFont.inc
U    packages/cocoaint/src/appkit/NSFontPanel.inc
U    packages/cocoaint/src/appkit/NSGestureRecognizer.inc
U    packages/cocoaint/src/appkit/NSImage.inc
U    packages/cocoaint/src/appkit/NSImageCell.inc
U    packages/cocoaint/src/appkit/NSImageRep.inc
U    packages/cocoaint/src/appkit/NSImageView.inc
U    packages/cocoaint/src/appkit/NSLayoutManager.inc
U    packages/cocoaint/src/appkit/NSMenu.inc
U    packages/cocoaint/src/appkit/NSMenuItem.inc
U    packages/cocoaint/src/appkit/NSMenuItemCell.inc
U    packages/cocoaint/src/appkit/NSMenuView.inc
U    packages/cocoaint/src/appkit/NSNib.inc
U    packages/cocoaint/src/appkit/NSObjectController.inc
U    packages/cocoaint/src/appkit/NSPageController.inc
U    packages/cocoaint/src/appkit/NSPanGestureRecognizer.inc
U    packages/cocoaint/src/appkit/NSPopUpButton.inc
U    packages/cocoaint/src/appkit/NSRulerMarker.inc
U    packages/cocoaint/src/appkit/NSScrollView.inc
U    packages/cocoaint/src/appkit/NSScroller.inc
U    packages/cocoaint/src/appkit/NSSearchFieldCell.inc
U    packages/cocoaint/src/appkit/NSSliderCell.inc
U    packages/cocoaint/src/appkit/NSSpellChecker.inc
U    packages/cocoaint/src/appkit/NSStatusBar.inc
U    packages/cocoaint/src/appkit/NSTabView.inc
U    packages/cocoaint/src/appkit/NSTabViewItem.inc
U    packages/cocoaint/src/appkit/NSTableColumn.inc
U    packages/cocoaint/src/appkit/NSTextContainer.inc
U    packages/cocoaint/src/appkit/NSTextFieldCell.inc
U    packages/cocoaint/src/appkit/NSToolbar.inc
U    packages/cocoaint/src/appkit/NSToolbarItem.inc
U    packages/cocoaint/src/appkit/NSTreeController.inc
U    packages/cocoaint/src/appkit/NSUserDefaultsController.inc
U    packages/cocoaint/src/appkit/NSView.inc
U    packages/cocoaint/src/appkit/NSWindow.inc
U    packages/cocoaint/src/appkit/NSWindowController.inc
U    packages/cocoaint/src/automator/AMWorkflowController.inc
U    packages/cocoaint/src/automator/AMWorkflowView.inc
U    packages/cocoaint/src/coredata/NSBatchUpdateRequest.inc
U    packages/cocoaint/src/coredata/NSEntityDescription.inc
U    packages/cocoaint/src/coredata/NSEntityMapping.inc
U    packages/cocoaint/src/coredata/NSFetchRequestExpression.inc
U    packages/cocoaint/src/coredata/NSManagedObjectContext.inc
U    packages/cocoaint/src/coredata/NSManagedObjectModel.inc
U    packages/cocoaint/src/coredata/NSMappingModel.inc
U    packages/cocoaint/src/coredata/NSPersistentStore.inc
U    packages/cocoaint/src/coredata/NSPersistentStoreCoordinator.inc
U    packages/cocoaint/src/coredata/NSPropertyDescription.inc
U    packages/cocoaint/src/coredata/NSPropertyMapping.inc
U    packages/cocoaint/src/foundation/InlineFunctions.inc
U    packages/cocoaint/src/foundation/NSProxy.inc
U    packages/cocoaint/src/iTunesLibrary.pas
--- Recording mergeinfo for merge of r42501 into '.':
 U   .

git-svn-id: branches/fixes_3_2@44841 -
2020-04-19 10:42:57 +00:00
Jonas Maebe
947f6825c9 --- Merging r43485 into '.':
U    compiler/systems/t_bsd.pas
--- Recording mergeinfo for merge of r43485 into '.':
 U   .

git-svn-id: branches/fixes_3_2@44732 -
2020-04-16 17:09:03 +00:00
pierre
a4758f3560 Merge commit #43305 into fixes branch.
------------------------------------------------------------------------
r43305 | pierre | 2019-10-23 06:38:10 +0000 (Wed, 23 Oct 2019) | 1 line

 Completely disable Round functions if FPUNONE is defined, to fix avr builds without flaot support
------------------------------------------------------------------------
--- Merging r43305 into '.':
U    rtl/inc/iso7185.pp
--- Recording mergeinfo for merge of r43305 into '.':
 U   .

git-svn-id: branches/fixes_3_2@44701 -
2020-04-12 13:13:41 +00:00
pierre
e3a9cad8d5 Merge commit #44108 into fixes branch.
------------------------------------------------------------------------
r44108 | pierre | 2020-02-03 22:35:25 +0000 (Mon, 03 Feb 2020) | 1 line

 Fix invalid typecast revealed by -CriotR option
------------------------------------------------------------------------
--- Merging r44108 into '.':
U    compiler/ncnv.pas
--- Recording mergeinfo for merge of r44108 into '.':
 U   .

git-svn-id: branches/fixes_3_2@44680 -
2020-04-10 20:57:02 +00:00
Jonas Maebe
5c417b9211 --- Merging r44395 into '.':
U    compiler/utils/fpc.pp
--- Recording mergeinfo for merge of r44395 into '.':
 U   .

git-svn-id: branches/fixes_3_2@44434 -
2020-03-30 19:01:58 +00:00
michael
525d1c5ed5 * Merging revisions 44429 from trunk:
------------------------------------------------------------------------
    r44429 | michael | 2020-03-30 11:26:02 +0200 (Mon, 30 Mar 2020) | 1 line
    
    * Patch from Bart Broersma to fix bug ID #36809	
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@44430 -
2020-03-30 09:57:29 +00:00
ondrej
227f408df9 Merge revisions: r44040, r43881, r43700, r43699, r43698, r43602
Revision: 44040
Author: ondrej
Date: Sonntag, 26. Januar 2020 18:49:08
Message:
fcl-db: allow 0 length in binary field (MSSQL can have a null/0 field length in a view)
----
Modified : /trunk/packages/fcl-db/src/base/fields.inc

Revision: 43881
Author: ondrej
Date: Dienstag, 7. Januar 2020 10:41:20
Message:
odbc: fix international column names
----
Modified : /trunk/packages/fcl-db/src/sqldb/odbc/odbcconn.pas
Modified : /trunk/packages/fcl-db/src/sqldb/sqldb.pp

Revision: 43700
Author: ondrej
Date: Donnerstag, 19. Dezember 2019 18:43:34
Message:
sqldb: odbc: use ANSI codepage for connection as default
----
Modified : /trunk/packages/fcl-db/src/sqldb/odbc/odbcconn.pas

Revision: 43699
Author: ondrej
Date: Donnerstag, 19. Dezember 2019 17:54:36
Message:
sqldb: odbc: send SQL to ODBC as WideString to support FPC 3.0.x character conversion
----
Modified : /trunk/packages/fcl-db/src/sqldb/odbc/odbcconn.pas

Revision: 43698
Author: ondrej
Date: Donnerstag, 19. Dezember 2019 17:41:57
Message:
odbc: fix passing ANSI parameters with FPC character conversion
----
Modified : /trunk/packages/fcl-db/src/sqldb/odbc/odbcconn.pas

Revision: 43602
Author: ondrej
Date: Donnerstag, 28. November 2019 13:59:13
Message:
fcl-db: ODBC: allow NULL parameters (TParam.Value := Null sets type to ftUnknown)
----
Modified : /trunk/packages/fcl-db/src/sqldb/odbc/odbcconn.pas

git-svn-id: branches/fixes_3_2@44391 -
2020-03-29 06:46:42 +00:00
ondrej
6b3a22efb5 Merge revision: r43294
Author: ondrej
Date: Montag, 21. Oktober 2019 19:28:27
Message:
fcl-image: make test compile
----
Modified : /trunk/packages/fcl-image/test/tcbarcodes.pp
Modified : /trunk/packages/fcl-image/test/testfpimage.lpr

git-svn-id: branches/fixes_3_2@44390 -
2020-03-29 06:34:44 +00:00
pierre
a77f220a51 ------------------------------------------------------------------------
r41140 | pierre | 2019-01-30 10:48:21 +0000 (Wed, 30 Jan 2019) | 1 line

 Fix cycling of arm compiler starting with release ppcarm 3.0.4
------------------------------------------------------------------------
--- Merging r41140 into '.':
U    rtl/arm/setjump.inc
--- Recording mergeinfo for merge of r41140 into '.':
 U   .

git-svn-id: branches/fixes_3_2@44375 -
2020-03-27 21:49:47 +00:00
Jonas Maebe
8ef53e60e2 --- Merging r41136 into '.':
U    rtl/arm/setjump.inc
--- Recording mergeinfo for merge of r41136 into '.':
 U   .

git-svn-id: branches/fixes_3_2@44365 -
2020-03-26 21:33:22 +00:00
Jonas Maebe
d73b4e1e81 --- Merging r42509 into '.':
U    packages/cocoaint/fpmake.pp
--- Recording mergeinfo for merge of r42509 into '.':
 U   .

git-svn-id: branches/fixes_3_2@44327 -
2020-03-21 15:42:17 +00:00
pierre
660a061030 Merge of commit 44311 and 44314 from trunk branch
------------------------------------------------------------------------
r44311 | pierre | 2020-03-19 13:30:36 +0000 (Thu, 19 Mar 2020) | 1 line

Restore usage of revision.inc file, but do not print date and revision information into generated Makefile's
------------------------------------------------------------------------
--- Merging r44311 into '.':
U    utils/fpcm/fpcmmain.pp
U    utils/fpcm/fpcmwr.pp
--- Recording mergeinfo for merge of r44311 into '.':
 U   .
------------------------------------------------------------------------
r44314 | pierre | 2020-03-20 07:51:17 +0000 (Fri, 20 Mar 2020) | 1 line

 Commit generated change to revision.inc file following commit #44311
------------------------------------------------------------------------
--- Merging r44314 into '.':
U    utils/fpcm/revision.inc
--- Recording mergeinfo for merge of r44314 into '.':
 G   .

git-svn-id: branches/fixes_3_2@44315 -
2020-03-20 08:48:50 +00:00
marco
b2dedf8aec --- Merging r43469 into '.':
U    packages/fcl-pdf/src/fppdf.pp
--- Recording mergeinfo for merge of r43469 into '.':
 U   .
--- Merging r43470 into '.':
G    packages/fcl-pdf/src/fppdf.pp
--- Recording mergeinfo for merge of r43470 into '.':
 G   .
--- Merging r43471 into '.':
G    packages/fcl-pdf/src/fppdf.pp
--- Recording mergeinfo for merge of r43471 into '.':
 G   .

# revisions: 43469,43470,43471

git-svn-id: branches/fixes_3_2@44308 -
2020-03-17 14:38:55 +00:00
marco
6d1a81ffde --- Recording mergeinfo for merge of r44225 into '.':
G   .

# revisions: 44225

git-svn-id: branches/fixes_3_2@44307 -
2020-03-17 09:36:47 +00:00
pierre
0710825bda Merge of commit 43189 from trunk branch
as merge of 43188 seems to generate troubles with
  testsuite database.

------------------------------------------------------------------------
r43189 | florian | 2019-10-13 11:42:33 +0000 (Sun, 13 Oct 2019) | 1 line

  * sorted out tests
------------------------------------------------------------------------
--- Merging r43189 into '.':
U    tests/webtbs/tw34848.pp
D    tests/webtbs/tw40850.pp
--- Recording mergeinfo for merge of r43189 into '.':
 U   .

git-svn-id: branches/fixes_3_2@44306 -
2020-03-16 21:50:24 +00:00
marco
626c2b52c0 # revisions: 40850,41429,43188,43281,43282,43283,43801
git-svn-id: branches/fixes_3_2@44301 -
2020-03-14 16:08:36 +00:00
marco
7b1408640e --- Merging r43290 into '.':
U    packages/fcl-image/src/freetype.pp
--- Recording mergeinfo for merge of r43290 into '.':
 U   .
--- Merging r43291 into '.':
G    packages/fcl-image/src/freetype.pp
--- Recording mergeinfo for merge of r43291 into '.':
 G   .
--- Merging r43292 into '.':
U    packages/fcl-image/src/libfreetype.inc
--- Recording mergeinfo for merge of r43292 into '.':
 G   .
--- Merging r43293 into '.':
U    packages/fcl-image/examples/textout.pp
G    packages/fcl-image/src/freetype.pp
U    packages/fcl-image/src/ftfont.pp
--- Recording mergeinfo for merge of r43293 into '.':
 G   .
--- Merging r43334 into '.':
U    packages/fcl-image/src/freetypehdyn.pp
--- Recording mergeinfo for merge of r43334 into '.':
 G   .
--- Merging r43335 into '.':
U    packages/fcl-image/src/fphelper.inc
--- Recording mergeinfo for merge of r43335 into '.':
 G   .
--- Merging r43420 into '.':
U    packages/rtl-generics/src/inc/generics.dictionaries.inc
--- Recording mergeinfo for merge of r43420 into '.':
 G   .

# revisions: 43290,43291,43292,43293,43334,43335,43420

git-svn-id: branches/fixes_3_2@44300 -
2020-03-14 15:56:48 +00:00
marco
c06a8ad7bb # revisions: 44262
git-svn-id: branches/fixes_3_2@44299 -
2020-03-14 15:25:47 +00:00
marco
913dd3190f # revisions: 43950,44275,44276,44277,44278,44280,44282,44290
git-svn-id: branches/fixes_3_2@44298 -
2020-03-14 15:22:22 +00:00
marco
e7d6528f14 * allow 3.2.0 for bootstrapping instead of 3.0.2.
git-svn-id: branches/fixes_3_2@44267 -
2020-03-06 12:21:33 +00:00
marco
8a2da3c007 --- Merging r44258 into '.':
U    rtl/win/wininc/struct.inc
--- Recording mergeinfo for merge of r44258 into '.':
 U   .
--- Merging r44259 into '.':
U    packages/winunits-base/src/commctrl.pp
U    packages/winunits-base/src/nb30.pp
--- Recording mergeinfo for merge of r44259 into '.':
 G   .
--- Merging r44260 into '.':
G    packages/winunits-base/src/commctrl.pp
--- Recording mergeinfo for merge of r44260 into '.':
 G   .

# revisions: 44258,44259,44260

git-svn-id: branches/fixes_3_2@44263 -
2020-03-04 09:37:16 +00:00
pierre
eec778bcd5 Merge of commit 44246 from trunk branch
+ other fixes to packages/*/fpmake.pp with wrong versions.
  Fixes shortsrc target in fixes_3_2 branch.
------------------------------------------------------------------------
r44246 | pierre | 2020-02-27 07:32:00 +0000 (Thu, 27 Feb 2020) | 3 lines

  * Fix sourcezip make target, correcting mixed case input file names.


------------------------------------------------------------------------
--- Merging r44246 into '.':
U    packages/ide/fpmake.pp
U    packages/libgbafpc/fpmake.pp
U    packages/libndsfpc/fpmake.pp
U    packages/vcl-compat/fpmake.pp
--- Recording mergeinfo for merge of r44246 into '.':
 U   .

git-svn-id: branches/fixes_3_2@44247 -
2020-02-27 16:52:50 +00:00
Jonas Maebe
e1d37acf20 --- Merging r44231 into '.':
U    packages/cocoaint/src/foundation/NSExtensionContext.inc

git-svn-id: branches/fixes_3_2@44232 -
2020-02-22 16:23:14 +00:00
joost
313ff530ff --- Merging (from foreign repository) r44152 into '.':
U    fpmake.pp
U    packages/fpmake.pp
U    packages/ide/fpmake.pp
--- Merging (from foreign repository) r44154 into '.':
G    packages/ide/fpmake.pp

git-svn-id: branches/fixes_3_2@44229 -
2020-02-21 14:50:44 +00:00
joost
4b06ea7fe7 --- Merging (from foreign repository) r44090 into '.':
U    rtl/unix/sysutils.pp

git-svn-id: branches/fixes_3_2@44228 -
2020-02-21 14:49:57 +00:00
joost
6704b5fa9f --- Merging (from foreign repository) r44089 into '.':
U    packages/fcl-web/src/base/fphttpserver.pp

git-svn-id: branches/fixes_3_2@44227 -
2020-02-21 14:49:20 +00:00
joost
2e864e6bb7 --- Merging (from foreign repository) r44088 into '.':
U    packages/fcl-net/src/netdb.pp

git-svn-id: branches/fixes_3_2@44226 -
2020-02-21 14:48:42 +00:00
joost
1a56efc159 --- Merging (from foreign repository) r44221 into '.':
U    utils/tply/fpmake.pp

git-svn-id: branches/fixes_3_2@44225 -
2020-02-21 14:39:43 +00:00
joost
46d8498a7a --- Merging (from foreign repository) r44183 into '.':
U    packages/fppkg/src/fprepos.pp

git-svn-id: branches/fixes_3_2@44224 -
2020-02-21 14:17:45 +00:00
marco
8172b79be1 --- Merging r44055 into '.':
U    compiler/ncnv.pas
--- Recording mergeinfo for merge of r44055 into '.':
 U   .
--- Merging r44098 into '.':
G    compiler/ncnv.pas
--- Recording mergeinfo for merge of r44098 into '.':
 G   .
--- Merging r44099 into '.':
G    compiler/ncnv.pas
--- Recording mergeinfo for merge of r44099 into '.':
 G   .

# revisions: 44055,44098,44099

git-svn-id: branches/fixes_3_2@44223 -
2020-02-21 11:37:26 +00:00
joost
fd191a9d57 --- Merging r44193 into '.':
U    utils/fppkg/fppkg.pp
--- Recording mergeinfo for merge of r44193 into '.':
 U   .

git-svn-id: branches/fixes_3_2@44214 -
2020-02-18 22:30:10 +00:00
joost
8efb6f8970 --- Merging r41184 into '.':
U    compiler/utils/samplecfg
U    utils/fpcmkcfg/fppkg.cfg
U    utils/fpcmkcfg/fppkg.inc
--- Recording mergeinfo for merge of r41184 into '.':
 U   .

git-svn-id: branches/fixes_3_2@44213 -
2020-02-18 22:27:08 +00:00
marco
10af070def --- Merging r44210 into '.':
U    rtl/go32v2/msmouse.pp
--- Recording mergeinfo for merge of r44210 into '.':
 U   .

# revisions: 44210

git-svn-id: branches/fixes_3_2@44211 -
2020-02-18 17:06:17 +00:00
marco
75558b7437 --- Merging r44178 into '.':
U    packages/winunits-base/src/activex.pp
--- Recording mergeinfo for merge of r44178 into '.':
 U   .

# revisions: 44178

git-svn-id: branches/fixes_3_2@44209 -
2020-02-18 13:47:58 +00:00
michael
1fe4a6ff79 * Merging revisions 44149,44150 from trunk:
------------------------------------------------------------------------
    r44149 | michael | 2020-02-11 10:44:49 +0100 (Tue, 11 Feb 2020) | 1 line
    
    * Enable use of EFS flag when zipping files
    ------------------------------------------------------------------------
    r44150 | michael | 2020-02-11 11:17:47 +0100 (Tue, 11 Feb 2020) | 1 line
    
    * Patch from Petr K to save directory with zero size (Bug ID 36691)
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@44160 -
2020-02-12 09:19:25 +00:00
michael
e3174352cb * Merging revisions 44142 from trunk:
------------------------------------------------------------------------
    r44142 | michael | 2020-02-09 18:51:06 +0100 (Sun, 09 Feb 2020) | 1 line
    
    * Patch from Simon Ameis to actually implement parameter checking
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@44159 -
2020-02-12 09:18:23 +00:00
michael
3088728222 * Merging revisions 44004 from trunk:
------------------------------------------------------------------------
    r44004 | michael | 2020-01-20 19:23:58 +0100 (Mon, 20 Jan 2020) | 1 line
    
    * Clear search path (fix from Pascal Riekenberg, bug ID #36609)
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@44158 -
2020-02-12 09:17:32 +00:00