packages: recordmydesktop/recordmydesktop.spec, recordmydesktop/cache_fix.p...

[mmazur]

Author: mmazur                       Date: Sat May 29 21:50:03 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 5; fixed building and made qt gui work
- stbr someone

---- Files affected:
packages/recordmydesktop:
   recordmydesktop.spec (1.24 -> 1.25) , cache_fix.patch (NONE -> 1.1)  (NEW), x11_build_fix.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/recordmydesktop/recordmydesktop.spec
diff -u packages/recordmydesktop/recordmydesktop.spec:1.24 packages/recordmydesktop/recordmydesktop.spec:1.25
--- packages/recordmydesktop/recordmydesktop.spec:1.24	Sat May 29 23:07:53 2010
+++ packages/recordmydesktop/recordmydesktop.spec	Sat May 29 23:49:57 2010
@@ -12,7 +12,7 @@
 Summary(pl.UTF-8):	Rejestrator pulpitu
 Name:		recordmydesktop
 Version:	0.3.8
-Release:	3
+Release:	5
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	http://downloads.sourceforge.net/recordmydesktop/%{name}-%{version}.tar.gz
@@ -21,6 +21,8 @@
 # Source1-md5:	2637b9be9801e0b2c3b6dae8f86a8b59
 Source2:	http://downloads.sourceforge.net/recordmydesktop/qt-%{name}-%{version}.tar.gz
 # Source2-md5:	bf1525740755615ae172ae27fef68fb5
+Patch0:     cache_fix.patch
+Patch1:     x11_build_fix.patch
 URL:		http://recordmydesktop.sourceforge.net/
 BuildRequires:	alsa-lib-devel
 BuildRequires:	autoconf
@@ -95,6 +97,8 @@
 
 %prep
 %setup -q -a 1 -a 2
+%patch0 -p1
+%patch1 -p1
 
 %build
 %{__aclocal}
@@ -158,7 +162,7 @@
 %endif
 
 %if %{with gtk}
-%files gtk -f gtk-%{name}.lang
+%files gtk -f gtk-recordMyDesktop.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/gtk-%{module}
 %{_desktopdir}/gtk-%{name}.desktop
@@ -166,11 +170,12 @@
 %endif
 
 %if %{with qt}
-%files qt -f qt-%{module}.lang
+%files qt -f qt-recordMyDesktop.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qt-%{module}
 %{_desktopdir}/qt-%{name}.desktop
 %{_pixmapsdir}/qt-%{name}*.png
+%{_pixmapsdir}/*.svg
 %{py_sitescriptdir}/qt_%{module}
 %endif
 
@@ -180,6 +185,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2010/05/29 21:49:57  mmazur
+- rel 5; fixed building and made qt gui work
+- stbr someone
+
 Revision 1.24  2010/05/29 21:07:53  mmazur
 - R: /usr/bin/jack_lsp or the settings window for qt gui doesn't open
 - again, unmaintained software, doesn't work out of the box (missing some icons)

================================================================
Index: packages/recordmydesktop/cache_fix.patch
diff -u /dev/null packages/recordmydesktop/cache_fix.patch:1.1
--- /dev/null	Sat May 29 23:50:03 2010
+++ packages/recordmydesktop/cache_fix.patch	Sat May 29 23:49:57 2010
@@ -0,0 +1,11 @@
+--- recordmydesktop/src/rmd_cache_frame.c	2009/03/12 07:09:01	599
++++ recordmydesktop/src/rmd_cache_frame.c	2009/11/08 18:32:44	601
+@@ -271,7 +271,7 @@
+       unsigned int bytes_per_pixel  = pdata->specs.depth >= 24 ? 4 : 2;
+       unsigned int pixels_per_frame = pdata->brwin.rrect.width * pdata->brwin.rrect.height;
+       
+-      total_received_bytes = ((unsigned int)frameno) * bytes_per_pixel * pixels_per_frame;
++      total_received_bytes = ((unsigned long long int)frameno) * bytes_per_pixel * pixels_per_frame;
+     }
+ 
+     if(total_received_bytes){

================================================================
Index: packages/recordmydesktop/x11_build_fix.patch
diff -u /dev/null packages/recordmydesktop/x11_build_fix.patch:1.1
--- /dev/null	Sat May 29 23:50:03 2010
+++ packages/recordmydesktop/x11_build_fix.patch	Sat May 29 23:49:57 2010
@@ -0,0 +1,22 @@
+--- recordmydesktop-0.3.8/src/rmd_getzpixmap.c~	2008-11-23 16:09:23.000000000 +0100
++++ recordmydesktop-0.3.8/src/rmd_getzpixmap.c	2010-05-29 23:37:28.383498736 +0200
+@@ -28,7 +28,7 @@
+ 
+ #include <X11/Xlib.h>
+ #include <X11/Xlibint.h>
+-#include <X11/extensions/shmstr.h>
++#include <X11/extensions/shmproto.h>
+ #include <X11/extensions/XShm.h>
+ 
+ #include "rmd_types.h"
+--- recordmydesktop-0.3.8/src/rmd_update_image.c~	2008-11-23 16:09:23.000000000 +0100
++++ recordmydesktop-0.3.8/src/rmd_update_image.c	2010-05-29 23:39:30.020624282 +0200
+@@ -27,7 +27,7 @@
+ #include "config.h"
+ 
+ #include <X11/Xlibint.h>
+-#include <X11/extensions/shmstr.h>
++#include <X11/extensions/shmproto.h>
+ #include <X11/extensions/XShm.h>
+ 
+ #include "rmd_types.h"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/recordmydesktop/recordmydesktop.spec?r1=1.24&r2=1.25&f=u