Author: miriam
Date: 2012-06-02 23:58:06 +0000 (Sat, 02 Jun 2012)
New Revision: 13658
Modified:
packages/trunk/love/debian/patches/scripts_refresh.patch
packages/trunk/love/debian/patches/scripts_source.patch
packages/trunk/love/debian/patches/series
Log:
Corrected patches: they were wrong
Modified: packages/trunk/love/debian/patches/scripts_refresh.patch
===================================================================
--- packages/trunk/love/debian/patches/scripts_refresh.patch 2012-06-02
23:47:54 UTC (rev 13657)
+++ packages/trunk/love/debian/patches/scripts_refresh.patch 2012-06-02
23:58:06 UTC (rev 13658)
@@ -22,103 +22,3 @@
0x6d, 0x65, 0x6e, 0x74, 0x20, 0x54, 0x65, 0x61, 0x6d, 0x0a,0x0a,
0x54, 0x68, 0x69, 0x73, 0x20, 0x73, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72,
0x65, 0x20, 0x69, 0x73, 0x20, 0x70,
0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x64, 0x20, 0x27, 0x61, 0x73, 0x2d,
0x69, 0x73, 0x27, 0x2c, 0x20, 0x77,
-@@ -6427,7 +6427,7 @@
- 0x76, 0x61, 0x6c, 0x75, 0x65, 0x29, 0x0a,
- 0x09, 0x09, 0x09, 0x69, 0x66, 0x20, 0x74, 0x20, 0x3d, 0x3d, 0x20, 0x22,
0x75, 0x73, 0x65, 0x72, 0x64, 0x61,
- 0x74, 0x61, 0x22, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x76, 0x61, 0x6c, 0x75,
0x65, 0x2e, 0x74, 0x79, 0x70, 0x65,
-- 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x74, 0x20, 0x3d, 0x20, 0x76, 0x61,
0x6c, 0x79, 0x65, 0x2e, 0x74, 0x79,
-+ 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x74, 0x20, 0x3d, 0x20, 0x76, 0x61,
0x6c, 0x75, 0x65, 0x2e, 0x74, 0x79,
- 0x70, 0x65, 0x20, 0x65, 0x6e, 0x64, 0x0a,
- 0x09, 0x09, 0x09, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x28, 0x22, 0x43, 0x61,
0x6e, 0x6e, 0x6f, 0x74, 0x20, 0x73,
- 0x65, 0x6e, 0x64, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x20, 0x28, 0x75,
0x6e, 0x73, 0x75, 0x70, 0x70, 0x6f,
---- love-0.8.0.orig/src/scripts/boot.lua.h
-+++ love-0.8.0/src/scripts/boot.lua.h
-@@ -207,6 +207,7 @@ const unsigned char boot_lua[] =
- 0x20, 0x7b, 0x0a,
- 0x09, 0x63, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x20, 0x3d, 0x20, 0x7b,
0x20, 0x61, 0x20, 0x3d, 0x20, 0x30,
- 0x20, 0x7d, 0x2c, 0x0a,
-+ 0x09, 0x66, 0x75, 0x73, 0x65, 0x64, 0x20, 0x3d, 0x20, 0x7b, 0x61, 0x20,
0x3d, 0x20, 0x30, 0x20, 0x7d, 0x2c, 0x0a,
- 0x09, 0x67, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, 0x7b, 0x20, 0x61, 0x20,
0x3d, 0x20, 0x31, 0x20, 0x7d, 0x0a,
- 0x7d, 0x0a,0x0a,
- 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6c, 0x6f, 0x76,
0x65, 0x2e, 0x61, 0x72, 0x67, 0x2e,
-@@ -345,15 +346,27 @@ const unsigned char boot_lua[] =
- 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x73, 0x65, 0x74, 0x53,
0x6f, 0x75, 0x72, 0x63, 0x65, 0x2c,
- 0x20, 0x61, 0x72, 0x67, 0x30, 0x29, 0x0a,
- 0x09, 0x69, 0x73, 0x5f, 0x66, 0x75, 0x73, 0x65, 0x64, 0x5f, 0x67, 0x61,
0x6d, 0x65, 0x20, 0x3d, 0x20, 0x63,
-- 0x61, 0x6e, 0x5f, 0x68, 0x61, 0x73, 0x5f, 0x67, 0x61, 0x6d, 0x65,
0x0a,0x0a,
-+ 0x61, 0x6e, 0x5f, 0x68, 0x61, 0x73, 0x5f, 0x67, 0x61, 0x6d, 0x65, 0x0a,
-+ 0x09, 0x69, 0x66, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x61, 0x72, 0x67,
0x2e, 0x6f, 0x70, 0x74, 0x69, 0x6f,
-+ 0x6e, 0x73, 0x2e, 0x66, 0x75, 0x73, 0x65, 0x64, 0x2e, 0x73, 0x65, 0x74,
0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a,
-+ 0x09, 0x09, 0x69, 0x73, 0x5f, 0x66, 0x75, 0x73, 0x65, 0x64, 0x5f, 0x67,
0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20,
-+ 0x74, 0x72, 0x75, 0x65, 0x0a,
-+ 0x09, 0x65, 0x6e, 0x64, 0x0a,0x0a,
- 0x09, 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x63, 0x61, 0x6e, 0x5f,
0x68, 0x61, 0x73, 0x5f, 0x67, 0x61,
- 0x6d, 0x65, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x6f, 0x2e, 0x67, 0x61, 0x6d,
0x65, 0x2e, 0x73, 0x65, 0x74, 0x20,
- 0x61, 0x6e, 0x64, 0x20, 0x6f, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x2e, 0x61,
0x72, 0x67, 0x5b, 0x31, 0x5d, 0x20,
- 0x74, 0x68, 0x65, 0x6e, 0x0a,
-+ 0x09, 0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x6e, 0x6f, 0x75, 0x72,
0x69, 0x20, 0x3d, 0x20, 0x6f, 0x2e,
-+ 0x67, 0x61, 0x6d, 0x65, 0x2e, 0x61, 0x72, 0x67, 0x5b, 0x31, 0x5d, 0x0a,
-+ 0x09, 0x09, 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x75, 0x72, 0x69, 0x3a, 0x73,
0x75, 0x62, 0x28, 0x31, 0x2c, 0x20,
-+ 0x37, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x66, 0x69, 0x6c, 0x65, 0x3a,
0x2f, 0x2f, 0x22, 0x20, 0x74, 0x68,
-+ 0x65, 0x6e, 0x0a,
-+ 0x09, 0x09, 0x09, 0x6e, 0x6f, 0x75, 0x72, 0x69, 0x20, 0x3d, 0x20, 0x6e,
0x6f, 0x75, 0x72, 0x69, 0x3a, 0x73,
-+ 0x75, 0x62, 0x28, 0x38, 0x29, 0x0a,
-+ 0x09, 0x09, 0x65, 0x6e, 0x64, 0x0a,
- 0x09, 0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x66, 0x75, 0x6c, 0x6c,
0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63,
- 0x65, 0x20, 0x3d, 0x20, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x70, 0x61,
0x74, 0x68, 0x2e, 0x67, 0x65, 0x74,
-- 0x66, 0x75, 0x6c, 0x6c, 0x28, 0x6f, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x2e,
0x61, 0x72, 0x67, 0x5b, 0x31, 0x5d,
-- 0x29, 0x0a,
-+ 0x66, 0x75, 0x6c, 0x6c, 0x28, 0x6e, 0x6f, 0x75, 0x72, 0x69, 0x29, 0x0a,
- 0x09, 0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x6c, 0x65, 0x61, 0x66,
0x20, 0x3d, 0x20, 0x6c, 0x6f, 0x76,
- 0x65, 0x2e, 0x70, 0x61, 0x74, 0x68, 0x2e, 0x6c, 0x65, 0x61, 0x66, 0x28,
0x66, 0x75, 0x6c, 0x6c, 0x5f, 0x73,
- 0x6f, 0x75, 0x72, 0x63, 0x65, 0x29, 0x0a,
-@@ -1840,24 +1853,29 @@ const unsigned char boot_lua[] =
- 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
- 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
- 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a,0x0a,
-- 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74,
0x20, 0x3d, 0x20, 0x78, 0x70, 0x63,
-- 0x61, 0x6c, 0x6c, 0x28, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x62, 0x6f, 0x6f,
0x74, 0x2c, 0x20, 0x65, 0x72, 0x72,
-- 0x6f, 0x72, 0x5f, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x29, 0x0a,
-- 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c,
0x74, 0x20, 0x74, 0x68, 0x65, 0x6e,
-- 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x65, 0x6e, 0x64, 0x0a,
-- 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74,
0x20, 0x3d, 0x20, 0x78, 0x70, 0x63,
-- 0x61, 0x6c, 0x6c, 0x28, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x69, 0x6e, 0x69,
0x74, 0x2c, 0x20, 0x6c, 0x6f, 0x76,
-- 0x65, 0x2e, 0x5f, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x20, 0x61,
0x6e, 0x64, 0x20, 0x6c, 0x6f, 0x76,
-- 0x65, 0x2e, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x65, 0x72, 0x72,
0x68, 0x61, 0x6e, 0x64, 0x20, 0x6f,
-- 0x72, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x65, 0x72, 0x72, 0x68, 0x61,
0x6e, 0x64, 0x29, 0x0a,
-- 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c,
0x74, 0x20, 0x74, 0x68, 0x65, 0x6e,
-- 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x65, 0x6e, 0x64, 0x0a,
-- 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74,
0x20, 0x3d, 0x20, 0x78, 0x70, 0x63,
-- 0x61, 0x6c, 0x6c, 0x28, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x72, 0x75, 0x6e,
0x2c, 0x20, 0x6c, 0x6f, 0x76, 0x65,
-- 0x2e, 0x5f, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x20, 0x61, 0x6e,
0x64, 0x20, 0x6c, 0x6f, 0x76, 0x65,
-- 0x2e, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x65, 0x72, 0x72, 0x68,
0x61, 0x6e, 0x64, 0x20, 0x6f, 0x72,
-- 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x65, 0x72, 0x72, 0x68, 0x61, 0x6e,
0x64, 0x29, 0x0a,
-- 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c,
0x74, 0x20, 0x74, 0x68, 0x65, 0x6e,
-- 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x65, 0x6e, 0x64, 0x0a,
-+ 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74,
0x69, 0x6f, 0x6e, 0x28, 0x29, 0x0a,
-+ 0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c,
0x74, 0x20, 0x3d, 0x20, 0x78, 0x70,
-+ 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x62, 0x6f,
0x6f, 0x74, 0x2c, 0x20, 0x65, 0x72,
-+ 0x72, 0x6f, 0x72, 0x5f, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x29,
0x0a,
-+ 0x09, 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x72, 0x65, 0x73, 0x75,
0x6c, 0x74, 0x20, 0x74, 0x68, 0x65,
-+ 0x6e, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x31, 0x20, 0x65,
0x6e, 0x64, 0x0a,
-+ 0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c,
0x74, 0x20, 0x3d, 0x20, 0x78, 0x70,
-+ 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x69, 0x6e,
0x69, 0x74, 0x2c, 0x20, 0x6c, 0x6f,
-+ 0x76, 0x65, 0x2e, 0x5f, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x20,
0x61, 0x6e, 0x64, 0x20, 0x6c, 0x6f,
-+ 0x76, 0x65, 0x2e, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x65, 0x72,
0x72, 0x68, 0x61, 0x6e, 0x64, 0x20,
-+ 0x6f, 0x72, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x65, 0x72, 0x72, 0x68,
0x61, 0x6e, 0x64, 0x29, 0x0a,
-+ 0x09, 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x72, 0x65, 0x73, 0x75,
0x6c, 0x74, 0x20, 0x74, 0x68, 0x65,
-+ 0x6e, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x31, 0x20, 0x65,
0x6e, 0x64, 0x0a,
-+ 0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c,
0x74, 0x2c, 0x20, 0x72, 0x65, 0x74,
-+ 0x76, 0x61, 0x6c, 0x20, 0x3d, 0x20, 0x78, 0x70, 0x63, 0x61, 0x6c, 0x6c,
0x28, 0x6c, 0x6f, 0x76, 0x65, 0x2e,
-+ 0x72, 0x75, 0x6e, 0x2c, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x5f, 0x72,
0x65, 0x6c, 0x65, 0x61, 0x73, 0x65,
-+ 0x20, 0x61, 0x6e, 0x64, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x72, 0x65,
0x6c, 0x65, 0x61, 0x73, 0x65, 0x65,
-+ 0x72, 0x72, 0x68, 0x61, 0x6e, 0x64, 0x20, 0x6f, 0x72, 0x20, 0x6c, 0x6f,
0x76, 0x65, 0x2e, 0x65, 0x72, 0x72,
-+ 0x68, 0x61, 0x6e, 0x64, 0x29, 0x0a,
-+ 0x09, 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x72, 0x65, 0x73, 0x75,
0x6c, 0x74, 0x20, 0x74, 0x68, 0x65,
-+ 0x6e, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x31, 0x20, 0x65,
0x6e, 0x64, 0x0a,0x0a,
-+ 0x09, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x74, 0x6f, 0x6e, 0x75,
0x6d, 0x62, 0x65, 0x72, 0x28, 0x72,
-+ 0x65, 0x74, 0x76, 0x61, 0x6c, 0x29, 0x20, 0x6f, 0x72, 0x20, 0x30, 0x0a,
-+ 0x65, 0x6e, 0x64, 0x0a,
- }; // [boot.lua]
- } // love
-\ No newline at end of file
Modified: packages/trunk/love/debian/patches/scripts_source.patch
===================================================================
--- packages/trunk/love/debian/patches/scripts_source.patch 2012-06-02
23:47:54 UTC (rev 13657)
+++ packages/trunk/love/debian/patches/scripts_source.patch 2012-06-02
23:58:06 UTC (rev 13658)
@@ -1,4 +1,4 @@
-# https://bitbucket.org/rude/love/src/eaafb8f2ebcc/src/scripts/
+# https://bitbucket.org/rude/love/src/e0f98d53debb/src/scripts
--- /dev/null
+++ love-0.8.0/src/scripts/audio.lua
@@ -166,7 +166,7 @@
+
--- /dev/null
+++ love-0.8.0/src/scripts/boot.lua
-@@ -0,0 +1,817 @@
+@@ -0,0 +1,805 @@
+--[[
+Copyright (c) 2006-2012 LOVE Development Team
+
@@ -281,7 +281,6 @@
+
+love.arg.options = {
+ console = { a = 0 },
-+ fused = {a = 0 },
+ game = { a = 1 }
+}
+
@@ -376,16 +375,9 @@
+ -- Is this one of those fancy "fused" games?
+ local can_has_game = pcall(love.filesystem.setSource, arg0)
+ is_fused_game = can_has_game
-+ if love.arg.options.fused.set then
-+ is_fused_game = true
-+ end
+
+ if not can_has_game and o.game.set and o.game.arg[1] then
-+ local nouri = o.game.arg[1]
-+ if nouri:sub(1, 7) == "file://" then
-+ nouri = nouri:sub(8)
-+ end
-+ local full_source = love.path.getfull(nouri)
++ local full_source = love.path.getfull(o.game.arg[1])
+ local leaf = love.path.leaf(full_source)
+ love.filesystem.setIdentity(leaf)
+ can_has_game = pcall(love.filesystem.setSource, full_source)
@@ -974,16 +966,12 @@
+-- The root of all calls.
+-----------------------------------------------------------
+
-+return function()
-+ local result = xpcall(love.boot, error_printer)
-+ if not result then return 1 end
-+ local result = xpcall(love.init, love._release and love.releaseerrhand
or love.errhand)
-+ if not result then return 1 end
-+ local result, retval = xpcall(love.run, love._release and
love.releaseerrhand or love.errhand)
-+ if not result then return 1 end
-+
-+ return tonumber(retval) or 0
-+end
++local result = xpcall(love.boot, error_printer)
++if not result then return end
++local result = xpcall(love.init, love._release and love.releaseerrhand or
love.errhand)
++if not result then return end
++local result = xpcall(love.run, love._release and love.releaseerrhand or
love.errhand)
++if not result then return end
--- /dev/null
+++ love-0.8.0/src/scripts/graphics.lua
@@ -0,0 +1,1374 @@
@@ -2340,7 +2328,7 @@
+ end
+ else
+ local t = type(value)
-+ if t == "userdata" and value.type then t = value.type
end
++ if t == "userdata" and value.type then t = valye.type
end
+ error("Cannot send value (unsupported type: "..t..").")
+ end
+ end
Modified: packages/trunk/love/debian/patches/series
===================================================================
--- packages/trunk/love/debian/patches/series 2012-06-02 23:47:54 UTC (rev
13657)
+++ packages/trunk/love/debian/patches/series 2012-06-02 23:58:06 UTC (rev
13658)
@@ -1,2 +1,2 @@
scripts_source.patch
-#scripts_refresh.patch
+scripts_refresh.patch
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
