[graphite2] 03/04: don't require SS2

Rene Engelhard rene at moszumanska.debian.org
Sat May 6 11:39:10 UTC 2017


This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository graphite2.

commit 0edab6a1c7d8b56a4b18fe2e42530eb0d40eb1b8
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sat May 6 13:20:49 2017 +0200

    don't require SS2
---
 debian/patches/do-not-require-ss2.diff | 23 +++++++++++++++++++++++
 debian/patches/series                  |  1 +
 2 files changed, 24 insertions(+)

diff --git a/debian/patches/do-not-require-ss2.diff b/debian/patches/do-not-require-ss2.diff
new file mode 100644
index 0000000..6f7f1ce
--- /dev/null
+++ b/debian/patches/do-not-require-ss2.diff
@@ -0,0 +1,23 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 08e1c8f..4f1e7e5 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -111,9 +111,6 @@ if  (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+         COMPILE_FLAGS   "-Wall -Wextra -Wno-unknown-pragmas -Wendif-labels -Wshadow -Wctor-dtor-privacy -Wnon-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector"
+         LINK_FLAGS      "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}" 
+         LINKER_LANGUAGE C)
+-    if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86|i.86")
+-        add_definitions(-mfpmath=sse -msse2)
+-    endif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86|i.86")
+     if (CMAKE_COMPILER_IS_GNUCXX)
+         add_definitions(-Wdouble-promotion)
+     endif (CMAKE_COMPILER_IS_GNUCXX)
+@@ -138,7 +135,7 @@ endif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+ 
+ if  (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+     set_target_properties(graphite2 PROPERTIES 
+-        COMPILE_FLAGS   "-Wall -Wextra -Wno-unknown-pragmas -Wimplicit-fallthrough -Wendif-labels -Wshadow -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector -mfpmath=sse -msse2"
++        COMPILE_FLAGS   "-Wall -Wextra -Wno-unknown-pragmas -Wimplicit-fallthrough -Wendif-labels -Wshadow -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector"
+         LINK_FLAGS      "-nodefaultlibs" 
+         LINKER_LANGUAGE C)
+     target_link_libraries(graphite2 c)
diff --git a/debian/patches/series b/debian/patches/series
index 5bf0f98..bf7936e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+do-not-require-ss2.diff
 ffloat-store.diff
 non-linux.diff
 no-icons.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/graphite2.git



More information about the Pkg-openoffice-commits mailing list