U packages/fcl-image/src/clipping.pp
--- Recording mergeinfo for merge of r49373 into '.':
U .
# revisions: 49373
r49373 | marco | 2021-05-15 22:45:48 +0200 (Sat, 15 May 2021) | 1 line
Changed paths:
M /trunk/packages/fcl-image/src/clipping.pp
* fix for mantis 38889, swap bottom and rect in pointinside
git-svn-id: branches/fixes_3_2@49611 -
U rtl/objpas/classes/streams.inc
--- Recording mergeinfo for merge of r49478 into '.':
U .
# revisions: 49478
r49478 | marco | 2021-06-05 17:42:34 +0200 (Sat, 05 Jun 2021) | 2 lines
Changed paths:
M /trunk/rtl/objpas/classes/streams.inc
* fix from Sebastian Hellwig for writeunicodestring bytes number, mantis 0038963
git-svn-id: branches/fixes_3_2@49610 -
U packages/fcl-db/src/base/db.pas
U packages/paszlib/src/zstream.pp
--- Recording mergeinfo for merge of r49490 into '.':
U .
--- Merging r49491 into '.':
G packages/fcl-db/src/base/db.pas
--- Recording mergeinfo for merge of r49491 into '.':
G .
--- Merging r49492 into '.':
U packages/paszlib/src/infblock.pas
U packages/paszlib/src/infcodes.pas
U packages/paszlib/src/inffast.pas
U packages/paszlib/src/zbase.pas
U packages/paszlib/src/zconf.inc
U packages/paszlib/src/zdeflate.pas
--- Recording mergeinfo for merge of r49492 into '.':
G .
--- Merging r49565 into '.':
U rtl/win/wininc/defines.inc
--- Recording mergeinfo for merge of r49565 into '.':
G .
--- Merging r49590 into '.':
U packages/gtk2/src/gtkext/gtkstatusicon.inc
U packages/gtk2/src/gtkext/gtkstatusiconh.inc
--- Recording mergeinfo for merge of r49590 into '.':
G .
# revisions: 49490,49491,49492,49565,49590
r49490 | marco | 2021-06-08 10:52:50 +0200 (Tue, 08 Jun 2021) | 2 lines
Changed paths:
M /trunk/packages/fcl-db/src/base/db.pas
M /trunk/packages/paszlib/src/zstream.pp
* use local buffer for seek mantis #38930 patch by Hendi.
r49491 | marco | 2021-06-08 10:53:42 +0200 (Tue, 08 Jun 2021) | 2 lines
Changed paths:
M /trunk/packages/fcl-db/src/base/db.pas
* revert accidentally modified file.
r49492 | marco | 2021-06-08 10:58:21 +0200 (Tue, 08 Jun 2021) | 2 lines
Changed paths:
M /trunk/packages/paszlib/src/infblock.pas
M /trunk/packages/paszlib/src/infcodes.pas
M /trunk/packages/paszlib/src/inffast.pas
M /trunk/packages/paszlib/src/zbase.pas
M /trunk/packages/paszlib/src/zconf.inc
M /trunk/packages/paszlib/src/zdeflate.pas
* commit second patch (from Hendi) from mantis #38930, make debug define compiling again
r49565 | marco | 2021-06-26 20:36:37 +0200 (Sat, 26 Jun 2021) | 1 line
Changed paths:
M /trunk/rtl/win/wininc/defines.inc
* redo psd constants, mantis #39022
r49590 | marco | 2021-07-10 14:07:55 +0200 (Sat, 10 Jul 2021) | 6 lines
Changed paths:
M /trunk/packages/gtk2/src/gtkext/gtkstatusicon.inc
M /trunk/packages/gtk2/src/gtkext/gtkstatusiconh.inc
* add gtk_status_icon_set_tooltip_text as per Juha's patch, mantis #39199
--This line, and those below, will be ignored--
M gtk2/src/gtkext/gtkstatusicon.inc
M gtk2/src/gtkext/gtkstatusiconh.inc
git-svn-id: branches/fixes_3_2@49607 -
------------------------------------------------------------------------
r45733 | pierre | 2020-07-06 13:39:42 +0200 (Mon, 06 Jul 2020) | 1 line
Fix cycle with -CriotR option on aarch64-linux
------------------------------------------------------------------------
--- Merging r45733 into '.':
U compiler/constexp.pas
--- Recording mergeinfo for merge of r45733 into '.':
U .
git-svn-id: branches/fixes_3_2@49606 -
U packages/rtl-objpas/src/inc/system.uitypes.pp
--- Recording mergeinfo for merge of r49563 into '.':
U .
--- Merging r49566 into '.':
G packages/rtl-objpas/src/inc/system.uitypes.pp
--- Recording mergeinfo for merge of r49566 into '.':
G .
# revisions: 49563,49566
fetching log for rev 49563 - 369 characters
r49563 | marco | 2021-06-26 18:00:12 +0200 (Sat, 26 Jun 2021) | 2 lines
Changed paths:
M /trunk/packages/rtl-objpas/src/inc/system.uitypes.pp
* tcolors alias.
* a few missing colors copied from lazarus' graphics unit
fetching log for rev 49566 - 305 characters
r49566 | marco | 2021-06-26 21:24:57 +0200 (Sat, 26 Jun 2021) | 2 lines
Changed paths:
M /trunk/packages/rtl-objpas/src/inc/system.uitypes.pp
* fix typo
git-svn-id: branches/fixes_3_2@49600 -
U packages/sqlite/src/sqlite3.inc
--- Recording mergeinfo for merge of r49598 into '.':
U .
# revisions: 49598
r49598 | marco | 2021-07-11 15:09:56 +0200 (Sun, 11 Jul 2021) | 1 line
Changed paths:
M /trunk/packages/sqlite/src/sqlite3.inc
* ente ->enter as reported by KryptKicker
git-svn-id: branches/fixes_3_2@49599 -
r47234 | pierre | 2020-10-28 12:37:57 +0000 (Wed, 28 Oct 2020) | 1 line
Update -T help output after introduction of iOS targets
------------------------------------------------------------------------
--- Merging r47234 into '.':
U compiler/msg/errore.msg
U compiler/msgidx.inc
U compiler/msgtxt.inc
--- Recording mergeinfo for merge of r47234 into '.':
U .
git-svn-id: branches/fixes_3_2@49533 -
Add setting of all optimization debug macros with single DEBUG_ALL_OPT macro
------------------------------------------------------------------------
--- Merging r48111 into '.':
U compiler/fpcdefs.inc
--- Recording mergeinfo for merge of r48111 into '.':
U .
------------------------------------------------------------------------
r48112 | pierre | 2021-01-08 12:13:43 +0100 (Fri, 08 Jan 2021) | 1 line
Fix compilation with -dALLOCREGDEBUG
------------------------------------------------------------------------
--- Merging r48112 into '.':
U compiler/aoptobj.pas
--- Recording mergeinfo for merge of r48112 into '.':
G .
git-svn-id: branches/fixes_3_2@49497 -
r48140 | pierre | 2021-01-11 22:17:09 +0000 (Mon, 11 Jan 2021) | 1 line
Correct check of stringtype inside use_tag_prefix function
------------------------------------------------------------------------
--- Merging r48140 into '.':
U compiler/dbgstabs.pas
--- Recording mergeinfo for merge of r48140 into '.':
U .
git-svn-id: branches/fixes_3_2@49447 -
r42206 | pierre | 2019-06-10 13:55:59 +0000 (Mon, 10 Jun 2019) | 1 line
Fix error in commit #42199
------------------------------------------------------------------------
--- Merging r42206 into '.':
U compiler/dbgstabx.pas
--- Recording mergeinfo for merge of r42206 into '.':
U .
git-svn-id: branches/fixes_3_2@49423 -
r42199 | pierre | 2019-06-09 20:59:06 +0000 (Sun, 09 Jun 2019) | 1 line
Use use_tag_types everywhere to get consistent results for 'Tt' versus 't' for stabs for string definitions
------------------------------------------------------------------------
--- Merging r42199 into '.':
U compiler/dbgstabs.pas
U compiler/dbgstabx.pas
--- Recording mergeinfo for merge of r42199 into '.':
U .
git-svn-id: branches/fixes_3_2@49422 -
r40155 | jonas | 2018-11-01 20:39:38 +0000 (Thu, 01 Nov 2018) | 1 line
* fixed compilation with -O3 (one false positive, one real error)
------------------------------------------------------------------------
--- Merging r40155 into '.':
C compiler/riscv { not present in fixes branch }
U compiler/sparcgen/ncpumat.pas
--- Recording mergeinfo for merge of r40155 into '.':
U .
Summary of conflicts:
Tree conflicts: 1
git-svn-id: branches/fixes_3_2@49419 -
r40821 | pierre | 2019-01-09 22:48:08 +0000 (Wed, 09 Jan 2019) | 1 line
Avoid warnings with -O4 option
------------------------------------------------------------------------
--- Merging r40821 into '.':
U compiler/ogomf.pas
--- Recording mergeinfo for merge of r40821 into '.':
U .
git-svn-id: branches/fixes_3_2@49418 -
C Makefile
C Makefile.fpc
--- Recording mergeinfo for merge of r49045 into '.':
U .
Summary of conflicts:
Text conflicts: 2
# revisions: 49045
r49045 | jonas | 2021-03-24 15:33:09 +0100 (Wed, 24 Mar 2021) | 1 line
Changed paths:
M /trunk/Makefile
M /trunk/Makefile.fpc
* support building with FPC 3.2.2
git-svn-id: branches/fixes_3_2@49384 -
------------------------------------------------------------------------
r47343 | michael | 2020-11-08 18:05:01 +0100 (Sun, 08 Nov 2020) | 1 line
* Fix bug #37852, possible memleak
------------------------------------------------------------------------
r47344 | michael | 2020-11-08 18:10:07 +0100 (Sun, 08 Nov 2020) | 1 line
* Correct line number
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@49320 -
------------------------------------------------------------------------
r47342 | michael | 2020-11-08 17:42:06 +0100 (Sun, 08 Nov 2020) | 1 line
* Fail with trailing garbage in joStrict mode, bug ID #0037837
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@49319 -
------------------------------------------------------------------------
r47006 | michael | 2020-09-29 17:45:27 +0200 (Tue, 29 Sep 2020) | 1 line
* More strict behaviour for identifiers, patch by Benito van der Zander (bug ID 37841)
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@49318 -
------------------------------------------------------------------------
r47005 | michael | 2020-09-29 17:33:59 +0200 (Tue, 29 Sep 2020) | 1 line
* Fix more strict handling of numbers (bug ID 37840, patch by Benito van der Zander)
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@49317 -
* patch by Cyrax: forbid to use heaptrc and valgrind at the same time, resolves#36529
* load cmem before line* units as they might allocate memory
........
git-svn-id: branches/fixes_3_2@49314 -
U compiler/msg/errorct.msg
C compiler/msg/errord.msg
U compiler/msg/errorda.msg
C compiler/msg/errordu.msg
U compiler/msg/errore.msg
U compiler/msg/errores.msg
U compiler/msg/errorf.msg
U compiler/msg/errorfi.msg
U compiler/msg/errorhe.msg
U compiler/msg/errorheu.msg
U compiler/msg/errorid.msg
U compiler/msg/erroriu.msg
U compiler/msg/errorn.msg
U compiler/msg/errorpl.msg
U compiler/msg/errorpli.msg
U compiler/msg/errorpt.msg
U compiler/msg/errorptu.msg
U compiler/msg/errorr.msg
U compiler/msg/errorru.msg
U compiler/msg/errorues.msg
U compiler/msgtxt.inc
--- Recording mergeinfo for merge of r48432 into '.':
U .
Summary of conflicts:
Text conflicts: 2
# revisions: 48432
r48432 | florian | 2021-01-26 23:03:17 +0100 (Tue, 26 Jan 2021) | 1 line
Changed paths:
M /trunk/compiler/msg/errorct.msg
M /trunk/compiler/msg/errord.msg
M /trunk/compiler/msg/errorda.msg
M /trunk/compiler/msg/errordu.msg
M /trunk/compiler/msg/errore.msg
M /trunk/compiler/msg/errores.msg
M /trunk/compiler/msg/errorf.msg
M /trunk/compiler/msg/errorfi.msg
M /trunk/compiler/msg/errorhe.msg
M /trunk/compiler/msg/errorheu.msg
M /trunk/compiler/msg/errorid.msg
M /trunk/compiler/msg/erroriu.msg
M /trunk/compiler/msg/errorn.msg
M /trunk/compiler/msg/errorpl.msg
M /trunk/compiler/msg/errorpli.msg
M /trunk/compiler/msg/errorpt.msg
M /trunk/compiler/msg/errorptu.msg
M /trunk/compiler/msg/errorr.msg
M /trunk/compiler/msg/errorru.msg
M /trunk/compiler/msg/errorues.msg
M /trunk/compiler/msgtxt.inc
* updated copyright year to 2021
git-svn-id: branches/fixes_3_2@49309 -
------------------------------------------------------------------------
r48711 | michael | 2021-02-18 16:10:05 +0100 (Thu, 18 Feb 2021) | 1 line
* Fix from mattias Gartner for issue ID #38509, correctly rest index on close/reopen
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@49304 -
------------------------------------------------------------------------
r49276 | michael | 2021-04-27 13:16:58 +0200 (Tue, 27 Apr 2021) | 1 line
* Make some properties public
------------------------------------------------------------------------
r49277 | michael | 2021-04-27 13:30:53 +0200 (Tue, 27 Apr 2021) | 1 line
* Forgot to include sslbase
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@49300 -
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 -
