haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-05 06:28:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

gptfdisk: bump to 1.0.3, make TEST() succeed on x86_64. (#2169)

Browse Source
This commit is contained in:
fbrosson
2018-02-03 22:47:59 +00:00
committed by GitHub
parent 0056631f09
commit f298721206
2 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
sys-apps/gptfdisk/gptfdisk-1.0.1.recipe → sys-apps/gptfdisk/gptfdisk-1.0.3.recipe
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-2015 Rod Smith"
COPYRIGHT="2013-2017 Rod Smith"
LICENSE="GNU GPL v2"
REVISION="2"
REVISION="1"
SOURCE_URI="https://downloads.sf.net/gptfdisk/gptfdisk-$portVersion.tar.gz"
CHECKSUM_SHA256="864c8aee2efdda50346804d7e6230407d5f42a8ae754df70404dd8b2fdfaeac7"
CHECKSUM_SHA256="89fd5aec35c409d610a36cb49c65b442058565ed84042f767bba614b8fc91b5c"
PATCHES="gptfdisk-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64"
@@ -42,6 +42,19 @@ BUILD_PREREQUIRES="
cmd:make
"
TEST_REQUIRES="
cmd:awk
cmd:dd
cmd:grep
cmd:head
cmd:mktemp
cmd:tail
cmd:tr
"
BUILD_PREREQUIRES="$BUILD_PREREQUIRES
$TEST_REQUIRES
"
BUILD()
{
make $jobArgs
@@ -49,10 +62,10 @@ BUILD()
INSTALL()
{
install -d -m 755 $sbinDir $docDir $manDir/man8
install -t $sbinDir -c -m 555 -s cgdisk gdisk sgdisk fixparts
install -t $docDir -c -m 444 README COPYING
install -t $manDir/man8 -c -m 444 *.8
install -d "$sbinDir" "$docDir" "$manDir"/man8
install -t "$sbinDir" -s cgdisk gdisk sgdisk fixparts
install -t "$docDir" README
install -t "$manDir"/man8 *.8
}
TEST()

16
sys-apps/gptfdisk/patches/gptfdisk-1.0.1.patchset → sys-apps/gptfdisk/patches/gptfdisk-1.0.3.patchset
View File

@@ -5,7 +5,7 @@ Subject: Preliminary Haiku support.
diff --git a/diskio.h b/diskio.h
index 631a43a..e343cb9 100644
index 0bdaba4..d8645b7 100644
--- a/diskio.h
+++ b/diskio.h
@@ -29,7 +29,7 @@
@@ -18,7 +18,7 @@ index 631a43a..e343cb9 100644
#define stat64 stat
#endif
diff --git a/gptcurses.cc b/gptcurses.cc
index 6002077..4eb8aee 100644
index 0e18f8f..8651bdc 100644
--- a/gptcurses.cc
+++ b/gptcurses.cc
@@ -22,6 +22,7 @@
@@ -30,7 +30,7 @@ index 6002077..4eb8aee 100644
#include "gptcurses.h"
#include "support.h"
diff --git a/support.h b/support.h
index 7f691c3..b64cb16 100644
index 85324f6..58b00fd 100644
--- a/support.h
+++ b/support.h
@@ -16,6 +16,10 @@
@@ -45,7 +45,7 @@ index 7f691c3..b64cb16 100644
#define DEFAULT_GPT_TYPE 0xA503
#endif
--
1.8.3.4
2.16.1
From 43151ba0e882e40163086578d5b6fbda1ec543f5 Mon Sep 17 00:00:00 2001
@@ -55,10 +55,10 @@ Subject: Accept character devices on Haiku.
diff --git a/diskio-unix.cc b/diskio-unix.cc
index af71cdb..38568ed 100644
index d9f8b8d..6f38118 100644
--- a/diskio-unix.cc
+++ b/diskio-unix.cc
@@ -75,6 +75,7 @@ int DiskIO::OpenForRead(void) {
@@ -78,6 +78,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,7 +67,7 @@ index af71cdb..38568ed 100644
else if (S_ISCHR(st.st_mode))
cerr << "The specified path is a character device!\n";
--
2.7.0
2.16.1
From ce3cdab4d24c693a97912c2550a6ace6a068836f Mon Sep 17 00:00:00 2001
@@ -107,5 +107,5 @@ index d253dd9..8da42ed 100644
{
crc = i;
--
2.7.0
2.16.1