mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 00:43:20 +00:00
571c71e6f7
We are migrating packages that meet below requirements:
1. using `callPackage`
2. called path is a directory
3. overriding set is empty (`{ }`)
4. not containing path expressions other than relative path (to
makenixpkgs-vet happy)
5. not referenced by nix files outside of the directory, other
than`pkgs/top-level/all-packages.nix`
6. not referencing nix files outside of the directory
7. not referencing `default.nix` (since it's changed to `package.nix`)
8. `outPath` doesn't change after migration
The tool is here: https://github.com/Aleksanaa/by-name-migrate.
32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
Description: Fix build with gcc-5
|
|
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=778003
|
|
Author: Jaromír Mikeš <mira.mikes@seznam.cz>
|
|
Forwarded: No
|
|
|
|
Index: meterbridge/src/linedraw.h
|
|
===================================================================
|
|
--- meterbridge.orig/src/linedraw.h
|
|
+++ meterbridge/src/linedraw.h
|
|
@@ -1,7 +1,7 @@
|
|
#ifndef LINEDRAW_H
|
|
#define LINEDRAW_H
|
|
|
|
-inline void set_rgba(SDL_Surface *surface, Uint32 x, Uint32 y, Uint32 col);
|
|
+void set_rgba(SDL_Surface *surface, Uint32 x, Uint32 y, Uint32 col);
|
|
|
|
void draw_ptr(SDL_Surface *surface, int x1, int y1, int x2, int y2, Uint32 nedle_col, Uint32 aa_col);
|
|
|
|
Index: meterbridge/src/linedraw.c
|
|
===================================================================
|
|
--- meterbridge.orig/src/linedraw.c
|
|
+++ meterbridge/src/linedraw.c
|
|
@@ -4,7 +4,7 @@
|
|
/* set a pixel on an SDL_Surface, assumes that the surface is 32bit RGBA,
|
|
* ordered ABGR (I think), probably wont work on bigendian systems */
|
|
|
|
-inline void set_rgba(SDL_Surface *surface, Uint32 x, Uint32 y, Uint32 col)
|
|
+void set_rgba(SDL_Surface *surface, Uint32 x, Uint32 y, Uint32 col)
|
|
{
|
|
Uint32 *bufp = (Uint32 *)surface->pixels + y*surface->pitch/4 + x;
|
|
*bufp = col;
|