From 70d021ba21e9908ba7460c95106e2919bb103136 Mon Sep 17 00:00:00 2001 From: Nolan Clark Date: Fri, 5 Dec 2014 18:30:36 -0600 Subject: [PATCH 1/8] Added reciped for CoveredCalc --- .../coveredcalc/coveredcalc-1.10.0.recipe | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe diff --git a/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe b/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe new file mode 100644 index 000000000..b9b2a4c30 --- /dev/null +++ b/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe @@ -0,0 +1,38 @@ +SUMMARY="The desktop calculator which features a skin interface system." +DESCRIPTION="CoveredCalc is a desktop calculator whose look and feel is flexibly + customizable. It works on Windows, BeOS, and Haiku. In this application + the word \"cover\" means a set of files for its design, instead of + the commonly used word \"skin\"." +HOMEPAGE="https://code.google.com/p/coveredcalc" +SRC_URI="https://coveredcalc.googlecode.com/files/CoveredCalcBe1.10.0.zip" +CHECKSUM_SHA256="f5256c9cdb581c0246292005e9d3275586552bd4630b91e7372bd1903a94b669" +REVISION="1" +LICENSE="MIT" +ARCHITECTURES="x86 x86_gcc2" +COPYRIGHT="2008 hiron@with.memail.jp" +SOURCE_DIR="CoveredCalc" + +PROVIDES=" + coveredcalc = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_REQUIRES=" + " + +BUILD() +{ + #do nothing + echo +} + +INSTALL() +{ + mkdir -p $appsDir/CoveredCalc + cp -R * $appsDir/CoveredCalc + chmod +x $appsDir/CoveredCalc/CoveredCalc + addAppDeskbarSymlink $appsDir/CoveredCalc/CoveredCalc +} From 823928030bcf7f26f425d3782bed6dd78d1fc723 Mon Sep 17 00:00:00 2001 From: Nolan Clark Date: Fri, 5 Dec 2014 18:49:13 -0600 Subject: [PATCH 2/8] Edited DESCRIPTION of coveredcalc-1.10.0.recipe to be within specs --- haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe b/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe index b9b2a4c30..b27c41880 100644 --- a/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe +++ b/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe @@ -1,8 +1,8 @@ SUMMARY="The desktop calculator which features a skin interface system." -DESCRIPTION="CoveredCalc is a desktop calculator whose look and feel is flexibly - customizable. It works on Windows, BeOS, and Haiku. In this application - the word \"cover\" means a set of files for its design, instead of - the commonly used word \"skin\"." +DESCRIPTION="CoveredCalc is a desktop calculator whose look and feel is \ +flexibly customizable. It works on Windows, BeOS, and Haiku. In this \ +application the word \"cover\" means a set of files for its design, \ +instead of the commonly used word \"skin\"." HOMEPAGE="https://code.google.com/p/coveredcalc" SRC_URI="https://coveredcalc.googlecode.com/files/CoveredCalcBe1.10.0.zip" CHECKSUM_SHA256="f5256c9cdb581c0246292005e9d3275586552bd4630b91e7372bd1903a94b669" From d45b21bed4a70b8f6e0ae4135ca4dd65e8608bff Mon Sep 17 00:00:00 2001 From: Nolan Clark Date: Fri, 5 Dec 2014 19:04:57 -0600 Subject: [PATCH 3/8] Added ?x86 to clarify untested status of GCC4 architecture --- haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe b/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe index b27c41880..be8212506 100644 --- a/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe +++ b/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe @@ -8,7 +8,7 @@ SRC_URI="https://coveredcalc.googlecode.com/files/CoveredCalcBe1.10.0.zip" CHECKSUM_SHA256="f5256c9cdb581c0246292005e9d3275586552bd4630b91e7372bd1903a94b669" REVISION="1" LICENSE="MIT" -ARCHITECTURES="x86 x86_gcc2" +ARCHITECTURES="x86_gcc2 ?x86" COPYRIGHT="2008 hiron@with.memail.jp" SOURCE_DIR="CoveredCalc" From a322d0e02762c2cd2262285b908f713086a7cf0b Mon Sep 17 00:00:00 2001 From: Nolan Clark Date: Fri, 5 Dec 2014 20:19:08 -0600 Subject: [PATCH 4/8] CoveredCalc now builds from source --- .../coveredcalc/coveredcalc-1.10.0.recipe | 31 ++++++++++++++----- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe b/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe index be8212506..c12268e21 100644 --- a/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe +++ b/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe @@ -4,16 +4,15 @@ flexibly customizable. It works on Windows, BeOS, and Haiku. In this \ application the word \"cover\" means a set of files for its design, \ instead of the commonly used word \"skin\"." HOMEPAGE="https://code.google.com/p/coveredcalc" -SRC_URI="https://coveredcalc.googlecode.com/files/CoveredCalcBe1.10.0.zip" -CHECKSUM_SHA256="f5256c9cdb581c0246292005e9d3275586552bd4630b91e7372bd1903a94b669" +SRC_URI="svn+http://coveredcalc.googlecode.com/svn/trunk@72" REVISION="1" LICENSE="MIT" ARCHITECTURES="x86_gcc2 ?x86" COPYRIGHT="2008 hiron@with.memail.jp" -SOURCE_DIR="CoveredCalc" PROVIDES=" coveredcalc = $portVersion + app:CoveredCalc = $portVersion " REQUIRES=" @@ -21,18 +20,34 @@ REQUIRES=" " BUILD_REQUIRES=" + haiku_devel + cmd:make + cmd:gcc + cmd:xres + cmd:wget + cmd:unzip " + +BUILD_PREREQUIRES=" + cmd:svn + " BUILD() { - #do nothing - echo + cd Sources/CoveredCalc/CoveredCalcBe + make release $jobArgs + cd ../../.. + #download skin from Google Drive (source doesn't include a skin) + wget http://googledrive.com/host/0BwHhdVuLdvajZDBXSXl0S1NMVWc/skin.zip + unzip skin.zip } INSTALL() { - mkdir -p $appsDir/CoveredCalc - cp -R * $appsDir/CoveredCalc - chmod +x $appsDir/CoveredCalc/CoveredCalc + mkdir -p $appsDir/CoveredCalc/{NLS,Keymaps,Covers} + cp Sources/CoveredCalc/CoveredCalcBe/obj.release/CoveredCalc $appsDir/CoveredCalc + cp LangFiles/BeOS/* $appsDir/CoveredCalc/NLS + cp KeyMappings/BeOS/* $appsDir/CoveredCalc/Keymaps + cp -R default $appsDir/CoveredCalc/Covers addAppDeskbarSymlink $appsDir/CoveredCalc/CoveredCalc } From c8e6e6f1d271501baba765acc2575e6193e3003b Mon Sep 17 00:00:00 2001 From: Nolan Clark Date: Sat, 6 Dec 2014 11:33:20 -0600 Subject: [PATCH 5/8] Changed recipe to pull skin from binary package --- haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe b/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe index c12268e21..092d984b4 100644 --- a/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe +++ b/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe @@ -4,7 +4,9 @@ flexibly customizable. It works on Windows, BeOS, and Haiku. In this \ application the word \"cover\" means a set of files for its design, \ instead of the commonly used word \"skin\"." HOMEPAGE="https://code.google.com/p/coveredcalc" -SRC_URI="svn+http://coveredcalc.googlecode.com/svn/trunk@72" +SRC_URI_1="svn+http://coveredcalc.googlecode.com/svn/trunk@72" +SRC_URI_2="https://coveredcalc.googlecode.com/files/CoveredCalcBe1.10.0.zip" +CHECKSUM_SHA256_2="f5256c9cdb581c0246292005e9d3275586552bd4630b91e7372bd1903a94b669" REVISION="1" LICENSE="MIT" ARCHITECTURES="x86_gcc2 ?x86" @@ -37,17 +39,14 @@ BUILD() cd Sources/CoveredCalc/CoveredCalcBe make release $jobArgs cd ../../.. - #download skin from Google Drive (source doesn't include a skin) - wget http://googledrive.com/host/0BwHhdVuLdvajZDBXSXl0S1NMVWc/skin.zip - unzip skin.zip } INSTALL() { - mkdir -p $appsDir/CoveredCalc/{NLS,Keymaps,Covers} + mkdir -p $appsDir/CoveredCalc/{NLS,Keymaps} cp Sources/CoveredCalc/CoveredCalcBe/obj.release/CoveredCalc $appsDir/CoveredCalc cp LangFiles/BeOS/* $appsDir/CoveredCalc/NLS cp KeyMappings/BeOS/* $appsDir/CoveredCalc/Keymaps - cp -R default $appsDir/CoveredCalc/Covers + cp -R CoveredCalc/Covers $appsDir/CoveredCalc addAppDeskbarSymlink $appsDir/CoveredCalc/CoveredCalc } From 96bd39160f9644339f747d6816e8796565149a98 Mon Sep 17 00:00:00 2001 From: Nolan Clark Date: Sat, 6 Dec 2014 12:53:54 -0600 Subject: [PATCH 6/8] Fixed recipe to build with SRC_URI_2 --- haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe b/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe index 092d984b4..bf61e48f1 100644 --- a/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe +++ b/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe @@ -47,6 +47,6 @@ INSTALL() cp Sources/CoveredCalc/CoveredCalcBe/obj.release/CoveredCalc $appsDir/CoveredCalc cp LangFiles/BeOS/* $appsDir/CoveredCalc/NLS cp KeyMappings/BeOS/* $appsDir/CoveredCalc/Keymaps - cp -R CoveredCalc/Covers $appsDir/CoveredCalc + cp -R ../../sources-2/CoveredCalc/Covers $appsDir/CoveredCalc addAppDeskbarSymlink $appsDir/CoveredCalc/CoveredCalc } From 232fcc36250f0102a6d04284e0092df70ade3c8b Mon Sep 17 00:00:00 2001 From: Nolan Clark Date: Sat, 6 Dec 2014 12:57:17 -0600 Subject: [PATCH 7/8] Removed unnecessary cd --- haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe | 1 - 1 file changed, 1 deletion(-) diff --git a/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe b/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe index bf61e48f1..799a5fe9d 100644 --- a/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe +++ b/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe @@ -38,7 +38,6 @@ BUILD() { cd Sources/CoveredCalc/CoveredCalcBe make release $jobArgs - cd ../../.. } INSTALL() From 238bcbea532524ffa57a00541753cda1d0da7144 Mon Sep 17 00:00:00 2001 From: Nolan Clark Date: Sat, 6 Dec 2014 13:02:16 -0600 Subject: [PATCH 8/8] Removed unnecessary BUILD_REQUIRES, BUILD_PREREQUIRES, and added version constraints to haiku_devel --- haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe b/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe index 799a5fe9d..0e9852022 100644 --- a/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe +++ b/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe @@ -22,17 +22,11 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku_devel + haiku_devel >= $haikuVersion cmd:make cmd:gcc cmd:xres - cmd:wget - cmd:unzip " - -BUILD_PREREQUIRES=" - cmd:svn - " BUILD() {