Origin: $NetBSD: patch-src_libimage_gif.c,v 1.4 2019/11/16 17:36:28 ng0 Exp $ Modified by: R Veera Kumar 2020-03-28; change to patch -p1 diff -uNr xplanet-1.3.1/src/libimage/gif.c xplanet-1.3.1.new/src/libimage/gif.c --- xplanet-1.3.1/src/libimage/gif.c 2013-02-17 01:07:47.000000000 +0530 +++ xplanet-1.3.1.new/src/libimage/gif.c 2020-03-28 22:15:24.444309199 +0530 @@ -21,7 +21,7 @@ #include #include #include - +#include #include /* @@ -178,8 +178,12 @@ *BufferP++ = ColorMapEntry->Blue; } } - + +#if GIFLIB_MAJOR >= 5 + if (DGifCloseFile(GifFile, NULL) == GIF_ERROR) { +#else if (DGifCloseFile(GifFile) == GIF_ERROR) { +#endif return(0); } @@ -493,7 +497,11 @@ static void QuitGifError(GifFileType *GifFile) { fprintf(stderr, "Error writing GIF file\n"); +#if GIFLIB_MAJOR >= 5 + if (GifFile != NULL) EGifCloseFile(GifFile, NULL); +#else if (GifFile != NULL) EGifCloseFile(GifFile); +#endif } int @@ -589,7 +597,11 @@ Ptr += width; } +#if GIFLIB_MAJOR >= 5 + if (EGifCloseFile(GifFile, NULL) == GIF_ERROR) +#else if (EGifCloseFile(GifFile) == GIF_ERROR) +#endif { QuitGifError(GifFile); er/connman.scm?id=bc4f219ba472559b5d54e9262589fd9a83b4edaf'>treecommitdiff
AgeCommit message (Expand)Author
2020-09-21installer: Fix docstring typoes....* gnu/installer/connman.scm (connman-state, run-locale-page) (start-swapping, stop-swapping, run-installer-steps): Fix typo in docstring. Tobias Geerinckx-Rice
2020-04-19installer: connman: Fix Wifi connection....Issue reported by SergioBG here: https://lists.gnu.org/archive/html/bug-guix/2020-04/msg00432.html. Due to default buffering mode, the installer was reading from the pipe without having actually written a command before. * gnu/installer/connman.scm (connman-connect-with-auth): Set pipe buffering mode to 'line. Mathieu Othacehe
2019-05-29installer: Fix wifi menu crash with hidden SSIDs....This fixes https://issues.guix.gnu.org/issue/35622. * gnu/installer/connman.scm (<service>): Mention that name may be false. * gnu/installer/newt/wifi.scm (wifi-services): Filter out wifi services without name. Co-authored by: Pierre Neidhardt <mail@ambrevar.xyz> Mathieu Othacehe
2019-02-18gnu: Fix some typos in the installer....* gnu/installer/connman.scm (connman-connect-with-auth): Fix typo in documentation. * gnu/installer/newt/keymap.scm (sort-variants): Likewise. * gnu/installer/newt/page.scm (run-listbox-selection-page): Likewise. * gnu/installer/parted.scm (mkpart): Likewise. * gnu/installer/newt/utils.scm (destroy-form-and-pop): Likewise. * gnu/installer/newt/wifi.scm (run-unknown-error-page): Fix typo. (wifi-listbox-heigth): Rename to… (wifi-listbox-height): …this, and adjust caller. * gnu/installer/timezone.scm (locate-childrens): Rename to… (locate-children): …this. Adjust all callers. Tobias Geerinckx-Rice
2019-01-17gnu: Add graphical installer support....* configure.ac: Require that guile-newt is available. * gnu/installer.scm: New file. * gnu/installer/aux-files/logo.txt: New file. * gnu/installer/build-installer.scm: New file. * gnu/installer/connman.scm: New file. * gnu/installer/keymap.scm: New file. * gnu/installer/locale.scm: New file. * gnu/installer/newt.scm: New file. * gnu/installer/newt/ethernet.scm: New file. * gnu/installer/newt/hostname.scm: New file. * gnu/installer/newt/keymap.scm: New file. * gnu/installer/newt/locale.scm: New file. * gnu/installer/newt/menu.scm: New file. * gnu/installer/newt/network.scm: New file. * gnu/installer/newt/page.scm: New file. * gnu/installer/newt/timezone.scm: New file. * gnu/installer/newt/user.scm: New file. * gnu/installer/newt/utils.scm: New file. * gnu/installer/newt/welcome.scm: New file. * gnu/installer/newt/wifi.scm: New file. * gnu/installer/steps.scm: New file. * gnu/installer/timezone.scm: New file. * gnu/installer/utils.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add previous files. * gnu/system.scm: Export %root-account. * gnu/system/install.scm (%installation-services): Use kmscon instead of linux VT for all tty. (installation-os)[users]: Add the graphical installer as shell of the root account. [packages]: Add font related packages. * po/guix/POTFILES.in: Add installer files. Mathieu Othacehe