commit:     043a826a035154cb403f96abc02875ae641b2f04
Author:     NHOrus <jy6x2b32pie9 <AT> yahoo <DOT> com>
AuthorDate: Tue Feb  4 19:51:01 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 10 08:49:21 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=043a826a

dev-libs/libvformat: update EAPI 7 -> 8, fix incompatible pointers

Use new-er debian patchset
time_t was already used in most places, with this patch to fix
incompatible pointer types error, it's not surprisingly transformed
into 32-bit unsigned int.

Closes: https://github.com/gentoo/gentoo/pull/38980
Closes: https://bugs.gentoo.org/919257
Signed-off-by: NHOrus <jy6x2b32pie9 <AT> yahoo.com>
Closes: https://github.com/gentoo/gentoo/pull/40440
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/libvformat/Manifest                       |  1 +
 .../libvformat/files/libvformat-1.13-time_t.patch  | 33 +++++++++++++++++++
 dev-libs/libvformat/libvformat-1.13-r3.ebuild      | 37 ++++++++++++++++++++++
 3 files changed, 71 insertions(+)

diff --git a/dev-libs/libvformat/Manifest b/dev-libs/libvformat/Manifest
index f3066fa5d451..e38fd1a533a8 100644
--- a/dev-libs/libvformat/Manifest
+++ b/dev-libs/libvformat/Manifest
@@ -1,2 +1,3 @@
 DIST libvformat_1.13-10.debian.tar.gz 25884 BLAKE2B 
73f2ef1126dcf51ef1d8128a74b131e6ed67b8a83c4a7db2d142942bd3f4748d0925f4bdd09633f4be47260d035066d0f730bd7680ebd4b9721bc0416e61d823
 SHA512 
fd3635a697cf52215a024118dd5e7776829ec2e537a6795121361046588be23f00225fafc50e14e25e94e94659bb16d7830193b159925c63ff2e0644394b3626
+DIST libvformat_1.13-12.debian.tar.xz 21560 BLAKE2B 
a226c3a0488c78357c44f3b45608bb07b002e3e59eb01db4bc42c284ef8b24484e75368dc24a9dcba637a99ddcff1f19b39462c800606e1f73327bbe3bdc6eaf
 SHA512 
9fd7f3765fd53d3dd90698973e582b9a61e9e0192c5f588f984c323b36939535a47c33ff89d8eb9c7aa9c567b8a785e077c626db13668532f683834ee53c234a
 DIST libvformat_1.13.orig.tar.gz 254463 BLAKE2B 
ee7d7bf9585e670ed3f6999d002669072535ce7c2c474b1f86d80026ea4bf6852a5c000a45a03b881e6d15695bd3162c132864ccb4f7cc574207209ea3a6c579
 SHA512 
80b47897dd4f5dfa05e78a40de821406a007e330fc82584a0d26e2d1580a5ce52b6af90ecd4c0f7f36eaf00d6a78d9ba3b84ec2b7c7d814ba890a629d7a2c7ba

diff --git a/dev-libs/libvformat/files/libvformat-1.13-time_t.patch 
b/dev-libs/libvformat/files/libvformat-1.13-time_t.patch
new file mode 100644
index 000000000000..b49c6bbdfa4b
--- /dev/null
+++ b/dev-libs/libvformat/files/libvformat-1.13-time_t.patch
@@ -0,0 +1,33 @@
+Program already uses time_t everywhere else, use it in last possible place
+https://bugs.gentoo.org/919257
+--- a/src/vf_access_calendar.c
++++ b/src/vf_access_calendar.c
+@@ -226,7 +226,7 @@
+  
*---------------------------------------------------------------------------*/
+ 
+ bool_t vf_date_string_to_time(
+-    uint32_t *p_time,               /* Output time value */
++    time_t *p_time,                 /* Output time value */
+     const char *p_string            /* Input string */
+     )
+ {
+@@ -298,7 +298,7 @@
+             }
+             else
+             {
+-                *p_time = (uint32_t)t;
++                *p_time = t;
+             }
+         }
+     }
+--- a/vformat/vf_iface.h
++++ b/vformat/vf_iface.h
+@@ -1203,7 +1203,7 @@
+  
*---------------------------------------------------------------------------*/
+ 
+ extern VFORMATDECLSPEC bool_t vf_date_string_to_time(
+-    uint32_t *p_time,               /* Output time value */
++    time_t *p_time,                 /* Output time value */
+     const char *p_string            /* Input string */
+     );
+ 

diff --git a/dev-libs/libvformat/libvformat-1.13-r3.ebuild 
b/dev-libs/libvformat/libvformat-1.13-r3.ebuild
new file mode 100644
index 000000000000..879ad26638d7
--- /dev/null
+++ b/dev-libs/libvformat/libvformat-1.13-r3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Library to read and write vcard files"
+HOMEPAGE="https://sourceforge.net/projects/vformat/";
+SRC_URI="
+       mirror://debian/pool/main/libv/${PN}/${PN}_${PV}.orig.tar.gz
+       mirror://debian/pool/main/libv/${PN}/${PN}_${PV}-12.debian.tar.xz
+"
+S="${WORKDIR}/${P}.orig"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+src_prepare() {
+       eapply \
+               "${WORKDIR}"/debian/patches/*.patch \
+               "${FILESDIR}"/${PN}-nodoc.patch \
+               "${FILESDIR}"/${P}-has_unistd.patch \
+               "${FILESDIR}"/${P}-str.patch \
+               "${FILESDIR}"/${P}-time_t.patch
+
+       default
+
+       eautoreconf
+}
+
+src_install() {
+       default
+
+       find "${ED}" -name '*.la' -delete || die
+}

Reply via email to