rpms/kdeaddons/FC-4 kdeaddons-3.5.3-sdl.patch, NONE, 1.1 kdeaddons.spec, 1.40, 1.41 sources, 1.29, 1.30

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdeaddons/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv2429

Modified Files:
	kdeaddons.spec sources 
Added Files:
	kdeaddons-3.5.3-sdl.patch 
Log Message:
3.5.3


kdeaddons-3.5.3-sdl.patch:
 tippercanoe/main.cpp    |    2 +-
 tippercanoe/sdlwrap.cpp |    2 ++
 tippercanoe/syna.h      |    2 +-
 tyler/main.cpp          |    4 +++-
 4 files changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE kdeaddons-3.5.3-sdl.patch ---
--- kdeaddons-3.5.3/noatun-plugins/tippercanoe/sdlwrap.cpp.than	2006-06-07 18:52:09.000000000 +0200
+++ kdeaddons-3.5.3/noatun-plugins/tippercanoe/sdlwrap.cpp	2006-06-07 18:54:06.000000000 +0200
@@ -183,6 +183,7 @@
 	SDL_UpdateRect(surface, 0, 0, 0, 0);
 }
 
+#if 0
 int SdlScreen::winID(void)
 {
 	SDL_SysWMinfo info;
@@ -195,3 +196,4 @@
 	SDL_GetWMInfo(&info);
 	return info.info.x11.wmwindow;
 }
+#endif
--- kdeaddons-3.5.3/noatun-plugins/tippercanoe/main.cpp.than	2006-06-07 18:54:19.000000000 +0200
+++ kdeaddons-3.5.3/noatun-plugins/tippercanoe/main.cpp	2006-06-07 18:54:27.000000000 +0200
@@ -112,7 +112,7 @@
 {
 	time_t timer = time(NULL);
 
-	printf("%u\n", static_cast<SdlScreen *>(screen)->winID());
+	//printf("%u\n", static_cast<SdlScreen *>(screen)->winID());
 	fflush(stdout);
 
 	int frames = 0;
--- kdeaddons-3.5.3/noatun-plugins/tippercanoe/syna.h.than	2006-06-07 18:51:25.000000000 +0200
+++ kdeaddons-3.5.3/noatun-plugins/tippercanoe/syna.h	2006-06-07 18:51:56.000000000 +0200
@@ -108,7 +108,7 @@
 	int  sizeUpdate();
 	bool inputUpdate(int &mouseX,int &mouseY,int &mouseButtons,char &keyHit);
 	void show();
-	int winID();
+	//int winID();
 };
 
 // core
--- kdeaddons-3.5.3/noatun-plugins/tyler/main.cpp.than	2006-06-07 18:54:38.000000000 +0200
+++ kdeaddons-3.5.3/noatun-plugins/tyler/main.cpp	2006-06-07 18:55:00.000000000 +0200
@@ -52,6 +52,7 @@
 SDL_Surface *screen;
 }
 
+#if 0
 int winID(void)
 {
 	SDL_SysWMinfo info;
@@ -61,6 +62,7 @@
 	SDL_GetWMInfo(&info);
 	return info.info.x11.wmwindow;
 }
+#endif
 
 int main(int, char **)
 {
@@ -74,7 +76,7 @@
 	access_mutex = SDL_CreateMutex();
 
 	init_renderer1();
-	printf("%u\n", winID());
+	//printf("%u\n", winID());
 	fflush(stdout);
 	init_renderer2();
 	thread = SDL_CreateThread((int (*)(void *))renderer, NULL);


Index: kdeaddons.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaddons/FC-4/kdeaddons.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- kdeaddons.spec	11 Apr 2006 14:26:44 -0000	1.40
+++ kdeaddons.spec	9 Jun 2006 21:31:39 -0000	1.41
@@ -4,12 +4,12 @@
 %define make_cvs 1
 
 %define qt_version 3.3.4
-%define arts_version 1.5.2
+%define arts_version 1.5.3
 %define arts 1
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.2
+Version: 3.5.3
 Release: 0.1.fc4
 Name: kdeaddons
 Summary: K Desktop Environment - Plugins
@@ -19,6 +19,7 @@
 Url: http://www.kde.org
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch1: kde-libtool.patch
+Patch2: kdeaddons-3.5.3-sdl.patch
 
 Prereq: /sbin/ldconfig
 
@@ -27,6 +28,9 @@
 Requires: arts >= 8:%{arts_version}
 Requires: SDL >= 1.2.0
 
+BuildPrereq: autoconf
+BuildPrereq: libtool
+BuildPrereq: automake
 BuildPrereq: kdegames-devel
 BuildPrereq: kdemultimedia-devel
 BuildPrereq: zlib-devel
@@ -70,6 +74,7 @@
 %prep
 %setup -q
 %patch1 -p1 -b .libtool
+%patch2 -p1 -b .sdl
 
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
@@ -165,6 +170,9 @@
 %endif
 
 %changelog
+* Fri Jun 09 2006 Than Ngo <than at redhat.com> 3.5.3-0.1.fc4
+- update to 3.5.3
+
 * Tue Apr 11 2006 Than Ngo <than at redhat.com> 3.5.2-0.1.fc4
 - update to 3.5.2 
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeaddons/FC-4/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	11 Apr 2006 14:27:52 -0000	1.29
+++ sources	9 Jun 2006 21:31:39 -0000	1.30
@@ -1 +1 @@
-affb74174c6e3eda2c0748d6c052c8ff  kdeaddons-3.5.2.tar.bz2
+ea25326c6a775bbfa40d0efabed34c0d  kdeaddons-3.5.3.tar.bz2