* [gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/, app-admin/testdisk/files/
@ 2017-12-04 21:52 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2017-12-04 21:52 UTC (permalink / raw
To: gentoo-commits
commit: 2c93d4c95f28c62aaded3d4bc95dc9cfca9cef64
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 4 20:04:30 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 4 21:52:17 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c93d4c9
app-admin/testdisk: Fix qtbindir
Closes: https://bugs.gentoo.org/616008
Package-Manager: Portage-2.3.16, Repoman-2.3.6
app-admin/testdisk/Manifest | 2 +-
.../testdisk/files/testdisk-7.0-qtbindir.patch | 27 ++++++++++++++++++++++
app-admin/testdisk/testdisk-7.0-r3.ebuild | 2 ++
3 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index 2f2df7b27b6..aaf4fce8fb0 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1 +1 @@
-DIST testdisk-7.0.tar.bz2 676990 SHA256 00bb3b6b22e6aba88580eeb887037aef026968c21a87b5f906c6652cbee3442d SHA512 b1ebe1d2fca453660a17623b70c06e0195cb5f07056fb7bc683d575c034fb71dfb793582c804dcff0ca57789a6de84bbf13b1a554353811660996e42199102e2 WHIRLPOOL 9ef3ed733f13477435123089cbd6168c189591284aa72dc9636470b35a21a32222d6871916b43e3c2ba4ac6da85979d6ec249b22c2573b77db7b2bcc280b85f1
+DIST testdisk-7.0.tar.bz2 676990 BLAKE2B deeeee290f05d4a992ff69c990cca8480c74e67ba2df0b523640833b968ed98dc9f44e5f33b2666daf07286dd8349b98171d6c65f7f3baae3d5cca159a5c9584 SHA512 b1ebe1d2fca453660a17623b70c06e0195cb5f07056fb7bc683d575c034fb71dfb793582c804dcff0ca57789a6de84bbf13b1a554353811660996e42199102e2
diff --git a/app-admin/testdisk/files/testdisk-7.0-qtbindir.patch b/app-admin/testdisk/files/testdisk-7.0-qtbindir.patch
new file mode 100644
index 00000000000..cb99e503829
--- /dev/null
+++ b/app-admin/testdisk/files/testdisk-7.0-qtbindir.patch
@@ -0,0 +1,27 @@
+--- a/configure.ac 2015-04-18 11:04:47.000000000 +0200
++++ b/configure.ac 2017-12-04 20:34:51.804861863 +0100
+@@ -854,17 +854,14 @@
+
+ if test "$use_qt" = "true";
+ then
+- PKG_CHECK_MODULES(QTGUI, [QtGui >= 4.0.1],,use_qt=false)
+- AC_CHECK_TOOLS(MOC,[moc-qt4 moc],)
+- if test x$MOC = x ; then
+- AC_MSG_WARN(Could not find a moc-qt4 or moc tool in your PATH.)
++ PKG_CHECK_MODULES([QTGUI], [QtCore >= 4.8.0 QtGui], [
++ QT_PATH="$( eval $PKG_CONFIG --variable=libdir QtCore )/bin"
++ AC_PATH_PROGS([MOC], [moc-qt4 moc], [moc], [$QT_PATH])
++ AC_PATH_PROGS([RCC], [rcc-qt4 rcc], [rcc], [$QT_PATH])
++ ], [
++ AC_MSG_ERROR([Qt4 not found])
+ use_qt=false
+- fi
+- AC_CHECK_TOOLS(RCC,[rcc-qt4 rcc],)
+- if test x$RCC = x ; then
+- AC_MSG_WARN(Could not find a rcc-qt4 or rcc tool in your PATH.)
+- use_qt=false
+- fi
++ ])
+ qphotorec_LDADD="$qphotorec_LDADD $QTGUI_LIBS"
+ qphotorec_CXXFLAGS="$qphotorec_CXXFLAGS $QTGUI_CFLAGS"
+ fi
diff --git a/app-admin/testdisk/testdisk-7.0-r3.ebuild b/app-admin/testdisk/testdisk-7.0-r3.ebuild
index 22e8db9dfe2..30247d7d1ca 100644
--- a/app-admin/testdisk/testdisk-7.0-r3.ebuild
+++ b/app-admin/testdisk/testdisk-7.0-r3.ebuild
@@ -47,6 +47,8 @@ RDEPEND="!static? ( ${DEPEND} )"
AUTOTOOLS_IN_SOURCE_BUILD=1
DOCS=( )
+PATCHES=( "${FILESDIR}/${P}-qtbindir.patch" )
+
src_configure() {
local myconf
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/, app-admin/testdisk/files/
@ 2018-04-26 15:36 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2018-04-26 15:36 UTC (permalink / raw
To: gentoo-commits
commit: 6ecedda792b9f73ce6ff096dcde5a1732b84470f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 26 06:23:54 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 26 15:36:13 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ecedda7
app-admin/testdisk: Drop old Qt4-based
Bug: https://bugs.gentoo.org/639974
Package-Manager: Portage-2.3.31, Repoman-2.3.9
app-admin/testdisk/Manifest | 1 -
.../testdisk/files/testdisk-7.0-qtbindir.patch | 27 -------
app-admin/testdisk/testdisk-7.0-r3.ebuild | 83 ----------------------
3 files changed, 111 deletions(-)
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index 5a9d30a3529..2a977ec6d5e 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,2 +1 @@
-DIST testdisk-7.0.tar.bz2 676990 BLAKE2B deeeee290f05d4a992ff69c990cca8480c74e67ba2df0b523640833b968ed98dc9f44e5f33b2666daf07286dd8349b98171d6c65f7f3baae3d5cca159a5c9584 SHA512 b1ebe1d2fca453660a17623b70c06e0195cb5f07056fb7bc683d575c034fb71dfb793582c804dcff0ca57789a6de84bbf13b1a554353811660996e42199102e2
DIST testdisk-7.1_pre20180322.tar.gz 632598 BLAKE2B 741610622c9afa2c41d14e8eb391cbe629a5f7ac102cf4cbf446b0c0d7330cb8482a17c1ce8470aa9d1b0578aac254cf17aa061e21dd831a803152514fab5422 SHA512 fbe699ccfbe31be636d71eda5d1fccb8efb16788bf664e048ee16344c3d3689961aaa7ef4c9123690db695bb7ae3439440bd775ab8b8455500232b2fc6048ebc
diff --git a/app-admin/testdisk/files/testdisk-7.0-qtbindir.patch b/app-admin/testdisk/files/testdisk-7.0-qtbindir.patch
deleted file mode 100644
index cb99e503829..00000000000
--- a/app-admin/testdisk/files/testdisk-7.0-qtbindir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/configure.ac 2015-04-18 11:04:47.000000000 +0200
-+++ b/configure.ac 2017-12-04 20:34:51.804861863 +0100
-@@ -854,17 +854,14 @@
-
- if test "$use_qt" = "true";
- then
-- PKG_CHECK_MODULES(QTGUI, [QtGui >= 4.0.1],,use_qt=false)
-- AC_CHECK_TOOLS(MOC,[moc-qt4 moc],)
-- if test x$MOC = x ; then
-- AC_MSG_WARN(Could not find a moc-qt4 or moc tool in your PATH.)
-+ PKG_CHECK_MODULES([QTGUI], [QtCore >= 4.8.0 QtGui], [
-+ QT_PATH="$( eval $PKG_CONFIG --variable=libdir QtCore )/bin"
-+ AC_PATH_PROGS([MOC], [moc-qt4 moc], [moc], [$QT_PATH])
-+ AC_PATH_PROGS([RCC], [rcc-qt4 rcc], [rcc], [$QT_PATH])
-+ ], [
-+ AC_MSG_ERROR([Qt4 not found])
- use_qt=false
-- fi
-- AC_CHECK_TOOLS(RCC,[rcc-qt4 rcc],)
-- if test x$RCC = x ; then
-- AC_MSG_WARN(Could not find a rcc-qt4 or rcc tool in your PATH.)
-- use_qt=false
-- fi
-+ ])
- qphotorec_LDADD="$qphotorec_LDADD $QTGUI_LIBS"
- qphotorec_CXXFLAGS="$qphotorec_CXXFLAGS $QTGUI_CFLAGS"
- fi
diff --git a/app-admin/testdisk/testdisk-7.0-r3.ebuild b/app-admin/testdisk/testdisk-7.0-r3.ebuild
deleted file mode 100644
index d8f6f196102..00000000000
--- a/app-admin/testdisk/testdisk-7.0-r3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils flag-o-matic
-
-DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
-HOMEPAGE="http://www.cgsecurity.org/wiki/TestDisk"
-SRC_URI="http://www.cgsecurity.org/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc x86"
-IUSE="ewf jpeg ntfs reiserfs static qt4"
-
-REQUIRED_USE="static? ( !qt4 )"
-
-# WARNING: reiserfs support does NOT work with reiserfsprogs
-# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released).
-DEPEND="
- static? (
- sys-apps/util-linux[static-libs]
- >=sys-libs/ncurses-5.2:0[static-libs]
- jpeg? ( virtual/jpeg:0[static-libs] )
- ntfs? ( sys-fs/ntfs3g[static-libs] )
- reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] )
- >=sys-fs/e2fsprogs-1.35[static-libs]
- sys-libs/zlib[static-libs]
- !arm? ( ewf? ( app-forensics/libewf:=[static-libs] ) )
- )
- !static? (
- sys-apps/util-linux
- >=sys-libs/ncurses-5.2:0=
- jpeg? ( virtual/jpeg:0 )
- ntfs? ( sys-fs/ntfs3g )
- reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
- >=sys-fs/e2fsprogs-1.35
- sys-libs/zlib
- !arm? ( ewf? ( app-forensics/libewf:= ) )
- qt4? ( dev-qt/qtgui:4 )
- )"
-RDEPEND="!static? ( ${DEPEND} )"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-DOCS=( )
-
-PATCHES=( "${FILESDIR}/${P}-qtbindir.patch" )
-
-src_configure() {
- local myconf
-
- # this is static method is the same used by upstream for their 'static' make
- # target, but better, as it doesn't break.
- use static && append-ldflags -static
-
- # --with-foo are broken, any use of --with/--without disable the
- # functionality.
- # The following variation must be used.
- use reiserfs || myconf+=" --without-reiserfs"
- use ntfs || myconf+=" --without-ntfs --without-ntfs3g"
- use jpeg || myconf+=" --without-jpeg"
- use ewf || myconf+=" --without-ewf"
- myconf+=$(usex qt4 " --enable-qt" " --disable-qt")
-
- econf \
- --docdir "${ROOT}/usr/share/doc/${P}" \
- --enable-sudo \
- ${myconf}
-
- # perform safety checks for NTFS, REISERFS and JPEG
- if use ntfs && ! egrep -q '^#define HAVE_LIBNTFS(3G)? 1$' "${S}"/config.h ; then
- die "Failed to find either NTFS or NTFS-3G library."
- fi
- if use reiserfs && egrep -q 'undef HAVE_LIBREISERFS\>' "${S}"/config.h ; then
- die "Failed to find reiserfs library."
- fi
- if use jpeg && egrep -q 'undef HAVE_LIBJPEG\>' "${S}"/config.h ; then
- die "Failed to find jpeg library."
- fi
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/, app-admin/testdisk/files/
@ 2022-12-14 5:07 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-12-14 5:07 UTC (permalink / raw
To: gentoo-commits
commit: 79464f898360a2fdec7b55b020c3fdb70c3657d7
Author: Oskari Pirhonen <xxc3ncoredxx <AT> gmail <DOT> com>
AuthorDate: Wed Dec 7 05:05:16 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 14 05:07:40 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79464f89
app-admin/testdisk: fix clang build
Backport the ntfs-3g ioctl prototype fixes from upstream master.
Upstream: https://git.cgsecurity.org/cgit/testdisk/commit/?id=2b0a0fcde875a89e2beffbe5c43c7518f682b482
Closes: https://bugs.gentoo.org/875509
Signed-off-by: Oskari Pirhonen <xxc3ncoredxx <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28582
Signed-off-by: Sam James <sam <AT> gentoo.org>
...disk-7.1-backport-ntfs-3g-ioctl-prototype.patch | 46 +++++++++++
app-admin/testdisk/testdisk-7.1-r2.ebuild | 95 ++++++++++++++++++++++
2 files changed, 141 insertions(+)
diff --git a/app-admin/testdisk/files/testdisk-7.1-backport-ntfs-3g-ioctl-prototype.patch b/app-admin/testdisk/files/testdisk-7.1-backport-ntfs-3g-ioctl-prototype.patch
new file mode 100644
index 000000000000..4ef379f0021f
--- /dev/null
+++ b/app-admin/testdisk/files/testdisk-7.1-backport-ntfs-3g-ioctl-prototype.patch
@@ -0,0 +1,46 @@
+From 2b0a0fcde875a89e2beffbe5c43c7518f682b482 Mon Sep 17 00:00:00 2001
+From: Christophe Grenier <grenier@cgsecurity.org>
+Date: Wed, 6 Apr 2022 07:43:45 +0200
+Subject: [PATCH] src/ntfs_io.c: fix ntfs_device_testdisk_io_ioctl() prototype
+ for ntfs-3g
+
+---
+Gentoo note: link to upstream commit:
+https://git.cgsecurity.org/cgit/testdisk/commit/?id=2b0a0fcde875a89e2beffbe5c43c7518f682b482
+
+ src/ntfs_io.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/ntfs_io.c b/src/ntfs_io.c
+index 5ca494a5..fa056724 100644
+--- a/src/ntfs_io.c
++++ b/src/ntfs_io.c
+@@ -159,6 +159,7 @@ static int ntfs_device_testdisk_io_stat(struct ntfs_device *dev, struct stat *bu
+ return -1;
+ }
+
++#ifdef HAVE_LIBNTFS
+ static int ntfs_device_testdisk_io_ioctl(struct ntfs_device *dev, int request,
+ void *argp)
+ {
+@@ -168,6 +169,17 @@ static int ntfs_device_testdisk_io_ioctl(struct ntfs_device *dev, int request,
+ #endif
+ return -1;
+ }
++#else
++static int ntfs_device_testdisk_io_ioctl(struct ntfs_device *dev, unsigned long request,
++ void *argp)
++{
++ log_warning( "ntfs_device_testdisk_io_ioctl() unimplemented\n");
++#ifdef ENOTSUP
++ errno = ENOTSUP;
++#endif
++ return -1;
++}
++#endif
+
+ /**
+ * Device operations for working with unix style devices and files.
+--
+2.37.4
+
diff --git a/app-admin/testdisk/testdisk-7.1-r2.ebuild b/app-admin/testdisk/testdisk-7.1-r2.ebuild
new file mode 100644
index 000000000000..8753298f1237
--- /dev/null
+++ b/app-admin/testdisk/testdisk-7.1-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic qmake-utils xdg-utils
+
+DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
+HOMEPAGE="https://www.cgsecurity.org/wiki/TestDisk"
+SRC_URI="https://www.cgsecurity.org/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="ewf jpeg ntfs qt5 reiserfs static zlib"
+
+REQUIRED_USE="static? ( !qt5 )"
+
+# WARNING: reiserfs support does NOT work with reiserfsprogs
+# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released).
+DEPEND="
+ static? (
+ sys-apps/util-linux[static-libs]
+ sys-fs/e2fsprogs[static-libs]
+ sys-libs/ncurses:0[static-libs]
+ jpeg? ( media-libs/libjpeg-turbo:=[static-libs] )
+ ntfs? ( sys-fs/ntfs3g[static-libs] )
+ reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] )
+ zlib? ( sys-libs/zlib[static-libs] )
+ !arm? ( ewf? ( app-forensics/libewf[static-libs] ) )
+ )
+ !static? (
+ sys-apps/util-linux
+ sys-fs/e2fsprogs
+ sys-libs/ncurses:0=
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ ntfs? ( sys-fs/ntfs3g:= )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
+ reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
+ zlib? ( sys-libs/zlib )
+ !arm? ( ewf? ( app-forensics/libewf:= ) )
+ )
+"
+RDEPEND="!static? ( ${DEPEND} )"
+BDEPEND="qt5? ( dev-qt/linguist-tools:5 )"
+
+DOCS=()
+
+PATCHES=(
+ "${FILESDIR}"/${P}-backport-ntfs-3g-ioctl-prototype.patch
+)
+
+src_configure() {
+ export PATH="$(qt5_get_bindir):${PATH}"
+
+ local myconf=(
+ --enable-sudo
+ --without-ntfs
+ $(use_with ewf)
+ $(use_with jpeg)
+ $(use_with ntfs ntfs3g)
+ $(use_enable qt5 qt)
+ $(use_with reiserfs)
+ $(use_with zlib)
+ )
+
+ # this static method is the same used by upstream for their 'static' make
+ # target, but better, as it doesn't break.
+ use static && append-ldflags -static
+
+ econf "${myconf[@]}"
+
+ # perform safety checks for NTFS, REISERFS and JPEG
+ if use ntfs && ! grep -E -q '^#define HAVE_LIBNTFS(3G)? 1$' "${S}"/config.h ; then
+ die "Failed to find either NTFS or NTFS-3G library."
+ fi
+ if use reiserfs && grep -E -q 'undef HAVE_LIBREISERFS\>' "${S}"/config.h ; then
+ die "Failed to find reiserfs library."
+ fi
+ if use jpeg && grep -E -q 'undef HAVE_LIBJPEG\>' "${S}"/config.h ; then
+ die "Failed to find jpeg library."
+ fi
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-12-14 5:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-04 21:52 [gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/, app-admin/testdisk/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2018-04-26 15:36 Andreas Sturmlechner
2022-12-14 5:07 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox