Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/xscreensaver/patches/xscreensaver-5.42-fontglide-forbit-c-style-comment-ftbfs.patch

    Annotation of /trunk/xscreensaver/patches/xscreensaver-5.42-fontglide-forbit-c-style-comment-ftbfs.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 3275 - (hide annotations) (download)
    Sun Jan 6 12:22:14 2019 UTC (5 years, 3 months ago) by niro
    File size: 1162 byte(s) 
    -fix a ftbfs
    1 niro 3275 From e491478965fc9005362e44ba62c6b167d4d1b4b2 Mon Sep 17 00:00:00 2001
    2     From: XScreenSaver owners <xscreensaver-owner@fedoraproject.org>
    3     Date: Sun, 30 Dec 2018 14:45:54 +0900
    4     Subject: [PATCH] fontglide.c: forbit C++ style comment
    5    
    6     ../../hacks/fontglide.c: In function 'fontglide_free':
    7     ../../hacks/fontglide.c:2424:1: error: C++ style comments are not allowed in ISO C90
    8     // if (s->b && s->b != s->window) XFreePixmap (dpy, s->b);
    9    
    10     Change comments with C style
    11     ---
    12     hacks/fontglide.c | 6 ++++--
    13     1 file changed, 4 insertions(+), 2 deletions(-)
    14    
    15     diff --git a/hacks/fontglide.c b/hacks/fontglide.c
    16     index df8f498..6c33d1a 100644
    17     --- a/hacks/fontglide.c
    18     +++ b/hacks/fontglide.c
    19     @@ -2421,8 +2421,10 @@ fontglide_free (Display *dpy, Window window, void *closure)
    20    
    21     textclient_close (s->tc);
    22    
    23     -// if (s->b && s->b != s->window) XFreePixmap (dpy, s->b);
    24     -// if (s->ba && s->ba != s->b) XFreePixmap (dpy, s->ba);
    25     +/*
    26     + if (s->b && s->b != s->window) XFreePixmap (dpy, s->b);
    27     + if (s->ba && s->ba != s->b) XFreePixmap (dpy, s->ba);
    28     +*/
    29     XFreeGC (dpy, s->bg_gc);
    30     if (s->charset) free (s->charset);
    31     if (s->font_override) free (s->font_override);
    32     --
    33     2.20.1
    34