summaryrefslogtreecommitdiff
path: root/packages/libsdl/libsdl-qpe-1.2.7/pygame.patch
diff options
context:
space:
mode:
Diffstat (limited to 'packages/libsdl/libsdl-qpe-1.2.7/pygame.patch')
-rw-r--r--packages/libsdl/libsdl-qpe-1.2.7/pygame.patch20
1 files changed, 9 insertions, 11 deletions
diff --git a/packages/libsdl/libsdl-qpe-1.2.7/pygame.patch b/packages/libsdl/libsdl-qpe-1.2.7/pygame.patch
index 276902c608..6814dd6d72 100644
--- a/packages/libsdl/libsdl-qpe-1.2.7/pygame.patch
+++ b/packages/libsdl/libsdl-qpe-1.2.7/pygame.patch
@@ -1,6 +1,6 @@
Index: SDL-1.2.7/src/main/qtopia/SDL_qtopia_main.cc
===================================================================
---- SDL-1.2.7.orig/src/main/qtopia/SDL_qtopia_main.cc 2005-03-02 22:24:42.713596719 +0100
+--- SDL-1.2.7.orig/src/main/qtopia/SDL_qtopia_main.cc 2003-12-14 07:25:53.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-
@@ -53,8 +53,8 @@ Index: SDL-1.2.7/src/main/qtopia/SDL_qtopia_main.cc
Index: SDL-1.2.7/src/video/qtopia/SDL_qmain.cc
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ SDL-1.2.7/src/video/qtopia/SDL_qmain.cc 2005-03-03 00:11:13.830189869 +0100
-@@ -0,0 +1,101 @@
++++ SDL-1.2.7/src/video/qtopia/SDL_qmain.cc 2005-03-13 18:04:59.218302232 +0100
+@@ -0,0 +1,99 @@
+/* Include the SDL main definition header */
+#include "SDL_main.h"
+#include <stdlib.h>
@@ -70,8 +70,6 @@ Index: SDL-1.2.7/src/video/qtopia/SDL_qmain.cc
+#include <string.h>
+
+
-+static void initialize_qpe_app() __attribute__((constructor));
-+static void deinitialize_qpe_app() __attribute__((destructor));
+
+static QWidget *dummyW = 0;
+static QPEApplication *theApp = 0;
@@ -140,7 +138,7 @@ Index: SDL-1.2.7/src/video/qtopia/SDL_qmain.cc
+ delete [] cmdline;
+}
+
-+static void initialize_qpe_app() {
++static void __attribute__((constructor)) initialize_qpe_app() {
+ parse_cmd_line();
+
+ theApp = new QPEApplication( size, cmdline );
@@ -148,7 +146,7 @@ Index: SDL-1.2.7/src/video/qtopia/SDL_qmain.cc
+ theApp->showMainWidget(dummyW);
+}
+
-+static void deinitialize_qpe_app() {
++static void __attribute__((destructor)) deinitialize_qpe_app() {
+ free_cmd_line();
+ delete dummyW;
+ delete theApp;
@@ -158,8 +156,8 @@ Index: SDL-1.2.7/src/video/qtopia/SDL_qmain.cc
+#endif
Index: SDL-1.2.7/src/main/Makefile.am
===================================================================
---- SDL-1.2.7.orig/src/main/Makefile.am 2005-03-02 22:24:42.714596577 +0100
-+++ SDL-1.2.7/src/main/Makefile.am 2005-03-03 00:08:55.914676851 +0100
+--- SDL-1.2.7.orig/src/main/Makefile.am 2004-02-18 18:22:01.000000000 +0100
++++ SDL-1.2.7/src/main/Makefile.am 2005-03-13 18:03:46.321636109 +0100
@@ -21,11 +21,7 @@
if TARGET_MACOSX
MAINLIB_ARCH_SRCS = macosx/SDLMain.m macosx/SDLMain.h
@@ -174,8 +172,8 @@ Index: SDL-1.2.7/src/main/Makefile.am
libSDLmain_a_SOURCES = $(MAINLIB_ARCH_SRCS)
Index: SDL-1.2.7/src/video/qtopia/Makefile.am
===================================================================
---- SDL-1.2.7.orig/src/video/qtopia/Makefile.am 2005-03-02 22:24:42.714596577 +0100
-+++ SDL-1.2.7/src/video/qtopia/Makefile.am 2005-03-03 00:08:55.915676710 +0100
+--- SDL-1.2.7.orig/src/video/qtopia/Makefile.am 2002-05-28 21:24:11.000000000 +0200
++++ SDL-1.2.7/src/video/qtopia/Makefile.am 2005-03-13 18:03:46.322635967 +0100
@@ -15,4 +15,5 @@
SDL_syswm.cc \
SDL_syswm_c.h \