QElectrotech: bump version

2026-04-09 05:10:05 +02:00 · 2018-06-17 22:35:54 +10:00
parent d87f55cf7c
commit dc2640612c
4 changed files with 141 additions and 61 deletions
--- a/sci-electronics/qelectrotech/additional-files/qelectrotech.rdef.in
+++ b/sci-electronics/qelectrotech/additional-files/qelectrotech.rdef.in
@@ -0,0 +1,35 @@
+
+resource app_flags B_MULTIPLE_LAUNCH;
+
+resource app_version {
+	major  = @MAJOR@,
+	middle = @MIDDLE@,
+	minor  = @MINOR@,
+
+	variety = B_APPV_FINAL,
+	internal = 0,
+
+	short_info = "QElectrotech",
+	long_info = "@LONG_INFO@"
+};
+
+resource app_signature "@APP_SIGNATURE@";
+
+resource vector_icon {
+	$"6E6369660705FF020006023C6BEA0000000000003C6BEA498F07D02715003889"
+	$"E9FF5EA5FB04FF33020002023B4B6B0000000000003BF41B4AD35F4A12B30029"
+	$"2C2F26FF00000000050003FFCC000500080A04B5ACB5ACD003B5ACD003D003B5"
+	$"ACD0030A04B4FBB4FBD0B5B4FBD0B5D0B5B4FBD0B50A04B5A4B5A4B5A4D00CD0"
+	$"0CD00CD00CB5A40A04B6F6B6F6CEBAB6F6CEBACEBAB6F6CEBA0A05BAECC6CEC6"
+	$"CEB6F6CEBABEE2CEBACEBAC2D8CEBA0A05BAECC6CEC6CEB6F6CEBABEE2CEBACE"
+	$"BAC2D8CEBA0A0BC121B6F6BAECC6C8C44EC364C39DCA2B4556C305CEBA5259C4"
+	$"95CA48C8B9BF18C007C25FC6CEB6F60A0BC121B6F6BAECC6C8C44EC364C39DCA"
+	$"2BC1AFC8D0C305CEBAC6EDC9B8C495CA48C8B9BF18C007C25FC6CEB6F6080A00"
+	$"0100023F608A0000000000003F608AC09D6BC09D6B0A060101123F7C90000000"
+	$"0000003F7C90C26548C2654801158303040A010101023F608A0000000000003F"
+	$"608AC09D6BC09D6B0A02020203023F608A0000000000003F608AC09D6BC09D6B"
+	$"0A030104023F608A0000000000003F608AC09D6BC09D6B0A040105123F608A00"
+	$"00000000003F608AC09D6BC09D6B01178000040A060106123F608A0000000000"
+	$"003F608AC09D6BC09D6B01158300040A050107023F608A0000000000003F608A"
+	$"C09D6BC09D6B"
+};
--- a/sci-electronics/qelectrotech/patches/qelectrotech-0.5.patchset
+++ b/sci-electronics/qelectrotech/patches/qelectrotech-0.5.patchset
@@ -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
-
--- a/sci-electronics/qelectrotech/patches/qelectrotech-0.6.patchset
+++ b/sci-electronics/qelectrotech/patches/qelectrotech-0.6.patchset
@@ -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
+
--- a/sci-electronics/qelectrotech/qelectrotech-0.6.recipe
+++ b/sci-electronics/qelectrotech/qelectrotech-0.6.recipe
@@ -20,24 +20,26 @@ dropped into a diagram, it is automatically added to “imported” collection i
 a duplicate copy. This copy of the element will be available for editing to \
 effect suitable changes to create customized symbols."
 HOMEPAGE="https://qelectrotech.org"
-COPYRIGHT="2008-2016 Laurent Trinques, Joshua Claveau, Ronny Desmedt, Cyril Frausty, Abhishek Bansal"
+COPYRIGHT="2008-2018 Laurent Trinques, Joshua Claveau, Ronny Desmedt, Cyril Frausty, Abhishek Bansal"
 LICENSE="GNU GPL v2"
-SOURCE_URI="http://download.tuxfamily.org/qet/tags/20151127/qelectrotech-$portVersion-src.tar.gz"
-CHECKSUM_SHA256="361f0f0fd282bdbd1624f7590f6be24918f8be75266f2c09a07ad9453590ce67"
+SOURCE_URI="https://download.tuxfamily.org/qet/tags/20180306/qelectrotech-$portVersion-src.tar.gz"
+CHECKSUM_SHA256="9144c8627f46fecaef6c49ca09f8dd3ddfd3d79b7f8755bba18951638555bbac"
 SOURCE_DIR="qelectrotech-$portVersion-src"
 PATCHES="qelectrotech-$portVersion.patchset"
+ADDITIONAL_FILES="qelectrotech.rdef.in"
 REVISION="1"

-ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
-	qelectrotech$secondaryArchSuffix
-	cmd:qelectrotech
+	qelectrotech$secondaryArchSuffix = $portVersion
+	app:QElectrotech$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
+	lib:libQt5Concurrent$secondaryArchSuffix
 	lib:libQt5Core$secondaryArchSuffix
 	lib:libQt5Svg$secondaryArchSuffix
 	lib:libQt5Network$secondaryArchSuffix
@@ -50,6 +52,7 @@ REQUIRES="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	devel:libQt5Core$secondaryArchSuffix
 	devel:libGL$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
@@ -61,13 +64,35 @@ BUILD_PREREQUIRES="

 BUILD()
 {
-	qmake -r prefix=$prefix datadir=$relativeDataDir
+	qmake -r prefix=$appsDir/QElectrotech
 	make $jobArgs
 }

 INSTALL()
 {
+	mkdir -p $dataDir/appdata $docDir/man
 	make install
+	
+	cd $appsDir/QElectrotech
+	mv qelectrotech QElectrotech
+	rm -f *.xml *.desktop

-	addAppDeskbarSymlink $appsDir/qelectrotech/bin/qlelectrotech
+	local APP_SIGNATURE="application/x-vnd.qelectrotech"
+	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
+	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
+	local MINOR="0"
+	local LONG_INFO="$SUMMARY"
+	sed \
+		-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
+		-e "s|@MAJOR@|$MAJOR|" \
+		-e "s|@MIDDLE@|$MIDDLE|" \
+		-e "s|@MINOR@|$MINOR|" \
+		-e "s|@LONG_INFO@|$LONG_INFO|" \
+		$portDir/additional-files/qelectrotech.rdef.in > \
+			$sourceDir/qelectrotech.rdef
+
+	addResourcesToBinaries $sourceDir/qelectrotech.rdef \
+		$appsDir/QElectrotech/QElectrotech
+
+	addAppDeskbarSymlink $appsDir/QElectrotech/QElectrotech
 }