qremotecontrol-server: 2.4.2 -> unstable-2014-11-05, use Qt5
Qt4 is going to be removed: #174634
This commit is contained in:
parent
969f525683
commit
a102efba92
|
@ -0,0 +1,26 @@
|
|||
From 922d3dd36ac72b29ea21c4c728a922b43b19400e Mon Sep 17 00:00:00 2001
|
||||
From: Francesco Gazzetta <fgaz@fgaz.me>
|
||||
Date: Tue, 14 Jun 2022 17:55:43 +0200
|
||||
Subject: [PATCH] Another Qt5 fix
|
||||
|
||||
---
|
||||
qtsingleapplication/qtlocalpeer.cpp | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/qtsingleapplication/qtlocalpeer.cpp b/qtsingleapplication/qtlocalpeer.cpp
|
||||
index 4a84036..e6ccc72 100644
|
||||
--- a/qtsingleapplication/qtlocalpeer.cpp
|
||||
+++ b/qtsingleapplication/qtlocalpeer.cpp
|
||||
@@ -41,6 +41,9 @@
|
||||
|
||||
#include "qtlocalpeer.h"
|
||||
#include <QCoreApplication>
|
||||
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
|
||||
+#include <QDataStream>
|
||||
+#endif
|
||||
#include <QTime>
|
||||
|
||||
#if defined(Q_OS_WIN)
|
||||
--
|
||||
2.36.0
|
||||
|
|
@ -1,24 +1,35 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchgit
|
||||
, qmake4Hook
|
||||
, qt4
|
||||
, qmake
|
||||
, wrapQtAppsHook
|
||||
, qtbase
|
||||
, xorg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qremotecontrol-server";
|
||||
version = "2.4.2";
|
||||
version = "unstable-2014-11-05"; # basically 2.4.2 + qt5
|
||||
|
||||
# There is no 2.4.2 release tarball, but there is a git tag
|
||||
src = fetchgit {
|
||||
url = "https://git.code.sf.net/p/qrc/gitcode";
|
||||
rev = version;
|
||||
sha256 = "sha256-i3X575SbrWV8kWWHAhXvKl5aSKFZm0VyrJOiL7eYrCo=";
|
||||
rev = "8f1c55eac10ac8af974c3c20157d90ef57f7308a";
|
||||
sha256 = "sha256-AfFScec5/emG/f+yc5Zn37USIEWzGP/sBifE6Kx8d0E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake4Hook ];
|
||||
buildInputs = [ qt4 xorg.libXtst ];
|
||||
patches = [
|
||||
./0001-fix-qt5-build-include-QDataStream.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
xorg.libXtst
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace QRemoteControl-Server.pro \
|
||||
|
@ -29,8 +40,7 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl3;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ fgaz ];
|
||||
homepage = "https://qremote.org/";
|
||||
downloadPage = "https://qremote.org/download.php#Download";
|
||||
homepage = "https://sourceforge.net/projects/qrc/";
|
||||
description = "Remote control your desktop from your mobile";
|
||||
longDescription = ''
|
||||
With QRemoteControl installed on your desktop you can easily control
|
||||
|
@ -46,4 +56,3 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
@ -22962,7 +22962,7 @@ with pkgs;
|
|||
|
||||
qpid-cpp = callPackage ../servers/amqp/qpid-cpp { };
|
||||
|
||||
qremotecontrol-server = callPackage ../servers/misc/qremotecontrol-server { };
|
||||
qremotecontrol-server = libsForQt5.callPackage ../servers/misc/qremotecontrol-server { };
|
||||
|
||||
rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server {
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa;
|
||||
|
|
Loading…
Reference in a new issue