[v0.1.7] Switch to system websocket

CODeRUS · Mar 9, 2020 · 47ae1a4 · 47ae1a4
1 parent 6034950
commit 47ae1a4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 23 deletions.
diff --git a/harbour-lgremote-webos.pro b/harbour-lgremote-webos.pro
@@ -1,6 +1,6 @@
 TARGET = harbour-lgremote-webos
 
-QT += network xml xmlpatterns
+QT += network xml xmlpatterns websockets
 CONFIG += sailfishapp
 
 SOURCES += \
@@ -14,20 +14,10 @@ HEADERS += \
 
 DEFINES += APP_VERSION=\\\"$$VERSION\\\"
 
-wslibs9.files = \
-    websockets9/libQt5WebSockets.so \
-    websockets9/libQt5WebSockets.so.5 \
-    websockets9/libQt5WebSockets.so.5.3 \
-    websockets9/libQt5WebSockets.so.5.3.3
-wslibs9.path = /usr/share/harbour-lgremote-webos/lib
-
-wsqml9.files = websockets9/harbour
-wsqml9.path = /usr/share/harbour-lgremote-webos/import
-
 images.files = images
 images.path = /usr/share/harbour-lgremote-webos
 
-INSTALLS += wslibs9 wsqml9 images
+INSTALLS += images
 
 OTHER_FILES += \
     qml/cover/CoverPage.qml \

diff --git a/qml/main.qml b/qml/main.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.1
 import Sailfish.Silica 1.0
-import harbour.lgremote.webos.websockets 1.0
 import "pages"
+;import QtWebSockets 1.1
 ;import Sailfish.Media 1.0
 ;import org.nemomobile.policy 1.0
 ;import org.nemomobile.configuration 1.0

diff --git a/qml/pages/MainSocket.qml b/qml/pages/MainSocket.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.1
-import harbour.lgremote.webos.websockets 1.0
+;import QtWebSockets 1.1
 
 WebSocket {
     id: mainSocket

diff --git a/qml/pages/PointerSocket.qml b/qml/pages/PointerSocket.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.1
-import harbour.lgremote.webos.websockets 1.0
+;import QtWebSockets 1.1
 
 WebSocket {
     id: pointerSocket

diff --git a/rpm/harbour-lgremote-webos.spec b/rpm/harbour-lgremote-webos.spec
@@ -5,28 +5,24 @@
 
 Name:       harbour-lgremote-webos
 
-# >> macros
-%define __provides_exclude_from ^%{_datadir}/.*$
-%define __requires_exclude ^libQt5WebSockets.*$
-# << macros
-
-%{!?qtc_qmake:%define qtc_qmake %qmake}
 %{!?qtc_qmake5:%define qtc_qmake5 %qmake5}
 %{!?qtc_make:%define qtc_make make}
-%{?qtc_builddir:%define _builddir %qtc_builddir}
+
 Summary:    LG Remote for webOS Smart TV
-Version:    0.1.6
+Version:    0.1.7
 Release:    1
 Group:      Qt/Qt
 License:    WTFPL
 URL:        https://github.com/CODeRUS/harbour-lgremote-webos
 Source0:    %{name}-%{version}.tar.bz2
 Requires:   sailfishsilica-qt5 >= 0.10.9
+Requires:   qt5-qtdeclarative-import-websockets
 BuildRequires:  pkgconfig(sailfishapp) >= 1.0.2
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5Qml)
 BuildRequires:  pkgconfig(Qt5Quick)
 BuildRequires:  desktop-file-utils
+BuildRequires:  qt5-qtdeclarative-import-websockets
 
 %description
 LG Remote for webOS Smart TV