r19819 by jghali - #12881: update hyphen to 2.8.8 and move it to third_party directory

scribus-commit scribus-commit at lists.scribus.net
Sun Feb 15 14:59:48 UTC 2015 

Author: jghali
Date: Sun Feb 15 14:59:48 2015
New Revision: 19819

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19819
Log:
#12881: update hyphen to 2.8.8 and move it to third_party directory

Added:
    trunk/Scribus/scribus/third_party/hyphen/
    trunk/Scribus/scribus/third_party/hyphen/COPYING
    trunk/Scribus/scribus/third_party/hyphen/COPYING.LGPL
    trunk/Scribus/scribus/third_party/hyphen/COPYING.MPL
    trunk/Scribus/scribus/third_party/hyphen/README
    trunk/Scribus/scribus/third_party/hyphen/hnjalloc.c
    trunk/Scribus/scribus/third_party/hyphen/hnjalloc.h
    trunk/Scribus/scribus/third_party/hyphen/hyphen.c
    trunk/Scribus/scribus/third_party/hyphen/hyphen.h
Modified:
    trunk/Scribus/scribus/CMakeLists.txt
    trunk/Scribus/scribus/hnjalloc.c
    trunk/Scribus/scribus/hnjalloc.h
    trunk/Scribus/scribus/hyphen.c
    trunk/Scribus/scribus/hyphen.h
    trunk/Scribus/scribus/hyphenator.h
    trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj
    trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj.filters
    trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj
    trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj.filters

Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19819&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/CMakeLists.txt Sun Feb 15 14:59:48 2015
@@ -989,10 +989,11 @@
 )
 
 IF(NOT HAVE_HYPHEN)
+	INCLUDE_DIRECTORIES(third_party/hyphen)
 	SET(SCRIBUS_SOURCES
 	${SCRIBUS_SOURCES}
-	hnjalloc.c
-	hyphen.c
+	third_party/hyphen/hnjalloc.c
+	third_party/hyphen/hyphen.c
 	)
 ENDIF(NOT HAVE_HYPHEN)
 

Modified: trunk/Scribus/scribus/hyphenator.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19819&path=/trunk/Scribus/scribus/hyphenator.h
==============================================================================
--- trunk/Scribus/scribus/hyphenator.h (original)
+++ trunk/Scribus/scribus/hyphenator.h Sun Feb 15 14:59:48 2015
@@ -13,7 +13,8 @@
 #include <QSet>
 
 #include "scribusapi.h"
-#include "hyphen.h"
+#include "third_party/hyphen/hyphen.h"
+
 class ScribusDoc;
 class ScribusMainWindow;
 class PageItem;

Modified: trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19819&path=/trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj
==============================================================================
--- trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj (original)
+++ trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj Sun Feb 15 14:59:48 2015
@@ -285,10 +285,10 @@
     <moc Include="..\..\..\scribus\ui\filedialogeventcatcher.h" />
     <moc Include="..\..\..\scribus\ui\downloadspalette.h" />
     <ClInclude Include="..\..\..\scribus\ui\helpnavigation.h" />
-    <ClInclude Include="..\..\..\scribus\hnjalloc.h" />
+    <ClInclude Include="..\..\..\scribus\third_party\hyphen\hnjalloc.h" />
     <moc Include="..\..\..\scribus\ui\hruler.h" />
     <moc Include="..\..\..\scribus\ui\hyask.h" />
-    <ClInclude Include="..\..\..\scribus\hyphen.h" />
+    <ClInclude Include="..\..\..\scribus\third_party\hyphen\hyphen.h" />
     <moc Include="..\..\..\scribus\hyphenator.h" />
     <moc Include="..\..\..\scribus\ui\imageinfodialog.h" />
     <moc Include="..\..\..\scribus\ui\inlinepalette.h" />
@@ -921,7 +921,7 @@
     <ClCompile Include="..\..\..\scribus\guidesview.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\helpbrowser.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\helpnavigation.cpp" />
-    <ClCompile Include="..\..\..\scribus\hnjalloc.c">
+    <ClCompile Include="..\..\..\scribus\third_party\hyphen\hnjalloc.c">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
       </PrecompiledHeader>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -937,7 +937,7 @@
     </ClCompile>
     <ClCompile Include="..\..\..\scribus\ui\hruler.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\hyask.cpp" />
