Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 684154 Details for
Bug 766579
media-libs/jbigkit: EAPI 7 request
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
fix.patch
0001-media-libs-jbigkit-EAPI-7.patch (text/plain), 3.52 KB, created by
David Michael
on 2021-01-22 20:09:50 UTC
(
hide
)
Description:
fix.patch
Filename:
MIME Type:
Creator:
David Michael
Created:
2021-01-22 20:09:50 UTC
Size:
3.52 KB
patch
obsolete
>From f775bebd3d6f3fe4db0b75d354c58f262a4eb9a0 Mon Sep 17 00:00:00 2001 >From: David Michael <fedora.dm0@gmail.com> >Date: Fri, 22 Jan 2021 15:09:32 -0500 >Subject: [PATCH] media-libs/jbigkit: EAPI 7 > >Closes: https://bugs.gentoo.org/766579 >Package-Manager: Portage-3.0.13, Repoman-3.0.2 >Signed-off-by: David Michael <fedora.dm0@gmail.com> >--- > .../jbigkit/files/jbigkit-2.1-build.patch | 12 +++++----- > media-libs/jbigkit/jbigkit-2.1.ebuild | 23 ++++++++++--------- > 2 files changed, 18 insertions(+), 17 deletions(-) > >diff --git a/media-libs/jbigkit/files/jbigkit-2.1-build.patch b/media-libs/jbigkit/files/jbigkit-2.1-build.patch >index a7bc7ae761d..087ac3c544d 100644 >--- a/media-libs/jbigkit/files/jbigkit-2.1-build.patch >+++ b/media-libs/jbigkit/files/jbigkit-2.1-build.patch >@@ -1,7 +1,7 @@ > This patch has been mailed to upstream. No reply at this time. Status unknown. > >---- libjbig/Makefile >-+++ libjbig/Makefile >+--- a/libjbig/Makefile >++++ b/libjbig/Makefile > @@ -1,28 +1,58 @@ > # Unix makefile for the JBIG-KIT library > >@@ -70,8 +70,8 @@ This patch has been mailed to upstream. No reply at this time. Status unknown. > > jbig.o: jbig.c jbig.h jbig_ar.h > jbig85.o: jbig85.c jbig85.h jbig_ar.h >---- Makefile >-+++ Makefile >+--- a/Makefile >++++ b/Makefile > @@ -1,10 +1,10 @@ > # Unix makefile for JBIG-KIT > >@@ -94,8 +94,8 @@ This patch has been mailed to upstream. No reply at this time. Status unknown. > tar cvaf jbigkit-$(VERSION).tar.gz jbigkit-$(VERSION) > > release: >---- pbmtools/Makefile >-+++ pbmtools/Makefile >+--- a/pbmtools/Makefile >++++ b/pbmtools/Makefile > @@ -1,11 +1,11 @@ > # Unix makefile for the JBIG-KIT PBM tools > >diff --git a/media-libs/jbigkit/jbigkit-2.1.ebuild b/media-libs/jbigkit/jbigkit-2.1.ebuild >index aabec623cbc..58cb0a9b89a 100644 >--- a/media-libs/jbigkit/jbigkit-2.1.ebuild >+++ b/media-libs/jbigkit/jbigkit-2.1.ebuild >@@ -1,23 +1,27 @@ > # Copyright 1999-2021 Gentoo Authors > # Distributed under the terms of the GNU General Public License v2 > >-EAPI=5 >+EAPI=7 > >-inherit eutils multilib toolchain-funcs multilib-minimal >+inherit multilib multilib-minimal toolchain-funcs > > DESCRIPTION="data compression algorithm for bi-level high-resolution images" > HOMEPAGE="http://www.cl.cam.ac.uk/~mgk25/jbigkit/" > SRC_URI="http://www.cl.cam.ac.uk/~mgk25/download/${P}.tar.gz" > > LICENSE="GPL-2" >-SLOT="0/2.1" # Since we install libjbig.so and libjbig85.so without version, use ${PV} like 2.1 >+SLOT="0/${PV}" # Since we install unversioned libraries, use ${PV} subslots. > KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" > IUSE="static-libs" > > DOCS="ANNOUNCE CHANGES TODO libjbig/*.txt pbmtools/*.txt" > >+PATCHES=( >+ "${FILESDIR}"/${P}-build.patch >+) >+ > src_prepare() { >- epatch "${FILESDIR}"/${P}-build.patch >+ default > multilib_copy_sources > tc-export AR CC RANLIB > } >@@ -27,9 +31,7 @@ multilib_src_compile() { > LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ > $(multilib_is_native_abi || echo lib) > >- if use static-libs; then >- cd libjbig && emake static >- fi >+ use static-libs && emake -C libjbig static > } > > multilib_src_test() { >@@ -42,8 +44,7 @@ multilib_src_install() { > doman pbmtools/jbgtopbm.1 pbmtools/pbmtojbg.1 > fi > >- insinto /usr/include >- doins libjbig/*.h >- dolib libjbig/libjbig{,85}$(get_libname) >- use static-libs && dolib libjbig/libjbig{,85}.a >+ doheader libjbig/*.h >+ dolib.so libjbig/libjbig{,85}$(get_libname) >+ use static-libs && dolib.a libjbig/libjbig{,85}.a > } >-- >2.26.2 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 766579
: 684154