This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository mricron.
commit 6cac550b104f1aae44197f6f7cfefd199ddc98b4 Author: Andreas Tille <[email protected]> Date: Sat Jan 14 23:03:46 2017 +0100 Use fixed patch --- debian/patches/stricter_fpc.patch | 68 +++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/debian/patches/stricter_fpc.patch b/debian/patches/stricter_fpc.patch index d625bc9..306bef5 100644 --- a/debian/patches/stricter_fpc.patch +++ b/debian/patches/stricter_fpc.patch @@ -5,44 +5,44 @@ Last-Upate: Sat, 6 Feb 2016 15:45:38 +0100 --- a/common/dialogsx.pas +++ b/common/dialogsx.pas -@@ -66,6 +66,36 @@ begin - end; - {$ENDIF} +@@ -68,13 +68,44 @@ end; -+{ Convert our TMsgDlgButtons type to Dialogs.TMsgDlgButtons type -+ in a type-safe manner. Do not assume that memory layout matches between -+ - TMsgDlgButtons and Dialogs.TMsgDlgButtons, or -+ - TMsgDlgBtn and Dialogs.TMsgDlgBtn. -+} -+function MsgDlgButtonsConvertToStandard( -+ const Buttons: TMsgDlgButtons): Dialogs.TMsgDlgButtons; -+var -+ B: TMsgDlgBtn; -+begin -+ Result := []; -+ for B := Low(B) to High(B) do -+ if B in Buttons then -+ { convert our TMsgDlgBtn to Dialogs.TMsgDlgBtn type } -+ case B of -+ mbYes : Include(Result, Dialogs.mbYes ); -+ mbNo : Include(Result, Dialogs.mbNo ); -+ mbOK : Include(Result, Dialogs.mbOK ); -+ mbCancel : Include(Result, Dialogs.mbCancel ); -+ mbAbort : Include(Result, Dialogs.mbAbort ); -+ mbRetry : Include(Result, Dialogs.mbRetry ); -+ mbIgnore : Include(Result, Dialogs.mbIgnore ); -+ mbAll : Include(Result, Dialogs.mbAll ); -+ mbNoToAll : Include(Result, Dialogs.mbNoToAll ); -+ mbYesToAll: Include(Result, Dialogs.mbYesToAll); -+ mbHelp : Include(Result, Dialogs.mbHelp ); -+ else raise Exception.Create('Unsupported TMsgDlgBtn value'); -+ end; -+end; -+ function MsgDlg(const Msg: string; DlgType: TMsgDlgType; Buttons: TMsgDlgButtons; HelpCtx: Longint): Word; {$IFDEF GUI} ++ ++ { Convert our TMsgDlgButtons type to Dialogs.TMsgDlgButtons type ++ in a type-safe manner. Do not assume that memory layout matches between ++ - TMsgDlgButtons and Dialogs.TMsgDlgButtons, or ++ - TMsgDlgBtn and Dialogs.TMsgDlgBtn. ++ } ++ function MsgDlgButtonsConvertToStandard( ++ const Buttons: TMsgDlgButtons): Dialogs.TMsgDlgButtons; ++ var ++ B: TMsgDlgBtn; ++ begin ++ Result := []; ++ for B := Low(B) to High(B) do ++ if B in Buttons then ++ { convert our TMsgDlgBtn to Dialogs.TMsgDlgBtn type } ++ case B of ++ mbYes : Include(Result, Dialogs.mbYes ); ++ mbNo : Include(Result, Dialogs.mbNo ); ++ mbOK : Include(Result, Dialogs.mbOK ); ++ mbCancel : Include(Result, Dialogs.mbCancel ); ++ mbAbort : Include(Result, Dialogs.mbAbort ); ++ mbRetry : Include(Result, Dialogs.mbRetry ); ++ mbIgnore : Include(Result, Dialogs.mbIgnore ); ++ mbAll : Include(Result, Dialogs.mbAll ); ++ mbNoToAll : Include(Result, Dialogs.mbNoToAll ); ++ mbYesToAll: Include(Result, Dialogs.mbYesToAll); ++ mbHelp : Include(Result, Dialogs.mbHelp ); ++ else raise Exception.Create('Unsupported TMsgDlgBtn value'); ++ end; ++ end; ++ var -@@ -74,7 +104,7 @@ var + lDlgType : Dialogs.TMsgDlgType; + lButtons: Dialogs.TMsgDlgButtons; begin lDlgType := Dialogs.TMsgDlgType(DlgType); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/mricron.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
