Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

 devel/rust/HISTORY                                                           
|    5 
 devel/rust/patches/0001-libressl-3.4.x.patch                                 
|   16 +-
 devel/rust/patches/0014-llvm-wrapper-adapt-for-LLVM-17.patch                 
|   76 ++++++++++
 x11-libs/cairo/HISTORY                                                       
|    4 
 x11-libs/cairo/patches-stable/0001-Fix-build-with-external-libexecinfo.patch 
|   28 +++
 x11-libs/cairo/patches/0001-Fix-build-with-external-libexecinfo.patch        
|   28 ---
 6 files changed, 128 insertions(+), 29 deletions(-)

New commits:
commit 62c828207a6503815e5d2dbcc4d2e4f385cc18f6
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    x11-libs/cairo: apply libexecinfo patch only in stable

commit 83f94313da7928adc51d82e5eafd7460e415238e
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    devel/rust: updated/added patches to build with libressl 3.8.x and llvm 17

diff --git a/devel/rust/HISTORY b/devel/rust/HISTORY
index 662ee9b..a8d38b6 100644
--- a/devel/rust/HISTORY
+++ b/devel/rust/HISTORY
@@ -1,3 +1,8 @@
+2023-09-29 Pavel Vinogradov <public AT sorcemage.org>
+       * patches/0001-libressl-3.4.x.patch: updated
+       * patches/0014-llvm-wrapper-adapt-for-LLVM-17.patch: added patch for 
building
+         with llvm 17
+
 2023-09-19 Pavel Vinogradov <public AT sorcemage.org>
        * DETAILS: version 1.72.1
 
diff --git a/devel/rust/patches/0001-libressl-3.4.x.patch 
b/devel/rust/patches/0001-libressl-3.4.x.patch
index 8ba8603..89c762b 100644
--- a/devel/rust/patches/0001-libressl-3.4.x.patch
+++ b/devel/rust/patches/0001-libressl-3.4.x.patch
@@ -2,14 +2,28 @@ diff --git a/vendor/openssl-sys/build/cfgs.rs 
b/vendor/openssl-sys/build/cfgs.rs
 index 960515f..f901e5a 100644
 --- a/vendor/openssl-sys/build/cfgs.rs
 +++ b/vendor/openssl-sys/build/cfgs.rs
-@@ -52,6 +52,9 @@ pub fn get(openssl_version: Option<u64>, libressl_version: 
Option<u64>) -> Vec<&
+@@ -53,6 +53,12 @@ pub fn get(openssl_version: Option<u64>, 
libressl_version: Option<u64>) -> Vec<&
          if libressl_version >= 0x3_07_00_00_0 {
              cfgs.push("libressl370");
          }
 +        if libressl_version >= 0x3_08_00_00_0 {
 +            cfgs.push("libressl380");
 +        }
++        if libressl_version >= 0x3_08_00_01_0 {
++            cfgs.push("libressl381");
++        }
      } else {
          let openssl_version = openssl_version.unwrap();
  
+diff --git a/vendor/openssl-sys/build/main.rs 
b/vendor/openssl-sys/build/main.rs
+index 3359165..d5913ce 100644
+--- a/vendor/openssl-sys/build/main.rs
++++ b/vendor/openssl-sys/build/main.rs
+@@ -274,6 +274,7 @@ See rust-openssl documentation for more information:
+             (3, 7, 1) => ('3', '7', '1'),
+             (3, 7, _) => ('3', '7', 'x'),
+             (3, 8, 0) => ('3', '8', '0'),
++            (3, 8, _) => ('3', '8', 'x'),
+             _ => version_error(),
+         };
  
