From 30f7e031514dab56e9180348251b1c53004c9369 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sun, 17 Sep 2017 23:45:50 +0000 Subject: mythinstall: fixes building against mythtv 29 --- .../MythVantage-app/mythinstall/mythinstall.pro | 20 +++++++------------- abs/core/mythinstall/PKGBUILD | 6 +++--- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/mythinstall.pro b/abs/core/mythinstall/MythVantage-app/mythinstall/mythinstall.pro index 8f069e6..f517c43 100755 --- a/abs/core/mythinstall/MythVantage-app/mythinstall/mythinstall.pro +++ b/abs/core/mythinstall/MythVantage-app/mythinstall/mythinstall.pro @@ -1,28 +1,22 @@ #This is the path to the mythtv src - - PREFIX = /usr/include/mythtv -LIBVERSION = 0.28 -VERSION = 0.28.0 - - - +LIBVERSION = 29 +VERSION = 29.0 -INCLUDEPATH += $$PREFIX/libmythui $$PREFIX $$PREFIX/libmyth +INCLUDEPATH += $$PREFIX +INCLUDEPATH += $$PREFIX/libmyth +INCLUDEPATH += $$PREFIX/libmythui +INCLUDEPATH += $$PREFIX/libmythservicecontracts LIBS += -L /usr/local/lib - - LIBS += -lmythtv-$$LIBVERSION #LIBS += -lmythdb-$$LIBVERSION LIBS += -lmythui-$$LIBVERSION LIBS += -lmyth-$$LIBVERSION LIBS+= -lmythbase-$$LIBVERSION - - mingw { LIBS += -lpthread CONFIG += console @@ -30,6 +24,7 @@ mingw { TEMPLATE = app CONFIG += thread +CONFIG += c++11 TARGET = mythinstall target.path = $${PREFIX}/bin @@ -50,4 +45,3 @@ HEADERS += installdialog.h commandlineparser.h installsettings.h settemplate.h i SOURCES += main.cpp commandlineparser.cpp installdialog.cpp installsettings.cpp settemplate.cpp installationtype.cpp autocard.cpp xorgsettings.cpp password_manage.cpp misc_settings.cpp infrared.cpp compat-mv.cpp supplemental.cpp vnc.cpp fileshare.cpp QT += sql xml network widgets - diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD index 93a8f00..73c44fe 100644 --- a/abs/core/mythinstall/PKGBUILD +++ b/abs/core/mythinstall/PKGBUILD @@ -1,11 +1,11 @@ # Maintainer: Jams pkgname=mythinstall -pkgver=8.4.3 +pkgver=8.5 pkgrel=2 pkgdesc="LinHES installer/systemconfig GUI." arch=('i686' 'x86_64') -depends=('mythtv>=0.28') -makedepends=('mythtv>=0.28') +depends=('mythtv>=29') +makedepends=('mythtv>=29') logofiles=`ls logo*.png` source=('install-ui.xml' $logofiles) -- cgit v0.12