* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/files/, media-gfx/iscan/
@ 2017-09-26 17:48 Andreas Hüttel
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Hüttel @ 2017-09-26 17:48 UTC (permalink / raw
To: gentoo-commits
commit: e38656c8d9430ba339b7852115beb472509a409e
Author: Matthew Schultz <mattsch <AT> gmail <DOT> com>
AuthorDate: Tue Sep 26 17:46:55 2017 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Sep 26 17:48:05 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e38656c8
media-gfx/iscan: version bump, bug 596942
Closes: https://bugs.gentoo.org/596942
Closes: https://bugs.gentoo.org/595776
media-gfx/iscan/Manifest | 1 +
media-gfx/iscan/files/iscan-2.30.1.1-gcc6.patch | 11 ++
media-gfx/iscan/iscan-2.30.2.2.ebuild | 177 ++++++++++++++++++++++++
3 files changed, 189 insertions(+)
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index f1c23fac83d..f6b078770b7 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -1,3 +1,4 @@
DIST iscan_2.30.1-1.tar.gz 1217985 SHA256 79aa9a9f81a7146beb22a382bbaf840fbce61b1bdb82660e541946a471e48426 SHA512 0562be739b637ee78a5bf2612e7b148de60709c32550742383b76750688d48e42834acbe050c5f2fad26bd9063c9faff425bf906dcebc3e4160d17cd5481850a WHIRLPOOL f3492bff532779987aa8b47f8bb4a1a16164c3d77386d7906dc6b2c6a606b25bcdb4d15766971f8e9bb5b23c4522a3b601e4198212e8fddd54f75f046dda85ef
+DIST iscan_2.30.2-2.tar.gz 1216875 SHA256 ca2322a527ab41c8207b060ee54fc3782cba84c444bcf6b9c8ee32f7cda007d9 SHA512 bc5e871fa5e3baa62eee7b8b0a73abf2640a38f71f98248b1c9e1cace17c2a32de2f64c2a7527e8618f20e9913a16d0f55a8a94b3aea88ae8a157339e8bcf8e9 WHIRLPOOL 4727f6103639d6fe6e70f1651c4c5b2414ebd244ee395add2aa93849170c9abc815b82fd7fbcc0a3e2394a7fa0849ce5c58865d2a18e3bc4831a94b70ad28b49
DIST userg_revQ_e.pdf 627189 SHA256 7f40dfb94bf747a5059c17cba21e72e2485226ea41655453d010b46ed96e8a1c SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc WHIRLPOOL f1497a87ad9b991a05a7a93ff5603944b1cadf00b5162498ff4c0ff1d85615de922324ee5574d0f8540e2d44fc2dede2a25157e562633f51b75eb8e4d4e56dc2
DIST userg_revQ_j.pdf 734920 SHA256 22d29bd17fe8c5772cdcdfb5201eff54eeaadebe3c94563ee4fcfc04579a1c4d SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90 WHIRLPOOL 0f567a4d3543ea0df1d49e92211ba3811a03f200f828d4348eb00bb695df915ae75001faec52d616ff98d4da617ef6cfe95795ece33eeb114b0378892294647e
diff --git a/media-gfx/iscan/files/iscan-2.30.1.1-gcc6.patch b/media-gfx/iscan/files/iscan-2.30.1.1-gcc6.patch
new file mode 100644
index 00000000000..14a64bcdd9c
--- /dev/null
+++ b/media-gfx/iscan/files/iscan-2.30.1.1-gcc6.patch
@@ -0,0 +1,11 @@
+--- iscan-2.30.1/lib/jpegstream.cc.old 2016-10-12 02:55:47.345862674 -0400
++++ iscan-2.30.1/lib/jpegstream.cc 2016-10-12 03:02:53.790439580 -0400
+@@ -82,7 +82,7 @@
+ // only that _bits != 8.
+ for (unsigned int i = 0; i < _h_sz; ++i)
+ {
+- div_t index = div (i, 8 * sizeof (JSAMPLE));
++ div_t index = div ((int) i, (int) 8 * sizeof (JSAMPLE));
+ int offset = 8 * sizeof (JSAMPLE) - 1 - index.rem;
+ _scanline[i] = ((line[index.quot] & (1 << offset))
+ ? 0 : ~0);
diff --git a/media-gfx/iscan/iscan-2.30.2.2.ebuild b/media-gfx/iscan/iscan-2.30.2.2.ebuild
new file mode 100644
index 00000000000..81ed7d13b55
--- /dev/null
+++ b/media-gfx/iscan/iscan-2.30.2.2.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic autotools versionator
+
+# HINTS:
+# -> non-free modules are x86 and amd64 only
+# -> iscan frontend needs non-free modules
+# -> sane-epkowa should be usable on every arch
+# -> ${P}-${SRC_REV}.tar.gz (for gcc 3.2/3.3)
+# -> ${P}-${SRC_REV}.c2.tar.gz (for gcc 3.4 or later)
+
+# FIXME:
+# Make jpeg/png optional. The problem is, that the configure script ignores --disable-*,
+# if the corresponding lib is found on the system.
+# Furthermore, iscan doesn't compile w/o libusb, this should be fixed somehow.
+
+# TODO:
+# (re)add closed-source binary modules which are needed for some scanners.
+
+KEYWORDS="~amd64 ~x86"
+
+MY_PV="$(get_version_component_range 1-3)"
+MY_PVR="$(replace_version_separator 3 -)"
+MY_DOC="userg_revQ"
+
+DESCRIPTION="EPSON Image Scan! for Linux (including sane-epkowa backend)"
+HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
+SRC_URI="http://support.epson.net/linux/src/scanner/iscan/${PN}_${MY_PVR}.tar.gz
+ doc? (
+ https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_e.pdf
+ l10n_ja? ( https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_j.pdf )
+ )"
+LICENSE="GPL-2 AVASYS"
+SLOT="0"
+
+IUSE="X doc gimp jpeg png tiff l10n_ja"
+IUSE_LINGUAS="ar de es fr it ja ko nl pt zh_CN zh_TW"
+
+for X in ${IUSE_LINGUAS}; do IUSE="${IUSE} linguas_${X}"; done
+
+REQUIRED_USE="gimp? ( X )
+ jpeg? ( X )
+ png? ( X )
+ tiff? ( X )"
+
+QA_PRESTRIPPED="usr/lib*/libesmod.so.*"
+QA_TEXTRELS="${QA_PRESTRIPPED}"
+QA_FLAGS_IGNORED="${QA_PRESTRIPPED}"
+
+# Upstream ships broken sanity test
+RESTRICT="test"
+
+RDEPEND="dev-libs/libxml2
+ media-gfx/iscan-data
+ media-gfx/sane-backends
+ virtual/udev
+ virtual/libusb:1
+ X? ( x11-libs/gtk+:2 )
+ gimp? ( media-gfx/gimp )
+ jpeg? ( virtual/jpeg:= )
+ png? ( media-libs/libpng:= )
+ tiff? ( media-libs/tiff:= )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ X? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+ eapply_user
+ local i
+
+ # convert japanese docs to UTF-8
+ if use l10n_ja; then
+ for i in {NEWS,README}.ja non-free/*.ja.txt; do
+ if [ -f "${i}" ]; then
+ echo ">>> Converting ${i} to UTF-8"
+ iconv -f eucjp -t utf8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~"
+ fi
+ done
+ fi
+
+ # disable checks for gtk+
+ if ! use X; then
+ sed -i -e "s:PKG_CHECK_MODULES(GTK,.*):AC_DEFINE([HAVE_GTK_2], 0):g" \
+ -e "s:\(PKG_CHECK_MODULES(GDK_IMLIB,.*)\):#\1:g" configure.ac || die
+ fi
+
+ epatch "${FILESDIR}"/iscan-2.29.1-drop-ltdl.patch
+ epatch "${FILESDIR}"/iscan-2.28.1.3+libpng-1.5.patch
+ epatch "${FILESDIR}"/iscan-2.29.1-png-libs.patch
+ epatch "${FILESDIR}"/iscan-2.30.1-fix-g++-test.patch
+ epatch "${FILESDIR}"/iscan-2.30.1.1-gcc6.patch
+
+ eautoreconf
+}
+
+src_configure() {
+ append-cppflags -D_GNU_SOURCE # needed for 'strndup'
+ # Fix selector box bug 388073
+ replace-flags "-O[0-9s]" "-O1"
+
+ local myconf=(
+ --enable-dependency-reduction
+ --disable-static
+ $(use_enable X frontend)
+ $(use_enable gimp)
+ $(use_enable jpeg)
+ $(use_enable png)
+ $(use_enable tiff)
+ )
+ econf ${myconf[@]}
+}
+
+src_install() {
+ local MY_LIB="/usr/$(get_libdir)"
+ emake DESTDIR="${D}" install || die "emake install failed"
+
+ # install docs
+ dodoc AUTHORS NEWS README
+ use l10n_ja && dodoc NEWS.ja README.ja
+
+ # install sane config
+ insinto /etc/sane.d
+ doins backend/epkowa.conf
+
+ # install extra docs
+ if use doc; then
+ insinto /usr/share/doc/${PF}
+ if use l10n_ja; then
+ doins "${DISTDIR}/${MY_DOC}_j.pdf"
+ else
+ doins "${DISTDIR}/${MY_DOC}_e.pdf"
+ fi
+ fi
+
+ # link iscan so it is seen as a plugin in gimp
+ if use X && use gimp; then
+ local plugindir
+ if [ -x /usr/bin/gimptool ]; then
+ plugindir="$(gimptool --gimpplugindir)/plug-ins" || die "Failed to get gimpplugindir"
+ elif [ -x /usr/bin/gimptool-2.0 ]; then
+ plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins" || die "Failed to get gimpplugindir"
+ else
+ die "Can't find GIMP plugin directory."
+ fi
+ dodir "${plugindir}"
+ dosym /usr/bin/iscan "${plugindir}"/iscan
+ fi
+
+ # install desktop entry
+ if use X; then
+ make_desktop_entry iscan "Image Scan! for Linux ${PV}" scanner
+ fi
+}
+
+pkg_postinst() {
+ local i
+ local DLL_CONF="/etc/sane.d/dll.conf"
+ local EPKOWA_CONF="/etc/sane.d/epkowa.conf"
+
+ elog
+ if grep -q "^[ \t]*\<epkowa\>" ${DLL_CONF}; then
+ elog "Please edit ${EPKOWA_CONF} to suit your needs."
+ elif grep -q "\<epkowa\>" ${DLL_CONF}; then
+ elog "Hint: to enable the backend, add 'epkowa' to ${DLL_CONF}"
+ elog "Then edit ${EPKOWA_CONF} to suit your needs."
+ else
+ echo "epkowa" >> ${DLL_CONF}
+ elog "A new entry 'epkowa' was added to ${DLL_CONF}"
+ elog "Please edit ${EPKOWA_CONF} to suit your needs."
+ fi
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/files/, media-gfx/iscan/
@ 2018-01-20 20:26 David Seifert
0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2018-01-20 20:26 UTC (permalink / raw
To: gentoo-commits
commit: 32694b0b3b24bd6729e613fabd7a3050c658c95b
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 20 20:25:50 2018 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jan 20 20:26:20 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32694b0b
media-gfx/iscan: [QA] Cleanup
Package-Manager: Portage-2.3.19, Repoman-2.3.6
.../iscan/files/iscan-2.28.1.3+libpng-1.5.patch | 8 +-
media-gfx/iscan/iscan-2.30.2.2-r1.ebuild | 166 +++++++++++++++++++++
2 files changed, 170 insertions(+), 4 deletions(-)
diff --git a/media-gfx/iscan/files/iscan-2.28.1.3+libpng-1.5.patch b/media-gfx/iscan/files/iscan-2.28.1.3+libpng-1.5.patch
index 7205028d824..50b94889190 100644
--- a/media-gfx/iscan/files/iscan-2.28.1.3+libpng-1.5.patch
+++ b/media-gfx/iscan/files/iscan-2.28.1.3+libpng-1.5.patch
@@ -1,5 +1,5 @@
---- lib/pngstream.cc 2011-12-01 02:30:53.000000000 +0100
-+++ lib/pngstream.cc 2012-02-06 03:06:22.000000000 +0100
+--- a/lib/pngstream.cc
++++ b/lib/pngstream.cc
@@ -83,7 +83,12 @@
#if HAVE_PNG_H
set_error_handler (_png, _info);
@@ -33,8 +33,8 @@
&& lib->write_info
&& lib->write_row
&& lib->write_flush
---- lib/pngstream.hh 2011-12-01 02:30:53.000000000 +0100
-+++ lib/pngstream.hh 2012-02-06 03:09:09.000000000 +0100
+--- a/lib/pngstream.hh
++++ b/lib/pngstream.hh
@@ -108,6 +108,10 @@
png_structp);
fundecl (void, write_end,
diff --git a/media-gfx/iscan/iscan-2.30.2.2-r1.ebuild b/media-gfx/iscan/iscan-2.30.2.2-r1.ebuild
new file mode 100644
index 00000000000..be96146638b
--- /dev/null
+++ b/media-gfx/iscan/iscan-2.30.2.2-r1.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools desktop flag-o-matic versionator
+
+# HINTS:
+# -> non-free modules are x86 and amd64 only
+# -> iscan frontend needs non-free modules
+# -> sane-epkowa should be usable on every arch
+# -> ${P}-${SRC_REV}.tar.gz (for gcc 3.2/3.3)
+# -> ${P}-${SRC_REV}.c2.tar.gz (for gcc 3.4 or later)
+
+# FIXME:
+# Make jpeg/png optional. The problem is, that the configure script ignores --disable-*,
+# if the corresponding lib is found on the system.
+# Furthermore, iscan doesn't compile w/o libusb, this should be fixed somehow.
+
+# TODO:
+# (re)add closed-source binary modules which are needed for some scanners.
+
+MY_PV="$(get_version_component_range 1-3)"
+MY_PVR="$(replace_version_separator 3 -)"
+MY_DOC="userg_revQ"
+
+DESCRIPTION="EPSON Image Scan! for Linux (including sane-epkowa backend)"
+HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
+SRC_URI="http://support.epson.net/linux/src/scanner/iscan/${PN}_${MY_PVR}.tar.gz
+ doc? (
+ https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_e.pdf
+ l10n_ja? ( https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_j.pdf )
+ )"
+
+LICENSE="GPL-2 AVASYS"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X doc gimp jpeg png tiff l10n_ja"
+REQUIRED_USE="gimp? ( X )
+ jpeg? ( X )
+ png? ( X )
+ tiff? ( X )"
+# Upstream ships broken sanity test
+RESTRICT="test"
+
+RDEPEND="dev-libs/libxml2
+ media-gfx/iscan-data
+ media-gfx/sane-backends
+ virtual/udev
+ virtual/libusb:1
+ X? ( x11-libs/gtk+:2 )
+ gimp? ( media-gfx/gimp )
+ jpeg? ( virtual/jpeg:= )
+ png? ( media-libs/libpng:= )
+ tiff? ( media-libs/tiff:= )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ X? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PATCHES=(
+ "${FILESDIR}"/iscan-2.29.1-drop-ltdl.patch
+ "${FILESDIR}"/iscan-2.28.1.3+libpng-1.5.patch
+ "${FILESDIR}"/iscan-2.29.1-png-libs.patch
+ "${FILESDIR}"/iscan-2.30.1-fix-g++-test.patch
+ "${FILESDIR}"/iscan-2.30.1.1-gcc6.patch
+)
+
+QA_PRESTRIPPED="usr/lib*/libesmod.so.*"
+QA_TEXTRELS="${QA_PRESTRIPPED}"
+QA_FLAGS_IGNORED="${QA_PRESTRIPPED}"
+
+src_prepare() {
+ local i
+
+ # convert japanese docs to UTF-8
+ if use l10n_ja; then
+ for i in {NEWS,README}.ja non-free/*.ja.txt; do
+ if [[ -f ${i} ]]; then
+ elog ">>> Converting ${i} to UTF-8"
+ iconv -f eucjp -t utf8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~"
+ fi
+ done
+ fi
+
+ # disable checks for gtk+
+ if ! use X; then
+ sed -i -e "s:PKG_CHECK_MODULES(GTK,.*):AC_DEFINE([HAVE_GTK_2], 0):g" \
+ -e "s:\(PKG_CHECK_MODULES(GDK_IMLIB,.*)\):#\1:g" configure.ac || die
+ fi
+
+ default
+ eautoreconf
+}
+
+src_configure() {
+ append-cppflags -D_GNU_SOURCE # needed for 'strndup'
+ # Fix selector box bug 388073
+ replace-flags "-O[0-9s]" "-O1"
+
+ local myconf=(
+ --enable-dependency-reduction
+ --disable-static
+ $(use_enable X frontend)
+ $(use_enable gimp)
+ $(use_enable jpeg)
+ $(use_enable png)
+ $(use_enable tiff)
+ )
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ local MY_LIB="${EPREFIX}/usr/$(get_libdir)"
+ emake DESTDIR="${D}" install
+
+ # install docs
+ dodoc AUTHORS NEWS README
+ use l10n_ja && dodoc NEWS.ja README.ja
+
+ # install sane config
+ insinto /etc/sane.d
+ doins backend/epkowa.conf
+
+ # install extra docs
+ use doc && dodoc "${DISTDIR}"/${MY_DOC}_$(usex l10n_ja j e).pdf
+
+ # link iscan so it is seen as a plugin in gimp
+ if use X && use gimp; then
+ local plugindir
+ if [[ -x ${EPREFIX}/usr/bin/gimptool ]]; then
+ plugindir="$(gimptool --gimpplugindir)/plug-ins" || die "Failed to get gimpplugindir"
+ elif [[ -x ${EPREFIX}/usr/bin/gimptool-2.0 ]]; then
+ plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins" || die "Failed to get gimpplugindir"
+ else
+ die "Can't find GIMP plugin directory."
+ fi
+ dodir "${plugindir}"
+ dosym /usr/bin/iscan "${plugindir}"/iscan
+ fi
+
+ # install desktop entry
+ if use X; then
+ make_desktop_entry iscan "Image Scan! for Linux ${PV}" scanner
+ fi
+}
+
+pkg_postinst() {
+ local i
+ local DLL_CONF="${EPREFIX}/etc/sane.d/dll.conf"
+ local EPKOWA_CONF="${EPREFIX}/etc/sane.d/epkowa.conf"
+
+ elog
+ if grep -q "^[ \t]*\<epkowa\>" ${DLL_CONF}; then
+ elog "Please edit ${EPKOWA_CONF} to suit your needs."
+ elif grep -q "\<epkowa\>" ${DLL_CONF}; then
+ elog "Hint: to enable the backend, add 'epkowa' to ${DLL_CONF}"
+ elog "Then edit ${EPKOWA_CONF} to suit your needs."
+ else
+ echo "epkowa" >> ${DLL_CONF} || die
+ elog "A new entry 'epkowa' was added to ${DLL_CONF}"
+ elog "Please edit ${EPKOWA_CONF} to suit your needs."
+ fi
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/files/, media-gfx/iscan/
@ 2020-01-16 14:57 David Seifert
0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2020-01-16 14:57 UTC (permalink / raw
To: gentoo-commits
commit: 4335ff10cb362b8c9e42a8c42d8576582df07bba
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 16 14:53:54 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Jan 16 14:53:54 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4335ff10
media-gfx/iscan: Add patch for IJG libjpeg
Closes: https://bugs.gentoo.org/704062
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../iscan/files/iscan-3.61.0-ijg-libjpeg.patch | 45 ++++++++++++++++++++++
media-gfx/iscan/iscan-3.61.0.ebuild | 4 +-
2 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/media-gfx/iscan/files/iscan-3.61.0-ijg-libjpeg.patch b/media-gfx/iscan/files/iscan-3.61.0-ijg-libjpeg.patch
new file mode 100644
index 00000000000..2625741d409
--- /dev/null
+++ b/media-gfx/iscan/files/iscan-3.61.0-ijg-libjpeg.patch
@@ -0,0 +1,45 @@
+--- a/filters/jpeg.cpp
++++ b/filters/jpeg.cpp
+@@ -410,13 +410,13 @@
+ cinfo_.image_height = ctx_.height ();
+
+ jpeg_set_defaults (&cinfo_);
+- jpeg_set_quality (&cinfo_, quality_, true);
++ jpeg_set_quality (&cinfo_, quality_, TRUE);
+
+ cinfo_.density_unit = 1; // in dpi
+ cinfo_.X_density = ctx_.x_resolution ();
+ cinfo_.Y_density = ctx_.y_resolution ();
+
+- jpeg_start_compress (&cinfo_, true);
++ jpeg_start_compress (&cinfo_, TRUE);
+
+ cache_ = new octet[ctx_.octets_per_line ()];
+ cache_size_ = ctx_.octets_per_line ();
+@@ -462,7 +462,7 @@
+ dmgr_.next_output_byte = jbuf_ + (jbuf_size_ - n);
+ dmgr_.free_in_buffer = n;
+
+- return true;
++ return TRUE;
+ }
+
+ void
+@@ -535,7 +535,7 @@
+
+ //jpegデータの一部が分割されて送られてきても正常に動作するように変更
+
+- return false;
++ return FALSE;
+ }
+
+ void
+@@ -580,7 +580,7 @@
+ {
+ if (!header_done_)
+ {
+- if (JPEG_SUSPENDED == jpeg_read_header (&cinfo_, true))
++ if (JPEG_SUSPENDED == jpeg_read_header (&cinfo_, TRUE))
+ {
+ log::trace ("jpeg_read_header suspended");
+ if (!reclaim_space ())
diff --git a/media-gfx/iscan/iscan-3.61.0.ebuild b/media-gfx/iscan/iscan-3.61.0.ebuild
index 3fe05c6da65..5ea99a53ae2 100644
--- a/media-gfx/iscan/iscan-3.61.0.ebuild
+++ b/media-gfx/iscan/iscan-3.61.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -32,6 +32,8 @@ RDEPEND=${DEPEND}
S="${WORKDIR}/utsushi-0.$(ver_cut 2-3)"
+PATCHES=( "${FILESDIR}"/${PN}-3.61.0-ijg-libjpeg.patch )
+
src_configure() {
econf \
$(use_with gui gtkmm) \
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/files/, media-gfx/iscan/
@ 2020-05-10 12:06 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2020-05-10 12:06 UTC (permalink / raw
To: gentoo-commits
commit: c35585303c48d0746234352cca0df3e1b9ff8fd3
Author: Marcin Deranek <marcin.deranek <AT> booking <DOT> com>
AuthorDate: Sun May 10 11:52:32 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 10 12:05:52 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3558530
media-gfx/iscan: fix building with boost 1.73
Closes: https://bugs.gentoo.org/721696
Signed-off-by: Marcin Deranek <marcin.deranek <AT> slonko.net>
Closes: https://github.com/gentoo/gentoo/pull/15737
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../iscan/files/iscan-3.62.0-boost-1.73.patch | 33 ++++++++++++++++++++++
media-gfx/iscan/iscan-3.62.0.ebuild | 1 +
2 files changed, 34 insertions(+)
diff --git a/media-gfx/iscan/files/iscan-3.62.0-boost-1.73.patch b/media-gfx/iscan/files/iscan-3.62.0-boost-1.73.patch
new file mode 100644
index 00000000000..d55a464823b
--- /dev/null
+++ b/media-gfx/iscan/files/iscan-3.62.0-boost-1.73.patch
@@ -0,0 +1,33 @@
+diff -urN a/drivers/esci/verify.cpp b/drivers/esci/verify.cpp
+--- a/drivers/esci/verify.cpp 2019-11-18 04:08:45.000000000 +0200
++++ b/drivers/esci/verify.cpp 2020-05-09 20:22:00.899968638 +0300
+@@ -58,6 +58,7 @@
+
+ using namespace utsushi;
+ using namespace _drv_::esci;
++using namespace boost::placeholders;
+
+ using std::basic_string;
+ using std::ios_base;
+diff -urN a/lib/monitor.cpp b/lib/monitor.cpp
+--- a/lib/monitor.cpp 2019-11-18 04:08:08.000000000 +0200
++++ b/lib/monitor.cpp 2020-05-09 20:22:26.392174029 +0300
+@@ -49,6 +49,7 @@
+ namespace utsushi {
+
+ using boost::filesystem::exists;
++using namespace boost::placeholders;
+
+ class monitor::impl
+ {
+diff -urN a/sane/handle.cpp b/sane/handle.cpp
+--- a/sane/handle.cpp 2019-11-18 04:08:08.000000000 +0200
++++ b/sane/handle.cpp 2020-05-09 20:21:49.559223712 +0300
+@@ -65,6 +65,7 @@
+ using utsushi::_flt_::deskew;
+ using utsushi::_flt_::autocrop;
+ using utsushi::_flt_::pnm;
++using namespace boost::placeholders;
+
+ namespace sane {
+
diff --git a/media-gfx/iscan/iscan-3.62.0.ebuild b/media-gfx/iscan/iscan-3.62.0.ebuild
index f5957958df9..f01a67d2417 100644
--- a/media-gfx/iscan/iscan-3.62.0.ebuild
+++ b/media-gfx/iscan/iscan-3.62.0.ebuild
@@ -33,6 +33,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.61.0-ijg-libjpeg.patch
"${FILESDIR}"/${PN}-3.61.0-imagemagick-7.patch
"${FILESDIR}"/${PN}-3.62.0-gcc-10.patch
+ "${FILESDIR}"/${PN}-3.62.0-boost-1.73.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/files/, media-gfx/iscan/
@ 2021-01-15 20:25 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2021-01-15 20:25 UTC (permalink / raw
To: gentoo-commits
commit: b2757129ca25c1b7ff6e4e0095445c6650e2c5f0
Author: Hector Martin <marcan <AT> marcan <DOT> st>
AuthorDate: Mon Jan 4 08:22:12 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 15 20:25:03 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2757129
media-gfx/iscan: fix build due to `bool` mismatch
Use <stdbool.h> instead of a custom bool type when available, to avoid
build failures if other packages include <stdbool.h> later, which
redefines it to _Bool. This causes build failures due to mismatch
between declarations and definitions.
Closes: https://bugs.gentoo.org/755884
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Hector Martin <marcan <AT> marcan.st>
Closes: https://github.com/gentoo/gentoo/pull/18938
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/iscan/files/iscan-2.30.4.2-c99.patch | 24 ++++++++++++++++++++++++
media-gfx/iscan/iscan-2.30.4.2-r1.ebuild | 3 ++-
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/media-gfx/iscan/files/iscan-2.30.4.2-c99.patch b/media-gfx/iscan/files/iscan-2.30.4.2-c99.patch
new file mode 100644
index 00000000000..93683c2887b
--- /dev/null
+++ b/media-gfx/iscan/files/iscan-2.30.4.2-c99.patch
@@ -0,0 +1,24 @@
+--- a/backend/defines.h 2021-01-04 08:13:48.995137756 -0000
++++ b/backend/defines.h 2021-01-04 08:16:00.524563361 -0000
+@@ -31,6 +31,13 @@
+
+
+ #ifndef __cplusplus
++
++/* Use the C99 bool type if available
++ */
++#ifdef HAVE_STDBOOL_H
++#include <stdbool.h>
++#else
++
+ /*! A C++ Boolean type and corresponding keywords for our C code.
+ */
+ typedef enum {
+@@ -38,6 +45,7 @@
+ true
+ } bool;
+ #endif
++#endif
+
+
+ /* Run-time contract validation.
diff --git a/media-gfx/iscan/iscan-2.30.4.2-r1.ebuild b/media-gfx/iscan/iscan-2.30.4.2-r1.ebuild
index 333d41b9b1c..c1eb390986e 100644
--- a/media-gfx/iscan/iscan-2.30.4.2-r1.ebuild
+++ b/media-gfx/iscan/iscan-2.30.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -70,6 +70,7 @@ PATCHES=(
"${FILESDIR}"/iscan-2.30.1.1-gcc6.patch
"${FILESDIR}"/iscan-2.30.3.1-fix-x86-unknown-types.patch
"${FILESDIR}"/iscan-2.30.4.2-sscanf.patch
+ "${FILESDIR}"/iscan-2.30.4.2-c99.patch
)
QA_PRESTRIPPED="usr/lib.*/libesmod.so.*"
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/files/, media-gfx/iscan/
@ 2022-02-18 3:06 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-02-18 3:06 UTC (permalink / raw
To: gentoo-commits
commit: 532d6cb41030f2c98b335f7ee56dfc6e1ddfb826
Author: Marcin Deranek <marcin.deranek <AT> booking <DOT> com>
AuthorDate: Sat Jan 29 13:58:19 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 18 02:51:31 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=532d6cb4
media-gfx/iscan: Support build with sane-backends-1.1
Signed-off-by: Marcin Deranek <marcin.deranek <AT> slonko.net>
Closes: https://bugs.gentoo.org/831823
Closes: https://github.com/gentoo/gentoo/pull/24014
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/iscan/files/iscan-3.65.0-sane-backends-1.1.patch | 11 +++++++++++
media-gfx/iscan/iscan-3.65.0.ebuild | 1 +
2 files changed, 12 insertions(+)
diff --git a/media-gfx/iscan/files/iscan-3.65.0-sane-backends-1.1.patch b/media-gfx/iscan/files/iscan-3.65.0-sane-backends-1.1.patch
new file mode 100644
index 000000000000..97979c6a313a
--- /dev/null
+++ b/media-gfx/iscan/files/iscan-3.65.0-sane-backends-1.1.patch
@@ -0,0 +1,11 @@
+--- a/sane/version.hpp 2020-12-22 07:44:15.000000000 +0100
++++ b/sane/version.hpp 2022-01-22 22:47:47.508608348 +0100
+@@ -37,7 +37,7 @@
+ #include <sane/sane.h>
+ }
+
+-#if !((SANE_MAJOR == SANE_CURRENT_MAJOR) && (SANE_MINOR == 0))
++#if !(SANE_MAJOR == SANE_CURRENT_MAJOR)
+ #error "SANE installation violates versioning portability constraints."
+ #endif
+
diff --git a/media-gfx/iscan/iscan-3.65.0.ebuild b/media-gfx/iscan/iscan-3.65.0.ebuild
index f143a5474646..38fb610ef483 100644
--- a/media-gfx/iscan/iscan-3.65.0.ebuild
+++ b/media-gfx/iscan/iscan-3.65.0.ebuild
@@ -46,6 +46,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.62.0-tests-tesseract.patch
"${FILESDIR}"/${PN}-3.62.0-tests-linkage.patch
"${FILESDIR}"/${PN}-3.63.0-autoconf-2.70.patch
+ "${FILESDIR}"/${PN}-3.65.0-sane-backends-1.1.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/files/, media-gfx/iscan/
@ 2024-01-20 13:33 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2024-01-20 13:33 UTC (permalink / raw
To: gentoo-commits
commit: 18d79e21e9d9019976c8ece9eefe45013c3cf2ae
Author: Marcin Deranek <marcin.deranek <AT> slonko <DOT> net>
AuthorDate: Fri Jan 12 14:46:20 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 20 13:32:32 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18d79e21
media-gfx/iscan: Update boost header files included
Signed-off-by: Marcin Deranek <marcin.deranek <AT> slonko.net>
Closes: https://bugs.gentoo.org/921215
Closes: https://github.com/gentoo/gentoo/pull/34724
Signed-off-by: Sam James <sam <AT> gentoo.org>
| 353 +++++++++++++++++++++
...can-3.65.0-r1.ebuild => iscan-3.65.0-r2.ebuild} | 3 +-
2 files changed, 355 insertions(+), 1 deletion(-)
--git a/media-gfx/iscan/files/iscan-3.65.0-boost-1.84-headers.patch b/media-gfx/iscan/files/iscan-3.65.0-boost-1.84-headers.patch
new file mode 100644
index 000000000000..426b3345f1c7
--- /dev/null
+++ b/media-gfx/iscan/files/iscan-3.65.0-boost-1.84-headers.patch
@@ -0,0 +1,353 @@
+--- utsushi-0.65.0/drivers/esci/grammar-automatic-feed.hpp 2024-01-08 22:20:05.171112996 +0100
++++ utsushi-0.65.0/drivers/esci/grammar-automatic-feed.hpp 2024-01-08 22:25:43.442258670 +0100
+@@ -24,8 +24,7 @@
+ //! \copydoc grammar.hpp
+
+ #include <boost/operators.hpp>
+-#include <boost/spirit/include/karma_rule.hpp>
+-#include <boost/spirit/include/karma_symbols.hpp>
++#include <boost/spirit/include/karma.hpp>
+
+ #include "buffer.hpp"
+ #include "code-token.hpp"
+--- utsushi-0.65.0/drivers/esci/grammar-automatic-feed.ipp 2024-01-08 22:20:05.167779489 +0100
++++ utsushi-0.65.0/drivers/esci/grammar-automatic-feed.ipp 2024-01-08 22:22:23.921745849 +0100
+@@ -24,11 +24,7 @@
+ //! \copydoc grammar.ipp
+
+ // encoding::basic_grammar_automatic_feed<T> implementation requirements
+-#include <boost/spirit/include/karma_binary.hpp>
+-#include <boost/spirit/include/karma_char_.hpp>
+-
+-// Support for debugging of parser and generator rules
+-#include <boost/spirit/include/karma_nonterminal.hpp>
++#include <boost/spirit/include/karma.hpp>
+
+ #include "code-point.hpp"
+ #include "grammar-automatic-feed.hpp"
+--- utsushi-0.65.0/drivers/esci/grammar-capabilities.hpp 2024-01-08 22:21:32.725717869 +0100
++++ utsushi-0.65.0/drivers/esci/grammar-capabilities.hpp 2024-01-08 22:27:49.542243597 +0100
+@@ -28,7 +28,7 @@
+
+ #include <boost/operators.hpp>
+ #include <boost/optional.hpp>
+-#include <boost/spirit/include/qi_rule.hpp>
++#include <boost/spirit/include/qi.hpp>
+ #include <boost/variant.hpp>
+
+ #include <utsushi/constraint.hpp>
+--- utsushi-0.65.0/drivers/esci/grammar-capabilities.ipp 2024-01-08 22:21:32.722384361 +0100
++++ utsushi-0.65.0/drivers/esci/grammar-capabilities.ipp 2024-01-08 22:26:39.831899213 +0100
+@@ -24,23 +24,11 @@
+ //! \copydoc grammar.ipp
+
+ // decoding::basic_grammar_capabilities<T> implementation requirements
+-#include <boost/spirit/include/qi_alternative.hpp>
+-#include <boost/spirit/include/qi_and_predicate.hpp>
+-#include <boost/spirit/include/qi_binary.hpp>
+-#include <boost/spirit/include/qi_difference.hpp>
+-#include <boost/spirit/include/qi_eoi.hpp>
+-#include <boost/spirit/include/qi_expect.hpp>
+-#include <boost/spirit/include/qi_matches.hpp>
+-#include <boost/spirit/include/qi_permutation.hpp>
+-#include <boost/spirit/include/qi_plus.hpp>
+-#include <boost/spirit/include/qi_skip.hpp>
++#include <boost/spirit/include/qi.hpp>
+
+ // *::basic_grammar_capabilities<T> implementation requirements
+ #include <boost/fusion/include/adapt_struct.hpp>
+
+-// Support for debugging of parser rules
+-#include <boost/spirit/include/qi_nonterminal.hpp>
+-
+ #include "grammar-capabilities.hpp"
+
+ namespace utsushi {
+--- utsushi-0.65.0/drivers/esci/grammar-formats.hpp 2024-01-08 22:21:32.725717869 +0100
++++ utsushi-0.65.0/drivers/esci/grammar-formats.hpp 2024-01-08 22:23:48.012841294 +0100
+@@ -26,10 +26,8 @@
+ #include <sstream>
+ #include <string>
+
+-#include <boost/spirit/include/karma_generate.hpp>
+-#include <boost/spirit/include/karma_rule.hpp>
+-#include <boost/spirit/include/qi_parse.hpp>
+-#include <boost/spirit/include/qi_rule.hpp>
++#include <boost/spirit/include/karma.hpp>
++#include <boost/spirit/include/qi.hpp>
+
+ #include <utsushi/cstdint.hpp>
+
+--- utsushi-0.65.0/drivers/esci/grammar-formats.ipp 2024-01-08 22:21:32.725717869 +0100
++++ utsushi-0.65.0/drivers/esci/grammar-formats.ipp 2024-01-08 22:28:50.565464000 +0100
+@@ -24,37 +24,16 @@
+ //! \copydoc grammar.ipp
+
+ // decoding::basic_grammar_formats<T> implementation requirements
+-#include <boost/spirit/include/qi_action.hpp>
+-#include <boost/spirit/include/qi_alternative.hpp>
+-#include <boost/spirit/include/qi_and_predicate.hpp>
+-#include <boost/spirit/include/qi_binary.hpp>
+-#include <boost/spirit/include/qi_char_class.hpp>
+-#include <boost/spirit/include/qi_repeat.hpp>
+-#include <boost/spirit/include/qi_sequence.hpp>
+-#include <boost/spirit/include/qi_uint.hpp>
++#include <boost/spirit/include/qi.hpp>
+
+ // encoding::basic_grammar_formats<T> implementation requirements
+-#include <boost/spirit/include/karma_action.hpp>
+-#include <boost/spirit/include/karma_alternative.hpp>
+-#include <boost/spirit/include/karma_binary.hpp>
+-#include <boost/spirit/include/karma_char_.hpp>
+-#include <boost/spirit/include/karma_eps.hpp>
+-#include <boost/spirit/include/karma_int.hpp>
+-#include <boost/spirit/include/karma_repeat.hpp>
+-#include <boost/spirit/include/karma_right_alignment.hpp>
+-#include <boost/spirit/include/karma_sequence.hpp>
+-#include <boost/spirit/include/karma_upper_lower_case.hpp>
++#include <boost/spirit/include/karma.hpp>
+ #include "upstream/include/no_attribute_directive.hpp"
+
+ // *::basic_grammar_formats<T> implementation requirements
+-#include <boost/spirit/include/phoenix_container.hpp>
+-#include <boost/spirit/include/phoenix_operator.hpp>
++#include <boost/phoenix.hpp>
+ #include <boost/spirit/include/support_ascii.hpp>
+
+-// Support for debugging of parser and generator rules
+-#include <boost/spirit/include/qi_nonterminal.hpp>
+-#include <boost/spirit/include/karma_nonterminal.hpp>
+-
+ #include "code-point.hpp"
+ #include "grammar-formats.hpp"
+
+--- utsushi-0.65.0/drivers/esci/grammar.hpp 2024-01-08 22:21:32.719050852 +0100
++++ utsushi-0.65.0/drivers/esci/grammar.hpp 2024-01-08 22:22:42.532725739 +0100
+@@ -35,10 +35,8 @@
+
+ #include <boost/operators.hpp>
+ #include <boost/optional.hpp>
+-#include <boost/spirit/include/karma_delimit.hpp>
+-#include <boost/spirit/include/karma_rule.hpp>
+-#include <boost/spirit/include/karma_symbols.hpp>
+-#include <boost/spirit/include/qi_rule.hpp>
++#include <boost/spirit/include/karma.hpp>
++#include <boost/spirit/include/qi.hpp>
+
+ #include "buffer.hpp"
+ #include "code-token.hpp"
+--- utsushi-0.65.0/drivers/esci/grammar-information.hpp 2024-01-08 22:21:32.719050852 +0100
++++ utsushi-0.65.0/drivers/esci/grammar-information.hpp 2024-01-08 22:26:20.097525012 +0100
+@@ -28,7 +28,7 @@
+
+ #include <boost/operators.hpp>
+ #include <boost/optional.hpp>
+-#include <boost/spirit/include/qi_rule.hpp>
++#include <boost/spirit/include/qi.hpp>
+
+ #include "code-token.hpp"
+ #include "grammar-formats.hpp"
+--- utsushi-0.65.0/drivers/esci/grammar-information.ipp 2024-01-08 22:21:32.722384361 +0100
++++ utsushi-0.65.0/drivers/esci/grammar-information.ipp 2024-01-08 22:27:01.883062422 +0100
+@@ -24,23 +24,11 @@
+ //! \copydoc grammar.ipp
+
+ // decoding::basic_grammar_information<T> implementation requirements
+-#include <boost/spirit/include/qi_alternative.hpp>
+-#include <boost/spirit/include/qi_and_predicate.hpp>
+-#include <boost/spirit/include/qi_binary.hpp>
+-#include <boost/spirit/include/qi_difference.hpp>
+-#include <boost/spirit/include/qi_eoi.hpp>
+-#include <boost/spirit/include/qi_expect.hpp>
+-#include <boost/spirit/include/qi_matches.hpp>
+-#include <boost/spirit/include/qi_permutation.hpp>
+-#include <boost/spirit/include/qi_plus.hpp>
+-#include <boost/spirit/include/qi_skip.hpp>
++#include <boost/spirit/include/qi.hpp>
+
+ // *::basic_grammar_information<T> implementation requirements
+ #include <boost/fusion/include/adapt_struct.hpp>
+
+-// Support for debugging of parser rules
+-#include <boost/spirit/include/qi_nonterminal.hpp>
+-
+ #include "grammar-information.hpp"
+
+ namespace utsushi {
+--- utsushi-0.65.0/drivers/esci/grammar.ipp 2024-01-08 22:21:32.725717869 +0100
++++ utsushi-0.65.0/drivers/esci/grammar.ipp 2024-01-08 22:29:05.462917002 +0100
+@@ -33,31 +33,14 @@
+ */
+
+ // decoding::basic_grammar<T> implementation requirements
+-#include <boost/spirit/include/qi_action.hpp>
+-#include <boost/spirit/include/qi_alternative.hpp>
+-#include <boost/spirit/include/qi_and_predicate.hpp>
+-#include <boost/spirit/include/qi_attr.hpp>
+-#include <boost/spirit/include/qi_binary.hpp>
+-#include <boost/spirit/include/qi_difference.hpp>
+-#include <boost/spirit/include/qi_eoi.hpp>
+-#include <boost/spirit/include/qi_expect.hpp>
+-#include <boost/spirit/include/qi_kleene.hpp>
+-#include <boost/spirit/include/qi_omit.hpp>
+-#include <boost/spirit/include/qi_optional.hpp>
+-#include <boost/spirit/include/qi_permutation.hpp>
++#include <boost/spirit/include/qi.hpp>
+
+ // encoding::basic_grammar<T> implementation requirements
+-#include <boost/spirit/include/karma_binary.hpp>
+-#include <boost/spirit/include/karma_char_.hpp>
+-#include <boost/spirit/include/karma_sequence.hpp>
++#include <boost/spirit/include/karma.hpp>
+
+ // *::basic_grammar<T> implementation requirements
+ #include <boost/fusion/include/adapt_struct.hpp>
+-#include <boost/spirit/include/phoenix_operator.hpp>
+-
+-// Support for debugging of parser and generator rules
+-#include <boost/spirit/include/qi_nonterminal.hpp>
+-#include <boost/spirit/include/karma_nonterminal.hpp>
++#include <boost/phoenix.hpp>
+
+ #include "grammar.hpp"
+
+--- utsushi-0.65.0/drivers/esci/grammar-mechanics.hpp 2024-01-08 22:20:05.171112996 +0100
++++ utsushi-0.65.0/drivers/esci/grammar-mechanics.hpp 2024-01-08 22:22:23.921745849 +0100
+@@ -24,8 +24,7 @@
+ //! \copydoc grammar.hpp
+
+ #include <boost/operators.hpp>
+-#include <boost/spirit/include/karma_rule.hpp>
+-#include <boost/spirit/include/karma_symbols.hpp>
++#include <boost/spirit/include/karma.hpp>
+
+ #include "buffer.hpp"
+ #include "code-token.hpp"
+--- utsushi-0.65.0/drivers/esci/grammar-mechanics.ipp 2024-01-08 22:20:05.167779489 +0100
++++ utsushi-0.65.0/drivers/esci/grammar-mechanics.ipp 2024-01-08 22:22:23.921745849 +0100
+@@ -24,21 +24,11 @@
+ //! \copydoc grammar.ipp
+
+ // encoding::basic_grammar_mechanics<T> implementation requirements
+-#include <boost/spirit/include/karma_alternative.hpp>
+-#include <boost/spirit/include/karma_and_predicate.hpp>
+-#include <boost/spirit/include/karma_binary.hpp>
+-#include <boost/spirit/include/karma_bool.hpp>
+-#include <boost/spirit/include/karma_buffer.hpp>
+-#include <boost/spirit/include/karma_char_.hpp>
+-#include <boost/spirit/include/karma_optional.hpp>
+-#include <boost/spirit/include/karma_sequence.hpp>
++#include <boost/spirit/include/karma.hpp>
+
+ // *::basic_grammar_mechanics<T> implementation requirements
+ #include <boost/fusion/include/adapt_struct.hpp>
+
+-// Support for debugging of parser and generator rules
+-#include <boost/spirit/include/karma_nonterminal.hpp>
+-
+ #include "code-point.hpp"
+ #include "grammar-mechanics.hpp"
+
+--- utsushi-0.65.0/drivers/esci/grammar-parameters.hpp 2024-01-08 22:21:32.722384361 +0100
++++ utsushi-0.65.0/drivers/esci/grammar-parameters.hpp 2024-01-08 22:22:55.200059463 +0100
+@@ -28,9 +28,8 @@
+
+ #include <boost/operators.hpp>
+ #include <boost/optional.hpp>
+-#include <boost/spirit/include/karma_rule.hpp>
+-#include <boost/spirit/include/karma_symbols.hpp>
+-#include <boost/spirit/include/qi_rule.hpp>
++#include <boost/spirit/include/karma.hpp>
++#include <boost/spirit/include/qi.hpp>
+
+ #include <utsushi/cstdint.hpp>
+ #include <utsushi/quantity.hpp>
+--- utsushi-0.65.0/drivers/esci/grammar-parameters.ipp 2024-01-08 22:21:32.722384361 +0100
++++ utsushi-0.65.0/drivers/esci/grammar-parameters.ipp 2024-01-08 22:23:31.538640070 +0100
+@@ -24,35 +24,14 @@
+ //! \copydoc grammar.ipp
+
+ // decoding::basic_grammar_parameters<T> implementation requirements
+-#include <boost/spirit/include/qi_alternative.hpp>
+-#include <boost/spirit/include/qi_and_predicate.hpp>
+-#include <boost/spirit/include/qi_binary.hpp>
+-#include <boost/spirit/include/qi_eoi.hpp>
+-#include <boost/spirit/include/qi_expect.hpp>
+-#include <boost/spirit/include/qi_kleene.hpp>
+-#include <boost/spirit/include/qi_permutation.hpp>
+-#include <boost/spirit/include/qi_plus.hpp>
+-#include <boost/spirit/include/qi_repeat.hpp>
+-#include <boost/spirit/include/qi_skip.hpp>
++#include <boost/spirit/include/qi.hpp>
+
+ // encoding::basic_grammar_parameters<T> implementation requirements
+-#include <boost/spirit/include/karma_alternative.hpp>
+-#include <boost/spirit/include/karma_binary.hpp>
+-#include <boost/spirit/include/karma_buffer.hpp>
+-#include <boost/spirit/include/karma_char_.hpp>
+-#include <boost/spirit/include/karma_kleene.hpp>
+-#include <boost/spirit/include/karma_optional.hpp>
+-#include <boost/spirit/include/karma_plus.hpp>
+-#include <boost/spirit/include/karma_repeat.hpp>
+-#include <boost/spirit/include/karma_sequence.hpp>
++#include <boost/spirit/include/karma.hpp>
+
+ // *::basic_grammar_parameters<T> implementation requirements
+ #include <boost/fusion/include/adapt_struct.hpp>
+
+-// Support for debugging of parser and generator rules
+-#include <boost/spirit/include/qi_nonterminal.hpp>
+-#include <boost/spirit/include/karma_nonterminal.hpp>
+-
+ #include "grammar-parameters.hpp"
+
+ namespace utsushi {
+--- utsushi-0.65.0/drivers/esci/grammar-status.hpp 2024-01-08 22:21:32.722384361 +0100
++++ utsushi-0.65.0/drivers/esci/grammar-status.hpp 2024-01-08 22:27:35.678178729 +0100
+@@ -27,7 +27,7 @@
+
+ #include <boost/operators.hpp>
+ #include <boost/optional.hpp>
+-#include <boost/spirit/include/qi_rule.hpp>
++#include <boost/spirit/include/qi.hpp>
+
+ #include <utsushi/media.hpp>
+
+--- utsushi-0.65.0/drivers/esci/grammar-status.ipp 2024-01-08 22:21:32.722384361 +0100
++++ utsushi-0.65.0/drivers/esci/grammar-status.ipp 2024-01-08 22:27:22.694160350 +0100
+@@ -24,21 +24,11 @@
+ //! \copydoc grammar.ipp
+
+ // decoding::basic_grammar_status<T> implementation requirements
+-#include <boost/spirit/include/qi_alternative.hpp>
+-#include <boost/spirit/include/qi_and_predicate.hpp>
+-#include <boost/spirit/include/qi_attr.hpp>
+-#include <boost/spirit/include/qi_binary.hpp>
+-#include <boost/spirit/include/qi_eoi.hpp>
+-#include <boost/spirit/include/qi_expect.hpp>
+-#include <boost/spirit/include/qi_permutation.hpp>
+-#include <boost/spirit/include/qi_skip.hpp>
++#include <boost/spirit/include/qi.hpp>
+
+ // *::basic_grammar_status<T> implementation requirements
+ #include <boost/fusion/include/adapt_struct.hpp>
+
+-// Support for debugging of parser rules
+-#include <boost/spirit/include/qi_nonterminal.hpp>
+-
+ #include "grammar-status.hpp"
+
+ namespace utsushi {
+--- utsushi-0.65.0/drivers/esci/grammar-tracer.hpp 2024-01-08 22:21:32.725717869 +0100
++++ utsushi-0.65.0/drivers/esci/grammar-tracer.hpp 2024-01-08 22:25:58.496385824 +0100
+@@ -24,8 +24,8 @@
+ #include <string>
+
+ #include <boost/fusion/include/empty.hpp>
+-#include <boost/spirit/include/karma_nonterminal.hpp>
+-#include <boost/spirit/include/qi_nonterminal.hpp>
++#include <boost/spirit/include/karma.hpp>
++#include <boost/spirit/include/qi.hpp>
+ #include <boost/spirit/include/support_attributes.hpp>
+
+ #if !defined (ESCI_GRAMMAR_TRACE_INDENT)
diff --git a/media-gfx/iscan/iscan-3.65.0-r1.ebuild b/media-gfx/iscan/iscan-3.65.0-r2.ebuild
similarity index 97%
rename from media-gfx/iscan/iscan-3.65.0-r1.ebuild
rename to media-gfx/iscan/iscan-3.65.0-r2.ebuild
index 21dc24242f01..fe66b5c9f143 100644
--- a/media-gfx/iscan/iscan-3.65.0-r1.ebuild
+++ b/media-gfx/iscan/iscan-3.65.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -49,6 +49,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.62.0-tests-linkage.patch
"${FILESDIR}"/${PN}-3.63.0-autoconf-2.70.patch
"${FILESDIR}"/${PN}-3.65.0-sane-backends-1.1.patch
+ "${FILESDIR}"/${PN}-3.65.0-boost-1.84-headers.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-01-20 13:33 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-16 14:57 [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/files/, media-gfx/iscan/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2024-01-20 13:33 Sam James
2022-02-18 3:06 Sam James
2021-01-15 20:25 Andreas Sturmlechner
2020-05-10 12:06 Andreas Sturmlechner
2018-01-20 20:26 David Seifert
2017-09-26 17:48 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