Date: Friday, February 7, 2020 @ 18:41:27 Author: heftig Revision: 374979
archrelease: copy trunk to extra-x86_64 Added: libkate/repos/extra-x86_64/0001-Fix-automake-warnings.patch (from rev 374978, libkate/trunk/0001-Fix-automake-warnings.patch) libkate/repos/extra-x86_64/PKGBUILD (from rev 374978, libkate/trunk/PKGBUILD) Deleted: libkate/repos/extra-x86_64/0001-Fix-automake-warnings.patch libkate/repos/extra-x86_64/PKGBUILD ----------------------------------+ 0001-Fix-automake-warnings.patch | 168 ++++++++++++++++++------------------- PKGBUILD | 85 ++++++++---------- 2 files changed, 122 insertions(+), 131 deletions(-) Deleted: 0001-Fix-automake-warnings.patch =================================================================== --- 0001-Fix-automake-warnings.patch 2020-02-07 18:41:09 UTC (rev 374978) +++ 0001-Fix-automake-warnings.patch 2020-02-07 18:41:27 UTC (rev 374979) @@ -1,84 +0,0 @@ -From f86958231c2e5d3172554976a88f8cb552109079 Mon Sep 17 00:00:00 2001 -From: Jelle van der Waa <je...@vdwaa.nl> -Date: Wed, 21 Jun 2017 21:42:57 +0200 -Subject: [PATCH] Fix automake warnings - -Signed-off-by: Jelle van der Waa <je...@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 - Copied: libkate/repos/extra-x86_64/0001-Fix-automake-warnings.patch (from rev 374978, libkate/trunk/0001-Fix-automake-warnings.patch) =================================================================== --- 0001-Fix-automake-warnings.patch (rev 0) +++ 0001-Fix-automake-warnings.patch 2020-02-07 18:41:27 UTC (rev 374979) @@ -0,0 +1,84 @@ +From f86958231c2e5d3172554976a88f8cb552109079 Mon Sep 17 00:00:00 2001 +From: Jelle van der Waa <je...@vdwaa.nl> +Date: Wed, 21 Jun 2017 21:42:57 +0200 +Subject: [PATCH] Fix automake warnings + +Signed-off-by: Jelle van der Waa <je...@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 + Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-02-07 18:41:09 UTC (rev 374978) +++ PKGBUILD 2020-02-07 18:41:27 UTC (rev 374979) @@ -1,47 +0,0 @@ -# $Id$ -# Maintainer: Giovanni Scafora <giova...@archlinux.org> -# Contributor: N30N <archli...@alunamation.com> -# Contributor: linkmauve <linkma...@linkmauve.fr> -# Contributor: mokkurkalve <xeno...@gmail.com> - -pkgname=libkate -pkgver=0.4.1 -pkgrel=6 -pkgdesc="A karaoke and text codec for embedding in ogg" -url="https://wiki.xiph.org/OggKate" -license=('BSD') -arch=('x86_64') -depends=('libpng' 'libogg' 'python2') -makedepends=('pkg-config' 'git') -optdepends=('wxpython: for KateDJ' - 'liboggz: for KateDJ') -source=("$pkgname::git+git://git.xiph.org/users/oggk/kate.git#tag=kate-${pkgver}" - 0001-Fix-automake-warnings.patch) -sha512sums=('SKIP' - '525d120cddd040441859f2783e6e566da631ba304074bfa40a34399879fc3053577e8e71ef804168aeef519fac62e205829b50a61d770cddd46f7dbfba660842') - -prepare() { - cd "${srcdir}/${pkgname}" - patch -Np1 -i "${srcdir}/0001-Fix-automake-warnings.patch" - ./autogen.sh -} - -build() { - cd "${srcdir}/${pkgname}" - - export PYTHON="/usr/bin/python2" - sed "1s/python$/python2/" -i tools/KateDJ/KateDJ - - ./configure --prefix=/usr \ - --disable-static \ - --disable-doc - make -} - -package() { - cd "${srcdir}/${pkgname}" - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - - python2 -m compileall "${pkgdir}/usr/lib/python2.7/site-packages/kdj/" -} Copied: libkate/repos/extra-x86_64/PKGBUILD (from rev 374978, libkate/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-02-07 18:41:27 UTC (rev 374979) @@ -0,0 +1,38 @@ +# Maintainer: Giovanni Scafora <giova...@archlinux.org> +# Contributor: N30N <archli...@alunamation.com> +# Contributor: linkmauve <linkma...@linkmauve.fr> +# Contributor: mokkurkalve <xeno...@gmail.com> + +pkgname=libkate +pkgver=0.4.1 +pkgrel=7 +pkgdesc="A karaoke and text codec for embedding in ogg" +url="https://wiki.xiph.org/OggKate" +license=('BSD') +arch=('x86_64') +depends=('libpng' 'libogg') +makedepends=('git') +source=("$pkgname::git+git://git.xiph.org/users/oggk/kate.git#tag=kate-${pkgver}" + 0001-Fix-automake-warnings.patch) +sha512sums=('SKIP' + '525d120cddd040441859f2783e6e566da631ba304074bfa40a34399879fc3053577e8e71ef804168aeef519fac62e205829b50a61d770cddd46f7dbfba660842') + +prepare() { + cd ${pkgname} + patch -Np1 -i ../0001-Fix-automake-warnings.patch +} + +build() { + cd ${pkgname} + ./autogen.sh --prefix=/usr \ + --disable-static \ + --disable-doc + make +} + +package() { + cd ${pkgname} + make DESTDIR="${pkgdir}" install + install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 COPYING + rm "${pkgdir}/usr/share/man/man1/KateDJ.1" +}