* [gentoo-commits] repo/gentoo:master commit in: sys-fs/ext3grep/files/, sys-fs/ext3grep/
@ 2018-06-21 19:00 Hanno Boeck
0 siblings, 0 replies; 3+ messages in thread
From: Hanno Boeck @ 2018-06-21 19:00 UTC (permalink / raw
To: gentoo-commits
commit: 06df722649b38d027a32cf58f47f144426e16c48
Author: Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Mon May 7 21:28:02 2018 +0000
Commit: Hanno Boeck <hanno <AT> gentoo <DOT> org>
CommitDate: Thu Jun 21 18:59:20 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06df7226
sys-fs/ext3grep: Fix build with newer e2fsprogs version
Also bumped to EAPI=6
Closes: https://bugs.gentoo.org/650042
Package-Manager: Portage-2.3.36, Repoman-2.3.9
sys-fs/ext3grep/ext3grep-0.10.2.ebuild | 30 ++++++++++------------
...3grep-0.10.2-include-unistd_h-for-sysconf.patch | 4 +--
...gs.diff => ext3grep-0.10.2-new-e2fsprogs.patch} | 0
.../files/ext3grep-0.10.2-newer-e2fsprogs.patch | 22 ++++++++++++++++
4 files changed, 38 insertions(+), 18 deletions(-)
diff --git a/sys-fs/ext3grep/ext3grep-0.10.2.ebuild b/sys-fs/ext3grep/ext3grep-0.10.2.ebuild
index 88c27978d04..1c8c5533ad9 100644
--- a/sys-fs/ext3grep/ext3grep-0.10.2.ebuild
+++ b/sys-fs/ext3grep/ext3grep-0.10.2.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
-inherit eutils
+EAPI=6
DESCRIPTION="Recover deleted files on an ext3 file system"
HOMEPAGE="https://code.google.com/p/ext3grep/"
@@ -13,25 +12,24 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="debug pch"
-DOCS="NEWS README"
-
-RDEPEND=""
DEPEND="sys-fs/e2fsprogs
virtual/os-headers
virtual/pkgconfig"
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-0.10.1-gcc44.patch \
- "${FILESDIR}"/${P}-include-unistd_h-for-sysconf.patch
+DOCS="NEWS README"
- # Fix build against latest e2fsprogs, taken from
- # https://code.google.com/p/ext3grep/issues/detail?id=34
- epatch "${FILESDIR}"/${P}-new-e2fsprogs.diff
-}
+PATCHES=(
+ "${FILESDIR}/${PN}-0.10.1-gcc44.patch"
+ "${FILESDIR}/${P}-include-unistd_h-for-sysconf.patch"
+ "${FILESDIR}/${P}-new-e2fsprogs.patch"
+ "${FILESDIR}/${P}-newer-e2fsprogs.patch"
+)
src_configure() {
- econf \
- $(use_enable debug) \
+ myeconfargs=(
+ $(use_enable debug)
$(use_enable pch)
+ )
+
+ econf "${myeconfargs[@]}"
}
diff --git a/sys-fs/ext3grep/files/ext3grep-0.10.2-include-unistd_h-for-sysconf.patch b/sys-fs/ext3grep/files/ext3grep-0.10.2-include-unistd_h-for-sysconf.patch
index bf38c27e709..42588f71d6e 100644
--- a/sys-fs/ext3grep/files/ext3grep-0.10.2-include-unistd_h-for-sysconf.patch
+++ b/sys-fs/ext3grep/files/ext3grep-0.10.2-include-unistd_h-for-sysconf.patch
@@ -1,7 +1,7 @@
http://bugs.gentoo.org/422789
---- src/init_consts.cc
-+++ src/init_consts.cc
+--- a/src/init_consts.cc
++++ b/src/init_consts.cc
@@ -27,6 +27,10 @@
#include "debug.h"
#endif
diff --git a/sys-fs/ext3grep/files/ext3grep-0.10.2-new-e2fsprogs.diff b/sys-fs/ext3grep/files/ext3grep-0.10.2-new-e2fsprogs.patch
similarity index 100%
rename from sys-fs/ext3grep/files/ext3grep-0.10.2-new-e2fsprogs.diff
rename to sys-fs/ext3grep/files/ext3grep-0.10.2-new-e2fsprogs.patch
diff --git a/sys-fs/ext3grep/files/ext3grep-0.10.2-newer-e2fsprogs.patch b/sys-fs/ext3grep/files/ext3grep-0.10.2-newer-e2fsprogs.patch
new file mode 100644
index 00000000000..8a029f9916b
--- /dev/null
+++ b/sys-fs/ext3grep/files/ext3grep-0.10.2-newer-e2fsprogs.patch
@@ -0,0 +1,22 @@
+--- a/src/ext3.h 2008-04-09 13:20:31.000000000 +0200
++++ b/src/ext3.h 2018-05-07 23:16:35.413754674 +0200
+@@ -106,7 +106,7 @@
+ __u32 const* block(void) const { return i_block; }
+ __u32 generation(void) const { return i_generation; }
+ __u32 file_acl(void) const { return i_file_acl; }
+- __u32 dir_acl(void) const { return i_dir_acl; }
++ __u32 size_high(void) const { return i_size_high; }
+ __u32 faddr(void) const { return i_faddr; }
+ __u16 uid_high(void) const { return i_uid_high; }
+ __u16 gid_high(void) const { return i_gid_high; }
+--- a/src/print_inode_to.cc 2008-10-17 03:27:15.000000000 +0200
++++ b/src/print_inode_to.cc 2018-05-07 23:16:54.379754601 +0200
+@@ -118,7 +118,7 @@
+ os << '\n';
+ }
+ //os << "File ACL: " << inode.file_acl() << '\n';
+- //os << "Directory ACL: " << inode.dir_acl() << '\n';
++ //os << "Directory ACL: " << inode.size_high() << '\n';
+ //os << "Fragment address: " << inode.faddr() << '\n';
+ //os << "Fragment number: " << (int)inode.osd2.linux2.l_i_frag << '\n';
+ //os << "Fragment size: " << (int)inode.osd2.linux2.l_i_fsize << '\n';
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/ext3grep/files/, sys-fs/ext3grep/
@ 2023-02-06 22:19 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-02-06 22:19 UTC (permalink / raw
To: gentoo-commits
commit: 5a28bd967d8a385702969116e6a9d6aa47be6644
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 6 22:03:36 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 6 22:03:48 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a28bd96
sys-fs/ext3grep: EAPI 8, fix build w/ gcc 12
Closes: https://bugs.gentoo.org/890987
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{ext3grep-0.10.2.ebuild => ext3grep-0.10.2-r1.ebuild} | 15 ++++++++-------
.../files/ext3grep-0.10.2-missing-cassert-include.patch | 11 +++++++++++
2 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/sys-fs/ext3grep/ext3grep-0.10.2.ebuild b/sys-fs/ext3grep/ext3grep-0.10.2-r1.ebuild
similarity index 77%
rename from sys-fs/ext3grep/ext3grep-0.10.2.ebuild
rename to sys-fs/ext3grep/ext3grep-0.10.2-r1.ebuild
index 1c8c5533ad98..6be20c71aa3f 100644
--- a/sys-fs/ext3grep/ext3grep-0.10.2.ebuild
+++ b/sys-fs/ext3grep/ext3grep-0.10.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
DESCRIPTION="Recover deleted files on an ext3 file system"
HOMEPAGE="https://code.google.com/p/ext3grep/"
@@ -12,21 +12,22 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="debug pch"
-DEPEND="sys-fs/e2fsprogs
+DEPEND="
+ sys-fs/e2fsprogs
virtual/os-headers
- virtual/pkgconfig"
-
-DOCS="NEWS README"
+"
+BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}/${PN}-0.10.1-gcc44.patch"
"${FILESDIR}/${P}-include-unistd_h-for-sysconf.patch"
"${FILESDIR}/${P}-new-e2fsprogs.patch"
"${FILESDIR}/${P}-newer-e2fsprogs.patch"
+ "${FILESDIR}/${P}-missing-cassert-include.patch"
)
src_configure() {
- myeconfargs=(
+ local myeconfargs=(
$(use_enable debug)
$(use_enable pch)
)
diff --git a/sys-fs/ext3grep/files/ext3grep-0.10.2-missing-cassert-include.patch b/sys-fs/ext3grep/files/ext3grep-0.10.2-missing-cassert-include.patch
new file mode 100644
index 000000000000..34e60b00a659
--- /dev/null
+++ b/sys-fs/ext3grep/files/ext3grep-0.10.2-missing-cassert-include.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/890987
+--- a/src/custom.cc
++++ b/src/custom.cc
+@@ -44,6 +44,7 @@
+ #include "init_consts.h"
+ #include "print_inode_to.h"
+ #include <sys/time.h>
++#include <cassert>
+ #include <cstring>
+ #include <ctime>
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/ext3grep/files/, sys-fs/ext3grep/
@ 2024-12-31 13:07 Hanno Böck
0 siblings, 0 replies; 3+ messages in thread
From: Hanno Böck @ 2024-12-31 13:07 UTC (permalink / raw
To: gentoo-commits
commit: 5c4aa35ae0f672b7c1af0be0c198dc7ec8dff8d6
Author: Hanno Böck <hanno <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 31 13:06:02 2024 +0000
Commit: Hanno Böck <hanno <AT> gentoo <DOT> org>
CommitDate: Tue Dec 31 13:06:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c4aa35a
sys-fs/ext3grep: Fix include order / C23 compile errors
Based on patch provided by NHOrus via Github.
Closes: https://github.com/gentoo/gentoo/pull/39904
Closes: https://bugs.gentoo.org/939024
Closes: https://bugs.gentoo.org/934532
Signed-off-by: Hanno Böck <hanno <AT> gentoo.org>
sys-fs/ext3grep/ext3grep-0.10.2-r2.ebuild | 37 ++++++++++
.../files/ext3grep-0.10.2-include-order.patch | 86 ++++++++++++++++++++++
2 files changed, 123 insertions(+)
diff --git a/sys-fs/ext3grep/ext3grep-0.10.2-r2.ebuild b/sys-fs/ext3grep/ext3grep-0.10.2-r2.ebuild
new file mode 100644
index 000000000000..1311fc4dc750
--- /dev/null
+++ b/sys-fs/ext3grep/ext3grep-0.10.2-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Recover deleted files on an ext3 file system"
+HOMEPAGE="https://code.google.com/p/ext3grep/"
+SRC_URI="https://ext3grep.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug pch"
+
+DEPEND="
+ sys-fs/e2fsprogs
+ virtual/os-headers
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.10.1-gcc44.patch"
+ "${FILESDIR}/${P}-include-unistd_h-for-sysconf.patch"
+ "${FILESDIR}/${P}-new-e2fsprogs.patch"
+ "${FILESDIR}/${P}-newer-e2fsprogs.patch"
+ "${FILESDIR}/${P}-missing-cassert-include.patch"
+ "${FILESDIR}/${P}-include-order.patch"
+)
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable debug)
+ $(use_enable pch)
+ )
+
+ econf "${myeconfargs[@]}"
+}
diff --git a/sys-fs/ext3grep/files/ext3grep-0.10.2-include-order.patch b/sys-fs/ext3grep/files/ext3grep-0.10.2-include-order.patch
new file mode 100644
index 000000000000..6f08e5ad9329
--- /dev/null
+++ b/sys-fs/ext3grep/files/ext3grep-0.10.2-include-order.patch
@@ -0,0 +1,86 @@
+https://bugs.gentoo.org/934532
+https://bugs.gentoo.org/939024
+Ordering of includes is important, so we don't redefine "clamp" from
+under STL internals:
+https://en.cppreference.com/w/cpp/algorithm/clamp takes four args
+but clamp in ext2fs.h takes three
+diff -ur a/src/directories.cc b/src/directories.cc
+--- a/src/directories.cc 2024-12-30 14:12:51.353812001 +0400
++++ b/src/directories.cc 2024-12-30 14:13:51.472524523 +0400
+@@ -21,6 +21,10 @@
+ // You should have received a copy of the GNU General Public License
+ // along with this program. If not, see <http://www.gnu.org/licenses/>.
+
++#include <cstring>
++#include <ctime>
++#include <algorithm>
++
+ #ifndef USE_PCH
+ #include "sys.h"
+ #include "ext3.h"
+@@ -33,9 +37,6 @@
+ #include "indirect_blocks.h"
+ #include "get_block.h"
+ #include "directories.h"
+-#include <cstring>
+-#include <ctime>
+-#include <algorithm>
+
+ //-----------------------------------------------------------------------------
+ //
+diff -ur a/src/init_files.cc b/src/init_files.cc
+--- a/src/init_files.cc 2024-12-30 14:12:51.353812001 +0400
++++ b/src/init_files.cc 2024-12-30 14:13:37.823593692 +0400
+@@ -21,6 +21,8 @@
+ // You should have received a copy of the GNU General Public License
+ // along with this program. If not, see <http://www.gnu.org/licenses/>.
+
++#include <algorithm>
++
+ #ifndef USE_PCH
+ #include "sys.h"
+ #include <iomanip>
+@@ -33,7 +35,6 @@
+ #include "globals.h"
+ #include "forward_declarations.h"
+ #include "journal.h"
+-#include <algorithm>
+
+ //-----------------------------------------------------------------------------
+ //
+diff -ur a/src/journal.cc b/src/journal.cc
+--- a/src/journal.cc 2024-12-30 14:12:51.353812001 +0400
++++ b/src/journal.cc 2024-12-30 14:14:07.808441493 +0400
+@@ -21,6 +21,9 @@
+ // You should have received a copy of the GNU General Public License
+ // along with this program. If not, see <http://www.gnu.org/licenses/>.
+
++#include <algorithm>
++#include <ctime>
++
+ #ifndef USE_PCH
+ #include "sys.h"
+ #include <stdint.h>
+@@ -37,8 +40,6 @@
+ #include "indirect_blocks.h"
+ #include "get_block.h"
+ #include "commandline.h"
+-#include <algorithm>
+-#include <ctime>
+
+ //-----------------------------------------------------------------------------
+ //
+It throws warning - we already define LARGEFILE on Gentoo, so let's not redefine
+diff -ur a/src/sys.h.in b/src/sys.h.in
+--- a/src/sys.h.in 2024-12-30 14:12:51.353812001 +0400
++++ b/src/sys.h.in 2024-12-30 14:24:36.796244569 +0400
+@@ -31,7 +31,9 @@
+ #endif
+
+ // This is needed for lseek64.
++#ifndef _LARGEFILE64_SOURCE
+ #define _LARGEFILE64_SOURCE
++#endif
+
+ #ifdef CWDEBUG
+ #ifndef _GNU_SOURCE
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-12-31 13:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-21 19:00 [gentoo-commits] repo/gentoo:master commit in: sys-fs/ext3grep/files/, sys-fs/ext3grep/ Hanno Boeck
-- strict thread matches above, loose matches on Subject: below --
2023-02-06 22:19 Sam James
2024-12-31 13:07 Hanno Böck
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox