* [gentoo-commits] repo/gentoo:master commit in: app-arch/gcab/, app-arch/gcab/files/
@ 2019-02-12 11:10 Mart Raudsepp
0 siblings, 0 replies; 3+ messages in thread
From: Mart Raudsepp @ 2019-02-12 11:10 UTC (permalink / raw
To: gentoo-commits
commit: ad94d90fa3849239b889e939d395cc0d7a75cd2c
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 12 10:00:19 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Feb 12 11:09:28 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad94d90f
app-arch/gcab: bump to 1.2
Closes: https://bugs.gentoo.org/677454
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
app-arch/gcab/Manifest | 1 +
app-arch/gcab/files/1.2-optional-vapi.patch | 44 +++++++++++++++++++++++++
app-arch/gcab/gcab-1.2.ebuild | 50 +++++++++++++++++++++++++++++
3 files changed, 95 insertions(+)
diff --git a/app-arch/gcab/Manifest b/app-arch/gcab/Manifest
index 9959cfa87c8..67cbaefc29f 100644
--- a/app-arch/gcab/Manifest
+++ b/app-arch/gcab/Manifest
@@ -1 +1,2 @@
DIST gcab-0.8.tar.xz 337016 BLAKE2B 6f9ccf6d33c4bd32b6cda09083c98ee9b24ffc3b42be9019493a864011a4d3f1e2d1fa766bbdd0a5de29eb04608d91a2ad5c17aa25302e3d94d2ef6ca659d764 SHA512 044b1cbe71b08946031161ca97379df8500be5569d6f4989b8fd8f1d8c48ba0fe757306955de9137958eb870cd4024e4c56f833ce847e5a972339883b39454f2
+DIST gcab-1.2.tar.xz 76088 BLAKE2B 4d8f04ec6211745e841b88e93c5d156843bce9ca8668daf9d39f1197c814d619f7e61b1e20d163c8631da36bf395776c3b20a91a0ec97ff7c609997fa84a538d SHA512 b5cc114f5cea21c21d9ef2009cefce700b5a7f97609e20aa455b84fcefe1693ce2566ddc58dc2b7c97f7db772f8ae3a2f3cc9a0e1d2c23d93d5fbee9101d3f64
diff --git a/app-arch/gcab/files/1.2-optional-vapi.patch b/app-arch/gcab/files/1.2-optional-vapi.patch
new file mode 100644
index 00000000000..10a171926cb
--- /dev/null
+++ b/app-arch/gcab/files/1.2-optional-vapi.patch
@@ -0,0 +1,44 @@
+From 5ac7272bba9635234fc08ab526b80a9f259d0fc6 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Tue, 12 Feb 2019 11:44:10 +0200
+Subject: [PATCH] build-sys: Support disabling vapi generation independent of
+ introspection
+
+---
+ libgcab/meson.build | 12 +++++++-----
+ meson_options.txt | 1 +
+ 2 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/libgcab/meson.build b/libgcab/meson.build
+index f939617..3c4ac68 100644
+--- a/libgcab/meson.build
++++ b/libgcab/meson.build
+@@ -93,9 +93,11 @@ if get_option('introspection')
+ ],
+ install : true
+ )
+- gnome.generate_vapi('libgcab-1.0',
+- sources: gir[0],
+- packages : ['gio-2.0'],
+- install : true,
+- )
++ if get_option('vapi')
++ gnome.generate_vapi('libgcab-1.0',
++ sources: gir[0],
++ packages : ['gio-2.0'],
++ install : true,
++ )
++ endif
+ endif
+diff --git a/meson_options.txt b/meson_options.txt
+index bbcbbea..b7ade3f 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,3 +1,4 @@
+ option('docs', type : 'boolean', value : true, description : 'enable developer documentation')
+ option('introspection', type : 'boolean', value : true, description : 'generate GObject Introspection data')
++option('vapi', type : 'boolean', value : true, description: 'generate Vala bindings (requires introspection)')
+ option('tests', type : 'boolean', value : true, description : 'enable tests')
+--
+2.17.0
+
diff --git a/app-arch/gcab/gcab-1.2.ebuild b/app-arch/gcab/gcab-1.2.ebuild
new file mode 100644
index 00000000000..ec4cb4e72be
--- /dev/null
+++ b/app-arch/gcab/gcab-1.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org meson vala
+
+DESCRIPTION="Library and tool for working with Microsoft Cabinet (CAB) files"
+HOMEPAGE="https://wiki.gnome.org/msitools"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+IUSE="gtk-doc +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+ >=dev-libs/glib-2.44:2
+ sys-libs/zlib
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}
+ dev-util/glib-utils
+ gtk-doc? ( >=dev-util/gtk-doc-1.14
+ app-text/docbook-xml-dtd:4.3 )
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}"/${PV}-optional-vapi.patch ) # https://gitlab.gnome.org/GNOME/gcab/merge_requests/1
+
+src_prepare() {
+ use vala && vala_src_prepare
+ default
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use gtk-doc docs)
+ $(meson_use introspection)
+ $(meson_use vala vapi)
+ $(meson_use test tests)
+ )
+ meson_src_configure
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-arch/gcab/, app-arch/gcab/files/
@ 2020-01-01 16:06 Mart Raudsepp
0 siblings, 0 replies; 3+ messages in thread
From: Mart Raudsepp @ 2020-01-01 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 7bbc81104deae05e8ef8968882a878a99e2dff2d
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 1 15:47:24 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Jan 1 16:06:39 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bbc8110
app-arch/gcab: remove old
Package-Manager: Portage-2.3.79, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
app-arch/gcab/Manifest | 1 -
app-arch/gcab/files/1.2-optional-vapi.patch | 44 -------------------------
app-arch/gcab/gcab-1.2.ebuild | 50 -----------------------------
3 files changed, 95 deletions(-)
diff --git a/app-arch/gcab/Manifest b/app-arch/gcab/Manifest
index 7a4087fdca9..4e1c6c55822 100644
--- a/app-arch/gcab/Manifest
+++ b/app-arch/gcab/Manifest
@@ -1,3 +1,2 @@
DIST gcab-0.8.tar.xz 337016 BLAKE2B 6f9ccf6d33c4bd32b6cda09083c98ee9b24ffc3b42be9019493a864011a4d3f1e2d1fa766bbdd0a5de29eb04608d91a2ad5c17aa25302e3d94d2ef6ca659d764 SHA512 044b1cbe71b08946031161ca97379df8500be5569d6f4989b8fd8f1d8c48ba0fe757306955de9137958eb870cd4024e4c56f833ce847e5a972339883b39454f2
-DIST gcab-1.2.tar.xz 76088 BLAKE2B 4d8f04ec6211745e841b88e93c5d156843bce9ca8668daf9d39f1197c814d619f7e61b1e20d163c8631da36bf395776c3b20a91a0ec97ff7c609997fa84a538d SHA512 b5cc114f5cea21c21d9ef2009cefce700b5a7f97609e20aa455b84fcefe1693ce2566ddc58dc2b7c97f7db772f8ae3a2f3cc9a0e1d2c23d93d5fbee9101d3f64
DIST gcab-1.3.tar.xz 77900 BLAKE2B 9ab61c1ab36561cd0bce075c8d491c8e28651c26ff5943a2ddc294a369f7627c300ed698363980dd839b64d512b678d7b3903addeea05657551af308b6e0c5ed SHA512 fd34722bc57a75e9a2aaec354af4629a35936928eb6db5646659c8dd51c8c6fd7fc6786c23f7e91a33a727bf8548327f50725081a8c7b1e0facb877341887b22
diff --git a/app-arch/gcab/files/1.2-optional-vapi.patch b/app-arch/gcab/files/1.2-optional-vapi.patch
deleted file mode 100644
index 10a171926cb..00000000000
--- a/app-arch/gcab/files/1.2-optional-vapi.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 5ac7272bba9635234fc08ab526b80a9f259d0fc6 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Tue, 12 Feb 2019 11:44:10 +0200
-Subject: [PATCH] build-sys: Support disabling vapi generation independent of
- introspection
-
----
- libgcab/meson.build | 12 +++++++-----
- meson_options.txt | 1 +
- 2 files changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/libgcab/meson.build b/libgcab/meson.build
-index f939617..3c4ac68 100644
---- a/libgcab/meson.build
-+++ b/libgcab/meson.build
-@@ -93,9 +93,11 @@ if get_option('introspection')
- ],
- install : true
- )
-- gnome.generate_vapi('libgcab-1.0',
-- sources: gir[0],
-- packages : ['gio-2.0'],
-- install : true,
-- )
-+ if get_option('vapi')
-+ gnome.generate_vapi('libgcab-1.0',
-+ sources: gir[0],
-+ packages : ['gio-2.0'],
-+ install : true,
-+ )
-+ endif
- endif
-diff --git a/meson_options.txt b/meson_options.txt
-index bbcbbea..b7ade3f 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1,3 +1,4 @@
- option('docs', type : 'boolean', value : true, description : 'enable developer documentation')
- option('introspection', type : 'boolean', value : true, description : 'generate GObject Introspection data')
-+option('vapi', type : 'boolean', value : true, description: 'generate Vala bindings (requires introspection)')
- option('tests', type : 'boolean', value : true, description : 'enable tests')
---
-2.17.0
-
diff --git a/app-arch/gcab/gcab-1.2.ebuild b/app-arch/gcab/gcab-1.2.ebuild
deleted file mode 100644
index 870507f4b16..00000000000
--- a/app-arch/gcab/gcab-1.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org meson vala xdg
-
-DESCRIPTION="Library and tool for working with Microsoft Cabinet (CAB) files"
-HOMEPAGE="https://wiki.gnome.org/msitools"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
-
-IUSE="gtk-doc +introspection test vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
- >=dev-libs/glib-2.44:2
- sys-libs/zlib
- introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}
- dev-util/glib-utils
- gtk-doc? ( >=dev-util/gtk-doc-1.14
- app-text/docbook-xml-dtd:4.3 )
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=( "${FILESDIR}"/${PV}-optional-vapi.patch ) # https://gitlab.gnome.org/GNOME/gcab/merge_requests/1
-
-src_prepare() {
- xdg_src_prepare
- use vala && vala_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_use gtk-doc docs)
- $(meson_use introspection)
- $(meson_use vala vapi)
- $(meson_use test tests)
- )
- meson_src_configure
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-arch/gcab/, app-arch/gcab/files/
@ 2022-08-05 20:49 Matt Turner
0 siblings, 0 replies; 3+ messages in thread
From: Matt Turner @ 2022-08-05 20:49 UTC (permalink / raw
To: gentoo-commits
commit: 6fa54e8cb856a425daa398868d99cb6a2ff3ff92
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 5 20:48:46 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Aug 5 20:49:14 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fa54e8c
app-arch/gcab: Version bump to 1.5
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
app-arch/gcab/Manifest | 1 +
.../files/1.5-meson-git-version-is-optional.patch | 35 ++++++++++++++
app-arch/gcab/gcab-1.5.ebuild | 56 ++++++++++++++++++++++
3 files changed, 92 insertions(+)
diff --git a/app-arch/gcab/Manifest b/app-arch/gcab/Manifest
index 8922b04345a1..4aca7506d8f4 100644
--- a/app-arch/gcab/Manifest
+++ b/app-arch/gcab/Manifest
@@ -1 +1,2 @@
DIST gcab-1.4.tar.xz 78240 BLAKE2B 8b857c116fab636db93463cee7d6b809c3c7b2bdf3896b7b5b5b66ebf270b284b356710933ec17584143bcef5c1f5c555811dd05ea98399f327047476a33fc16 SHA512 66a2e0d0a5888c555153356ce808f602053e71b76af19794db7e3bbf9516fe791805068838b4e208698cd645ada7a08610ac95f846fa81e00a9b955016306299
+DIST gcab-1.5.tar.xz 81728 BLAKE2B ba1793a8374e2dac412ca2807343781013f5be8d79e444ef0a136fbf903dd9a47809b3dec4703ebd19d196a7046a0c8405ae8463c2f7338fdc5eaf979436e8e1 SHA512 2a9b7d2720abbb5527d478ac760898ae254d08b7aa929fbb21753296e5a07c51d62e134a3f8b1b21d9b557d4093505194e09823ddbaf58465d37b372f37534b7
diff --git a/app-arch/gcab/files/1.5-meson-git-version-is-optional.patch b/app-arch/gcab/files/1.5-meson-git-version-is-optional.patch
new file mode 100644
index 000000000000..6bfbaecf78a6
--- /dev/null
+++ b/app-arch/gcab/files/1.5-meson-git-version-is-optional.patch
@@ -0,0 +1,35 @@
+From ad0baea50359c1978a9224ee60bf98d97bfb991f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
+Date: Fri, 5 Aug 2022 11:13:41 +0400
+Subject: [PATCH] meson: git version is optional
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+My bad, git may be present, but running "git abbrev" from the tarball
+extracted project can fail.
+
+Fix commit a755e2ae77035aad9644adadaec5ecf15e9656ba ("meson: fix new
+warning about run_command()")
+
+Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 15fd5cd..5eba715 100644
+--- a/meson.build
++++ b/meson.build
+@@ -8,7 +8,7 @@ project('gcab', 'c',
+ git_version = []
+ git = find_program('git', required: false)
+ if git.found()
+- git_version = run_command(git, 'describe', '--abbrev=4', '--dirty', check: true).stdout().strip().split('-')
++ git_version = run_command(git, 'describe', '--abbrev=4', '--dirty', check: false).stdout().strip().split('-')
+ endif
+
+ # libtool versioning
+--
+2.35.1
+
diff --git a/app-arch/gcab/gcab-1.5.ebuild b/app-arch/gcab/gcab-1.5.ebuild
new file mode 100644
index 000000000000..acf17df81e42
--- /dev/null
+++ b/app-arch/gcab/gcab-1.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson vala xdg
+
+DESCRIPTION="Library and tool for working with Microsoft Cabinet (CAB) files"
+HOMEPAGE="https://wiki.gnome.org/msitools https://gitlab.gnome.org/GNOME/gcab"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+IUSE="gtk-doc +introspection test vala"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+ >=dev-libs/glib-2.62.0:2
+ sys-libs/zlib
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/glib-utils
+ gtk-doc? (
+ >=dev-util/gtk-doc-1.14
+ app-text/docbook-xml-dtd:4.3
+ )
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PV}-meson-git-version-is-optional.patch
+)
+
+src_prepare() {
+ default
+ xdg_environment_reset
+ use vala && vala_setup
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use gtk-doc docs)
+ $(meson_use introspection)
+ -Dnls=true
+ $(meson_use vala vapi)
+ $(meson_use test tests)
+ -Dinstalled_tests=false
+ )
+ meson_src_configure
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-08-05 20:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-01 16:06 [gentoo-commits] repo/gentoo:master commit in: app-arch/gcab/, app-arch/gcab/files/ Mart Raudsepp
-- strict thread matches above, loose matches on Subject: below --
2022-08-05 20:49 Matt Turner
2019-02-12 11:10 Mart Raudsepp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox