NumptyPhysics: bump version

2026-04-22 11:40:06 +02:00 · 2020-06-07 17:04:26 +10:00
parent dc27ea3adb
commit 0b43f8346e
3 changed files with 96 additions and 25 deletions
--- a/games-puzzle/numptyphysics/additional-files/numptyphysics.rdef
+++ b/games-puzzle/numptyphysics/additional-files/numptyphysics.rdef
@@ -5,7 +5,7 @@ resource app_flags B_SINGLE_LAUNCH;
 resource app_version {
 	major  = 0,
 	middle = 3,
-	minor  = 4,
+	minor  = 5,

 	variety = B_APPV_FINAL,
 	internal = 0,
@@ -15,16 +15,32 @@ resource app_version {
 };

 resource vector_icon array {
-	$"6E63696602032BAB2B03FFE03F0A040BFEFF2B2E4529482A4928472840294228"
-	$"40233C233E233A2A3B2A3B2B392F3032312C2F313A3039323B393C393B393D35"
-	$"403540354136493245020B542E542D5431593156315C315A2B5C2D5829562857"
-	$"295527512353234F234F2550254E254524482443244224422442264628452647"
-	$"2A492A492A492A522B512A532C00023B573B573B593960395D39600802465748"
-	$"6000044D4A4D4A4D4C4F544F524F56495A4B59475B4258445A425804030F5159"
-	$"5159505A4F564E5850545300063655365539574B5649584D544C404E414A3F49"
-	$"3C483E493C50374E385235542E5431542E04077E2F492A4532452F4535483C49"
-	$"3A483C3E483C483C473D3D474142394C385904033E3F493D463F473B452D4330"
-	$"432D430405FE032E3D3040303F3041314430433144324432443247314A314831"
-	$"4A030A00090908070605040302011815FF01178222040A0101001815FF011782"
-	$"22040A0101001A42367A00000000000042367A3E562CCA115100150117822204"
+	$"6E6369660503DF000003DDB80003171752050004005E04020ABA10B97EBA10B9"
+	$"7EB98DB9A9B8F2BA8DB93BBA1FB812BC20B7EBBFC5B793BDFAB87EC095BA28C1"
+	$"C4B923C183BB46C219BDA1C22FBC77C26BBF10C0F6BF60BD22BF7BBEF1BF61BB"
+	$"ECBDB0BA30BE77BB01BD45B9ABBBFDB9BCBC8CB9EEBB5FB98BBA10B97EBAB7B9"
+	$"53BA10B97EBA10B97EBA10B97EBA10B97E0009B9A8B87FB9A8B87FBB12B843BD"
+	$"E6B90038B884BEE1B9CAC03CBBF8BFC5BACAC0BFBE80BE11C32DC03AC187BC74"
+	$"C373B947C290BACCC320B86CC229B73EC0A8B7D4C160B6A6BFF3B6D1BE20B6DB"
+	$"BEF9B6C4BCEDB7AFBAB6B73DBBCCB813B9CBB9A8B87FB8ACB8DAB9A8B87F0223"
+	$"C420B994C420B994C44AB91DC534B93BC4CBB8F7C567BAE4C5CDBE37C54CBC99"
+	$"53BE63CA5DBE39C8D7BE2FCAADBF00C970BFE3C9E9BF6CC8D5C070C7CAC1B6C8"
+	$"4CC111C80EC28CC8D4C41EC888C34CC8FFC485C84FC4E0C896C4B7C899C54BC8"
+	$"A1C646C8DCC5C2C859C634C7C6C606C7FFC642C6E7C525C54EC340C62AC425C5"
+	$"29C309C4B7C34FC4DCC329C3DBC40AC233C593C310C4D9C1EFC5DCC134C573C1"
+	$"3EC5F8C101C493C065C2E3C0ECC3A5C07AC289C09CC1D5C08DC22FC062C1B9BF"
+	$"EFC182C029C19DC01AC134C066C094C03FC0E3C0FBC0CDC232C112C196C0F4C2"
+	$"32C139C22FC1ACC230C185C1F9C1F3C195C288C1B3C232C1B5C317C228C424C1"
+	$"F6C39BC309C35AC4C9C1C1C3EEC293C500C1C0C56E45C537C1BFC5EEC253C722"
+	$"C349C669C2F6C6FEC2A5C6D1C153C6A4C1FEC728C091C85DBF69C7CCC001C757"
+	$"BF68C54BBF26C645BF81C462BE67C44ABC07C479BD16C3DDBD1FC2EEBF47C35F"
+	$"BE30C23FBF58C101BECDC19CBF15C107BE7BC111BDD6C10CBE29C177BDDBC244"
+	$"BDE8C1DDBDE2C2EEBC7CC420B994C379BB01C420B994C420B994C420B994C420"
+	$"B994020EB6B5C42BB6B5C42BB639C3F32949B618C34EB784C34A2F4EB81DC4F4"
+	$"BAB4C5E83D51BCCCC608C009C7164956C1CAC81DC3E9C8AB4F55C524C7FDC689"
+	$"C84BC78FC7D2C6C5C78EC7CDC7F7C7D4C88EC7BCC852C711C8D74F58C681C963"
+	$"C4ECC9384858C3B8C982C14EC8E93C53BFBCC7DDBC41C6C62E50BA6FC6D0B7E5"
+	$"C5EEB6B5C42BB765C454B6B5C42BB6B5C42BB6B5C42BB6B5C42B050A04040302"
+	$"01001240098A0000000000003E117E43E01C497B1601178300040A0304030201"
+	$"001001178300040A00020001000A010102000A02010300"
 };
--- a/games-puzzle/numptyphysics/numptyphysics-0.3.5.recipe
+++ b/games-puzzle/numptyphysics/numptyphysics-0.3.5.recipe
@@ -4,19 +4,19 @@ levers, pulleys and whatever else you fancy to get the little red thing to \
 the little yellow thing."
 HOMEPAGE="http://numptyphysics.garage.maemo.org"
 COPYRIGHT="2008-2010 Tim Edmonds
-	2008, 2012, 2014-2016 Thomas Perl"
+	2008, 2012, 2014-2019 Thomas Perl"
 LICENSE="GNU GPL v3"
-REVISION="3"
+REVISION="1"
 SOURCE_URI="https://github.com/thp/numptyphysics/archive/$portVersion.tar.gz"
-CHECKSUM_SHA256="e00e1535c8246f3f1c3bab37d2e6f01259a14f59b38382299457b4b8447d2bc9"
+CHECKSUM_SHA256="70347440adcacb3f1b02a2a73a4c23e8a76145a5e6e12237c7512a73b6000c5a"
 PATCHES="numptyphysics-$portVersion.patchset"
 ADDITIONAL_FILES="numptyphysics.rdef"

-ARCHITECTURES="!x86_gcc2 !x86 !x86_64"
+ARCHITECTURES="!x86_gcc2 !x86 x86_64"
 SECONDARY_ARCHITECTURES="!x86_gcc2 !x86"

 PROVIDES="
-	numptyphysics = $portVersion
+	numptyphysics$secondaryArchSuffix = $portVersion
 	app:NumptyPhysics
 	"
 REQUIRES="
@@ -48,7 +48,6 @@ BUILD_PREREQUIRES="

 BUILD()
 {
-# TODO: figure out how to move the ~/.numptyphysics directory to ~/config/settings/numptyphysics
 	make PLATFORM=sdl1 PREFIX=$appsDir/NumptyPhysics OBJ_DIR=objects $jobArgs
 }

@@ -56,7 +55,11 @@ INSTALL()
 {
 	make PLATFORM=sdl1 PREFIX=$appsDir/NumptyPhysics install

-	addResourcesToBinaries $portDir/additional-files/numptyphysics.rdef $appsDir/NumptyPhysics/bin/numptyphysics
+	mv $appsDir/NumptyPhysics/bin/numptyphysics "$appsDir/NumptyPhysics/Numpty Physics"
+	mv $appsDir/NumptyPhysics/data/numptyphysics/* $appsDir/NumptyPhysics/data
+	rm -rf $appsDir/NumptyPhysics/{bin,data/numptyphysics}

-	ln -s $appsDir/NumptyPhysics/bin/numptyphysics $appsDir/NumptyPhysics/"Numpty Physics"
+	addResourcesToBinaries $portDir/additional-files/numptyphysics.rdef "$appsDir/NumptyPhysics/Numpty Physics"
+	
+	addAppDeskbarSymlink "$appsDir/NumptyPhysics/Numpty Physics"
 }
--- a/games-puzzle/numptyphysics/patches/numptyphysics-0.3.5.patchset
+++ b/games-puzzle/numptyphysics/patches/numptyphysics-0.3.5.patchset
@@ -1,11 +1,11 @@
-From c10e292e69df48bf6cab817e350c652068db22fe Mon Sep 17 00:00:00 2001
+From 36d51bab16cb2b30092aadf0721fe334bdda8021 Mon Sep 17 00:00:00 2001
 From: begasus <begasus@gmail.com>
 Date: Sat, 12 Oct 2019 14:16:38 +0200
 Subject: Fix build, install paths


 diff --git a/external/glaserl/glaserl_gl.h b/external/glaserl/glaserl_gl.h
-index 6c8a3e7..d327b32 100644
+index 36546e0..0b3d70c 100644
 --- a/external/glaserl/glaserl_gl.h
 +++ b/external/glaserl/glaserl_gl.h
@@ -18,7 +18,7 @@
@@ -32,7 +32,7 @@ index f713ea8..dac9046 100644
 
 .PHONY: install
 diff --git a/platform/sdl1/platform.in b/platform/sdl1/platform.in
-index 4bf22dc..3bdb5f4 100644
+index 4bf22dc..e7f0eea 100644
 --- a/platform/sdl1/platform.in
 +++ b/platform/sdl1/platform.in
@@ -1,6 +1,8 @@
@@ -71,5 +71,57 @@ index 830126b..cd197ac 100644
 class SDLSTBRenderer : public GLRenderer {
 public:
 -- 
-2.23.0
+2.26.0
+
+
+From 3d2e7426a4e09b4e970e7659120b1e1a79b24a2e Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Sun, 7 Jun 2020 16:47:33 +1000
+Subject: Use realpath for argv[0]
+
+
+diff --git a/platform/sdl1/OsSDL1.cpp b/platform/sdl1/OsSDL1.cpp
+index 654e74b..1c5928d 100644
+--- a/platform/sdl1/OsSDL1.cpp
+++ b/platform/sdl1/OsSDL1.cpp
+@@ -40,6 +40,11 @@ public:
+ 
+ int main(int argc, char** argv)
+ {
+#ifdef __HAIKU__
+	char *binpath = realpath(argv[0], NULL);
+	if (binpath != NULL)
+		argv[0] = binpath;
+#endif
+     std::shared_ptr<Os> os(new OsSDL1());
+ 
+     std::shared_ptr<MainLoop> mainloop(npmain(argc, argv));
+-- 
+2.26.0
+
+
+From 4b440f10516524be4f7967d11440dd5fe98d2921 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Sun, 7 Jun 2020 17:01:30 +1000
+Subject: Fix settings dir
+
+
+diff --git a/platform/sdl1/OsSDL1.cpp b/platform/sdl1/OsSDL1.cpp
+index 1c5928d..3fb7864 100644
+--- a/platform/sdl1/OsSDL1.cpp
+++ b/platform/sdl1/OsSDL1.cpp
+@@ -34,7 +34,11 @@ public:
+ 
+     virtual std::string userDataDir()
+     {
+#ifdef __HAIKU__
+        return "config/settings/numptyphysics";
+#else
+         return ".numptyphysics-data-sdl1";
+#endif
+     }
+ };
+ 
+-- 
+2.26.0