svn commit: r349221 - head/editors/lazarus/files

[Jose Alonso Cardenas Marquez]

Author: acm
Date: Wed Mar 26 03:46:53 2014
New Revision: 349221
URL: http://svnweb.freebsd.org/changeset/ports/349221
QAT: https://qat.redports.org/buildarchive/r349221/

Log:
  - Add new patch files. It fix a problem when qt or carbon is used like main
    interface

Added:
  head/editors/lazarus/files/patch-lcl-interfaces-carbon_carbonstrings.pp   (contents, props changed)
  head/editors/lazarus/files/patch-lcl-interfaces-qt_qtprivate.pp   (contents, props changed)

Added: head/editors/lazarus/files/patch-lcl-interfaces-carbon_carbonstrings.pp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/lazarus/files/patch-lcl-interfaces-carbon_carbonstrings.pp	Wed Mar 26 03:46:53 2014	(r349221)
@@ -0,0 +1,31 @@
+--- lcl/interfaces/carbon/carbonstrings.pp	2014-03-25 21:13:32.000000000 -0500
++++ lcl/interfaces/carbon/carbonstrings.pp	2014-03-25 21:15:20.000000000 -0500
+@@ -18,6 +18,10 @@
+ // defines
+ {$I carbondefines.inc}
+ 
++{$if (FPC_FULLVERSION>=20701) OR (FPC_FULLVERSION>=20603)}
++{$define HAS_INHERITED_INSERTITEM}
++{$endif}
++
+ uses
+  // rtl+ftl
+   Classes, SysUtils,
+@@ -34,7 +38,7 @@
+     FOwner: TCarbonComboBox;  // Carbon combo box control owning strings
+   protected
+     procedure Put(Index: Integer; const S: string); override;
+-    {$IF FPC_FULLVERSION<20701}
++    {$IFNDEF HAS_INHERITED_INSERTITEM}
+     // before fpc 2.7.1 InsertItem(Index,S) did not call InsertItem(Index,S,nil)
+     procedure InsertItem(Index: Integer; const S: string); override;
+     {$ENDIF}
+@@ -113,7 +117,7 @@
+   FOwner.Insert(Index, S);
+ end;
+ 
+-{$IF FPC_FULLVERSION<20701}
++{$IFNDEF HAS_INHERITED_INSERTITEM}
+ {------------------------------------------------------------------------------
+   Method:  TCarbonComboBoxStrings.InsertItem
+   Params:  Index - Line index

Added: head/editors/lazarus/files/patch-lcl-interfaces-qt_qtprivate.pp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/lazarus/files/patch-lcl-interfaces-qt_qtprivate.pp	Wed Mar 26 03:46:53 2014	(r349221)
@@ -0,0 +1,11 @@
+--- lcl/interfaces/qt/qtprivate.pp	2014-03-25 21:10:58.000000000 -0500
++++ lcl/interfaces/qt/qtprivate.pp	2014-03-25 21:12:20.000000000 -0500
+@@ -23,7 +23,7 @@
+ 
+ // todo: check if build macros can handle this and define it
+ // in package LCL instead (it's needed for several widgetsets)
+-{$if (FPC_FULLVERSION>=20701)}
++{$if (FPC_FULLVERSION>=20701) OR (FPC_FULLVERSION=20603)}
+ {$define HAS_INHERITED_INSERTITEM}
+ {$endif}
+