Update PKGBUILD

3 files changed, 129 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 12ce78355d31..c176a9e12e37 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 pkgbase = lib32-libkate
 	pkgdesc = A karaoke and text codec for embedding in ogg (32-bit)
 	pkgver = 0.4.1
-	pkgrel = 2
-	url = https://code.google.com/archive/p/libkate/
+	pkgrel = 3
+	url = https://wiki.xiph.org/OggKate
 	arch = x86_64
 	license = BSD
 	makedepends = pkg-config
-	depends = lib32-libpng
+	makedepends = git
 	depends = lib32-libogg
-	depends = lib32-python2
+	depends = lib32-libpng
 	depends = libkate
-	optdepends = wxpython: for KateDJ
-	optdepends = liboggz: for KateDJ
-	source = https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libkate/libkate-0.4.1.tar.gz
-	md5sums = 1dfdbdeb2fa5d07063cf5b8261111fca
+	source = libkate::git+git://git.xiph.org/users/oggk/kate.git#tag=kate-0.4.1
+	source = 0001-Fix-automake-warnings.patch
+	sha512sums = SKIP
+	sha512sums = 525d120cddd040441859f2783e6e566da631ba304074bfa40a34399879fc3053577e8e71ef804168aeef519fac62e205829b50a61d770cddd46f7dbfba660842
 
 pkgname = lib32-libkate
 
diff --git a/0001-Fix-automake-warnings.patch b/0001-Fix-automake-warnings.patch
new file mode 100644
index 000000000000..8360c6456c52
--- /dev/null
+++ b/0001-Fix-automake-warnings.patch
@@ -0,0 +1,84 @@
+From f86958231c2e5d3172554976a88f8cb552109079 Mon Sep 17 00:00:00 2001
+From: Jelle van der Waa <jelle@vdwaa.nl>
+Date: Wed, 21 Jun 2017 21:42:57 +0200
+Subject: [PATCH] Fix automake warnings
+
+Signed-off-by: Jelle van der Waa <jelle@vdwaa.nl>
+---
+ Makefile.am       | 2 --
+ configure.ac      | 3 ++-
+ doc/Makefile.am   | 2 --
+ tests/Makefile.am | 2 --
+ tools/Makefile.am | 2 --
+ 5 files changed, 2 insertions(+), 9 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 12a85d3..c137e1d 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -16,8 +16,6 @@ katepc_DATA+=misc/pkgconfig/oggkate.pc
+ noinst_DATA+=misc/pkgconfig/oggkate-uninstalled.pc
+ endif
+ 
+-LIBTOOLFLAGS=--silent
+-
+ AM_CPPFLAGS=-I $(top_srcdir)/src -I $(top_srcdir)/include
+ 
+ lib_libkate_la_SOURCES=\
+diff --git a/configure.ac b/configure.ac
+index 58ff478..0234255 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -7,7 +7,7 @@ AC_PREREQ(2.53)
+ 
+ AC_CANONICAL_TARGET
+ 
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
++AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects -Wno-portability])
+ AC_CONFIG_HEADERS([include/config.h])
+ 
+ ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])
+@@ -27,6 +27,7 @@ dnl     then set AGE to 0.
+ LIBKATE_SHARED_VERSION="4:0:3"
+ LIBOGGKATE_SHARED_VERSION="3:2:2"
+ 
++AM_PROG_AR
+ AC_PROG_CC_C_O
+ AC_LIBTOOL_DLOPEN
+ AC_PROG_LIBTOOL
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 693f2fc..f519c08 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,5 +1,3 @@
+-LIBTOOLFLAGS=--silent
+-
+ man_MANS=man/kateenc.1 man/katedec.1 man/katalyzer.1 man/KateDJ.1
+ 
+ # dependency to get doc to be built
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 4fa768a..31d3434 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -1,5 +1,3 @@
+-LIBTOOLFLAGS=--silent
+-
+ AM_CPPFLAGS=-I $(top_srcdir)/src -I $(top_srcdir)/include
+ 
+ LIBKATE=../lib/libkate.la
+diff --git a/tools/Makefile.am b/tools/Makefile.am
+index 2be12a3..01c3d7b 100644
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -2,8 +2,6 @@ if HAVE_PYTHON
+ SUBDIRS=KateDJ
+ endif
+ 
+-LIBTOOLFLAGS=--silent
+-
+ AM_CPPFLAGS=-I $(top_srcdir)/src -I $(top_srcdir)/include -I $(top_srcdir)/tools
+ 
+ noinst_HEADERS=\
+-- 
+2.13.1
+
diff --git a/PKGBUILD b/PKGBUILD
index 2fb119c9a19c..e85a43bfeae8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,45 +1,55 @@
-# Maintainer: orumin <dev@orum.in>
+# Maintainer: Rodrigo Bezerra <rodrigobezerra21 at gmail dot com>
+# Contributor: orumin <dev@orum.in>
 
 _basename=libkate
 pkgname="lib32-$_basename"
 pkgver=0.4.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A karaoke and text codec for embedding in ogg (32-bit)"
-url="https://code.google.com/archive/p/libkate/"
+url="https://wiki.xiph.org/OggKate"
 license=('BSD')
 arch=('x86_64')
-depends=('lib32-libpng' 'lib32-libogg' 'lib32-python2' "$_basename")
-makedepends=('pkg-config')
-optdepends=('wxpython: for KateDJ'
-            'liboggz: for KateDJ')
-source=("https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/$_basename/$_basename-$pkgver.tar.gz")
-md5sums=('1dfdbdeb2fa5d07063cf5b8261111fca')
+depends=('lib32-libogg' 'lib32-libpng' 'libkate')
+makedepends=('pkg-config' 'git')
+source=("$_basename::git+git://git.xiph.org/users/oggk/kate.git#tag=kate-${pkgver}"
+        0001-Fix-automake-warnings.patch)
+sha512sums=('SKIP'
+            '525d120cddd040441859f2783e6e566da631ba304074bfa40a34399879fc3053577e8e71ef804168aeef519fac62e205829b50a61d770cddd46f7dbfba660842')
+
+prepare() {
+    cd $_basename
+
+    patch -Np1 -i "$srcdir/0001-Fix-automake-warnings.patch"
+
+    ./autogen.sh
+}
 
 build() {
-  cd "${srcdir}/${_basename}-${pkgver}"
+    cd $_basename
 
-  export PYTHON="/usr/bin/python2"
-  sed "1s/python$/python2/" -i tools/KateDJ/KateDJ
+    export CC='gcc -m32'
+    export CXX='g++ -m32'
+    export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
 
-  export CC='gcc -m32'
-  export CXX='g++ -m32'
-  export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
+    ./configure \
+        --build=i686-pc-linux-gnu \
+        --prefix=/usr \
+        --libdir=/usr/lib32 \
+        --disable-static \
+        --disable-doc
 
-  ./configure --prefix=/usr \
-              --libdir=/usr/lib32 \
-              --build=i686-pc-linux-gnu \
-              --disable-static \
-              --disable-doc
-  make
+    make
 }
 
 package() {
-  cd $_basename-$pkgver
-  make DESTDIR="${pkgdir}" install
+    cd $_basename
+
+    make DESTDIR=$pkgdir install
+
+    install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
-  python2-32 -m compileall "${pkgdir}/usr/lib/python2.7/site-packages/kdj/"
+    cd "$pkgdir/usr"
 
-  cd "$pkgdir"/usr
-  mv lib/* lib32
-  rm -r bin lib include share
+    mv lib lib32
+    rm -r bin include lib32/lib share/{doc,man}
 }