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

FUSE: fixes and adjustments

Browse Source 
- Wrong name was used for patchset
- Use https URLs from sourceforge to save one redirect
- gcc2 build fix at the proper place (previously a generated file had
  been modified).

Thanks to Sergio Baldovi for contributing those.
This commit is contained in:
Adrien Destugues
2016-03-26 17:44:16 +01:00
parent 9363d97610
commit 96c1fe7f67
4 changed files with 60 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app-emulation/fuse-utils/fuse_utils-1.1.1.recipe
View File

@@ -5,10 +5,10 @@ HOMEPAGE="http://fuse-emulator.sourceforge.net/fuse.php"
COPYRIGHT="2003-2015 Philip Kendall and FUSE contributors"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="http://sourceforge.net/projects/fuse-emulator/files/fuse-utils/$portVersion/fuse-utils-$portVersion.tar.gz"
SOURCE_URI="https://sourceforge.net/projects/fuse-emulator/files/fuse-utils/$portVersion/fuse-utils-$portVersion.tar.gz"
CHECKSUM_SHA256="7c36c0b42805661a06c21aede3461ffc8ccdb5ce56fe232875bf86e79f77c93c"
SOURCE_DIR="fuse-utils-$portVersion"
PATCHES="fuse_utils-$portVersion"
PATCHES="fuse_utils-$portVersion.patchset"
ARCHITECTURES="x86_gcc2"

2
app-emulation/fuse/fuse-1.1.1.recipe
View File

@@ -20,7 +20,7 @@ HOMEPAGE="http://fuse-emulator.sourceforge.net/fuse.php"
COPYRIGHT="2003-2015 Philip Kendall and FUSE contributors"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="http://sourceforge.net/projects/fuse-emulator/files/fuse/$portVersion/fuse-$portVersion.tar.gz"
SOURCE_URI="https://sourceforge.net/projects/fuse-emulator/files/fuse/$portVersion/fuse-$portVersion.tar.gz"
CHECKSUM_SHA256="a857d4bd62e01d18429897467508af15624cbaf343caed8b9ba1ab3a8879444e"
PATCHES="fuse-$portVersion.patchset"

58
app-emulation/fuse/patches/fuse-1.1.1.patchset
View File

@@ -1,4 +1,4 @@
From 174978f3abb5c1d7ddf9ab4c8f975a4372d20f51 Mon Sep 17 00:00:00 2001
From c5775ba61c54dd2e089af5e343567b968cd0c932 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Tue, 12 May 2015 21:38:51 +0200
Subject: C89 "declaration after statement" fixes.
@@ -496,5 +496,59 @@ index 8774fc0..10c925a 100644
widget_rectangle( x, y, 8, 8, colour );
widget_print_checkbox( x, y,
--
2.2.2
2.7.0
From 11d00d3a2196c8c124439c458eb2a64f1ce0c541 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 26 Mar 2016 17:39:58 +0100
Subject: gcc2 build fix.
diff --git a/ui/widget/options.c b/ui/widget/options.c
index 3a7fd3b..9967007 100644
--- a/ui/widget/options.c
+++ b/ui/widget/options.c
@@ -685,8 +685,6 @@ widget_options_finish( widget_finish_state finished )
/* If we exited normally, actually set the options */
if( finished == WIDGET_FINISHED_OK ) {
- int needs_hard_reset;
-
/* Get a copy of current settings */
settings_info original_settings;
memset( &original_settings, 0, sizeof( settings_info ) );
@@ -695,7 +693,8 @@ widget_options_finish( widget_finish_state finished )
/* Apply new options */
settings_copy( &settings_current, &widget_options_settings );
- needs_hard_reset = periph_postcheck();
+ int needs_hard_reset = periph_postcheck();
+
if( needs_hard_reset ) {
error = widget_do( WIDGET_TYPE_QUERY,
"Some options need to reset the machine. Reset?" );
diff --git a/ui/widget/options.pl b/ui/widget/options.pl
index 89f8249..5d1fb84 100755
--- a/ui/widget/options.pl
+++ b/ui/widget/options.pl
@@ -364,6 +364,7 @@ int
widget_options_finish( widget_finish_state finished )
{
int error;
+ int needs_hard_reset;
/* If we exited normally, actually set the options */
if( finished == WIDGET_FINISHED_OK ) {
@@ -375,7 +376,7 @@ widget_options_finish( widget_finish_state finished )
/* Apply new options */
settings_copy( &settings_current, &widget_options_settings );
- int needs_hard_reset = periph_postcheck();
+ needs_hard_reset = periph_postcheck();
if( needs_hard_reset ) {
error = widget_do( WIDGET_TYPE_QUERY,
--
2.7.0

2
app-emulation/libspectrum/libspectrum-1.1.1.recipe
View File

@@ -7,7 +7,7 @@ HOMEPAGE="http://fuse-emulator.sourceforge.net/libspectrum.php"
COPYRIGHT="2003-2013 Philip Kendall and libspectrum contributors"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="http://sourceforge.net/projects/fuse-emulator/files/libspectrum/1.1.1/libspectrum-1.1.1.tar.gz"
SOURCE_URI="https://sourceforge.net/projects/fuse-emulator/files/libspectrum/1.1.1/libspectrum-1.1.1.tar.gz"
CHECKSUM_SHA256="178d3607af2109b6b8dafac4f91912745b9f3c087319945c3a886bb7fe7989d5"
PATCHES="libspectrum-$portVersion.patchset"