From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B386D1396D0 for ; Thu, 17 Aug 2017 22:41:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E22401FC059; Thu, 17 Aug 2017 22:41:53 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B79301FC008 for ; Thu, 17 Aug 2017 22:41:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3FF9C3418A8 for ; Thu, 17 Aug 2017 22:41:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C8E0E795F for ; Thu, 17 Aug 2017 22:41:50 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1503009705.0bb05cf38855b0e72b6ce7c8a16b1401cb70f097.eva@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/plymouth/, sys-boot/plymouth/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-boot/plymouth/files/0.9.3-glibc-sysmacros.patch sys-boot/plymouth/plymouth-0.9.3-r1.ebuild sys-boot/plymouth/plymouth-9999.ebuild X-VCS-Directories: sys-boot/plymouth/ sys-boot/plymouth/files/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 0bb05cf38855b0e72b6ce7c8a16b1401cb70f097 X-VCS-Branch: master Date: Thu, 17 Aug 2017 22:41:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3844463a-fe2d-4446-96fa-b7b9970f4725 X-Archives-Hash: d96f28ef848392a9f9a632cfcbff106a commit: 0bb05cf38855b0e72b6ce7c8a16b1401cb70f097 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Thu Aug 17 22:40:26 2017 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Thu Aug 17 22:41:45 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bb05cf3 sys-boot/plymouth: fix build with newer glibc, bug #604480 Fix missing dependency on xsltproc and XSL stylesheets as required to build man pages, bug #628078. Package-Manager: Portage-2.3.7, Repoman-2.3.3 .../plymouth/files/0.9.3-glibc-sysmacros.patch | 45 ++++++++++++++++++++++ ...ymouth-9999.ebuild => plymouth-0.9.3-r1.ebuild} | 8 +++- sys-boot/plymouth/plymouth-9999.ebuild | 3 +- 3 files changed, 53 insertions(+), 3 deletions(-) diff --git a/sys-boot/plymouth/files/0.9.3-glibc-sysmacros.patch b/sys-boot/plymouth/files/0.9.3-glibc-sysmacros.patch new file mode 100644 index 00000000000..8969161bb19 --- /dev/null +++ b/sys-boot/plymouth/files/0.9.3-glibc-sysmacros.patch @@ -0,0 +1,45 @@ +From f8d7813b32dfe129d1e5718719ee3eff131f4fac Mon Sep 17 00:00:00 2001 +From: Kjell Claesson +Date: Fri, 18 Aug 2017 00:25:56 +0200 +Subject: [PATCH] Fix build with newer glibc + +Signed-off-by: Gilles Dartiguelongue +--- + configure.ac | 1 + + src/libply-splash-core/ply-terminal.c | 8 ++++++++ + 2 files changed, 9 insertions(+) + +diff --git a/configure.ac b/configure.ac +index c32697f..8376789 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -5,6 +5,7 @@ AC_CONFIG_AUX_DIR(build-tools) + + AC_USE_SYSTEM_EXTENSIONS + AC_SYS_LARGEFILE ++AC_HEADER_MAJOR + AC_PROG_AWK + AC_PROG_CC_STDC + AM_PROG_CC_C_O +diff --git a/src/libply-splash-core/ply-terminal.c b/src/libply-splash-core/ply-terminal.c +index a0954f2..ef62bf8 100644 +--- a/src/libply-splash-core/ply-terminal.c ++++ b/src/libply-splash-core/ply-terminal.c +@@ -36,6 +36,14 @@ + #include + #include + ++/* major()/minor() */ ++#ifdef MAJOR_IN_MKDEV ++# include ++#endif ++#ifdef MAJOR_IN_SYSMACROS ++# include ++#endif ++ + #include + #include + #include +-- +2.14.1 + diff --git a/sys-boot/plymouth/plymouth-9999.ebuild b/sys-boot/plymouth/plymouth-0.9.3-r1.ebuild similarity index 89% copy from sys-boot/plymouth/plymouth-9999.ebuild copy to sys-boot/plymouth/plymouth-0.9.3-r1.ebuild index 45f6e2cec40..3f5694b8600 100644 --- a/sys-boot/plymouth/plymouth-9999.ebuild +++ b/sys-boot/plymouth/plymouth-0.9.3-r1.ebuild @@ -3,10 +3,10 @@ EAPI=6 -SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/sys-boot/plymouth/gentoo-logo.png" +SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png" if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://anongit.freedesktop.org/git/plymouth" + EGIT_REPO_URI="git://anongit.freedesktop.org/plymouth" inherit git-r3 else SRC_URI="${SRC_URI} https://www.freedesktop.org/software/plymouth/releases/${P}.tar.xz" @@ -33,6 +33,8 @@ CDEPEND=" pango? ( >=x11-libs/pango-1.21 ) " DEPEND="${CDEPEND} + app-text/docbook-xsl-stylesheets + dev-libs/libxslt virtual/pkgconfig " # Block due bug #383067 @@ -47,6 +49,7 @@ DOC_CONTENTS=" " PATCHES=( + "${FILESDIR}"/0.9.3-glibc-sysmacros.patch ) src_configure() { @@ -54,6 +57,7 @@ src_configure() { myconf="--with-system-root-install=no --localstatedir=/var --without-rhgb-compat-link + --enable-documentation --enable-systemd-integration --with-systemdunitdir="$(systemd_get_systemunitdir)" $(use_enable !static-libs shared) diff --git a/sys-boot/plymouth/plymouth-9999.ebuild b/sys-boot/plymouth/plymouth-9999.ebuild index 45f6e2cec40..49ce1012fe8 100644 --- a/sys-boot/plymouth/plymouth-9999.ebuild +++ b/sys-boot/plymouth/plymouth-9999.ebuild @@ -3,7 +3,7 @@ EAPI=6 -SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/sys-boot/plymouth/gentoo-logo.png" +SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png" if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://anongit.freedesktop.org/git/plymouth" @@ -47,6 +47,7 @@ DOC_CONTENTS=" " PATCHES=( + "${FILESDIR}"/0.9.3-glibc-sysmacros.patch ) src_configure() {