From 591c3562a0a85ae4b554e573b5e41d51a8d23d78 Mon Sep 17 00:00:00 2001 From: Nav Date: Tue, 23 Dec 2014 08:41:30 +0200 Subject: [PATCH 1/7] Updated bafx recipe to point at a more recent commit and removed patch --- haiku-apps/bafx/bafx-0.0.1.recipe | 6 ++---- haiku-apps/bafx/patches/bafx-0.0.1.patchset | 22 --------------------- 2 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 haiku-apps/bafx/patches/bafx-0.0.1.patchset diff --git a/haiku-apps/bafx/bafx-0.0.1.recipe b/haiku-apps/bafx/bafx-0.0.1.recipe index 187eae185..15c1bc8f0 100644 --- a/haiku-apps/bafx/bafx-0.0.1.recipe +++ b/haiku-apps/bafx/bafx-0.0.1.recipe @@ -3,10 +3,10 @@ DESCRIPTION=" BAfx is a file manager for Haiku. " HOMEPAGE="https://github.com/marbocub/BAfx" -SRC_URI="git+https://github.com/marbocub/BAfx#4b14a8ba4c" +SRC_URI="git+https://github.com/marbocub/BAfx#ebd3db8a22" COPYRIGHT="2012 @marbocub" LICENSE="MIT" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 x86 ?x86_64" PROVIDES=" @@ -25,8 +25,6 @@ BUILD_PREREQUIRES=" cmd:mkdepend " -PATCHES="bafx-0.0.1.patchset" - BUILD() { make OBJ_DIR=objects \ diff --git a/haiku-apps/bafx/patches/bafx-0.0.1.patchset b/haiku-apps/bafx/patches/bafx-0.0.1.patchset deleted file mode 100644 index f5c0c7ee4..000000000 --- a/haiku-apps/bafx/patches/bafx-0.0.1.patchset +++ /dev/null @@ -1,22 +0,0 @@ -From 7c5605074b639c6daa54275d1ced9720555da3d1 Mon Sep 17 00:00:00 2001 -From: Chris Roberts -Date: Mon, 2 Dec 2013 17:37:11 -0700 -Subject: Fix makefile stdc++ libs - - -diff --git a/Makefile b/Makefile -index 6f14782..50893a9 100755 ---- a/Makefile -+++ b/Makefile -@@ -56,7 +56,7 @@ RSRCS= - # naming scheme you need to specify the path to the library - # and it's name - # library: my_lib.a entry: my_lib.a or path/my_lib.a --LIBS= be -+LIBS= be $(STDCPPLIBS) - - # specify additional paths to directories following the standard - # libXXX.so or libXXX.a naming scheme. You can specify full paths --- -1.8.3.4 - From 8270e194ceade944aaa965fc6410bd707d590f03 Mon Sep 17 00:00:00 2001 From: Nav Date: Tue, 23 Dec 2014 11:32:04 +0200 Subject: [PATCH 2/7] Updated bafx description --- haiku-apps/bafx/bafx-0.0.1.recipe | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/haiku-apps/bafx/bafx-0.0.1.recipe b/haiku-apps/bafx/bafx-0.0.1.recipe index bc232f853..03631f167 100644 --- a/haiku-apps/bafx/bafx-0.0.1.recipe +++ b/haiku-apps/bafx/bafx-0.0.1.recipe @@ -1,7 +1,8 @@ SUMMARY="A file manager for Haiku." DESCRIPTION=" -BAfx is a file manager for Haiku. -" +BAfx is a file manager for BeOS/Haiku that works with the BeOS InterfaceKit \ +with directory view implemented. File and directory operations, built-in \ +text viewer and built-in image viewer are still under development." HOMEPAGE="https://github.com/marbocub/BAfx" SRC_URI="git+https://github.com/marbocub/BAfx#ebd3db8a22" COPYRIGHT="2012 @marbocub" From c7283439ee6c9f8abae2fe0b0289806e8ead0893 Mon Sep 17 00:00:00 2001 From: Nav Date: Tue, 23 Dec 2014 11:33:14 +0200 Subject: [PATCH 3/7] Updated bafx description --- haiku-apps/bafx/bafx-0.0.1.recipe | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/haiku-apps/bafx/bafx-0.0.1.recipe b/haiku-apps/bafx/bafx-0.0.1.recipe index 03631f167..5929141d2 100644 --- a/haiku-apps/bafx/bafx-0.0.1.recipe +++ b/haiku-apps/bafx/bafx-0.0.1.recipe @@ -1,6 +1,5 @@ SUMMARY="A file manager for Haiku." -DESCRIPTION=" -BAfx is a file manager for BeOS/Haiku that works with the BeOS InterfaceKit \ +DESCRIPTION="BAfx is a file manager for BeOS/Haiku that works with the BeOS InterfaceKit \ with directory view implemented. File and directory operations, built-in \ text viewer and built-in image viewer are still under development." HOMEPAGE="https://github.com/marbocub/BAfx" From 317544cca2345561b804c794fa210c61e385d855 Mon Sep 17 00:00:00 2001 From: Nav Date: Tue, 23 Dec 2014 12:03:51 +0200 Subject: [PATCH 4/7] Updated BAfx recipe --- haiku-apps/bafx/{bafx-0.0.1.recipe => bafx-0.2.3.recipe} | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) rename haiku-apps/bafx/{bafx-0.0.1.recipe => bafx-0.2.3.recipe} (69%) diff --git a/haiku-apps/bafx/bafx-0.0.1.recipe b/haiku-apps/bafx/bafx-0.2.3.recipe similarity index 69% rename from haiku-apps/bafx/bafx-0.0.1.recipe rename to haiku-apps/bafx/bafx-0.2.3.recipe index 5929141d2..93587193c 100644 --- a/haiku-apps/bafx/bafx-0.0.1.recipe +++ b/haiku-apps/bafx/bafx-0.2.3.recipe @@ -1,7 +1,8 @@ SUMMARY="A file manager for Haiku." -DESCRIPTION="BAfx is a file manager for BeOS/Haiku that works with the BeOS InterfaceKit \ -with directory view implemented. File and directory operations, built-in \ -text viewer and built-in image viewer are still under development." +DESCRIPTION="BAfx is a file manager for BeOS/Haiku. It uses a single window \ +with two panes for source and destination folder. \ +The file manager is still in early stages of development. \ +A built-in text and image viewer are planned for future releases." HOMEPAGE="https://github.com/marbocub/BAfx" SRC_URI="git+https://github.com/marbocub/BAfx#ebd3db8a22" COPYRIGHT="2012 @marbocub" From a5c3d586eaa0886fc599cfe80f5dc8529e71c542 Mon Sep 17 00:00:00 2001 From: Nav Date: Tue, 23 Dec 2014 17:44:48 +0200 Subject: [PATCH 5/7] Removed patch from TakeNotes --- haiku-apps/takenotes/takenotes-1.0.0.recipe | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/haiku-apps/takenotes/takenotes-1.0.0.recipe b/haiku-apps/takenotes/takenotes-1.0.0.recipe index c00265afc..12292e323 100644 --- a/haiku-apps/takenotes/takenotes-1.0.0.recipe +++ b/haiku-apps/takenotes/takenotes-1.0.0.recipe @@ -1,6 +1,6 @@ SUMMARY="A note taking application" DESCRIPTION=" -With this application you can: +With TakeNotes you can: - Write a note - Edit the font family, color and size - Change the color of your note @@ -12,9 +12,10 @@ With this application you can: COPYRIGHT="Copyright 2009, Ilio Catallo, Stefano Celentano, Eleonora Ciceri, all rights reserved" LICENSE="GNU GPL v2" HOMEPAGE="https://github.com/HaikuArchives/TakeNotes" -SRC_URI="git+https://github.com/HaikuArchives/TakeNotes#3ee7d80b53" -REVISION="2" +SRC_URI="git+https://github.com/HaikuArchives/TakeNotes#a8724dadac" +REVISION="3" ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SOURCE_DIR="takesnotes-1.0.0/source" PROVIDES=" takenotes=$portVersion @@ -36,8 +37,6 @@ BUILD_PREREQUIRES=" cmd:mkdepend " -PATCHES="takenotes-1.0.0.patchset" - BUILD() { make OBJ_DIR=objects \ @@ -49,4 +48,4 @@ INSTALL() mkdir -p $appsDir cp objects/TakeNotes $appsDir addAppDeskbarSymlink $appsDir/TakeNotes -} +} \ No newline at end of file From 91b400cd260bf9a50fcbce58edcdf79b2c9ae2d9 Mon Sep 17 00:00:00 2001 From: Nav Date: Tue, 23 Dec 2014 17:49:43 +0200 Subject: [PATCH 6/7] Updated SRC_URI for TakeNotes --- haiku-apps/takenotes/takenotes-1.0.0.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-apps/takenotes/takenotes-1.0.0.recipe b/haiku-apps/takenotes/takenotes-1.0.0.recipe index 12292e323..05df96c52 100644 --- a/haiku-apps/takenotes/takenotes-1.0.0.recipe +++ b/haiku-apps/takenotes/takenotes-1.0.0.recipe @@ -12,7 +12,7 @@ With TakeNotes you can: COPYRIGHT="Copyright 2009, Ilio Catallo, Stefano Celentano, Eleonora Ciceri, all rights reserved" LICENSE="GNU GPL v2" HOMEPAGE="https://github.com/HaikuArchives/TakeNotes" -SRC_URI="git+https://github.com/HaikuArchives/TakeNotes#a8724dadac" +SRC_URI="git+https://github.com/HaikuArchives/TakeNotes#7f84d8f50e" REVISION="3" ARCHITECTURES="x86_gcc2 x86 ?x86_64" SOURCE_DIR="takesnotes-1.0.0/source" From 910a9df96061d624f46125b5eaef5f03d8c980de Mon Sep 17 00:00:00 2001 From: Nav Date: Tue, 23 Dec 2014 17:52:24 +0200 Subject: [PATCH 7/7] Resetting BAfx's revision --- haiku-apps/bafx/bafx-0.2.3.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-apps/bafx/bafx-0.2.3.recipe b/haiku-apps/bafx/bafx-0.2.3.recipe index 93587193c..b3b8581b9 100644 --- a/haiku-apps/bafx/bafx-0.2.3.recipe +++ b/haiku-apps/bafx/bafx-0.2.3.recipe @@ -7,7 +7,7 @@ HOMEPAGE="https://github.com/marbocub/BAfx" SRC_URI="git+https://github.com/marbocub/BAfx#ebd3db8a22" COPYRIGHT="2012 @marbocub" LICENSE="MIT" -REVISION="3" +REVISION="1" ARCHITECTURES="x86_gcc2 x86 ?x86_64" PROVIDES="