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

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed May 14 14:16:12 2008
New Revision: 12550
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12550&view=rev

Log:
2008-05-14  Rene Engelhard  <rene debian org>

        * patches/dev300/apply,
          patches/dev300/fixup-system-hyph.diff: fix system-hyph



Added:
   trunk/patches/dev300/fixup-system-hyph.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed May 14 14:16:12 2008
@@ -955,6 +955,9 @@
 # fix build with system-hunspell
 fix-system-hunspell.diff, i#87604
 
+[ BuildBits >= dev300-m12 ]
+fixup-system-hyph.diff, i#89468
+
 [ NovellOnlyWin32 ]
 SectionOwner => tml
 

Added: trunk/patches/dev300/fixup-system-hyph.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/fixup-system-hyph.diff	Wed May 14 14:16:12 2008
@@ -0,0 +1,42 @@
+? download/hyphen-2.3.1
+Index: makefile.mk
+===================================================================
+RCS file: /cvs/external/hyphen/makefile.mk,v
+retrieving revision 1.5
+diff -u -u -r1.5 makefile.mk
+--- makefile.mk	22 Apr 2008 14:42:43 -0000	1.5
++++ makefile.mk	14 May 2008 13:59:45 -0000
+@@ -50,10 +50,19 @@
+ CONFIGURE_DIR=$(BUILD_DIR)
+ 
+ #relative to CONFIGURE_DIR
++# still needed also in system-hyphen case as it creates the makefile
+ CONFIGURE_ACTION=configure
+ CONFIGURE_FLAGS= --disable-shared --with-pic
+ 
++.IF "$(SYSTEM_HYPH)" == "YES" && "$(WITH_MYSPELL_DICTS)" == "YES"
++BUILD_ACTION=make hyph_en_US.dic
++.ELIF "$(SYSTEM_HYPH)" == "YES" && "$(WITH_MYSPELL_DICTS)" != "YES"
++ all:
++	echo "Nothing to do here."
++.ELSE
+ BUILD_ACTION=make
++OUT2INC += hyphen.h 
++.ENDIF
+ 
+ .ENDIF # "$(GUI)"=="UNX"
+ 
+Index: prj/d.lst
+===================================================================
+RCS file: /cvs/external/hyphen/prj/d.lst,v
+retrieving revision 1.4
+diff -u -u -r1.4 d.lst
+--- prj/d.lst	7 May 2008 15:37:26 -0000	1.4
++++ prj/d.lst	14 May 2008 13:59:45 -0000
+@@ -1,5 +1,5 @@
+ ..\%__SRC%\slb\hyphen.lib     %_DEST%\lib%_EXT%\hyphen.lib
+ 
+-..\%__SRC%\misc\build\hyphen-2.3.1\hyphen.h %_DEST%\inc\hyphen.h
++..\%__SRC%\inc\hyphen.h %_DEST%\inc\hyphen.h
+ ..\%__SRC%\misc\build\hyphen-2.3.1\.libs\libhyphen.a %_DEST%\lib%_EXT%\libhyphen.a
+ ..\%__SRC%\misc\build\hyphen-2.3.1\hyph_en_US.dic %_DEST%\bin\hyph_en_US.dic