rpms/xorg-x11-drv-sisusb/devel sisusb-0.8.1-open-is-not-fopen.patch, NONE, 1.1 xorg-x11-drv-sisusb.spec, 1.18, 1.19

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-sisusb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26788

Modified Files:
	xorg-x11-drv-sisusb.spec 
Added Files:
	sisusb-0.8.1-open-is-not-fopen.patch 
Log Message:
* Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 0.8.1-8
- sisusb-0.8.1-open-is-not-fopen.patch: Despite the similarity, you can not
  pass character literals to open that match the string literals you'd pass
  to fopen.


sisusb-0.8.1-open-is-not-fopen.patch:

--- NEW FILE sisusb-0.8.1-open-is-not-fopen.patch ---
diff -up xf86-video-sisusb-0.8.1/src/sisusb_driver.c.jx xf86-video-sisusb-0.8.1/src/sisusb_driver.c
--- xf86-video-sisusb-0.8.1/src/sisusb_driver.c.jx	2005-09-28 14:48:30.000000000 -0400
+++ xf86-video-sisusb-0.8.1/src/sisusb_driver.c	2007-08-23 16:21:42.000000000 -0400
@@ -509,7 +509,7 @@ SiSUSB_SiSFB_Lock(ScrnInfoPtr pScrn, Boo
     if(!pSiSUSB->sisfbfound) return;
     if(!pSiSUSB->sisfb_havelock) return;
 
-    if((fd = open(pSiSUSB->sisfbdevname, 'r')) != -1) {
+    if((fd = open(pSiSUSB->sisfbdevname, O_RDONLY)) != -1) {
        parm = lock ? 1 : 0;
        ioctl(fd, SISUSBFB_SET_LOCK, &parm);
        close(fd);
@@ -932,7 +932,7 @@ SISUSBPreInit(ScrnInfoPtr pScrn, int fla
 	     sprintf(name, "/dev/fb/%1d", i-8);
 	  }
 
-          if((fd = open(name, 'r')) != -1) {
+          if((fd = open(name, O_RDONLY)) != -1) {
 
 	     Bool gotit = FALSE;
 


Index: xorg-x11-drv-sisusb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-sisusb/devel/xorg-x11-drv-sisusb.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xorg-x11-drv-sisusb.spec	23 Aug 2007 18:22:08 -0000	1.18
+++ xorg-x11-drv-sisusb.spec	23 Aug 2007 20:31:16 -0000	1.19
@@ -13,6 +13,8 @@
 
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 
+Patch0: sisusb-0.8.1-open-is-not-fopen.patch
+
 ExcludeArch: s390 s390x
 
 BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
@@ -24,6 +26,7 @@
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p1 -b .open-hilarity
 
 %build
 %configure --disable-static
@@ -51,7 +54,9 @@
 
 %changelog
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 0.8.1-8
-- Rebuild for ppc toolchain bug
+- sisusb-0.8.1-open-is-not-fopen.patch: Despite the similarity, you can not
+  pass character literals to open that match the string literals you'd pass
+  to fopen.
 
 * Wed Aug 22 2007 Adam Jackson <ajax at redhat.com> - 0.8.1-7
 - Rebuild for PPC toolchain bug