Update to version 0.5

4 files changed, 63 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index da12e9905563..4f027067c78a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,21 @@
 pkgbase = qelectrotech
 	pkgdesc = An electric diagram editor
-	pkgver = 0.4
-	pkgrel = 3
+	pkgver = 0.5
+	pkgrel = 1
 	url = http://qelectrotech.tuxfamily.org/
 	install = qelectrotech.install
 	arch = i686
 	arch = x86_64
 	license = GPL2
-	depends = qt4
+	depends = qt5-svg
+	depends = desktop-file-utils
+	depends = hicolor-icon-theme
 	depends = shared-mime-info
-	source = http://download.tuxfamily.org/qet/tags/20150220/qelectrotech-0.4-src.tar.gz
-	md5sums = 3699e5718e0adc361511513c9f1f7ea1
+	depends = xdg-utils
+	source = http://download.tuxfamily.org/qet/tags/20151127/qelectrotech-0.5-src.tar.gz
+	source = install-dir.patch
+	md5sums = 6fdf6d0a9fa7437e3555d5a940e1a1e3
+	md5sums = 757db940a4e189b9b0aae59131cb26d0
 
 pkgname = qelectrotech
 
diff --git a/PKGBUILD b/PKGBUILD
index abbbd6f275ae..6be5a3cb7294 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,22 +4,26 @@
 # (Contributor) Nick B <Shirakawasuna at gmail _dot_com>
 # (Maintainer) moostik <mooostik_at_gmail.com>
 pkgname=qelectrotech
-pkgver=0.4
-pkgrel=3
+pkgver=0.5
+pkgrel=1
 pkgdesc="An electric diagram editor"
 arch=('i686' 'x86_64')
 url="http://qelectrotech.tuxfamily.org/"
 install='qelectrotech.install'
 license=('GPL2')
-depends=('qt4' 'shared-mime-info')
-md5sums=('3699e5718e0adc361511513c9f1f7ea1')
-source=(http://download.tuxfamily.org/qet/tags/20150220/${pkgname}-${pkgver}-src.tar.gz)
+depends=('qt5-svg' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info' 'xdg-utils')
+md5sums=('6fdf6d0a9fa7437e3555d5a940e1a1e3' '757db940a4e189b9b0aae59131cb26d0')
+source=("http://download.tuxfamily.org/qet/tags/20151127/${pkgname}-${pkgver}-src.tar.gz" 'install-dir.patch')
+
+prepare() {
+	cd ${srcdir}/${pkgname}-${pkgver}-src
+	patch -p1 < $startdir/install-dir.patch
+}
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}-src
-  sed -i s,usr\/local,usr,g qelectrotech.pro
-  qmake-qt4
-  make
+  qmake-qt5
+  make -j8
 }
 
 package() {
diff --git a/install-dir.patch b/install-dir.patch
new file mode 100644
index 000000000000..04b6d848dc3b
--- /dev/null
+++ b/install-dir.patch
@@ -0,0 +1,39 @@
+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
+@@ -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'
+ }
+ 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/'
diff --git a/qelectrotech.install b/qelectrotech.install
index 620b4dd20530..b85302f9c160 100644
--- a/qelectrotech.install
+++ b/qelectrotech.install
@@ -3,6 +3,8 @@ post_install() {
   update-mime-database /usr/share/mime/ > /dev/null
   echo "update desktop database..."
   update-desktop-database -q
+  echo "update icon resource..."
+  xdg-icon-resource forceupdate
 }
 
 post_upgrade() {