From efdc260bd00b0761056167d84d10b93666ec8531 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 7 Feb 2017 20:35:17 +0100 Subject: [PATCH] foldershaper: patch is upstreamed. --- .../foldershaper/foldershaper-1.0.recipe | 7 +++--- .../patches/foldershaper-1.0.patchset | 22 ------------------- 2 files changed, 3 insertions(+), 26 deletions(-) delete mode 100644 haiku-apps/foldershaper/patches/foldershaper-1.0.patchset diff --git a/haiku-apps/foldershaper/foldershaper-1.0.recipe b/haiku-apps/foldershaper/foldershaper-1.0.recipe index 018762d1a..a91894317 100644 --- a/haiku-apps/foldershaper/foldershaper-1.0.recipe +++ b/haiku-apps/foldershaper/foldershaper-1.0.recipe @@ -7,12 +7,11 @@ your folders on FolderShaper and select the template from the pop-up menu." HOMEPAGE="https://github.com/HaikuArchives/FolderShaper" COPYRIGHT="2005 Jonas Sundström" LICENSE="Public Domain" -REVISION="2" -srcGitRev="afe549dc49e5fffc0dd2f65c383c6a8e0764a103" +REVISION="3" +srcGitRev="6bf73af2ddb5a96ac46950e66fd24f1499c092dc" SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz" -CHECKSUM_SHA256="b007d056b92f21b0cc31bea57ac939f31c3f751c06775694e1749e568257eee4" +CHECKSUM_SHA256="d41494b4c11c0c0827a3a5121556ae92e6138095f8ee44a55a612ca041596378" SOURCE_DIR="FolderShaper-$srcGitRev" -PATCHES="foldershaper-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" diff --git a/haiku-apps/foldershaper/patches/foldershaper-1.0.patchset b/haiku-apps/foldershaper/patches/foldershaper-1.0.patchset deleted file mode 100644 index babf70eb6..000000000 --- a/haiku-apps/foldershaper/patches/foldershaper-1.0.patchset +++ /dev/null @@ -1,22 +0,0 @@ -From 36ae44f5ef235432cca1844705a36e98f96fd4b3 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Tue, 31 Jan 2017 21:41:40 +0100 -Subject: add STDCPPLIBS - - -diff --git a/Source/Makefile b/Source/Makefile -index 7d78645..46541c6 100644 ---- a/Source/Makefile -+++ b/Source/Makefile -@@ -56,7 +56,7 @@ RSRCS= FolderShaper.rsrc - # 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 --- -2.10.2 -