Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/eterm/patches/eterm-0.9.6-imlib2-1.12.patch

    Annotation of /trunk/eterm/patches/eterm-0.9.6-imlib2-1.12.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 3769 - (hide annotations) (download)
    Fri Sep 1 08:01:19 2023 UTC (8 months, 3 weeks ago) by niro
    File size: 2114 byte(s) 
    -fix ftbfs with imlib2-1.12
    1 niro 3769 Description: Fix for imlib2 update as imlib_strerror() has been introduced to imlib2, so changing source files afected.
    2     Origin: http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/x11/eterm/patches/patch-src_pixmap.c?r1=1.1
    3     Last-Update: 2023-03-10
    4     ---
    5     This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
    6     --- a/src/pixmap.c
    7     +++ b/src/pixmap.c
    8     @@ -172,7 +172,7 @@
    9    
    10     #ifdef PIXMAP_SUPPORT
    11     const char *
    12     -imlib_strerror(Imlib_Load_Error err)
    13     +eterm_imlib_strerror(Imlib_Load_Error err)
    14     {
    15     switch (err) {
    16     case IMLIB_LOAD_ERROR_NONE:
    17     @@ -1447,7 +1447,7 @@
    18     if (f) {
    19     im = imlib_load_image_with_error_return(f, &im_err);
    20     if (!im) {
    21     - libast_print_error("Unable to load image file \"%s\" -- %s\n", file, imlib_strerror(im_err));
    22     + libast_print_error("Unable to load image file \"%s\" -- %s\n", file, eterm_imlib_strerror(im_err));
    23     return 0;
    24     } else {
    25     reset_simage(simg, (RESET_IMLIB_IM | RESET_PMAP_PIXMAP | RESET_PMAP_MASK));
    26     @@ -2178,7 +2178,7 @@
    27    
    28     temp_im = imlib_load_image_with_error_return(icon_path, &im_err);
    29     if (!temp_im) {
    30     - libast_print_error("Unable to load icon file \"%s\" -- %s\n", icon_path, imlib_strerror(im_err));
    31     + libast_print_error("Unable to load icon file \"%s\" -- %s\n", icon_path, eterm_imlib_strerror(im_err));
    32     } else {
    33     /* If we're going to render the image anyway, might as well be nice and give it to the WM in a size it likes. */
    34     if (XGetIconSizes(Xdisplay, Xroot, &icon_sizes, &count)) {
    35     --- a/src/pixmap.h
    36     +++ b/src/pixmap.h
    37     @@ -221,7 +221,7 @@
    38     extern const char *get_image_type(unsigned char);
    39     extern unsigned char image_mode_any(unsigned char);
    40     #ifdef PIXMAP_SUPPORT
    41     -extern const char *imlib_strerror(Imlib_Load_Error);
    42     +extern const char *eterm_imlib_strerror(Imlib_Load_Error);
    43     extern unsigned short parse_pixmap_ops(char *);
    44     extern unsigned short set_pixmap_scale(const char *, pixmap_t *);
    45     extern unsigned char check_image_ipc(unsigned char);