[arch-commits] Commit in libkate/repos/extra-x86_64 (4 files)
David Runge
dvzrv at gemini.archlinux.org
Sat Feb 19 19:54:03 UTC 2022
Date: Saturday, February 19, 2022 @ 19:54:02
Author: dvzrv
Revision: 437776
archrelease: copy trunk to extra-x86_64
Added:
libkate/repos/extra-x86_64/0001-Fix-automake-warnings.patch
(from rev 437775, libkate/trunk/0001-Fix-automake-warnings.patch)
libkate/repos/extra-x86_64/PKGBUILD
(from rev 437775, 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 | 110 +++++++++++++++---------
2 files changed, 156 insertions(+), 122 deletions(-)
Deleted: 0001-Fix-automake-warnings.patch
===================================================================
--- 0001-Fix-automake-warnings.patch 2022-02-19 19:53:36 UTC (rev 437775)
+++ 0001-Fix-automake-warnings.patch 2022-02-19 19:54:02 UTC (rev 437776)
@@ -1,84 +0,0 @@
-From f86958231c2e5d3172554976a88f8cb552109079 Mon Sep 17 00:00:00 2001
-From: Jelle van der Waa <jelle at vdwaa.nl>
-Date: Wed, 21 Jun 2017 21:42:57 +0200
-Subject: [PATCH] Fix automake warnings
-
-Signed-off-by: Jelle van der Waa <jelle at 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 437775, libkate/trunk/0001-Fix-automake-warnings.patch)
===================================================================
--- 0001-Fix-automake-warnings.patch (rev 0)
+++ 0001-Fix-automake-warnings.patch 2022-02-19 19:54:02 UTC (rev 437776)
@@ -0,0 +1,84 @@
+From f86958231c2e5d3172554976a88f8cb552109079 Mon Sep 17 00:00:00 2001
+From: Jelle van der Waa <jelle at vdwaa.nl>
+Date: Wed, 21 Jun 2017 21:42:57 +0200
+Subject: [PATCH] Fix automake warnings
+
+Signed-off-by: Jelle van der Waa <jelle at 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 2022-02-19 19:53:36 UTC (rev 437775)
+++ PKGBUILD 2022-02-19 19:54:02 UTC (rev 437776)
@@ -1,38 +0,0 @@
-# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
-# Contributor: N30N <archlinux at alunamation.com>
-# Contributor: linkmauve <linkmauve at linkmauve.fr>
-# Contributor: mokkurkalve <xenofil at 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"
-}
Copied: libkate/repos/extra-x86_64/PKGBUILD (from rev 437775, libkate/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-02-19 19:54:02 UTC (rev 437776)
@@ -0,0 +1,72 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: N30N <archlinux at alunamation.com>
+# Contributor: linkmauve <linkmauve at linkmauve.fr>
+# Contributor: mokkurkalve <xenofil at gmail.com>
+
+pkgbase=libkate
+pkgname=(libkate libkate-docs)
+pkgver=0.4.1
+pkgrel=8
+pkgdesc="A karaoke and text codec for embedding in ogg"
+license=(BSD)
+url="https://wiki.xiph.org/OggKate"
+arch=(x86_64)
+makedepends=(libpng libogg)
+options=(debug)
+source=(
+ https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/$pkgname/$pkgname-$pkgver.tar.gz
+ 0001-Fix-automake-warnings.patch
+)
+sha512sums=('2635237753abc0f6c43fc07bd0ecc57c2f3c893efa6c62ad08de9191045612477302ed45acd61cdfea7447efd654ebbe0ed2d6a2cbf867eb834581d7ee43377b'
+ '525d120cddd040441859f2783e6e566da631ba304074bfa40a34399879fc3053577e8e71ef804168aeef519fac62e205829b50a61d770cddd46f7dbfba660842')
+b2sums=('99e755a365fcd9983fcce59f38a313b4c0c23c3a274e3b98c8756aafae29d19dc3ed3d200cf2207dd2d4985d8e99ec0d47dcdadc273a78ff84c4be11330b1e0a'
+ '57869bb321ca84e3ed23a5d9f2a234421da7d1979e46a357862c6376c7fb5e70336600ef834781daaf4e4d5094b41324a5374cf249ce108ec158fbf0369925eb')
+
+_pick() {
+ local p="$1" f d; shift
+ for f; do
+ d="$srcdir/$p/${f#$pkgdir/}"
+ mkdir -p "$(dirname "$d")"
+ mv "$f" "$d"
+ rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
+ done
+}
+
+prepare() {
+ cd $pkgbase-$pkgver
+ patch -Np1 -i ../0001-Fix-automake-warnings.patch
+ autoreconf -fiv
+}
+
+build() {
+ cd $pkgbase-$pkgver
+ ./configure --prefix=/usr \
+ --disable-static \
+ --disable-doc
+ make
+}
+
+package_libkate() {
+ depends=(glibc)
+ optdepends=(
+ 'libkate-docs: for developer documentation'
+ 'libogg: for katalyzer, katedec and kateenc'
+ 'libpng: for kateenc'
+ )
+ provides=(libkate.so liboggkate.so)
+
+ make DESTDIR="$pkgdir" install -C $pkgbase-$pkgver
+ install -vDm 644 $pkgbase-$pkgver/COPYING -t "$pkgdir/usr/share/licenses/$pkgbase"
+ rm -v "$pkgdir/usr/share/man/man1/KateDJ.1"
+
+ cd "$pkgdir"
+ _pick docs usr/share/doc/$pkgbase/html
+}
+
+package_libkate-docs() {
+ pkgdesc+=' - developer documentation'
+
+ mv -v docs/* "$pkgdir"
+ install -vDm 644 $pkgbase-$pkgver/COPYING -t "$pkgdir/usr/share/licenses/$pkgname"
+}
More information about the arch-commits
mailing list