From ad3e2f38b0be4ae541a17ccb3e247a301d32ef47 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 15 Jul 2025 16:15:14 +0200 Subject: [PATCH] subtle: update to 0.11.6610. --- srcpkgs/subtle/patches/ruby32.patch | 34 ----------------------------- srcpkgs/subtle/template | 10 +++++---- 2 files changed, 6 insertions(+), 38 deletions(-) delete mode 100644 srcpkgs/subtle/patches/ruby32.patch diff --git a/srcpkgs/subtle/patches/ruby32.patch b/srcpkgs/subtle/patches/ruby32.patch deleted file mode 100644 index 23a3303215b..00000000000 --- a/srcpkgs/subtle/patches/ruby32.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/src/shared/shared.h -+++ b/src/shared/shared.h -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- a/data/sur/server.rb -+++ b/data/sur/server.rb -@@ -148,8 +148,8 @@ - #DataMapper::Model.raise_on_save_failure = true - - # Create database and store -- DataMapper.auto_migrate! unless File.exists?(DATABASE) -- Dir.mkdir(REPOSITORY) unless File.exists?(REPOSITORY) -+ DataMapper.auto_migrate! unless File.exist?(DATABASE) -+ Dir.mkdir(REPOSITORY) unless File.exist?(REPOSITORY) - - # Configure sinatra application - set :port, port ---- a/Rakefile -+++ b/Rakefile -@@ -288,7 +288,7 @@ - end - - # Get revision -- if File.exists?(".hg") and (hg = find_executable0("hg")) -+ if File.exist?(".hg") and (hg = find_executable0("hg")) - match = `#{hg} tip`.match(/^[^:]+:\s*(\d+).*/) - - if !match.nil? and 2 == match.size diff --git a/srcpkgs/subtle/template b/srcpkgs/subtle/template index 3263ed931f5..d52fd51ca1f 100644 --- a/srcpkgs/subtle/template +++ b/srcpkgs/subtle/template @@ -1,7 +1,7 @@ # Template file for 'subtle' pkgname=subtle -version=0.11.6579 -revision=6 +version=0.11.6610 +revision=1 hostmakedepends="python3 mercurial ruby-devel pkg-config" makedepends="ruby-devel libX11-devel libXpm-devel libXft-devel libXinerama-devel libXrandr-devel libXtst-devel" @@ -10,15 +10,17 @@ maintainer="Andrea Brancaleoni " license="GPL-3.0-or-later" homepage="https://hg.unexist.dev/subtle/" distfiles="https://hg.unexist.dev/subtle/archive/${version#*.*.}.tar.gz" -checksum=58b4bf85ae348f120a77001042f036570c239cd3327802b012506ea0158d8d86 +checksum=7aff9833ebe97b49f53c36a3efa644e4ee0cf169befb8facb4941c4ece5d9234 conf_files="/etc/xdg/subtle/subtle.rb" +CFLAGS="-Wno-int-conversion" + if [ "$CROSS_BUILD" ]; then if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then broken="Word size must match" fi hostmakedepends+=" $makedepends" - CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/ruby-3.2.0/" + CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/ruby-3.4.0/" export CFLAGS fi