From: ScrelliCopter <ScrelliCopter@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] grabc: update to 1.0.2
Date: Mon, 25 Jan 2021 05:08:45 +0100 [thread overview]
Message-ID: <20210125040845.7IjiRIb_PBUjegmYsf3enrWwBMHD5L3BnhVRyDd2Qd0@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-28211@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1915 bytes --]
There is an updated pull request by ScrelliCopter against master on the void-packages repository
https://github.com/ScrelliCopter/void-packages grabc
https://github.com/void-linux/void-packages/pull/28211
grabc: update to 1.0.2
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
#### Some notes:
Old version number is from the tarball name, which appears to be a typo and should've been `1.0.1`, hence the revert. Let me know if this is the right approach to fix this.
~~xlint complains because the license changed from GPL2 to MIT, but there is no LICENSE or COPYING file to `vlicense`.~~
A patch file from https://github.com/void-linux/void-packages/pull/28211.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-grabc-28211.patch --]
[-- Type: text/x-diff, Size: 1614 bytes --]
From c94272de507813f6171d7b0a9ab4199d20a39136 Mon Sep 17 00:00:00 2001
From: a dinosaur <nick@a-dinosaur.com>
Date: Wed, 13 Jan 2021 22:07:34 +1100
Subject: [PATCH] grabc: update to 1.0.2
---
srcpkgs/grabc/template | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/grabc/template b/srcpkgs/grabc/template
index 382767654b5..1d449ca6bf6 100644
--- a/srcpkgs/grabc/template
+++ b/srcpkgs/grabc/template
@@ -1,20 +1,26 @@
# Template file for 'grabc'
pkgname=grabc
-version=1.1
+reverts=1.1_1
+version=1.0.2
revision=1
-wrksrc="${pkgname}${version}"
+create_wrksrc=yes
+build_wrksrc="${pkgname}-${version}"
build_style=gnu-makefile
makedepends="libX11-devel"
short_desc="Identify color of a pixel on the screen"
maintainer="Duncaen <duncaen@voidlinux.org>"
-license="GPL-2"
+license="MIT"
homepage="http://www.muquit.com/muquit/software/grabc/grabc.html"
-distfiles="http://www.muquit.com/muquit/software/grabc/grabc${version}.tar.gz"
-checksum=f0492a8ea33b46a16bdb94644420f54724e31c4436e4cd77937a30b2de3bb00e
+# Remove the license file on next version bump as it will be included.
+distfiles="https://github.com/muquit/grabc/archive/v${version}.tar.gz
+ https://raw.githubusercontent.com/muquit/grabc/b9e4316/LICENSE.txt"
+checksum="a3e4d2e5b11ef63e8928a630418fc8dfe1327585adc48aef8d0f13b2d78d5ea0
+ 9691605fc9d14f0924faf49367189f9c5bc50e4872987b637b18db77960b1536"
pre_build() {
- sed -i -e 's|$(LIBS)|$(LDFLAGS) -lX11|' Makefile
+ sed -i -e 's|/usr/local|/usr|' Makefile
}
-do_install() {
- vbin grabc
+
+post_install() {
+ vlicense ../LICENSE.txt
}
next prev parent reply other threads:[~2021-01-25 4:08 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-25 3:19 [PR PATCH] " ScrelliCopter
2021-01-25 4:08 ` ScrelliCopter [this message]
2021-01-25 19:35 ` ericonr
2021-02-04 6:19 ` [PR REVIEW] " ericonr
2021-02-04 6:19 ` ericonr
2021-02-04 6:43 ` [PR PATCH] [Updated] " ScrelliCopter
2021-02-04 6:46 ` [PR REVIEW] " ScrelliCopter
2021-02-04 6:50 ` ScrelliCopter
2021-11-20 23:02 ` [PR PATCH] [Merged]: " Duncaen
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=20210125040845.7IjiRIb_PBUjegmYsf3enrWwBMHD5L3BnhVRyDd2Qd0@z \
--to=screllicopter@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).