From: paper42 <paper42@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] appstream-glib: update to 0.8.1.
Date: Sat, 01 Oct 2022 15:54:25 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39585@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1434 bytes --]
There is a new pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages appstream-glib-0.8
https://github.com/void-linux/void-packages/pull/39585
appstream-glib: update to 0.8.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
I am not sure why the patches are necessary, the commit from 2018 doesn't have any comments and the PR was in a deleted repository, but it seems to work fine without them.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->
A patch file from https://github.com/void-linux/void-packages/pull/39585.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-appstream-glib-0.8-39585.patch --]
[-- Type: text/x-diff, Size: 3934 bytes --]
From 789bb12f1011efa0b53b8e70cdd43839ff1fc861 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 15:45:27 +0200
Subject: [PATCH] appstream-glib: update to 0.8.1.
---
...d-archive_entry_h-order-on-client-as-util.patch | 14 --------------
...ntry_h-order-on-libappstream-glib-as-util.patch | 14 --------------
srcpkgs/appstream-glib/template | 12 ++++++------
3 files changed, 6 insertions(+), 34 deletions(-)
delete mode 100644 srcpkgs/appstream-glib/patches/0001-flip-archive_h-and-archive_entry_h-order-on-client-as-util.patch
delete mode 100644 srcpkgs/appstream-glib/patches/0002-flip-archive_h-and-archive_entry_h-order-on-libappstream-glib-as-util.patch
diff --git a/srcpkgs/appstream-glib/patches/0001-flip-archive_h-and-archive_entry_h-order-on-client-as-util.patch b/srcpkgs/appstream-glib/patches/0001-flip-archive_h-and-archive_entry_h-order-on-client-as-util.patch
deleted file mode 100644
index 90d85364681d..000000000000
--- a/srcpkgs/appstream-glib/patches/0001-flip-archive_h-and-archive_entry_h-order-on-client-as-util.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-They are in the wrong order.
-
---- a/client/as-util.c
-+++ b/client/as-util.c
-@@ -27,8 +27,8 @@
- #include <gio/gio.h>
-
- #include <appstream-glib.h>
--#include <archive_entry.h>
- #include <archive.h>
-+#include <archive_entry.h>
- #include <libsoup/soup.h>
- #include <locale.h>
- #include <stdlib.h>
diff --git a/srcpkgs/appstream-glib/patches/0002-flip-archive_h-and-archive_entry_h-order-on-libappstream-glib-as-util.patch b/srcpkgs/appstream-glib/patches/0002-flip-archive_h-and-archive_entry_h-order-on-libappstream-glib-as-util.patch
deleted file mode 100644
index 2502048d75ac..000000000000
--- a/srcpkgs/appstream-glib/patches/0002-flip-archive_h-and-archive_entry_h-order-on-libappstream-glib-as-util.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-They are in the wrong order.
-
---- a/libappstream-glib/as-utils.c
-+++ b/libappstream-glib/as-utils.c
-@@ -34,8 +34,8 @@
-
- #include <fnmatch.h>
- #include <string.h>
--#include <archive_entry.h>
- #include <archive.h>
-+#include <archive_entry.h>
- #include <libsoup/soup.h>
- #include <stdlib.h>
- #include <uuid.h>
diff --git a/srcpkgs/appstream-glib/template b/srcpkgs/appstream-glib/template
index 5eaf493d53f6..ef5baf1afdf9 100644
--- a/srcpkgs/appstream-glib/template
+++ b/srcpkgs/appstream-glib/template
@@ -1,6 +1,6 @@
# Template file for 'appstream-glib'
pkgname=appstream-glib
-version=0.7.18
+version=0.8.1
revision=1
build_style=meson
build_helper="gir"
@@ -8,25 +8,25 @@ configure_args="-Dgtk-doc=false -Drpm=false -Dstemmer=false
-Dintrospection=$(vopt_if gir true false)"
hostmakedepends="gcab gperf pkg-config glib-devel"
makedepends="gcab-devel gtk+3-devel json-glib-devel libarchive-devel
- libsoup-devel libyaml-devel"
+ libcurl-devel libyaml-devel"
short_desc="Install and update applications"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://people.freedesktop.org/~hughsient/appstream-glib/"
changelog="https://raw.githubusercontent.com/hughsie/appstream-glib/master/NEWS"
-distfiles="${homepage}/releases/${pkgname}-${version}.tar.xz"
-checksum=ca1ed22e3bde3912cb903aaa7de085d55771da454f1c0573fd9608e1de9c4002
+distfiles="https://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-${version}.tar.xz"
+checksum=68a3d007f5b3aa84592dbef07950d9acf327da97ec8a6e88a90575d9055ddf6d
build_options="gir"
build_options_default="gir"
post_install() {
- rm -rf -- "${DESTDIR}"/usr/share/installed-tests
+ rm -r "${DESTDIR}"/usr/share/installed-tests
}
appstream-glib-devel_package() {
depends="${sourcepkg}>=${version}_${revision} gcab-devel gdk-pixbuf-devel
- libarchive-devel libsoup-devel libyaml-devel"
+ libarchive-devel libcurl-devel libyaml-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
next reply other threads:[~2022-10-01 13:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-01 13:54 paper42 [this message]
2022-10-01 17:09 ` [PR PATCH] [Merged]: " paper42
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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39585@inbox.vuxu.org \
--to=paper42@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).