Github messages for voidlinux
 help / color / mirror / Atom feed
From: fosslinux <fosslinux@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] foomatic-db{,-nonfree}: update to 20210104. 
Date: Wed, 06 Jan 2021 09:32:50 +0100	[thread overview]
Message-ID: <20210106083250.in_EItzW21dtScR-OZONZlGGhhe-y9XV2m72IRke1xQ@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27651@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 445 bytes --]

There is an updated pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages foomatic-db-update
https://github.com/void-linux/void-packages/pull/27651

foomatic-db{,-nonfree}: update to 20210104. 
These two packages are essentially non-versioned databases but need to be bumped every so often.

A patch file from https://github.com/void-linux/void-packages/pull/27651.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-foomatic-db-update-27651.patch --]
[-- Type: text/x-diff, Size: 3710 bytes --]

From b2ff282810ed901e106a2c39c5b315503a8209d3 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Mon, 4 Jan 2021 20:42:38 +1100
Subject: [PATCH 1/2] foomatic-db: update to 20210104.

---
 srcpkgs/foomatic-db/template | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/foomatic-db/template b/srcpkgs/foomatic-db/template
index 58d267a42d6..0a486243178 100644
--- a/srcpkgs/foomatic-db/template
+++ b/srcpkgs/foomatic-db/template
@@ -1,23 +1,24 @@
 # Template file for 'foomatic-db'
-# Note: update the version=<date> regularly like once/month.
+# Update when there is a new commit at https://github.com/OpenPrinting/foomatic-db.
 pkgname=foomatic-db
-version=20201129
+version=20210104
 revision=1
-create_wrksrc=yes
+_commit=28466ef2f9f931f49816ed70c499001d1783f5cb
+wrksrc="${pkgname}-${_commit}"
 build_style=gnu-configure
-hostmakedepends="xmlstarlet tar"
+hostmakedepends="xmlstarlet tar automake"
 short_desc="OpenPrinting printer support - database"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MIT"
 homepage="https://wiki.linuxfoundation.org/openprinting/database/foomatic"
+distfiles="https://github.com/OpenPrinting/foomatic-db/archive/${_commit}.tar.gz"
+checksum=eb412f7967300ae49bd22a886ecd478767828eff5da4d1e875c3409898265866
 
-do_fetch() {
-	$XBPS_FETCH_CMD https://www.openprinting.org/download/foomatic/${pkgname}-4.0-current.tar.gz
-}
-
-do_extract() {
-	bsdtar -xf ${XBPS_BUILDDIR}/${pkgname}-4.0-current.tar.gz \
-		--strip-components=1 -C ${wrksrc}
+pre_configure() {
+	# Taken from make_configure
+	aclocal
+	autoconf
+	sed -i "s=\#include \<xmlversion.h\>=\#include \<libxml/xmlversion.h\>=g" configure
 }
 
 post_install() {
@@ -28,4 +29,4 @@ post_install() {
 			vlicense "LICENSE-$(basename $i .xml).txt"
 		fi
 	done
- }
+}

From ae8dde8222400b5a0f306efe4604f2d827206bd0 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Mon, 4 Jan 2021 20:42:51 +1100
Subject: [PATCH 2/2] foomatic-db-nonfree: update to 20210104.

---
 srcpkgs/foomatic-db-nonfree/template | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/foomatic-db-nonfree/template b/srcpkgs/foomatic-db-nonfree/template
index d6773c5443b..bc4ef4c5a0f 100644
--- a/srcpkgs/foomatic-db-nonfree/template
+++ b/srcpkgs/foomatic-db-nonfree/template
@@ -1,24 +1,25 @@
 # Template file for 'foomatic-db-nonfree'
-# Note: update the version=<date> regularly like once/month.
+# Update when there is a new commit at https://github.com/OpenPrinting/foomatic-db-nonfree.
 pkgname=foomatic-db-nonfree
-version=20201129
+version=20210104
 revision=1
-create_wrksrc=yes
+_commit=6ddae02ac89240c019f8b5026cfe70e30fd2b3db
+wrksrc="${pkgname}-${_commit}"
 build_style=gnu-configure
-hostmakedepends="tar xmlstarlet"
+hostmakedepends="tar xmlstarlet automake"
 short_desc="OpenPrinting printer support - nonfree database"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="custom:Various Nonfree"
 homepage="https://wiki.linuxfoundation.org/openprinting/database/foomatic"
+distfiles="https://github.com/OpenPrinting/foomatic-db-nonfree/archive/${_commit}.tar.gz"
+checksum=958c1067a24c37cb753ee2b4aeb9e8325629f4363ce9e108f1f6d0f828e5b7c5
 repository="nonfree"
 
-do_fetch() {
-	$XBPS_FETCH_CMD https://www.openprinting.org/download/foomatic/${pkgname}-current.tar.gz
-}
-
-do_extract() {
-	bsdtar -xf ${XBPS_BUILDDIR}/${pkgname}-current.tar.gz \
-		--strip-components=1 -C ${wrksrc}
+pre_configure() {
+	# From make_configure
+	aclocal
+	autoconf
+	sed -i "s=\#include \<xmlversion.h\>=\#include \<libxml/xmlversion.h\>=g" configure
 }
 
 post_install() {

  parent reply	other threads:[~2021-01-06  8:32 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-04  9:43 [PR PATCH] " fosslinux
2021-01-04 12:44 ` ericonr
2021-01-04 20:15 ` Chocimier
2021-01-04 21:06 ` Anachron
2021-01-06  8:26 ` [PR PATCH] [Updated] " fosslinux
2021-01-06  8:32 ` fosslinux [this message]
2021-01-06  8:33 ` fosslinux
2021-01-11 23:09 ` Chocimier
2021-01-12  1:09 ` [PR PATCH] [Updated] " fosslinux
2021-01-18 21:28 ` [PR PATCH] [Merged]: " Chocimier

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=20210106083250.in_EItzW21dtScR-OZONZlGGhhe-y9XV2m72IRke1xQ@z \
    --to=fosslinux@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).