-    <ClCompile Include="..\..\..\scribus\hyphen.c">
+    <ClCompile Include="..\..\..\scribus\third_party\hyphen\hyphen.c">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
       </PrecompiledHeader>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

Modified: trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19819&path=/trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj.filters (original)
+++ trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj.filters Sun Feb 15 14:59:48 2015
@@ -218,10 +218,10 @@
     <ClInclude Include="..\..\..\scribus\ui\helpnavigation.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\scribus\hnjalloc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\hyphen.h">
+    <ClInclude Include="..\..\..\scribus\third_party\hyphen\hnjalloc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\scribus\third_party\hyphen\hyphen.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\scribus\ioapi.h">
@@ -1426,7 +1426,7 @@
     <ClCompile Include="..\..\..\scribus\ui\helpnavigation.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\scribus\hnjalloc.c">
+    <ClCompile Include="..\..\..\scribus\third_party\hyphen\hnjalloc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\scribus\ui\hruler.cpp">
@@ -1435,7 +1435,7 @@
     <ClCompile Include="..\..\..\scribus\ui\hyask.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\scribus\hyphen.c">
+    <ClCompile Include="..\..\..\scribus\third_party\hyphen\hyphen.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\scribus\hyphenator.cpp">

Modified: trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19819&path=/trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj
==============================================================================
--- trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj (original)
+++ trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj Sun Feb 15 14:59:48 2015
@@ -398,10 +398,10 @@
     <moc Include="..\..\..\scribus\ui\filedialogeventcatcher.h" />
     <moc Include="..\..\..\scribus\ui\downloadspalette.h" />
     <ClInclude Include="..\..\..\scribus\ui\helpnavigation.h" />
-    <ClInclude Include="..\..\..\scribus\hnjalloc.h" />
+    <ClInclude Include="..\..\..\scribus\third_party\hyphen\hnjalloc.h" />
     <moc Include="..\..\..\scribus\ui\hruler.h" />
     <moc Include="..\..\..\scribus\ui\hyask.h" />
-    <ClInclude Include="..\..\..\scribus\hyphen.h" />
+    <ClInclude Include="..\..\..\scribus\third_party\hyphen\hyphen.h" />
     <moc Include="..\..\..\scribus\hyphenator.h" />
     <moc Include="..\..\..\scribus\ui\imageinfodialog.h" />
     <moc Include="..\..\..\scribus\ui\inlinepalette.h" />
@@ -1034,7 +1034,7 @@
     <ClCompile Include="..\..\..\scribus\guidesview.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\helpbrowser.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\helpnavigation.cpp" />
-    <ClCompile Include="..\..\..\scribus\hnjalloc.c">
+    <ClCompile Include="..\..\..\scribus\third_party\hyphen\hnjalloc.c">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
       </PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -1062,7 +1062,7 @@
     </ClCompile>
     <ClCompile Include="..\..\..\scribus\ui\hruler.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\hyask.cpp" />
-    <ClCompile Include="..\..\..\scribus\hyphen.c">
+    <ClCompile Include="..\..\..\scribus\third_party\hyphen\hyphen.c">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
       </PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

Modified: trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19819&path=/trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj.filters (original)
+++ trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj.filters Sun Feb 15 14:59:48 2015
@@ -218,10 +218,10 @@
     <ClInclude Include="..\..\..\scribus\ui\helpnavigation.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\scribus\hnjalloc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\hyphen.h">
+    <ClInclude Include="..\..\..\scribus\third_party\hyphen\hnjalloc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\scribus\third_party\hyphen\hyphen.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\scribus\ioapi.h">
@@ -1417,7 +1417,7 @@
     <ClCompile Include="..\..\..\scribus\ui\helpnavigation.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\scribus\hnjalloc.c">
+    <ClCompile Include="..\..\..\scribus\third_party\hyphen\hnjalloc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\scribus\ui\hruler.cpp">
@@ -1426,7 +1426,7 @@
     <ClCompile Include="..\..\..\scribus\ui\hyask.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\scribus\hyphen.c">
+    <ClCompile Include="..\..\..\scribus\third_party\hyphen\hyphen.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\scribus\hyphenator.cpp">

More information about the scribus-commit mailing list