From b4dc91df38cc9d3d8267eb332cc863ba94e88ab5 Mon Sep 17 00:00:00 2001
From: Evan Maddock <maddock.evan@vivaldi.net>
Date: Mon, 24 Aug 2026 12:01:25 -0400
Subject: [PATCH] ypkg: Update to version 35.1.3

**Summary**
Changelog available [here](https://github.com/getsolus/ypkg/releases/tag/v35.1.3).

Signed-off-by: Evan Maddock <maddock.evan@vivaldi.net>
---
 packages/y/ypkg/abi_used_symbols              | 16 ++++++++
 ...onger-update-debug-sections-in-bolt_.patch | 25 ------------
 ...acros-Update-bolt-optimization-flags.patch | 38 -------------------
 packages/y/ypkg/package.yml                   | 31 +++++++--------
 packages/y/ypkg/pspec_x86_64.xml              | 24 ++++++------
 5 files changed, 44 insertions(+), 90 deletions(-)
 delete mode 100644 packages/y/ypkg/files/0001-data-macros-No-longer-update-debug-sections-in-bolt_.patch
 delete mode 100644 packages/y/ypkg/files/0001-data-macros-Update-bolt-optimization-flags.patch

diff --git a/packages/y/ypkg/abi_used_symbols b/packages/y/ypkg/abi_used_symbols
index cb0a3028a3a6..e25e545f4b70 100644
--- a/packages/y/ypkg/abi_used_symbols
+++ b/packages/y/ypkg/abi_used_symbols
@@ -1,9 +1,11 @@
 libc.so.6:__ctype_b_loc
 libc.so.6:__errno_location
 libc.so.6:__libc_start_main
+libc.so.6:__mbstowcs_chk
 libc.so.6:__open_2
 libc.so.6:__read_chk
 libc.so.6:__readlink_chk
+libc.so.6:__realpath_chk
 libc.so.6:__stack_chk_fail
 libc.so.6:__strcat_chk
 libc.so.6:__strcpy_chk
@@ -11,8 +13,10 @@ libc.so.6:__vfprintf_chk
 libc.so.6:__vsnprintf_chk
 libc.so.6:abort
 libc.so.6:access
+libc.so.6:calloc
 libc.so.6:close
 libc.so.6:closedir
+libc.so.6:creat
 libc.so.6:dirname
 libc.so.6:execv
 libc.so.6:exit
@@ -21,26 +25,35 @@ libc.so.6:fclose
 libc.so.6:fileno
 libc.so.6:fopen
 libc.so.6:fork
+libc.so.6:fread
 libc.so.6:free
+libc.so.6:fseek
 libc.so.6:fstat
+libc.so.6:ftell
 libc.so.6:fwrite
 libc.so.6:getenv
 libc.so.6:getpid
 libc.so.6:getpwuid
 libc.so.6:gettimeofday
 libc.so.6:getuid
+libc.so.6:iswdigit
 libc.so.6:kill
+libc.so.6:lseek
 libc.so.6:malloc
 libc.so.6:memcpy
 libc.so.6:memmove
 libc.so.6:memset
 libc.so.6:mkdir
+libc.so.6:mmap
+libc.so.6:munmap
 libc.so.6:nanosleep
 libc.so.6:opendir
 libc.so.6:perror
 libc.so.6:puts
 libc.so.6:readdir
+libc.so.6:rename
 libc.so.6:rmdir
+libc.so.6:sendfile
 libc.so.6:setenv
 libc.so.6:signal
 libc.so.6:stat
@@ -48,11 +61,14 @@ libc.so.6:stderr
 libc.so.6:strcasecmp
 libc.so.6:strcat
 libc.so.6:strcmp
+libc.so.6:strcpy
 libc.so.6:strdup
 libc.so.6:strerror
 libc.so.6:strlen
+libc.so.6:strncpy
 libc.so.6:symlink
 libc.so.6:unlink
 libc.so.6:unsetenv
 libc.so.6:usleep
 libc.so.6:waitpid
+libc.so.6:wcslen
diff --git a/packages/y/ypkg/files/0001-data-macros-No-longer-update-debug-sections-in-bolt_.patch b/packages/y/ypkg/files/0001-data-macros-No-longer-update-debug-sections-in-bolt_.patch
deleted file mode 100644
index d74009cac068..000000000000
--- a/packages/y/ypkg/files/0001-data-macros-No-longer-update-debug-sections-in-bolt_.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7488be6df76865e835de5503e3eb24411fcb220f Mon Sep 17 00:00:00 2001
-From: Joey Riches <josephriches@gmail.com>
-Date: Thu, 13 Aug 2026 19:12:33 +0100
-Subject: [PATCH 1/1] data/macros: No longer update-debug-sections in bolt_opt
-
-bolt doesn't support compressed debug symbols
----
- data/macros/actions/pgo.yaml | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/data/macros/actions/pgo.yaml b/data/macros/actions/pgo.yaml
-index cc48bea..5a76ee6 100644
---- a/data/macros/actions/pgo.yaml
-+++ b/data/macros/actions/pgo.yaml
-@@ -30,7 +30,6 @@ actions:
-     - bolt_opt: |
-         boptim(){
-             llvm-bolt ${1}.orig -o ${1}.bolt -data=$PKG_BUILD_DIR/BOLT/final/$(basename ${1}).fdata \
--                -update-debug-sections \
-                 -reorder-blocks=ext-tsp \
-                 -reorder-functions=hfsort+ \
-                 -split-functions \
--- 
-2.55.0
-
diff --git a/packages/y/ypkg/files/0001-data-macros-Update-bolt-optimization-flags.patch b/packages/y/ypkg/files/0001-data-macros-Update-bolt-optimization-flags.patch
deleted file mode 100644
index 92a2797b53a9..000000000000
--- a/packages/y/ypkg/files/0001-data-macros-Update-bolt-optimization-flags.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 32f7cb9e1399d7bd14f3642649329893ca7b1d51 Mon Sep 17 00:00:00 2001
-From: Joey Riches <josephriches@gmail.com>
-Date: Sat, 15 Aug 2026 23:11:43 +0100
-Subject: [PATCH 1/1] data/macros: Update bolt optimization flags
-
-Replace deprecated hfsort+ with cdsort
-
-Replace deprecated -icf=1 usage with -icf
-
-Remove -use-gnu-stack, no longer required since binutils 2.44
-https://forge.sourceware.org/binutils-gdb/binutils-gdb-mirror/commit/bbc969306f8d5fb6c7b636e25f6f8e278946ef23
----
- data/macros/actions/pgo.yaml | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/data/macros/actions/pgo.yaml b/data/macros/actions/pgo.yaml
-index 5a76ee6..4fc318f 100644
---- a/data/macros/actions/pgo.yaml
-+++ b/data/macros/actions/pgo.yaml
-@@ -31,13 +31,12 @@ actions:
-         boptim(){
-             llvm-bolt ${1}.orig -o ${1}.bolt -data=$PKG_BUILD_DIR/BOLT/final/$(basename ${1}).fdata \
-                 -reorder-blocks=ext-tsp \
--                -reorder-functions=hfsort+ \
-+                -reorder-functions=cdsort \
-                 -split-functions \
-                 -split-all-cold \
-                 -split-eh \
-                 -dyno-stats \
--                -icf=1 \
--                -use-gnu-stack \
-+                -icf \
-                 -peepholes=all \
-                 -frame-opt=hot \
-                 -use-old-text ${2} ${3} ${4}
--- 
-2.55.0
-
diff --git a/packages/y/ypkg/package.yml b/packages/y/ypkg/package.yml
index 8a00954511e8..12e1b7f14a34 100644
--- a/packages/y/ypkg/package.yml
+++ b/packages/y/ypkg/package.yml
@@ -1,9 +1,9 @@
 # yaml-language-server: $schema=/usr/share/ypkg/schema/schema.json
 name       : ypkg
-version    : 35.1.2
-release    : 220
+version    : 35.1.3
+release    : 221
 source     :
-    - https://github.com/getsolus/ypkg/archive/refs/tags/v35.1.2.tar.gz : 2033c7c2a68599d81c87632dab86f5e6d260e37f0796f4ff4e425990fa2a3636
+    - https://github.com/getsolus/ypkg/archive/refs/tags/v35.1.3.tar.gz : 5b74195180b7042ee52bafeaefb8d773e8b0aeae28c26be353ac9fb643a1ef3d
 homepage   : https://github.com/getsolus/ypkg
 license    : GPL-3.0-or-later
 component  : system.devel
@@ -12,7 +12,7 @@ description: |
     ypkg is the build tool of choice for Solus.
 
     Simply put, it is a tool to convert a build process into a packaging operation.
-mancompress: true
+clang      : true
 strip      : false
 debug      : false
 builddeps  :
@@ -39,23 +39,24 @@ rundeps    :
     - python-zstandard
     - pyyaml
     - ruamel_yaml
-clang      : true
 environment: |
     # ensure our nuitka build doesn't pull in -v3 hwcaps libs
     export GLIBC_TUNABLES=glibc.cpu.hwcaps=-AVX
-
-    # Patches succeeds but also fails? WTF
-    %patch -p1 -i $pkgfiles/0001-data-macros-No-longer-update-debug-sections-in-bolt_.patch || :
-    %patch -p1 -i $pkgfiles/0001-data-macros-Update-bolt-optimization-flags.patch || :
 build      : |
-    %python3_setup
+    %pyproject_build
 install    : |
-    %python3_install
+    %pyproject_install
 
     # build static bins from ypkg
-    time nuitka --onefile --include-module=dbm.gnu --show-scons --lto=yes --no-deployment-flag=self-execution --main=$installdir/usr/bin/ypkg --jobs=%YJOBS%
+    time nuitka \
+        --onefile \
+        --include-module=dbm.gnu \
+        --show-scons \
+        --no-deployment-flag=self-execution \
+        --main=${installdir}/usr/bin/ypkg \
+        --jobs=%YJOBS%
 
     # Install main ypkg binary
-    mv $installdir/usr/bin/ypkg $installdir/usr/bin/ypkg.py
-    install -Dm0755 $workdir/ypkg.bin -t $installdir/usr/bin/
-    ln -srvf $installdir/usr/bin/ypkg.bin $installdir/usr/bin/ypkg
+    mv ${installdir}/usr/bin/ypkg{,.py}
+    %install_exe ${workdir}/ypkg.bin -t ${installdir}/usr/bin/
+    ln -srvf ${installdir}/usr/bin/ypkg.bin ${installdir}/usr/bin/ypkg
diff --git a/packages/y/ypkg/pspec_x86_64.xml b/packages/y/ypkg/pspec_x86_64.xml
index e74e2aa062e1..dd719b6c3510 100644
--- a/packages/y/ypkg/pspec_x86_64.xml
+++ b/packages/y/ypkg/pspec_x86_64.xml
@@ -3,8 +3,8 @@
         <Name>ypkg</Name>
         <Homepage>https://github.com/getsolus/ypkg</Homepage>
         <Packager>
-            <Name>Joey Riches</Name>
-            <Email>josephriches@gmail.com</Email>
+            <Name>Evan Maddock</Name>
+            <Email>maddock.evan@vivaldi.net</Email>
         </Packager>
         <License>GPL-3.0-or-later</License>
         <PartOf>system.devel</PartOf>
@@ -29,11 +29,11 @@ Simply put, it is a tool to convert a build process into a packaging operation.
             <Path fileType="executable">/usr/bin/ypkg.bin</Path>
             <Path fileType="executable">/usr/bin/ypkg.py</Path>
             <Path fileType="executable">/usr/bin/yupdate</Path>
-            <Path fileType="library">/usr/lib/python3.14/site-packages/ypkg2-35.1.2.dist-info/METADATA</Path>
-            <Path fileType="library">/usr/lib/python3.14/site-packages/ypkg2-35.1.2.dist-info/RECORD</Path>
-            <Path fileType="library">/usr/lib/python3.14/site-packages/ypkg2-35.1.2.dist-info/WHEEL</Path>
-            <Path fileType="library">/usr/lib/python3.14/site-packages/ypkg2-35.1.2.dist-info/entry_points.txt</Path>
-            <Path fileType="library">/usr/lib/python3.14/site-packages/ypkg2-35.1.2.dist-info/licenses/LICENSE</Path>
+            <Path fileType="library">/usr/lib/python3.14/site-packages/ypkg2-35.1.3.dist-info/METADATA</Path>
+            <Path fileType="library">/usr/lib/python3.14/site-packages/ypkg2-35.1.3.dist-info/RECORD</Path>
+            <Path fileType="library">/usr/lib/python3.14/site-packages/ypkg2-35.1.3.dist-info/WHEEL</Path>
+            <Path fileType="library">/usr/lib/python3.14/site-packages/ypkg2-35.1.3.dist-info/entry_points.txt</Path>
+            <Path fileType="library">/usr/lib/python3.14/site-packages/ypkg2-35.1.3.dist-info/licenses/LICENSE</Path>
             <Path fileType="library">/usr/lib/python3.14/site-packages/ypkg2/__init__.py</Path>
             <Path fileType="library">/usr/lib/python3.14/site-packages/ypkg2/__pycache__/__init__.cpython-314.opt-1.pyc</Path>
             <Path fileType="library">/usr/lib/python3.14/site-packages/ypkg2/__pycache__/__init__.cpython-314.pyc</Path>
@@ -114,12 +114,12 @@ Simply put, it is a tool to convert a build process into a packaging operation.
         </Files>
     </Package>
     <History>
-        <Update release="220">
-            <Date>2026-08-15</Date>
-            <Version>35.1.2</Version>
+        <Update release="221">
+            <Date>2026-09-02</Date>
+            <Version>35.1.3</Version>
             <Comment>Packaging update</Comment>
-            <Name>Joey Riches</Name>
-            <Email>josephriches@gmail.com</Email>
+            <Name>Evan Maddock</Name>
+            <Email>maddock.evan@vivaldi.net</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file