QElectrotech: bump version

sci-electronics/qelectrotech/patches/qelectrotech-0.7.0.patchset

@@ -1,29 +1,16 @@
-From 461da819663a540b3d680fa628e015fb93c557f5 Mon Sep 17 00:00:00 2001
+From 4a99202d27ca83d59a0312df1890c788029b807d Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Sun, 17 Jun 2018 19:13:43 +1000
+Date: Tue, 13 Aug 2019 20:41:39 +1000
 Subject: Fix build for Haiku
 
 
 diff --git a/qelectrotech.pro b/qelectrotech.pro
-index 3114b90..f768606 100644
+index 07e51fb..991a9c0 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           = './'
+@@ -33,6 +33,18 @@ win32 {
+ 	# Liste des ressources Windows
+     #RC_FILE = qelectrotech.rc
  }
 +haiku {	
 +	COMPIL_PREFIX              = $$prefix'/'
@@ -40,7 +27,17 @@ index 3114b90..f768606 100644
  macx {
  	# Chemins MacOS X
  	COMPIL_PREFIX              = './'
-@@ -199,10 +212,14 @@ man.extra          = sh man/compress_man_pages.sh
+@@ -160,7 +172,8 @@ RESOURCES += qelectrotech.qrc
+ TRANSLATIONS += lang/qet_en.ts lang/qet_es.ts lang/qet_fr.ts lang/qet_ru.ts lang/qet_pt.ts lang/qet_cs.ts lang/qet_pl.ts lang/qet_de.ts lang/qet_ro.ts lang/qet_it.ts lang/qet_el.ts lang/qet_nl.ts lang/qet_be.ts
+ 
+ # Modules Qt utilises par l'application
+-QT += xml svg network sql widgets printsupport concurrent KWidgetsAddons KCoreAddons
++QT += xml svg network sql widgets printsupport concurrent
++LIBS += -lKF5WidgetsAddons -lKF5CoreAddons
+ 
+ # UI DESIGNER FILES AND GENERATION SOURCES FILES
+ FORMS += $$files(sources/richtext/*.ui) \
+@@ -236,10 +249,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
@@ -57,7 +54,7 @@ index 3114b90..f768606 100644
  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
+index 9316c2f..dd02b80 100644
 --- a/sources/ui/importelementdialog.h
 +++ b/sources/ui/importelementdialog.h
 @@ -19,6 +19,7 @@
@@ -69,5 +66,5 @@ index d5b93bc..a0b2403 100644
  
  namespace Ui {
 -- 
-2.16.4
+2.21.0
 

sci-electronics/qelectrotech/qelectrotech-0.7.0.recipe

@@ -20,12 +20,12 @@ 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-2018 Laurent Trinques, Joshua Claveau, Ronny Desmedt, Cyril Frausty, Abhishek Bansal"
+COPYRIGHT="2008-2019 Laurent Trinques, Joshua Claveau, Ronny Desmedt, Cyril Frausty, Abhishek Bansal"
 LICENSE="GNU GPL v2"
-REVISION="2"
-SOURCE_URI="https://download.tuxfamily.org/qet/tags/20180306/qelectrotech-$portVersion-src.tar.gz"
-CHECKSUM_SHA256="9144c8627f46fecaef6c49ca09f8dd3ddfd3d79b7f8755bba18951638555bbac"
-SOURCE_DIR="qelectrotech-$portVersion-src"
+REVISION="1"
+SOURCE_URI="https://git.tuxfamily.org/qet/qet.git/snapshot/qet-$portVersion.tar.gz"
+CHECKSUM_SHA256="d9d7de46c26f9ab9076d02463e9abd9b4b01e4e77202dc22ccecfe08d9bdd2c4"
+SOURCE_DIR="qet-$portVersion"
 PATCHES="qelectrotech-$portVersion.patchset"
 ADDITIONAL_FILES="qelectrotech.rdef.in"
 
@@ -39,6 +39,8 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
+	lib:libKF5CoreAddons$secondaryArchSuffix
+	lib:libKF5WidgetsAddons$secondaryArchSuffix
 	lib:libQt5Concurrent$secondaryArchSuffix
 	lib:libQt5Core$secondaryArchSuffix
 	lib:libQt5Gui$secondaryArchSuffix
@@ -52,19 +54,25 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules$secondaryArchSuffix >= 5.55
 	devel:libGL$secondaryArchSuffix
+	devel:libKF5CoreAddons$secondaryArchSuffix
+	devel:libKF5WidgetsAddons$secondaryArchSuffix
 	devel:libQt5Core$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:find
 	cmd:gcc$secondaryArchSuffix
+	cmd:lrelease$secondaryArchSuffix >= 5
 	cmd:make
 	cmd:qmake$secondaryArchSuffix >= 5
 	"
 
 BUILD()
 {
-	qmake -r prefix=$appsDir/QElectrotech
+	qmake -r \
+		prefix=$appsDir/QElectrotech \
+		INCLUDEPATH="/system/$relativeIncludeDir/KF5/KWidgetsAddons /system/$relativeIncludeDir/KF5/KCoreAddons"
 	make $jobArgs
 }
 
@@ -80,7 +88,7 @@ INSTALL()
 	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 MINOR="`echo "$portVersion" | cut -d. -f3`"
 	local LONG_INFO="$SUMMARY"
 	sed \
 		-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \