From 4f04836cc3fea4211d8cb4f25eb44c27c0751366 Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Mon, 7 Nov 2016 23:36:49 +0100
Subject: annotate custom builds, and add correct revno into make dist tarballs

(bzr r15223)
---
 CMakeScripts/inkscape-version.cmake | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'CMakeScripts/inkscape-version.cmake')

diff --git a/CMakeScripts/inkscape-version.cmake b/CMakeScripts/inkscape-version.cmake
index 2155e0013..bbf222b32 100644
--- a/CMakeScripts/inkscape-version.cmake
+++ b/CMakeScripts/inkscape-version.cmake
@@ -7,13 +7,23 @@
 
 # We should extract the version from build.xml
 # but for now just hard code
+
 set(INKSCAPE_REVISION "unknown")
+set(INKSCAPE_CUSTOM "custom")
 
 if(EXISTS ${INKSCAPE_SOURCE_DIR}/.bzr/)
     execute_process(COMMAND
 	bzr revno --tree ${INKSCAPE_SOURCE_DIR}
 	OUTPUT_VARIABLE INKSCAPE_REVISION
 	OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+    execute_process(COMMAND
+        bzr status -S -V ${INKSCAPE_SOURCE_DIR}/src
+        OUTPUT_VARIABLE INKSCAPE_SOURCE_MODIFIED
+        OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if(NOT INKSCAPE_SOURCE_MODIFIED STREQUAL "")
+    string(CONCAT INKSCAPE_REVISION ${INKSCAPE_REVISION} " " ${INKSCAPE_CUSTOM})
+    endif()
 endif()
 message("revision is " ${INKSCAPE_REVISION})
 
-- 
cgit v1.2.3


From d11c2cb1902dfa00cb38cab81417272394e88a23 Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Sat, 3 Dec 2016 00:46:54 +0100
Subject: prevent use of string concat for compatibility with old cmake

(bzr r15292)
---
 CMakeScripts/inkscape-version.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'CMakeScripts/inkscape-version.cmake')

diff --git a/CMakeScripts/inkscape-version.cmake b/CMakeScripts/inkscape-version.cmake
index bbf222b32..11316101f 100644
--- a/CMakeScripts/inkscape-version.cmake
+++ b/CMakeScripts/inkscape-version.cmake
@@ -22,7 +22,7 @@ if(EXISTS ${INKSCAPE_SOURCE_DIR}/.bzr/)
         OUTPUT_VARIABLE INKSCAPE_SOURCE_MODIFIED
         OUTPUT_STRIP_TRAILING_WHITESPACE)
     if(NOT INKSCAPE_SOURCE_MODIFIED STREQUAL "")
-    string(CONCAT INKSCAPE_REVISION ${INKSCAPE_REVISION} " " ${INKSCAPE_CUSTOM})
+        set(INKSCAPE_REVISION ${INKSCAPE_REVISION} " " ${INKSCAPE_CUSTOM})
     endif()
 endif()
 message("revision is " ${INKSCAPE_REVISION})
-- 
cgit v1.2.3


From 30a0802e0a6ccbb37a76e816aa47ebf08e2b548d Mon Sep 17 00:00:00 2001
From: Eduard Braun <eduard.braun2@gmx.de>
Date: Mon, 13 Feb 2017 22:41:13 +0100
Subject: CMake: Cosmetic fix for version string

(set concatenates arguments with a semicolon ";")

(bzr r15517)
---
 CMakeScripts/inkscape-version.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'CMakeScripts/inkscape-version.cmake')

diff --git a/CMakeScripts/inkscape-version.cmake b/CMakeScripts/inkscape-version.cmake
index 11316101f..2e23925c4 100644
--- a/CMakeScripts/inkscape-version.cmake
+++ b/CMakeScripts/inkscape-version.cmake
@@ -22,7 +22,7 @@ if(EXISTS ${INKSCAPE_SOURCE_DIR}/.bzr/)
         OUTPUT_VARIABLE INKSCAPE_SOURCE_MODIFIED
         OUTPUT_STRIP_TRAILING_WHITESPACE)
     if(NOT INKSCAPE_SOURCE_MODIFIED STREQUAL "")
-        set(INKSCAPE_REVISION ${INKSCAPE_REVISION} " " ${INKSCAPE_CUSTOM})
+        set(INKSCAPE_REVISION "${INKSCAPE_REVISION} ${INKSCAPE_CUSTOM}")
     endif()
 endif()
 message("revision is " ${INKSCAPE_REVISION})
-- 
cgit v1.2.3