Applied sekret's changes:

- Changed url to go directly to the site of tupi
- Changed source to github, recommended by the maintainer
- Changed quazip5.patch, so the package builds
- Changed pkgver(), so the actual pkgver is being included and so it gets more meaning
- Changed configure options to what I find reasonable
- Added an ld.so.conf file for the libraries in /usr/lib/tupi

4 files changed, 68 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 650b4af2c94c..fe31281a92fa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,10 @@
+# Generated by mksrcinfo v8
+# Wed Dec 28 23:39:39 UTC 2016
 pkgbase = tupi-git
-	pkgdesc = A 2D animation tool for 8-100 years old kids.
-	pkgver = 156.11cadda
-	pkgrel = 4
-	url = http://www.maefloresta.com/
-	install = tupi.install
+	pkgdesc = A design and authoring tool for digital artists interested in 2D animation.
+	pkgver = 0.2.git04.251.gdcd31b64
+	pkgrel = 1
+	url = http://www.maefloresta.com/tupi
 	arch = i686
 	arch = x86_64
 	license = GPL3
@@ -13,15 +14,15 @@ pkgbase = tupi-git
 	makedepends = libgl
 	depends = qt5-multimedia
 	depends = qt5-svg
-	depends = quazip-qt5
+	depends = quazip
 	depends = ffmpeg
 	depends = shared-mime-info
 	provides = tupi
 	conflicts = tupi
-	source = git://anongit.kde.org/tupi
+	source = git+https://github.com/xtingray/tupi.git
 	source = quazip5.patch
 	md5sums = SKIP
-	md5sums = c8e05ddef493102349e3f15b07e0c6e2
+	md5sums = b5da9bd90ef57e6778f4e281572da3eb
 
 pkgname = tupi-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 903102a4062d..8d79430f8e30 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,22 @@
 # Contributor: Ninez <triplesquarednine AT gmail DOT com>
 # Contributor: N30N <archlinux@alunamation.com>
+# Contributor: sekret (AUR)
 # Maintainer: SanskritFritz (gmail)
 
-pkgname="tupi-git"
-pkgver=156.11cadda
-pkgrel=4
-pkgdesc="A 2D animation tool for 8-100 years old kids."
-url="http://www.maefloresta.com/"
+pkgname=tupi-git
+pkgver=0.2.git04.251.gdcd31b64
+pkgrel=1
+pkgdesc="A design and authoring tool for digital artists interested in 2D animation."
+url="http://www.maefloresta.com/tupi"
 license=("GPL3")
 arch=("i686" "x86_64")
-depends=("qt5-multimedia" "qt5-svg" "quazip-qt5" "ffmpeg" "shared-mime-info")
+depends=("qt5-multimedia" "qt5-svg" "quazip" "ffmpeg" "shared-mime-info")
 provides=("tupi")
 conflicts=("tupi")
 makedepends=("git" "ruby" "zlib" "libgl")
