Bump to 0.8.0

3 files changed, 47 insertions, 59 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 16590e926a0e..4bf5e4b37011 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,7 @@
 pkgbase = qelectrotech
 	pkgdesc = An electric diagram editor
-	pkgver = 0.7.0
+	pkgver = 0.8.0
 	pkgrel = 1
-	epoch = 1
 	url = https://qelectrotech.org/
 	arch = i686
 	arch = x86_64
@@ -12,11 +11,10 @@ pkgbase = qelectrotech
 	depends = desktop-file-utils
 	depends = kwidgetsaddons
 	depends = kcoreaddons
-	depends = tk
-	source = https://github.com/qelectrotech/qelectrotech-source-mirror/archive/0.7.0.tar.gz
+	optdepends = tk: for qet_tb_generator support
+	source = https://github.com/qelectrotech/qelectrotech-source-mirror/archive/refs/tags/0.8.0.tar.gz
 	source = install-dir.patch
-	sha512sums = 7ed59203dbfeb8069fa9407ae8e7a6748c8c6bffddf9a64656477f8b4515587084e5ec908feddf67c589700e90577547114248d044c4b559827ba195d352201b
-	sha512sums = 37bda63af55fb422ab5c5950b229cc8a375295a43decffe31522c14e5dcc6dbeb9ca50a36ca40f595458af652cf1e0f46683a97c950b4745c12a1ddd31e28c57
+	sha512sums = e382c659474d42478c19cfa04ea77e1f013a4a40157d813e789607bbdf8d008d850c8c67bf81a62ecf3e1d0a6b4a9715d5e728fba65ac00a56dfaa4b88343e21
+	sha512sums = 9bf61fdc56f95547799962b8010ee2b147aed4707bf6b66bf7c382d11c9a88d7e102f94aa9c562eff01ca17da7f35e2a318495faabb082005cd338bfde3badb4
 
 pkgname = qelectrotech
-
diff --git a/PKGBUILD b/PKGBUILD
index bdbc52211803..94d9e4376dd8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,31 @@
-# Maintainer: Simon Doppler (dopsi) <dop.simon_at_gmail.com>
-
-# Former maintaining team :
+# Maintainer: Nicola Fontana <ntd@entidi.it>
+#
+# Former maintaining team:
+# (Maintainer) Simon Doppler (dopsi) <dop.simon_at_gmail.com>
 # (Contributor) Nick B <Shirakawasuna at gmail _dot_com>
 # (Maintainer) moostik <mooostik_at_gmail.com>
 pkgname=qelectrotech
-pkgver=0.7.0
+pkgver=0.8.0
 pkgrel=1
-epoch=1
-pkgdesc="An electric diagram editor"
+pkgdesc='An electric diagram editor'
 arch=('i686' 'x86_64')
-url="https://qelectrotech.org/"
+url='https://qelectrotech.org/'
 license=('GPL2')
-depends=('qt5-svg' 'hicolor-icon-theme' 'desktop-file-utils' 'kwidgetsaddons'
-'kcoreaddons' 'tk')
-sha512sums=('7ed59203dbfeb8069fa9407ae8e7a6748c8c6bffddf9a64656477f8b4515587084e5ec908feddf67c589700e90577547114248d044c4b559827ba195d352201b'
-            '37bda63af55fb422ab5c5950b229cc8a375295a43decffe31522c14e5dcc6dbeb9ca50a36ca40f595458af652cf1e0f46683a97c950b4745c12a1ddd31e28c57')
-source=(
-  "https://github.com/qelectrotech/qelectrotech-source-mirror/archive/$pkgver.tar.gz"
-  'install-dir.patch'
-)
+depends=('qt5-svg' 'hicolor-icon-theme' 'desktop-file-utils'
+         'kwidgetsaddons' 'kcoreaddons')
+optdepends=('tk: for qet_tb_generator support')
+source=("https://github.com/qelectrotech/$pkgname-source-mirror/archive/refs/tags/$pkgver.tar.gz"
+        "install-dir.patch")
+sha512sums=('e382c659474d42478c19cfa04ea77e1f013a4a40157d813e789607bbdf8d008d850c8c67bf81a62ecf3e1d0a6b4a9715d5e728fba65ac00a56dfaa4b88343e21'
+            '9bf61fdc56f95547799962b8010ee2b147aed4707bf6b66bf7c382d11c9a88d7e102f94aa9c562eff01ca17da7f35e2a318495faabb082005cd338bfde3badb4')
 
 _tarname="$pkgname-source-mirror-$pkgver"
 
