From 3b5b21c8afa5f9f885b9ff2520d889151d666675 Mon Sep 17 00:00:00 2001 From: Bert Peters Date: Sun, 19 Jan 2025 19:51:14 +0100 Subject: [PATCH] upgpkg: jekyll 4.3.4-1 upstream release. this explicitly depeneds on liquid 4, as liquid 5 breaks stuff badly. --- jekyll/.SRCINFO | 12 ++++++----- jekyll/.nvchecker.toml | 3 +++ jekyll/PKGBUILD | 13 ++++++------ jekyll/dependencies.patch | 43 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 60 insertions(+), 11 deletions(-) create mode 100644 jekyll/.nvchecker.toml create mode 100644 jekyll/dependencies.patch diff --git a/jekyll/.SRCINFO b/jekyll/.SRCINFO index 054ba29..a3941fa 100644 --- a/jekyll/.SRCINFO +++ b/jekyll/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = jekyll pkgdesc = A simple, blog aware, static site generator. - pkgver = 4.3.3 + pkgver = 4.3.4 pkgrel = 1 url = https://github.com/jekyll/jekyll arch = any @@ -11,7 +11,7 @@ pkgbase = jekyll depends = ruby-jekyll-sass-converter>=2.0 depends = ruby-jekyll-watch>=2.0 depends = ruby-kramdown>=2.1.0 - depends = ruby-liquid>=4.0 + depends = ruby-liquid-4 depends = ruby-mercenary>=0.3.3 depends = ruby-pathutil>=0.9 depends = ruby-rouge>1.7 @@ -25,12 +25,14 @@ pkgbase = jekyll optdepends = ruby-jekyll-paginate optdepends = ruby-jekyll-gist optdepends = ruby-jekyll-feed - provides = jekyll=4.3.3 + provides = jekyll=4.3.4 provides = ruby-jekyll conflicts = ruby-jekyll replaces = ruby-jekyll options = !emptydirs - source = jekyll-4.3.3.tar.gz::https://github.com/jekyll/jekyll/archive/v4.3.3.tar.gz - sha256sums = 61903b4c731557cdca489e381e509ea113258a2b88426b8c20b3bc4c7145d507 + source = jekyll-4.3.4.tar.gz::https://github.com/jekyll/jekyll/archive/v4.3.4.tar.gz + source = dependencies.patch + sha256sums = 573034f7d8bff27fe98c79e4c1d6a424b307483dc8b4d38867bdd3fd76d4dc98 + sha256sums = 4bc5c17e36e89115a7ed7cfb676042c2ada74a0eb66ee6baaae2675f42abd47b pkgname = jekyll diff --git a/jekyll/.nvchecker.toml b/jekyll/.nvchecker.toml new file mode 100644 index 0000000..44eedc0 --- /dev/null +++ b/jekyll/.nvchecker.toml @@ -0,0 +1,3 @@ +[jekyll] +source = "gems" +gems = "jekyll" diff --git a/jekyll/PKGBUILD b/jekyll/PKGBUILD index 1436673..4318ca5 100644 --- a/jekyll/PKGBUILD +++ b/jekyll/PKGBUILD @@ -5,7 +5,7 @@ _gemname=jekyll pkgname=$_gemname -pkgver=4.3.3 +pkgver=4.3.4 pkgrel=1 pkgdesc='A simple, blog aware, static site generator.' arch=('any') @@ -17,7 +17,7 @@ depends=('ruby>=2.1.0' 'ruby-jekyll-sass-converter>=2.0' 'ruby-jekyll-watch>=2.0' 'ruby-kramdown>=2.1.0' - 'ruby-liquid>=4.0' + 'ruby-liquid-4' 'ruby-mercenary>=0.3.3' 'ruby-pathutil>=0.9' 'ruby-rouge>1.7' @@ -38,13 +38,14 @@ provides=("$pkgname=$pkgver" "ruby-jekyll") conflicts=('ruby-jekyll') replaces=('ruby-jekyll') options=(!emptydirs) -source=(${pkgname}-${pkgver}.tar.gz::https://github.com/jekyll/jekyll/archive/v${pkgver}.tar.gz) -sha256sums=('61903b4c731557cdca489e381e509ea113258a2b88426b8c20b3bc4c7145d507') +source=(${pkgname}-${pkgver}.tar.gz::https://github.com/jekyll/jekyll/archive/v${pkgver}.tar.gz + dependencies.patch) +sha256sums=('573034f7d8bff27fe98c79e4c1d6a424b307483dc8b4d38867bdd3fd76d4dc98' + '4bc5c17e36e89115a7ed7cfb676042c2ada74a0eb66ee6baaae2675f42abd47b') prepare() { cd ${_gemname}-${pkgver} - sed -r 's|~>|>=|g' -i ${_gemname}.gemspec # don't give a fuck about rubys bla bla - sed 's|git ls-files|find -type f\|sed "s,\\\\./,,g"|' -i ${_gemname}.gemspec + patch -p1 -i ../dependencies.patch } build() { diff --git a/jekyll/dependencies.patch b/jekyll/dependencies.patch new file mode 100644 index 0000000..a1e7b75 --- /dev/null +++ b/jekyll/dependencies.patch @@ -0,0 +1,43 @@ +diff --git a/jekyll.gemspec b/jekyll.gemspec +index 67333b2b1..f3cddd874 100644 +--- a/jekyll.gemspec ++++ b/jekyll.gemspec +@@ -13,7 +13,7 @@ Gem::Specification.new do |s| + s.summary = "A simple, blog aware, static site generator." + s.description = "Jekyll is a simple, blog aware, static site generator." + +- all_files = `git ls-files`.split($INPUT_RECORD_SEPARATOR) ++ all_files = `find -type f\|sed "s,\\\\./,,g"`.split($INPUT_RECORD_SEPARATOR) + s.files = all_files.grep(%r!^(exe|lib|rubocop)/|^.rubocop.yml$!) + s.executables = all_files.grep(%r!^exe/!) { |f| File.basename(f) } + s.bindir = "exe" +@@ -32,19 +32,19 @@ Gem::Specification.new do |s| + s.required_ruby_version = ">= 2.5.0" + s.required_rubygems_version = ">= 2.7.0" + +- s.add_runtime_dependency("addressable", "~> 2.4") +- s.add_runtime_dependency("colorator", "~> 1.0") +- s.add_runtime_dependency("em-websocket", "~> 0.5") +- s.add_runtime_dependency("i18n", "~> 1.0") ++ s.add_runtime_dependency("addressable", ">= 2.4") ++ s.add_runtime_dependency("colorator", ">= 1.0") ++ s.add_runtime_dependency("em-websocket", ">= 0.5") ++ s.add_runtime_dependency("i18n", ">= 1.0") + s.add_runtime_dependency("jekyll-sass-converter", ">= 2.0", "< 4.0") +- s.add_runtime_dependency("jekyll-watch", "~> 2.0") +- s.add_runtime_dependency("kramdown", "~> 2.3", ">= 2.3.1") +- s.add_runtime_dependency("kramdown-parser-gfm", "~> 1.0") ++ s.add_runtime_dependency("jekyll-watch", ">= 2.0") ++ s.add_runtime_dependency("kramdown", ">= 2.3", ">= 2.3.1") ++ s.add_runtime_dependency("kramdown-parser-gfm", ">= 1.0") + s.add_runtime_dependency("liquid", "~> 4.0") + s.add_runtime_dependency("mercenary", ">= 0.3.6", "< 0.5") +- s.add_runtime_dependency("pathutil", "~> 0.9") ++ s.add_runtime_dependency("pathutil", ">= 0.9") + s.add_runtime_dependency("rouge", ">= 3.0", "< 5.0") +- s.add_runtime_dependency("safe_yaml", "~> 1.0") ++ s.add_runtime_dependency("safe_yaml", ">= 1.0") + s.add_runtime_dependency("terminal-table", ">= 1.8", "< 4.0") +- s.add_runtime_dependency("webrick", "~> 1.7") ++ s.add_runtime_dependency("webrick", ">= 1.7") + end