diff options
Diffstat (limited to 'media-gfx')
-rw-r--r-- | media-gfx/epsonscan2/Manifest | 9 | ||||
-rw-r--r-- | media-gfx/epsonscan2/epsonscan2-6.6.42.0.ebuild | 65 | ||||
-rw-r--r-- | media-gfx/epsonscan2/epsonscan2-6.7.65.0.ebuild (renamed from media-gfx/epsonscan2/epsonscan2-6.7.63.0.ebuild) | 8 | ||||
-rw-r--r-- | media-gfx/epsonscan2/files/0002-Fix-crash.patch | 31 | ||||
-rw-r--r-- | media-gfx/epsonscan2/files/0003-Use-XDG-open-to-open-the-directory.patch | 36 | ||||
-rw-r--r-- | media-gfx/epsonscan2/files/0004-Fix-a-crash-on-an-OOB-container-access.patch | 30 |
6 files changed, 109 insertions, 70 deletions
diff --git a/media-gfx/epsonscan2/Manifest b/media-gfx/epsonscan2/Manifest index 8873156..74addba 100644 --- a/media-gfx/epsonscan2/Manifest +++ b/media-gfx/epsonscan2/Manifest @@ -1,5 +1,6 @@ -DIST epsonscan2-6.6.42.0-1.src.tar.gz 2448446 BLAKE2B 8fa1718c9e153c9fca1a90e1cce3642e7cf8ae2f7ad95295a24735e6aae3a115f5a0282b5f59227441aef82d1cb05684cac32c018589428883c0bdb0285e4d7b SHA512 ae93d9c1aed6f1a420ad390af9f72ca9c5d28a3735f51df2fbfe23d26ae12ba45bc9a7f42776745a64d97141db2ec61a6fd3699f310d854b0f1e7e5b5cacb195 -DIST epsonscan2-6.7.63.0-1.src.tar.gz 2559661 BLAKE2B d765082c258e77bc98a64457388bddf465d258b62617460b0d8d3b82c3d6e1833e69515995349d5536069e2a4aede705abc3c962a12107fdf0af45e8fe8d8eac SHA512 99fb6a8e75b5e4a2e9f3bef593f948f75e8785d7b09397dc3c3f68e04a483f4e479e655bc2779635ce6c3e3d16e2f4b8c4f70609d4d4abfd3ee94f5f80c0faa6 -EBUILD epsonscan2-6.6.42.0.ebuild 1490 BLAKE2B c042fc31f498c638487fc39f48bcb50a03a57f0ee3632de911d8db9eb127ee8f6b4e1fa8cf921e0d11babce6ca8f86702b9c3834d67b6cb84544fc5b11da936e SHA512 3ce0b21dc7f0a3f6905333e8fedd50f7ab23e731a91f8b719f657f44bcf58e79dc2ca7f6cb32989dc5db43969bc6f05065f748db1ba9365ed28b7f3be827110d -EBUILD epsonscan2-6.7.63.0.ebuild 1567 BLAKE2B cb9ce37f9794cf09b8e29fc55344b247b3b3da9f886b52dc5dfc1c513e289fb6e0b61ebdc3782799649eee609c8335fbb04cdfce3cb0714016641a5b0d99cf37 SHA512 bd8bb9c38ce631c6f2aa79640287d94c827946dd1b609bc00393e7aeb69a2417cdff90cf6e3067c94f7a8dd8de76d706fe6d35a17b7123d784686d1b43f2df2b +AUX 0002-Fix-crash.patch 1141 BLAKE2B 9637be5374f6406b79b0004486764d4b6f8b3c113ac880df7c6baf87808807463627fc3d365d164ffc77644daf04d936b7a60e1f9514c36941e94c77377d2be7 SHA512 10b0b6be6cf004eb9e98b49ef778b987a3e0d8b8f8fee367b580554f865ff927bbff31496608a402979897db458c41d8cc0d5b7dff30aa225c89366f13ca0844 +AUX 0003-Use-XDG-open-to-open-the-directory.patch 1403 BLAKE2B 519ee6aaa8b395cc18249e42a4e52b9904d5d01798d47f7af33e8d0cdb96c0fdd70d750731baf8ada22cfd691b301dad6cd12d831c773da6b1953ef0ce467e21 SHA512 b178f6938b05639d2e0ffdfdd53caf4377e869465c45efe8f423dcff2d885fe48a910c2f081754fa43d1083e1727edd45da4b8ca24318a705d54adfac7a0ec19 +AUX 0004-Fix-a-crash-on-an-OOB-container-access.patch 899 BLAKE2B 9634925263f93a6601f65b0f998ec292a35f1e109a26c2e7a44c6e129c33fc9a12e92466c98c893f6ac7052f5009efb09270cd2cb62228df6f81b019488fa12f SHA512 61c26db912f55b80eff3a6cbbc4b9e633048b8c611f2a5b8d1dc2a452f6268da0f039a0ed27217ed0dc58a11957ba2dfbf25326e33b43ca1b4a8ffdadfffeafc +DIST epsonscan2-6.7.65.0-1.src.tar.gz 2435836 BLAKE2B f198eecacd84d973bccfd7e8f768aeb6c1a97e3c90045c76c3c553550d5daac356e916bac09bd95ec6d9993bbfcce622317b16da9bf513f5fc66ea8f048e47d1 SHA512 139263a55d4443b450b2f40ac2d800f32fb6c796c9da4303287a4e36e755ab6f7acac21fae5969c17f3a5ec8b74c8dd62d77e8c0684c830910722cb05f0e9752 +EBUILD epsonscan2-6.7.65.0.ebuild 1742 BLAKE2B 3f28878126762b6c5a53ba77e05ad25f7a60c7d344620fab81b07e7c58d28843ee8e5954573297b7702152ffc550a1effb04077970825f7d8bbe7582f7436858 SHA512 eb06cec2092b7db293b95dfe88a397fec82cd14c486b77acf1649ad9f18da467d81276b1d60ba56136b19d0245e3bd77ca80546279d425ab75cfd4dc37d2ad7d MISC metadata.xml 787 BLAKE2B 86ad1919846630b77745e19fed9f3cfb9c76b28e3aff3c9709e68c230361226240e4d8101f2bdc6fd5d4b25a283c43bab755eb8c5794d762631cfc6f66e231ac SHA512 545659f051bdc470ea1f988866de2966f1fd812e6b863f7d5851a498d55a25e02208d669b14a7c3e5a79b3d4afde732bbe08818b4236ae4dd02066cdedc8aac6 diff --git a/media-gfx/epsonscan2/epsonscan2-6.6.42.0.ebuild b/media-gfx/epsonscan2/epsonscan2-6.6.42.0.ebuild deleted file mode 100644 index 1337de4..0000000 --- a/media-gfx/epsonscan2/epsonscan2-6.6.42.0.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_VERSION="${PV}-1" - -DESCRIPTION="Epson scanner management utility" -HOMEPAGE="https://support.epson.net/linux/en/epsonscan2.php" -SRC_URI="https://support.epson.net/linux/src/scanner/${PN}/${PN}-${MY_VERSION}.src.tar.gz" -S="${WORKDIR}/${PN}-${MY_VERSION}" - -inherit cmake desktop udev - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64" - -DEPEND=" - dev-libs/boost - dev-libs/rapidjson - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - media-gfx/sane-backends - media-libs/libharu - media-libs/libjpeg-turbo:= - media-libs/libpng - media-libs/tiff - sys-libs/zlib - virtual/libusb:1 -" -RDEPEND="${DEPEND}" - -src_prepare() { - cmake_src_prepare - sed -i \ - -e '/\(execute_process.*\)${EPSON_INSTALL_ROOT}/d' \ - -e "s|^\(set(EPSON_VERSION \).*|\1-${PV})|g" \ - CMakeLists.txt || die - # Force usage of system libraries - rm -rf thirdparty/{HaruPDF,rapidjson,zlib} - sed -i \ - -e '/thirdparty\/HaruPDF/d' \ - -e '/thirdparty\/zlib/d' \ - -e 's|^\([[:blank:]]*\)\(usb-1.0\)|\1\2\n\1hpdf\n\1z|' \ - src/Controller/CMakeLists.txt || die -} - -src_install() { - cmake_src_install - # Sane symlinks - dosym ../epsonscan2/libsane-epsonscan2.so /usr/$(get_libdir)/sane/libsane-epsonscan2.so.1 - dosym ../epsonscan2/libsane-epsonscan2.so /usr/$(get_libdir)/sane/libsane-epsonscan2.so.1.0.0 - # Desktop icon - domenu desktop/rpm/x86_64/epsonscan2.desktop -} - -pkg_postinst() { - udev_reload -} - -pkg_postrm() { - udev_reload -} diff --git a/media-gfx/epsonscan2/epsonscan2-6.7.63.0.ebuild b/media-gfx/epsonscan2/epsonscan2-6.7.65.0.ebuild index fb4e7cb..6fc6f71 100644 --- a/media-gfx/epsonscan2/epsonscan2-6.7.63.0.ebuild +++ b/media-gfx/epsonscan2/epsonscan2-6.7.65.0.ebuild @@ -7,7 +7,7 @@ MY_PROG="${P}-1" DESCRIPTION="Epson scanner management utility" HOMEPAGE="https://support.epson.net/linux/en/epsonscan2.php" -SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/15/17/69/0ef02802c476a6564f13cac929859c394f40326a/${MY_PROG}.src.tar.gz" +SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/15/87/25/a00d9b45f416c29b5b5cf569e76448b918c0eabd/${MY_PROG}.src.tar.gz" S="${WORKDIR}/${MY_PROG}" inherit cmake desktop udev @@ -34,6 +34,12 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/0002-Fix-crash.patch" + "${FILESDIR}/0003-Use-XDG-open-to-open-the-directory.patch" + "${FILESDIR}/0004-Fix-a-crash-on-an-OOB-container-access.patch" +) + src_prepare() { sed -i \ -e '/\(execute_process.*\)${EPSON_INSTALL_ROOT}/d' \ diff --git a/media-gfx/epsonscan2/files/0002-Fix-crash.patch b/media-gfx/epsonscan2/files/0002-Fix-crash.patch new file mode 100644 index 0000000..7125e37 --- /dev/null +++ b/media-gfx/epsonscan2/files/0002-Fix-crash.patch @@ -0,0 +1,31 @@ +From a162321f309b38d97442cac06185ebfb098b3b22 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= <hub@figuiere.net> +Date: Sat, 1 Jun 2024 19:41:51 -0400 +Subject: [PATCH 2/4] Fix crash +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Hubert Figuière <hub@figuiere.net> +--- + src/ES2Command/Src/Interface/ipc/ipcInterfaceImpl.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/ES2Command/Src/Interface/ipc/ipcInterfaceImpl.cpp b/src/ES2Command/Src/Interface/ipc/ipcInterfaceImpl.cpp +index a095ffd..0f1bc90 100755 +--- a/src/ES2Command/Src/Interface/ipc/ipcInterfaceImpl.cpp ++++ b/src/ES2Command/Src/Interface/ipc/ipcInterfaceImpl.cpp +@@ -128,7 +128,9 @@ ESErrorCode IPCInterfaceImpl::Open() + if(!ES_IsExistFile(dat_file)){ + FILE *fp; + fp = fopen(dat_file.c_str(),"w"); +- fclose(fp); ++ if (fp) { ++ fclose(fp); ++ } + } + interrupt_.reset(new ipc_interrupt(delegate_, dat_file, IPC_SHARED_ID, IPC_SEMAHORE_KEY)); + interrupt_->start(); +-- +2.45.0 + diff --git a/media-gfx/epsonscan2/files/0003-Use-XDG-open-to-open-the-directory.patch b/media-gfx/epsonscan2/files/0003-Use-XDG-open-to-open-the-directory.patch new file mode 100644 index 0000000..b268c03 --- /dev/null +++ b/media-gfx/epsonscan2/files/0003-Use-XDG-open-to-open-the-directory.patch @@ -0,0 +1,36 @@ +From 53685b913a613023a3e3a037b5cc479bbcebdc2a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= <hub@figuiere.net> +Date: Sat, 1 Jun 2024 19:42:38 -0400 +Subject: [PATCH 3/4] Use XDG open to open the directory +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Hubert Figuière <hub@figuiere.net> +--- + src/Standalone/savedestfolder.cpp | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/src/Standalone/savedestfolder.cpp b/src/Standalone/savedestfolder.cpp +index 7480631..7df5941 100755 +--- a/src/Standalone/savedestfolder.cpp ++++ b/src/Standalone/savedestfolder.cpp +@@ -43,7 +43,14 @@ bool SaveDestFolder::open_folder(Supervisor* sv) + int cmd_size = 0; + const bool result = ES_CMN_FUNCS::PATH::ES_IsExistFile(sv->device_data.SelectPath); + if (result) { +- if(system("which nautilus > /dev/null") == 0){ ++ if(system("which xdg-open > /dev/null") == 0){ ++ cmd_size = strlen("xdg-open "); ++ failer = (char *)malloc(cmd_size+1); ++ if(failer){ ++ memset(failer, 0, cmd_size+1); ++ memcpy(failer, "xdg-open", cmd_size); ++ } ++ } else if(system("which nautilus > /dev/null") == 0){ + cmd_size = strlen("nautilus "); + failer = (char *)malloc(cmd_size+1); + if(failer){ +-- +2.45.0 + diff --git a/media-gfx/epsonscan2/files/0004-Fix-a-crash-on-an-OOB-container-access.patch b/media-gfx/epsonscan2/files/0004-Fix-a-crash-on-an-OOB-container-access.patch new file mode 100644 index 0000000..1f32b41 --- /dev/null +++ b/media-gfx/epsonscan2/files/0004-Fix-a-crash-on-an-OOB-container-access.patch @@ -0,0 +1,30 @@ +From 09a0f982bd1601c7cd2ed28490e4d54a635b0838 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= <hub@figuiere.net> +Date: Sat, 1 Jun 2024 19:43:11 -0400 +Subject: [PATCH 4/4] Fix a crash on an OOB container access +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Hubert Figuière <hub@figuiere.net> +--- + src/Controller/Src/Finder/Finder.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/Controller/Src/Finder/Finder.cpp b/src/Controller/Src/Finder/Finder.cpp +index aa6b853..5e063e8 100755 +--- a/src/Controller/Src/Finder/Finder.cpp ++++ b/src/Controller/Src/Finder/Finder.cpp +@@ -52,6 +52,9 @@ namespace epsonscan { + } + SDIDeviceInfo* Finder::GetDevicesPointer() + { ++ if (devices_.size() == 0) { ++ return nullptr; ++ } + return &devices_[0]; + } + int32_t Finder::GetDevicesCount() const +-- +2.45.0 + |