* [gentoo-commits] repo/gentoo:master commit in: media-gfx/xfig/files/, media-gfx/xfig/
@ 2017-03-24 14:32 Andreas Hüttel
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Hüttel @ 2017-03-24 14:32 UTC (permalink / raw
To: gentoo-commits
commit: 36808ffac39c0c2f370e00173d09f4c669bcb827
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 24 14:31:41 2017 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Mar 24 14:32:03 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36808ffa
media-gfx/xfig: Add patch for libpng-1.6 support from RH
Package-Manager: Portage-2.3.5, Repoman-2.3.2
.../xfig/files/xfig-3.2.5b-app-defaults.patch | 4 +-
media-gfx/xfig/files/xfig-3.2.5b-mkstemp.patch | 4 +-
media-gfx/xfig/files/xfig-3.2.5b-solaris.patch | 8 +-
media-gfx/xfig/files/xfig-3.2.5b-urwfonts.patch | 4 +-
media-gfx/xfig/files/xfig-3.2.5c-png16.patch | 18 ++++
media-gfx/xfig/xfig-3.2.5c-r1.ebuild | 111 +++++++++++++++++++++
6 files changed, 139 insertions(+), 10 deletions(-)
diff --git a/media-gfx/xfig/files/xfig-3.2.5b-app-defaults.patch b/media-gfx/xfig/files/xfig-3.2.5b-app-defaults.patch
index d773da51b18..560ddef94eb 100644
--- a/media-gfx/xfig/files/xfig-3.2.5b-app-defaults.patch
+++ b/media-gfx/xfig/files/xfig-3.2.5b-app-defaults.patch
@@ -1,8 +1,8 @@
Defaults for xfig. Idea from Roland Rosenfeld <roland@debian.org>
diff -urNad xfig~/Fig.ad xfig/Fig.ad
---- Fig.ad
-+++ Fig.ad
+--- a/Fig.ad
++++ b/Fig.ad
@@ -10,13 +10,17 @@
! some sample settings you may want to change
diff --git a/media-gfx/xfig/files/xfig-3.2.5b-mkstemp.patch b/media-gfx/xfig/files/xfig-3.2.5b-mkstemp.patch
index c672a27554d..931ac94e58a 100644
--- a/media-gfx/xfig/files/xfig-3.2.5b-mkstemp.patch
+++ b/media-gfx/xfig/files/xfig-3.2.5b-mkstemp.patch
@@ -3,8 +3,8 @@ Missed hunk noticed https://bugzilla.redhat.com/show_bug.cgi?id=505257#c1 is rec
http://bugs.gentoo.org/show_bug.cgi?id=264575
=== modified file 'u_print.c'
---- u_print.c 2010-01-14 19:50:08 +0000
-+++ u_print.c 2010-01-14 19:54:14 +0000
+--- a/u_print.c 2010-01-14 19:50:08 +0000
++++ b/u_print.c 2010-01-14 19:54:14 +0000
@@ -202,14 +202,22 @@
char tmp_fig_file[PATH_MAX];
char *outfile, *name, *real_lang;
diff --git a/media-gfx/xfig/files/xfig-3.2.5b-solaris.patch b/media-gfx/xfig/files/xfig-3.2.5b-solaris.patch
index a295b5227f0..2e93a7faac2 100644
--- a/media-gfx/xfig/files/xfig-3.2.5b-solaris.patch
+++ b/media-gfx/xfig/files/xfig-3.2.5b-solaris.patch
@@ -1,7 +1,7 @@
* workaround some missing things on Solaris
---- u_quartic.c
-+++ u_quartic.c
+--- a/u_quartic.c
++++ b/u_quartic.c
@@ -21,4 +21,7 @@
#include <math.h>
@@ -10,8 +10,8 @@
+ #endif
static int
---- w_intersect.c
-+++ w_intersect.c
+--- a/w_intersect.c
++++ b/w_intersect.c
@@ -31,6 +31,11 @@
#define ISET_P1 (1 << 0)
#define ISET_P2 (1 << 1)
diff --git a/media-gfx/xfig/files/xfig-3.2.5b-urwfonts.patch b/media-gfx/xfig/files/xfig-3.2.5b-urwfonts.patch
index 6a5c3dff949..87ac63f838f 100644
--- a/media-gfx/xfig/files/xfig-3.2.5b-urwfonts.patch
+++ b/media-gfx/xfig/files/xfig-3.2.5b-urwfonts.patch
@@ -1,5 +1,5 @@
---- u_fonts.c 2002-09-09 13:36:58.000000000 -0400
-+++ u_fonts.c 2006-10-11 00:29:07.000000000 -0400
+--- a/u_fonts.c 2002-09-09 13:36:58.000000000 -0400
++++ b/u_fonts.c 2006-10-11 00:29:07.000000000 -0400
@@ -22,41 +22,41 @@
/* X11 font names */
diff --git a/media-gfx/xfig/files/xfig-3.2.5c-png16.patch b/media-gfx/xfig/files/xfig-3.2.5c-png16.patch
new file mode 100644
index 00000000000..f7a426295d3
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.5c-png16.patch
@@ -0,0 +1,18 @@
+Source: https://bugzilla.redhat.com/show_bug.cgi?id=1150330
+
+From: David Kaufmann <astra@ionic.at>
+Subject: Fix PNG reading
+
+--- a/f_readpng.c 2014-09-15 13:25:26.290813563 +0200
++++ a/f_readpng.c 2014-09-15 14:04:10.241297027 +0200
+@@ -90,8 +90,8 @@
+ png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type,
+ &interlace_type, &compression_type, &filter_type);
+
+- png_fixed_point gamma = 0.45;
+- png_get_gAMA_fixed(png_ptr,info_ptr,&gamma);
++ double gamma = 0.45455;
++ png_get_gAMA(png_ptr,info_ptr,&gamma);
+ png_set_gamma(png_ptr, 2.2, gamma);
+
+ if (png_get_valid(png_ptr,info_ptr,PNG_INFO_bKGD)) {
diff --git a/media-gfx/xfig/xfig-3.2.5c-r1.ebuild b/media-gfx/xfig/xfig-3.2.5c-r1.ebuild
new file mode 100644
index 00000000000..bbe838eccc2
--- /dev/null
+++ b/media-gfx/xfig/xfig-3.2.5c-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib
+
+MY_P=${PN}.${PV}
+
+DESCRIPTION="A menu-driven tool to draw and manipulate objects interactively in an X window"
+HOMEPAGE="http://www.xfig.org"
+SRC_URI="mirror://sourceforge/mcj/${MY_P}.full.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="nls"
+
+RDEPEND="x11-libs/libXaw
+ x11-libs/libXp
+ x11-libs/libXaw3d
+ nls? ( x11-libs/libXaw3d[unicode] )
+ x11-libs/libXi
+ x11-libs/libXt
+ virtual/jpeg:0=
+ media-libs/libpng:0=
+ media-fonts/font-misc-misc
+ media-fonts/urw-fonts
+ >=media-gfx/transfig-3.2.5-r1
+ media-libs/netpbm"
+DEPEND="${RDEPEND}
+ x11-misc/imake
+ x11-proto/xproto
+ x11-proto/inputproto"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.2.5c-spelling.patch"
+ "${FILESDIR}/${PN}-3.2.5b-papersize_b1.patch"
+ "${FILESDIR}/${PN}-3.2.5b-pdfimport_mediabox.patch"
+ "${FILESDIR}/${PN}-3.2.5b-network_images.patch"
+ "${FILESDIR}/${PN}-3.2.5b-app-defaults.patch"
+ "${FILESDIR}/${PN}-3.2.5b-urwfonts.patch"
+ "${FILESDIR}/${PN}-3.2.5b-mkstemp.patch" #264575
+ "${FILESDIR}/${PN}-3.2.5c-darwin.patch"
+ "${FILESDIR}/${PN}-3.2.5b-solaris.patch"
+ "${FILESDIR}/${PN}-3.2.5c-XAW3D1_5E_notlocal.patch"
+ "${FILESDIR}/${PN}-3.2.5c-crash-on-exit.patch"
+ "${FILESDIR}/${PN}-3.2.5c-png16.patch"
+)
+
+sed_Imakefile() {
+ # see Imakefile for details
+ vars2subs=( BINDIR="${EPREFIX}"/usr/bin
+ PNGINC=-I"${EPREFIX}"/usr/include
+ JPEGLIBDIR="${EPREFIX}"/usr/$(get_libdir)
+ JPEGINC=-I"${EPREFIX}"/usr/include
+ XPMLIBDIR="${EPREFIX}"/usr/$(get_libdir)
+ XPMINC=-I"${EPREFIX}"/usr/include/X11
+ USEINLINE=-DUSE_INLINE
+ XFIGLIBDIR="${EPREFIX}"/usr/share/xfig
+ XFIGDOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+ MANDIR="${EPREFIX}/usr/share/man/man\$\(MANSUFFIX\)"
+ "CC=$(tc-getCC)" )
+
+ for variable in "${vars2subs[@]}" ; do
+ varname=${variable%%=*}
+ varval=${variable##*=}
+ sed -i \
+ -e "s:^\(XCOMM\)*[[:space:]]*${varname}[[:space:]]*=.*$:${varname} = ${varval}:" \
+ "$@" || die
+ done
+ if use nls; then
+ # XAW_INTERNATIONALIZATION fixes #405475 (comment 17) and #426780 by Markus Peloquin
+ sed -i \
+ -e "s:^\(XCOMM\)*[[:space:]]*\(#define I18N\).*$:\2:" \
+ -e "s:^\(XCOMM\)*[[:space:]]*\(XAW_INTERN = -DXAW_INTERNATIONALIZATION\).*$:\2:" \
+ "$@" || die
+ fi
+ sed -i -e "s:^\(XCOMM\)*[[:space:]]*\(#define XAW3D1_5E\).*$:\2:" "$@" || die
+}
+
+src_prepare() {
+ # Permissions are really crazy here
+ chmod -R go+rX . || die
+ find . -type f -exec chmod a-x '{}' \; || die
+
+ default
+
+ sed_Imakefile Imakefile
+ sed -e "s:/usr/lib/X11/xfig:${EPREFIX}/usr/share/doc/${PF}:" \
+ -i Doc/xfig.man || die
+}
+
+src_compile() {
+ local EXTCFLAGS=${CFLAGS}
+ xmkmf || die
+ [[ ${CHOST} == *-solaris* ]] && EXTCFLAGS="${EXTCFLAGS} -D_POSIX_SOURCE"
+ emake CC="$(tc-getCC)" LOCAL_LDFLAGS="${LDFLAGS}" CDEBUGFLAGS="${EXTCFLAGS}" \
+ USRLIBDIR="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+ emake -j1 DESTDIR="${D}" install install.libs install.man
+
+ dodoc README FIGAPPS CHANGES LATEX.AND.XFIG
+
+ doicon xfig.png
+ make_desktop_entry xfig Xfig xfig
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/xfig/files/, media-gfx/xfig/
@ 2023-10-15 8:45 Hans de Graaff
0 siblings, 0 replies; 2+ messages in thread
From: Hans de Graaff @ 2023-10-15 8:45 UTC (permalink / raw
To: gentoo-commits
commit: 086cdb657c4cc10d9006e6e0a52414993faa42d9
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 15 08:45:42 2023 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Oct 15 08:45:55 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=086cdb65
media-gfx/xfig: add 3.2.9
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
media-gfx/xfig/Manifest | 1 +
media-gfx/xfig/files/xfig-3.2.9-app-defaults.patch | 12 +++++
media-gfx/xfig/xfig-3.2.9.ebuild | 51 ++++++++++++++++++++++
3 files changed, 64 insertions(+)
diff --git a/media-gfx/xfig/Manifest b/media-gfx/xfig/Manifest
index eaa8f0ea2b77..eedea84da010 100644
--- a/media-gfx/xfig/Manifest
+++ b/media-gfx/xfig/Manifest
@@ -1 +1,2 @@
DIST xfig-3.2.8b.tar.xz 5382524 BLAKE2B 94963d165664c6451776fcbc3e332a7933c00d4b43e3d4196f15883a9873171f7a0791e6fa41cbb6e8d07958f9ddcceb9578a62a9893cf2f436c07dcbe3e7f37 SHA512 5cc5e61977f97956baca77bf4bce09d0f47ea6fafb10055d0523f7cccd72d7af80e706daa62ae16df3fc54338b4f6cd4a6b71dc460311e65be749ec84fa662b3
+DIST xfig-3.2.9.tar.xz 5368544 BLAKE2B 6fd04d7238453d304a5e9624524f1e3674fe21ea3485d0925fa430a6312b61019a54397301cd7773565035cd3aee7fa130ed2459187241a778c0d44759c57d45 SHA512 c5e797b394740761a24e6e5e83d025dd78a11ad7d12662728c708218d7131d9077d9ed0c09023134ed9d709c58f52f5c9182e5b50e540b1876be4c359d79a60e
diff --git a/media-gfx/xfig/files/xfig-3.2.9-app-defaults.patch b/media-gfx/xfig/files/xfig-3.2.9-app-defaults.patch
new file mode 100644
index 000000000000..09c61453f679
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.9-app-defaults.patch
@@ -0,0 +1,12 @@
+diff -ruN xfig-3.2.8b.orig/app-defaults/Fig xfig-3.2.6a/app-defaults/Fig
+--- xfig-3.2.8b.orig/app-defaults/Fig 2017-01-10 00:27:39.000000000 +0100
++++ xfig-3.2.8b/app-defaults/Fig 2017-03-24 16:22:14.702253419 +0100
+@@ -10,4 +10,8 @@
+
++! If the following resource is set to false, xfig will use metric units
++! by default.
++Fig.inches: false
++
+ ! The following fixes a problem that some window managers have
+ ! with xfig continually resizing itself
+
diff --git a/media-gfx/xfig/xfig-3.2.9.ebuild b/media-gfx/xfig/xfig-3.2.9.ebuild
new file mode 100644
index 000000000000..c264b39dadc8
--- /dev/null
+++ b/media-gfx/xfig/xfig-3.2.9.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature xdg
+
+DESCRIPTION="A menu-driven tool to draw and manipulate objects interactively in an X window"
+HOMEPAGE="https://mcj.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/project/mcj/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+COMMON_DEPEND="
+ app-text/ghostscript-gpl:=
+ >=media-gfx/fig2dev-${PV}
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ media-libs/tiff:=
+ x11-libs/libX11
+ x11-libs/libXaw3d[unicode(+)]
+ x11-libs/libXpm
+ x11-libs/libXt
+"
+DEPEND="${COMMON_DEPEND}
+ x11-base/xorg-proto
+"
+RDEPEND="${COMMON_DEPEND}
+ media-fonts/font-misc-misc
+ media-fonts/urw-fonts
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.2.6a-solaris.patch"
+ "${FILESDIR}/${PN}-3.2.9-app-defaults.patch"
+)
+
+src_configure() {
+ local myeconfargs=(
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}" # it expects docdir...
+ )
+ econf "${myeconfargs[@]}"
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ optfeature "GIF support" media-libs/netpbm virtual/imagemagick-tools
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-10-15 8:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-15 8:45 [gentoo-commits] repo/gentoo:master commit in: media-gfx/xfig/files/, media-gfx/xfig/ Hans de Graaff
-- strict thread matches above, loose matches on Subject: below --
2017-03-24 14:32 Andreas Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox