MultiMC: fix qt5 includes and do not install ELF in /usr/share

This commit is contained in:
q66 2019-01-30 18:16:51 +01:00 committed by John Zimmermann
parent 46d7925b97
commit 536228f1d1
3 changed files with 36 additions and 5 deletions

View File

@ -1,2 +1,2 @@
#!/bin/sh #!/bin/sh
/usr/share/multimc/MultiMC -d ~/.multimc /usr/libexec/multimc/MultiMC -d ~/.multimc

View File

@ -0,0 +1,30 @@
--- application/MultiMC.h
+++ application/MultiMC.h
@@ -6,6 +6,7 @@
#include <QFlag>
#include <QIcon>
#include <QDateTime>
+#include <QTabBar>
#include <updater/GoUpdate.h>
#include <BaseInstance.h>
--- application/dialogs/NotificationDialog.cpp
+++ application/dialogs/NotificationDialog.cpp
@@ -2,6 +2,7 @@
#include "ui_NotificationDialog.h"
#include <QTimerEvent>
+#include <QStyle>
NotificationDialog::NotificationDialog(const NotificationChecker::NotificationEntry &entry, QWidget *parent) :
QDialog(parent, Qt::MSWindowsFixedSizeDialogHint | Qt::WindowTitleHint | Qt::CustomizeWindowHint),
--- application/pages/modplatform/ImportPage.cpp
+++ application/pages/modplatform/ImportPage.cpp
@@ -7,6 +7,7 @@
#include "dialogs/ProgressDialog.h"
#include "dialogs/NewInstanceDialog.h"
#include <QFileDialog>
+#include <QValidator>
#include <InstanceImportTask.h>
class UrlValidator : public QValidator

View File

@ -1,7 +1,8 @@
# Template file for 'MultiMC' # Template file for 'MultiMC'
pkgname=MultiMC pkgname=MultiMC
version=0.6.2 version=0.6.2
revision=2 revision=3
wrksrc="${pkgname}5-${version}"
_commithashnbt="4b305bbd2ac0e7a26987baf7949a484a87b474d4" _commithashnbt="4b305bbd2ac0e7a26987baf7949a484a87b474d4"
_nbtversion="multimc-0.5.0" _nbtversion="multimc-0.5.0"
_quazipversion="multimc-2" _quazipversion="multimc-2"
@ -9,7 +10,7 @@ build_style=cmake
hostmakedepends="openjdk xxd git-all" hostmakedepends="openjdk xxd git-all"
makedepends="qt5-devel qt5-x11extras-devel qt5-svg-devel gtk+-devel" makedepends="qt5-devel qt5-x11extras-devel qt5-svg-devel gtk+-devel"
depends="virtual?java-environment" depends="virtual?java-environment"
short_desc="An instanced Minecraft client" short_desc="Instanced Minecraft client"
maintainer="Spencer H <spencernh77@gmail.com>" maintainer="Spencer H <spencernh77@gmail.com>"
license="Apache-2.0" license="Apache-2.0"
homepage="http://multimc.org" homepage="http://multimc.org"
@ -19,7 +20,6 @@ distfiles="https://github.com/${pkgname}/${pkgname}5/archive/${version}.tar.gz
checksum="d5e5fdc3234ac423e4abf8ea3b46d851c2df54713eae61f2171cb6f85de78fee checksum="d5e5fdc3234ac423e4abf8ea3b46d851c2df54713eae61f2171cb6f85de78fee
bcefbdd905f10a04605cf9e8f768d0f60c972e9e219c800512a5fd9c5f7a8498 bcefbdd905f10a04605cf9e8f768d0f60c972e9e219c800512a5fd9c5f7a8498
25e1b74f0edef5e09647f7b5344c08fad4eaebbc386b1f288b59286ecdfe07fa" 25e1b74f0edef5e09647f7b5344c08fad4eaebbc386b1f288b59286ecdfe07fa"
wrksrc="${pkgname}5-${version}"
skip_extraction="${_nbtversion}.tar.gz ${_quazipversion}.tar.gz" skip_extraction="${_nbtversion}.tar.gz ${_quazipversion}.tar.gz"
pre_configure() { pre_configure() {
@ -31,8 +31,9 @@ pre_configure() {
do_install() { do_install() {
vmkdir usr/bin vmkdir usr/bin
vmkdir usr/libexec/multimc
vmkdir usr/share/multimc/jars vmkdir usr/share/multimc/jars
vcopy build/MultiMC usr/share/multimc vcopy build/MultiMC usr/libexec/multimc
vcopy build/jars/*.jar usr/share/multimc/jars vcopy build/jars/*.jar usr/share/multimc/jars
vinstall build/libMultiMC_gui.so 755 /usr/lib vinstall build/libMultiMC_gui.so 755 /usr/lib
vinstall build/libMultiMC_rainbow.so 755 /usr/lib vinstall build/libMultiMC_rainbow.so 755 /usr/lib