Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 4df09b00cd3a
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: c2846eeac5fb
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Feb 19, 2020

  1. aseprite: fix build with glibc 2.30 

    Otherwise it fails with:

In file included from /build/source/src/allegro/include/allegro/base.h:41,
                 from /build/source/src/allegro/include/allegro.h:25,
                 from /build/source/src/./she/alleg4/alleg_surface.h:11,
                 from /build/source/src/she/alleg4/alleg_surface.cpp:11:
/build/source/src/allegro/include/allegro/alcompat.h:44:22: error: conflicting declaration of C function 'fixed fadd(fixed, fixed)'
   44 |       AL_ALIAS(fixed fadd(fixed x, fixed y), fixadd(x, y))
      |                      ^~~~
/build/source/src/allegro/include/allegro/internal/alconfig.h:164:49: note: in definition of macro 'AL_ALIAS'
  164 |       static __attribute__((unused)) __inline__ DECL    \
      |                                                 ^~~~
In file included from /nix/store/y57skwl8a5vbkrjrc30ygdw9vr1p6n19-gcc-9.2.0/include/c++/9.2.0/cmath:45,
                 from /nix/store/y57skwl8a5vbkrjrc30ygdw9vr1p6n19-gcc-9.2.0/include/c++/9.2.0/math.h:36,
                 from /build/source/src/./base/base.h:13,
                 from /build/source/src/./config.h:40,
                 from /build/source/src/she/alleg4/alleg_surface.cpp:8:
/nix/store/2v6pi2wj3lcsc3j48n7flx9mgqyii1lv-glibc-2.30-dev/include/bits/mathcalls-narrow.h:24:20: note: previous declaration 'float fadd(double, double)'
   24 | __MATHCALL_NARROW (__MATHCALL_NAME (add), __MATHCALL_REDIR_NAME (add), 2);
      |                    ^~~~~~~~~~~~~~~

(cherry picked from commit 0ded378)
    @orivej
    orivej committed Feb 19, 2020
    Copy the full SHA
    929e0f0 View commit details
    Browse the repository at this point in the history

  2. aseprite-unfree: fix build 

    It fails with:

src/gpu/gl/glx/GrGLMakeNativeInterface_glx.cpp:15:10: fatal error: GL/glx.h: No such file or directory
   15 | #include <GL/glx.h>

(cherry picked from commit 3ad2c20)
    @orivej
    orivej committed Feb 19, 2020
    Copy the full SHA
    dccfb8c View commit details
    Browse the repository at this point in the history

  3. aseprite-unfree: 1.2.11 -> 1.2.16.3 

    Restore the comment explaining the split between free and unfree versions
deleted in caa4e6d.

(cherry picked from commit 43ee809)
    @orivej
    orivej committed Feb 19, 2020
    Copy the full SHA
    c2846ee View commit details
    Browse the repository at this point in the history