From 82440a75084f4d5adc13761db35dc0c8481952ef Mon Sep 17 00:00:00 2001 From: Lu zhiping Date: Mon, 15 Aug 2022 16:26:58 +0800 Subject: [PATCH] format patches --- debian/patches/00-intrinsics.patch | 19 ++++++++++++++----- debian/patches/01-reproducibility.patch | 14 ++++++++++---- debian/patches/02-soname.patch | 21 +++++++++++++++------ debian/patches/03-pthread.patch | 14 ++++++++++---- 4 files changed, 49 insertions(+), 19 deletions(-) diff --git a/debian/patches/00-intrinsics.patch b/debian/patches/00-intrinsics.patch index 5a054b4..3e04dc8 100644 --- a/debian/patches/00-intrinsics.patch +++ b/debian/patches/00-intrinsics.patch @@ -1,12 +1,19 @@ -Description: INTRINSICS are not universally available -Author: Michael Tautschnig +From: Michael Tautschnig +Date: Mon, 15 Aug 2022 16:26:58 +0800 +Subject: INTRINSICS are not universally available + Forwarded: no Last-Update: 2016-07-08 --- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + src/util/hwf.cpp | 2 +- + src/util/mpz.cpp | 31 ++++++++----------------------- + 2 files changed, 9 insertions(+), 24 deletions(-) + +diff --git a/src/util/hwf.cpp b/src/util/hwf.cpp +index 89e2185..69f73d0 100644 --- a/src/util/hwf.cpp +++ b/src/util/hwf.cpp -@@ -48,7 +48,7 @@ +@@ -48,7 +48,7 @@ Revision History: // clear to the compiler what instructions should be used. E.g., for sqrt(), the Windows compiler selects // the x87 FPU, even when /arch:SSE2 is on. // Luckily, these are kind of standardized, at least for Windows/Linux/macOS. @@ -15,9 +22,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ #undef USE_INTRINSICS #endif +diff --git a/src/util/mpz.cpp b/src/util/mpz.cpp +index a8190df..036790c 100644 --- a/src/util/mpz.cpp +++ b/src/util/mpz.cpp -@@ -46,39 +46,24 @@ +@@ -46,39 +46,24 @@ Revision History: #define LEHMER_GCD #endif diff --git a/debian/patches/01-reproducibility.patch b/debian/patches/01-reproducibility.patch index 56c706c..fd96af8 100644 --- a/debian/patches/01-reproducibility.patch +++ b/debian/patches/01-reproducibility.patch @@ -1,11 +1,17 @@ -Description: Remove the use of __DATE__ to make the build reproducible -Author: Fabian Wolff +From: Fabian Wolff +Date: Mon, 15 Aug 2022 16:26:58 +0800 +Subject: Remove the use of __DATE__ to make the build reproducible + Last-Update: 2019-09-29 --- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + src/api/api_log.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/api/api_log.cpp b/src/api/api_log.cpp +index e82ec3f..1efa09b 100644 --- a/src/api/api_log.cpp +++ b/src/api/api_log.cpp -@@ -54,7 +54,7 @@ +@@ -54,7 +54,7 @@ extern "C" { res = false; } else { diff --git a/debian/patches/02-soname.patch b/debian/patches/02-soname.patch index d20c127..07825eb 100644 --- a/debian/patches/02-soname.patch +++ b/debian/patches/02-soname.patch @@ -1,11 +1,18 @@ -Description: Set the SONAME properly -Author: Fabian Wolff +From: Fabian Wolff +Date: Mon, 15 Aug 2022 16:26:58 +0800 +Subject: Set the SONAME properly + Last-Update: 2020-01-08 --- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + src/CMakeLists.txt | 4 ++-- + src/api/java/CMakeLists.txt | 3 ++- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 439d42d..d5320ad 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -119,8 +119,8 @@ +@@ -119,8 +119,8 @@ set_target_properties(libz3 PROPERTIES # libz3.so.W.X. # This indicates that no breaking API changes will be made within a single # minor version. @@ -16,9 +23,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ if (NOT MSVC) # On UNIX like platforms if we don't change the OUTPUT_NAME +diff --git a/src/api/java/CMakeLists.txt b/src/api/java/CMakeLists.txt +index f886639..130a38d 100644 --- a/src/api/java/CMakeLists.txt +++ b/src/api/java/CMakeLists.txt -@@ -52,6 +52,7 @@ +@@ -52,6 +52,7 @@ target_include_directories(z3java PRIVATE # This prevents CMake from automatically defining ``z3java_EXPORTS`` set_property(TARGET z3java PROPERTY DEFINE_SYMBOL "") @@ -26,7 +35,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ # Rule to generate the ``com.microsoft.z3.enumerations`` package # FIXME: This list of files is fragile -@@ -223,7 +224,7 @@ +@@ -223,7 +224,7 @@ if (Z3_INSTALL_JAVA_BINDINGS) ) # FIXME: I don't think this the right installation location set(Z3_JAVA_JNI_LIB_INSTALLDIR diff --git a/debian/patches/03-pthread.patch b/debian/patches/03-pthread.patch index db924b9..40c4d59 100644 --- a/debian/patches/03-pthread.patch +++ b/debian/patches/03-pthread.patch @@ -1,13 +1,19 @@ -Description: Fix build failure on riscv64 -Author: Aurelien Jarno +From: Aurelien Jarno +Date: Mon, 15 Aug 2022 16:26:58 +0800 +Subject: Fix build failure on riscv64 + Origin: vendor, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=948109#75 Bug-Debian: https://bugs.debian.org/948109 Last-Update: 2020-01-10 --- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0e2c8ac..e4f6b81 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -314,6 +314,7 @@ +@@ -314,6 +314,7 @@ endif() ################################################################################ # Threading support ################################################################################