U rtl/win/sysutils.pp
--- Recording mergeinfo for merge of r49244 into '.':
U .
--- Merging r49245 into '.':
U packages/winunits-base/src/comserv.pp
--- Recording mergeinfo for merge of r49245 into '.':
G .
--- Merging r49250 into '.':
G rtl/win/sysutils.pp
--- Recording mergeinfo for merge of r49250 into '.':
G .
# revisions: 49244,49245,49250
r49244 | marco | 2021-04-22 16:00:51 +0200 (Thu, 22 Apr 2021) | 1 line
Changed paths:
M /trunk/rtl/win/sysutils.pp
* use W variant to get localestrs.
r49245 | marco | 2021-04-22 17:11:38 +0200 (Thu, 22 Apr 2021) | 1 line
Changed paths:
M /trunk/packages/winunits-base/src/comserv.pp
* patch by Wallaby, mantis 0038382, load filename via -W function
r49250 | marco | 2021-04-23 21:06:18 +0200 (Fri, 23 Apr 2021) | 1 line
Changed paths:
M /trunk/rtl/win/sysutils.pp
* avoid rangecheck mantis 0038791
git-svn-id: branches/fixes_3_2@49288 -
U packages/fcl-base/src/streamex.pp
--- Recording mergeinfo for merge of r49219 into '.':
U .
# revisions: 49219
r49219 | marco | 2021-04-17 16:30:42 +0200 (Sat, 17 Apr 2021) | 1 line
Changed paths:
M /trunk/packages/fcl-base/src/streamex.pp
* Apply fix from bug #0038734 from Andrea Mauri to update vpbyte after fillbuffer in a loop. The second instance of fillbuffer is safe, because it is at the procedure exit, and vpbyte is a local variable.
git-svn-id: branches/fixes_3_2@49243 -
U compiler/aarch64/hlcgcpu.pas
A tests/webtbs/tw38766.pp
--- Recording mergeinfo for merge of r49236 into '.':
U .
git-svn-id: branches/fixes_3_2@49237 -
U packages/fcl-registry/src/registry.pp
--- Recording mergeinfo for merge of r49165 into '.':
U .
--- Merging r49166 into '.':
U packages/hash/src/sha1.pp
--- Recording mergeinfo for merge of r49166 into '.':
G .
--- Merging r49167 into '.':
U packages/iconvenc/src/iconvert.inc
--- Recording mergeinfo for merge of r49167 into '.':
G .
# revisions: 49165,49166,49167
r49165 | marco | 2021-04-10 15:53:57 +0200 (Sat, 10 Apr 2021) | 3 lines
Changed paths:
M /trunk/packages/fcl-registry/src/registry.pp
* fix from bart for mantis #0038581 that prohibits reusing readbinarydata
as basis for a multisz reader.
r49166 | marco | 2021-04-10 16:26:20 +0200 (Sat, 10 Apr 2021) | 1 line
Changed paths:
M /trunk/packages/hash/src/sha1.pp
* raise exception when file not found.
r49167 | marco | 2021-04-10 16:58:53 +0200 (Sat, 10 Apr 2021) | 2 lines
Changed paths:
M /trunk/packages/iconvenc/src/iconvert.inc
* implemented recommendations from mantis #038510 for better bionic
compatibility.
git-svn-id: branches/fixes_3_2@49221 -
U compiler/aarch64/aasmcpu.pas
--- Recording mergeinfo for merge of r49206 into '.':
U .
--- Merging r49207 into '.':
U compiler/aarch64/rgcpu.pas
A tests/webtbs/tw38053.pp
--- Recording mergeinfo for merge of r49207 into '.':
G .
git-svn-id: branches/fixes_3_2@49208 -
------------------------------------------------------------------------
r49131 | pierre | 2021-04-06 16:43:21 -0600 (Tue, 06 Apr 2021) | 1 line
Changed paths:
M /trunk/packages/fpmkunit/src/fpmkunit.pp
Delete existing files before overwriting them for Darwin OS to avoid codesign issues
------------------------------------------------------------------------
------------------------------------------------------------------------
r49202 | pierre | 2021-04-14 02:06:54 -0600 (Wed, 14 Apr 2021) | 1 line
Also delete file before copying if destination is a directory on Darwin OS
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@49204 -
U packages/chm/src/chmfilewriter.pas
--- Recording mergeinfo for merge of r49071 into '.':
U .
--- Merging r49125 into '.':
G packages/chm/src/chmfilewriter.pas
--- Recording mergeinfo for merge of r49125 into '.':
G .
# revisions: 49071,49125
r49071 | marco | 2021-03-28 14:48:20 +0200 (Sun, 28 Mar 2021) | 1 line
Changed paths:
M /trunk/packages/chm/src/chmfilewriter.pas
* more fixes from serbod repo. Make paths relative.
r49125 | marco | 2021-04-05 21:29:19 +0200 (Mon, 05 Apr 2021) | 1 line
Changed paths:
M /trunk/packages/chm/src/chmfilewriter.pas
* attempt to fix mantis #28321. Use path of project file as base of chm.
git-svn-id: branches/fixes_3_2@49127 -
U rtl/darwin/sysctlh.inc
--- Recording mergeinfo for merge of r49115 into '.':
U .
# revisions: 49115
r49115 | marco | 2021-04-03 21:42:11 +0200 (Sat, 03 Apr 2021) | 1 line
Changed paths:
M /trunk/rtl/darwin/sysctlh.inc
* patch from mantis 37205, add OS X sysctl constants
git-svn-id: branches/fixes_3_2@49116 -
U packages/fcl-base/src/bufstream.pp
A tests/webtbs/tw38351.pp
--- Recording mergeinfo for merge of r48282 into '.':
U .
# revisions: 48282
r48282 | florian | 2021-01-21 22:08:13 +0100 (Thu, 21 Jan 2021) | 1 line
Changed paths:
M /trunk/packages/fcl-base/src/bufstream.pp
A /trunk/tests/webtbs/tw38351.pp
* fix TBufferedFileStream.Seek(0,soBeginning) as proposed by Andrey Zubarev, resolves#38351
git-svn-id: branches/fixes_3_2@49111 -
U packages/rtl-objpas/src/inc/variants.pp
--- Recording mergeinfo for merge of r49040 into '.':
U .
--- Merging r49044 into '.':
U packages/rtl-objpas/src/inc/strutils.pp
--- Recording mergeinfo for merge of r49044 into '.':
G .
--- Merging r49047 into '.':
U packages/regexpr/src/regexpr.pas
--- Recording mergeinfo for merge of r49047 into '.':
G .
--- Merging r49101 into '.':
U rtl/win/wininc/struct.inc
--- Recording mergeinfo for merge of r49101 into '.':
G .
--- Merging r49104 into '.':
C compiler/aarch64/cgcpu.pas
A tests/webtbs/tw38695.pp
--- Recording mergeinfo for merge of r49104 into '.':
G .
Summary of conflicts:
Text conflicts: 1
# revisions: 49040,49044,49047,49101,49104
r49040 | florian | 2021-03-23 21:57:18 +0100 (Tue, 23 Mar 2021) | 1 line
Changed paths:
M /trunk/packages/rtl-objpas/src/inc/variants.pp
* patch by Arnaud Bouchez: initialize dummy_data properly, resolves#38653
r49044 | michael | 2021-03-24 11:40:03 +0100 (Wed, 24 Mar 2021) | 1 line
Changed paths:
M /trunk/packages/rtl-objpas/src/inc/strutils.pp
Fix casing, bug ID #38660
r49047 | michael | 2021-03-24 18:05:26 +0100 (Wed, 24 Mar 2021) | 1 line
Changed paths:
M /trunk/packages/regexpr/src/regexpr.pas
* Fix issue #38442
r49101 | marco | 2021-04-02 16:54:40 +0200 (Fri, 02 Apr 2021) | 1 line
Changed paths:
M /trunk/rtl/win/wininc/struct.inc
* split propsheetheader in -A and -W variants.
r49104 | florian | 2021-04-02 18:44:43 +0200 (Fri, 02 Apr 2021) | 2 lines
Changed paths:
M /trunk/compiler/aarch64/cgcpu.pas
A /trunk/tests/webtbs/tw38695.pp
* Aarch64: patch by J. Gareth Moreton: fix constant writing, resolves#38695
+ test
git-svn-id: branches/fixes_3_2@49110 -
U rtl/inc/lnfodwrf.pp
--- Recording mergeinfo for merge of r49080 into '.':
U .
--- Merging r49086 into '.':
G rtl/inc/lnfodwrf.pp
--- Recording mergeinfo for merge of r49086 into '.':
G .
# revisions: 49080,49086
r49080 | florian | 2021-03-29 14:20:39 +0200 (Mon, 29 Mar 2021) | 1 line
Changed paths:
M /trunk/rtl/inc/lnfodwrf.pp
+ use a hash table to speed up line info retrieval
r49086 | florian | 2021-03-30 16:06:19 +0200 (Tue, 30 Mar 2021) | 1 line
Changed paths:
M /trunk/rtl/inc/lnfodwrf.pp
* check for cache entry before even trying to open the file containing the debug info
git-svn-id: branches/fixes_3_2@49088 -
* fix for Mantis #38145: allow overloading of assignment operators that return ShortStrings with a specific size
+ added tests
The following rules for using these operator overloads as *implicit* overloads apply (Delphi compatible):
- if a found assignment operator returns a default ShortString then that is used
- if only one assignment operator to a String[x] is found then that is used
- otherwise the assignment is not possible
The explicit assignment checks for an exact match (and falls back for an implicit assignment). This is not entirely Delphi compatible as Delphi seems to favor the first found symbol in that case, but sometimes also not... :/
........
* with the recent ShortString changes this test is no longer needed as it was added exactly to check the condition I removed, so disable it for 3.2.1 and newer (as I want to merge these changes back to fixes)
........
git-svn-id: branches/fixes_3_2@49055 -
U packages/rtl-objpas/src/inc/strutils.pp
A tests/test/units/strutils/tboyer.pp
--- Recording mergeinfo for merge of r48752 into '.':
U .
# revisions: 48752
r48752 | florian | 2021-02-21 14:54:25 +0100 (Sun, 21 Feb 2021) | 2 lines
Changed paths:
M /trunk/packages/rtl-objpas/src/inc/strutils.pp
A /trunk/tests/test/units/strutils/tboyer.pp
* fix by avk for issue #38513
+ test
git-svn-id: branches/fixes_3_2@49050 -
------------------------------------------------------------------------
r48814 | pierre | 2021-02-26 17:15:30 +0000 (Fri, 26 Feb 2021) | 1 line
Do not add libgcc directory to library directories with -Fl option if -Xd option is used
------------------------------------------------------------------------
------------------------------------------------------------------------
r42843 | pierre | 2019-08-26 21:41:41 +0000 (Mon, 26 Aug 2019) | 1 line
Partial update for go32v2 and sources
------------------------------------------------------------------------
--- Merging r44112 into '.':
G installer/install.dat
--- Recording mergeinfo for merge of r44112 into '.':
G .
------------------------------------------------------------------------
r48836 | hajny | 2021-02-28 02:08:17 +0000 (Sun, 28 Feb 2021) | 1 line
* package tplylib added, corrections for more than 31 items on a tab
------------------------------------------------------------------------
--- Merging r48836 into '.':
G installer/install.dat
--- Recording mergeinfo for merge of r48836 into '.':
G .
------------------------------------------------------------------------
r49035 | pierre | 2021-03-22 23:26:26 +0000 (Mon, 22 Mar 2021) | 1 line
Try to fix short package name issues in install.dat and add missing go32v2 packages
------------------------------------------------------------------------
--- Merging r49035 into '.':
G installer/install.dat
--- Recording mergeinfo for merge of r49035 into '.':
G .
git-svn-id: branches/fixes_3_2@49041 -
U packages/rtl-objpas/src/inc/fmtbcd.pp
--- Recording mergeinfo for merge of r48876 into '.':
G .
--- Merging r49021 into '.':
U packages/fcl-process/src/win/process.inc
--- Recording mergeinfo for merge of r49021 into '.':
G .
# revisions: 48876,49021
r48876 | marco | 2021-03-04 11:37:50 +0100 (Thu, 04 Mar 2021) | 1 line
Changed paths:
M /trunk/packages/rtl-objpas/src/inc/fmtbcd.pp
* Patch from Lacak. Better fix for mantis 30853
r49021 | marco | 2021-03-20 22:45:19 +0100 (Sat, 20 Mar 2021) | 1 line
Changed paths:
M /trunk/packages/fcl-process/src/win/process.inc
* also assign threadid. mantis 38645
git-svn-id: branches/fixes_3_2@49039 -
U packages/rtl-objpas/src/inc/strutils.pp
--- Recording mergeinfo for merge of r48967 into '.':
U .
# revisions: 48967
r48967 | michael | 2021-03-14 16:29:27 +0100 (Sun, 14 Mar 2021) | 1 line
Changed paths:
M /trunk/packages/rtl-objpas/src/inc/strutils.pp
* Patch from N. Neumann to add delphi-compatible bintohex
git-svn-id: branches/fixes_3_2@49009 -
U packages/fcl-process/src/processbody.inc
--- Recording mergeinfo for merge of r48982 into '.':
U .
# revisions: 48982
r48982 | marco | 2021-03-15 16:58:05 +0100 (Mon, 15 Mar 2021) | 1 line
Changed paths:
M /trunk/packages/fcl-process/src/processbody.inc
* buffer overflow in ReadInputStream if a stream read> READ_BYTES (=64k) large. The overloaded tstream one is ok.
git-svn-id: branches/fixes_3_2@49007 -
------------------------------------------------------------------------
r48716 | michael | 2021-02-19 09:12:46 +0100 (Fri, 19 Feb 2021) | 1 line
* Month constants appeared in Delphi
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@48935 -
------------------------------------------------------------------------
r48898 | michael | 2021-03-07 19:58:23 +0100 (Sun, 07 Mar 2021) | 1 line
* Fix bug ID #0038580: Empty text for startsstr
------------------------------------------------------------------------
r48899 | michael | 2021-03-07 20:00:26 +0100 (Sun, 07 Mar 2021) | 1 line
* Fix bug #38330: reset line number on execute
------------------------------------------------------------------------
r48900 | michael | 2021-03-07 20:02:54 +0100 (Sun, 07 Mar 2021) | 1 line
* Fix bug #38330: reset line number on execute (1-based)
------------------------------------------------------------------------
r48901 | michael | 2021-03-07 20:04:55 +0100 (Sun, 07 Mar 2021) | 1 line
* Wrong delimiter used for samesite cookie value
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@48933 -
------------------------------------------------------------------------
r48814 | pierre | 2021-02-26 17:15:30 +0000 (Fri, 26 Feb 2021) | 1 line
Do not add libgcc directory to library directories with -Fl option if -Xd option is used
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@48854 -
C compiler/systems/i_darwin.pas
--- Recording mergeinfo for merge of r48762 into '.':
G .
--- Merging r48764 into '.':
C compiler/systems/i_darwin.pas
--- Recording mergeinfo for merge of r48764 into '.':
G .
git-svn-id: branches/fixes_3_2@48772 -
------------------------------------------------------------------------
r48702 | michael | 2021-02-17 22:07:57 +0100 (Wed, 17 Feb 2021) | 1 line
* Cursor can be nil, patch from Mattias Gaertner
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@48703 -
------------------------------------------------------------------------
r48694 | michael | 2021-02-17 14:26:18 +0100 (Wed, 17 Feb 2021) | 1 line
* Fix from Joellin to correctly read monospace fonts
------------------------------------------------------------------------
r48696 | michael | 2021-02-17 14:32:03 +0100 (Wed, 17 Feb 2021) | 1 line
* Fix issue ID #35251 (patch from Rumen Gyurov)
------------------------------------------------------------------------
r48697 | michael | 2021-02-17 14:35:48 +0100 (Wed, 17 Feb 2021) | 1 line
* Example for monospace fonts and subsetting
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@48698 -
------------------------------------------------------------------------
r48692 | michael | 2021-02-17 13:59:32 +0100 (Wed, 17 Feb 2021) | 1 line
* Patch from Mattias Gaertner to add MySQL 8.0 support
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@48693 -
U packages/symbolic/src/symbolic.pas
--- Recording mergeinfo for merge of r48525 into '.':
U .
# revisions: 48525
r48525 | marco | 2021-02-08 10:16:13 +0100 (Mon, 08 Feb 2021) | 1 line
Changed paths:
M /trunk/packages/symbolic/src/symbolic.pas
* sqrt is 4 characters long, noticed by Artlogic.
git-svn-id: branches/fixes_3_2@48690 -
* apply patch by Blaise.ru to allow record methods to be assigned to method variables as well (this is Delphi compatible)
+ added test
........
* apply patch by Blaise.ru to allow specializations for the result type of function and method variables
+ added tests
........
* fix for Mantis #38238: when creating a copy of a procdef for a procvar set the methodpointer flag also for methods of records
+ added test
........
git-svn-id: branches/fixes_3_2@48653 -
U packages/pasjpeg/examples/example.pas
--- Recording mergeinfo for merge of r48428 into '.':
U .
--- Merging r48431 into '.':
A packages/pasjpeg/examples/demo.lpi
--- Recording mergeinfo for merge of r48431 into '.':
G .
--- Merging r48463 into '.':
U packages/graph/src/inc/graph.tex
--- Recording mergeinfo for merge of r48463 into '.':
G .
--- Merging r48115 into '.':
U packages/fv/src/views.pas
--- Recording mergeinfo for merge of r48115 into '.':
G .
# revisions: 48428,48431,48463,48115
r48428 | florian | 2021-01-25 22:29:14 +0100 (Mon, 25 Jan 2021) | 1 line
Changed paths:
M /trunk/packages/pasjpeg/examples/example.pas
* fix demo example for delphi_stream being defined
r48431 | florian | 2021-01-26 23:00:33 +0100 (Tue, 26 Jan 2021) | 1 line
Changed paths:
A /trunk/packages/pasjpeg/examples/demo.lpi
+ lazarus project for demo
r48463 | nickysn | 2021-01-31 12:08:21 +0100 (Sun, 31 Jan 2021) | 1 line
Changed paths:
M /trunk/packages/graph/src/inc/graph.tex
* set eol-style=native and mime-type=text/plain to graph.tex
r48115 | florian | 2021-01-08 17:33:05 +0100 (Fri, 08 Jan 2021) | 1 line
Changed paths:
M /trunk/packages/fv/src/views.pas
* avoid div by zero in TView.CalcBounds.GrowI, resolves#30922
git-svn-id: branches/fixes_3_2@48511 -
------------------------------------------------------------------------
r48227 | pierre | 2021-01-20 12:39:21 +0000 (Wed, 20 Jan 2021) | 1 line
Fix compilation for OpenBSD target after changes that use libc by default
------------------------------------------------------------------------
--- Merging r48227 into '.':
U packages/rtl-extra/fpmake.pp
U packages/rtl-extra/src/bsd/osdefs.inc
--- Recording mergeinfo for merge of r48227 into '.':
U .
git-svn-id: branches/fixes_3_2@48503 -
* fix for Mantis #38249: apply adjusted patch by avk to implemnt CastTo handling when the source variant is a custom variant, but the destination type is not
+ added test (includes test for #20849)
........
git-svn-id: branches/fixes_3_2@48494 -
+ add support for logging to StdOut or StdErr instead of a file or system output; if the specified output is not opened an exception will be thrown
........
+ add event to retrieve the logged messages in addition to writing them to the backend
........
git-svn-id: branches/fixes_3_2@48493 -
------------------------------------------------------------------------
r47258 | pierre | 2020-10-30 16:13:35 +0000 (Fri, 30 Oct 2020) | 1 line
Add explicitly dependency to system unit for win16 rtl
------------------------------------------------------------------------
--- Merging r47258 into '.':
C rtl/win16/Makefile
C rtl/win16/Makefile.fpc
--- Recording mergeinfo for merge of r47258 into '.':
U .
Summary of conflicts:
Text conflicts: 2, due to sortbase unit only presentr in trunk,
conflicts resolved by removing the sortbase PPU references.
git-svn-id: branches/fixes_3_2@48417 -
------------------------------------------------------------------------
r47460 | florian | 2020-11-19 21:37:23 +0000 (Thu, 19 Nov 2020) | 1 line
* remove readln
------------------------------------------------------------------------
--- Merging r47460 into '.':
U tests/webtbs/tw38058.pp
--- Recording mergeinfo for merge of r47460 into '.':
U .
git-svn-id: branches/fixes_3_2@48135 -
U compiler/nbas.pas
--- Recording mergeinfo for merge of r44096 into '.':
U .
--- Merging r46274 into '.':
G compiler/nbas.pas
--- Recording mergeinfo for merge of r46274 into '.':
G .
--- Merging r48127 into '.':
A tests/webtbs/tw38337.pp
--- Recording mergeinfo for merge of r48127 into '.':
G .
git-svn-id: branches/fixes_3_2@48128 -
U rtl/powerpc/powerpc.inc
--- Recording mergeinfo for merge of r45802 into '.':
U .
# revisions: 45802
r45802 | karoly | 2020-07-17 23:28:49 +0200 (Fri, 17 Jul 2020) | 1 line
Changed paths:
M /trunk/rtl/powerpc/powerpc.inc
powerpc: also drop DCBZ usage on AmigaOS4, as it runs on hardware with other than the assumed cacheline size
git-svn-id: branches/fixes_3_2@48123 -
U rtl/objpas/sysutils/fmtflt.inc
A tests/test/units/sysutils/tw37374.pp
-- Aufzeichnung der Informationen für Zusammenführung von r46778 in ».«:
U .
git-svn-id: branches/fixes_3_2@48104 -
