ofono-phonesim: unstable-2014-04-22 → unstable-2019-11-18

Jussi’s repo was actually a fork.

Upstream was ported from Qt4 to Qt5 and from QScript to QML on master.
This commit is contained in:
Jan Tojnar 2019-11-26 00:37:24 +01:00
parent 2561f4da88
commit c0acd27c6e
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
2 changed files with 7 additions and 62 deletions

View file

@ -1,27 +1,21 @@
{ stdenv
, mkDerivation
, fetchFromGitHub
, fetchgit
, autoreconfHook
, pkgconfig
, qtbase
, qtscript
}:
mkDerivation {
pname = "ofono-phonesim";
version = "unstable-2014-04-22";
version = "unstable-2019-11-18";
src = fetchFromGitHub {
owner = "jpakkane";
repo = "ofono-phonesim";
rev = "baa41f04e6a86c5289d7185cad8a6f08a5c3ed0a";
sha256 = "0ywalvvf3dfbn81ml21gji1n2hywh2nmakynakjzyyskcqjn2wiz";
src = fetchgit {
url = "git://git.kernel.org/pub/scm/network/ofono/phonesim.git";
rev = "adf231a84cd3708b825dc82c56e841dd7e3b4541";
sha256 = "sha256:1840914sz46l8h2jwa0lymw6dvgj72wq9bhp3k4v4rk6masbf6hp";
};
patches = [
./qt5-compat.patch
];
nativeBuildInputs = [
autoreconfHook
pkgconfig
@ -29,7 +23,6 @@ mkDerivation {
buildInputs = [
qtbase
qtscript
];
makeFlags = [
@ -39,7 +32,7 @@ mkDerivation {
meta = with stdenv.lib; {
description = "Phone Simulator for modem testing";
homepage = https://github.com/jpakkane/ofono-phonesim;
homepage = "https://01.org/ofono";
license = licenses.gpl2;
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.linux;

View file

@ -1,48 +0,0 @@
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