-source=("git://anongit.kde.org/tupi" "quazip5.patch")
+source=("git+https://github.com/xtingray/tupi.git" "quazip5.patch")
 md5sums=('SKIP'
-         'c8e05ddef493102349e3f15b07e0c6e2')
-install="tupi.install"
+         'b5da9bd90ef57e6778f4e281572da3eb')
 
 prepare() {
 	cd tupi
@@ -25,17 +25,15 @@ prepare() {
 
 pkgver() {
 	cd tupi
-	echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
+	git describe | sed -r 's/^v//;s/-/./g'
 }
 
 build() {
 	cd tupi
 	./configure \
-		--prefix="/usr" \
 		--libdir="/usr/lib" \
-		--with-quazip="/usr" \
-		# --sharedir="/usr/share/tupi"
-		# --with-debug \
+		--sharedir="/usr/share/tupi" \
+		--without-debug
 	make
 }
 
@@ -44,4 +42,7 @@ package() {
 	make DESTDIR="$pkgdir" install
 
 	sed "s|$pkgdir||" -i "$pkgdir/usr/bin/tupi"
+
+	mkdir -p "$pkgdir/etc/ld.so.conf.d"
+	echo "/usr/lib/tupi" > "$pkgdir/etc/ld.so.conf.d/tupi.conf"
 }
diff --git a/quazip5.patch b/quazip5.patch
index cd82c6157965..dc56e7b53f16 100644
--- a/quazip5.patch
+++ b/quazip5.patch
@@ -1,5 +1,5 @@
 diff --git a/configure.rb b/configure.rb
-index 1df69be..c6329be 100755
+index 23f3dcc9..951db1fa 100755
 --- a/configure.rb
 +++ b/configure.rb
 @@ -108,7 +108,7 @@ _EOH_
@@ -11,8 +11,23 @@ index 1df69be..c6329be 100755
            config.addLib("-L" + quazipLib)
            config.addIncludePath(quazipInclude)
         else
+diff --git a/configure.tests/quazip/main.cpp b/configure.tests/quazip/main.cpp
+index f9ec3753..cf1820da 100644
+--- a/configure.tests/quazip/main.cpp
++++ b/configure.tests/quazip/main.cpp
+@@ -33,8 +33,8 @@
+  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
+  ***************************************************************************/
+ 
+-#include "quazip/quazip.h"
+-#include "quazip/quazipfile.h"
++#include "quazip5/quazip.h"
++#include "quazip5/quazipfile.h"
+ #include <QFile>
+ 
+ int main()
 diff --git a/configure.tests/quazip/quazip.pro b/configure.tests/quazip/quazip.pro
-index 4db2eeb..b9e21fa 100755
+index 4db2eeb8..b9e21faa 100755
 --- a/configure.tests/quazip/quazip.pro
 +++ b/configure.tests/quazip/quazip.pro
 @@ -10,7 +10,7 @@ macx {
@@ -25,7 +40,7 @@ index 4db2eeb..b9e21fa 100755
  
  LIBS += -lz
 diff --git a/configure.tests/quazip/quazip.qonf b/configure.tests/quazip/quazip.qonf
-index 7d259a8..da8aa2c 100755
+index 7d259a82..da8aa2ca 100755
 --- a/configure.tests/quazip/quazip.qonf
 +++ b/configure.tests/quazip/quazip.qonf
 @@ -8,7 +8,7 @@
@@ -38,10 +53,10 @@ index 7d259a8..da8aa2c 100755
  	</provide>
  	<solution>
 diff --git a/qonf/test.rb b/qonf/test.rb
-index 79a7ecc..9e43036 100755
+index ba63f319..d746377c 100755
 --- a/qonf/test.rb
 +++ b/qonf/test.rb
-@@ -98,15 +98,15 @@ class Test
+@@ -98,12 +98,12 @@ class Test
                        if conf.hasArgument?("with-quazip")
                           quazipDir = conf.argumentValue("with-quazip")
                           quazipLib = quazipDir + "/lib"
@@ -52,24 +67,35 @@ index 79a7ecc..9e43036 100755
                           qmakeLine = "'LIBS += #{extraLib}'"
                           qmakeLine += " 'INCLUDEPATH += #{extraInclude}'"
                        else
-                          if parser.os.eql? "14.10" 
--                            extraLib = "-lquazip-qt5"
-+                            extraLib = "-lquazip5"
-                          else
--                            extraLib = "-lquazip"
-+                            extraLib = "-lquazip5"
-                          end
+-                         extraLib = "-lquazip-qt5"
++                         extraLib = "-lquazip5"
                           qmakeLine = "'LIBS += #{extraLib}'"
                        end
-@@ -178,9 +178,9 @@ class Test
+                    else
+@@ -174,9 +174,9 @@ class Test
          }
  
-         if parser.os.eql? "14.10"
--           config.addLib("-lquazip-qt5")
+         if conf.hasArgument?("with-quazip")
+-           config.addLib("-lquazip")
 +           config.addLib("-lquazip5")
          else
--           config.addLib("-lquazip")
+-           config.addLib("-lquazip-qt5")
 +           config.addLib("-lquazip5")
          end
-         
-         parser.defines.each { |define|
+ 
+         # config.addLib("-lquazip-qt5")
+diff --git a/src/libtupi/tuppackagehandler.h b/src/libtupi/tuppackagehandler.h
+index 413bae8a..5e623971 100644
+--- a/src/libtupi/tuppackagehandler.h
++++ b/src/libtupi/tuppackagehandler.h
+@@ -38,8 +38,8 @@
+ 
+ #include "tglobal.h"
+ #include "tapplicationproperties.h"
+-#include "quazip/quazip.h"
+-#include "quazip/quazipfile.h"
++#include "quazip5/quazip.h"
++#include "quazip5/quazipfile.h"
+ 
+ // SQA: Pending to enable in the future
+ // #include "quazip/JlCompress.h"
diff --git a/tupi.install b/tupi.install
deleted file mode 100644
index 6210bd0ab082..000000000000
--- a/tupi.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}