* [gentoo-commits] repo/gentoo:master commit in: sys-apps/gptfdisk/, sys-apps/gptfdisk/files/
@ 2023-08-19 16:24 Marek Szuba
0 siblings, 0 replies; 3+ messages in thread
From: Marek Szuba @ 2023-08-19 16:24 UTC (permalink / raw
To: gentoo-commits
commit: 7a1379aaf6851999446e5a06e196a8956649f9f6
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 19 16:18:20 2023 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sat Aug 19 16:24:13 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a1379aa
sys-apps/gptfdisk: remove hard-coded upstream optimisation flags
Closes: https://bugs.gentoo.org/911855
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
.../files/gptfdisk-1.0.9-build_flags.patch | 11 ++++
sys-apps/gptfdisk/gptfdisk-1.0.9-r3.ebuild | 63 ++++++++++++++++++++++
2 files changed, 74 insertions(+)
diff --git a/sys-apps/gptfdisk/files/gptfdisk-1.0.9-build_flags.patch b/sys-apps/gptfdisk/files/gptfdisk-1.0.9-build_flags.patch
new file mode 100644
index 000000000000..2f92d77f3855
--- /dev/null
+++ b/sys-apps/gptfdisk/files/gptfdisk-1.0.9-build_flags.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -66,7 +66,7 @@
+ # Default/Linux settings....
+ STRIP?=strip
+ #CXXFLAGS+=-O2 -Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16
+-CXXFLAGS+=-O2 -Wall -D_FILE_OFFSET_BITS=64
++CXXFLAGS+=-D_FILE_OFFSET_BITS=64
+ LDFLAGS+=
+ LDLIBS+=-luuid #-licuio -licuuc
+ FATBINFLAGS=
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.9-r3.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.9-r3.ebuild
new file mode 100644
index 000000000000..9656c9322eb5
--- /dev/null
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.9-r3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="GPT partition table manipulator for Linux"
+HOMEPAGE="https://www.rodsbooks.com/gdisk/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="ncurses static"
+
+# libuuid from util-linux is required.
+RDEPEND="!static? (
+ dev-libs/popt
+ ncurses? ( sys-libs/ncurses:=[unicode(+)] )
+ kernel_linux? ( sys-apps/util-linux )
+ )"
+DEPEND="
+ ${RDEPEND}
+ static? (
+ dev-libs/popt[static-libs(+)]
+ ncurses? ( sys-libs/ncurses:=[unicode(+),static-libs(+)] )
+ kernel_linux? ( sys-apps/util-linux[static-libs(+)] )
+ )
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.0.9-libuuid.patch" #844073
+ "${FILESDIR}/${PN}-1.0.9-popt_segv.patch" #872131
+ "${FILESDIR}"/${PN}-1.0.9-build_flags.patch
+ "${FILESDIR}"/${PN}-1.0.9-musl-1.2.4.patch
+)
+
+src_prepare() {
+ default
+
+ tc-export CXX PKG_CONFIG
+
+ if ! use ncurses ; then
+ sed -i \
+ -e '/^all:/s: cgdisk::' \
+ Makefile || die
+ fi
+
+ sed \
+ -e '/g++/s:=:?=:g' \
+ -e 's:-lncursesw:$(shell $(PKG_CONFIG) --libs ncursesw):g' \
+ -i Makefile || die
+
+ use static && append-ldflags -static
+}
+
+src_install() {
+ dosbin gdisk sgdisk $(usex ncurses cgdisk '') fixparts
+ doman *.8
+ dodoc NEWS README
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/gptfdisk/, sys-apps/gptfdisk/files/
@ 2024-04-07 14:08 Marek Szuba
0 siblings, 0 replies; 3+ messages in thread
From: Marek Szuba @ 2024-04-07 14:08 UTC (permalink / raw
To: gentoo-commits
commit: cb6fca52f4cbb863b5cb15fd431298374e23633d
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 7 14:07:07 2024 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sun Apr 7 14:07:07 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb6fca52
sys-apps/gptfdisk: fix UTF-16LE to UTF-8 conversion for partition names
Given the timing of the release of 1.0.10 I assumed it would have
already been incorporated upstream, turns out I was wrong though. Thanks
for the heads-up, ulm!
Bug: https://bugs.gentoo.org/926949
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
.../gptfdisk-1.0.10_utf16-to-utf8-conversion.patch | 19 +++++++++++++++++++
...tfdisk-1.0.10.ebuild => gptfdisk-1.0.10-r1.ebuild} | 1 +
2 files changed, 20 insertions(+)
diff --git a/sys-apps/gptfdisk/files/gptfdisk-1.0.10_utf16-to-utf8-conversion.patch b/sys-apps/gptfdisk/files/gptfdisk-1.0.10_utf16-to-utf8-conversion.patch
new file mode 100644
index 000000000000..f30eb593799f
--- /dev/null
+++ b/sys-apps/gptfdisk/files/gptfdisk-1.0.10_utf16-to-utf8-conversion.patch
@@ -0,0 +1,19 @@
+From ade1729d1ca44b34678653fdf12e787e1afc5fd8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <ulm@gentoo.org>
+Date: Wed, 13 Mar 2024 20:38:37 +0100
+Subject: [PATCH] gptpart.cc: Fix Unicode to UTF-8 conversion in GetDescription
+
+--- a/gptpart.cc
++++ b/gptpart.cc
+@@ -131,7 +131,7 @@ string GPTPart::GetDescription(void) {
+ } // if
+ else {
+ utf8 += (char) ( 0xf0 | ( uni >> 18 ) ) ;
+- utf8 += (char) ( 0xe0 | ( ( uni >> 12 ) & 0x3f ) ) ;
++ utf8 += (char) ( 0x80 | ( ( uni >> 12 ) & 0x3f ) ) ;
+ utf8 += (char) ( 0x80 | ( ( uni >> 6 ) & 0x3f ) ) ;
+ utf8 += (char) ( 0x80 | ( uni & 0x3f ) ) ;
+ } // if
+--
+2.44.0
+
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.10.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.10-r1.ebuild
similarity index 95%
rename from sys-apps/gptfdisk/gptfdisk-1.0.10.ebuild
rename to sys-apps/gptfdisk/gptfdisk-1.0.10-r1.ebuild
index 980f14022408..e1986b2d8214 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.10.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.10-r1.ebuild
@@ -32,6 +32,7 @@ DEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-1.0.9-build_flags.patch
+ "${FILESDIR}"/${PN}-1.0.10_utf16-to-utf8-conversion.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/gptfdisk/, sys-apps/gptfdisk/files/
@ 2025-02-24 11:21 Petr Vaněk
0 siblings, 0 replies; 3+ messages in thread
From: Petr Vaněk @ 2025-02-24 11:21 UTC (permalink / raw
To: gentoo-commits
commit: b8e44b369d3b09805597fa4f05e0285e73c89131
Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 24 11:02:33 2025 +0000
Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Mon Feb 24 11:02:33 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8e44b36
sys-apps/gptfdisk: drop 1.0.9-r3
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>
sys-apps/gptfdisk/Manifest | 1 -
.../gptfdisk/files/gptfdisk-1.0.9-libuuid.patch | 37 -------------
.../gptfdisk/files/gptfdisk-1.0.9-musl-1.2.4.patch | 30 -----------
.../gptfdisk/files/gptfdisk-1.0.9-popt_segv.patch | 22 --------
sys-apps/gptfdisk/gptfdisk-1.0.9-r3.ebuild | 63 ----------------------
5 files changed, 153 deletions(-)
diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest
index 50e5811b14e5..1b014edf7fea 100644
--- a/sys-apps/gptfdisk/Manifest
+++ b/sys-apps/gptfdisk/Manifest
@@ -1,2 +1 @@
DIST gptfdisk-1.0.10.tar.gz 220787 BLAKE2B 9047bf68a2c5c254bda9b2815488963dc19a9415c90fbf4a127268a37fe8a545b7d45a333e356bd9da22e37ef649d9f60896ffedfdc35b60c7642a48e4ed2e5a SHA512 76764e176cd92470648a1d7a8d2570ebc41005204e73b0f2dd5a7aff2fc1981d3bec61a3bd68b855cc3474bcb7cf49c1cb2ea25843d4e7945bef7648d548383d
-DIST gptfdisk-1.0.9.tar.gz 215065 BLAKE2B 1939ffd75972a4d7f92af2bfab90c7b0223825b5478b6b808dd35af943c687d38ba81663cd7ba5e0f9400656db4dac019c13a9f75d90b7bd716568c676c24dd2 SHA512 c2489ac7e196cb53b9fdb18d0e421571eca43c366de8922c5c7f550aadf192558e7af69b181c30747d6cf607c1670126223465eaa5e231cc589402d94a4e97a2
diff --git a/sys-apps/gptfdisk/files/gptfdisk-1.0.9-libuuid.patch b/sys-apps/gptfdisk/files/gptfdisk-1.0.9-libuuid.patch
deleted file mode 100644
index e7a5f68e19ee..000000000000
--- a/sys-apps/gptfdisk/files/gptfdisk-1.0.9-libuuid.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From e67faca2c0ca955f56cbd22e90941cdcbdc12597 Mon Sep 17 00:00:00 2001
-From: Rod Smith <rodsmith@rodsbooks.com>
-Date: Sat, 16 Apr 2022 09:32:04 -0400
-Subject: [PATCH] Updated guid.cc to deal with minor change in libuuid
-
----
- NEWS | 3 +++
- guid.cc | 2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/NEWS b/NEWS
-index c7add56..3d90d9a 100644
---- a/NEWS
-+++ b/NEWS
-@@ -1,3 +1,6 @@
-+
-+- Updated guid.cc to deal with minor change in libuuid.
-+
- 1.0.9 (4/14/2022):
- ------------------
-
-diff --git a/guid.cc b/guid.cc
-index 1e73ab7..d3e4fd5 100644
---- a/guid.cc
-+++ b/guid.cc
-@@ -141,7 +141,7 @@ void GUIDData::Zero(void) {
- void GUIDData::Randomize(void) {
- int i, uuidGenerated = 0;
-
--#ifdef _UUID_UUID_H
-+#if defined (_UUID_UUID_H) || defined (_UL_LIBUUID_UUID_H)
- uuid_generate(uuidData);
- ReverseBytes(&uuidData[0], 4);
- ReverseBytes(&uuidData[4], 2);
---
-2.36.1
-
diff --git a/sys-apps/gptfdisk/files/gptfdisk-1.0.9-musl-1.2.4.patch b/sys-apps/gptfdisk/files/gptfdisk-1.0.9-musl-1.2.4.patch
deleted file mode 100644
index 6f019d9eec6f..000000000000
--- a/sys-apps/gptfdisk/files/gptfdisk-1.0.9-musl-1.2.4.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Upstream: https://sourceforge.net/p/gptfdisk/code/ci/7dfa8984f5a30f313d8675ff6097c8592d636d10/
-
-From 7dfa8984f5a30f313d8675ff6097c8592d636d10 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 12 Dec 2022 12:50:07 -0800
-Subject: [PATCH] Use 64bit time_t on linux as well
-
-Alias 64bit version of stat functions to original functions
-we are already passing -D_FILE_OFFSET_BITS=64 in linux Makefile
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---- a/diskio-unix.cc
-+++ b/diskio-unix.cc
-@@ -37,8 +37,12 @@
-
- using namespace std;
-
--#ifdef __APPLE__
-+#if defined(__APPLE__) || defined(__linux__)
- #define off64_t off_t
-+#define stat64 stat
-+#define fstat64 fstat
-+#define lstat64 lstat
-+#define lseek64 lseek
- #endif
-
- // Returns the official "real" name for a shortened version of same.
---
-2.41.0
-
diff --git a/sys-apps/gptfdisk/files/gptfdisk-1.0.9-popt_segv.patch b/sys-apps/gptfdisk/files/gptfdisk-1.0.9-popt_segv.patch
deleted file mode 100644
index 470defd33cf6..000000000000
--- a/sys-apps/gptfdisk/files/gptfdisk-1.0.9-popt_segv.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/gptcl.cc
-+++ b/gptcl.cc
-@@ -156,9 +156,10 @@
-
- // Assume first non-option argument is the device filename....
- device = (char*) poptGetArg(poptCon);
-- poptResetContext(poptCon);
-
- if (device != NULL) {
-+ device = strdup(device);
-+ poptResetContext(poptCon);
- JustLooking(); // reset as necessary
- BeQuiet(); // Tell called functions to be less verbose & interactive
- if (LoadPartitions((string) device)) {
-@@ -498,6 +499,7 @@
- cerr << "Error encountered; not saving changes.\n";
- retval = 4;
- } // if
-+ free(device);
- } // if (device != NULL)
- poptFreeContext(poptCon);
- return retval;
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.9-r3.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.9-r3.ebuild
deleted file mode 100644
index 9258919e0948..000000000000
--- a/sys-apps/gptfdisk/gptfdisk-1.0.9-r3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="GPT partition table manipulator for Linux"
-HOMEPAGE="https://www.rodsbooks.com/gdisk/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="ncurses static"
-
-# libuuid from util-linux is required.
-RDEPEND="!static? (
- dev-libs/popt
- ncurses? ( sys-libs/ncurses:=[unicode(+)] )
- kernel_linux? ( sys-apps/util-linux )
- )"
-DEPEND="
- ${RDEPEND}
- static? (
- dev-libs/popt[static-libs(+)]
- ncurses? ( sys-libs/ncurses:=[unicode(+),static-libs(+)] )
- kernel_linux? ( sys-apps/util-linux[static-libs(+)] )
- )
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.0.9-libuuid.patch" #844073
- "${FILESDIR}/${PN}-1.0.9-popt_segv.patch" #872131
- "${FILESDIR}"/${PN}-1.0.9-build_flags.patch
- "${FILESDIR}"/${PN}-1.0.9-musl-1.2.4.patch
-)
-
-src_prepare() {
- default
-
- tc-export CXX PKG_CONFIG
-
- if ! use ncurses ; then
- sed -i \
- -e '/^all:/s: cgdisk::' \
- Makefile || die
- fi
-
- sed \
- -e '/g++/s:=:?=:g' \
- -e 's:-lncursesw:$(shell $(PKG_CONFIG) --libs ncursesw):g' \
- -i Makefile || die
-
- use static && append-ldflags -static
-}
-
-src_install() {
- dosbin gdisk sgdisk $(usex ncurses cgdisk '') fixparts
- doman *.8
- dodoc NEWS README
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-02-24 11:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-07 14:08 [gentoo-commits] repo/gentoo:master commit in: sys-apps/gptfdisk/, sys-apps/gptfdisk/files/ Marek Szuba
-- strict thread matches above, loose matches on Subject: below --
2025-02-24 11:21 Petr Vaněk
2023-08-19 16:24 Marek Szuba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox