Unverified Commit c1535463 authored by Rick van Schijndel's avatar Rick van Schijndel Committed by GitHub
Browse files

Merge pull request #328481 from OPNA2608/update/libqofono 

libsForQt5.libqofono: 0.103 -> 0.123
parents 05c5a73f fb12dde0

pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix

+14 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
, lib

, fetchFromGitLab

, fetchpatch

, fetchpatch2

, gitUpdater

, testers

, accountsservice
@@ -80,6 +81,12 @@ stdenv.mkDerivation (finalAttrs: { 
      url = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/commit/67d9e28ebab8bdb9473d5bf8da2b7573e6848fa2.patch";

      hash = "sha256-pFWNne2UH3R5Fz9ayHvIpDXDQbXPs0k4b/oRg0fzi+s=";

    })



    (fetchpatch2 {

      name = "0004-lomiri-system-settings-QOfono-namespace-change.patch";

      url = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/commit/c0b5b007d77993fabdd95be5ccbbba5151f0f165.patch";

      hash = "sha256-HB7qdlbY0AVG6X3hL3IHf0Z7rm1G0wfdqo5MXtY7bfE=";

    })

  ] ++ [



    ./2000-Support-wrapping-for-Nixpkgs.patch
@@ -94,6 +101,13 @@ stdenv.mkDerivation (finalAttrs: { 
  ];



  postPatch = ''

    # Part of 0004-lomiri-system-settings-QOfono-namespace-change.patch, fetchpatch2 cannot handle rename-only changes

    for unmovedThing in tests/mocks/MeeGo/QOfono/*; do

      mv "$unmovedThing" "tests/mocks/QOfono/$(basename "$unmovedThing")"

    done

    rmdir tests/mocks/MeeGo/QOfono

    rmdir tests/mocks/MeeGo



    substituteInPlace CMakeLists.txt \

      --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" \

pkgs/desktops/lomiri/applications/lomiri-system-settings/plugins/lomiri-system-settings-security-privacy.nix

+4 −0
Original line number Diff line number Diff line
@@ -33,6 +33,10 @@ stdenv.mkDerivation (finalAttrs: { 
      substituteInPlace CMakeLists.txt \

        --replace-fail "pkg_get_variable($pcvarname LomiriSystemSettings $pcvar)" "set($pcvarname $(pkg-config LomiriSystemSettings --define-variable=prefix=$out --define-variable=libdir=$out/lib --variable=$pcvar))"

    done



    # Compatibility with newer libqofono

    substituteInPlace plugins/security-privacy/{Ofono,PageComponent,SimPin}.qml \

      --replace-fail 'import MeeGo.QOfono' 'import QOfono'

  '';



  strictDeps = true;

pkgs/desktops/lomiri/applications/lomiri/default.nix

+15 −0
Original line number Diff line number Diff line
@@ -116,6 +116,14 @@ stdenv.mkDerivation (finalAttrs: { 
      hash = "sha256-guq/Ykcq4WcuXxNKO1eA4sJFyGSpZo0gtyFTdeK/GeE=";

    })



    # fetchpatch2 for renames

    # Remove when version > 0.2.1

    (fetchpatch2 {

      name = "1010-lomiri-QOfono-namespace.patch";

      url = "https://gitlab.com/ubports/development/core/lomiri/-/commit/d0397dadb5f05097f916c5b39e6d9b95d4ab9e4d.patch";

      hash = "sha256-wIkHlz2vYxF9eeH/sYYEdD9f8m4ylHEXXnX/DFG3HXg=";

    })



    ./9901-lomiri-Disable-Wizard.patch

    ./9902-lomiri-Check-NIXOS_XKB_LAYOUTS.patch

  ];
@@ -126,6 +134,13 @@ stdenv.mkDerivation (finalAttrs: { 
      --replace-fail '@CMAKE_INSTALL_FULL_BINDIR@/lomiri-greeter-wrapper @CMAKE_INSTALL_FULL_BINDIR@/lomiri --mode=greeter' '@CMAKE_INSTALL_FULL_BINDIR@/lomiri --mode=greeter' \

      --replace-fail 'X-LightDM-Session-Type=mir' 'X-LightDM-Session-Type=wayland'



    # Part of QOfono namespace patch, fetchpatch2 cannot handle rename-only changes

    for unmovedThing in tests/mocks/MeeGo/QOfono/*; do

      mv "$unmovedThing" "tests/mocks/QOfono/$(basename "$unmovedThing")"

    done

    rmdir tests/mocks/MeeGo/QOfono

    rmdir tests/mocks/MeeGo



    # Need to replace prefix

    substituteInPlace data/systemd-user/CMakeLists.txt \

      --replace-fail 'pkg_get_variable(SYSTEMD_USERUNITDIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USERUNITDIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})'

pkgs/development/libraries/libqofono/default.nix

+8 −6
Original line number Diff line number Diff line 
{ lib

, substituteAll

, mkDerivation

, fetchFromGitLab

, fetchFromGitHub

, gitUpdater

, mobile-broadband-provider-info

, qmake

, qtbase
@@ -10,14 +11,13 @@ 


mkDerivation rec {

  pname = "libqofono";

  version = "0.103";

  version = "0.123";



  src = fetchFromGitLab {

    domain = "git.sailfishos.org";

    owner = "mer-core";

  src = fetchFromGitHub {

    owner = "sailfishos";

    repo = "libqofono";

    rev = version;

    sha256 = "1ly5aj412ljcjvhqyry6nhiglbzzhczsy1a6w4i4fja60b2m1z45";

    hash = "sha256-Ml86wHejSDyR2ibamuzg14GZ5S7zHBgPC9K5G+sgtC0=";

  };



  patches = [
@@ -48,6 +48,8 @@ mkDerivation rec { 
    qtdeclarative

  ];



  passthru.updateScript = gitUpdater { };



  meta = with lib; {

    description = "Library for accessing the ofono daemon, and declarative plugin for it";

    homepage = "https://git.sailfishos.org/mer-core/libqofono/";