From f05d5cd719cd5c3a1bdc1dde9f51c192f89d763e Mon Sep 17 00:00:00 2001
From: Humdinger <humdingerb@gmail.com>
Date: Wed, 9 Nov 2022 10:41:19 +0100
Subject: [PATCH] Filwip: Update recipe

* Point to last commit
* Removed upstreamed patch
* Removed old recipe
---
 haiku-apps/filwip/filwip-1.0.1.recipe         | 58 -------------------
 haiku-apps/filwip/filwip-2.0.0.recipe         | 13 +++--
 .../filwip/patches/filwip-2.0.0.patchset      | 22 -------
 3 files changed, 7 insertions(+), 86 deletions(-)
 delete mode 100644 haiku-apps/filwip/filwip-1.0.1.recipe
 delete mode 100644 haiku-apps/filwip/patches/filwip-2.0.0.patchset

diff --git a/haiku-apps/filwip/filwip-1.0.1.recipe b/haiku-apps/filwip/filwip-1.0.1.recipe
deleted file mode 100644
index f5153a0b9..000000000
--- a/haiku-apps/filwip/filwip-1.0.1.recipe
+++ /dev/null
@@ -1,58 +0,0 @@
-SUMMARY="A tool to clean temporary and unwanted files"
-DESCRIPTION="It cleans your hard disk of unwanted files such as left-over \
-temporary files, cache files of internet sessions, logs, history files and \
-the like. It works with easy to write text files that include information \
-about where the files to delete are."
-HOMEPAGE="https://sites.google.com/site/appfilwip/home"
-COPYRIGHT="2002 Ramshankar"
-LICENSE="SPL"
-REVISION="3"
-srcGitRev="227dac4d85ba9fdccf6fac672b399784a8ebfe0f"
-SOURCE_URI="https://github.com/HaikuArchives/filwip/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="1666f52533b24ae9f72ffabe0484ca9b088dee997b90f271f42c98a4fc135a64"
-SOURCE_FILENAME="filwip-$srcGitRev.tar.gz"
-SOURCE_DIR="FilWip-$srcGitRev"
-ADDITIONAL_FILES="install_plugins.sh"
-
-ARCHITECTURES="all"
-
-USER_SETTINGS_FILES="settings/FilWip directory keep-old"
-POST_INSTALL_SCRIPTS="$relativePostInstallDir/install_plugins.sh"
-
-PROVIDES="
-	filwip = $portVersion
-	app:FilWip = $portVersion
-	"
-REQUIRES="
-	haiku
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	"
-BUILD_PREREQUIRES="
-	makefile_engine
-	cmd:g++
-	cmd:make
-	cmd:xres
-	"
-
-BUILD()
-{
-	make $jobArgs -C Source
-}
-
-INSTALL()
-{
-	mkdir -p $appsDir/FilWip
-	cp -rf Docs $appsDir/FilWip/Docs
-	cp -a FilWip $appsDir/FilWip
-
-	addAppDeskbarSymlink $appsDir/FilWip/FilWip
-
-	mkdir -p $dataDir/FilWip
-	cp -rf Plugins $dataDir/FilWip/Plugins
-
-	mkdir -p $postInstallDir
-	cp $portDir/additional-files/install_plugins.sh $postInstallDir
-}
diff --git a/haiku-apps/filwip/filwip-2.0.0.recipe b/haiku-apps/filwip/filwip-2.0.0.recipe
index f3aabeb20..e9ea57470 100644
--- a/haiku-apps/filwip/filwip-2.0.0.recipe
+++ b/haiku-apps/filwip/filwip-2.0.0.recipe
@@ -5,13 +5,14 @@ the like. It works with easy to write text files that include information \
 about where the files to delete are."
 HOMEPAGE="https://github.com/HaikuArchives/FilWip"
 COPYRIGHT="2002 Ramshankar
-	2018 HaikuArchives team"
+	2021 HaikuArchives team"
 LICENSE="SPL"
-REVISION="2"
-SOURCE_URI="$HOMEPAGE/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="67ca2d8152a5458b3d5622a260c6fdc5ff2ed8ed4098b257d5a5061e7385f664"
-SOURCE_DIR="FilWip-$portVersion"
-PATCHES="filwip-$portVersion.patchset"
+REVISION="3"
+srcGitRev="5ea70cdb5113033e889ff031f4eb0cbbed6679d7"
+SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz"
+CHECKSUM_SHA256="c17ae5b6c471ba9e4968acc9e70e38ad0123c79309d346977ed2ab9a3101b645"
+SOURCE_DIR="FilWip-$srcGitRev"
+
 ADDITIONAL_FILES="install_plugins.sh"
 
 ARCHITECTURES="all"
diff --git a/haiku-apps/filwip/patches/filwip-2.0.0.patchset b/haiku-apps/filwip/patches/filwip-2.0.0.patchset
deleted file mode 100644
index 234336feb..000000000
--- a/haiku-apps/filwip/patches/filwip-2.0.0.patchset
+++ /dev/null
@@ -1,22 +0,0 @@
-From 3a758dc3fcc035a61401231f5538441635d437e2 Mon Sep 17 00:00:00 2001
-From: Chris Roberts <cpr420@gmail.com>
-Date: Sun, 6 Nov 2022 14:22:58 -0700
-Subject: add libshared to LIBS
-
-
-diff --git a/Source/Makefile b/Source/Makefile
-index 395cb20..603c6a9 100644
---- a/Source/Makefile
-+++ b/Source/Makefile
-@@ -65,7 +65,7 @@ RSRCS =
- #	- 	if your library does not follow the standard library naming scheme,
- #		you need to specify the path to the library and it's name.
- #		(e.g. for mylib.a, specify "mylib.a" or "path/mylib.a")
--LIBS = be columnlistview translation tracker $(STDCPPLIBS)
-+LIBS = be columnlistview translation tracker shared $(STDCPPLIBS)
- 
- #	Specify additional paths to directories following the standard libXXX.so
- #	or libXXX.a naming scheme. You can specify full paths or paths relative
--- 
-2.37.3
-