* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libjcat/files/, dev-libs/libjcat/
@ 2020-03-30 15:03 Marek Szuba
0 siblings, 0 replies; 6+ messages in thread
From: Marek Szuba @ 2020-03-30 15:03 UTC (permalink / raw
To: gentoo-commits
commit: c9213e24cceac0fa9c9ad94b8cedd107698c1c80
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 30 14:28:49 2020 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Mar 30 14:30:05 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9213e24
dev-libs/libjcat: new package
An upcoming dependency of sys-apps/fwupd.
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
dev-libs/libjcat/Manifest | 1 +
.../libjcat-0.1.0-disable_installed_tests.patch | 45 ++++++++++++++++++
dev-libs/libjcat/libjcat-0.1.0.ebuild | 55 ++++++++++++++++++++++
dev-libs/libjcat/metadata.xml | 23 +++++++++
4 files changed, 124 insertions(+)
diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest
new file mode 100644
index 00000000000..12536faba64
--- /dev/null
+++ b/dev-libs/libjcat/Manifest
@@ -0,0 +1 @@
+DIST libjcat-0.1.0.tar.gz 60808 BLAKE2B 384e5a846fb7c49c8a6d6ace5f2b17715693d7e9ecfce020859c6fb5d96f9b9398606a2161a2c9f795c16c90e8b7a0e9d08970c1f81e4412783097f4ca599083 SHA512 2172fd621c86b3a2d507c3bb8fcc5f40a46656a5352f4963a014c76642bb2c34e316bb8608c121fa7d728d63dc2593ed28d3e3478e1ec5bcf32daeffc43627fd
diff --git a/dev-libs/libjcat/files/libjcat-0.1.0-disable_installed_tests.patch b/dev-libs/libjcat/files/libjcat-0.1.0-disable_installed_tests.patch
new file mode 100644
index 00000000000..823d713b791
--- /dev/null
+++ b/dev-libs/libjcat/files/libjcat-0.1.0-disable_installed_tests.patch
@@ -0,0 +1,45 @@
+--- a/data/tests/colorhug/meson.build
++++ b/data/tests/colorhug/meson.build
+@@ -1,9 +1,11 @@
++if false
+ install_data([
+ 'firmware.bin',
+ 'firmware.bin.asc',
+ ],
+ install_dir: installed_test_datadir,
+ )
++endif
+
+ if get_option('pkcs7')
+ # generate self-signed detached signature
+@@ -16,7 +18,7 @@
+ '--load-certificate', pkcs7_certificate,
+ '--infile', '@INPUT@',
+ '--outfile', '@OUTPUT@'],
+- install: true,
++ install: false,
+ install_dir: installed_test_datadir,
+ )
+ endif
+--- a/data/tests/meson.build
++++ b/data/tests/meson.build
+@@ -2,7 +2,7 @@
+ input : 'libjcat.test.in',
+ output : 'libjcat.test',
+ configuration : conf,
+- install: true,
++ install: false,
+ install_dir: installed_test_datadir,
+ )
+
+--- a/libjcat/meson.build
++++ b/libjcat/meson.build
+@@ -225,7 +225,7 @@
+ '-DTESTDATADIR_SRC="' + testdatadir_src + '"',
+ '-DTESTDATADIR_DST="' + testdatadir_dst + '"',
+ ],
+- install : true,
++ install : false,
+ install_dir : installed_test_bindir
+ )
+ test('jcat-self-test', e)
diff --git a/dev-libs/libjcat/libjcat-0.1.0.ebuild b/dev-libs/libjcat/libjcat-0.1.0.ebuild
new file mode 100644
index 00000000000..32863148cd1
--- /dev/null
+++ b/dev-libs/libjcat/libjcat-0.1.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson vala xdg-utils
+
+DESCRIPTION="Library and tool for reading and writing Jcat files "
+HOMEPAGE="https://github.com/hughsie/libjcat"
+SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gpg gtk-doc +introspection +man pkcs7 test"
+
+RDEPEND="dev-libs/glib:2
+ dev-libs/json-glib:=
+ gpg? (
+ app-crypt/gpgme
+ dev-libs/libgpg-error
+ )
+ introspection? ( dev-libs/gobject-introspection:= )
+ pkcs7? ( net-libs/gnutls )
+ dev-lang/vala:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+ gtk-doc? ( dev-util/gtk-doc )
+ man? ( sys-apps/help2man )
+ test? ( net-libs/gnutls[tools] )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.1.0-disable_installed_tests.patch
+)
+
+src_prepare() {
+ xdg_environment_reset
+# TODO: make vala optional
+ vala_src_prepare
+ default
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use gtk-doc gtkdoc)
+ $(meson_use gpg)
+ $(meson_use introspection)
+ $(meson_use man)
+ $(meson_use pkcs7)
+ $(meson_use test tests)
+ )
+ meson_src_configure
+}
diff --git a/dev-libs/libjcat/metadata.xml b/dev-libs/libjcat/metadata.xml
new file mode 100644
index 00000000000..8d98279081e
--- /dev/null
+++ b/dev-libs/libjcat/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>marecki@gentoo.org</email>
+ <name>Marek Szuba</name>
+ </maintainer>
+ <longdescription lang="en">
+ This library allows reading and writing gzip-compressed JSON catalog files,
+ which can be used to store GPG, PKCS-7 and SHA-256 checksums for each file.
+
+ This provides equivalent functionality to the catalog files supported
+ in Microsoft Windows.
+ </longdescription>
+ <use>
+ <flag name="gpg">Enable GPG verification support via <pkg>app-crypt/gpgme</pkg></flag>
+ <flag name="man">Generate and install man pages</flag>
+ <flag name="pkcs7">Enable PKCS7 verification support via <pkg>net-libs/gnutls</pkg></flag>
+ </use>
+ <upstream>
+ <remote-id type="github">hughsie/libjcat</remote-id>
+ </upstream>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libjcat/files/, dev-libs/libjcat/
@ 2020-04-21 19:12 Marek Szuba
0 siblings, 0 replies; 6+ messages in thread
From: Marek Szuba @ 2020-04-21 19:12 UTC (permalink / raw
To: gentoo-commits
commit: fe0e73d12746563850c08679d13d2d2d93581567
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 21 19:10:42 2020 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Apr 21 19:11:48 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe0e73d1
dev-libs/libjcat: bump to 0.1.1
Closes: https://bugs.gentoo.org/718574
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
dev-libs/libjcat/Manifest | 1 +
.../libjcat-0.1.1-disable_installed_tests.patch | 46 ++++++++++++++++++
dev-libs/libjcat/libjcat-0.1.1.ebuild | 55 ++++++++++++++++++++++
3 files changed, 102 insertions(+)
diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest
index 12536faba64..a627d9c5941 100644
--- a/dev-libs/libjcat/Manifest
+++ b/dev-libs/libjcat/Manifest
@@ -1 +1,2 @@
DIST libjcat-0.1.0.tar.gz 60808 BLAKE2B 384e5a846fb7c49c8a6d6ace5f2b17715693d7e9ecfce020859c6fb5d96f9b9398606a2161a2c9f795c16c90e8b7a0e9d08970c1f81e4412783097f4ca599083 SHA512 2172fd621c86b3a2d507c3bb8fcc5f40a46656a5352f4963a014c76642bb2c34e316bb8608c121fa7d728d63dc2593ed28d3e3478e1ec5bcf32daeffc43627fd
+DIST libjcat-0.1.1.tar.gz 62579 BLAKE2B fed33602d2b036605238945d09ede1c524847624f1be6301a7f5ff64d21ba27c7c765b37c522f81dfd49071db6339738ad82b2ad0b25f0494bf4fd806c64b5de SHA512 fd644c003ad3a317a9f8886c2bad6dcfabf953e61bcbf02b30a292e9a85a591f854f71d7ac17692d5d98d976a435cf53beba1394c662fa78836389d66d4a5824
diff --git a/dev-libs/libjcat/files/libjcat-0.1.1-disable_installed_tests.patch b/dev-libs/libjcat/files/libjcat-0.1.1-disable_installed_tests.patch
new file mode 100644
index 00000000000..5cb3e00c677
--- /dev/null
+++ b/dev-libs/libjcat/files/libjcat-0.1.1-disable_installed_tests.patch
@@ -0,0 +1,46 @@
+--- a/data/tests/colorhug/meson.build
++++ b/data/tests/colorhug/meson.build
+@@ -1,3 +1,4 @@
++if false
+ install_data([
+ 'firmware.bin',
+ 'firmware.bin.asc',
+@@ -5,6 +6,7 @@
+ ],
+ install_dir: join_paths(installed_test_bindir, 'colorhug'),
+ )
++endif
+
+ if get_option('pkcs7')
+ # generate self-signed detached signature
+@@ -17,7 +19,7 @@
+ '--load-certificate', pkcs7_certificate,
+ '--infile', '@INPUT@',
+ '--outfile', '@OUTPUT@'],
+- install: true,
++ install: false,
+ install_dir: join_paths(installed_test_bindir, 'colorhug'),
+ )
+ endif
+--- a/data/tests/meson.build
++++ b/data/tests/meson.build
+@@ -2,7 +2,7 @@
+ input : 'libjcat.test.in',
+ output : 'libjcat.test',
+ configuration : conf,
+- install: true,
++ install: false,
+ install_dir: installed_test_datadir,
+ )
+
+--- a/libjcat/meson.build
++++ b/libjcat/meson.build
+@@ -235,7 +235,7 @@
+ dependencies : [
+ libjcat_deps,
+ ],
+- install : true,
++ install : false,
+ install_dir : installed_test_bindir
+ )
+ test('jcat-self-test', e, env : testdatadirs)
diff --git a/dev-libs/libjcat/libjcat-0.1.1.ebuild b/dev-libs/libjcat/libjcat-0.1.1.ebuild
new file mode 100644
index 00000000000..8a87c2a8b19
--- /dev/null
+++ b/dev-libs/libjcat/libjcat-0.1.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson vala xdg-utils
+
+DESCRIPTION="Library and tool for reading and writing Jcat files "
+HOMEPAGE="https://github.com/hughsie/libjcat"
+SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gpg gtk-doc +introspection +man pkcs7 test"
+
+RDEPEND="dev-libs/glib:2
+ dev-libs/json-glib:=
+ gpg? (
+ app-crypt/gpgme
+ dev-libs/libgpg-error
+ )
+ introspection? ( dev-libs/gobject-introspection:= )
+ pkcs7? ( net-libs/gnutls )
+ dev-lang/vala:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+ gtk-doc? ( dev-util/gtk-doc )
+ man? ( sys-apps/help2man )
+ test? ( net-libs/gnutls[tools] )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.1.1-disable_installed_tests.patch
+)
+
+src_prepare() {
+ xdg_environment_reset
+# TODO: make vala optional
+ vala_src_prepare
+ default
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use gtk-doc gtkdoc)
+ $(meson_use gpg)
+ $(meson_use introspection)
+ $(meson_use man)
+ $(meson_use pkcs7)
+ $(meson_use test tests)
+ )
+ meson_src_configure
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libjcat/files/, dev-libs/libjcat/
@ 2021-04-27 11:05 Marek Szuba
0 siblings, 0 replies; 6+ messages in thread
From: Marek Szuba @ 2021-04-27 11:05 UTC (permalink / raw
To: gentoo-commits
commit: c5ca217c3532dada8121adcf36a77ae864a900f3
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 27 10:28:25 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Apr 27 11:04:21 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5ca217c
dev-libs/libjcat: drop 0.1.4, 0.1.5
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
dev-libs/libjcat/Manifest | 2 -
.../files/libjcat-0.1.3-optional_vala.patch | 28 ---------
dev-libs/libjcat/libjcat-0.1.4.ebuild | 66 ----------------------
dev-libs/libjcat/libjcat-0.1.5.ebuild | 65 ---------------------
4 files changed, 161 deletions(-)
diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest
index a8e8fd337c3..7d38411b10f 100644
--- a/dev-libs/libjcat/Manifest
+++ b/dev-libs/libjcat/Manifest
@@ -1,3 +1 @@
-DIST libjcat-0.1.4.tar.gz 63900 BLAKE2B 509a9916aa77193835e5a29a152acb0eb1cee24b6aae3e256dee42c1fd598b9c181009cdea4c276cc0d8c8cb56d22b9073f44dd11b7fab59d29df3633af6d042 SHA512 d58860410ce6e9d35a1eefcd0c6fcd956db42a12a3e8f856e19e3abe8bd6ae304ab7a60e2c1ee28f3848f2fee3b406dd900d7c1024eca5602797711528d3f7e3
-DIST libjcat-0.1.5.tar.gz 64244 BLAKE2B fce5324981b757c7d5f9196790984a0d02e4dad3a0f75bf7262dcadc82838137537865395d75cdb6c59dade45babe0143243202bc01e41a9af5696ef79a44ec4 SHA512 ad4fb27582d24d3a7f62c8fd39c6a45d77e4e8cb005b73fe2f0cf4d697b555ca3e503c5edb05694526609d8baf7e9c21dad1465c78c8e3ee125df6a1bb79835a
DIST libjcat-0.1.6.tar.gz 64485 BLAKE2B 1b9c26655864972a5b0686eaa1b2d3835d494fd897bf0e0d08639a5b8d337c245c1265fe49d24bc52038379e4eba406660f8485a5c6350b4abab01b76a80e161 SHA512 89f49b4c73305ca83157bc0ae369d2793835b6d7d06ff90e55cd27491363c8ca7451dc0e4e5c1e3def9b653581e3ad1a990469b029f4557442cefd650420dc2d
diff --git a/dev-libs/libjcat/files/libjcat-0.1.3-optional_vala.patch b/dev-libs/libjcat/files/libjcat-0.1.3-optional_vala.patch
deleted file mode 100644
index 3c31e63eff5..00000000000
--- a/dev-libs/libjcat/files/libjcat-0.1.3-optional_vala.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Make installation of dev-lang/vala bindings optional. Unfortunately
-the option name "vala" is reserved so we must use a different one.
-
---- a/libjcat/meson.build
-+++ b/libjcat/meson.build
-@@ -122,6 +122,7 @@
- install : true
- )
-
-+ if get_option('vala-bindings')
- gnome.generate_vapi('jcat',
- sources : jcat_gir[0],
- packages : [
-@@ -130,6 +131,7 @@
- ],
- install : true,
- )
-+ endif
-
- python = import('python')
- python_interpreter = python.find_installation('python3',
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -4,3 +4,4 @@
- option('gpg', type : 'boolean', value : true, description : 'enable the GPG verification support')
- option('pkcs7', type : 'boolean', value : true, description : 'enable the PKCS7 verification support')
- option('man', type : 'boolean', value : true, description : 'enable man pages')
-+option('vala-bindings', type : 'boolean', value : true, description : 'enable vala bindings')
diff --git a/dev-libs/libjcat/libjcat-0.1.4.ebuild b/dev-libs/libjcat/libjcat-0.1.4.ebuild
deleted file mode 100644
index 649a9b130eb..00000000000
--- a/dev-libs/libjcat/libjcat-0.1.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="xml"
-
-inherit meson python-any-r1 vala xdg-utils
-
-DESCRIPTION="Library and tool for reading and writing Jcat files "
-HOMEPAGE="https://github.com/hughsie/libjcat"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE="gpg gtk-doc +introspection +man pkcs7 test vala"
-
-RDEPEND="dev-libs/glib:2
- dev-libs/json-glib:=
- gpg? (
- app-crypt/gpgme
- dev-libs/libgpg-error
- )
- introspection? ( dev-libs/gobject-introspection:= )
- pkcs7? ( net-libs/gnutls )
- vala? ( dev-lang/vala:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
- $(python_gen_any_dep '
- dev-python/setuptools[${PYTHON_USEDEP}]
- ')
- gtk-doc? ( dev-util/gtk-doc )
- man? ( sys-apps/help2man )
- test? ( net-libs/gnutls[tools] )"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.1.1-disable_installed_tests.patch
- "${FILESDIR}"/${PN}-0.1.3-optional_vala.patch
-)
-
-python_check_deps() {
- has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
- xdg_environment_reset
- use vala && vala_src_prepare
- default
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_use gtk-doc gtkdoc)
- $(meson_use gpg)
- $(meson_use introspection)
- $(meson_use man)
- $(meson_use pkcs7)
- $(meson_use test tests)
- $(meson_use vala vala-bindings)
- )
- meson_src_configure
-}
diff --git a/dev-libs/libjcat/libjcat-0.1.5.ebuild b/dev-libs/libjcat/libjcat-0.1.5.ebuild
deleted file mode 100644
index bada11c0c7e..00000000000
--- a/dev-libs/libjcat/libjcat-0.1.5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="xml"
-
-inherit meson python-any-r1 vala xdg-utils
-
-DESCRIPTION="Library and tool for reading and writing Jcat files "
-HOMEPAGE="https://github.com/hughsie/libjcat"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE="gpg gtk-doc +introspection +man pkcs7 test vala"
-
-RDEPEND="dev-libs/glib:2
- dev-libs/json-glib:=
- gpg? (
- app-crypt/gpgme
- dev-libs/libgpg-error
- )
- introspection? ( dev-libs/gobject-introspection:= )
- pkcs7? ( net-libs/gnutls )
- vala? ( dev-lang/vala:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
- $(python_gen_any_dep '
- dev-python/setuptools[${PYTHON_USEDEP}]
- ')
- gtk-doc? ( dev-util/gtk-doc )
- man? ( sys-apps/help2man )
- test? ( net-libs/gnutls[tools] )"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.1.1-disable_installed_tests.patch
-)
-
-python_check_deps() {
- has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
- xdg_environment_reset
- use vala && vala_src_prepare
- default
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_use gtk-doc gtkdoc)
- $(meson_use gpg)
- $(meson_use introspection)
- $(meson_use man)
- $(meson_use pkcs7)
- $(meson_use test tests)
- $(meson_use vala vapi)
- )
- meson_src_configure
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libjcat/files/, dev-libs/libjcat/
@ 2022-06-30 9:37 Marek Szuba
0 siblings, 0 replies; 6+ messages in thread
From: Marek Szuba @ 2022-06-30 9:37 UTC (permalink / raw
To: gentoo-commits
commit: 8073e979e38e4104f9243893755054a9f9e80928
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 09:31:20 2022 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 09:31:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8073e979
dev-libs/libjcat: expand non-installation of test data
No revbump because this bug only affected users who have had tests
enabled on this package, and in any case the spurious files ARE known to
the package manager so they'll be gone come next release anyway.
Closes: https://bugs.gentoo.org/855302
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
...atch => libjcat-0.1.11-disable_installed_tests.patch} | 16 +++++++++++++++-
dev-libs/libjcat/libjcat-0.1.11.ebuild | 2 +-
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/dev-libs/libjcat/files/libjcat-0.1.1-disable_installed_tests.patch b/dev-libs/libjcat/files/libjcat-0.1.11-disable_installed_tests.patch
similarity index 75%
rename from dev-libs/libjcat/files/libjcat-0.1.1-disable_installed_tests.patch
rename to dev-libs/libjcat/files/libjcat-0.1.11-disable_installed_tests.patch
index 5cb3e00c6778..18ef4000293e 100644
--- a/dev-libs/libjcat/files/libjcat-0.1.1-disable_installed_tests.patch
+++ b/dev-libs/libjcat/files/libjcat-0.1.11-disable_installed_tests.patch
@@ -33,9 +33,23 @@
install_dir: installed_test_datadir,
)
+--- a/data/tests/pki/meson.build
++++ b/data/tests/pki/meson.build
+@@ -1,9 +1,11 @@
++if false
+ install_data([
+ 'GPG-KEY-Linux-Vendor-Firmware-Service',
+ 'LVFS-CA.pem',
+ ],
+ install_dir: join_paths(installed_test_bindir, 'pki'),
+ )
++endif
+
+ # generate certificate
+ pkcs7_config = join_paths(meson.current_source_dir(), 'test.cfg')
--- a/libjcat/meson.build
+++ b/libjcat/meson.build
-@@ -235,7 +235,7 @@
+@@ -248,7 +248,7 @@
dependencies : [
libjcat_deps,
],
diff --git a/dev-libs/libjcat/libjcat-0.1.11.ebuild b/dev-libs/libjcat/libjcat-0.1.11.ebuild
index 1e2e8e341b96..b949816c5858 100644
--- a/dev-libs/libjcat/libjcat-0.1.11.ebuild
+++ b/dev-libs/libjcat/libjcat-0.1.11.ebuild
@@ -38,7 +38,7 @@ BDEPEND="virtual/pkgconfig
RESTRICT="!test? ( test )"
PATCHES=(
- "${FILESDIR}"/${PN}-0.1.1-disable_installed_tests.patch
+ "${FILESDIR}"/${PN}-0.1.11-disable_installed_tests.patch
)
python_check_deps() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libjcat/files/, dev-libs/libjcat/
@ 2024-10-04 17:37 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2024-10-04 17:37 UTC (permalink / raw
To: gentoo-commits
commit: 22cf32987629f16fd1a229ada33bc5296296c820
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 4 11:57:57 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct 4 17:36:55 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22cf3298
dev-libs/libjcat: drop 0.1.14
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-libs/libjcat/Manifest | 1 -
.../libjcat-0.1.11-disable_installed_tests.patch | 60 -------------------
dev-libs/libjcat/libjcat-0.1.14.ebuild | 68 ----------------------
3 files changed, 129 deletions(-)
diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest
index 6331f7ea2ef2..662daac1f93a 100644
--- a/dev-libs/libjcat/Manifest
+++ b/dev-libs/libjcat/Manifest
@@ -1,2 +1 @@
-DIST libjcat-0.1.14.tar.gz 70018 BLAKE2B 71329e6fc04ef37e5af215c88b4a5a03fbd65143604da57b0357d4bd07896a22a98b9028d8529234655adb37e5cefe226d09d987e798bce17b47fef1e1142d1f SHA512 837a50ad31a736a36bd9df26b151c198e18873df0e7444502b7a6e26a86df15f1df970112f2dd22658960389fdfb78a2c601274e2b5c46ec82fceef5aad778c1
DIST libjcat-0.2.1.tar.gz 76698 BLAKE2B 62f77c993e47843dddacc9a67b9daac9bd29bef7363ce62125ecd22f9649b8a5ce2de07d74ea6900e9a45feb141caa19761bcffd337530d86a31b6ed94cab164 SHA512 e29fdaae38ade2960ffa7ac3cd41224ccab5fdb351d2ae420ffe0cf0ddb948bba37e9e040cc3046c8593be4622bf018779dfa80f173873b79582061f12c02373
diff --git a/dev-libs/libjcat/files/libjcat-0.1.11-disable_installed_tests.patch b/dev-libs/libjcat/files/libjcat-0.1.11-disable_installed_tests.patch
deleted file mode 100644
index 18ef4000293e..000000000000
--- a/dev-libs/libjcat/files/libjcat-0.1.11-disable_installed_tests.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/data/tests/colorhug/meson.build
-+++ b/data/tests/colorhug/meson.build
-@@ -1,3 +1,4 @@
-+if false
- install_data([
- 'firmware.bin',
- 'firmware.bin.asc',
-@@ -5,6 +6,7 @@
- ],
- install_dir: join_paths(installed_test_bindir, 'colorhug'),
- )
-+endif
-
- if get_option('pkcs7')
- # generate self-signed detached signature
-@@ -17,7 +19,7 @@
- '--load-certificate', pkcs7_certificate,
- '--infile', '@INPUT@',
- '--outfile', '@OUTPUT@'],
-- install: true,
-+ install: false,
- install_dir: join_paths(installed_test_bindir, 'colorhug'),
- )
- endif
---- a/data/tests/meson.build
-+++ b/data/tests/meson.build
-@@ -2,7 +2,7 @@
- input : 'libjcat.test.in',
- output : 'libjcat.test',
- configuration : conf,
-- install: true,
-+ install: false,
- install_dir: installed_test_datadir,
- )
-
---- a/data/tests/pki/meson.build
-+++ b/data/tests/pki/meson.build
-@@ -1,9 +1,11 @@
-+if false
- install_data([
- 'GPG-KEY-Linux-Vendor-Firmware-Service',
- 'LVFS-CA.pem',
- ],
- install_dir: join_paths(installed_test_bindir, 'pki'),
- )
-+endif
-
- # generate certificate
- pkcs7_config = join_paths(meson.current_source_dir(), 'test.cfg')
---- a/libjcat/meson.build
-+++ b/libjcat/meson.build
-@@ -248,7 +248,7 @@
- dependencies : [
- libjcat_deps,
- ],
-- install : true,
-+ install : false,
- install_dir : installed_test_bindir
- )
- test('jcat-self-test', e, env : testdatadirs)
diff --git a/dev-libs/libjcat/libjcat-0.1.14.ebuild b/dev-libs/libjcat/libjcat-0.1.14.ebuild
deleted file mode 100644
index 6ea7c2221b23..000000000000
--- a/dev-libs/libjcat/libjcat-0.1.14.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit meson python-any-r1 vala xdg-utils
-
-DESCRIPTION="Library and tool for reading and writing Jcat files"
-HOMEPAGE="https://github.com/hughsie/libjcat"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ppc64 ~riscv x86"
-IUSE="+gpg gtk-doc +introspection +man +pkcs7 test vala"
-
-RDEPEND="dev-libs/glib:2
- dev-libs/json-glib:=
- gpg? (
- app-crypt/gpgme:=
- dev-libs/libgpg-error
- )
- introspection? ( dev-libs/gobject-introspection:= )
- pkcs7? ( net-libs/gnutls )
- vala? ( dev-lang/vala:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
- $(python_gen_any_dep '
- dev-python/setuptools[${PYTHON_USEDEP}]
- ')
- gtk-doc? ( dev-util/gtk-doc )
- man? ( sys-apps/help2man )
- test? ( net-libs/gnutls[tools] )"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.1.11-disable_installed_tests.patch
-)
-
-python_check_deps() {
- python_has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use vala && vala_setup
-}
-
-src_prepare() {
- xdg_environment_reset
- default
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_use gtk-doc gtkdoc)
- $(meson_use gpg)
- $(meson_use introspection)
- $(meson_use man)
- $(meson_use pkcs7)
- $(meson_use test tests)
- $(meson_use vala vapi)
- )
- meson_src_configure
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libjcat/files/, dev-libs/libjcat/
@ 2024-12-27 5:48 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2024-12-27 5:48 UTC (permalink / raw
To: gentoo-commits
commit: f62b54688e72027c173afd046ae174c8e6ce2505
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 27 05:47:56 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 27 05:48:14 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f62b5468
dev-libs/libjcat: fix tests w/ USE=-ed25519
Closes: https://bugs.gentoo.org/946985
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/libjcat/files/libjcat-0.2.2-tests.patch | 36 ++++++++++++++++++++++++
dev-libs/libjcat/libjcat-0.2.2.ebuild | 4 +++
2 files changed, 40 insertions(+)
diff --git a/dev-libs/libjcat/files/libjcat-0.2.2-tests.patch b/dev-libs/libjcat/files/libjcat-0.2.2-tests.patch
new file mode 100644
index 000000000000..82f1b6a38286
--- /dev/null
+++ b/dev-libs/libjcat/files/libjcat-0.2.2-tests.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/946985
+https://github.com/hughsie/libjcat/commit/130179f55a4eba1e885ca4ea1b4b2aa0a8d24605
+
+From 130179f55a4eba1e885ca4ea1b4b2aa0a8d24605 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <mail@heiko-becker.de>
+Date: Sat, 2 Nov 2024 15:06:31 +0100
+Subject: [PATCH] Skip ed25519 part of a test with -Ded25519=false
+
+Otherwise it fails with "jcat-self-test.c:1147:jcat_bt_common_func:
+assertion failed (error == NULL): Jcat engine kind 'ed25519' not
+supported (g-io-error-quark, 1)"
+---
+ libjcat/jcat-self-test.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libjcat/jcat-self-test.c b/libjcat/jcat-self-test.c
+index 68e1273..cc92e12 100644
+--- a/libjcat/jcat-self-test.c
++++ b/libjcat/jcat-self-test.c
+@@ -1142,6 +1142,7 @@ jcat_bt_common_func(void)
+ g_assert_no_error(error);
+ g_assert_nonnull(btcheckpoint);
+
++#ifdef ENABLE_ED25519
+ /* get engine */
+ engine = jcat_context_get_engine(context, JCAT_BLOB_KIND_ED25519, &error);
+ g_assert_no_error(error);
+@@ -1162,6 +1163,7 @@ jcat_bt_common_func(void)
+ &error);
+ g_assert_no_error(error);
+ g_assert_nonnull(result);
++#endif
+ }
+
+ int
+
diff --git a/dev-libs/libjcat/libjcat-0.2.2.ebuild b/dev-libs/libjcat/libjcat-0.2.2.ebuild
index f584d650c90e..56480d506397 100644
--- a/dev-libs/libjcat/libjcat-0.2.2.ebuild
+++ b/dev-libs/libjcat/libjcat-0.2.2.ebuild
@@ -44,6 +44,10 @@ BDEPEND="
RESTRICT="!test? ( test )"
+PATCHES=(
+ "${FILESDIR}"/${P}-tests.patch
+)
+
python_check_deps() {
python_has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-12-27 5:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-27 5:48 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libjcat/files/, dev-libs/libjcat/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-10-04 17:37 Andreas Sturmlechner
2022-06-30 9:37 Marek Szuba
2021-04-27 11:05 Marek Szuba
2020-04-21 19:12 Marek Szuba
2020-03-30 15:03 Marek Szuba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox