ooo-build r12970 - in trunk: . patches/dev300

[mloiseleur svn gnome org]

Author: mloiseleur
Date: Thu Jun 26 12:29:53 2008
New Revision: 12970
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12970&view=rev

Log:
2008-06-26  Michel Loiseleur  <mloiseleur linagora com>

* patches/dev300/human-icons-add.diff:
* patches/dev300/static-libs-use-_pic.diff: update to current
release.

Modified:
   trunk/ChangeLog
   trunk/patches/dev300/human-icons-add.diff
   trunk/patches/dev300/static-libs-use-_pic.diff

Modified: trunk/patches/dev300/human-icons-add.diff
==============================================================================
--- trunk/patches/dev300/human-icons-add.diff	(original)
+++ trunk/patches/dev300/human-icons-add.diff	Thu Jun 26 12:29:53 2008
@@ -16,15 +16,16 @@
  				</constraints>
 --- solenv/inc/settings.mk.old	2007-08-04 02:51:40.000000000 -0500
 +++ solenv/inc/settings.mk	2007-08-04 02:51:55.000000000 -0500
-@@ -946,7 +946,7 @@
+@@ -956,6 +956,9 @@
+ RSCDEFS+= -DDEBUG
  .ENDIF
  
- # additional image sets
--CUSTOM_IMAGE_SETS=hicontrast industrial crystal tango
++# additional image sets
 +CUSTOM_IMAGE_SETS=hicontrast industrial crystal tango human
- 
++
  # settings for mozilla idl compiler
  XPIDL=xpidl
+ XPIDL_LINK=xpt_link
 --- svtools/inc/imgdef.hxx.old	2007-06-04 09:47:50.000000000 -0500
 +++ svtools/inc/imgdef.hxx	2007-08-04 02:53:12.000000000 -0500
 @@ -50,7 +50,8 @@

Modified: trunk/patches/dev300/static-libs-use-_pic.diff
==============================================================================
--- trunk/patches/dev300/static-libs-use-_pic.diff	(original)
+++ trunk/patches/dev300/static-libs-use-_pic.diff	Thu Jun 26 12:29:53 2008
@@ -28,10 +28,10 @@
  .ELSE
  AGGLIB=-lagg$(OFFICEUPD)$(DLLPOSTFIX)
  .ENDIF
-@@ -339,7 +339,7 @@
- .ELSE
- HUNSPELLLIB=-lhunspell-1.1
- .ENDIF
+@@ -335,7 +335,7 @@
+ UDMLIB=-ludm
+ HUNSPELLLIB*=-lhunspell
+ ULINGULIB=-lulingu
 -MYTHESLIB=-lmythes
 +MYTHESLIB*=-lmythes
  PYUNOLIB=-lpyuno