ofono-phonesim: init at unstable-2014-04-22

This commit is contained in:
Jan Tojnar 2019-08-23 20:30:28 +02:00
parent 5db762126c
commit 877dc46d24
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
3 changed files with 97 additions and 0 deletions

View File

@ -0,0 +1,47 @@
{ stdenv
, mkDerivation
, fetchFromGitHub
, autoreconfHook
, pkgconfig
, qtbase
, qtscript
}:
mkDerivation rec {
pname = "ofono-phonesim";
version = "unstable-2014-04-22";
src = fetchFromGitHub {
owner = "jpakkane";
repo = "ofono-phonesim";
rev = "baa41f04e6a86c5289d7185cad8a6f08a5c3ed0a";
sha256 = "0ywalvvf3dfbn81ml21gji1n2hywh2nmakynakjzyyskcqjn2wiz";
};
patches = [
./qt5-compat.patch
];
nativeBuildInputs = [
autoreconfHook
pkgconfig
];
buildInputs = [
qtbase
qtscript
];
makeFlags = [
"MOC=${qtbase.dev}/bin/moc"
"UIC=${qtbase.dev}/bin/uic"
];
meta = with stdenv.lib; {
description = "Phone Simulator for modem testing";
homepage = https://github.com/jpakkane/ofono-phonesim;
license = licenses.gpl2;
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.linux;
};
}

View File

@ -0,0 +1,48 @@
diff --git a/configure.ac b/configure.ac
index 2436292..993df87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,18 +21,18 @@ AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization],
fi
])
-PKG_CHECK_MODULES(QT, QtCore QtGui QtXml QtNetwork QtScript QtDBus, dummy=yes,
+PKG_CHECK_MODULES(QT, Qt5Core Qt5Gui Qt5Widgets Qt5Xml Qt5Network Qt5Script Qt5DBus, dummy=yes,
AC_MSG_ERROR(Qt is required))
AC_SUBST(QT_CFLAGS)
AC_SUBST(QT_LIBS)
AC_MSG_CHECKING(for moc)
-MOC="`$PKG_CONFIG --variable=moc_location QtCore`"
+MOC="`$PKG_CONFIG --variable=moc_location Qt5Core`"
AC_SUBST(MOC)
AC_MSG_RESULT($MOC)
AC_MSG_CHECKING(for uic)
-UIC="`$PKG_CONFIG --variable=uic_location QtCore`"
+UIC="`$PKG_CONFIG --variable=uic_location Qt5Core`"
AC_SUBST(UIC)
AC_MSG_RESULT($UIC)
diff --git a/src/control.cpp b/src/control.cpp
index e1838a6..880da68 100644
--- a/src/control.cpp
+++ b/src/control.cpp
@@ -22,7 +22,7 @@
#include <qslider.h>
#include <qcheckbox.h>
#include <qcombobox.h>
-#include <QtGui/qmessagebox.h>
+#include <QMessageBox>
#include <qfiledialog.h>
#include <Qt>
#include <qbuffer.h>
@@ -31,7 +31,7 @@
#include <QFileInfo>
#include <QFile>
#include <QDir>
-#include <QtGui/QHeaderView>
+#include <QHeaderView>
#define TWO_BYTE_MAX 65535
#define FOUR_CHAR 4

View File

@ -5128,6 +5128,8 @@ in
offlineimap = callPackage ../tools/networking/offlineimap { };
ofono-phonesim = libsForQt5.callPackage ../development/tools/ofono-phonesim/default.nix { };
oh-my-zsh = callPackage ../shells/zsh/oh-my-zsh { };
ola = callPackage ../applications/misc/ola { };