summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2020-04-04 09:33:20 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2020-04-04 09:33:20 +0000
commit3c68dce11d096f87dc7bf66b21ee6b718a8721eb (patch)
treeac7ffb937d31562b673ff91443809d6bb2f26401
parentMerging upstream version 1.3.14. (diff)
downloadgraphite2-3c68dce11d096f87dc7bf66b21ee6b718a8721eb.tar.xz
graphite2-3c68dce11d096f87dc7bf66b21ee6b718a8721eb.zip
Merging debian version 1.3.14-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog6
-rw-r--r--debian/patches/do-not-require-sse2.diff25
-rw-r--r--debian/patches/ffloat-store.diff2
-rw-r--r--debian/patches/no-icons.diff18
-rw-r--r--debian/patches/reproducible-build.diff10
5 files changed, 35 insertions, 26 deletions
diff --git a/debian/changelog b/debian/changelog
index 08aaff6..a019551 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+graphite2 (1.3.14-1) unstable; urgency=medium
+
+ * New upstream version 1.3.14
+
+ -- Rene Engelhard <rene@debian.org> Wed, 01 Apr 2020 11:11:00 +0200
+
graphite2 (1.3.13-11~progress5+u1) engywuck-backports; urgency=medium
* Uploading to engywuck-backports, remaining changes:
diff --git a/debian/patches/do-not-require-sse2.diff b/debian/patches/do-not-require-sse2.diff
index f25be8e..16e4410 100644
--- a/debian/patches/do-not-require-sse2.diff
+++ b/debian/patches/do-not-require-sse2.diff
@@ -1,21 +1,22 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index b6ac26b..77ba468 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
-@@ -107,9 +107,6 @@
- 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"
+@@ -108,7 +108,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
LINK_FLAGS "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}"
LINKER_LANGUAGE C)
-- if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86|i.86")
+ if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86|i.86")
- add_definitions(-mfpmath=sse -msse2)
-- endif()
- if (CMAKE_COMPILER_IS_GNUCXX)
- add_definitions(-Wdouble-promotion)
++ add_definitions(-mfpmath=sse)
endif()
-@@ -136,7 +133,7 @@
-
- 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 -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 -mfpmath=sse"
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ add_definitions(-Wno-class-memaccess -Wdouble-promotion)
+@@ -140,7 +140,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
LINK_FLAGS "-nodefaultlibs"
LINKER_LANGUAGE C)
+ if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86|i.86")
+- add_definitions(-mfpmath=sse -msse2)
++ add_definitions(-mfpmath=sse)
+ endif()
target_link_libraries(graphite2 c)
+ include(Graphite)
diff --git a/debian/patches/ffloat-store.diff b/debian/patches/ffloat-store.diff
index 0889fc4..3d2a383 100644
--- a/debian/patches/ffloat-store.diff
+++ b/debian/patches/ffloat-store.diff
@@ -8,4 +8,4 @@
+ 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 -ffloat-store"
LINK_FLAGS "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}"
LINKER_LANGUAGE C)
- if (CMAKE_COMPILER_IS_GNUCXX)
+ if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86|i.86")
diff --git a/debian/patches/no-icons.diff b/debian/patches/no-icons.diff
index b8ce821..4f12eaf 100644
--- a/debian/patches/no-icons.diff
+++ b/debian/patches/no-icons.diff
@@ -1,16 +1,18 @@
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index e91d9e1..cc0a48f 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
-@@ -12,11 +12,11 @@
+@@ -12,11 +12,11 @@ if(A2X)
if(DBLATEX)
add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/manual.pdf
- DEPENDS ${PROJECT_SOURCE_DIR}/[a-z]*.txt
-- COMMAND ${A2X} --icons -D ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/manual.txt)
-+ COMMAND ${A2X} -D ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/manual.txt)
+ DEPENDS ${PROJECT_SOURCE_DIR}/[a-z]*.asc
+- COMMAND ${A2X} --icons -D ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/manual.asc)
++ COMMAND ${A2X} -D ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/manual.asc)
add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/GTF.pdf
- DEPENDS ${PROJECT_SOURCE_DIR}/GTF.txt
- ${PROJECT_SOURCE_DIR}/OpCodes.txt
-- COMMAND ${A2X} --icons -D ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/GTF.txt)
-+ COMMAND ${A2X} -D ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/GTF.txt)
+ DEPENDS ${PROJECT_SOURCE_DIR}/GTF.asc
+ ${PROJECT_SOURCE_DIR}/OpCodes.asc
+- COMMAND ${A2X} --icons -D ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/GTF.asc)
++ COMMAND ${A2X} -D ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/GTF.asc)
set(DOC_DEPENDS ${PROJECT_BINARY_DIR}/manual.pdf ${PROJECT_BINARY_DIR}/GTF.pdf)
endif()
add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/manual.html
diff --git a/debian/patches/reproducible-build.diff b/debian/patches/reproducible-build.diff
index 221d9ea..df43d3d 100644
--- a/debian/patches/reproducible-build.diff
+++ b/debian/patches/reproducible-build.diff
@@ -3,9 +3,9 @@
@@ -12,7 +12,7 @@
if(DBLATEX)
add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/manual.pdf
- DEPENDS ${PROJECT_SOURCE_DIR}/[a-z]*.txt
-- COMMAND ${A2X} -D ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/manual.txt)
-+ COMMAND ${A2X} -D ${PROJECT_BINARY_DIR} --dblatex-opts="--tmpdir=docbuild" ${PROJECT_SOURCE_DIR}/manual.txt)
+ DEPENDS ${PROJECT_SOURCE_DIR}/[a-z]*.asc
+- COMMAND ${A2X} -D ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/manual.asc)
++ COMMAND ${A2X} -D ${PROJECT_BINARY_DIR} --dblatex-opts="--tmpdir=docbuild" ${PROJECT_SOURCE_DIR}/manual.asc)
add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/GTF.pdf
- DEPENDS ${PROJECT_SOURCE_DIR}/GTF.txt
- ${PROJECT_SOURCE_DIR}/OpCodes.txt
+ DEPENDS ${PROJECT_SOURCE_DIR}/GTF.asc
+ ${PROJECT_SOURCE_DIR}/OpCodes.asc