Unverified Commit 7f92b022 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #234384 from dotlambda/mauikit-3.0.0 

libsForQt5.mauiPackages: 2.2.2 -> 3.0.0
parents 3a74e488 0ba12430

pkgs/applications/maui/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ let 
      mauikit-calendar = callPackage ./mauikit-calendar { };

      mauikit-filebrowsing = callPackage ./mauikit-filebrowsing.nix { };

      mauikit-imagetools = callPackage ./mauikit-imagetools.nix { };

      mauikit-terminal = callPackage ./mauikit-terminal.nix { };

      mauikit-texteditor = callPackage ./mauikit-texteditor.nix { };

      mauiman = callPackage ./mauiman.nix { };

pkgs/applications/maui/mauikit-calendar/add-akonadi-calendar.patch

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -89,6 +89,7 @@ set_package_properties(Qt5QuickCompiler PROPERTIES

 find_package(MauiKit)



 find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED)

+find_package(KF5AkonadiCalendar ${AKONADI_VERSION} CONFIG REQUIRED)

 find_package(KF5AkonadiContact ${AKONADI_CONTACT_VERSION} CONFIG REQUIRED)

 find_package(KF5CalendarSupport ${CALENDARSUPPORT_LIB_VERSION} CONFIG REQUIRED)

 find_package(KF5EventViews ${EVENTVIEW_LIB_VERSION} CONFIG REQUIRED)
 
 No newline at end of file

pkgs/applications/maui/mauikit-calendar/default.nix

+0 −2
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ 
mkDerivation {

  pname = "mauikit-calendar";



  patches = [ ./add-akonadi-calendar.patch ];



  nativeBuildInputs = [

    cmake

    extra-cmake-modules

pkgs/applications/maui/mauikit-imagetools.nix

+0 −9
Original line number Diff line number Diff line 
{ lib

, mkDerivation

, fetchpatch

, cmake

, extra-cmake-modules

, kconfig
@@ -17,14 +16,6 @@ 
mkDerivation {

  pname = "mauikit-imagetools";



  patches = [

    (fetchpatch {

      name = "remove-unused-method.patch";

      url = "https://invent.kde.org/maui/mauikit-imagetools/-/commit/344852044d407b144bca01c41a409ceaa548bec0.patch";

      hash = "sha256-Cpq/XzDgrKD8YVex2z9VxGTA+iDI5703+fHwkn0cIWA=";

    })

  ];



  nativeBuildInputs = [

    cmake

    extra-cmake-modules

pkgs/applications/maui/mauikit-terminal.nix

0 → 100644
+32 −0
Original line number Diff line number Diff line 
{ lib

, mkDerivation

, cmake

, extra-cmake-modules

, kconfig

, kcoreaddons

, ki18n

, mauikit

}:



mkDerivation {

  pname = "mauikit-terminal";



  nativeBuildInputs = [

    cmake

    extra-cmake-modules

  ];



  buildInputs = [

    kconfig

    kcoreaddons

    ki18n

    mauikit

  ];



  meta = with lib; {

    homepage = "https://invent.kde.org/maui/mauikit-terminal";

    description = "Terminal support components for Maui applications";

    license = licenses.gpl2Plus;

    maintainers = with maintainers; [ dotlambda ];

  };

}