Merge lp:~ntrrgc/inkscape/inkscape into lp:~inkscape.dev/inkscape/trunk

[Alicia Boya]

I have modified the CMake files in order to build inkview too.

Object files are compiled only once and then linked by both inkscape and inkview.

[lp:~ntrrgc/inkscape/inkscape]

14294. By jazzynico on 2015-08-13

Translations. New script for PO files statistics.

14295. By jazzynico on 2015-08-13

Tutorials. Tutorials check script update.

14296. By jazzynico on 2015-08-13

Translations. Fixing bad tutorials links in UI translations.

14297. By jazzynico on 2015-08-13

Tutorials. Adding new Greek, Chineese (TW) and French translations for Tracing pixel art.
Tutorials. Fixing more tutorial references in the UI translation files.
Tutorials. Adding missing Russian interpolate and Dutch Tracing pixel art tutorials in Makefile.am.

14298. By Krzysztof Kosinski on 2015-08-13

Fix bug in Maithili .po file.

One of the tutorial strings had a duplicate msgid line instead
of a msgid-msgstr pair, thereby causing a message compilation error.

14299. By Krzysztof Kosinski on 2015-08-13

2Geom: update to r2422.

Fixes LP #1482806: crash on Pattern along Path with horizontal segments.
This was caused by empty SBasis objects. After the changes in 2Geom,
empty SBasis objects should no longer be created.

[Mc (mc...)]

Compiles successfully inkscape and inkview

review: Approve

[lp:~ntrrgc/inkscape/inkscape]

14300. By Jabiertxof <email address hidden> on 2015-08-13

Refactor of BSPline code attemping to fix the duplicate end node bug, not sure if fixed jet

14301. By Jabiertxof <email address hidden> on 2015-08-14

A bit more refactor of BSPline tool. Still the bug duplicating end node :(

14302. By Alicia Boya on 2015-08-14

add inkview to the cmake build

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-06-14 04:40:36 +0000
+++ CMakeLists.txt	2015-08-13 13:19:02 +0000
@@ -149,7 +149,7 @@
 	# TODO: man, locale
 
 	install(
-		PROGRAMS ${EXECUTABLE_OUTPUT_PATH}/inkscape
+                PROGRAMS ${EXECUTABLE_OUTPUT_PATH}/inkscape ${EXECUTABLE_OUTPUT_PATH}/inkview
 		DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 	)
 

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-06-08 19:01:23 +0000
+++ src/CMakeLists.txt	2015-08-13 13:19:02 +0000
@@ -509,8 +509,14 @@
 #add_inkscape_lib(sp_LIB "${sp_SRC}")
 #add_inkscape_lib(inkscape_LIB "${inkscape_SRC}")
 
-# make executable for INKSCAPE
-add_executable(inkscape ${main_SRC} ${inkscape_SRC} ${sp_SRC})
+# Build everything except main and inkview.c in a CMake "object" library.
+# An object library is just a bunch of .o files. Linking them with main.c or inkview.c
+# we get the inkscape and inkview executables respectively.
+add_library(inkscape_base OBJECT ${inkscape_SRC} ${sp_SRC})
+
+# make executables for inkscape and inkview
+add_executable(inkscape ${main_SRC} $<TARGET_OBJECTS:inkscape_base>)
+add_executable(inkview inkview.cpp $<TARGET_OBJECTS:inkscape_base>)
 
 if(UNIX)
 # message after building.
@@ -523,31 +529,28 @@
 
 add_dependencies(inkscape inkscape_version)
 
-target_link_libraries(inkscape
-	# order from automake
-	#sp_LIB
-	#nrtype_LIB
-
-	#inkscape_LIB
-	#sp_LIB # annoying, we need both!
-	nrtype_LIB # annoying, we need both!
-
-	croco_LIB
-	avoid_LIB
-	gdl_LIB
-	cola_LIB
-	vpsc_LIB
-	livarot_LIB
-	uemf_LIB
-	2geom_LIB
-	depixelize_LIB
-	util_LIB
-	gc_LIB
-
-	${INKSCAPE_LIBS}
+set(INKSCAPE_TARGET_LIBS
+        # order from automake
+        #sp_LIB
+        #nrtype_LIB
+
+        #inkscape_LIB
+        #sp_LIB # annoying, we need both!
+        nrtype_LIB # annoying, we need both!
+
+        croco_LIB
+        avoid_LIB
+        gdl_LIB
+        cola_LIB
+        vpsc_LIB
+        livarot_LIB
+        uemf_LIB
+        2geom_LIB
+        depixelize_LIB
+        util_LIB
+        gc_LIB
+        ${INKSCAPE_LIBS}
 )
 
-# TODO
-# make executable for INKVIEW
-#add_executable(inkview inkview.cpp)
-# ...
+target_link_libraries(inkscape ${INKSCAPE_TARGET_LIBS})
+target_link_libraries(inkview ${INKSCAPE_TARGET_LIBS})

=== modified file 'src/svg/CMakeLists.txt'
--- src/svg/CMakeLists.txt	2014-10-14 11:01:49 +0000
+++ src/svg/CMakeLists.txt	2015-08-13 13:19:02 +0000
@@ -2,7 +2,7 @@
 set(svg_SRC
 	css-ostringstream.cpp
 	path-string.cpp
-	sp-svg.def
+        #sp-svg.def
 	stringstream.cpp
 	strip-trailing-zeros.cpp
 	svg-affine.cpp