Unverified Commit 7d32565c authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

dbus-cpp: 5.0.3 -> 5.0.4 (#394891)

parents 9058a594 20dad149

pkgs/by-name/db/dbus-cpp/package.nix

+19 −34
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
  stdenv,

  lib,

  fetchFromGitLab,

  fetchpatch,

  gitUpdater,

  testers,

  boost186,
@@ -20,13 +19,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "dbus-cpp";

  version = "5.0.3";

  version = "5.0.4";



  src = fetchFromGitLab {

    owner = "ubports";

    repo = "development/core/lib-cpp/dbus-cpp";

    rev = finalAttrs.version;

    hash = "sha256-t8SzPRUuKeEchT8vAsITf8MwbgHA+mR5C9CnkdVyX7s=";

    tag = finalAttrs.version;

    hash = "sha256-ki4bnwRpvmB9yzt/Mn3MQs1Dr6Vrcs2D0tvCjvvfmq4=";

  };



  outputs = [
@@ -36,39 +35,22 @@ stdenv.mkDerivation (finalAttrs: { 
    "examples"

  ];



  patches = [

    # Handle already-stolen dbus call better

    # Remove when version > 5.0.3

    (fetchpatch {

      name = "0001-dbus-cpp-src-Dont-steal-a-pending-dbus-call-more-then-once.patch";

      url = "https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/commit/9f3d1ff2b1c6c732285949c3dbb35e40cf55ea92.patch";

      hash = "sha256-xzOCIJVsK2J+X9RsV930R9uw6h4UxqwSaNOgv8v4qQU=";

    })



    # Fix GCC13 compilation

    # Remove when version > 5.0.3

    (fetchpatch {

      name = "0002-dbus-cpp-Add-missing-headers-for-GCC13.patch";

      url = "https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/commit/c761b1eec084962dbe64d35d7f7b86dcbe57a3f7.patch";

      hash = "sha256-/tKe3iHWxP9jWtpdgwwRynj8565u9LxCt4WXJDXzgX4=";

    })

  ];



  postPatch =

    ''

      substituteInPlace doc/CMakeLists.txt \

        --replace 'DESTINATION share/''${CMAKE_PROJECT_NAME}/doc' 'DESTINATION ''${CMAKE_INSTALL_DOCDIR}'

        --replace-fail 'DESTINATION share/''${CMAKE_PROJECT_NAME}/doc' 'DESTINATION ''${CMAKE_INSTALL_DOCDIR}'



      # Warning on aarch64-linux breaks build due to -Werror

      substituteInPlace CMakeLists.txt \

        --replace '-Werror' ""

        --replace-fail '-Werror' ""



      # pkg-config output patching hook expects prefix variable here

      substituteInPlace data/dbus-cpp.pc.in \

        --replace 'includedir=''${exec_prefix}' 'includedir=''${prefix}'

        --replace-fail 'includedir=''${exec_prefix}' 'includedir=''${prefix}'

    ''

    + lib.optionalString (!finalAttrs.finalPackage.doCheck) ''

      sed -i -e '/add_subdirectory(tests)/d' CMakeLists.txt

      substituteInPlace CMakeLists.txt \

        --replace-fail 'add_subdirectory(tests)' '# add_subdirectory(tests)'

    '';



  strictDeps = true;
@@ -98,11 +80,10 @@ stdenv.mkDerivation (finalAttrs: { 
  ];



  cmakeFlags = [

    "-DDBUS_CPP_ENABLE_DOC_GENERATION=ON"

    (lib.cmakeBool "DBUS_CPP_ENABLE_DOC_GENERATION" true)

  ];



  # Too flaky on ARM CI & for some amd64 users

  doCheck = false;

  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;



  # DBus, parallelism messes with communication

  enableParallelChecking = false;
@@ -112,17 +93,21 @@ stdenv.mkDerivation (finalAttrs: { 
  '';



  passthru = {

    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

    tests.pkg-config = testers.hasPkgConfigModules {

      package = finalAttrs.finalPackage;

      versionCheck = true;

    };

    updateScript = gitUpdater { };

  };



  meta = with lib; {

  meta = {

    description = "Dbus-binding leveraging C++-11";

    homepage = "https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp";

    license = licenses.lgpl3Only;

    maintainers = with maintainers; [ OPNA2608 ];

    changelog = "https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/blob/${finalAttrs.version}/ChangeLog";

    license = lib.licenses.lgpl3Only;

    maintainers = with lib.maintainers; [ OPNA2608 ];

    mainProgram = "dbus-cppc";

    platforms = platforms.linux;

    platforms = lib.platforms.linux;

    pkgConfigModules = [

      "dbus-cpp"

    ];