diff --git a/devel/rust/patches/0014-llvm-wrapper-adapt-for-LLVM-17.patch 
b/devel/rust/patches/0014-llvm-wrapper-adapt-for-LLVM-17.patch
new file mode 100644
index 0000000..15729c2
--- /dev/null
+++ b/devel/rust/patches/0014-llvm-wrapper-adapt-for-LLVM-17.patch
@@ -0,0 +1,76 @@
+From 71958da4854176c50a8b12470b956d5c7ed11817 Mon Sep 17 00:00:00 2001
+From: Krasimir Georgiev <krasimir AT google.com>
+Date: Wed, 12 Jul 2023 09:30:31 +0000
+Subject: [PATCH] llvm-wrapper: adapt for LLVM API change
+
+Adapts the wrapper for LLVM commit
+https://github.com/llvm/llvm-project/commit/546ec641b4b1bbbf9e66a53983b635fe85d365e6.
+
+Found by the experimental rust + LLVM @ HEAD bot: 
https://buildkite.com/llvm-project/rust-llvm-integrate-prototype/builds/20723#01894922-ed5d-4830-81f6-a27fb82ec8c7/210-645
+---
+ compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp 
b/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp
+index c43a02724773..eb3d67e720f2 100644
+--- a/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp
++++ b/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp
+@@ -667,6 +667,7 @@ LLVMRustOptimize(
+     assert(!PGOUsePath && !PGOSampleUsePath);
+     PGOOpt = PGOOptions(PGOGenPath, "", "",
+ #if LLVM_VERSION_GE(17, 0)
++                        "",
+                         FS,
+ #endif
+                         PGOOptions::IRInstr, PGOOptions::NoCSAction,
+@@ -675,6 +676,7 @@ LLVMRustOptimize(
+     assert(!PGOSampleUsePath);
+     PGOOpt = PGOOptions(PGOUsePath, "", "",
+ #if LLVM_VERSION_GE(17, 0)
++                        "",
+                         FS,
+ #endif
+                         PGOOptions::IRUse, PGOOptions::NoCSAction,
+@@ -682,6 +684,7 @@ LLVMRustOptimize(
+   } else if (PGOSampleUsePath) {
+     PGOOpt = PGOOptions(PGOSampleUsePath, "", "",
+ #if LLVM_VERSION_GE(17, 0)
++                        "",
+                         FS,
+ #endif
+                         PGOOptions::SampleUse, PGOOptions::NoCSAction,
+@@ -689,6 +692,7 @@ LLVMRustOptimize(
+   } else if (DebugInfoForProfiling) {
+     PGOOpt = PGOOptions("", "", "",
+ #if LLVM_VERSION_GE(17, 0)
++                        "",
+                         FS,
+ #endif
+                         PGOOptions::NoAction, PGOOptions::NoCSAction,
+
+From 6ddf9128b2b55f9def80af57f7353d2521527c6a Mon Sep 17 00:00:00 2001
+From: Krasimir Georgiev <krasimir AT google.com>
+Date: Fri, 14 Jul 2023 12:10:29 +0000
+Subject: [PATCH] llvm-wrapper: update for LLVM API change
+
+No functional changes intended.
+
+Adds an include for llvm::SmallString. Previously, this must have been
+implicitly provided by some of the existing headers. With recent LLVM
+changes, not anymore:
+https://buildkite.com/llvm-project/rust-llvm-integrate-prototype/builds/20776#01895448-44a4-4a1e-8407-9d41d0186132/209-690
+---
+ compiler/rustc_llvm/llvm-wrapper/SymbolWrapper.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/compiler/rustc_llvm/llvm-wrapper/SymbolWrapper.cpp 
b/compiler/rustc_llvm/llvm-wrapper/SymbolWrapper.cpp
+index 0493d6b05d03..bf00d11edf6d 100644
+--- a/compiler/rustc_llvm/llvm-wrapper/SymbolWrapper.cpp
++++ b/compiler/rustc_llvm/llvm-wrapper/SymbolWrapper.cpp
+@@ -7,6 +7,7 @@
+ // * 
https://github.com/llvm/llvm-project/blob/8ef3e895ad8ab1724e2b87cabad1dacdc7a397a3/llvm/include/llvm/Object/ArchiveWriter.h
+ // * 
https://github.com/llvm/llvm-project/blob/8ef3e895ad8ab1724e2b87cabad1dacdc7a397a3/llvm/lib/Object/ArchiveWriter.cpp
+ 
++#include "llvm/ADT/SmallString.h"
+ #include "llvm/IR/LLVMContext.h"
+ #include "llvm/Object/ObjectFile.h"
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index db17f28..89af473 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,7 @@
+2023-09-29 Pavel Vinogradov <public AT sorcemage.org>
+       * patches/0001-Fix-build-with-external-libexecinfo.patch ->
+         patches-stable/0001-Fix-build-with-external-libexecinfo.patch
+
 2023-09-23 Pavel Vinogradov <public AT sorcemage.org>
        * DETAILS: version 1.18.0, updated SOURCE_URL[0], added Watch line
        * DEPENDS: cleaned up xml flag
diff --git 
a/x11-libs/cairo/patches-stable/0001-Fix-build-with-external-libexecinfo.patch
 
b/x11-libs/cairo/patches-stable/0001-Fix-build-with-external-libexecinfo.patch
new file mode 100644
index 0000000..77a80ad
--- /dev/null
+++ 
b/x11-libs/cairo/patches-stable/0001-Fix-build-with-external-libexecinfo.patch
@@ -0,0 +1,28 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Subject: [PATCH] Fix build with external libexecinfo
+Date: Mon,  5 Sep 2022 11:44:43 +0200
+
+The backtracing functions may be implemented on a separate library instead
+of in the libc, so try to find it.
+
+Origin: Source Mage GNU/Linux
+Upstream-Status: Pending
+Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+---
+ util/meson.build |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/util/meson.build b/util/meson.build
+index 5cc209cc9288..54f0f8406f9f 100644
+--- a/util/meson.build
++++ b/util/meson.build
+@@ -60,5 +60,7 @@ foreach util : cairo_utils
+ endforeach
+ 
+ if conf.get('CAIRO_HAS_DLSYM', 0) == 1 and cc.has_header('execinfo.h')
+-  libmallocstats = library('malloc-stats', 'malloc-stats.c', dependencies : 
dl_dep)
++  execinfo_dep = cc.find_library('execinfo', required: false)
++  libmallocstats = library('malloc-stats', 'malloc-stats.c',
++                           dependencies: [dl_dep, execinfo_dep])
+ endif
diff --git 
a/x11-libs/cairo/patches/0001-Fix-build-with-external-libexecinfo.patch 
b/x11-libs/cairo/patches/0001-Fix-build-with-external-libexecinfo.patch
deleted file mode 100644
index 77a80ad..0000000
--- a/x11-libs/cairo/patches/0001-Fix-build-with-external-libexecinfo.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ismael Luceno <ismael AT iodev.co.uk>
-Subject: [PATCH] Fix build with external libexecinfo
-Date: Mon,  5 Sep 2022 11:44:43 +0200
-
-The backtracing functions may be implemented on a separate library instead
-of in the libc, so try to find it.
-
-Origin: Source Mage GNU/Linux
-Upstream-Status: Pending
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
----
- util/meson.build |    4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/util/meson.build b/util/meson.build
-index 5cc209cc9288..54f0f8406f9f 100644
---- a/util/meson.build
-+++ b/util/meson.build
-@@ -60,5 +60,7 @@ foreach util : cairo_utils
- endforeach
- 
- if conf.get('CAIRO_HAS_DLSYM', 0) == 1 and cc.has_header('execinfo.h')
--  libmallocstats = library('malloc-stats', 'malloc-stats.c', dependencies : 
dl_dep)
-+  execinfo_dep = cc.find_library('execinfo', required: false)
-+  libmallocstats = library('malloc-stats', 'malloc-stats.c',
-+                           dependencies: [dl_dep, execinfo_dep])
- endif