diff options
Diffstat (limited to 'app-arch/pdv')
| -rw-r--r-- | app-arch/pdv/files/pdv-1.5.1-missing-prototype.patch | 19 | ||||
| -rw-r--r-- | app-arch/pdv/files/pdv-1.5.1-no-strip.patch | 11 | ||||
| -rw-r--r-- | app-arch/pdv/metadata.xml | 2 | ||||
| -rw-r--r-- | app-arch/pdv/pdv-1.5.1-r5.ebuild (renamed from app-arch/pdv/pdv-1.5.1-r3.ebuild) | 53 |
4 files changed, 53 insertions, 32 deletions
diff --git a/app-arch/pdv/files/pdv-1.5.1-missing-prototype.patch b/app-arch/pdv/files/pdv-1.5.1-missing-prototype.patch new file mode 100644 index 000000000000..d35ddedfda74 --- /dev/null +++ b/app-arch/pdv/files/pdv-1.5.1-missing-prototype.patch @@ -0,0 +1,19 @@ +Add missing prototype to a common header file. + +Bug: https://bugs.gentoo.org/882157 + +diff --git a/X11/xmpdvmkpkg.h b/X11/xmpdvmkpkg.h +index abaaa47..fd6c6f5 100644 +--- a/X11/xmpdvmkpkg.h ++++ b/X11/xmpdvmkpkg.h +@@ -76,6 +76,7 @@ extern Widget g_statusw; + void spectowidgets(void); + void widgetstospec(struct pdvspec_st *spec); + int cmpspecandwidgets(void); ++void statusmsg(char *fmt, ...); + void xu_SetMainTitle(const char *newtitle, const char *newprefix + , Widget topshell); + +-- +2.41.0 + diff --git a/app-arch/pdv/files/pdv-1.5.1-no-strip.patch b/app-arch/pdv/files/pdv-1.5.1-no-strip.patch index 630bf5eb7c36..4beaeb1c4889 100644 --- a/app-arch/pdv/files/pdv-1.5.1-no-strip.patch +++ b/app-arch/pdv/files/pdv-1.5.1-no-strip.patch @@ -1,13 +1,12 @@ -diff -ur pdv-1.5.1-orig/pdv.c pdv-1.5.1/pdv.c ---- pdv-1.5.1-orig/Makefile.in 2008-12-06 23:17:46.000000000 -0800 -+++ pdv-1.5.1/Makefile.in 2008-12-06 23:18:37.000000000 -0800 -@@ -536,7 +536,8 @@ +diff --git a/extra.mk b/extra.mk +index 65f6e72..e681adb 100644 +--- a/extra.mk ++++ b/extra.mk +@@ -11,7 +11,6 @@ pdv_fixed.c : Makefile touch $@ pdv_fixed : pdv_fixed.c pdv - $(STRIPBIN) pdv -+ # let portage decide whether to strip binaries -+ #$(STRIPBIN) pdv printf "%-5.5s" $$VERSION >> pdv printf "\000\000\000\000\000\000\000\000" >> pdv sleep 1 diff --git a/app-arch/pdv/metadata.xml b/app-arch/pdv/metadata.xml index 3f8f6e0fd143..a2e376eb5da0 100644 --- a/app-arch/pdv/metadata.xml +++ b/app-arch/pdv/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <upstream> diff --git a/app-arch/pdv/pdv-1.5.1-r3.ebuild b/app-arch/pdv/pdv-1.5.1-r5.ebuild index 8b712196c4de..c0269af6c104 100644 --- a/app-arch/pdv/pdv-1.5.1-r3.ebuild +++ b/app-arch/pdv/pdv-1.5.1-r5.ebuild @@ -1,58 +1,61 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit autotools toolchain-funcs DESCRIPTION="build a self-extracting and self-installing binary package" -HOMEPAGE="https://sourceforge.net/projects/pdv" -SRC_URI="mirror://sourceforge/pdv/${P}.tar.gz" +HOMEPAGE="https://sourceforge.net/projects/pdv/" +SRC_URI="https://downloads.sourceforge.net/pdv/${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="amd64 ~hppa ppc x86 ~x86-linux ~ppc-macos" -IUSE="X" +IUSE="gui" -DEPEND=" - X? ( +RDEPEND=" + gui? ( >=x11-libs/motif-2.3:0 >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 - >=x11-libs/libXext-1.0.0 ) -" -RDEPEND="${DEPEND}" - -src_prepare() { - default + >=x11-libs/libXext-1.0.0 + )" +DEPEND="${RDEPEND}" +PATCHES=( # fix a size-of-variable bug - eapply "${FILESDIR}"/${P}-opt.patch + "${FILESDIR}"/${P}-opt.patch # fix a free-before-use bug - eapply "${FILESDIR}"/${P}-early-free.patch + "${FILESDIR}"/${P}-early-free.patch # fix a configure script bug - eapply "${FILESDIR}"/${P}-x-config.patch + "${FILESDIR}"/${P}-x-config.patch # fix default args bug from assuming 'char' is signed - eapply "${FILESDIR}"/${P}-default-args.patch + "${FILESDIR}"/${P}-default-args.patch # prevent pre-stripped binaries - eapply "${FILESDIR}"/${P}-no-strip.patch + "${FILESDIR}"/${P}-no-strip.patch + # missing function prototype, see bug #882157 + "${FILESDIR}"/${P}-missing-prototype.patch +) + +src_prepare() { + default # re-build configure script since patch was applied to configure.in - cd "${S}"/X11 - mv configure.in configure.ac || die + # and to refresh old compiler checks, see bugs #880351 and #906002 eautoreconf - tc-export CC } src_configure() { - local myconf="" - use X || myconf="--without-x" # configure script is broken, cant use use_with - econf ${myconf} + tc-export CC + + econf $(usev !gui --without-x) # configure script is broken, cant use use_with } src_install() { dobin pdv pdvmkpkg doman pdv.1 pdvmkpkg.1 - if use X ; then + if use gui ; then dobin X11/xmpdvmkpkg doman xmpdvmkpkg.1 fi |