+
 prepare() {
   cd "$srcdir/$_tarname"
   patch -p1 < "$srcdir/install-dir.patch"
-  sed -i 's/gzip \-9n/gzip -9nf/' "$srcdir/$_tarname/man/compress_man_pages.sh"
+  sed -i 's/gzip \-9n/gzip -9nf/' "man/compress_man_pages.sh"
 }
 
 build() {
@@ -37,6 +37,4 @@ build() {
 package() {
   cd "$srcdir/$_tarname"
   make INSTALL_ROOT="$pkgdir" install
-  mv "$pkgdir/usr/doc" "$pkgdir/usr/share/doc"
 }
-
diff --git a/install-dir.patch b/install-dir.patch
index 04b6d848dc3b..69ff4d91333e 100644
--- a/install-dir.patch
+++ b/install-dir.patch
@@ -1,39 +1,31 @@
-diff -ruN qelectrotech-0.5-src/qelectrotech.pro src/qelectrotech-0.5-src/qelectrotech.pro
---- qelectrotech-0.5-src/qelectrotech.pro	2015-10-12 14:48:32.000000000 +0200
-+++ src/qelectrotech-0.5-src/qelectrotech.pro	2015-12-04 11:49:16.197910112 +0100
+diff -Naur qelectrotech-source-mirror-0.8.0-org/qelectrotech.pro qelectrotech-source-mirror-0.8.0/qelectrotech.pro
+--- qelectrotech-source-mirror-0.8.0-org/qelectrotech.pro	2021-02-21 10:15:38.000000000 +0100
++++ qelectrotech-source-mirror-0.8.0/qelectrotech.pro	2021-08-27 09:11:02.127741413 +0200
 @@ -5,20 +5,20 @@
  # Chemins utilises pour la compilation et l'installation de QET
  unix {
- 	# Chemins UNIX
--	COMPIL_PREFIX              = '/usr/local/'
--	INSTALL_PREFIX             = '/usr/local/'
-+	COMPIL_PREFIX              = '/usr/'
-+	INSTALL_PREFIX             = '/usr/'
- 	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_MIME_XML_PATH          = '../share/mime/application/'
--	QET_MIME_DESKTOP_PATH      = '../share/mimelnk/application/'
--	QET_MIME_PACKAGE_PATH      = '../share/mime/packages/'
-+	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_MAN_PATH               = 'share/man/'
- 	QET_APPDATA_PATH           = 'share/appdata'
+         # Chemins UNIX
+-        COMPIL_PREFIX              = '/usr/local/'
+-        INSTALL_PREFIX             = '/usr/local/'
++        COMPIL_PREFIX              = '/usr/'
++        INSTALL_PREFIX             = '/usr/'
+         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_MIME_XML_PATH          = '../share/mime/application/'
+-        QET_MIME_DESKTOP_PATH      = '../share/mimelnk/application/'
+-        QET_MIME_PACKAGE_PATH      = '../share/mime/packages/'
++        QET_LICENSE_PATH           = 'share/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_MAN_PATH               = 'share/man/'
+         QET_APPDATA_PATH           = 'share/appdata'
  }
  win32 {
-@@ -34,7 +34,7 @@
- macx {
- 	# Chemins MacOS X
- 	COMPIL_PREFIX              = './'
--	INSTALL_PREFIX             = '/usr/local/'
-+	INSTALL_PREFIX             = '/usr/'
- 	QET_BINARY_PATH            = 'bin/'
- 	QET_COMMON_COLLECTION_PATH = '../Resources/elements/'
- 	QET_COMMON_TBT_PATH        = '../Resources/titleblocks/'