[pkg-fso-commits] [xf86-video-glamo] 02/11: Drop patch 01-fix-unused-warning.patch

[Gilles Filippini]

This is an automated email from the git hooks/post-receive script.

pini pushed a commit to branch debian
in repository xf86-video-glamo.

commit 587477d86619f3bb73e9d12d02a4ff228d60ddf5
Author: Gilles Filippini <pini at debian.org>
Date:   Sat Jun 4 23:07:40 2011 +0200

    Drop patch 01-fix-unused-warning.patch
    
    Which created useless 'unused' variables, leading to FTBFS with
    gcc > 4.6 (closes: #625436)
---
 debian/patches/01-fix-unused-warning.patch |   56 ----------------------------
 debian/patches/series                      |    1 -
 2 files changed, 57 deletions(-)

diff --git a/debian/patches/01-fix-unused-warning.patch b/debian/patches/01-fix-unused-warning.patch
deleted file mode 100644
index fa1ec6d..0000000
--- a/debian/patches/01-fix-unused-warning.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Index: xf86-video-glamo-0.0.0+20090707.git98c012f7/src/glamo-driver.c
-===================================================================
---- xf86-video-glamo-0.0.0+20090707.git98c012f7.orig/src/glamo-driver.c	2010-01-01 01:42:25.000000000 -0500
-+++ xf86-video-glamo-0.0.0+20090707.git98c012f7/src/glamo-driver.c	2010-01-01 01:46:09.000000000 -0500
-@@ -688,11 +688,11 @@
-     volatile char *mmio = pGlamo->reg_base;
- #endif
- #if JBT6K74_SET_STATE
--    int fd;
-+    int fd, unused;
- 
-     fd = open(pGlamo->jbt6k74_state_path, O_RDONLY);
-     if (fd != -1) {
--       read(fd, pGlamo->saved_jbt6k74_state, 14);
-+        unused = read(fd, pGlamo->saved_jbt6k74_state, 14);
-         close(fd);
-     } else {
-         xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-@@ -723,7 +723,7 @@
-     volatile char *mmio = pGlamo->reg_base;
- #endif
- #ifdef JBT6K74_SET_STATE
--    int fd;
-+    int fd, unused;
- #endif
- 
-     if (ioctl(pGlamo->fb_fd, FBIOPUT_VSCREENINFO, (void*)(&pGlamo->fb_saved_var)) == -1) {
-@@ -749,7 +749,7 @@
- #ifdef JBT6K74_SET_STATE
-     fd = open(pGlamo->jbt6k74_state_path, O_WRONLY);
-     if (fd != -1) {
--        write(fd, pGlamo->saved_jbt6k74_state, 14);
-+        unused = write(fd, pGlamo->saved_jbt6k74_state, 14);
-         close(fd);
-     } else {
-         xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-Index: xf86-video-glamo-0.0.0+20090707.git98c012f7/src/glamo-output.c
-===================================================================
---- xf86-video-glamo-0.0.0+20090707.git98c012f7.orig/src/glamo-output.c	2010-01-01 01:46:14.000000000 -0500
-+++ xf86-video-glamo-0.0.0+20090707.git98c012f7/src/glamo-output.c	2010-01-01 01:46:50.000000000 -0500
-@@ -244,12 +244,12 @@
- GlamoOutputCommit(xf86OutputPtr output) {
- #ifdef JBT6K74_SET_STATE
-     GlamoPtr pGlamo = GlamoPTR(output->scrn);
--    int fd = open(pGlamo->jbt6k74_state_path, O_WRONLY);
-+    int fd = open(pGlamo->jbt6k74_state_path, O_WRONLY), unused;
-     if (fd != -1) {
-         if(output->crtc->mode.HDisplay == 240 && output->crtc->mode.VDisplay == 320)
--            write(fd, jbt6k74_state_qvga, sizeof(jbt6k74_state_qvga));
-+            unused = write(fd, jbt6k74_state_qvga, sizeof(jbt6k74_state_qvga));
-         else
--            write(fd, jbt6k74_state_vga, sizeof(jbt6k74_state_vga));
-+            unused = write(fd, jbt6k74_state_vga, sizeof(jbt6k74_state_vga));
-         close(fd);
-     } else {
-         xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
diff --git a/debian/patches/series b/debian/patches/series
index 234b2db..1e1f189 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-01-fix-unused-warning.patch
 03-force-kms-off-v2.patch

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-fso/xf86-video-glamo.git