Hi,
I am not sure what you mean:
# vercmp 1.5.0 1.5.beta.r86.gbf2c4f32e-1
1
Git Clone URL: | https://aur.archlinux.org/roundcubemail-git.git (read-only, click to copy) |
---|---|
Package Base: | roundcubemail-git |
Description: | A PHP web-based mail client |
Upstream URL: | https://roundcube.net/ |
Licenses: | GPL |
Conflicts: | roundcubemail |
Provides: | roundcubemail |
Submitter: | cgirard |
Maintainer: | None |
Last Packager: | cgirard |
Votes: | 1 |
Popularity: | 0.000000 |
First Submitted: | 2018-11-05 14:32 (UTC) |
Last Updated: | 2024-06-23 18:56 (UTC) |
« First ‹ Previous 1 2
Hi,
I am not sure what you mean:
# vercmp 1.5.0 1.5.beta.r86.gbf2c4f32e-1
1
The pkgver()
function is broken because it's allowing beta version tags upstream that are not a valid format for PKGBUILD files that will end up being newer than the final release tags. It can be fixed like this (apply with git am < file.patch
):
From 16aeb5032a5430795601d561f3d1f719dc0e02df Mon Sep 17 00:00:00 2001
From: Caleb Maclennan <caleb@alerque.com>
Date: Tue, 1 Jun 2021 22:10:25 +0300
Subject: [PATCH] Fix versioning so releases will be newer than betas
Signed-off-by: Caleb Maclennan <caleb@alerque.com>
---
.SRCINFO | 3 +--
PKGBUILD | 5 +++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.SRCINFO b/.SRCINFO
index e535845..85b6cde 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = roundcubemail-git
pkgdesc = A PHP web-based mail client
- pkgver = 1.4.rc2.r702.ga0fbcf381
+ pkgver = 1.5beta.r100.ge62c0a8
pkgrel = 1
url = https://roundcube.net/
arch = any
@@ -26,4 +26,3 @@ pkgbase = roundcubemail-git
sha256sums = c90981405527ebaf153a407af6b8178b41d078bd4472d63b837b3b4cd5ae36b0
pkgname = roundcubemail-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 086ce5b..5891672 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=roundcubemail-git
-pkgver=1.4.rc2.r702.ga0fbcf381
+pkgver=1.5beta.r100.ge62c0a8
pkgrel=1
pkgdesc="A PHP web-based mail client"
arch=('any')
@@ -21,7 +21,8 @@ sha256sums=('SKIP'
pkgver() {
cd "roundcubemail"
- git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+ git describe --long --tags --abbrev=7 HEAD |
+ sed 's/-beta/beta/g;s/\([^-]*-g\)/r\1/;s/-/./g'
}
prepare() {
--
2.31.1
Adopted and corrected nodejs-clean-css
Understood. I was using packages built a long time ago of those nodejs modules (as they have not been updated, it did not triggered a rebuild). On those version, no root module was included.
I have corrected nodejs-less PKGBUILD which should correct for that package anyway. If you still see issues with nodejs-clean-css or nodejs-less-plugin-clean-css, please comment on those packages as the owner has no way to learn about it else.
the problem isn't in roundcubemail-git, it's in nodejs-clean-css and nodejs-less (latest from AUR) containing conflicting files in /usr/lib/node_modules/root:
10:56:30 ernest:~/.cache/yay/nodejs-less master
% pacman -Qlp nodejs-less-4.1.1-1-any.pkg.tar.xz|grep /usr/lib/node_modules/root|wc -l
64
I'm guessing it is some obscure build issue with those two packages (npm?) which makes the install dir include files it shouldn't contain.
@corecode: I don't understant what you are talking about:
$ pacman -Qlp nodejs-clean-css-4.2.1-1-any.pkg.tar.zst | grep /usr/lib/node_modules/root
$ pacman -Qlp nodejs-less-4.1.1-1-any.pkg.tar.zst | grep /usr/lib/node_modules/root
$ pacman -Qlp nodejs-less-plugin-clean-css-1.5.1-1-any.pkg.tar.zst | grep /usr/lib/node_modules/root
$
I am rebuilding each day roundcubemail-git on a clean chroot without any problem (repo available here: https://arch-repos.valinor.fr/cgirard if you need it).
nodejs-less-plugin-clean-css requires both nodejs-less and nodejs-clean-css, both of which install conflicting files in /usr/lib/node_modules/root
. This conflict breaks build of roundcubemail-git.
What do you mean by
Additionally the current build depends on a duplicate package with a bad name that installs conflicting files with another package (nodejs-clean-css vs. nodejs-less-plugin-clean-css). Those have two different upstreams with unrelated versions.
Did you notice anything specific on upcoming 1.5 release? I have everything building and working fine with latest HEAD and do not see any notable change in instructions that I did not already applied.
There are quite a few build chain changes in the upcoming 1.5 release. Additionally the current build depends on a duplicate package with a bad name that installs conflicting files with another package (nodejs-clean-css vs. nodejs-less-plugin-clean-css). Could this be updated to build cleanly for the current dependencies?
atm nodejs-clean-css conflicts with nodejs-less
Pinned Comments
cgirard commented on 2021-07-12 14:14 (UTC)
Please note that with today change, for people pushing the built package to a (local) repo, it will probably not be automatically updated as
1.5rc.rx
<1.5.rc.rx
.