haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-06 06:58:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

QElectrotech: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2018-06-17 22:35:54 +10:00
parent d87f55cf7c
commit dc2640612c
4 changed files with 141 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
sci-electronics/qelectrotech/patches/qelectrotech-0.5.patchset
View File

@@ -1,53 +0,0 @@
From ec1f31094e704d65ddec0ee2d253ef13e252eb55 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Wed, 5 Jul 2017 10:15:50 +0200
Subject: hack in haiku support
diff --git a/qelectrotech.pro b/qelectrotech.pro
index 6293215..9cc4f34 100644
--- a/qelectrotech.pro
+++ b/qelectrotech.pro
@@ -5,21 +5,19 @@
# Chemins utilises pour la compilation et l'installation de QET
unix {
# Chemins UNIX
- COMPIL_PREFIX = '/usr/local/'
- INSTALL_PREFIX = '/usr/local/'
+ COMPIL_PREFIX = $$prefix'/'
+ INSTALL_PREFIX = $$prefix'/'
QET_BINARY_PATH = 'bin/'
- QET_COMMON_COLLECTION_PATH = 'share/qelectrotech/elements/'
- QET_COMMON_TBT_PATH = 'share/qelectrotech/titleblocks/'
- QET_LANG_PATH = 'share/qelectrotech/lang/'
- QET_EXAMPLES_PATH = 'share/qelectrotech/examples/'
- QET_LICENSE_PATH = 'doc/qelectrotech/'
+ QET_COMMON_COLLECTION_PATH = $$datadir'/qelectrotech/elements/'
+ QET_COMMON_TBT_PATH = $$datadir'/qelectrotech/titleblocks/'
+ QET_LANG_PATH = $$datadir'/qelectrotech/lang/'
+ QET_EXAMPLES_PATH = $$datadir'/qelectrotech/examples/'
+ QET_LICENSE_PATH = $$datadir'/doc/qelectrotech/'
QET_MIME_XML_PATH = '../share/mime/application/'
QET_MIME_DESKTOP_PATH = '../share/mimelnk/application/'
QET_MIME_PACKAGE_PATH = '../share/mime/packages/'
- QET_DESKTOP_PATH = 'share/applications/'
- QET_ICONS_PATH = 'share/icons/hicolor/'
- QET_MAN_PATH = 'man/'
- QET_APPDATA_PATH = 'share/appdata'
+ QET_MAN_PATH = $$datadir'/man/'
+ QET_APPDATA_PATH = $$datadir'/appdata'
}
win32 {
# Chemins Windows
@@ -186,7 +184,7 @@ man.extra = sh man/compress_man_pages.sh
INSTALLS += target elements tbt lang copyright
# Sous Unix, on installe egalement l'icone, un fichier .desktop, des fichiers mime et les pages de manuel
unix {
- INSTALLS += desktop mime_xml mime_desktop mime_package icons man examples appdata
+ INSTALLS += mime_xml mime_desktop mime_package man examples appdata
}
# Options de compilation communes a Unix et MacOS X
--
2.12.2

73
sci-electronics/qelectrotech/patches/qelectrotech-0.6.patchset Normal file
View File

@@ -0,0 +1,73 @@
From 461da819663a540b3d680fa628e015fb93c557f5 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 17 Jun 2018 19:13:43 +1000
Subject: Fix build for Haiku
diff --git a/qelectrotech.pro b/qelectrotech.pro
index 3114b90..f768606 100644
--- a/qelectrotech.pro
+++ b/qelectrotech.pro
@@ -3,7 +3,7 @@
######################################################################
# Chemins utilises pour la compilation et l'installation de QET
-unix {
+unix:!haiku {
# Chemins UNIX
COMPIL_PREFIX = '/usr/local/'
INSTALL_PREFIX = '/usr/local/'
@@ -28,9 +28,22 @@ win32 {
QET_BINARY_PATH = './'
QET_COMMON_COLLECTION_PATH = 'elements/'
QET_COMMON_TBT_PATH = 'titleblocks/'
+ QET_EXAMPLES_PATH = 'examples/'
QET_LANG_PATH = 'lang/'
QET_LICENSE_PATH = './'
}
+haiku {
+ COMPIL_PREFIX = $$prefix'/'
+ INSTALL_PREFIX = $$prefix'/'
+ QET_BINARY_PATH = './'
+ QET_COMMON_COLLECTION_PATH = 'elements/'
+ QET_COMMON_TBT_PATH = 'titleblocks/'
+ QET_LANG_PATH = 'lang/'
+ QET_EXAMPLES_PATH = 'examples/'
+ QET_LICENSE_PATH = 'license/'
+ QET_MAN_PATH = '../../documentation/man/'
+ QET_APPDATA_PATH = '../../data/appdata/'
+}
macx {
# Chemins MacOS X
COMPIL_PREFIX = './'
@@ -199,10 +212,14 @@ man.extra = sh man/compress_man_pages.sh
# L'installation comprend la copie du binaire, des elements, des fichiers de langue et du fichier LICENSE
INSTALLS += target elements tbt lang copyright
# Sous Unix, on installe egalement l'icone, un fichier .desktop, des fichiers mime et les pages de manuel
-unix {
+unix:!haiku {
INSTALLS += desktop mime_xml mime_desktop mime_package icons man examples appdata
}
+haiku {
+ INSTALLS += mime_xml mime_desktop mime_package man examples appdata
+}
+
# Options de compilation communes a Unix et MacOS X
unix {
# Chemin des fichiers de traduction ; par defaut : lang/ dans le repertoire d'execution
diff --git a/sources/ui/importelementdialog.h b/sources/ui/importelementdialog.h
index d5b93bc..a0b2403 100644
--- a/sources/ui/importelementdialog.h
+++ b/sources/ui/importelementdialog.h
@@ -19,6 +19,7 @@
#define IMPORTELEMENTDIALOG_H
#include <QDialog>
+#include <QButtonGroup>
#include "qet.h"
namespace Ui {
--
2.16.4