* [gentoo-commits] repo/gentoo:master commit in: sys-fs/hfsplusutils/, sys-fs/hfsplusutils/files/
@ 2016-04-23 6:38 Mike Frysinger
0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger @ 2016-04-23 6:38 UTC (permalink / raw
To: gentoo-commits
commit: 4b85d444031fb78c616869408835939b273a11b2
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 23 06:37:51 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat Apr 23 06:37:51 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b85d444
sys-fs/hfsplusutils: clean up more missing header warnings
.../files/hfsplusutils-1.0.4-stdlib.patch | 22 ++++++++++++++++++
.../files/hfsplusutils-1.0.4-string.patch | 26 ++++++++++++++++++++--
sys-fs/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild | 1 +
3 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-stdlib.patch b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-stdlib.patch
new file mode 100644
index 0000000..211a502
--- /dev/null
+++ b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-stdlib.patch
@@ -0,0 +1,22 @@
+needed for exit() prototype
+
+--- a/libhfsp/src/os.c
++++ b/libhfsp/src/os.c
+@@ -46,6 +46,7 @@ int fstat(int, struct stat *);
+ # endif
+
+ # include <stdio.h>
++# include <stdlib.h>
+
+
+ # include <errno.h>
+--- a/libhfsp/src/record.c
++++ b/libhfsp/src/record.c
+@@ -32,6 +32,7 @@
+ #include <errno.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <stdlib.h>
+
+ #include "libhfsp.h"
+ #include "hfstime.h"
diff --git a/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-string.patch b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-string.patch
index 2602876..37abcbd 100644
--- a/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-string.patch
+++ b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-string.patch
@@ -1,5 +1,7 @@
---- libhfsp/src/unicode.c.bak 2007-01-08 17:14:44.000000000 -0500
-+++ libhfsp/src/unicode.c 2007-01-08 17:14:52.000000000 -0500
+needed for mem* funcs
+
+--- a/libhfsp/src/unicode.c
++++ b/libhfsp/src/unicode.c
@@ -16,7 +16,7 @@
#include <stdlib.h>
#include <endian.h>
@@ -9,3 +11,23 @@
#define __USE_GNU
/* need wcsrtomb */
+--- a/libhfsp/src/partitions.c
++++ b/libhfsp/src/partitions.c
+@@ -31,6 +31,7 @@
+ #include "os.h"
+ #include "libhfsp.h"
+
++#include <string.h>
+ #include <stdlib.h>
+
+ /*
+--- a/libhfsp/src/record.c
++++ b/libhfsp/src/record.c
+@@ -32,6 +32,7 @@
+
+ #include <errno.h>
+ #include <stdio.h>
++#include <string.h>
+
+ #include "libhfsp.h"
+ #include "hfstime.h"
diff --git a/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild b/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild
index e11b120..380d9b2 100644
--- a/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild
+++ b/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild
@@ -25,6 +25,7 @@ src_prepare() {
epatch "${FILESDIR}/${P}-errno.patch"
epatch "${FILESDIR}/${P}-gcc4.patch"
epatch "${FILESDIR}/${P}-string.patch"
+ epatch "${FILESDIR}/${P}-stdlib.patch"
# let's avoid the Makefile.cvs since isn't working for us
eautoreconf
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/hfsplusutils/, sys-fs/hfsplusutils/files/
@ 2020-02-08 12:07 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2020-02-08 12:07 UTC (permalink / raw
To: gentoo-commits
commit: 2a279e72974f0b853750e1c11fe5449a0a032660
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 8 12:06:45 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb 8 12:06:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a279e72
sys-fs/hfsplusutils: Fix GCC 10
Closes: https://bugs.gentoo.org/707690
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../hfsplusutils-1.0.4-fno-common-gcc10.patch | 27 ++++++++++++++++++++++
sys-fs/hfsplusutils/hfsplusutils-1.0.4-r2.ebuild | 3 ++-
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-fno-common-gcc10.patch b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-fno-common-gcc10.patch
new file mode 100644
index 00000000000..dde912d4ef6
--- /dev/null
+++ b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-fno-common-gcc10.patch
@@ -0,0 +1,27 @@
+--- a/libhfsp/src/fscheck.c
++++ b/libhfsp/src/fscheck.c
+@@ -47,6 +47,8 @@
+ # include "os.h"
+ # include "swab.h"
+
++struct fsck_data_t fsck_data;
++
+ /* Dump all raw fork information to stdout */
+ void print_fork(hfsp_fork_raw* f)
+ {
+--- a/libhfsp/src/fscheck.h
++++ b/libhfsp/src/fscheck.h
+@@ -100,10 +100,11 @@
+ int fscheck_files(volume* vol);
+
+ /** global data used during fsck */
+-struct {
++struct fsck_data_t {
+ UInt32 maxCnid;
+ UInt32 macNow; // current date in mac-offset
+ int verbose;
+ int ignoreErr;
+-} fsck_data;
++};
+
++extern struct fsck_data_t fsck_data;
diff --git a/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r2.ebuild b/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r2.ebuild
index 4e624f1b33c..a578df33501 100644
--- a/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r2.ebuild
+++ b/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -24,6 +24,7 @@ PATCHES=(
"${FILESDIR}"/${P}-string.patch
"${FILESDIR}"/${P}-stdlib.patch
"${FILESDIR}"/${P}-cflags.patch
+ "${FILESDIR}"/${P}-fno-common-gcc10.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/hfsplusutils/, sys-fs/hfsplusutils/files/
@ 2020-02-08 12:07 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2020-02-08 12:07 UTC (permalink / raw
To: gentoo-commits
commit: 8e823883f26773f166dcedabc77003b2a4950347
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 8 12:06:48 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb 8 12:06:48 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e823883
sys-fs/hfsplusutils: Use proper `static inline` idiom for gnu89/C11
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../files/hfsplusutils-1.0.4-gcc5.patch | 201 +++++++++++++++++++++
sys-fs/hfsplusutils/hfsplusutils-1.0.4-r2.ebuild | 10 +-
2 files changed, 205 insertions(+), 6 deletions(-)
diff --git a/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-gcc5.patch b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-gcc5.patch
new file mode 100644
index 00000000000..7b3b30c1090
--- /dev/null
+++ b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-gcc5.patch
@@ -0,0 +1,201 @@
+https://bugs.gentoo.org/580620
+
+--- a/libhfsp/src/blockiter.c
++++ b/libhfsp/src/blockiter.c
+@@ -143,9 +143,3 @@
+ fail:
+ return -1;
+ }
+-
+-/* return current block */
+-UInt32 blockiter_curr(blockiter *b) /* inline */
+-{
+- return b->e->start_block + b->block;
+-}
+--- a/libhfsp/src/blockiter.h
++++ b/libhfsp/src/blockiter.h
+@@ -52,7 +52,7 @@
+ extern int blockiter_skip(blockiter *b, UInt32 skip);
+
+ /* return current block */
+-extern inline UInt32 blockiter_curr(blockiter *b)
++static inline UInt32 blockiter_curr(blockiter *b)
+ {
+ return b->e->start_block + b->block;
+ }
+--- a/libhfsp/src/libhfsp.c
++++ b/libhfsp/src/libhfsp.c
+@@ -32,15 +32,5 @@
+
+ const char *hfsp_error = "no error"; /* static error string */
+
+-/** helper function to create those Apple 4 byte Signatures */
+-UInt32 sig(char c0, char c1, char c2, char c3)
+-{
+- UInt32 sig;
+- ((char*)&sig)[0] = c0;
+- ((char*)&sig)[1] = c1;
+- ((char*)&sig)[2] = c2;
+- ((char*)&sig)[3] = c3;
+- return sig;
+-}
+
+
+--- a/libhfsp/src/libhfsp.h
++++ b/libhfsp/src/libhfsp.h
+@@ -90,7 +90,7 @@
+
+
+ /** helper function to create those Apple 4 byte Signatures */
+-extern inline UInt32 sig(char c0, char c1, char c2, char c3)
++static inline UInt32 sig(char c0, char c1, char c2, char c3)
+ {
+ UInt32 sig;
+ ((char*)&sig)[0] = c0;
+--- a/libhfsp/src/volume.c
++++ b/libhfsp/src/volume.c
+@@ -604,14 +604,6 @@
+ vol->extents = NULL;
+ }
+
+-/* accessor for entends btree, is created on demand */
+-/* inline */ btree* volume_get_extents_tree(volume* vol)
+-{
+- if (!vol->extents)
+- volume_create_extents_tree(vol);
+- return vol->extents;
+-}
+-
+ /* return new Id for files/folder and check for overflow.
+ *
+ * retun 0 on error .
+--- a/libhfsp/src/volume.h
++++ b/libhfsp/src/volume.h
+@@ -75,7 +75,7 @@
+ extern void volume_create_extents_tree(volume* vol);
+
+ /* accessor for entends btree, is created on demand */
+-extern inline btree* volume_get_extents_tree(volume* vol)
++static inline btree* volume_get_extents_tree(volume* vol)
+ {
+ if (!vol->extents)
+ volume_create_extents_tree(vol);
+--- a/src/darray.c
++++ b/src/darray.c
+@@ -65,16 +65,6 @@
+ return (array->eltend - array->mem) / array->elemsz;
+ }
+
+-/*
+- * NAME: darray->array()
+- * DESCRIPTION: return the array as an indexable block
+- */
+-inline
+-void *darray_array(darray *array)
+-{
+- return (void *) array->mem;
+-}
+-
+
+ /*
+ * NAME: darray->append()
+--- a/src/darray.h
++++ b/src/darray.h
+@@ -40,7 +40,7 @@
+ extern void darray_sort(darray *, int (*)(const void *, const void *));
+
+ /* return the array as an indexable block */
+-extern inline void *darray_array(darray *array)
++static inline void *darray_array(darray *array)
+ {
+ return (void *) array->mem;
+ }
+--- a/src/dlist.c
++++ b/src/dlist.c
+@@ -60,24 +60,6 @@
+ }
+
+ /*
+- * NAME: dlist->array()
+- * DESCRIPTION: return the array of strings in a list; can dispose with free()
+- */
+-char **dlist_array(dlist *list)
+-{
+- return (char **) list->mem;
+-}
+-
+-/*
+- * NAME: dlist->size()
+- * DESCRIPTION: return the number of strings in a list
+- */
+-int dlist_size(dlist *list)
+-{
+- return list->eltend - (char **) list->mem;
+-}
+-
+-/*
+ * NAME: dlist->append()
+ * DESCRIPTION: insert a string to the end of a list
+ */
+--- a/src/dlist.h
++++ b/src/dlist.h
+@@ -36,13 +36,13 @@
+ extern int dlist_append(dlist *, const char *);
+
+ /* return the array of strings in a list; can dispose with free() */
+-extern inline char **dlist_array(dlist *list)
++static inline char **dlist_array(dlist *list)
+ {
+ return (char **) list->mem;
+ }
+
+ /* return the number of strings in a list */
+-extern inline int dlist_size(dlist *list)
++static inline int dlist_size(dlist *list)
+ {
+ return list->eltend - (char **) list->mem;
+ }
+--- a/src/dstring.c
++++ b/src/dstring.c
+@@ -124,24 +124,6 @@
+ return 0;
+ }
+
+-/*
+- * NAME: dstring->string()
+- * DESCRIPTION: return a pointer to a dynamic string's content
+- */
+-char *dstring_string(dstring *string)
+-{
+- return string->str;
+-}
+-
+-/*
+- * NAME: dstring->length()
+- * DESCRIPTION: return the length of a dynamic string
+- */
+-int dstring_length(dstring *string)
+-{
+- return string->len;
+-}
+-
+
+ /*
+ * NAME: dstring->shrink()
+--- a/src/dstring.h
++++ b/src/dstring.h
+@@ -42,12 +42,12 @@
+ extern void dstring_shrink(dstring *, size_t);
+ extern void dstring_free(dstring *);
+
+-extern inline char *dstring_string(dstring *string)
++static inline char *dstring_string(dstring *string)
+ {
+ return string->str;
+ }
+
+-extern inline int dstring_length(dstring *string)
++static inline int dstring_length(dstring *string)
+ {
+ return string->len;
+ }
diff --git a/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r2.ebuild b/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r2.ebuild
index a578df33501..34c9cf508cb 100644
--- a/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r2.ebuild
+++ b/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r2.ebuild
@@ -3,9 +3,10 @@
EAPI=7
-inherit autotools flag-o-matic
+inherit autotools
MY_P="hfsplus_${PV}"
+
DESCRIPTION="HFS+ Filesystem Access Utilities (a PPC filesystem)"
HOMEPAGE="http://penguinppc.org/historical/hfsplus/"
SRC_URI="http://penguinppc.org/historical/hfsplus/${MY_P}.src.tar.bz2"
@@ -13,7 +14,6 @@ SRC_URI="http://penguinppc.org/historical/hfsplus/${MY_P}.src.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ppc ppc64 x86"
-IUSE="static-libs"
S="${WORKDIR}/hfsplus-${PV}"
@@ -25,6 +25,7 @@ PATCHES=(
"${FILESDIR}"/${P}-stdlib.patch
"${FILESDIR}"/${P}-cflags.patch
"${FILESDIR}"/${P}-fno-common-gcc10.patch
+ "${FILESDIR}"/${P}-gcc5.patch
)
src_prepare() {
@@ -36,10 +37,7 @@ src_prepare() {
}
src_configure() {
- # bug 580620
- append-flags -fgnu89-inline
-
- econf $(use_enable static-libs static)
+ econf --disable-static
}
src_install() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-02-08 12:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-08 12:07 [gentoo-commits] repo/gentoo:master commit in: sys-fs/hfsplusutils/, sys-fs/hfsplusutils/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2020-02-08 12:07 David Seifert
2016-04-23 6:38 Mike Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox