* [gentoo-commits] repo/gentoo:master commit in: x11-misc/efax-gtk/files/, x11-misc/efax-gtk/
@ 2020-02-01 13:43 Jeroen Roovers
0 siblings, 0 replies; 2+ messages in thread
From: Jeroen Roovers @ 2020-02-01 13:43 UTC (permalink / raw
To: gentoo-commits
commit: b1a6f1a0dfd27b0136ae980fd00942160f6eba00
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 1 13:08:54 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Feb 1 13:43:33 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1a6f1a0
x11-misc/efax-gtk: Fix CFLAGS=-fno-common
Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
x11-misc/efax-gtk/efax-gtk-3.2.13-r1.ebuild | 55 ++++++++++++++++++++++
.../files/efax-gtk-3.2.13-fno-common.patch | 35 ++++++++++++++
2 files changed, 90 insertions(+)
diff --git a/x11-misc/efax-gtk/efax-gtk-3.2.13-r1.ebuild b/x11-misc/efax-gtk/efax-gtk-3.2.13-r1.ebuild
new file mode 100644
index 00000000000..3a4ae41be48
--- /dev/null
+++ b/x11-misc/efax-gtk/efax-gtk-3.2.13-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A graphical frontend for the 'efax' application"
+HOMEPAGE="http://efax-gtk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.src.tgz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="nls"
+
+RDEPEND=">=dev-libs/glib-2.10
+ media-libs/tiff:0=
+ x11-libs/libX11
+ x11-libs/c++-gtk-utils:0[gtk]
+ x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )"
+
+DOCS="AUTHORS BUGS ChangeLog README"
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.2.13-fno-common.patch
+)
+
+src_prepare() {
+ default
+ # Prevent sandbox violation with chown/chgrp and existing spooldir
+ sed -i -e '/ch.*lp.*spooldir/d' efax-gtk-faxfilter/Makefile.in || die
+
+ sed -i \
+ -e '/^Categories/s:Office;::' \
+ ${PN}.desktop || die
+}
+
+src_configure() {
+ econf \
+ $(use_enable nls) \
+ --with-gtk-version=gtk3
+}
+
+src_install() {
+ default
+ # File collision with net-misc/efax wrt #401221
+ mv "${ED}"/usr/share/man/man1/efax{,-0.9a}.1 || die
+ mv "${ED}"/usr/share/man/man1/efix{,-0.9a}.1 || die
+}
+
+pkg_postinst() {
+ local spooldir="${EROOT}"/var/spool/fax
+ [[ -d ${spooldir} ]] && chown lp:lp "${spooldir}"
+}
diff --git a/x11-misc/efax-gtk/files/efax-gtk-3.2.13-fno-common.patch b/x11-misc/efax-gtk/files/efax-gtk-3.2.13-fno-common.patch
new file mode 100644
index 00000000000..4cfd79afd16
--- /dev/null
+++ b/x11-misc/efax-gtk/files/efax-gtk-3.2.13-fno-common.patch
@@ -0,0 +1,35 @@
+--- a/efax/efaxos.h
++++ b/efax/efaxos.h
+@@ -11,10 +11,6 @@
+ #define UNIXSIGS SIGHUP, SIGQUIT, SIGIOT, SIGALRM
+ #define CATCHSIGS ANSISIGS, UNIXSIGS
+
+-/* Bit order reversal table. */
+-
+-extern unsigned char normalbits [ ] ;
+-
+ typedef enum ttymodes /* serial port modes: */
+ {
+ COMMAND, /* 19200 8N1, no f/c, DTR high */
+--- a/efax/efaxlib.h
++++ b/efax/efaxlib.h
+@@ -208,7 +208,7 @@
+ /* Bit reversal lookup tables (note that the `normalbits' array
+ is the one actually used for the bit reversal. */
+
+-uchar reversebits [ 256 ], normalbits [ 256 ] ;
++extern uchar reversebits [ 256 ], normalbits [ 256 ] ;
+
+ void initbittab(void) ;
+
+--- a/efax/efaxlib.c
++++ b/efax/efaxlib.c
+@@ -48,6 +48,8 @@
+ return n < 0 ;
+ }
+
++uchar reversebits [ 256 ], normalbits [ 256 ] ;
++
+ /* Provide dummy gettext() function if there is no internationalisation support */
+
+ #ifndef ENABLE_NLS
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/efax-gtk/files/, x11-misc/efax-gtk/
@ 2021-03-15 21:39 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2021-03-15 21:39 UTC (permalink / raw
To: gentoo-commits
commit: a5cc9b0d498d2bd32574193f273786a40feca398
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 15 21:27:02 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 15 21:34:11 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5cc9b0d
x11-misc/efax-gtk: drop 3.2.14
Bug: https://bugs.gentoo.org/776445
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-misc/efax-gtk/Manifest | 1 -
x11-misc/efax-gtk/efax-gtk-3.2.14.ebuild | 57 ----------------------
.../files/efax-gtk-3.2.13-fno-common.patch | 35 -------------
3 files changed, 93 deletions(-)
diff --git a/x11-misc/efax-gtk/Manifest b/x11-misc/efax-gtk/Manifest
index 5e4ca4405d4..710870329cf 100644
--- a/x11-misc/efax-gtk/Manifest
+++ b/x11-misc/efax-gtk/Manifest
@@ -1,2 +1 @@
-DIST efax-gtk-3.2.14.src.tgz 1241132 BLAKE2B 8907907681076d9238219a42c7a490f15b988019be2dd291131fd48122421f8f9476ae59f4832395ff56c44b0981490f3c38c49df643dbc1125f33e735392bbf SHA512 28e0814c209c4c398a27b4f421b0902942fb2088e94d992c344093d755a74176cedce2912ad6f5c0a21fde1fc57acd8c5bb97bd98c42b76bdf2ab1b5919a595e
DIST efax-gtk-3.2.15.src.tgz 1253414 BLAKE2B 1cd5eadced1e1ad03cb3d05b2068ce232c5632cebdba3320b721b773685f9ba4f1c69f4f0f0f0e261fce127ccaeb2f8eb5b95a4f6cbcc7adcc36c4a22729acb8 SHA512 83ba678162c2ec5c62eeba941a712f507aaeef3a42dfffe8a7dedca72af5ee46626e9c709d7617fc3bf62191ce0f6b10bac2498e1996cc45270db638fdfb7e63
diff --git a/x11-misc/efax-gtk/efax-gtk-3.2.14.ebuild b/x11-misc/efax-gtk/efax-gtk-3.2.14.ebuild
deleted file mode 100644
index 776229b9a31..00000000000
--- a/x11-misc/efax-gtk/efax-gtk-3.2.14.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A graphical frontend for the 'efax' application"
-HOMEPAGE="http://efax-gtk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.src.tgz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-
-RDEPEND="
- >=dev-libs/glib-2.10
- media-libs/tiff:0=
- x11-libs/libX11
- x11-libs/c++-gtk-utils:0[gtk]
- x11-libs/gtk+:3
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
- sys-devel/gettext
-"
-
-DOCS="AUTHORS BUGS ChangeLog README"
-PATCHES=(
- "${FILESDIR}"/${PN}-3.2.13-fno-common.patch
-)
-
-src_prepare() {
- default
- # Prevent sandbox violation with chown/chgrp and existing spooldir
- sed -i -e '/ch.*lp.*spooldir/d' efax-gtk-faxfilter/Makefile.in || die
-
- sed -i \
- -e '/^Categories/s:Office;::' \
- ${PN}.desktop || die
-}
-
-src_configure() {
- econf \
- --with-gtk-version=gtk3
-}
-
-src_install() {
- default
- # File collision with net-misc/efax wrt #401221
- mv "${ED}"/usr/share/man/man1/efax{,-0.9a}.1 || die
- mv "${ED}"/usr/share/man/man1/efix{,-0.9a}.1 || die
-}
-
-pkg_postinst() {
- local spooldir="${EROOT}"/var/spool/fax
- [[ -d ${spooldir} ]] && chown lp:lp "${spooldir}"
-}
diff --git a/x11-misc/efax-gtk/files/efax-gtk-3.2.13-fno-common.patch b/x11-misc/efax-gtk/files/efax-gtk-3.2.13-fno-common.patch
deleted file mode 100644
index 4cfd79afd16..00000000000
--- a/x11-misc/efax-gtk/files/efax-gtk-3.2.13-fno-common.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/efax/efaxos.h
-+++ b/efax/efaxos.h
-@@ -11,10 +11,6 @@
- #define UNIXSIGS SIGHUP, SIGQUIT, SIGIOT, SIGALRM
- #define CATCHSIGS ANSISIGS, UNIXSIGS
-
--/* Bit order reversal table. */
--
--extern unsigned char normalbits [ ] ;
--
- typedef enum ttymodes /* serial port modes: */
- {
- COMMAND, /* 19200 8N1, no f/c, DTR high */
---- a/efax/efaxlib.h
-+++ b/efax/efaxlib.h
-@@ -208,7 +208,7 @@
- /* Bit reversal lookup tables (note that the `normalbits' array
- is the one actually used for the bit reversal. */
-
--uchar reversebits [ 256 ], normalbits [ 256 ] ;
-+extern uchar reversebits [ 256 ], normalbits [ 256 ] ;
-
- void initbittab(void) ;
-
---- a/efax/efaxlib.c
-+++ b/efax/efaxlib.c
-@@ -48,6 +48,8 @@
- return n < 0 ;
- }
-
-+uchar reversebits [ 256 ], normalbits [ 256 ] ;
-+
- /* Provide dummy gettext() function if there is no internationalisation support */
-
- #ifndef ENABLE_NLS
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-03-15 21:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-01 13:43 [gentoo-commits] repo/gentoo:master commit in: x11-misc/efax-gtk/files/, x11-misc/efax-gtk/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2021-03-15 21:39 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox