Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (dbe98fdbc3c37f596b2ca18b65f2c000bc67773b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (dbe98fdbc3c37f596b2ca18b65f2c000bc67773b)
  • Date: Mon, 8 Jun 2020 08:01:12 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

database/firebird3/HISTORY |
3
database/firebird3/patches/0001-use-system-libedit.patch |
22 ++--
database/firebird3/patches/0002-use-system-libtommath.patch |
14 +-
database/firebird3/patches/0003-suppress-some-includes.patch |
32 +++---
database/firebird3/patches/0004-cmake-fix-for-non-sse4.2-machine.patch |
12 +-
database/firebird3/patches/0005-fix-build-with-cmake-3.16.patch |
43 ++++++++
database/firebird3/patches/0005-make-pthread-usage-explicit.patch |
24 ----
database/firebird3/patches/0006-cmake-fix-for-SecDbCache.patch |
37 +++++++
database/firebird3/patches/0006-fix-build-with-cmake-3.16.patch |
43 --------
database/firebird3/patches/0007-cmake-fix-for-glibc-2.31.patch |
31 ++++++
database/firebird3/patches/0008-tweak-libedit-usage.patch |
50 ++++++++++
disk/libburn/DETAILS |
2
disk/libburn/HISTORY |
3
13 files changed, 210 insertions(+), 106 deletions(-)

New commits:
commit dbe98fdbc3c37f596b2ca18b65f2c000bc67773b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

firebird3$ - update patches

commit 744629e577f8e0a691acd7f125b00b431bb8bfb7
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libburn: => 1.5.2.pl01

diff --git a/database/firebird3/HISTORY b/database/firebird3/HISTORY
index ac61c55..e48c905 100644
--- a/database/firebird3/HISTORY
+++ b/database/firebird3/HISTORY
@@ -1,3 +1,6 @@
+2020-06-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * patches/*: update
+
2020-01-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.0.5.33220-0
* patches/*: update
diff --git a/database/firebird3/patches/0001-use-system-libedit.patch
b/database/firebird3/patches/0001-use-system-libedit.patch
index 5e67283..2cb0a81 100644
--- a/database/firebird3/patches/0001-use-system-libedit.patch
+++ b/database/firebird3/patches/0001-use-system-libedit.patch
@@ -1,7 +1,7 @@
-From 67edd37004966eff8329cfc9bffe91c797c70f7d Mon Sep 17 00:00:00 2001
+From 480099803708167a8d26bc126ce412459f00641c Mon Sep 17 00:00:00 2001
From: Treeve Jelbert <treeve AT sourcemage.org>
Date: Thu, 7 Jan 2016 15:59:12 +0100
-Subject: [PATCH 1/6] use system libedit
+Subject: [PATCH 1/8] use system libedit

---
CMakeLists.txt | 2 +-
@@ -11,10 +11,10 @@ Subject: [PATCH 1/6] use system libedit
4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6938299..fd1fc25 100644
+index 26a419d36b..86fed29d4e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -215,7 +215,7 @@ if (UNIX)
+@@ -216,7 +216,7 @@ if (UNIX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -msse4")

if (NOT CMAKE_CROSSCOMPILING)
@@ -24,7 +24,7 @@ index 6938299..fd1fc25 100644
if (NOT FREEBSD)
set(LIB_dl dl)
diff --git a/builds/cmake/Configure.cmake b/builds/cmake/Configure.cmake
-index 9faa0e5..81a0575 100644
+index 9faa0e50eb..81a057583f 100644
--- a/builds/cmake/Configure.cmake
+++ b/builds/cmake/Configure.cmake
@@ -124,7 +124,7 @@ set(include_files_list
@@ -37,7 +37,7 @@ index 9faa0e5..81a0575 100644
fcntl.h
float.h
diff --git a/src/include/gen/autoconfig.h.in
b/src/include/gen/autoconfig.h.in
-index 4440f4c..552255f 100644
+index 0229681a40..3e4b331266 100644
--- a/src/include/gen/autoconfig.h.in
+++ b/src/include/gen/autoconfig.h.in
@@ -195,8 +195,8 @@
@@ -52,10 +52,10 @@ index 4440f4c..552255f 100644
/* Define to 1 if you have the <errno.h> header file. */
#cmakedefine HAVE_ERRNO_H 1
diff --git a/src/isql/isql.epp b/src/isql/isql.epp
-index af9cd49..65b4a4e 100644
+index 3cb40b5b8a..c607ded862 100644
--- a/src/isql/isql.epp
+++ b/src/isql/isql.epp
-@@ -78,10 +78,8 @@
+@@ -77,10 +77,8 @@
#include <locale.h>
#endif

@@ -68,7 +68,7 @@ index af9cd49..65b4a4e 100644
#endif

enum literal_string_type
-@@ -622,7 +620,7 @@ int ISQL_main(int argc, char* argv[])
+@@ -636,7 +634,7 @@ int ISQL_main(int argc, char* argv[])
*
**************************************/

@@ -77,7 +77,7 @@ index af9cd49..65b4a4e 100644
setlocale(LC_CTYPE, "");
#endif
atexit(&atexit_fb_shutdown);
-@@ -851,7 +849,7 @@ static void readNextInputLine(const char* prompt)
+@@ -865,7 +863,7 @@ static void readNextInputLine(const char* prompt)

getColumn = 0;

@@ -87,5 +87,5 @@ index af9cd49..65b4a4e 100644
{
// CVC: On 2005-04-02, use an empty prompt when not working in
--
-2.16.0
+2.25.2

diff --git a/database/firebird3/patches/0002-use-system-libtommath.patch
b/database/firebird3/patches/0002-use-system-libtommath.patch
index 5da150e..9e83030 100644
--- a/database/firebird3/patches/0002-use-system-libtommath.patch
+++ b/database/firebird3/patches/0002-use-system-libtommath.patch
@@ -1,7 +1,7 @@
-From 3a92af4f6ae241f2bd84caef3c763e5ad8c80ec6 Mon Sep 17 00:00:00 2001
+From 462ee2b6bd77163404c5afc28e268b183a604756 Mon Sep 17 00:00:00 2001
From: Treeve Jelbert <treeve AT sourcemage.org>
Date: Sat, 24 Jan 2015 12:48:36 +0100
-Subject: [PATCH 2/6] use system libtommath
+Subject: [PATCH 2/8] use system libtommath

---
CMakeLists.txt | 5 -----
@@ -9,10 +9,10 @@ Subject: [PATCH 2/6] use system libtommath
2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fd1fc25..e607732 100644
+index 86fed29d4e..1e25ff673b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -321,7 +321,6 @@ endif() # if (NOT CMAKE_CROSSCOMPILING)
+@@ -322,7 +322,6 @@ endif() # if (NOT CMAKE_CROSSCOMPILING)

crosscompile_prebuild_steps()

@@ -20,7 +20,7 @@ index fd1fc25..e607732 100644
include_directories("extern/icu/include")
include_directories("extern/zlib")

-@@ -334,10 +333,6 @@
include_directories("${CMAKE_CURRENT_BINARY_DIR}/src/include/gen")
+@@ -335,10 +334,6 @@
include_directories("${CMAKE_CURRENT_BINARY_DIR}/src/include/gen")
# LIBRARY libtommath
########################################

@@ -32,7 +32,7 @@ index fd1fc25..e607732 100644
########################################
# EXECUTABLE btyacc
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 5b2739b..1344d1b 100644
+index 395965a69d..71ae606704 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -412,7 +412,7 @@ add_library (boot_yvalve SHARED
$<TARGET_OBJECTS:yvalve_common>
@@ -54,5 +54,5 @@ index 5b2739b..1344d1b 100644
PUBLIC ${LIB_readline}
PUBLIC ${LIB_dl}
--
-2.16.0
+2.25.2

diff --git a/database/firebird3/patches/0003-suppress-some-includes.patch
b/database/firebird3/patches/0003-suppress-some-includes.patch
index f1d229d..925e37b 100644
--- a/database/firebird3/patches/0003-suppress-some-includes.patch
+++ b/database/firebird3/patches/0003-suppress-some-includes.patch
@@ -1,36 +1,40 @@
-From abc15abbeb2c083f5741c7ba4b0b761f3facecfe Mon Sep 17 00:00:00 2001
+From e63d11d398c27b5a38016e7295de0ad23bde88a3 Mon Sep 17 00:00:00 2001
From: Treeve Jelbert <treeve AT sourcemage.org>
Date: Sat, 11 Feb 2017 14:56:02 +0100
-Subject: [PATCH 3/6] suppress some includes
+Subject: [PATCH 3/8] suppress some includes

---
- CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ CMakeLists.txt | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e607732..47b0fa9 100644
+index 1e25ff673b..0cdc0d10ab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -174,7 +174,7 @@ configure_file(${AUTOCONFIG_SRC} ${AUTOCONFIG} @ONLY)
+@@ -174,8 +174,6 @@ configure_file(${AUTOCONFIG_SRC} ${AUTOCONFIG} @ONLY)
#

################################################################################

-add_definitions(-DDEV_BUILD)
-+#add_definitions(-DDEV_BUILD)
-
+-
if (WIN32)
set(OS_DIR win32)
-@@ -321,8 +321,8 @@ endif() # if (NOT CMAKE_CROSSCOMPILING)
+ set(VERSION_RC ${CMAKE_SOURCE_DIR}/src/jrd/version.rc)
+@@ -322,12 +320,9 @@ endif() # if (NOT CMAKE_CROSSCOMPILING)

crosscompile_prebuild_steps()

-include_directories("extern/icu/include")
-include_directories("extern/zlib")
-+#include_directories("extern/icu/include")
-+#include_directories("extern/zlib")
-
+-
include_directories("src/include")
- include_directories("src/include/gen")
+-include_directories("src/include/gen")
+-include_directories("${CMAKE_CURRENT_BINARY_DIR}/src/include")
++include_directories("src/include/gen")
++include_directories("${CMAKE_CURRENT_BINARY_DIR}/src/include")
+ include_directories("${CMAKE_CURRENT_BINARY_DIR}/src/include/gen")
+
+ ########################################
--
-2.16.0
+2.25.2

diff --git
a/database/firebird3/patches/0004-cmake-fix-for-non-sse4.2-machine.patch
b/database/firebird3/patches/0004-cmake-fix-for-non-sse4.2-machine.patch
index 1c8e693..96a253e 100644
--- a/database/firebird3/patches/0004-cmake-fix-for-non-sse4.2-machine.patch
+++ b/database/firebird3/patches/0004-cmake-fix-for-non-sse4.2-machine.patch
@@ -1,7 +1,7 @@
-From f50cccdb659ceab185fa46516137693b8267a4dc Mon Sep 17 00:00:00 2001
+From 9dc161a68891671d52fc8aa3d13cf4334a4665d5 Mon Sep 17 00:00:00 2001
From: Treeve Jelbert <treeve AT sourcemage.org>
Date: Sat, 1 Apr 2017 13:11:35 +0200
-Subject: [PATCH 4/6] cmake fix for non sse4.2 machine
+Subject: [PATCH 4/8] cmake fix for non sse4.2 machine

---
CMakeLists.txt | 3 +--
@@ -9,7 +9,7 @@ Subject: [PATCH 4/6] cmake fix for non sse4.2 machine
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 47b0fa9..59210bf 100644
+index 0cdc0d10ab..9bcb59373a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@
@@ -21,7 +21,7 @@ index 47b0fa9..59210bf 100644

# In-source builds are not possible and so disabled.
if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
-@@ -212,7 +212,6 @@ if (UNIX)
+@@ -211,7 +211,6 @@ if (UNIX)
set(OS_DIR posix)

set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
@@ -30,7 +30,7 @@ index 47b0fa9..59210bf 100644
if (NOT CMAKE_CROSSCOMPILING)
set(LIB_readline edit)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 1344d1b..6bc51de 100644
+index 71ae606704..144f6003d2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -369,6 +369,7 @@ if (APPLE)
@@ -42,5 +42,5 @@ index 1344d1b..6bc51de 100644
add_dependencies_cc (common UpdateCloopInterfaces)

--
-2.16.0
+2.25.2

diff --git a/database/firebird3/patches/0005-fix-build-with-cmake-3.16.patch
b/database/firebird3/patches/0005-fix-build-with-cmake-3.16.patch
new file mode 100644
index 0000000..c442078
--- /dev/null
+++ b/database/firebird3/patches/0005-fix-build-with-cmake-3.16.patch
@@ -0,0 +1,43 @@
+From 0192ecf2d8d09517036bcf024c95477039d70e65 Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Tue, 3 Dec 2019 10:29:55 +0100
+Subject: [PATCH 5/8] fix build with cmake-3.16
+
+---
+ src/CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 144f6003d2..3c8641b743 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -266,7 +266,7 @@ add_custom_target(parse
+ SOURCES ${parse_src}
+ )
+ project_group(parse "Boot/Custom build steps")
+-set_source_files_properties(dsql/parse.cpp include/gen/parse.h PROPERTIES
GENERATED TRUE)
++set_source_files_properties(dsql/parse.cpp
${CMAKE_CURRENT_BINARY_DIR}/include/gen/parse.h PROPERTIES GENERATED TRUE)
+
+
+ ########################################
+@@ -357,7 +357,7 @@ add_library (burp ${burp_src}
${burp_generated_src_master})
+
+
+ ########################################
+-# LIBRARY common
++# LIBRARY Wcommon
+ ########################################
+
+ file(GLOB common_src "common/*.cpp" "common/classes/*.cpp"
"common/config/*.cpp" "common/os/${OS_DIR}/*.cpp" "common/sha2/*.cpp")
+@@ -371,7 +371,7 @@ endif()
+ add_library (common ${common_src} ${common_os_src}
${common_include})
+ set_source_files_properties(common/CRC32C.cpp PROPERTIES COMPILE_FLAGS
-msse4)
+ target_link_libraries (common ${LIB_mpr})
+-add_dependencies_cc (common UpdateCloopInterfaces)
++add_dependencies_cc (common UpdateCloopInterfaces parse)
+
+
+
################################################################################
+--
+2.25.2
+
diff --git
a/database/firebird3/patches/0005-make-pthread-usage-explicit.patch
b/database/firebird3/patches/0005-make-pthread-usage-explicit.patch
deleted file mode 100644
index f3f101e..0000000
--- a/database/firebird3/patches/0005-make-pthread-usage-explicit.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 90315362b464855c42602e0ee6a5c5def57214e0 Mon Sep 17 00:00:00 2001
-From: Treeve Jelbert <treeve AT sourcemage.org>
-Date: Thu, 18 Jan 2018 21:24:49 +0100
-Subject: [PATCH 5/6] make pthread usage explicit
-
----
- src/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 144f6003d2..c5a0181cf4 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -437,6 +437,7 @@ target_link_libraries (yvalve
- PRIVATE remote
- PRIVATE common
- PUBLIC tommath
-+ PUBLIC pthread
- PUBLIC ${LIB_Ws2_32}
- PUBLIC ${LIB_readline}
- PUBLIC ${LIB_dl}
---
-2.24.0
-
diff --git a/database/firebird3/patches/0006-cmake-fix-for-SecDbCache.patch
b/database/firebird3/patches/0006-cmake-fix-for-SecDbCache.patch
new file mode 100644
index 0000000..758d973
--- /dev/null
+++ b/database/firebird3/patches/0006-cmake-fix-for-SecDbCache.patch
@@ -0,0 +1,37 @@
+From 7d52f78631fe46cf36e64b2a055ca22e0a75b733 Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Tue, 11 Feb 2020 16:06:07 +0100
+Subject: [PATCH 6/8] cmake fix for SecDbCache
+
+---
+ src/CMakeLists.txt | 1 +
+ src/remote/CMakeLists.txt | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 3c8641b743..d289e37ef9 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -390,6 +390,7 @@ file(GLOB_RECURSE yvalve_include "yvalve/*.h")
+ set(yvalve_src ${yvalve_src}
+ auth/SecureRemotePassword/client/SrpClient.cpp
+ auth/SecurityDatabase/LegacyClient.cpp
++ auth/SecDbCache.cpp
+ plugins/crypt/arc4/Arc4.cpp
+ remote/client/BlrFromMessage.cpp
+ remote/client/interface.cpp
+diff --git a/src/remote/CMakeLists.txt b/src/remote/CMakeLists.txt
+index 5926008cc8..3d8ff54aad 100644
+--- a/src/remote/CMakeLists.txt
++++ b/src/remote/CMakeLists.txt
+@@ -15,6 +15,7 @@ set(remote_src
+ ../auth/SecureRemotePassword/srp.h
+ ../auth/SecureRemotePassword/Message.h
+ ../auth/trusted/AuthSspi.cpp
++ ../auth/SecDbCache.cpp
+ )
+ add_src_win32(remote_src
+ os/win32/wnet.cpp
+--
+2.25.2
+
diff --git a/database/firebird3/patches/0006-fix-build-with-cmake-3.16.patch
b/database/firebird3/patches/0006-fix-build-with-cmake-3.16.patch
deleted file mode 100644
index 2336adc..0000000
--- a/database/firebird3/patches/0006-fix-build-with-cmake-3.16.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From d0013d07402a7eba05fffe1983ea0d6ea2ab473c Mon Sep 17 00:00:00 2001
-From: Treeve Jelbert <treeve AT sourcemage.org>
-Date: Tue, 3 Dec 2019 10:29:55 +0100
-Subject: [PATCH 6/6] fix build with cmake-3.16
-
----
- src/CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index c5a0181cf4..ea4014c61f 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -266,7 +266,7 @@ add_custom_target(parse
- SOURCES ${parse_src}
- )
- project_group(parse "Boot/Custom build steps")
--set_source_files_properties(dsql/parse.cpp include/gen/parse.h PROPERTIES
GENERATED TRUE)
-+set_source_files_properties(dsql/parse.cpp
${CMAKE_CURRENT_BINARY_DIR}/include/gen/parse.h PROPERTIES GENERATED TRUE)
-
-
- ########################################
-@@ -357,7 +357,7 @@ add_library (burp ${burp_src}
${burp_generated_src_master})
-
-
- ########################################
--# LIBRARY common
-+# LIBRARY Wcommon
- ########################################
-
- file(GLOB common_src "common/*.cpp" "common/classes/*.cpp"
"common/config/*.cpp" "common/os/${OS_DIR}/*.cpp" "common/sha2/*.cpp")
-@@ -371,7 +371,7 @@ endif()
- add_library (common ${common_src} ${common_os_src}
${common_include})
- set_source_files_properties(common/CRC32C.cpp PROPERTIES COMPILE_FLAGS
-msse4)
- target_link_libraries (common ${LIB_mpr})
--add_dependencies_cc (common UpdateCloopInterfaces)
-+add_dependencies_cc (common UpdateCloopInterfaces parse)
-
-
-
################################################################################
---
-2.24.0
-
diff --git a/database/firebird3/patches/0007-cmake-fix-for-glibc-2.31.patch
b/database/firebird3/patches/0007-cmake-fix-for-glibc-2.31.patch
new file mode 100644
index 0000000..102b383
--- /dev/null
+++ b/database/firebird3/patches/0007-cmake-fix-for-glibc-2.31.patch
@@ -0,0 +1,31 @@
+From 7ef12b8a80cfd6e28ed20d7d59344716a8bd9b56 Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Tue, 11 Feb 2020 16:06:58 +0100
+Subject: [PATCH 7/8] cmake fix for glibc-2.31
+
+---
+ builds/cmake/Configure.cmake | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/builds/cmake/Configure.cmake b/builds/cmake/Configure.cmake
+index 81a057583f..02e8e501a1 100644
+--- a/builds/cmake/Configure.cmake
++++ b/builds/cmake/Configure.cmake
+@@ -287,10 +287,11 @@ set(CMAKE_EXTRA_INCLUDE_FILES Windows.h)
+ check_type_size("char[MAX_PATH]" MAXPATHLEN)
+ set(CMAKE_EXTRA_INCLUDE_FILES)
+
+-set(TIMEZONE_TYPE "struct timezone")
+-if (APPLE OR MINGW)
++#set(TIMEZONE_TYPE "struct timezone")
++#if (APPLE OR MINGW)
++ # fix for glibc-2.31
+ set(TIMEZONE_TYPE "void")
+-endif()
++#endif()
+ check_prototype_definition(
+ gettimeofday
+ "int gettimeofday(struct timeval *tv, ${TIMEZONE_TYPE} *tz)"
+--
+2.25.2
+
diff --git a/database/firebird3/patches/0008-tweak-libedit-usage.patch
b/database/firebird3/patches/0008-tweak-libedit-usage.patch
new file mode 100644
index 0000000..e74591b
--- /dev/null
+++ b/database/firebird3/patches/0008-tweak-libedit-usage.patch
@@ -0,0 +1,50 @@
+From 2698ac9ad9f669dbf18cd64c04a08a8018d34477 Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Sun, 22 Mar 2020 12:03:18 +0100
+Subject: [PATCH 8/8] tweak libedit usage
+
+---
+ src/CMakeLists.txt | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index d289e37ef9..5aa5514e07 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -416,7 +416,6 @@ target_link_libraries (boot_yvalve
+ PRIVATE common
+ PUBLIC tommath
+ PUBLIC ${LIB_Ws2_32}
+- PUBLIC ${LIB_readline}
+ PUBLIC ${LIB_dl}
+ PUBLIC ${LIB_iconv}
+ PUBLIC ${LIB_CoreFoundation}
+@@ -439,7 +438,6 @@ target_link_libraries (yvalve
+ PRIVATE common
+ PUBLIC tommath
+ PUBLIC ${LIB_Ws2_32}
+- PUBLIC ${LIB_readline}
+ PUBLIC ${LIB_dl}
+ PUBLIC ${LIB_iconv}
+ PUBLIC ${LIB_CoreFoundation}
+@@ -846,7 +844,7 @@ add_epp_suffix(isql_generated_src master)
+ if (NOT CMAKE_CROSSCOMPILING)
+
+ add_executable (boot_isql ${isql_src}
${isql_generated_src_boot} ${VERSION_RC})
+-target_link_libraries (boot_isql common boot_yvalve)
++target_link_libraries (boot_isql common boot_yvalve ${LIB_readline} )
+ set_output_directory (boot_isql . CURRENT_DIR)
+ project_group (boot_isql Boot)
+
+@@ -897,7 +895,7 @@ endif()
+ ########################################
+
+ add_executable (isql ${isql_src} ${isql_generated_src_master}
${VERSION_RC})
+-target_link_libraries (isql common yvalve)
++target_link_libraries (isql common yvalve ${LIB_readline} )
+
+
+ ########################################
+--
+2.25.2
+
diff --git a/disk/libburn/DETAILS b/disk/libburn/DETAILS
index 27383f5..2654190 100755
--- a/disk/libburn/DETAILS
+++ b/disk/libburn/DETAILS
@@ -9,7 +9,7 @@ if [[ $LIBBURN_BRANCH == scm ]]; then
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
SOURCE_IGNORE=volatile
else
- VERSION=1.5.2
+ VERSION=1.5.2.pl01
SOURCE2_IGNORE=signature
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
diff --git a/disk/libburn/HISTORY b/disk/libburn/HISTORY
index b928b3e..d37a04c 100644
--- a/disk/libburn/HISTORY
+++ b/disk/libburn/HISTORY
@@ -1,3 +1,6 @@
+2020-06-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.5.2pl01
+
2019-10-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.5.2




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (dbe98fdbc3c37f596b2ca18b65f2c000bc67773b), Treeve Jelbert, 06/08/2020

Archive powered by MHonArc 2.6.24.

Top of Page