* [gentoo-commits] repo/gentoo:master commit in: sys-boot/plymouth/, sys-boot/plymouth/files/
@ 2017-02-23 12:43 Michael Weber
0 siblings, 0 replies; 3+ messages in thread
From: Michael Weber @ 2017-02-23 12:43 UTC (permalink / raw
To: gentoo-commits
commit: dc5f5087a32dcdf2c05960849a7aaba46aa35674
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 23 12:43:04 2017 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 12:43:21 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc5f5087
sys-boot/plymouth: Remove old versions.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sys-boot/plymouth/Manifest | 2 -
.../files/0.8.8-initrd-binaries-paths.patch | 32 --------
sys-boot/plymouth/plymouth-0.8.8-r4.ebuild | 90 --------------------
sys-boot/plymouth/plymouth-0.8.8-r5.ebuild | 94 ---------------------
sys-boot/plymouth/plymouth-0.9.0.ebuild | 96 ----------------------
5 files changed, 314 deletions(-)
diff --git a/sys-boot/plymouth/Manifest b/sys-boot/plymouth/Manifest
index 8967184efe..5fd1575135 100644
--- a/sys-boot/plymouth/Manifest
+++ b/sys-boot/plymouth/Manifest
@@ -1,4 +1,2 @@
DIST gentoo-logo.png 14501 SHA256 79ebc1d66693371a90e218ad421cfed05066b51a6645bd967bb7da356a0881fa SHA512 059a555931b6d2a910bcd887f5ea0cc17c6edf2d2d45c03a1fec1bdda0138ba6bca6bdf90a65c6520a3f8f1b51ecf6f7956098f45ed6c1276f29c835e729163c WHIRLPOOL 65496223badb9a96cc72ba6a2432860af0756eea57f67946d2466ff1c3c1171c84568c502aa576613b77767c41cf251856728b509c72003567d4cebd1943375e
-DIST plymouth-0.8.8.tar.bz2 1143549 SHA256 1bada4e1d3a31a5a99adc2db83f5452d9818839cda51a6e430f044f6281d759b SHA512 97a20a8622c7ea51000e9b6d88a25fd84d7001fb2727527a72344b555f389c74954bd0be0bffd9cc9175b5c5a0d28e95af058fce79ec7531f736619ee74d8d94 WHIRLPOOL badb44a6c1eb004772e67cfe3cda601d22590d813ebd4bce5f0fcb325c445246916ba30e083c6aa98b73b460ddf4f2caf9bf2727d22bbbc5414f11a5cf0e5ddf
-DIST plymouth-0.9.0.tar.bz2 1159218 SHA256 d3e22e750a8a83de7377e9fa88975f146f875bbd030055411a2faf74c2e6cd4d SHA512 046e7fb20d3a65cc2b8b378026fae6619417557502426d944e4f06078eacfa37cb5fcf886d8bdb598921bbef87ce3ec92daa16a57075a180d5f427443100c232 WHIRLPOOL 3b2e327a02c18cd436f895aa38719acd07ed06f3cbd846181190144784325e8561c1ebd97516beaa396733e9981e76f3029dc29b27f3ae32f646c087529ada0d
DIST plymouth-0.9.2.tar.bz2 1231336 SHA256 2f0ce82042cf9c7eadd2517a1f74c8a85fa8699781d9f294a06eade29fbed57f SHA512 89356eb8326504fbf3155de262ce15de0847f0a0e6d157d873cf1dea9af464a6cb9e11d7143ee9a595b217a2487060b5835eba5ac142c3cd6d66689deb272e60 WHIRLPOOL 5f9e662dec633bb606cf4246611b442a0eb9eaa92942b37c53d1c48b6ca8ef96c5f4330d574b82de6a026ca175a770c1a45f52c7809c80d026126d805e707eba
diff --git a/sys-boot/plymouth/files/0.8.8-initrd-binaries-paths.patch b/sys-boot/plymouth/files/0.8.8-initrd-binaries-paths.patch
deleted file mode 100644
index 7416527b0f..0000000000
--- a/sys-boot/plymouth/files/0.8.8-initrd-binaries-paths.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 2d85c8d0a3ad81268718344e0e72ebeeea851422 Mon Sep 17 00:00:00 2001
-From: Enrico Tagliavini <enrico.tagliavini@gmail.com>
-Date: Wed, 29 Jan 2014 14:18:22 +0000
-Subject: populate-initrd: install binaries to their configured location
-
-If plymouth is configured --with-system-root-install=no then the
-systemd unitd files will write the paths of plymouth and plymouthd
-relative to /usr . The script currently hardcodes installing them
-to the initrd's /
-
-This commit makes sure they get placed on the same part of the of
-the initrd filesystem as systemd expects to find them.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=74174
----
-diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in
-index d25ab07..43c7f22 100755
---- a/scripts/plymouth-populate-initrd.in
-+++ b/scripts/plymouth-populate-initrd.in
-@@ -373,8 +373,8 @@ done
- [ -z "$INITRDDIR" ] && usage error
-
- mkdir -p ${INITRDDIR}${PLYMOUTH_DATADIR}/plymouth/themes
--inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR /sbin/plymouthd
--inst ${PLYMOUTH_CLIENT_PATH} $INITRDDIR /bin/plymouth
-+inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR
-+inst ${PLYMOUTH_CLIENT_PATH} $INITRDDIR
- inst ${PLYMOUTH_DATADIR}/plymouth/themes/text/text.plymouth $INITRDDIR
- inst ${PLYMOUTH_PLUGIN_PATH}/text.so $INITRDDIR
- inst ${PLYMOUTH_DATADIR}/plymouth/themes/details/details.plymouth $INITRDDIR
---
-cgit v0.9.0.2-2-gbebe
diff --git a/sys-boot/plymouth/plymouth-0.8.8-r4.ebuild b/sys-boot/plymouth/plymouth-0.8.8-r4.ebuild
deleted file mode 100644
index 7d3a7729d2..0000000000
--- a/sys-boot/plymouth/plymouth-0.8.8-r4.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools-utils readme.gentoo systemd toolchain-funcs
-
-DESCRIPTION="Graphical boot animation (splash) and logger"
-HOMEPAGE="https://cgit.freedesktop.org/plymouth/"
-SRC_URI="
- https://www.freedesktop.org/software/plymouth/releases/${P}.tar.bz2
- https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
-IUSE_VIDEO_CARDS="video_cards_intel video_cards_radeon"
-IUSE="${IUSE_VIDEO_CARDS} debug gdm +gtk +libkms +pango static-libs"
-
-CDEPEND="
- >=media-libs/libpng-1.2.16
- gtk? (
- dev-libs/glib:2
- >=x11-libs/gtk+-2.12:2 )
- libkms? ( x11-libs/libdrm[libkms] )
- pango? ( >=x11-libs/pango-1.21 )
- video_cards_intel? ( x11-libs/libdrm[video_cards_intel] )
- video_cards_radeon? ( x11-libs/libdrm[video_cards_radeon] )
-"
-DEPEND="${CDEPEND}
- virtual/pkgconfig
-"
-# Block due bug #383067
-RDEPEND="${CDEPEND}
- virtual/udev
-"
-
-DOC_CONTENTS="
- Follow the following instructions to set up Plymouth:\n
- https://dev.gentoo.org/~aidecoe/doc/en/plymouth.xml
-"
-
-src_prepare() {
- sed -i 's:/bin/systemd-tty-ask-password-agent:/usr/bin/systemd-tty-ask-password-agent:g' \
- systemd-units/systemd-ask-password-plymouth.service.in || die \
- 'ask-password sed failed'
- sed -i 's:/bin/udevadm:/usr/bin/udevadm:g' \
- systemd-units/plymouth-start.service.in || die 'udevadm sed failed'
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- --with-system-root-install=no
- --localstatedir=/var
- --without-rhgb-compat-link
- --enable-systemd-integration
- $(use_enable debug tracing)
- $(use_enable gtk gtk)
- $(use_enable libkms)
- $(use_enable pango)
- $(use_enable gdm gdm-transition)
- $(use_enable video_cards_intel libdrm_intel)
- $(use_enable video_cards_radeon libdrm_radeon)
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
-
- insinto /usr/share/plymouth
- newins "${DISTDIR}"/gentoo-logo.png bizcom.png
-
- # Install compatibility symlinks as some rdeps hardcode the paths
- dosym /usr/bin/plymouth /bin/plymouth
- dosym /usr/sbin/plymouth-set-default-theme /sbin/plymouth-set-default-theme
- dosym /usr/sbin/plymouthd /sbin/plymouthd
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
- if ! has_version "sys-kernel/dracut[dracut_modules_plymouth]" && ! has_version "sys-kernel/genkernel-next[plymouth]"; then
- ewarn "If you want initramfs builder with plymouth support, please emerge"
- ewarn "sys-kernel/dracut[dracut_modules_plymouth] or sys-kernel/genkernel-next[plymouth]."
- fi
-}
diff --git a/sys-boot/plymouth/plymouth-0.8.8-r5.ebuild b/sys-boot/plymouth/plymouth-0.8.8-r5.ebuild
deleted file mode 100644
index ee8fe1d6aa..0000000000
--- a/sys-boot/plymouth/plymouth-0.8.8-r5.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools-utils readme.gentoo systemd toolchain-funcs
-
-DESCRIPTION="Graphical boot animation (splash) and logger"
-HOMEPAGE="https://cgit.freedesktop.org/plymouth/"
-SRC_URI="
- https://www.freedesktop.org/software/plymouth/releases/${P}.tar.bz2
- https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE_VIDEO_CARDS="video_cards_intel video_cards_radeon"
-IUSE="${IUSE_VIDEO_CARDS} debug gdm +gtk +libkms +pango static-libs"
-
-CDEPEND="
- >=media-libs/libpng-1.2.16
- gtk? (
- dev-libs/glib:2
- >=x11-libs/gtk+-2.12:2 )
- libkms? ( x11-libs/libdrm[libkms] )
- pango? ( >=x11-libs/pango-1.21 )
- video_cards_intel? ( x11-libs/libdrm[video_cards_intel] )
- video_cards_radeon? ( x11-libs/libdrm[video_cards_radeon] )
-"
-DEPEND="${CDEPEND}
- virtual/pkgconfig
-"
-# Block due bug #383067
-RDEPEND="${CDEPEND}
- virtual/udev
-"
-
-DOC_CONTENTS="
- Follow the following instructions to set up Plymouth:\n
- https://dev.gentoo.org/~aidecoe/doc/en/plymouth.xml
-"
-
-PATCHES=(
- "${FILESDIR}/0.8.8-initrd-binaries-paths.patch"
-)
-
-src_prepare() {
- sed -i 's:/bin/systemd-tty-ask-password-agent:/usr/bin/systemd-tty-ask-password-agent:g' \
- systemd-units/systemd-ask-password-plymouth.service.in || die \
- 'ask-password sed failed'
- sed -i 's:/bin/udevadm:/usr/bin/udevadm:g' \
- systemd-units/plymouth-start.service.in || die 'udevadm sed failed'
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- --with-system-root-install=no
- --localstatedir=/var
- --without-rhgb-compat-link
- --enable-systemd-integration
- $(use_enable debug tracing)
- $(use_enable gtk gtk)
- $(use_enable libkms)
- $(use_enable pango)
- $(use_enable gdm gdm-transition)
- $(use_enable video_cards_intel libdrm_intel)
- $(use_enable video_cards_radeon libdrm_radeon)
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
-
- insinto /usr/share/plymouth
- newins "${DISTDIR}"/gentoo-logo.png bizcom.png
-
- # Install compatibility symlinks as some rdeps hardcode the paths
- dosym /usr/bin/plymouth /bin/plymouth
- dosym /usr/sbin/plymouth-set-default-theme /sbin/plymouth-set-default-theme
- dosym /usr/sbin/plymouthd /sbin/plymouthd
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
- if ! has_version "sys-kernel/dracut[dracut_modules_plymouth]" && ! has_version "sys-kernel/genkernel-next[plymouth]"; then
- ewarn "If you want initramfs builder with plymouth support, please emerge"
- ewarn "sys-kernel/dracut[dracut_modules_plymouth] or sys-kernel/genkernel-next[plymouth]."
- fi
-}
diff --git a/sys-boot/plymouth/plymouth-0.9.0.ebuild b/sys-boot/plymouth/plymouth-0.9.0.ebuild
deleted file mode 100644
index 131b6391c0..0000000000
--- a/sys-boot/plymouth/plymouth-0.9.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-SRC_URI="
- https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png"
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="git://anongit.freedesktop.org/plymouth"
- AUTOTOOLS_AUTORECONF="1"
- inherit git-r3
-else
- SRC_URI="${SRC_URI} https://www.freedesktop.org/software/plymouth/releases/${P}.tar.bz2"
-fi
-
-inherit autotools-utils readme.gentoo systemd toolchain-funcs
-
-DESCRIPTION="Graphical boot animation (splash) and logger"
-HOMEPAGE="https://cgit.freedesktop.org/plymouth/"
-
-LICENSE="GPL-2"
-SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug gdm +gtk +libkms +pango static-libs"
-
-CDEPEND="
- >=media-libs/libpng-1.2.16
- gtk? (
- dev-libs/glib:2
- >=x11-libs/gtk+-2.12:2
- x11-libs/cairo )
- libkms? ( x11-libs/libdrm[libkms] )
- pango? ( >=x11-libs/pango-1.21 )
-"
-DEPEND="${CDEPEND}
- virtual/pkgconfig
-"
-# Block due bug #383067
-RDEPEND="${CDEPEND}
- virtual/udev
- !<sys-kernel/dracut-0.37-r3
-"
-
-DOC_CONTENTS="
- Follow the following instructions to set up Plymouth:\n
- https://dev.gentoo.org/~aidecoe/doc/en/plymouth.xml
-"
-
-src_prepare() {
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- --with-system-root-install=no
- --localstatedir=/var
- --without-rhgb-compat-link
- --enable-systemd-integration
- $(use_enable debug tracing)
- $(use_enable gtk gtk)
- $(use_enable libkms drm)
- $(use_enable pango)
- $(use_enable gdm gdm-transition)
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
-
- insinto /usr/share/plymouth
- newins "${DISTDIR}"/gentoo-logo.png bizcom.png
-
- # Install compatibility symlinks as some rdeps hardcode the paths
- dosym /usr/bin/plymouth /bin/plymouth
- dosym /usr/sbin/plymouth-set-default-theme /sbin/plymouth-set-default-theme
- dosym /usr/sbin/plymouthd /sbin/plymouthd
-
- readme.gentoo_create_doc
-
- # looks like make install create /var/run/plymouth
- # this is not needed for systemd, same should hold for openrc
- # so remove
- rm -rf "${D}"/var/run
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
- if ! has_version "sys-kernel/dracut" && ! has_version "sys-kernel/genkernel-next[plymouth]"; then
- ewarn "If you want initramfs builder with plymouth support, please emerge"
- ewarn "sys-kernel/dracut or sys-kernel/genkernel-next[plymouth]."
- fi
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/plymouth/, sys-boot/plymouth/files/
@ 2017-08-17 22:41 Gilles Dartiguelongue
0 siblings, 0 replies; 3+ messages in thread
From: Gilles Dartiguelongue @ 2017-08-17 22:41 UTC (permalink / raw
To: gentoo-commits
commit: 0bb05cf38855b0e72b6ce7c8a16b1401cb70f097
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 17 22:40:26 2017 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> 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 <kjell.claesson@epost.tidanet.se>
+Date: Fri, 18 Aug 2017 00:25:56 +0200
+Subject: [PATCH] Fix build with newer glibc
+
+Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
+---
+ 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 <unistd.h>
+ #include <wchar.h>
+
++/* major()/minor() */
++#ifdef MAJOR_IN_MKDEV
++# include <sys/mkdev.h>
++#endif
++#ifdef MAJOR_IN_SYSMACROS
++# include <sys/sysmacros.h>
++#endif
++
+ #include <linux/kd.h>
+ #include <linux/major.h>
+ #include <linux/vt.h>
+--
+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() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/plymouth/, sys-boot/plymouth/files/
@ 2022-08-23 23:09 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-08-23 23:09 UTC (permalink / raw
To: gentoo-commits
commit: 944a39cd04fc0960a85035148475d9ad81e7dd51
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 23 22:56:18 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 22:56:18 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=944a39cd
sys-boot/plymouth: fix build w/ glibc 2.36
Closes: https://bugs.gentoo.org/863839
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/plymouth-22.02.122-glibc-2.36.patch | 25 ++++++++++++++++++++++
sys-boot/plymouth/plymouth-22.02.122-r1.ebuild | 1 +
2 files changed, 26 insertions(+)
diff --git a/sys-boot/plymouth/files/plymouth-22.02.122-glibc-2.36.patch b/sys-boot/plymouth/files/plymouth-22.02.122-glibc-2.36.patch
new file mode 100644
index 000000000000..b1da112732e3
--- /dev/null
+++ b/sys-boot/plymouth/files/plymouth-22.02.122-glibc-2.36.patch
@@ -0,0 +1,25 @@
+https://gitlab.freedesktop.org/plymouth/plymouth/-/commit/5f1e43c00039a7fe1fff768b91a05a695fb4a53d
+https://bugs.gentoo.org/863839
+
+From 5f1e43c00039a7fe1fff768b91a05a695fb4a53d Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Wed, 3 Aug 2022 15:23:33 -0400
+Subject: [PATCH] ply-utils: Drop linux/fs.h include
+
+It was needed long ago for a function we no longer even have.
+
+Now it's causing compile errors on Fedora 37 because it's conflicting
+with sys/mount.h.
+
+This commit drops it.
+--- a/src/libply/ply-utils.c
++++ b/src/libply/ply-utils.c
+@@ -46,7 +46,6 @@
+ #include <sys/user.h>
+ #include <sys/wait.h>
+ #include <time.h>
+-#include <linux/fs.h>
+ #include <linux/vt.h>
+
+ #include <dlfcn.h>
+GitLab
diff --git a/sys-boot/plymouth/plymouth-22.02.122-r1.ebuild b/sys-boot/plymouth/plymouth-22.02.122-r1.ebuild
index d87fe2ec7e36..075ed34ae073 100644
--- a/sys-boot/plymouth/plymouth-22.02.122-r1.ebuild
+++ b/sys-boot/plymouth/plymouth-22.02.122-r1.ebuild
@@ -52,6 +52,7 @@ DOC_CONTENTS="
PATCHES=(
"${FILESDIR}"/0.9.3-glibc-sysmacros.patch
+ "${FILESDIR}"/${P}-glibc-2.36.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-08-23 23:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-23 23:09 [gentoo-commits] repo/gentoo:master commit in: sys-boot/plymouth/, sys-boot/plymouth/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2017-08-17 22:41 Gilles Dartiguelongue
2017-02-23 12:43 Michael Weber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox