From: ericonr <ericonr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] catfish: update to 4.15.0.
Date: Sun, 15 Nov 2020 06:46:52 +0100 [thread overview]
Message-ID: <20201115054652.KBzAjmA4MxlQnoZQBnMYp6wewlBNudDqRWOOVJ2a45M@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26382@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 329 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages catfish
https://github.com/void-linux/void-packages/pull/26382
catfish: update to 4.15.0.
Fixes #26379
A patch file from https://github.com/void-linux/void-packages/pull/26382.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-catfish-26382.patch --]
[-- Type: text/x-diff, Size: 3605 bytes --]
From 2c688dadb0b8c230fb63f7bbe2e78c0c0889764b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 23:40:22 -0300
Subject: [PATCH 1/2] xfconf: update to 4.14.4, enable introspection and vala.
Introspection is necessary for catfish.
Part of the changes done by @sgn.
---
srcpkgs/xfconf/template | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/xfconf/template b/srcpkgs/xfconf/template
index 3d296110043..11d8c8925d9 100644
--- a/srcpkgs/xfconf/template
+++ b/srcpkgs/xfconf/template
@@ -1,19 +1,23 @@
# Template file for 'xfconf'
pkgname=xfconf
-version=4.14.3
+version=4.14.4
revision=1
+build_helper=gir
build_style=gnu-configure
configure_args="--enable-gsettings-backend
$(vopt_enable perl 'perl-bindings --with-perl-options=INSTALLDIRS=vendor')"
-hostmakedepends="pkg-config intltool glib-devel"
-makedepends="libxfce4util-devel $(vopt_if perl 'perl-ExtUtils-Depends perl-ExtUtils-PkgConfig perl-Glib')"
+hostmakedepends="pkg-config intltool glib-devel vala-devel"
+makedepends="libxfce4util-devel vala-devel
+$(vopt_if perl 'perl-ExtUtils-Depends perl-ExtUtils-PkgConfig perl-Glib')"
short_desc="Xfce hierarchical (tree-like) configuration system"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only, LGPL-2.0-only"
homepage="https://xfce.org/"
distfiles="https://archive.xfce.org/src/xfce/xfconf/${version%.*}/$pkgname-$version.tar.bz2"
-checksum=589052a0efc6151c5fb5f438da463502a4fd91848cae7b9376d417be4c5a0c02
-build_options="perl"
+checksum=cc37622eece51ed8905dfaad6f77b3c24662f41881545eb0142110f347ba5f73
+# XXX: perl bindings will be removed in >=4.15
+build_options="perl gir"
+build_options_default="gir"
xfconf-devel_package() {
depends="dbus-glib-devel ${sourcepkg}>=${version}_${revision}"
@@ -23,5 +27,9 @@ xfconf-devel_package() {
vmove usr/lib/*.so
vmove usr/lib/pkgconfig
vmove usr/share/gtk-doc
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/vala
+ vmove usr/share/gir-1.0
+ fi
}
}
From d140106e18bc9dfec2a5d5380f2b0f5f01b9631a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 16:17:22 -0300
Subject: [PATCH 2/2] catfish: update to 4.15.0, add xfconf to depends.
Also change distfile location.
Fixes #26379 - Python incompatibility
---
srcpkgs/catfish/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template
index 9eeb322b2e0..d07a83d55e1 100644
--- a/srcpkgs/catfish/template
+++ b/srcpkgs/catfish/template
@@ -1,14 +1,14 @@
# Template file for 'catfish'
pkgname=catfish
-version=1.4.13
-revision=3
-wrksrc="catfish-catfish-${version}"
+version=4.15.0
+revision=1
build_style=python3-module
hostmakedepends="intltool python3-distutils-extra python3-gobject"
-depends="desktop-file-utils gtk+3 hicolor-icon-theme python3-gobject python3-pexpect python3-dbus"
+depends="desktop-file-utils gtk+3 hicolor-icon-theme python3-gobject
+ python3-pexpect python3-dbus xfconf"
short_desc="Versatile file searching tool"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://docs.xfce.org/apps/catfish/start"
-distfiles="https://github.com/xfce-mirror/catfish/archive/catfish-${version}.tar.gz"
-checksum=8a061cf446e5d5c2a9d334e2d53bab47984253a7e771c7bd51fbdfdf5d955484
+distfiles="https://archive.xfce.org/src/apps/catfish/${version%.*}/catfish-${version}.tar.bz2"
+checksum=cefc43d091c719690d0c4ad259a757c89038ccdf290626674f54b1b1ea9cefbe
next prev parent reply other threads:[~2020-11-15 5:46 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-14 19:17 [PR PATCH] " ericonr
2020-11-15 2:42 ` [PR PATCH] [Updated] " ericonr
2020-11-15 2:45 ` ericonr
2020-11-15 2:54 ` ericonr
2020-11-15 5:00 ` ericonr
2020-11-15 5:01 ` ericonr
2020-11-15 5:08 ` ericonr
2020-11-15 5:46 ` ericonr [this message]
2020-11-15 6:46 ` [PR PATCH] [Closed]: " sgn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201115054652.KBzAjmA4MxlQnoZQBnMYp6wewlBNudDqRWOOVJ2a45M@z \
--to=ericonr@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).