From 120fb9eb8e78ad8d7b30e2799a9a646bf03e7a82 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 10 May 2017 20:23:50 +0200 Subject: [PATCH] libdsk: update to 1.5.4. 1.5.0 is gone from the upstream website. --- ...ibdsk-1.5.0.recipe => libdsk-1.5.4.recipe} | 3 +- .../libdsk/patches/libdsk-1.5.0.patchset | 30 ------------------- 2 files changed, 1 insertion(+), 32 deletions(-) rename app-emulation/libdsk/{libdsk-1.5.0.recipe => libdsk-1.5.4.recipe} (94%) delete mode 100644 app-emulation/libdsk/patches/libdsk-1.5.0.patchset diff --git a/app-emulation/libdsk/libdsk-1.5.0.recipe b/app-emulation/libdsk/libdsk-1.5.4.recipe similarity index 94% rename from app-emulation/libdsk/libdsk-1.5.0.recipe rename to app-emulation/libdsk/libdsk-1.5.4.recipe index 137658c7e..236de5d10 100644 --- a/app-emulation/libdsk/libdsk-1.5.0.recipe +++ b/app-emulation/libdsk/libdsk-1.5.4.recipe @@ -19,8 +19,6 @@ ARCHITECTURES="x86 x86_gcc2" SECONDARY_ARCHITECTURES="x86 x86_gcc2" SOURCE_URI="http://www.seasip.info/Unix/LibDsk/libdsk-$portVersion.tar.gz" -CHECKSUM_SHA256="4d0df2fb6e5c6785e53dbf55f9b74c6723e9e849d6187026f182f5bf6a7dec67" -PATCHES="libdsk-$portVersion.patchset" PROVIDES=" libdsk$secondaryArchSuffix = $portVersion @@ -31,6 +29,7 @@ PROVIDES=" if [ -z "$secondaryArchSuffix" ]; then PROVIDES_tools="$PROVIDES cmd:apriboot + cmd:dskconv cmd:dskdump cmd:dskform cmd:dskid diff --git a/app-emulation/libdsk/patches/libdsk-1.5.0.patchset b/app-emulation/libdsk/patches/libdsk-1.5.0.patchset deleted file mode 100644 index 964032f74..000000000 --- a/app-emulation/libdsk/patches/libdsk-1.5.0.patchset +++ /dev/null @@ -1,30 +0,0 @@ -From af6d78433bc13806b8b15f4f405e52c2fba802ce Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Sun, 7 Aug 2016 14:01:02 +0200 -Subject: libdsk: fix gcc2 build. - - -diff --git a/lib/ldbsdisk.c b/lib/ldbsdisk.c -index dd0053d..e74e7c9 100644 ---- a/lib/ldbsdisk.c -+++ b/lib/ldbsdisk.c -@@ -89,6 +89,7 @@ static dsk_err_t ldbsdisk_select_track(LDBSDISK_DSK_DRIVER *self, - dsk_pcyl_t cyl, dsk_phead_t head) - { - dsk_err_t err = DSK_ERR_OK; -+ LDBS_TRACKHEAD *t; - - if (self->cur_cyl == cyl && self->cur_head == head) - { -@@ -97,8 +98,6 @@ static dsk_err_t ldbsdisk_select_track(LDBSDISK_DSK_DRIVER *self, - err = ldbsdisk_flush_cur_track(self); - if (err) return err; - -- LDBS_TRACKHEAD *t; -- - err = ldbs_get_trackhead(self->store, &t, cyl, head); - if (err) return err; - --- -2.7.0 -