* [gentoo-commits] repo/gentoo:master commit in: app-text/xdvik/files/, app-text/xdvik/
@ 2017-06-17 11:11 Alexis Ballier
0 siblings, 0 replies; 6+ messages in thread
From: Alexis Ballier @ 2017-06-17 11:11 UTC (permalink / raw
To: gentoo-commits
commit: 1904d3e9f6f33a4fb1e6156cefd058dc7764a4e9
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 10:20:46 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sat Jun 17 11:10:57 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1904d3e9
app-text/xdvik: remove old
Package-Manager: Portage-2.3.6, Repoman-2.3.2
app-text/xdvik/Manifest | 2 -
app-text/xdvik/files/xdvik-22.87-xaw3d.patch | 22 ------
app-text/xdvik/xdvik-22.86.ebuild | 96 -------------------------
app-text/xdvik/xdvik-22.87.ebuild | 102 ---------------------------
4 files changed, 222 deletions(-)
diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest
index 9bf7cb354f3..b942f28d165 100644
--- a/app-text/xdvik/Manifest
+++ b/app-text/xdvik/Manifest
@@ -1,4 +1,2 @@
DIST xdvik-22.85.tar.gz 4128828 SHA256 91f08103e53ab46efc83053e648bdd07aa100043233dadcb7384efc83fa2dde8 SHA512 9220bac0dea21d617b4ea7129ca8133fd447fb1adc26c699970cae7d3e168e32f4745b0936d18d8f769f3926c526e085f0c92a4d99d5faff8301e3c4ebc297b5 WHIRLPOOL 57ffc2d6a326b754b63aed54836c05b2e9431b01faba6d9bdc347b07094a62a7569d7746f556366b282808cc93a41a81cbda4fd82cdf4972133f8addc74e4e75
-DIST xdvik-22.86.tar.gz 4412419 SHA256 a3dffb8d878e6039ebc168d3bd82d194912dac53177673f818d0baac2dc27203 SHA512 f2cf15b8f94ae1a43b749fc9355eac1b427a41d690299ad4a221d51ef21eb0adcf6986c13f03d8c681e6cc2522229a2843b5c6f1ad359c5f0a28933e6d11c8eb WHIRLPOOL 8031f1ddc0eb8de415446752c07c0b7a22f35ffcd6f44a2b025cdb1bf1593bbe37306da5c93d620fe9f00b14fd6fc061c0f432afd7294ccf774e5e4e4fbd8f9d
DIST xdvik-22.87.03.tar.gz 4760306 SHA256 a1b8631b6650c534cf8dc584a9f106b5df0771613743139c8a644a19f14611fc SHA512 d4d418d78658f16d4d278e387ed484b291afc8623b00acaf4110e9f123ed76568714ad50f80588373657f412e8fff36f3e76b3e43f69756d46f031c0f2269a88 WHIRLPOOL da8227daa34ac69b60c447e3c929aaf353697add104245b64815b2f42ad03c189c353c7b4d34359f5897a26e5dd811fa3ef21254ee18c243d557860f697bfba6
-DIST xdvik-22.87.tar.gz 4600576 SHA256 920a20928b4360a1ab83843cffb98c129a54c6462ee014d0e5c4b209b8840ea7 SHA512 cb0c15e88ce42b25cd5edfc8fb84a8afdcc821a6444ba1c5f9f1365a7f62e57cbf37729b276de033b4abfd0f6fe32fa5789f6efd5a0c042e1195c4dc971c8b9f WHIRLPOOL 06ff8d6920ece92d711a432ed19998290f7bda30ad545b3c2bceb505f0fa3a03d680d6694f60a49c44d1b13b1429b45f6c451ec3f0d8f2723b74190065fc9417
diff --git a/app-text/xdvik/files/xdvik-22.87-xaw3d.patch b/app-text/xdvik/files/xdvik-22.87-xaw3d.patch
deleted file mode 100644
index 79e7893a19b..00000000000
--- a/app-text/xdvik/files/xdvik-22.87-xaw3d.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/events.c b/events.c
-index dbb46f0..f9990f9 100644
---- a/events.c
-+++ b/events.c
-@@ -5311,7 +5311,7 @@ xi2_emulate_action(struct xdvi_action *actp, struct xi2_valinfo *valinfo,
- }
-
- if (actp->proc == Act_wheel) {
--# if XAW
-+# if !MOTIF
- if (globals.widgets.y_bar != NULL)
- XtCallCallbacks(globals.widgets.y_bar, XtNscrollProc,
- cast_int_to_XtPointer(dist));
-@@ -5322,7 +5322,7 @@ xi2_emulate_action(struct xdvi_action *actp, struct xi2_valinfo *valinfo,
- # endif /* MOTIF */
- }
- else { /* Act_hwheel */
--# if XAW
-+# if !MOTIF
- if (globals.widgets.x_bar != NULL)
- XtCallCallbacks(globals.widgets.x_bar, XtNscrollProc,
- cast_int_to_XtPointer(dist));
diff --git a/app-text/xdvik/xdvik-22.86.ebuild b/app-text/xdvik/xdvik-22.86.ebuild
deleted file mode 100644
index ea6665f07b0..00000000000
--- a/app-text/xdvik/xdvik-22.86.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils flag-o-matic elisp-common toolchain-funcs multilib
-
-DESCRIPTION="DVI previewer for X Window System"
-HOMEPAGE="http://xdvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="motif neXt Xaw3d emacs"
-
-RDEPEND="media-libs/freetype:2
- x11-libs/libXmu
- x11-libs/libXp
- x11-libs/libXpm
- motif? ( >=x11-libs/motif-2.3:0 )
- !motif? (
- neXt? ( x11-libs/neXtaw )
- !neXt? (
- Xaw3d? ( x11-libs/libXaw3d )
- !Xaw3d? ( x11-libs/libXaw )
- )
- )
- dev-libs/kpathsea"
-DEPEND="sys-devel/flex
- virtual/yacc
- ${RDEPEND}"
-RDEPEND="${RDEPEND}
- virtual/latex-base
- !<app-text/texlive-2007"
-S=${WORKDIR}/${P}/texk/xdvik
-
-src_prepare() {
- # Make sure system kpathsea headers are used
- cd "${WORKDIR}/${P}/texk/kpathsea"
- for i in *.h ; do echo "#include_next \"$i\"" > $i; done
-}
-
-src_configure() {
- local toolkit
-
- if use motif ; then
- toolkit="motif"
- use neXt && ewarn "neXt USE flag ignored (superseded by motif)"
- use Xaw3d && ewarn "Xaw3d USE flag ignored (superseded by motif)"
- elif use neXt ; then
- toolkit="neXtaw"
- use Xaw3d && ewarn "Xaw3d USE flag ignored (superseded by neXt)"
- elif use Xaw3d ; then
- toolkit="xaw3d"
- else
- toolkit="xaw"
- fi
-
- econf \
- --with-system-freetype2 \
- --with-system-kpathsea \
- --with-kpathsea-include="${EPREFIX}"/usr/include/kpathsea \
- --with-xdvi-x-toolkit="${toolkit}" \
- --x-includes="${EPREFIX}"/usr/include \
- --x-libraries="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_compile() {
- emake kpathsea_dir="${EPREFIX}/usr/include/kpathsea"
- use emacs && elisp-compile xdvi-search.el
-}
-
-src_install() {
- dodir /usr/share/texmf-dist/dvips/config
-
- emake DESTDIR="${D}" install
-
- dosym /usr/share/texmf-dist/xdvi/XDvi /usr/share/X11/app-defaults/XDvi
-
- dodoc BUGS FAQ README.*
-
- use emacs && elisp-install tex-utils *.el *.elc
-
- doicon "${FILESDIR}"/${PN}.xpm
- make_desktop_entry xdvi "XDVI" xdvik "Graphics;Viewer"
- echo "MimeType=application/x-dvi;" >> "${ED}"usr/share/applications/xdvi-"${PN}".desktop
-}
-
-pkg_postinst() {
- if use emacs; then
- elog "Add"
- elog " (add-to-list 'load-path \"${EPREFIX}${SITELISP}/tex-utils\")"
- elog " (require 'xdvi-search)"
- elog "to your ~/.emacs file"
- fi
-}
diff --git a/app-text/xdvik/xdvik-22.87.ebuild b/app-text/xdvik/xdvik-22.87.ebuild
deleted file mode 100644
index 596a4d860ed..00000000000
--- a/app-text/xdvik/xdvik-22.87.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic elisp-common toolchain-funcs multilib
-
-DESCRIPTION="DVI previewer for X Window System"
-HOMEPAGE="http://xdvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="motif neXt Xaw3d emacs"
-
-RDEPEND="media-libs/freetype:2
- x11-libs/libXi
- x11-libs/libXmu
- x11-libs/libXp
- x11-libs/libXpm
- motif? ( >=x11-libs/motif-2.3:0 )
- !motif? (
- neXt? ( x11-libs/neXtaw )
- !neXt? (
- Xaw3d? ( x11-libs/libXaw3d )
- !Xaw3d? ( x11-libs/libXaw )
- )
- )
- dev-libs/kpathsea"
-DEPEND="sys-devel/flex
- virtual/yacc
- virtual/pkgconfig
- ${RDEPEND}"
-RDEPEND="${RDEPEND}
- virtual/latex-base
- !<app-text/texlive-2007"
-S=${WORKDIR}/${P}/texk/xdvik
-
-src_prepare() {
- local i
- epatch "${FILESDIR}"/${P}-xaw3d.patch
- # Make sure system kpathsea headers are used
- cd "${WORKDIR}/${P}/texk/kpathsea"
- for i in *.h ; do echo "#include_next \"$i\"" > $i; done
-}
-
-src_configure() {
- has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
-
- local toolkit
-
- if use motif ; then
- toolkit="motif"
- use neXt && ewarn "neXt USE flag ignored (superseded by motif)"
- use Xaw3d && ewarn "Xaw3d USE flag ignored (superseded by motif)"
- elif use neXt ; then
- toolkit="neXtaw"
- use Xaw3d && ewarn "Xaw3d USE flag ignored (superseded by neXt)"
- elif use Xaw3d ; then
- toolkit="xaw3d"
- else
- toolkit="xaw"
- fi
-
- econf \
- --with-system-freetype2 \
- --with-system-kpathsea \
- --with-kpathsea-include="${EPREFIX}"/usr/include/kpathsea \
- --with-xdvi-x-toolkit="${toolkit}" \
- --x-includes="${EPREFIX}"/usr/include \
- --x-libraries="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_compile() {
- emake kpathsea_dir="${EPREFIX}/usr/include/kpathsea"
- use emacs && elisp-compile xdvi-search.el
-}
-
-src_install() {
- dodir /usr/share/texmf-dist/dvips/config
-
- emake DESTDIR="${D}" install
-
- dosym /usr/share/texmf-dist/xdvi/XDvi /usr/share/X11/app-defaults/XDvi
-
- dodoc BUGS FAQ README.*
-
- use emacs && elisp-install tex-utils *.el *.elc
-
- doicon "${FILESDIR}"/${PN}.xpm
- make_desktop_entry xdvi "XDVI" xdvik "Graphics;Viewer"
- echo "MimeType=application/x-dvi;" >> "${ED}"usr/share/applications/xdvi-"${PN}".desktop
-}
-
-pkg_postinst() {
- if use emacs; then
- elog "Add"
- elog " (add-to-list 'load-path \"${EPREFIX}${SITELISP}/tex-utils\")"
- elog " (require 'xdvi-search)"
- elog "to your ~/.emacs file"
- fi
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/xdvik/files/, app-text/xdvik/
@ 2018-10-08 21:52 Naohiro Aota
0 siblings, 0 replies; 6+ messages in thread
From: Naohiro Aota @ 2018-10-08 21:52 UTC (permalink / raw
To: gentoo-commits
commit: a975bbac7fdb2ee7d70131caa9b039a5801ddd13
Author: Naohiro Aota <naota <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 8 21:43:02 2018 +0000
Commit: Naohiro Aota <naota <AT> gentoo <DOT> org>
CommitDate: Mon Oct 8 21:51:19 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a975bbac
app-text/xdvik: use pkg-config instead of freetype-config
Also, bump to EAPI=6 and introduced CDEPEND variable.
Thanks to Aidan Thornton for the patch.
Closes: https://bugs.gentoo.org/655358
Signed-off-by: Naohiro Aota <naota <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
.../files/xdvik-22.87.03-freetype2-config.patch | 23 +++++
app-text/xdvik/xdvik-22.87.03-r2.ebuild | 115 +++++++++++++++++++++
2 files changed, 138 insertions(+)
diff --git a/app-text/xdvik/files/xdvik-22.87.03-freetype2-config.patch b/app-text/xdvik/files/xdvik-22.87.03-freetype2-config.patch
new file mode 100644
index 00000000000..6387b28c8ba
--- /dev/null
+++ b/app-text/xdvik/files/xdvik-22.87.03-freetype2-config.patch
@@ -0,0 +1,23 @@
+--- a/m4/kpse-freetype2-flags.m4 2018-09-19 10:19:06.437789178 +0100
++++ b/m4/kpse-freetype2-flags.m4 2018-09-19 10:23:48.556050046 +0100
+@@ -21,17 +21,10 @@
+
+ # KPSE_FREETYPE2_OPTIONS([WITH-SYSTEM])
+ # -------------------------------------
+-AC_DEFUN([KPSE_FREETYPE2_OPTIONS], [_KPSE_LIB_OPTIONS([freetype2], [$1], [freetype-config])])
++AC_DEFUN([KPSE_FREETYPE2_OPTIONS], [_KPSE_LIB_OPTIONS([freetype2], [$1], [pkg-config])])
+
+ # KPSE_FREETYPE2_SYSTEM_FLAGS
+ # ---------------------------
+ AC_DEFUN([KPSE_FREETYPE2_SYSTEM_FLAGS], [dnl
+-AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
+-AC_CHECK_TOOL([FT2_CONFIG], [freetype-config], [false])[]dnl
+-if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
+- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
+- FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+-elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
+- AC_MSG_ERROR([did not find freetype-config required for system freetype2 library])
+-fi
+-]) # KPSE_FREETYPE2_SYSTEM_FLAGS
++_KPSE_PKG_CONFIG_FLAGS([freetype2], [freetype2])])
++
diff --git a/app-text/xdvik/xdvik-22.87.03-r2.ebuild b/app-text/xdvik/xdvik-22.87.03-r2.ebuild
new file mode 100644
index 00000000000..30720be2062
--- /dev/null
+++ b/app-text/xdvik/xdvik-22.87.03-r2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools elisp-common eutils flag-o-matic multilib toolchain-funcs xdg-utils
+
+DESCRIPTION="DVI previewer for X Window System"
+HOMEPAGE="http://xdvi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="motif neXt Xaw3d emacs"
+
+CDEPEND=">=media-libs/freetype-2.9.1-r2:2
+ x11-libs/libX11
+ x11-libs/libXi
+ x11-libs/libXmu
+ x11-libs/libXpm
+ x11-libs/libXt
+ motif? ( >=x11-libs/motif-2.3:0 )
+ !motif? (
+ neXt? ( x11-libs/neXtaw )
+ !neXt? (
+ Xaw3d? ( x11-libs/libXaw3d )
+ !Xaw3d? ( x11-libs/libXaw )
+ )
+ )
+ dev-libs/kpathsea"
+DEPEND="sys-devel/flex
+ virtual/yacc
+ virtual/pkgconfig
+ ${CDEPEND}"
+RDEPEND="${CDEPEND}
+ virtual/latex-base
+ !<app-text/texlive-2007"
+S=${WORKDIR}/${P}/texk/xdvik
+
+src_prepare() {
+ local i
+ # Make sure system kpathsea headers are used
+ cd "${WORKDIR}/${P}/texk/kpathsea"
+ for i in *.h ; do echo "#include_next \"$i\"" > $i; done
+
+ cd "${WORKDIR}/${P}"
+ eapply "${FILESDIR}"/${P}-freetype2-config.patch
+ cd "${S}"
+ eautoreconf
+
+ eapply_user
+}
+
+src_configure() {
+ has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
+
+ local toolkit
+
+ if use motif ; then
+ toolkit="motif"
+ use neXt && ewarn "neXt USE flag ignored (superseded by motif)"
+ use Xaw3d && ewarn "Xaw3d USE flag ignored (superseded by motif)"
+ elif use neXt ; then
+ toolkit="neXtaw"
+ use Xaw3d && ewarn "Xaw3d USE flag ignored (superseded by neXt)"
+ elif use Xaw3d ; then
+ toolkit="xaw3d"
+ else
+ toolkit="xaw"
+ fi
+
+ econf \
+ --with-system-freetype2 \
+ --with-system-kpathsea \
+ --with-kpathsea-include="${EPREFIX}"/usr/include/kpathsea \
+ --with-xdvi-x-toolkit="${toolkit}" \
+ --x-includes="${SYSROOT}${EPREFIX}"/usr/include \
+ --x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_compile() {
+ emake kpathsea_dir="${EPREFIX}/usr/include/kpathsea"
+ use emacs && elisp-compile xdvi-search.el
+}
+
+src_install() {
+ dodir /usr/share/texmf-dist/dvips/config
+
+ emake DESTDIR="${D}" install
+
+ dosym ../../texmf-dist/xdvi/XDvi /usr/share/X11/app-defaults/XDvi
+
+ dodoc BUGS FAQ README.*
+
+ use emacs && elisp-install tex-utils *.el *.elc
+
+ doicon "${FILESDIR}"/${PN}.xpm
+ make_desktop_entry xdvi "XDVI" xdvik "Graphics;Viewer"
+ echo "MimeType=application/x-dvi;" >> "${ED}"usr/share/applications/xdvi-"${PN}".desktop
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+
+ if use emacs; then
+ elog "Add"
+ elog " (add-to-list 'load-path \"${EPREFIX}${SITELISP}/tex-utils\")"
+ elog " (require 'xdvi-search)"
+ elog "to your ~/.emacs file"
+ fi
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/xdvik/files/, app-text/xdvik/
@ 2023-08-27 14:24 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2023-08-27 14:24 UTC (permalink / raw
To: gentoo-commits
commit: d9b55a53eeeda3b14c67303c0cc33eead91839ad
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 27 14:24:21 2023 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Aug 27 14:24:21 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9b55a53
app-text/xdvik: drop 22.87.03-r4, 22.87.06
Signed-off-by: David Seifert <soap <AT> gentoo.org>
app-text/xdvik/Manifest | 1 -
.../files/xdvik-22.87.03-freetype2-config.patch | 23 -----
app-text/xdvik/xdvik-22.87.03-r4.ebuild | 114 ---------------------
app-text/xdvik/xdvik-22.87.06.ebuild | 114 ---------------------
4 files changed, 252 deletions(-)
diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest
index 946aa23510de..b17947255f53 100644
--- a/app-text/xdvik/Manifest
+++ b/app-text/xdvik/Manifest
@@ -1,3 +1,2 @@
-DIST xdvik-22.87.03.tar.gz 4760306 BLAKE2B d242696fadf2980cd307d4a172d2af06d98d07b090279440117f869c9a623bcade8745d7a4d3c108c4eafbdeaadefb8d5ba1ea00bdf77d350cbf83c49c2ca0fb SHA512 d4d418d78658f16d4d278e387ed484b291afc8623b00acaf4110e9f123ed76568714ad50f80588373657f412e8fff36f3e76b3e43f69756d46f031c0f2269a88
DIST xdvik-22.87.06.tar.gz 5922131 BLAKE2B 88821b7642d2d79158f5b49a7d23dad2209750a44d2b75f131d77a5ee326670d2a9cf09246ea9226a386bce429890459625d87df697599529de1bfc32438bf64 SHA512 93fb231f20ef76e170ae954d076ac5421669b3db71e3a96561626736d516f639227e3e502012ba4612fd238172b82f512985c571702d6c0ce078e60a67e5b19f
DIST xdvik_192.png 77893 BLAKE2B 533910801cd981a39c42851be2779f98ecf7fcec8ef2a167005521e39d8ef66d8eb806b382451ebf88da62ba61afba82b8d15a60ef6ba347bd2ff848f10253ed SHA512 7fa6becc3601df01134cd163e461780b9ab4ee855788e38dc3d255d491294c033f040326016df7671ff301cc8f91462209e1fda5e50cb383f5407f0c1021d71d
diff --git a/app-text/xdvik/files/xdvik-22.87.03-freetype2-config.patch b/app-text/xdvik/files/xdvik-22.87.03-freetype2-config.patch
deleted file mode 100644
index 6387b28c8ba2..000000000000
--- a/app-text/xdvik/files/xdvik-22.87.03-freetype2-config.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/m4/kpse-freetype2-flags.m4 2018-09-19 10:19:06.437789178 +0100
-+++ b/m4/kpse-freetype2-flags.m4 2018-09-19 10:23:48.556050046 +0100
-@@ -21,17 +21,10 @@
-
- # KPSE_FREETYPE2_OPTIONS([WITH-SYSTEM])
- # -------------------------------------
--AC_DEFUN([KPSE_FREETYPE2_OPTIONS], [_KPSE_LIB_OPTIONS([freetype2], [$1], [freetype-config])])
-+AC_DEFUN([KPSE_FREETYPE2_OPTIONS], [_KPSE_LIB_OPTIONS([freetype2], [$1], [pkg-config])])
-
- # KPSE_FREETYPE2_SYSTEM_FLAGS
- # ---------------------------
- AC_DEFUN([KPSE_FREETYPE2_SYSTEM_FLAGS], [dnl
--AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
--AC_CHECK_TOOL([FT2_CONFIG], [freetype-config], [false])[]dnl
--if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
-- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
-- FREETYPE2_LIBS=`$FT2_CONFIG --libs`
--elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
-- AC_MSG_ERROR([did not find freetype-config required for system freetype2 library])
--fi
--]) # KPSE_FREETYPE2_SYSTEM_FLAGS
-+_KPSE_PKG_CONFIG_FLAGS([freetype2], [freetype2])])
-+
diff --git a/app-text/xdvik/xdvik-22.87.03-r4.ebuild b/app-text/xdvik/xdvik-22.87.03-r4.ebuild
deleted file mode 100644
index 516a2fd525d4..000000000000
--- a/app-text/xdvik/xdvik-22.87.03-r4.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools desktop elisp-common flag-o-matic toolchain-funcs xdg
-
-DESCRIPTION="DVI previewer for X Window System"
-HOMEPAGE="https://xdvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz"
-S="${WORKDIR}"/${P}/texk/xdvik
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="motif neXt Xaw3d emacs"
-
-DEPEND=">=media-libs/freetype-2.9.1-r2:2
- x11-libs/libX11
- x11-libs/libXi
- x11-libs/libXmu
- x11-libs/libXpm
- x11-libs/libXt
- emacs? ( >=app-editors/emacs-23.1:* )
- motif? ( >=x11-libs/motif-2.3:0 )
- !motif? (
- neXt? ( x11-libs/neXtaw )
- !neXt? (
- Xaw3d? ( x11-libs/libXaw3d )
- !Xaw3d? ( x11-libs/libXaw )
- )
- )
- dev-libs/kpathsea:="
-RDEPEND="${DEPEND}
- virtual/latex-base
- !<app-text/texlive-2007"
-BDEPEND="sys-devel/flex
- app-alternatives/yacc
- virtual/pkgconfig"
-
-src_prepare() {
- default
-
- # Make sure system kpathsea headers are used
- cd "${WORKDIR}/${P}/texk/kpathsea" || die
- local i
- for i in *.h ; do
- echo "#include_next \"$i\"" > ${i} || die
- done
-
- cd "${WORKDIR}/${P}" || die
- eapply "${FILESDIR}"/${P}-freetype2-config.patch
- cd "${S}" || die
- eautoreconf
-}
-
-src_configure() {
- has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
-
- local toolkit
- if use motif ; then
- toolkit="motif"
- use neXt && ewarn "neXt USE flag ignored (superseded by motif)"
- use Xaw3d && ewarn "Xaw3d USE flag ignored (superseded by motif)"
- elif use neXt ; then
- toolkit="neXtaw"
- use Xaw3d && ewarn "Xaw3d USE flag ignored (superseded by neXt)"
- elif use Xaw3d ; then
- toolkit="xaw3d"
- else
- toolkit="xaw"
- fi
-
- econf \
- --with-system-freetype2 \
- --with-system-kpathsea \
- --with-kpathsea-include="${EPREFIX}"/usr/include/kpathsea \
- --with-xdvi-x-toolkit="${toolkit}" \
- --x-includes="${ESYSROOT}"/usr/include \
- --x-libraries="${ESYSROOT}"/usr/$(get_libdir)
-}
-
-src_compile() {
- emake kpathsea_dir="${EPREFIX}"/usr/include/kpathsea
-
- use emacs && elisp-compile xdvi-search.el
-}
-
-src_install() {
- dodir /usr/share/texmf-dist/dvips/config
-
- emake DESTDIR="${D}" install
-
- dosym ../../texmf-dist/xdvi/XDvi /usr/share/X11/app-defaults/XDvi
-
- dodoc BUGS FAQ README.*
-
- use emacs && elisp-install tex-utils *.el *.elc
-
- doicon "${FILESDIR}"/${PN}.xpm
- make_desktop_entry xdvi "XDVI" xdvik "Graphics;Viewer"
- echo "MimeType=application/x-dvi;" >> "${ED}"/usr/share/applications/xdvi-"${PN}".desktop
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- if use emacs; then
- elog "Add"
- elog " (add-to-list 'load-path \"${EPREFIX}${SITELISP}/tex-utils\")"
- elog " (require 'xdvi-search)"
- elog "to your ~/.emacs file"
- fi
-}
diff --git a/app-text/xdvik/xdvik-22.87.06.ebuild b/app-text/xdvik/xdvik-22.87.06.ebuild
deleted file mode 100644
index 82c80c752d0d..000000000000
--- a/app-text/xdvik/xdvik-22.87.06.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools desktop elisp-common flag-o-matic toolchain-funcs xdg
-
-DESCRIPTION="DVI previewer for X Window System"
-HOMEPAGE="https://xdvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz"
-S="${WORKDIR}"/${P}/texk/xdvik
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="motif neXt Xaw3d emacs"
-
-DEPEND=">=media-libs/freetype-2.9.1-r2:2
- x11-libs/libX11
- x11-libs/libXi
- x11-libs/libXmu
- x11-libs/libXpm
- x11-libs/libXt
- emacs? ( >=app-editors/emacs-23.1:* )
- motif? ( >=x11-libs/motif-2.3:0 )
- !motif? (
- neXt? ( x11-libs/neXtaw )
- !neXt? (
- Xaw3d? ( x11-libs/libXaw3d )
- !Xaw3d? ( x11-libs/libXaw )
- )
- )
- dev-libs/kpathsea:="
-RDEPEND="${DEPEND}
- virtual/latex-base
- !<app-text/texlive-2007"
-BDEPEND="sys-devel/flex
- app-alternatives/yacc
- virtual/pkgconfig"
-
-src_prepare() {
- default
-
- # Make sure system kpathsea headers are used
- cd "${WORKDIR}/${P}/texk/kpathsea" || die
- local i
- for i in *.h ; do
- echo "#include_next \"$i\"" > ${i} || die
- done
-
- cd "${WORKDIR}/${P}" || die
- cd "${S}" || die
- eapply "${FILESDIR}"/${PN}-22.87.06-configure-clang16.patch
- eautoreconf
-}
-
-src_configure() {
- has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
-
- local toolkit
- if use motif ; then
- toolkit="motif"
- use neXt && ewarn "neXt USE flag ignored (superseded by motif)"
- use Xaw3d && ewarn "Xaw3d USE flag ignored (superseded by motif)"
- elif use neXt ; then
- toolkit="neXtaw"
- use Xaw3d && ewarn "Xaw3d USE flag ignored (superseded by neXt)"
- elif use Xaw3d ; then
- toolkit="xaw3d"
- else
- toolkit="xaw"
- fi
-
- econf \
- --with-system-freetype2 \
- --with-system-kpathsea \
- --with-kpathsea-include="${EPREFIX}"/usr/include/kpathsea \
- --with-xdvi-x-toolkit="${toolkit}" \
- --x-includes="${ESYSROOT}"/usr/include \
- --x-libraries="${ESYSROOT}"/usr/$(get_libdir)
-}
-
-src_compile() {
- emake kpathsea_dir="${EPREFIX}"/usr/include/kpathsea
-
- use emacs && elisp-compile xdvi-search.el
-}
-
-src_install() {
- dodir /usr/share/texmf-dist/dvips/config
-
- emake DESTDIR="${D}" install
-
- dosym ../../texmf-dist/xdvi/XDvi /usr/share/X11/app-defaults/XDvi
-
- dodoc BUGS FAQ README.*
-
- use emacs && elisp-install tex-utils *.el *.elc
-
- doicon "${FILESDIR}"/${PN}.xpm
- make_desktop_entry xdvi "XDVI" xdvik "Graphics;Viewer"
- echo "MimeType=application/x-dvi;" >> "${ED}"/usr/share/applications/xdvi-"${PN}".desktop
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- if use emacs; then
- elog "Add"
- elog " (add-to-list 'load-path \"${EPREFIX}${SITELISP}/tex-utils\")"
- elog " (require 'xdvi-search)"
- elog "to your ~/.emacs file"
- fi
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/xdvik/files/, app-text/xdvik/
@ 2024-02-27 15:18 Florian Schmaus
0 siblings, 0 replies; 6+ messages in thread
From: Florian Schmaus @ 2024-02-27 15:18 UTC (permalink / raw
To: gentoo-commits
commit: 281631c0ee38b5793bd4bc30e9dcde99905e41b9
Author: Christopher Fore <csfore <AT> posteo <DOT> net>
AuthorDate: Tue Feb 27 02:18:16 2024 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Feb 27 15:17:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=281631c0
app-text/xdvik: Fix compilation on GCC 14
- Casts page_info.page_labels to _Xconst char** to correct an
incompatible pointer type
- Moves patches into an array
gui/pagesel.c: In function ‘xaw_update_list’:
gui/pagesel.c:541:41: error: passing argument 2 of ‘XawListChange’ from incompatible pointer type [-Wincompatible-pointer-types]
541 | XawListChange(LIST_WIDGET, page_info.page_labels, 0,
| ~~~~~~~~~^~~~~~~~~~~~
| |
| char **
https://wiki.gentoo.org/wiki/Modern_C_porting
Unfortunately upstream rejected the PR due to backwards compatability
issues
Upstream PR: https://github.com/TeX-Live/texlive-source/pull/64
Mailing List: https://tug.org/pipermail/tex-k/2024-February/004008.html
Closes: https://bugs.gentoo.org/919069
Signed-off-by: Christopher Fore <csfore <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/35546
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
app-text/xdvik/files/xdvik-22.87.06-c99-fix.patch | 40 +++++++++++++++++++++++
app-text/xdvik/xdvik-22.87.06-r1.ebuild | 6 +++-
2 files changed, 45 insertions(+), 1 deletion(-)
diff --git a/app-text/xdvik/files/xdvik-22.87.06-c99-fix.patch b/app-text/xdvik/files/xdvik-22.87.06-c99-fix.patch
new file mode 100644
index 000000000000..d22c473f42d3
--- /dev/null
+++ b/app-text/xdvik/files/xdvik-22.87.06-c99-fix.patch
@@ -0,0 +1,40 @@
+From 6d1fbe75ed92a7e1aea9d74e601dace6d24f721b Mon Sep 17 00:00:00 2001
+From: Christopher Fore <csfore@posteo.net>
+Date: Thu, 15 Feb 2024 15:20:34 -0500
+Subject: [PATCH] xdvik/gui: Fix compilation on GCC 14
+
+Starting in GCC 14, what used to be warnings from incompatible pointer
+types are now errors.
+
+https://www.gnu.org/software/gcc/gcc-14/porting_to.html
+
+Error message:
+gui/pagesel.c:541:41: error: passing argument 2 of `XawListChange' from
+incompatible pointer type [-Wincompatible-pointer-types]
+ 541 | XawListChange(LIST_WIDGET, page_info.page_labels, 0,
+ | ~~~~~~~~~^~~~~~~~~~~~
+ | |
+ | char **
+
+This mismatch is simply from XawListChange taking in a const whilst the
+argument given was not a const.
+
+Gentoo bug: https://bugs.gentoo.org/919069
+Signed-off-by: Christopher Fore <csfore@posteo.net>
+---
+ texk/xdvik/gui/pagesel.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gui/pagesel.c b/gui/pagesel.c
+index 945ae760fa..913db11264 100644
+--- a/gui/pagesel.c
++++ b/gui/pagesel.c
+@@ -538,7 +538,7 @@ xaw_update_list(void)
+ button_width = get_panel_width() - 2 * (resource.btn_side_spacing + resource.btn_border_width);
+ /* delete and re-create list */
+ ASSERT(total_pages <= (int)page_info.index_size, "");
+- XawListChange(LIST_WIDGET, page_info.page_labels, 0,
++ XawListChange(LIST_WIDGET, (_Xconst char**) page_info.page_labels, 0,
+ MAX(button_width, pagelist_width), False);
+ /* restore selected item */
+ if (idx != XAW_LIST_NONE) {
diff --git a/app-text/xdvik/xdvik-22.87.06-r1.ebuild b/app-text/xdvik/xdvik-22.87.06-r1.ebuild
index 42dbb86d80dd..a12b97aef76f 100644
--- a/app-text/xdvik/xdvik-22.87.06-r1.ebuild
+++ b/app-text/xdvik/xdvik-22.87.06-r1.ebuild
@@ -39,6 +39,11 @@ BDEPEND="app-alternatives/lex
app-alternatives/yacc
virtual/pkgconfig"
+PATCHES=(
+ "${FILESDIR}"/${PN}-22.87.06-configure-clang16.patch
+ "${FILESDIR}"/${PN}-22.87.06-c99-fix.patch
+)
+
src_prepare() {
default
@@ -51,7 +56,6 @@ src_prepare() {
cd "${WORKDIR}/${P}" || die
cd "${S}" || die
- eapply "${FILESDIR}"/${PN}-22.87.06-configure-clang16.patch
eautoreconf
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/xdvik/files/, app-text/xdvik/
@ 2024-06-19 18:58 Florian Schmaus
0 siblings, 0 replies; 6+ messages in thread
From: Florian Schmaus @ 2024-06-19 18:58 UTC (permalink / raw
To: gentoo-commits
commit: f472da40993dc9f1dde7f6f1f4dc5a4d9faec62d
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 19 18:51:57 2024 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Jun 19 18:58:15 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f472da40
app-text/xdvik: require >=libXaw-1.0.16
Starting with version 1.0.16, libXaw has (again) the expected xaw API
for XawListChange [1]. This means we can drop the according patch.
1: https://gitlab.freedesktop.org/xorg/lib/libxaw/-/commit/d0fcbd9722ad691ca0b5873c98e8e9c236fa718b
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
app-text/xdvik/files/xdvik-22.87.06-c99-fix.patch | 40 -----------------------
app-text/xdvik/xdvik-22.87.06-r1.ebuild | 6 ++--
2 files changed, 4 insertions(+), 42 deletions(-)
diff --git a/app-text/xdvik/files/xdvik-22.87.06-c99-fix.patch b/app-text/xdvik/files/xdvik-22.87.06-c99-fix.patch
deleted file mode 100644
index 4c16f0abd9c4..000000000000
--- a/app-text/xdvik/files/xdvik-22.87.06-c99-fix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 6d1fbe75ed92a7e1aea9d74e601dace6d24f721b Mon Sep 17 00:00:00 2001
-From: Christopher Fore <csfore@posteo.net>
-Date: Thu, 15 Feb 2024 15:20:34 -0500
-Subject: [PATCH] xdvik/gui: Fix compilation on GCC 14
-
-Starting in GCC 14, what used to be warnings from incompatible pointer
-types are now errors.
-
-https://www.gnu.org/software/gcc/gcc-14/porting_to.html
-
-Error message:
-gui/pagesel.c:541:41: error: passing argument 2 of `XawListChange' from
-incompatible pointer type [-Wincompatible-pointer-types]
- 541 | XawListChange(LIST_WIDGET, page_info.page_labels, 0,
- | ~~~~~~~~~^~~~~~~~~~~~
- | |
- | char **
-
-This mismatch is simply from XawListChange taking in a const whilst the
-argument given was not a const.
-
-Gentoo bug: https://bugs.gentoo.org/919069
-Signed-off-by: Christopher Fore <csfore@posteo.net>
----
- texk/xdvik/gui/pagesel.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gui/pagesel.c b/gui/pagesel.c
-index 945ae760fa..913db11264 100644
---- a/gui/pagesel.c
-+++ b/gui/pagesel.c
-@@ -538,7 +538,7 @@ xaw_update_list(void)
- button_width = get_panel_width() - 2 * (resource.btn_side_spacing + resource.btn_border_width);
- /* delete and re-create list */
- ASSERT(total_pages <= (int)page_info.index_size, "");
-- XawListChange(LIST_WIDGET, page_info.page_labels, 0,
-+ XawListChange(LIST_WIDGET, (char**) page_info.page_labels, 0,
- MAX(button_width, pagelist_width), False);
- /* restore selected item */
- if (idx != XAW_LIST_NONE) {
diff --git a/app-text/xdvik/xdvik-22.87.06-r1.ebuild b/app-text/xdvik/xdvik-22.87.06-r1.ebuild
index b41e96e30510..61fa93f0c7a1 100644
--- a/app-text/xdvik/xdvik-22.87.06-r1.ebuild
+++ b/app-text/xdvik/xdvik-22.87.06-r1.ebuild
@@ -17,6 +17,9 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390
IUSE="motif neXt Xaw3d emacs"
+# require >=libXaw-1.0.16 for suitable XawListChange API, see
+# - https://bugs.gentoo.org/919069
+# - https://gitlab.freedesktop.org/xorg/lib/libxaw/-/commit/d0fcbd9722ad691ca0b5873c98e8e9c236fa718b
DEPEND=">=media-libs/freetype-2.9.1-r2:2
x11-libs/libX11
x11-libs/libXi
@@ -29,7 +32,7 @@ DEPEND=">=media-libs/freetype-2.9.1-r2:2
neXt? ( x11-libs/neXtaw )
!neXt? (
Xaw3d? ( x11-libs/libXaw3d )
- !Xaw3d? ( x11-libs/libXaw )
+ !Xaw3d? ( >=x11-libs/libXaw-1.0.16 )
)
)
dev-libs/kpathsea:="
@@ -42,7 +45,6 @@ BDEPEND="app-alternatives/lex
PATCHES=(
"${FILESDIR}"/${PN}-22.87.06-configure-clang16.patch
- "${FILESDIR}"/${PN}-22.87.06-c99-fix.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/xdvik/files/, app-text/xdvik/
@ 2024-11-26 6:33 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2024-11-26 6:33 UTC (permalink / raw
To: gentoo-commits
commit: 9c387fef62bfcf3d647193ef11c631d93d352396
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 26 06:32:49 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 26 06:32:49 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c387fef
app-text/xdvik: fix C23 compat
Closes: https://bugs.gentoo.org/944178
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-text/xdvik/files/xdvik-22.87.06-c23.patch | 83 ++++++++++++++++++++++
.../xdvik/files/xdvik-22.87.06-squeeze-c23.patch | 12 ++++
app-text/xdvik/xdvik-22.87.06-r1.ebuild | 2 +
3 files changed, 97 insertions(+)
diff --git a/app-text/xdvik/files/xdvik-22.87.06-c23.patch b/app-text/xdvik/files/xdvik-22.87.06-c23.patch
new file mode 100644
index 000000000000..d41fe4314a4e
--- /dev/null
+++ b/app-text/xdvik/files/xdvik-22.87.06-c23.patch
@@ -0,0 +1,83 @@
+https://tug.org/pipermail/tex-live/2024-November/050931.html
+https://bugs.gentoo.org/944178
+--- a/dvi-draw.c
++++ b/dvi-draw.c
+@@ -198,7 +198,6 @@ bmUnitT bit_masks[] = {
+ #ifdef VMS
+ #define off_t int
+ #endif
+-extern off_t lseek();
+
+ #ifndef SEEK_SET /* if <unistd.h> is not provided (or for <X11R5) */
+ #define SEEK_SET 0
+@@ -4693,8 +4692,6 @@ anchor_search(const char *str)
+
+ #if GREY
+
+-extern double pow();
+-
+ static void
+ mask_shifts(Pixel mask, int *pshift1, int *pshift2)
+ {
+--- a/gui/menu.c
++++ b/gui/menu.c
+@@ -62,7 +62,7 @@ static struct button_info *m_button_info = NULL; /* toplevel node of pulldown me
+
+
+ static void
+-set_menu_info(void *val, XtActionProc proc, Boolean (*cmp)(), struct button_info *item)
++set_menu_info(void *val, XtActionProc proc, Boolean (*cmp)(void *, const char *), struct button_info *item)
+ {
+ size_t i;
+ ASSERT(item != NULL, "item in set_menu_info musn't be NULL!");
+@@ -96,7 +96,7 @@ set_menu_info(void *val, XtActionProc proc, Boolean (*cmp)(), struct button_info
+
+ /* set a menu according to val and the compare function cmp */
+ void
+-set_menu(void *val, XtActionProc proc, Boolean (*cmp)())
++set_menu(void *val, XtActionProc proc, Boolean (*cmp)(void *, const char *))
+ {
+ /* removed following since cast from function pointer to void pointer is not supported by ANSI C */
+ /* TRACE_GUI((stderr, "set_menu_info: %d, %p, %p", *(int *)val, (void *)proc, (void *)cmp)); */
+--- a/gui/menu.h
++++ b/gui/menu.h
+@@ -67,6 +67,6 @@ extern void create_menu_buttons(Widget parent,
+ #endif
+ );
+
+-extern void set_menu(void *val, XtActionProc proc, Boolean (*cmp)());
++extern void set_menu(void *val, XtActionProc proc, Boolean (*cmp)(void *, const char *));
+
+ #endif /* MENU_H_ */
+--- a/gui/sfDraw.c
++++ b/gui/sfDraw.c
+@@ -238,7 +238,6 @@ SFstatAndCheck(SFDir *dir, SFEntry *entry)
+ struct stat statBuf;
+ char save;
+ int last;
+- extern int SFchdir();
+
+ /*
+ * must be restored before returning
+--- a/gui/sfDraw.h
++++ b/gui/sfDraw.h
+@@ -56,7 +56,7 @@ void SFhAreaSelectedCallback(Widget w, int n, int pnew);
+ void SFpathSliderMovedCallback(Widget w, XtPointer client_data, float *new);
+ void SFpathAreaSelectedCallback(Widget w, XtPointer client_data, int pnew);
+ Boolean SFworkProc(void);
+-extern int (*SFfunc)();
++extern int (*SFfunc)(char *entryReal, char **entryShown, struct stat *statBuf);
+
+ extern Widget selFileField, selFileForm, selFileHScroll, selFileHScrolls[], selFileLists[], selFileVScrolls[];
+ extern Display *SFdisplay;
+--- a/gui/sfSelFile.c
++++ b/gui/sfSelFile.c
+@@ -125,7 +125,7 @@ XtAppContext SFapp;
+ int SFpathScrollWidth, SFvScrollHeight, SFhScrollWidth;
+ char SFtextBuffer[MAXPATHLEN];
+ XtIntervalId SFdirModTimerId;
+-int (*SFfunc) ();
++int (*SFfunc) (char *entryReal, char **entryShown, struct stat *statBuf);
+
+ static int SFstatus = SEL_FILE_NULL;
+
diff --git a/app-text/xdvik/files/xdvik-22.87.06-squeeze-c23.patch b/app-text/xdvik/files/xdvik-22.87.06-squeeze-c23.patch
new file mode 100644
index 000000000000..013c7af3e424
--- /dev/null
+++ b/app-text/xdvik/files/xdvik-22.87.06-squeeze-c23.patch
@@ -0,0 +1,12 @@
+https://tug.org/pipermail/tex-live/2024-November/050930.html
+https://bugs.gentoo.org/944178
+--- a/squeeze/squeeze.c
++++ b/squeeze/squeeze.c
+@@ -118,7 +118,6 @@ main(int argc, char *argv[])
+ int c;
+ char *b;
+ char seeking;
+- extern void exit();
+
+ if (argc > 3 || (in = (argc < 2 ? stdin : fopen(argv[1], "r"))) == NULL ||
+ (out = (argc < 3 ? stdout : fopen(argv[2], "w"))) == NULL) {
diff --git a/app-text/xdvik/xdvik-22.87.06-r1.ebuild b/app-text/xdvik/xdvik-22.87.06-r1.ebuild
index dd82571c839d..e40aeb4ffa5f 100644
--- a/app-text/xdvik/xdvik-22.87.06-r1.ebuild
+++ b/app-text/xdvik/xdvik-22.87.06-r1.ebuild
@@ -45,6 +45,8 @@ BDEPEND="app-alternatives/lex
PATCHES=(
"${FILESDIR}"/${PN}-22.87.06-configure-clang16.patch
+ "${FILESDIR}"/${PN}-22.87.06-squeeze-c23.patch
+ "${FILESDIR}"/${PN}-22.87.06-c23.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-11-26 6:34 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-17 11:11 [gentoo-commits] repo/gentoo:master commit in: app-text/xdvik/files/, app-text/xdvik/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
2018-10-08 21:52 Naohiro Aota
2023-08-27 14:24 David Seifert
2024-02-27 15:18 Florian Schmaus
2024-06-19 18:58 Florian Schmaus
2024-11-26 6:33 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox