tupi-0.2.9-1: updating version

3 files changed, 132 insertions, 57 deletions

diff --git a/pcr/tupi/PKGBUILD b/pcr/tupi/PKGBUILD
index 94c635cd4..f42e7ae5a 100644
--- a/pcr/tupi/PKGBUILD
+++ b/pcr/tupi/PKGBUILD
@@ -1,55 +1,42 @@
-# Maintainer: Márcio Silva <coadde@hyperbola.info>
+# Contributor (Arch): Ninez <triplesquarednine AT gmail DOT com>
+# Contributor (Arch): N30N <archlinux@alunamation.com>
+# Contributor (Arch): sekret (AUR)
+# Maintainer (Arch): SanskritFritz (gmail)
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
-pkgname=tupi
-pkgver=0.2.git20140724
-pkgcommit=ed31be0cb13892bc6839a58da3d1570e1f49876b # July 24, 2014
+pkgname="tupi"
+pkgver=0.2.9
 pkgrel=1
-pkgdesc='Tupí is an 2D animation/drawing software (fork of KToon)'
-arch=(
-  x86_64
-  i686
-)
-url=http://www.maefloresta.com/portal/
-license=GPL2
-depends=(
-  desktop-file-utils
-  ffmpeg
-  quazip
-  qt5-multimedia
-  qt5-svg
-  shared-mime-info
-  xdg-utils
-)
-makedepends=(
-  git
-  qt5-tools
-  ruby
-)
-install=$pkgname.install
-source=$pkgname-$pkgver::git+git://anongit.kde.org/tupi#commit=$pkgcommit
-sha512sums=SKIP
+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" "ffmpeg" "shared-mime-info")
+makedepends=("ruby" "zlib" "libgl")
+source=("http://sourceforge.net/projects/tupi2d/files/Source%20Code/tupi-$pkgver.tar.gz" 
+        "quazip5.patch")
+sha256sums=('c4e93fe29ab277d1d0800e6f0bef0beb69c00087e58a943d863da3b099f9e30a'
+            '263e93c6cc54c6a5e19fa0b05d3f51b75e23a8f6259fe0159174152090a9efcb')
 
 prepare() {
-  cd $pkgname-$pkgver
-  # fix /lib directory path
-  sed -i 's|/lib64|/lib|' configure.rb qonf/{configure,test}.rb
-  # fix qmake path
-  sed -i 's|qmake|qmake-qt5|g' configure
-  sed -i '\|path| s|qmake|qmake-qt5|
-          s|/bin/qmake|/bin/qmake-qt5|
-         ' qonf/qmake.rb
-  # fix /usr directory path
-  sed -i 's|/opt/|/usr/|' qonf/configure.rb
+	cd tupi-$pkgver
+	patch -p1 -i ../quazip5.patch
 }
 
 build() {
-  cd $pkgname-$pkgver
-  export QTDIR=/usr
-  ./configure --prefix=/usr
-  make
+	cd tupi-$pkgver
+	./configure \
+		--libdir="/usr/lib" \
+		--sharedir="/usr/share/tupi" \
+		--without-debug
+	make
 }
 
 package() {
-  cd $pkgname-$pkgver
-  make DESTDIR=$pkgdir install
+	cd tupi-$pkgver
+	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/pcr/tupi/quazip5.patch b/pcr/tupi/quazip5.patch
new file mode 100644
index 000000000..dc56e7b53
--- /dev/null
+++ b/pcr/tupi/quazip5.patch
@@ -0,0 +1,101 @@
+diff --git a/configure.rb b/configure.rb
+index 23f3dcc9..951db1fa 100755
+--- a/configure.rb
++++ b/configure.rb
+@@ -108,7 +108,7 @@ _EOH_
+        quazipDir = conf.argumentValue("with-quazip")
+        if File.directory? quazipDir
+           quazipLib = quazipDir + "/lib"
+-          quazipInclude = quazipDir + "/include"
++          quazipInclude = quazipDir + "/include/quazip5"
+           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 4db2eeb8..b9e21faa 100755
+--- a/configure.tests/quazip/quazip.pro
++++ b/configure.tests/quazip/quazip.pro
+@@ -10,7 +10,7 @@ macx {
+ }
+ 
+ unix:!macx {
+-  INCLUDEPATH += /usr/include/quazip
++  INCLUDEPATH += /usr/include/quazip5
+ }
+ 
+ LIBS += -lz
+diff --git a/configure.tests/quazip/quazip.qonf b/configure.tests/quazip/quazip.qonf
+index 7d259a82..da8aa2ca 100755
+--- a/configure.tests/quazip/quazip.qonf
++++ b/configure.tests/quazip/quazip.qonf
+@@ -8,7 +8,7 @@
+ 			<define value="HAVE_QUAZIP" />
+ 		</defines>
+                 <includes>
+-                        <include path="/usr/include/quazip/" />
++                        <include path="/usr/include/quazip5/" />
+                 </includes>
+ 	</provide>
+ 	<solution>
+diff --git a/qonf/test.rb b/qonf/test.rb
+index ba63f319..d746377c 100755
+--- a/qonf/test.rb
++++ b/qonf/test.rb
+@@ -98,12 +98,12 @@ class Test
+                       if conf.hasArgument?("with-quazip")
+                          quazipDir = conf.argumentValue("with-quazip")
+                          quazipLib = quazipDir + "/lib"
+-                         extraLib += "-L#{quazipLib} -lquazip"
+-                         extraInclude = quazipDir + "/include"
++                         extraLib += "-L#{quazipLib} -lquazip5"
++                         extraInclude = quazipDir + "/include/quazip5"
+                          qmakeLine = "'LIBS += #{extraLib}'"
+                          qmakeLine += " 'INCLUDEPATH += #{extraInclude}'"
+                       else
+-                         extraLib = "-lquazip-qt5"
++                         extraLib = "-lquazip5"
+                          qmakeLine = "'LIBS += #{extraLib}'"
+                       end
+                    else
+@@ -174,9 +174,9 @@ class Test
+         }
+ 
+         if conf.hasArgument?("with-quazip")
+-           config.addLib("-lquazip")
++           config.addLib("-lquazip5")
+         else
+-           config.addLib("-lquazip-qt5")
++           config.addLib("-lquazip5")
+         end
+ 
+         # 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/pcr/tupi/tupi.install b/pcr/tupi/tupi.install
deleted file mode 100644
index 724bfce00..000000000
--- a/pcr/tupi/tupi.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}