[cvs] dists/10.4/stable/main/finkinfo/devel lazarus-doc.info, 1.6, 1.7 lazarus-lcl-carbon-powerpc.info, 1.1, 1.2 lazarus-lcl-gtk2.info, 1.1, 1.2 lazarus-lcl-win32.info, 1.1, 1.2 lazarus-lcl-wince-arm.info, 1.1, 1.2 lazarus-lcl-wince-i386.info, 1.1, 1.2 lazarus.info, 1.9, 1.10

Tue, 03 Apr 2012 11:08:55 -0700 

Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel
In directory vz-cvs-3.sog:/tmp/cvs-serv30356

Modified Files:
        lazarus-doc.info lazarus-lcl-carbon-powerpc.info 
        lazarus-lcl-gtk2.info lazarus-lcl-win32.info 
        lazarus-lcl-wince-arm.info lazarus-lcl-wince-i386.info 
        lazarus.info 
Log Message:
Lazarus IDE: update to new upstream version. Enable 64 bit tree.

Index: lazarus-lcl-carbon-powerpc.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/lazarus-lcl-carbon-powerpc.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lazarus-lcl-carbon-powerpc.info     4 Jan 2012 15:06:38 -0000       1.1
+++ lazarus-lcl-carbon-powerpc.info     3 Apr 2012 18:08:43 -0000       1.2
@@ -1,19 +1,18 @@
 Package: lazarus-lcl-carbon-powerpc
-Version: 0.9.30.2
+Version: 0.9.30.4
 Revision: 1
-Architecture: i386 
-Distribution: 10.5, 10.6
+Architecture: i386, x86_64
 License: GPL/LGPL
 
 Depends: <<
-  lazarus-aqua (>= 0.9.20.2) | lazarus-gtk2 (>= 0.9.20.2),
+  lazarus-aqua (>= 0.9.30.4) | lazarus-gtk2 (>= 0.9.30.4),
   fpc-cross-powerpc-darwin (>= 2.6.0)
 <<
 
 Recommends: fpc-doc, lazarus-doc
 
 Source: http://downloads.sourceforge.net/lazarus/lazarus-%v-src.tar.bz2
-Source-MD5: 0dcf54613c2f9d38a32d183431e2dfc9
+Source-MD5: ebd40cdfdfc4b66d1ced7a0d48d6da84
 
 SourceDirectory: lazarus
 
@@ -28,7 +27,7 @@
 
   AllUnits="lcl packager/registration ideintf bigidecomponents packager"
 
-  make $AllUnits LCL_PLATFORM=carbon OPT="$debug_options" OS_TARGET=darwin  
PP=ppcppc CPU_TARGET=powerpc
+  make $AllUnits LCL_PLATFORM=carbon OPT="$debug_options" OS_TARGET=darwin 
PP=ppcppc CPU_TARGET=powerpc
 <<
 
 InstallScript: <<

Index: lazarus-doc.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/lazarus-doc.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- lazarus-doc.info    8 Jan 2012 15:16:40 -0000       1.6
+++ lazarus-doc.info    3 Apr 2012 18:08:43 -0000       1.7
@@ -1,12 +1,11 @@
 Package: lazarus-doc
-Version: 0.9.30.2
+Version: 0.9.30.4
 Revision: 1
-Architecture: powerpc, i386, x86_64
 Enhances: lazarus-aqua, lazarus-gtk2
 
 License: GPL/LGPL
 Source: 
mirror:sourceforge:lazarus/Lazarus%%20Documentation/Lazarus%%20%v/fpc-%n-html-%v.tar.bz2
-Source-MD5: db73829c21ddaca14e3a399720b28c49
+Source-MD5: 6fa9df55d0495040a273e330fcba0859
 
 NoSourceDirectory: true
 

Index: lazarus-lcl-wince-arm.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/lazarus-lcl-wince-arm.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lazarus-lcl-wince-arm.info  4 Jan 2012 15:06:38 -0000       1.1
+++ lazarus-lcl-wince-arm.info  3 Apr 2012 18:08:43 -0000       1.2
@@ -1,18 +1,17 @@
 Package: lazarus-lcl-wince-arm
-Version: 0.9.30.2
+Version: 0.9.30.4
 Revision: 1
