------------------------------------------------------------------------
r41849 | michael | 2019-04-08 09:51:19 +0200 (Mon, 08 Apr 2019) | 1 line
* Patch from Ondrej Pokorny to let AddStrings call beginupdate/endupdate under all circumstances (bug ID 35341)
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@42418 -
------------------------------------------------------------------------
r41819 | michael | 2019-04-01 19:31:20 +0200 (Mon, 01 Apr 2019) | 1 line
* Fix bug #35305, lazy instantiation of class alias list. Patch from Ondrej Pokorny
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@42417 -
U packages/morphunits/src/agraphics.pas
U packages/os4units/src/agraphics.pas
--- Recording mergeinfo for merge of r42261 into '.':
U .
# revisions: 42261
git-svn-id: branches/fixes_3_2@42345 -
G packages/chm/src/chmsitemap.pas
--- Recording mergeinfo for merge of r42129 into '.':
G .
--- Merging r42137 into '.':
G packages/chm/src/chmreader.pas
--- Recording mergeinfo for merge of r42137 into '.':
G .
--- Merging r42138 into '.':
G utils/fpdoc/dw_htmlchm.inc
--- Recording mergeinfo for merge of r42138 into '.':
G .
--- Merging r42140 into '.':
G utils/fpdoc/dw_htmlchm.inc
--- Recording mergeinfo for merge of r42140 into '.':
G .
--- Merging r42141 into '.':
G utils/fpdoc/dw_htmlchm.inc
--- Recording mergeinfo for merge of r42141 into '.':
G .
--- Merging r42142 into '.':
G packages/chm/src/chmfilewriter.pas
G packages/chm/src/chmwriter.pas
--- Recording mergeinfo for merge of r42142 into '.':
G .
--- Merging r42156 into '.':
G packages/chm/src/chmfilewriter.pas
U packages/chm/src/chmtypes.pas
--- Recording mergeinfo for merge of r42156 into '.':
G .
# revisions: 42129,42137,42138,42140,42141,42142,42156
git-svn-id: branches/fixes_3_2@42306 -
* fixed an i8086 inline assembler bug, where 'call word ptr [label]' (an
indirect call) was assembled as 'call near label' (direct call) instead of
'call near [label]' and 'call dword ptr [label]' was assembled as
'call near label' instead of 'call far [label]'
........
Add {$goto on} if FPC macro is defined
........
git-svn-id: branches/fixes_3_2@42215 -
U rtl/inc/getopts.pp
--- Recording mergeinfo for merge of r42147 into '.':
U .
--- Merging r42148 into '.':
U packages/winunits-base/src/shlwapi.pp
--- Recording mergeinfo for merge of r42148 into '.':
G .
--- Merging r42152 into '.':
G packages/winunits-base/src/shlwapi.pp
--- Recording mergeinfo for merge of r42152 into '.':
G .
# revisions: 42147,42148,42152
git-svn-id: branches/fixes_3_2@42161 -
U packages/gdbint/src/gdbint.pp
--- Recording mergeinfo for merge of r42086 into '.':
U .
--- Merging r42113 into '.':
U packages/openssl/src/openssl.pas
--- Recording mergeinfo for merge of r42113 into '.':
G .
--- Merging r42114 into '.':
G packages/openssl/src/openssl.pas
--- Recording mergeinfo for merge of r42114 into '.':
G .
--- Merging r42122 into '.':
U packages/fcl-base/examples/README.txt
A packages/fcl-base/examples/testappexit.pp
--- Recording mergeinfo for merge of r42122 into '.':
G .
--- Merging r42123 into '.':
G packages/fcl-base/examples/README.txt
A packages/fcl-base/examples/demoio.pp
--- Recording mergeinfo for merge of r42123 into '.':
G .
# revisions: 42086,42113,42114,42122,42123
git-svn-id: branches/fixes_3_2@42160 -
r40756 | karoly | 2019-01-04 03:00:03 +0000 (Fri, 04 Jan 2019) | 1 line
haiku: linker support code for internal sysinit and make the x86_64 port use it
------------------------------------------------------------------------
--- Merging r40756 into '.':
G compiler/systems/t_haiku.pas
U compiler/systems.pas
--- Recording mergeinfo for merge of r40756 into '.':
G .
------------------------------------------------------------------------
------------------------------------------------------------------------
r40791 | karoly | 2019-01-07 12:58:02 +0000 (Mon, 07 Jan 2019) | 1 line
haiku: move i386 also to internal sysinit
------------------------------------------------------------------------
U compiler/systems.pas
U rtl/haiku/system.pp
--- Recording mergeinfo for merge of r40791 into '.':
U .
git-svn-id: branches/fixes_3_2@42136 -
------------------------------------------------------------------------
r40753 | karoly | 2019-01-04 02:16:24 +0000 (Fri, 04 Jan 2019) | 1 line
haiku-x86_64: add target to the compiler and ppudump, enable it in fpmake and fpcmake
------------------------------------------------------------------------
--- Merging r40753 into '.':
U compiler/options.pas
U compiler/systems/i_haiku.pas
U compiler/systems/t_haiku.pas
U compiler/systems.inc
U compiler/utils/ppuutils/ppudump.pp
U compiler/x86/agx86att.pas
U compiler/x86_64/cpuelf.pas
U compiler/x86_64/cputarg.pas
U utils/fpcm/fpcmmain.pp
--- Recording mergeinfo for merge of r40753 into '.':
U .
------------------------------------------------------------------------
r40756 | karoly | 2019-01-04 03:00:03 +0000 (Fri, 04 Jan 2019) | 1 line
haiku: linker support code for internal sysinit and make the x86_64 port use it
------------------------------------------------------------------------
--- Merging r40756 into '.':
G compiler/systems/t_haiku.pas
U compiler/systems.pas
--- Recording mergeinfo for merge of r40756 into '.':
G .
git-svn-id: branches/fixes_3_2@42133 -
U rtl/win/wininc/func.inc
--- Recording mergeinfo for merge of r42008 into '.':
U .
--- Merging r42013 into '.':
U rtl/win/wininc/defines.inc
--- Recording mergeinfo for merge of r42013 into '.':
G .
--- Merging r42027 into '.':
G rtl/win/wininc/func.inc
--- Recording mergeinfo for merge of r42027 into '.':
G .
--- Merging r42028 into '.':
U rtl/win/wininc/ascdef.inc
U rtl/win/wininc/ascfun.inc
U rtl/win/wininc/unidef.inc
U rtl/win/wininc/unifun.inc
--- Recording mergeinfo for merge of r42028 into '.':
G .
--- Merging r42029 into '.':
G rtl/win/wininc/func.inc
--- Recording mergeinfo for merge of r42029 into '.':
G .
--- Merging r42030 into '.':
G rtl/win/wininc/defines.inc
G rtl/win/wininc/func.inc
--- Recording mergeinfo for merge of r42030 into '.':
G .
--- Merging r42043 into '.':
U rtl/win/syswin.inc
--- Recording mergeinfo for merge of r42043 into '.':
G .
# revisions: 42008,42013,42027,42028,42029,42030,42043
git-svn-id: branches/fixes_3_2@42130 -
------------------------------------------------------------------------
r42024 | pierre | 2019-05-10 07:23:31 +0000 (Fri, 10 May 2019) | 1 line
Use TIOCtlRequest type for local variable nr inside TCSetAttr function
------------------------------------------------------------------------
------------------------------------------------------------------------
r42024 | pierre | 2019-05-10 07:23:31 +0000 (Fri, 10 May 2019) | 1 line
Use TIOCtlRequest type for local variable nr inside TCSetAttr function
------------------------------------------------------------------------
--- Merging r42024 into '.':
U rtl/beos/termiosproc.inc
U rtl/darwin/termiosproc.inc
U rtl/haiku/termiosproc.inc
U rtl/linux/termiosproc.inc
U rtl/netbsd/termiosproc.inc
U rtl/openbsd/termiosproc.inc
--- Recording mergeinfo for merge of r42024 into '.':
U .
git-svn-id: branches/fixes_3_2@42125 -
U rtl/haiku/si_c.pp
U rtl/haiku/si_dllc.pp
U rtl/haiku/system.pp
--- Recording mergeinfo for merge of r40843 into '.':
U .
--- Merging r40844 into '.':
G rtl/haiku/system.pp
--- Recording mergeinfo for merge of r40844 into '.':
G .
--- Merging r40845 into '.':
U rtl/inc/exeinfo.pp
--- Recording mergeinfo for merge of r40845 into '.':
G .
--- Merging r42083 into '.':
U rtl/haiku/Makefile
U rtl/haiku/Makefile.fpc
--- Recording mergeinfo for merge of r42083 into '.':
G .
# revisions: 40843,40844,40845,42083
git-svn-id: branches/fixes_3_2@42117 -
U packages/sqlite/tests/testapiv3x.pp
--- Recording mergeinfo for merge of r41612 into '.':
U .
# revisions: 41612
r41612 | michael | 2019-03-06 08:27:28 +0100 (Wed, 06 Mar 2019) | 1 line
Changed paths:
M /trunk/packages/sqlite/tests/testapiv3x.pp
* Fix bug #35194
git-svn-id: branches/fixes_3_2@42099 -
------------------------------------------------------------------------
r42022 | pierre | 2019-05-08 11:38:43 +0200 (Wed, 08 May 2019) | 1 line
Do not use BSD system tar option -I if TARPROG is gtar for OpenBSD
------------------------------------------------------------------------
--- Merging r42022 into '.':
U tests/Makefile
U tests/Makefile.fpc
--- Recording mergeinfo for merge of r42022 into '.':
U .
git-svn-id: branches/fixes_3_2@42023 -
C compiler/systems.pas
--- Recording mergeinfo for merge of r41709 into '.':
U .
Summary of conflicts:
Text conflicts: 1
# revisions: 41709
git-svn-id: branches/fixes_3_2@41989 -
U packages/opengl/src/gl.pp
U packages/opengl/src/glu.pp
U packages/opengl/src/glut.pp
--- Recording mergeinfo for merge of r41646 into '.':
U .
--- Merging r41647 into '.':
G packages/opengl/src/gl.pp
G packages/opengl/src/glu.pp
G packages/opengl/src/glut.pp
--- Recording mergeinfo for merge of r41647 into '.':
G .
--- Merging r41675 into '.':
U compiler/systems/i_bsd.pas
--- Recording mergeinfo for merge of r41675 into '.':
G .
--- Merging r41695 into '.':
A rtl/openbsd/si_impl.inc
U rtl/openbsd/si_intf.inc
U rtl/openbsd/si_prc.pp
U rtl/openbsd/x86_64/si_prc.inc
--- Recording mergeinfo for merge of r41695 into '.':
G .
--- Merging r41696 into '.':
U compiler/systems/t_bsd.pas
--- Recording mergeinfo for merge of r41696 into '.':
G .
--- Merging r41697 into '.':
G compiler/systems/t_bsd.pas
--- Recording mergeinfo for merge of r41697 into '.':
G .
--- Merging r41698 into '.':
G compiler/systems/t_bsd.pas
--- Recording mergeinfo for merge of r41698 into '.':
G .
--- Merging r41699 into '.':
G compiler/systems/t_bsd.pas
--- Recording mergeinfo for merge of r41699 into '.':
G .
--- Merging r41700 into '.':
G compiler/systems/t_bsd.pas
--- Recording mergeinfo for merge of r41700 into '.':
G .
--- Merging r41701 into '.':
U rtl/openbsd/si_impl.inc
G rtl/openbsd/si_intf.inc
G rtl/openbsd/x86_64/si_prc.inc
--- Recording mergeinfo for merge of r41701 into '.':
G .
# revisions: 41646,41647,41675,41695,41696,41697,41698,41699,41700,41701
git-svn-id: branches/fixes_3_2@41985 -
U packages/morphunits/src/amigados.pas
U packages/morphunits/src/exec.pas
--- Recording mergeinfo for merge of r41941 into '.':
U .
--- Merging r41942 into '.':
U packages/arosunits/src/amigados.pas
--- Recording mergeinfo for merge of r41942 into '.':
G .
--- Merging r41944 into '.':
U packages/arosunits/src/agraphics.pas
--- Recording mergeinfo for merge of r41944 into '.':
G .
--- Merging r41945 into '.':
U packages/morphunits/src/agraphics.pas
--- Recording mergeinfo for merge of r41945 into '.':
G .
--- Merging r41947 into '.':
U packages/arosunits/src/intuition.pas
--- Recording mergeinfo for merge of r41947 into '.':
G .
--- Merging r41948 into '.':
U packages/morphunits/src/intuition.pas
--- Recording mergeinfo for merge of r41948 into '.':
G .
--- Merging r41953 into '.':
U packages/morphunits/src/utility.pas
--- Recording mergeinfo for merge of r41953 into '.':
G .
--- Merging r41955 into '.':
U packages/amunits/src/coreunits/agraphics.pas
U packages/amunits/src/coreunits/clipboard.pas
U packages/amunits/src/coreunits/intuition.pas
--- Recording mergeinfo for merge of r41955 into '.':
G .
--- Merging r41956 into '.':
U packages/arosunits/src/datatypes.pas
U packages/arosunits/src/locale.pas
U packages/arosunits/src/serial.pas
U packages/arosunits/src/workbench.pas
--- Recording mergeinfo for merge of r41956 into '.':
G .
--- Merging r41957 into '.':
U packages/morphunits/src/datatypes.pas
--- Recording mergeinfo for merge of r41957 into '.':
G .
# revisions: 41941,41942,41944,41945,41947,41948,41953,41955,41956,41957
git-svn-id: branches/fixes_3_2@41984 -
r41159 | pierre | 2019-02-01 13:26:46 +0000 (Fri, 01 Feb 2019) | 1 line
Fix parallel make for embedded rtl
------------------------------------------------------------------------
--- Merging r41159 into '.':
U rtl/embedded/Makefile
U rtl/embedded/Makefile.fpc
--- Recording mergeinfo for merge of r41159 into '.':
U .
git-svn-id: branches/fixes_3_2@41974 -
