Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
base: de71ea2b3113
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 24842ace4cb8
Choose a head ref
  • 5 commits
  • 3 files changed
  • 3 contributors

Commits on Sep 10, 2019

  1. ibus-engines.mozc: fix build

    This fixes:
    
    FAILED: obj/engine/engine.engine.o
    clang++ -MMD -MF obj/engine/engine.engine.o.d -DOS_LINUX -DMOZC_BUILD -DCHANNEL_DEV -DENABLE_GTK_RENDERER -DNDEBUG -DQT_NO_DEBUG -DNO_LOGGING -DIGNORE_HELP_FLAG -DIGNORE_INVALID_FLAG -I/build/source/src -Igen -Igen/proto_out -Wall -Wno-char-subscripts -Wno-sign-compare -Wno-deprecated-declarations -Wwrite-strings -Wno-unknown-warning-option -Wno-inconsistent-missing-override -fPIC -fno-exceptions -fmessage-length=0 -fno-strict-aliasing -funsigned-char -pipe -pthread -fno-omit-frame-pointer -fstack-protector --param=ssp-buffer-size=4 -Wtype-limits -O2 -Wno-deprecated -Wno-covered-switch-default -Wno-unnamed-type-template-args -Wno-c++11-narrowing -std=gnu++0x -std=gnu++0x  -c ../../engine/engine.cc -o obj/engine/engine.engine.o
    In file included from ../../engine/engine.cc:30:
    In file included from /build/source/src/engine/engine.h:33:
    In file included from /nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/memory:62:
    In file included from /nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/bits/stl_algobase.h:66:
    /nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/bits/stl_iterator_base_funcs.h:183:2: error: cannot decrement value of type 'mozc::ZeroQueryDict::iterator'
            --__i;
            ^ ~~~
    /nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/bits/stl_iterator_base_funcs.h:206:12: note: in instantiation of function template specialization 'std::__advance<mozc::ZeroQueryDict::iterator, long>' requested here
          std::__advance(__i, __d, std::__iterator_category(__i));
               ^
    /nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/bits/stl_algo.h:2137:9: note: in instantiation of function template specialization 'std::advance<mozc::ZeroQueryDict::iterator, long>' requested here
              std::advance(__middle, __half);
                   ^
    /nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/bits/stl_algo.h:2190:19: note: in instantiation of function template specialization 'std::__equal_range<mozc::ZeroQueryDict::iterator, unsigned long, __gnu_cxx::__ops::_Iter_less_val, __gnu_cxx::__ops::_Val_less_iter>' requested here
          return std::__equal_range(__first, __last, __val,
                      ^
    /build/source/src/prediction/zero_query_dict.h:213:17: note: in instantiation of function template specialization 'std::equal_range<mozc::ZeroQueryDict::iterator, unsigned long>' requested here
        return std::equal_range(begin(), end(), iter.index());
                    ^
    1 error generated.
    
    (cherry picked from commit b4b332b)
    ivan committed Sep 10, 2019
    Copy the full SHA
    e48a396 View commit details
    Browse the repository at this point in the history
  2. qolibri: 2018-11-14 -> 2019-07-22

    (cherry picked from commit 153127f)
    ivan authored and worldofpeace committed Sep 10, 2019
    Copy the full SHA
    7916216 View commit details
    Browse the repository at this point in the history
  3. qolibri: use qt5's mkDerivation

    (cherry picked from commit 939960b)
    ivan authored and worldofpeace committed Sep 10, 2019
    Copy the full SHA
    4a7cf94 View commit details
    Browse the repository at this point in the history
  4. qtwebkit: fixing build / reducing build log size

    GCC 8 introduced a new type of warning `-Wclass-memaccess` which
    is included in `-Wall`. This warnings spits out *a million* of warnings
    like the following:
    
    ```
    [...]
    /build/source/Source/WTF/wtf/Vector.h:128:15: warning: 'void* memcpy(void*, const void*, size_t)' writing to an object of type 'class WTF::RefPtr<WebCore::TransformOperation>' with no trivial copy-assignment; use copy-assignment or copy-initialization instead [-Wclass-memaccess]
             memcpy(dst, src, reinterpret_cast<const char*>(srcEnd) - reinterpret_cast<const char*>(src));
    [...]
    ``
    
    Logs demonstrating the issue:
    https://hydra.nixos.org/build/100205478/nixlog/1
    
    While I don't think disabling warnings is the best way to deal with this,
    there is alrady precedent for this package and I don't feel confident enough
    to either patch or bump this package.
    
    Please view this as a low-friction sub-optimal suggestion in case nobody else
    has a better fix.
    
    (cherry picked from commit 6f1ad06)
    d-goldin authored and worldofpeace committed Sep 10, 2019
    Copy the full SHA
    f7e746a View commit details
    Browse the repository at this point in the history
  5. Merge pull request #68445 from ivan/mozc-gcc8-fix-backport

    [19.09] ibus-engines.mozc: fix build
    worldofpeace committed Sep 10, 2019
    Copy the full SHA
    24842ac View commit details
    Browse the repository at this point in the history