-Architecture: powerpc, i386
 License: GPL/LGPL
 
 Depends: <<
-  lazarus-aqua (>= 0.9.20.2) | lazarus-gtk2 (>= 0.9.20.2),
+  lazarus-aqua (>= 0.9.30.4) | lazarus-gtk2 (>= 0.9.30.4),
   fpc-cross-arm-wince
 <<
 
 Recommends: fpc-doc, lazarus-doc
 
 Source: http://downloads.sourceforge.net/lazarus/lazarus-%v-src.tar.bz2
-Source-MD5: 0dcf54613c2f9d38a32d183431e2dfc9
+Source-MD5: ebd40cdfdfc4b66d1ced7a0d48d6da84
 
 SourceDirectory: lazarus
 
@@ -28,9 +27,9 @@
   BaseUnits="lcl packager/registration"
   AllUnits="lcl packager/registration ideintf bigidecomponents packager"
 
-  make $BaseUnits LCL_PLATFORM=wince  OPT="$debug_options" OS_TARGET=wince  
PP=ppcarm CPU_TARGET=arm
-  make ideintf    LCL_PLATFORM=wince  OPT="$debug_options" OS_TARGET=wince  
PP=ppcarm CPU_TARGET=arm
-  make packager   LCL_PLATFORM=wince  OPT="$debug_options" OS_TARGET=wince  
PP=ppcarm CPU_TARGET=arm
+  make $BaseUnits LCL_PLATFORM=wince OPT="$debug_options" OS_TARGET=wince 
PP=ppcarm CPU_TARGET=arm
+  make ideintf    LCL_PLATFORM=wince OPT="$debug_options" OS_TARGET=wince 
PP=ppcarm CPU_TARGET=arm
+  make packager   LCL_PLATFORM=wince OPT="$debug_options" OS_TARGET=wince 
PP=ppcarm CPU_TARGET=arm
 
 <<
 

Index: lazarus-lcl-wince-i386.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/lazarus-lcl-wince-i386.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lazarus-lcl-wince-i386.info 4 Jan 2012 15:06:38 -0000       1.1
+++ lazarus-lcl-wince-i386.info 3 Apr 2012 18:08:43 -0000       1.2
@@ -1,18 +1,18 @@
 Package: lazarus-lcl-wince-i386
-Version: 0.9.30.2
+Version: 0.9.30.4
 Revision: 1
-Architecture: i386
+Architecture: i386, x86_64
 License: GPL/LGPL
 
 Depends: <<
-  lazarus-aqua (>= 0.9.20.2) | lazarus-gtk2 (>= 0.9.20.2),
+  lazarus-aqua (>= 0.9.30.4) | lazarus-gtk2 (>= 0.9.30.4),
   fpc-cross-i386-wince
 <<
 
 Recommends: fpc-doc, lazarus-doc
 
 Source: http://downloads.sourceforge.net/lazarus/lazarus-%v-src.tar.bz2
-Source-MD5: 0dcf54613c2f9d38a32d183431e2dfc9
+Source-MD5: ebd40cdfdfc4b66d1ced7a0d48d6da84
 
 SourceDirectory: lazarus
 
@@ -28,9 +28,9 @@
   BaseUnits="lcl packager/registration"
   AllUnits="lcl packager/registration ideintf bigidecomponents packager"
 
-  make $BaseUnits LCL_PLATFORM=wince  OPT="$debug_options" OS_TARGET=wince  
PP=ppc386 CPU_TARGET=i386
-  make ideintf    LCL_PLATFORM=wince  OPT="$debug_options" OS_TARGET=wince  
PP=ppc386 CPU_TARGET=i386
-  make packager   LCL_PLATFORM=wince  OPT="$debug_options" OS_TARGET=wince  
PP=ppc386 CPU_TARGET=i386
+  make $BaseUnits LCL_PLATFORM=wince OPT="$debug_options" OS_TARGET=wince 
PP=ppc386 CPU_TARGET=i386
+  make ideintf    LCL_PLATFORM=wince OPT="$debug_options" OS_TARGET=wince 
PP=ppc386 CPU_TARGET=i386
+  make packager   LCL_PLATFORM=wince OPT="$debug_options" OS_TARGET=wince 
PP=ppc386 CPU_TARGET=i386
 
 <<
 

