Unverified Commit 8227d33e authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #336548 from K900/kde-gear-24.08 

KDE Gear 24.08
parents ae815cee 65f5cbb5

maintainers/scripts/kde/collect-missing-deps.py

+6 −0
Original line number Diff line number Diff line
@@ -73,6 +73,9 @@ OK_MISSING_BY_PACKAGE = { 
    "kwin": {

        "display-info",  # newer versions identify as libdisplay-info

    },

    "libksysguard": {

        "Libcap",  # used to call setcap at build time and nothing else

    },

    "mlt": {

        "Qt5",  # intentionally disabled

        "SWIG",
@@ -88,6 +91,9 @@ OK_MISSING_BY_PACKAGE = { 
    "powerdevil": {

        "DDCUtil",  # cursed, intentionally disabled

    },

    "print-manager": {

        "PackageKitQt6",  # used for auto-installing drivers which does not work for obvious reasons

    },

    "pulseaudio-qt": {

        "Qt6Qml",  # tests only

        "Qt6Quick",

pkgs/development/libraries/libvncserver/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -25,6 +25,11 @@ stdenv.mkDerivation rec { 
    sha256 = "sha256-kqVZeCTp+Z6BtB6nzkwmtkJ4wtmjlSQBg05lD02cVvQ=";

  };



  patches = [

    # fix generated pkg-config files

    ./pkgconfig.patch

  ];



  nativeBuildInputs = [

    cmake

  ];

pkgs/development/libraries/libvncserver/pkgconfig.patch

0 → 100644
+28 −0
Original line number Diff line number Diff line 
diff --git a/libvncclient.pc.cmakein b/libvncclient.pc.cmakein

index ceeda39d..2516e643 100644

--- a/libvncclient.pc.cmakein

+++ b/libvncclient.pc.cmakein

@@ -1,7 +1,7 @@

 prefix=@CMAKE_INSTALL_PREFIX@

 exec_prefix=@CMAKE_INSTALL_PREFIX@

-libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@

-includedir=@CMAKE_INSTALL_PREFIX@/include

+libdir=@CMAKE_INSTALL_FULL_LIBDIR@

+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@

 

 Name: LibVNCClient

 Description: A library for easy implementation of a VNC client.

diff --git a/libvncserver.pc.cmakein b/libvncserver.pc.cmakein

index 33ec6685..57244742 100644

--- a/libvncserver.pc.cmakein

+++ b/libvncserver.pc.cmakein

@@ -1,7 +1,7 @@

 prefix=@CMAKE_INSTALL_PREFIX@

 exec_prefix=@CMAKE_INSTALL_PREFIX@

-libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@

-includedir=@CMAKE_INSTALL_PREFIX@/include

+libdir=@CMAKE_INSTALL_FULL_LIBDIR@

+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@

 

 Name: LibVNCServer

 Description: A library for easy implementation of a VNC server.

pkgs/development/tools/misc/astyle/default.nix

+12 −1
Original line number Diff line number Diff line 
{ stdenv, lib, fetchurl, cmake }:

{ stdenv, lib, fetchurl, cmake, asLibrary ? false }:



stdenv.mkDerivation rec {

  pname = "astyle";
@@ -11,6 +11,17 @@ stdenv.mkDerivation rec { 


  nativeBuildInputs = [ cmake ];



  # upstream repo includes a build/ directory

  cmakeBuildDir = "_build";



  cmakeFlags = lib.optional asLibrary [

    "-DBUILD_SHARED_LIBS=ON"

  ];



  postInstall = lib.optionalString asLibrary ''

    install -Dm444 ../src/astyle.h $out/include/astyle.h

  '';



  meta = with lib; {

    description = "Source code indenter, formatter, and beautifier for C, C++, C# and Java";

    mainProgram = "astyle";

pkgs/kde/default.nix

+1 −5
Original line number Diff line number Diff line
@@ -55,13 +55,10 @@ 
      plasma-wayland-protocols = libsForQt5.plasma-wayland-protocols;



      selenium-webdriver-at-spi = null; # Used for integration tests that we don't run, stub

      # Not ported to Qt6 yet

      kdevelop-pg-qt = null;

      okteta = null;

      libmediawiki = null;



      alpaka = self.callPackage ./misc/alpaka {};

      kdiagram = self.callPackage ./misc/kdiagram {};

      kdevelop-pg-qt = self.callPackage ./misc/kdevelop-pg-qt {};

      kdsoap-ws-discovery-client = self.callPackage ./misc/kdsoap-ws-discovery-client {};

      kirigami-addons = self.callPackage ./misc/kirigami-addons {};

      kio-extras-kf5 = self.callPackage ./misc/kio-extras-kf5 {};
@@ -69,7 +66,6 @@ 
      ktextaddons = self.callPackage ./misc/ktextaddons {};

      kunifiedpush = self.callPackage ./misc/kunifiedpush {};

      kup = self.callPackage ./misc/kup {};

      kweathercore = self.callPackage ./misc/kweathercore {};

      marknote = self.callPackage ./misc/marknote {};

      mpvqt = self.callPackage ./misc/mpvqt {};

      oxygen-icons = self.callPackage ./misc/oxygen-icons {};