gptfdisk, bump version (#10089)

This commit is contained in:
Schrijvers Luc
2024-02-09 13:00:37 +00:00
committed by GitHub
parent 5a63715ec1
commit 3f284e86ee
2 changed files with 50 additions and 26 deletions

View File

@@ -7,11 +7,11 @@ Record (MBR) partition tables, but may also be used on MBR disks to convert \
them to GPT. The fixparts program repairs certain types of damage to MBR disks \
and enables changing partition types from primary to logical and vice-versa."
HOMEPAGE="http://www.rodsbooks.com/gdisk/"
COPYRIGHT="2013-2018 Rod Smith"
COPYRIGHT="2013-2023 Rod Smith"
LICENSE="GNU GPL v2"
REVISION="3"
REVISION="1"
SOURCE_URI="https://downloads.sf.net/gptfdisk/gptfdisk-$portVersion.tar.gz"
CHECKSUM_SHA256="b663391a6876f19a3cd901d862423a16e2b5ceaa2f4a3b9bb681e64b9c7ba78d"
CHECKSUM_SHA256="dafead2693faeb8e8b97832b23407f6ed5b3219bc1784f482dd855774e2d50c2"
PATCHES="gptfdisk-$portVersion.patchset"
ARCHITECTURES="all ?x86_gcc2"

View File

@@ -1,11 +1,11 @@
From 67b231749b7fdd10bfb4cd7ff6244e4848bfb6a1 Mon Sep 17 00:00:00 2001
From 10f9d74c8899185dc0282170325f4132070a0870 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Wed, 22 Oct 2014 21:47:40 +0200
Subject: Preliminary Haiku support.
diff --git a/diskio.h b/diskio.h
index 0bdaba4..d8645b7 100644
index b5c2ecc..a3d67ed 100644
--- a/diskio.h
+++ b/diskio.h
@@ -29,7 +29,7 @@
@@ -17,20 +17,8 @@ index 0bdaba4..d8645b7 100644
#define fstat64 fstat
#define stat64 stat
#endif
diff --git a/gptcurses.cc b/gptcurses.cc
index 3e9b240..9037269 100644
--- a/gptcurses.cc
+++ b/gptcurses.cc
@@ -22,6 +22,7 @@
#include <iostream>
#include <string>
#include <sstream>
+#include <clocale>
#include <ncurses.h>
#include "gptcurses.h"
#include "support.h"
diff --git a/support.h b/support.h
index 8f976da..745bb57 100644
index 8ba9ad1..7d91cba 100644
--- a/support.h
+++ b/support.h
@@ -16,6 +16,10 @@
@@ -45,20 +33,20 @@ index 8f976da..745bb57 100644
#define DEFAULT_GPT_TYPE 0xA503
#endif
--
2.16.1
2.42.1
From 43151ba0e882e40163086578d5b6fbda1ec543f5 Mon Sep 17 00:00:00 2001
From 6f7217f3c4447e6f4e9a8d79de8692fb0ea5572f Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@localhost>
Date: Fri, 8 Apr 2016 21:24:56 +0000
Subject: Accept character devices on Haiku.
diff --git a/diskio-unix.cc b/diskio-unix.cc
index d9f8b8d..6f38118 100644
index 7780aeb..cb81c02 100644
--- a/diskio-unix.cc
+++ b/diskio-unix.cc
@@ -78,6 +78,7 @@ int DiskIO::OpenForRead(void) {
@@ -82,6 +82,7 @@ int DiskIO::OpenForRead(void) {
if (S_ISDIR(st.st_mode))
cerr << "The specified path is a directory!\n";
#if !(defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) \
@@ -67,17 +55,17 @@ index d9f8b8d..6f38118 100644
else if (S_ISCHR(st.st_mode))
cerr << "The specified path is a character device!\n";
--
2.16.1
2.42.1
From ce3cdab4d24c693a97912c2550a6ace6a068836f Mon Sep 17 00:00:00 2001
From db51dc1eed1a853ee5f8b99468f303a55dad1f48 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@localhost>
Date: Fri, 8 Apr 2016 21:24:56 +0000
Subject: Use the correct CRC32 polynom on big-endian architectures.
diff --git a/crc32.cc b/crc32.cc
index d253dd9..8da42ed 100644
index 5eca100..ed5153c 100644
--- a/crc32.cc
+++ b/crc32.cc
@@ -16,6 +16,7 @@
@@ -107,5 +95,41 @@ index d253dd9..8da42ed 100644
{
crc = i;
--
2.16.1
2.42.1
From 933aa8ee669af025ae4bfda2e93e4ba4380e43c6 Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Fri, 9 Feb 2024 13:16:40 +0100
Subject: More build fixes
diff --git a/diskio-unix.cc b/diskio-unix.cc
index cb81c02..7943ce9 100644
--- a/diskio-unix.cc
+++ b/diskio-unix.cc
@@ -37,7 +37,7 @@
using namespace std;
-#ifdef __APPLE__
+#if defined(__APPLE__) || defined(__HAIKU__)
#define off64_t off_t
#endif
diff --git a/gptcurses.cc b/gptcurses.cc
index 8b0ae91..65b5874 100644
--- a/gptcurses.cc
+++ b/gptcurses.cc
@@ -23,7 +23,7 @@
#include <iostream>
#include <string>
#include <sstream>
-#if defined (__APPLE__) || (__FreeBSD__)
+#if defined (__APPLE__) || (__FreeBSD__) || (__HAIKU__)
#include <ncurses.h>
#else
#include <ncursesw/ncurses.h>
--
2.42.1