Index: lazarus-lcl-gtk2.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/lazarus-lcl-gtk2.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lazarus-lcl-gtk2.info       4 Jan 2012 15:06:38 -0000       1.1
+++ lazarus-lcl-gtk2.info       3 Apr 2012 18:08:43 -0000       1.2
@@ -1,23 +1,22 @@
 Package: lazarus-lcl-gtk2
-Version: 0.9.30.2
+Version: 0.9.30.4
 Revision: 1
-Architecture: powerpc, i386
-Distribution: 10.5, 10.6
 License: GPL/LGPL
 
 Depends: <<
-  lazarus-aqua (>= 0.9.20.2),
+  lazarus-aqua (>= 0.9.30.4),
   gtk+2-shlibs,
   glib2-shlibs,
   cairo-shlibs
 <<
 
 Builddepends: gtk+2, gtk+2-dev, glib2-dev, cairo
+Conflicts: lazarus-gtk2
 
 Recommends: fpc-doc, lazarus-doc
 
 Source: http://downloads.sourceforge.net/lazarus/lazarus-%v-src.tar.bz2
-Source-MD5: 0dcf54613c2f9d38a32d183431e2dfc9
+Source-MD5: ebd40cdfdfc4b66d1ced7a0d48d6da84
 
 SourceDirectory: lazarus
 
@@ -40,7 +39,7 @@
 
 <<
 
-Description: gtk2 lcl for lazarus-aqua
+Description: The gtk2 version of the lcl for lazarus-aqua
 
 DescUsage: <<
   With this package, lazarus-aqua can also build programs with the

Index: lazarus-lcl-win32.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/lazarus-lcl-win32.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lazarus-lcl-win32.info      4 Jan 2012 15:06:38 -0000       1.1
+++ lazarus-lcl-win32.info      3 Apr 2012 18:08:43 -0000       1.2
@@ -1,19 +1,18 @@
 Package: lazarus-lcl-win32
-Version: 0.9.30.2
+Version: 0.9.30.4
 Revision: 1
-Architecture: i386
-Distribution: 10.4, 10.5, 10.6
+Architecture: i386, x86_64
 License: GPL/LGPL
 
 Depends: <<
-  lazarus-aqua (>= 0.9.20.2) | lazarus-gtk2 (>= 0.9.20.2),
+ lazarus-aqua (>= 0.9.20.2) | lazarus-gtk2 (>= 
0.9.20.2),/lazarus-lcl-win32.info,v_TARGET=i386Œ+ðßôÿ"a'qŒ+òç'qŒ+€úßôÿðúßôÿóh'qŒ+€Š(qŒ+ètHqŒ+’XDrŒ+ðúßôÿ€pfrŒ+ðßôÿÐîßôÿë}'qŒ+6
 
èè!è!€úßôÿðúßôÿxDrŒ+ñßôÿ"a'qŒ+~'qŒ+€úßôÿð`'qŒ+¿úßôÿÀ¨rŒ+óh'qŒ+¨rŒ+بrŒ+¨
        
