From 84bc3f445c2d84dbfccccdc09cd23b4e87833673 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 21 Sep 2018 08:22:41 +0200
Subject: [PATCH] universalscroller: upstreamed patchset.

---
 .../universalscroller-4.0.1~20171227.patchset | 59 -------------------
 .../universalscroller-4.0.1~20171227.recipe   |  7 +--
 2 files changed, 3 insertions(+), 63 deletions(-)
 delete mode 100644 haiku-misc/universalscroller/patches/universalscroller-4.0.1~20171227.patchset

diff --git a/haiku-misc/universalscroller/patches/universalscroller-4.0.1~20171227.patchset b/haiku-misc/universalscroller/patches/universalscroller-4.0.1~20171227.patchset
deleted file mode 100644
index 2364d6fa4..000000000
--- a/haiku-misc/universalscroller/patches/universalscroller-4.0.1~20171227.patchset
+++ /dev/null
@@ -1,59 +0,0 @@
-From 840404a338fde55c779a620fefec961c1ddd4396 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
-Date: Mon, 23 Apr 2018 21:16:24 +0200
-Subject: Build fixes
-
-
-diff --git a/Makefile b/Makefile
-index c72660f..a36af23 100644
---- a/Makefile
-+++ b/Makefile
-@@ -59,8 +59,8 @@ dist: all
- 	scripts/substituting_cp.sh doc/readme.txt dist
- 	scripts/substituting_cp.sh scripts/install.sh dist
- 	scripts/substituting_cp.sh scripts/uninstall.sh dist
--	cp src/preferences/obj.$(BE_HOST_CPU)/Preferences dist
--	cp src/filter/obj.$(BE_HOST_CPU)/UniversalScroller dist
-+	cp src/preferences/objects/Preferences dist
-+	cp src/filter/objects/UniversalScroller dist
- 	cp LICENSE.txt dist
- 	chmod +x dist/install.sh
- 	chmod +x dist/uninstall.sh
-diff --git a/src/filter/Makefile b/src/filter/Makefile
-index db7bf86..8a57778 100644
---- a/src/filter/Makefile
-+++ b/src/filter/Makefile
-@@ -107,7 +107,7 @@ else
- endif
- 
- #	specify additional compiler flags for all files
--COMPILER_FLAGS =
-+COMPILER_FLAGS = -fpermissive
- 
- #	specify additional linker flags
- LINKER_FLAGS =
-diff --git a/src/preferences/Makefile b/src/preferences/Makefile
-index bdf427a..b15fa21 100644
---- a/src/preferences/Makefile
-+++ b/src/preferences/Makefile
-@@ -46,7 +46,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
-@@ -107,7 +107,7 @@ else
- endif
- 
- #	specify additional compiler flags for all files
--COMPILER_FLAGS =
-+COMPILER_FLAGS = -fpermissive
- 
- #	specify additional linker flags
- LINKER_FLAGS =
--- 
-2.16.2
-
diff --git a/haiku-misc/universalscroller/universalscroller-4.0.1~20171227.recipe b/haiku-misc/universalscroller/universalscroller-4.0.1~20171227.recipe
index ce9c75512..8632c3add 100644
--- a/haiku-misc/universalscroller/universalscroller-4.0.1~20171227.recipe
+++ b/haiku-misc/universalscroller/universalscroller-4.0.1~20171227.recipe
@@ -4,13 +4,12 @@ inter-clicks, launching programs upon clicking and much more."
 HOMEPAGE="https://github.com/HaikuArchives/UniversalScroller"
 COPYRIGHT="2011 Christian Aistleitner"
 LICENSE="GNU GPL v2"
-REVISION="1"
-srcGitRev="897c90dcc8079a8ede89c857d5e3601a4e443a35"
+REVISION="2"
+srcGitRev="adc773725e8a91976c75dcd42faf594f536ad370"
 SOURCE_URI="https://github.com/HaikuArchives/UniversalScroller/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="b0e5568ff385ed6e41ace1735a37eac849185ce3755ec334f58fb54ad6475a93"
+CHECKSUM_SHA256="9eecceda968c10e6a70a8a859dff4c0d25b570b8760a4236b9fcaf52717b6bdf"
 SOURCE_FILENAME="UniversalScroller-$portVersion-$srcGitRev.tar.gz"
 SOURCE_DIR="UniversalScroller-$srcGitRev"
-PATCHES="universalscroller-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"