From fca7b071b9ab268d3b9bfa505b3a9dbd88c4a845 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 2 Mar 2005 22:52:36 +0000 Subject: Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into handhelds.org:/home/ich/programming/oe/openembedded 2005/03/02 23:52:09+01:00 handhelds.org!zecke Libsdl QPE: -Kill special SDL Main library -Use gcc constructor and destructor to create and destroy the qpeapplication and qwidget. -Some more gccism to parse cmdline from /proc/self/cmdline (please review for security) BKrev: 422643b4lonGzqCqX-KtomfMGm1X-w --- packages/libsdl/libsdl-qpe-1.2.7/ipaq.patch | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'packages/libsdl/libsdl-qpe-1.2.7/ipaq.patch') diff --git a/packages/libsdl/libsdl-qpe-1.2.7/ipaq.patch b/packages/libsdl/libsdl-qpe-1.2.7/ipaq.patch index b8451f6f7e..1936246391 100644 --- a/packages/libsdl/libsdl-qpe-1.2.7/ipaq.patch +++ b/packages/libsdl/libsdl-qpe-1.2.7/ipaq.patch @@ -1,15 +1,17 @@ -diff -urNd SDL-1.2.7_clean/src/video/qtopia/Makefile.am SDL-1.2.7/src/video/qtopia/Makefile.am ---- SDL-1.2.7_clean/src/video/qtopia/Makefile.am 2005-01-27 23:51:00.000000000 +0200 -+++ SDL-1.2.7/src/video/qtopia/Makefile.am 2005-01-27 23:55:28.000000000 +0200 -@@ -20,4 +20,4 @@ +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:56.658626603 +0100 ++++ SDL-1.2.7/src/video/qtopia/Makefile.am 2005-03-02 22:25:01.549935581 +0100 +@@ -22,4 +22,4 @@ # overwrite USER variables CXXLD = $(CC) CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -lsupc++ -o $@ + $(AM_LDFLAGS) $(LDFLAGS) -lopiecore2 -lsupc++ -o $@ -diff -urNd SDL-1.2.7_clean/src/video/qtopia/SDL_QWin.cc SDL-1.2.7/src/video/qtopia/SDL_QWin.cc ---- SDL-1.2.7_clean/src/video/qtopia/SDL_QWin.cc 2005-01-27 23:50:59.000000000 +0200 -+++ SDL-1.2.7/src/video/qtopia/SDL_QWin.cc 2005-01-27 23:53:37.000000000 +0200 +Index: SDL-1.2.7/src/video/qtopia/SDL_QWin.cc +=================================================================== +--- SDL-1.2.7.orig/src/video/qtopia/SDL_QWin.cc 2005-03-02 22:24:55.100846680 +0100 ++++ SDL-1.2.7/src/video/qtopia/SDL_QWin.cc 2005-03-02 22:25:01.550935440 +0100 @@ -29,8 +29,11 @@ #include "SDL_QWin.h" #include @@ -72,9 +74,10 @@ diff -urNd SDL-1.2.7_clean/src/video/qtopia/SDL_QWin.cc SDL-1.2.7/src/video/qtop default: scancode = SDLK_UNKNOWN; break; -diff -urNd SDL-1.2.7_clean/src/video/qtopia/SDL_sysvideo.cc SDL-1.2.7/src/video/qtopia/SDL_sysvideo.cc ---- SDL-1.2.7_clean/src/video/qtopia/SDL_sysvideo.cc 2005-01-27 23:50:58.000000000 +0200 -+++ SDL-1.2.7/src/video/qtopia/SDL_sysvideo.cc 2005-01-27 23:53:37.000000000 +0200 +Index: SDL-1.2.7/src/video/qtopia/SDL_sysvideo.cc +=================================================================== +--- SDL-1.2.7.orig/src/video/qtopia/SDL_sysvideo.cc 2005-03-02 22:24:46.873009084 +0100 ++++ SDL-1.2.7/src/video/qtopia/SDL_sysvideo.cc 2005-03-02 22:25:01.551935299 +0100 @@ -106,6 +106,9 @@ MACHINE_SHARP_SLC760, MACHINE_SHARP_SLC860, -- cgit v1.2.3