Fix 4 building failed in x86_64 issues. (#1993)

* Fix bdhcalc

* Fix ppviewer

* Fix helios

* Fix lpairs

* Remove autoreconf

* Remove 'x'

* Update helios-1.7.2.recipe

* revision update

* Change arch variable

* x86_64 issues has been fixed upstream

* patches of ppviewer hass been merged to upstream

* Patches of BDH-Calc has been merged to upstream

games-puzzle/lpairs/lpairs-1.0.4.recipe

@@ -5,12 +5,12 @@ tries needed will be counted but there is no highscore chart or limit to this."
 HOMEPAGE="http://lgames.sourceforge.net/"
 COPYRIGHT="2001 Michael Speck"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="http://sourceforge.net/projects/lgames/files/lpairs/lpairs-1.0.4.tar.gz"
 CHECKSUM_SHA256="350237a51a5de6b2a557af687b4f16678056a0e8d8d96d7e395f6629481462c5"
 PATCHES="lpairs-1.0.4.patchset"
 
-ARCHITECTURES="x86_gcc2 ?x86 !x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="
 	lpairs = $portVersion
@@ -27,15 +27,18 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:make
-	cmd:gcc
+	cmd:g++
 	cmd:ld
 	cmd:libtoolize
 	"
+if [ "$effectiveTargetArchitecture" == "x86_64" ] ; then
+PATCHES="lpairs-1.0.4.patchset"
+fi
 
 BUILD()
 {
 	libtoolize --force --copy --install
-	runConfigure ./configure --disable-nls
+	runConfigure ./configure --disable-nls --disable-dependency-tracking
 
 	make $jobArgs
 }

games-puzzle/lpairs/patches/lpairs-1.0.4.patchset

@@ -1,11 +1,8 @@
-From 62c097ba3a2dc90d55c7064ca9c28094354a7eb4 Mon Sep 17 00:00:00 2001
+From 0861af061dad76b3fdb3aa6f34ce06d74273b1b3 Mon Sep 17 00:00:00 2001
 From: Markus Himmel <markus@himmel-villmar.de>
 Date: Wed, 14 Jan 2015 19:19:28 +0000
-Subject: [PATCH 1/2] applying patch lpairs-1.0.4.patch
+Subject: applying patch lpairs-1.0.4.patch
 
----
- configure | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure b/configure
 index 4dcecb1..a1908af 100755
@@ -21,17 +18,14 @@ index 4dcecb1..a1908af 100755
  
  # Check whether --enable-install was given.
 -- 
-1.8.3.4
+2.14.2
 
 
-From 563cfd6ddafe187d5555f801c539a16bccf960e0 Mon Sep 17 00:00:00 2001
+From 4055056b9afda14cee1255e846d3fb4ffb52743d Mon Sep 17 00:00:00 2001
 From: Markus Himmel <markus@himmel-villmar.de>
 Date: Wed, 14 Jan 2015 19:36:34 +0000
-Subject: [PATCH 2/2] Move config to LGames folder in user settings
+Subject: Move config to LGames folder in user settings
 
----
- lpairs/cfg.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
 
 diff --git a/lpairs/cfg.c b/lpairs/cfg.c
 index 301878a..a786e39 100644
@@ -69,5 +63,28 @@ index 301878a..a786e39 100644
      else
          strncpy(c_pth, p, sizeof(c_pth)-1);
 -- 
-1.8.3.4
+2.14.2
+
+
+From 51114168f60efd37ff3b7983535512cff43c3123 Mon Sep 17 00:00:00 2001
+From: Shiroko <hhx.xxm@gmail.com>
+Date: Fri, 29 Dec 2017 12:52:29 +0000
+Subject: Solved gcc2->gcc5 problem
+
+
+diff --git a/lpairs/sdl.c b/lpairs/sdl.c
+index 5937097..e4779c4 100644
+--- a/lpairs/sdl.c
++++ b/lpairs/sdl.c
+@@ -480,7 +480,7 @@ void hardware_cap()
+ /*
+     update rectangle (0,0,0,0)->fullscreen
+ */
+-inline void refresh_screen(int x, int y, int w, int h)
++void refresh_screen(int x, int y, int w, int h)
+ {
+     SDL_UpdateRect(sdl.screen, x, y, w, h);
+ }
+-- 
+2.14.2
 

haiku-apps/bdhcalc/bdhcalc-1.1.recipe

@@ -7,10 +7,10 @@ the calculator supports binary, decimal and hexadecimal conversion."
 HOMEPAGE="http://github.com/HaikuArchives/BDH-Calc"
 COPYRIGHT="1999 Scott Hammond"
 LICENSE="Zlib"
-REVISION="1"
-SOURCE_URI="git://github.com/HaikuArchives/BDH-Calc.git#6a3433a5fb558f592dd246b400221f2223770e75"
+REVISION="2"
+SOURCE_URI="git+https://github.com/HaikuArchives/BDH-Calc#92df9d48db9e1e684e9d28405e7a05f05e6671aa"
 
-ARCHITECTURES="x86 x86_gcc2 !x86_64"
+ARCHITECTURES="x86 x86_gcc2 x86_64"
 
 PROVIDES="
 	bdhcalc = $portVersion
@@ -24,21 +24,19 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:make
 	cmd:g++
 	"
 
 BUILD()
 {
-	g++ -c src/bdh_main.cpp -o bdh_main.o
-	g++ -c src/bdh_view.cpp -o bdh_view.o
-	g++ -lbe bdh_main.o bdh_view.o -o bdhcalc
-	xres -o bdhcalc Ressources/bdh.rsrc
-	mimeset -f bdhcalc
+	make $jobArgs OBJ_DIR=objects
 }
 
 INSTALL()
 {
 	mkdir -p $appsDir
-	mv bdhcalc $appsDir/bdhcalc
+	cp -a objects/bdhcalc $appsDir
 	addAppDeskbarSymlink $appsDir/bdhcalc "BDH Calc"
 }

haiku-apps/helios/helios-1.7.2.recipe

@@ -3,11 +3,11 @@ DESCRIPTION="Cdrecord GUI frontend."
 HOMEPAGE="https://github.com/HaikuArchives/Helios"
 COPYRIGHT="2000-2004 Maurice Michalski"
 LICENSE="MIT"
-REVISION="1"
-SOURCE_URI="git+https://github.com/HaikuArchives/Helios.git#ffbbca7"
-CHECKSUM_SHA256="ce82ede4fd218d3f0c7e30cafc061d2a377e473dbc88512a61e286f21ae51925"
+REVISION="2"
+SOURCE_URI="git+https://github.com/HaikuArchives/Helios.git#b870e47"
+CHECKSUM_SHA256=""
 
-ARCHITECTURES="x86_gcc2 ?x86 !x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="
 	helios = $portVersion
@@ -24,7 +24,7 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	makefile_engine
 	cmd:make
-	cmd:gcc
+	cmd:g++
 	"
 
 BUILD()

haiku-apps/ppviewer/ppviewer-1.0.0.recipe

@@ -5,10 +5,10 @@ decrypting routines."
 HOMEPAGE="https://github.com/HaikuArchives/PPViewer"
 COPYRIGHT="2002 Maurice Michalski"
 LICENSE="MIT"
-REVISION="1"
-SOURCE_URI="git+https://github.com/HaikuArchives/PPViewer#ce572506ca6e69c888898abf5b958701e068122b"
+REVISION="2"
+SOURCE_URI="git+https://github.com/HaikuArchives/PPViewer#bd43e4a8d9139c35ba34bd9791f293e4421ca082"
 
-ARCHITECTURES="x86_gcc2 x86 !x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="
 	ppviewer = $portVersion
@@ -22,17 +22,19 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:make
 	cmd:g++
 	"
 
 BUILD()
 {
-	g++ -lbe -ltracker -o PPViewer *.cpp
+	make $jobArgs OBJ_DIR=objects
 }
 
 INSTALL()
 {
 	mkdir -p $appsDir
-	cp PPViewer $appsDir
+	cp -a objects/ppviewer $appsDir
 	addAppDeskbarSymlink $appsDir/PPViewer
 }