X-Original-To: alpine-aports@mail.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id 1EC1BDC0BC2 for ; Tue, 2 Feb 2016 15:02:15 +0000 (UTC) Received: from mail-lb0-f175.google.com (mail-lb0-f175.google.com [209.85.217.175]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 62A00DC0080 for ; Tue, 2 Feb 2016 15:02:11 +0000 (UTC) Received: by mail-lb0-f175.google.com with SMTP id x4so97280578lbm.0 for ; Tue, 02 Feb 2016 07:02:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=ULNazNIs90aE9VhmQSyhvdBaBHX+2FfFDKjMeSrDE8c=; b=wDnUo+q/06hQFxtGPDHQ5cQ9muZZdJ3QbLQoBCqQovRKUVOddH+ziDnrBbFfzR7BYW 2ExLKCBwkb1Z3ZDo5gxaU8B2RsZdiAV4b7QDMdWvFe+vlXdOErYdA6clb3hD3M2lCOhS oUD/P22xEmd/65WjSX4WdrxIgRUMuwcSCxTh3yTwVPSqt/ekkS3peBvIXyHebXkmYGQT hjyUc7Eoerqid52i3lmwVNaQlkyN9LQJhH6bNWw31PNhktvYIqUFI56CBWQRohEpDuOl mhD1qF8X8uBU+8q+LMd+x4yLm8wO/TXRQSxTkO4zYPR8FF2HpqvbABk2gbKdzLOs/GKT +7WA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=ULNazNIs90aE9VhmQSyhvdBaBHX+2FfFDKjMeSrDE8c=; b=MIRGzOllGxni+IuEd1bHmRz3/ZvqINuvH11dBp21SVvKT6ZU/KnlT6oqR5iRRPXoPd UqGv8OL8nfQapxTerejHQbOoI6UMD4NKbXASJ7f10jkX/6jqmkOuuOxzdeHIxA+sXcDr Z6wy4Ppr9NESp0fYRYg9UpNzznNabN5SmDDuNW99cFLRvAr6ruK8a0Vo2Bc+fdRNtyhP BIptXr1BwIzZRtrAKENo3yxZZs6mEnUmx5O5qTN5c59+xY6Fvp48hk9ZEF52ETz25YLn kKgbH0Dz8L9mZEUMi3nJfsTcqK2ogoFq1m+ehuDtHAV14sccetk3R/B6hhw8xlsTewMh nKjw== X-Gm-Message-State: AG10YOTpp/imzOq1i6F2p5qmsoE6uwj3u3kdt5rDo4UnTpk6y4wcEM96nizP/oLqzxENwOtpZpCwk+300cEvJg== X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 X-Received: by 10.112.171.4 with SMTP id aq4mr11245205lbc.85.1454425327620; Tue, 02 Feb 2016 07:02:07 -0800 (PST) Received: by 10.25.39.4 with HTTP; Tue, 2 Feb 2016 07:02:07 -0800 (PST) In-Reply-To: <20160202153907.76279b47@ncopa-desktop.alpinelinux.org> References: <1453802141-25460-1-git-send-email-valery.kartel@gmail.com> <20160202153907.76279b47@ncopa-desktop.alpinelinux.org> Date: Tue, 2 Feb 2016 17:02:07 +0200 Message-ID: Subject: Re: [alpine-aports] [PATCH] main/rrdtool: [V2] upgrade to 1.5.5, fix makedepends, split to subpackages, remove patches From: Valery Kartel To: Natanael Copa Cc: alpine-aports@lists.alpinelinux.org Content-Type: multipart/alternative; boundary=001a11c38156015c3c052acac984 X-Virus-Scanned: ClamAV using ClamSMTP --001a11c38156015c3c052acac984 Content-Type: text/plain; charset=UTF-8 I don't think a choosen one font is need to be hardcoded as dependency. IMHO, it's better to make empty rrdtool-fonts subpackage with font dependency About other, I reconsider my own doings ... 2016-02-02 16:39 GMT+02:00 Natanael Copa : > On Tue, 26 Jan 2016 11:55:41 +0200 > Valery Kartel wrote: > > > - remove all unneeded patches > > - add libxml2-dev to makedepends > > - rrdtool library moved to librrd subpackage > > - rrdtool_th threaded library moved to librrd-th subpackage > > - rrdcgi web-page template parser moved to -cgi subpackage > > - rrdcached daemon moved to -cached subpackage with init script and > needed folders created > > - standalone utilities (rrdcreate,rrdupdate,rrdinfo) are moved to -utils > subpackage > > --- > > main/rrdtool/APKBUILD | 79 > ++++++++++++++++++++++++----------- > > main/rrdtool/libm-underlinking.patch | 11 ----- > > main/rrdtool/lua-install-cmod.patch | 13 ------ > > main/rrdtool/no-posix-fallocate.patch | 12 ------ > > main/rrdtool/rrdcached.initd | 17 ++++++++ > > 5 files changed, 72 insertions(+), 60 deletions(-) > > delete mode 100644 main/rrdtool/libm-underlinking.patch > > delete mode 100644 main/rrdtool/lua-install-cmod.patch > > delete mode 100644 main/rrdtool/no-posix-fallocate.patch > > create mode 100644 main/rrdtool/rrdcached.initd > > > > diff --git a/main/rrdtool/APKBUILD b/main/rrdtool/APKBUILD > > index 7fa5287..c1d468c 100644 > > --- a/main/rrdtool/APKBUILD > > +++ b/main/rrdtool/APKBUILD > > @@ -1,24 +1,23 @@ > > +# Contributor: Valery Kartel > > # Maintainer: Natanael Copa > > pkgname=rrdtool > > -pkgver=1.5.4 > > +pkgver=1.5.5 > > pkgrel=0 > > pkgdesc="Data logging and graphing application" > > url="http://www.rrdtool.org" > > arch="all" > > license="GPL" > > -depends="font-sony-misc" > > -makedepends="libart-lgpl-dev libpng-dev freetype-dev perl-dev cairo-dev > > - pango-dev lua lua-dev python-dev groff > > - autoconf automake libtool" > > -subpackages="$pkgname-dev $pkgname-doc perl-rrd:perl_rrd > lua-rrd:lua_rrd py-rrd:py_rrd" > > +depends= > > Is font-sony-misc no longer needed? > https://bugs.alpinelinux.org/issues/1475 > > > > +depends_dev= > > +makedepends="$depends_dev groff autoconf automake libtool > libart-lgpl-dev libpng-dev freetype-dev > > + perl-dev cairo-dev libxml2-dev pango-dev lua-dev python-dev" > > +subpackages="$pkgname-doc $pkgname-dev $pkgname-cached $pkgname-cgi > $pkgname-utils > > + perl-rrd:perl_rrd lua-rrd:lua_rrd py-rrd:py_rrd librrd-th:libth > librrd:libs" > > source="http://oss.oetiker.ch/$pkgname/pub/$pkgname-$pkgver.tar.gz > > - lua-install-cmod.patch > > - libm-underlinking.patch > > - no-posix-fallocate.patch > > + rrdcached.initd > > " > > > > _builddir="$srcdir"/$pkgname-$pkgver > > - > > prepare() { > > cd "$_builddir" > > for i in $source; do > > @@ -42,6 +41,7 @@ build() { > > --enable-perl-site-install \ > > --enable-lua-site-install \ > > --with-perl-options="INSTALLDIRS=vendor" \ > > + --with-pic \ > > why is --with-pic needed? if gcc does not by default build with pic > then please report it as a bug. > > > || return 1 > > make || return 1 > > } > > @@ -52,12 +52,37 @@ package() { > > make DESTDIR="$pkgdir" install || return 1 > > find "$pkgdir" -name '.packlist' -delete > > find "$pkgdir" -name 'perllocal.pod' -delete > > + rm "$pkgdir"/usr/lib/*.la > > I think recent abuild does this automatically for you. > > -nc > --001a11c38156015c3c052acac984 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
I don't think a choosen one font is need to = be hardcoded as dependency.
IMHO, it's better to make empty rr= dtool-fonts subpackage with font dependency

About other, I rec= onsider my own doings ...

2016-02-02 16:39 GMT+02:00 Natanael Copa <ncopa@alp= inelinux.org>:
On Tue, 26 Jan 2016 11:55:41 +0200
Valery Kartel <valery.kartel@= gmail.com> wrote:

> - remove all unneeded patches
> - add libxml2-dev to makedepends
> - rrdtool library moved to librrd subpackage
> - rrdtool_th threaded library moved to librrd-th subpackage
> - rrdcgi web-page template parser moved to -cgi subpackage
> - rrdcached daemon moved to -cached subpackage with init script and ne= eded folders created
> - standalone utilities (rrdcreate,rrdupdate,rrdinfo) are moved to -uti= ls subpackage
> ---
>=C2=A0 main/rrdtool/APKBUILD=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0| 79 ++++++++++++++++++++++++-----------
>=C2=A0 main/rrdtool/libm-underlinking.patch=C2=A0 | 11 -----
>=C2=A0 main/rrdtool/lua-install-cmod.patch=C2=A0 =C2=A0| 13 ------
>=C2=A0 main/rrdtool/no-posix-fallocate.patch | 12 ------
>=C2=A0 main/rrdtool/rrdcached.initd=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 |= 17 ++++++++
>=C2=A0 5 files changed, 72 insertions(+), 60 deletions(-)
>=C2=A0 delete mode 100644 main/rrdtool/libm-underlinking.patch
>=C2=A0 delete mode 100644 main/rrdtool/lua-install-cmod.patch
>=C2=A0 delete mode 100644 main/rrdtool/no-posix-fallocate.patch
>=C2=A0 create mode 100644 main/rrdtool/rrdcached.initd
>
> diff --git a/main/rrdtool/APKBUILD b/main/rrdtool/APKBUILD
> index 7fa5287..c1d468c 100644
> --- a/main/rrdtool/APKBUILD
> +++ b/main/rrdtool/APKBUILD
> @@ -1,24 +1,23 @@
> +# Contributor: Valery Kartel <valery.kartel@gmail.com>
>=C2=A0 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
>=C2=A0 pkgname=3Drrdtool
> -pkgver=3D1.5.4
> +pkgver=3D1.5.5
>=C2=A0 pkgrel=3D0
>=C2=A0 pkgdesc=3D"Data logging and graphing application"
>=C2=A0 url=3D"http://www.rrdtool.org"
>=C2=A0 arch=3D"all"
>=C2=A0 license=3D"GPL"
> -depends=3D"font-sony-misc"
> -makedepends=3D"libart-lgpl-dev libpng-dev freetype-dev perl-dev = cairo-dev
> -=C2=A0 =C2=A0 =C2=A0pango-dev lua lua-dev python-dev groff
> -=C2=A0 =C2=A0 =C2=A0autoconf automake libtool"
> -subpackages=3D"$pkgname-dev $pkgname-doc perl-rrd:perl_rrd lua-r= rd:lua_rrd py-rrd:py_rrd"
> +depends=3D

Is font-sony-misc no longer needed?
https://bugs.alpinelinux.org/issues/1475


> +depends_dev=3D
> +makedepends=3D"$depends_dev groff autoconf automake libtool liba= rt-lgpl-dev libpng-dev freetype-dev
> +=C2=A0 =C2=A0 =C2=A0perl-dev cairo-dev libxml2-dev pango-dev lua-dev = python-dev"
> +subpackages=3D"$pkgname-doc $pkgname-dev $pkgname-cached $pkgnam= e-cgi $pkgname-utils
> +=C2=A0 =C2=A0 =C2=A0 perl-rrd:perl_rrd lua-rrd:lua_rrd py-rrd:py_rrd = librrd-th:libth librrd:libs"
>=C2=A0 source=3D"http://oss.oetik= er.ch/$pkgname/pub/$pkgname-$pkgver.tar.gz
> -=C2=A0 =C2=A0 =C2=A0lua-install-cmod.patch
> -=C2=A0 =C2=A0 =C2=A0libm-underlinking.patch
> -=C2=A0 =C2=A0 =C2=A0no-posix-fallocate.patch
> +=C2=A0 =C2=A0 =C2=A0rrdcached.initd
>=C2=A0 =C2=A0 =C2=A0 =C2=A0"
>
>=C2=A0 _builddir=3D"$srcdir"/$pkgname-$pkgver
> -
>=C2=A0 prepare() {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0cd "$_builddir"
>=C2=A0 =C2=A0 =C2=A0 =C2=A0for i in $source; do
> @@ -42,6 +41,7 @@ build() {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--enable-perl-si= te-install \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--enable-lua-sit= e-install \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--with-perl-opti= ons=3D"INSTALLDIRS=3Dvendor" \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--with-pic \

why is --with-pic needed? if gcc does not by default build with pic<= br> then please report it as a bug.

>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|| return 1
>=C2=A0 =C2=A0 =C2=A0 =C2=A0make || return 1
>=C2=A0 }
> @@ -52,12 +52,37 @@ package() {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0make DESTDIR=3D"$pkgdir" install |= | return 1
>=C2=A0 =C2=A0 =C2=A0 =C2=A0find "$pkgdir" -name '.packlis= t' -delete
>=C2=A0 =C2=A0 =C2=A0 =C2=A0find "$pkgdir" -name 'perlloca= l.pod' -delete
> +=C2=A0 =C2=A0 =C2=A0rm "$pkgdir"/usr/lib/*.la

I think recent abuild does this automatically for you.

-nc

--001a11c38156015c3c052acac984-- --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---