¨rŒ+€Š(qŒ+xDrŒ+ñßôÿÐïßôÿë}'qŒ+à!à!€úßôÿðúßôÿÈÝ#rŒ+àñßôÿ"a'qŒ+~'qŒ+€úßôÿð`'qŒ+¿úßôÿ°úßôÿ¨úßôÿ{HqŒ+Œp˜ðúßôÿóh'qŒ+€Š(qŒ+àñßôÿ°ðßôÿë}'qŒ+GHIJKMNOP€úßôÿðúßôÿH•úqŒ+€óßôÿ"a'qŒ+~'qŒ+€úßôÿ0¨rŒ+óh'qŒ+
 DrŒ+ É×qŒ+¨rŒ+بrŒ+¨ 
¨rŒ+€Š(qŒ+H•úqŒ+€óßôÿÀñßôÿë}'qŒ+8•úqŒ+€óßôÿðñßôÿë}'qŒ+(•úqŒ+€óßôÿ
 òßôÿë}'qŒ+•úqŒ+€óßôÿPòßôÿë}'qŒ+  
¨¨rŒ+óh'qŒ+¨        
¨rŒ+ÐìßôÿŠØqŒ+æg'qŒ+بrŒ+ðòßôÿyØqŒ+æg'qŒ+¨rŒ+
 óßôÿZØqŒ+æg'qŒ+ØÄ×qŒ+ 
DrŒ+ É×qŒ+¨rŒ+Ø$DrŒ+بrŒ+¨ 
¨rŒ+€Š(qŒ+{HqŒ+£qŒ+ðúßôÿp[×qŒ+Ðôßôÿ óßôÿë}'qŒ+5678:<=>?@BD€úßôÿðúßôÿà qŒ+ðúßôÿóh'qŒ+ètHqŒ+Póßôÿ£qŒ+æg'qŒ+ètHqŒ+Õ_@fÆS
 
Qöl±íÁ³oqŒ+ðúßôÿà qŒ+àõßôÿ°ôßôÿë}'qŒ+u]ÞÓ
      4Q 
÷U^Qʉ§¶uª¹ñìò*ēv´2©qŒ+0üßôÿF0sŒ+F0sŒ+?…¦qŒ+ðûßôÿ€úßôÿ÷ßôÿ¿úßôÿ°úßôÿ¨úßôÿpýßôÿB0
sŒ+@üßôÿØ$DrŒ+ 
)DrŒ+€Š(qŒ+ÿÿÿÿÿÿÿÿB0sŒ+øúßôÿë}'q 
lazarus-aqua (>= 0.9.30.4) | lazarus-gtk2 (>= 0.9.30.4),
   fpc-cross-i386-win32 (>= 2.6.0)
 <<
 
 Recommends: fpc-doc, lazarus-doc
 
 Source: http://downloads.sourceforge.net/lazarus/lazarus-%v-src.tar.bz2
-Source-MD5: 0dcf54613c2f9d38a32d183431e2dfc9
+Source-MD5: ebd40cdfdfc4b66d1ced7a0d48d6da84
 
 SourceDirectory: lazarus
 
@@ -28,7 +27,7 @@
 
   AllUnits="lcl packager/registration ideintf bigidecomponents packager"
 
-  make $AllUnits LCL_PLATFORM=win32 OPT="$debug_options" OS_TARGET=win32
+  make $AllUnits LCL_PLATFORM=win32 OPT="$debug_options" OS_TARGET=win32 
PP=ppc386 CPU_TARGET=i386
 <<
 
 InstallScript: <<

Index: lazarus.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/lazarus.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- lazarus.info        4 Jan 2012 15:06:38 -0000       1.9
+++ lazarus.info        3 Apr 2012 18:08:43 -0000       1.10
@@ -1,23 +1,21 @@
 Info2: <<
 Package: lazarus%type_pkg[uitype]
 Type: uitype (-aqua -gtk2)
-Version: 0.9.30.2
+Version: 0.9.30.4
 Revision: 1
-Architecture: powerpc, i386
 License: GPL/LGPL
 
 Recommends: fpc-doc, lazarus-doc
 
-Distribution: 10.5, 10.6
-
 Source: mirror:sourceforge:lazarus/lazarus-%v-src.tar.bz2
-Source-MD5: 0dcf54613c2f9d38a32d183431e2dfc9
+Source-MD5: ebd40cdfdfc4b66d1ced7a0d48d6da84
 
 SourceDirectory: lazarus
 
 Depends: <<
 fpc (>= 2.6.0),
 fpc-sources (>= 2.6.0),
+(%m = x86_64) fpc-cross-i386-darwin,
 (%type_pkg[uitype] = -gtk2) gtk+2-shlibs,
 (%type_pkg[uitype] = -gtk2) glib2-shlibs,
 (%type_pkg[uitype] = -gtk2) cairo-shlibs
@@ -30,16 +28,18 @@
 (%type_pkg[uitype] = -gtk2) cairo
 <<
 
-Conflicts: lazarus-common, lazarus-aqua, lazarus-gtk, lazarus-gtk2
-Replaces:  lazarus-common, lazarus-aqua, lazarus-gtk, lazarus-gtk2
+Conflicts: (%type_pkg[uitype] = -gtk2) lazarus-lcl-gtk2, lazarus-common, 
lazarus-aqua, lazarus-gtk, lazarus-gtk2
+Replaces:  (%type_pkg[uitype] = -gtk2) lazarus-lcl-gtk2, lazarus-common, 
lazarus-aqua, lazarus-gtk, lazarus-gtk2
 
 Patchscript: <<
 #!/bin/sh -ev
 
   chmod 755 .
 
-# quick fix of the -WG bug. It is already fixed for later ( >0.9.30.2) versions
-  sed -i.bak "s|' -WG'|''|g" ide/compileroptions.pp
+# add the fink directory tree. This might need a check in a new version
+  sed -i.bak 's|GenerateDwarf/Value'', false|GenerateDwarf/Value'', true|g'    
                           ide/compileroptions.pp
+  sed -i.bak 's|GenerateDwarf/Value'', GenerateDwarf, 
false|GenerateDwarf/Value'', GenerateDwarf, true|g' ide/compileroptions.pp
+  sed -i.bak 's|FGenerateDwarf := false;|FGenerateDwarf := true;|g'            
                           ide/compileroptions.pp
 
 # Correct the version in Info.plist
   sed -i.bak 's|\.1 beta|\.0|g' lazarus.app/Contents/Info.plist
@@ -93,10 +93,6 @@
 #
 # until then do it through changes in the source code:
 
-  sed -i.bak 's|GenerateDwarf/Value'', false|GenerateDwarf/Value'', true|g'    
                           ide/compileroptions.pp
-  sed -i.bak 's|GenerateDwarf/Value'', GenerateDwarf, 
false|GenerateDwarf/Value'', GenerateDwarf, true|g' ide/compileroptions.pp
-  sed -i.bak 's|FGenerateDwarf := false;|FGenerateDwarf := true;|g'            
                           ide/compileroptions.pp
-
 <<
 
 UseMaxBuildJobs: false
@@ -104,19 +100,24 @@
 CompileScript: <<
 #!/bin/sh -ev
 
-  debug_options="-gw"
+  debug_options="-gw -dDBG_WITH_TIMEOUT"
+  if [ "%m" = "x86_64" ]; then carbon_arch="PP=ppc386 CPU_TARGET=i386 
CPU_SOURCE=i386" ; else carbon_arch="" ; fi
+
 
 # ** Start compiling lazarus
 
+  AllUnits="lcl packager/registration ideintf bigidecomponents packager"
   if   [ "%type_raw[uitype]" == "-aqua" ]; then
-    make all LCL_PLATFORM=carbon OPT="$debug_options -dDBG_WITH_TIMEOUT"
+    make $AllUnits all LCL_PLATFORM=carbon OPT="$debug_options" $carbon_arch
   elif [ "%type_raw[uitype]" == "-gtk2" ]; then
-    make all LCL_PLATFORM=gtk2   OPT="$debug_options -dHasX 
-Fl%p/lib/pango-ft219/lib/"
+    make $AllUnits all LCL_PLATFORM=gtk2   OPT="$debug_options -dHasX 
-Fl%p/lib/pango-ft219/lib/ -k-framework -kApplicationServices"
 
-    AllUnits="lcl packager/registration ideintf bigidecomponents packager"
-    make $AllUnits LCL_PLATFORM=carbon OPT="$debug_options"
+    make $AllUnits LCL_PLATFORM=carbon OPT="$debug_options" $carbon_arch
   fi
 
+# 64 bit units
+  make $AllUnits LCL_PLATFORM=nogui OPT="$debug_options" 
+
 # ** Finish compiling Lazarus **
 #
 <<
@@ -181,6 +182,10 @@
   i386-win32
   i386-wince
   arm-wince.
+
+CPU_SOURCE is needed to build the 32bit version on 64bit systems.
+Otherwise building svn2revisioninc crashes.
+gtk2-64bit needs additional -k-framework -kApplicationServices
 <<
 
 Homepage: http://wiki.freepascal.org/Main_Page



------------------------------------------------------------------------------
Better than sec? Nothing is better than sec when it comes to
monitoring Big Data applications. Try Boundary one-second 
resolution app monitoring today. Free.
http://p.sf.net/sfu/Boundary-dev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to