commit: 516618e885f1ff6e23449274207141ac9a6269cd Author: Z. Liu <zhixu.liu <AT> gmail <DOT> com> AuthorDate: Tue Jun 10 13:57:59 2025 +0000 Commit: Nowa Ammerlaan <nowa <AT> gentoo <DOT> org> CommitDate: Sun Jul 13 11:33:39 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=516618e8
sci-misc/oww: fix compile/configure failures * usb is enabled always, so remove IUSE="usb" * fix case handling in configure.in * fix error on function argument mismatch Closes: https://bugs.gentoo.org/927077 Closes: https://bugs.gentoo.org/944398 Closes: https://bugs.gentoo.org/954879 Signed-off-by: Z. Liu <zhixu.liu <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/42533 Closes: https://github.com/gentoo/gentoo/pull/42533 Signed-off-by: Nowa Ammerlaan <nowa <AT> gentoo.org> sci-misc/oww/files/oww-0.86.5-configure.in.patch | 16 +++++++++++++ sci-misc/oww/files/oww-0.86.5-fix-argument.patch | 27 ++++++++++++++++++++++ .../{oww-0.86.5-r1.ebuild => oww-0.86.5-r2.ebuild} | 11 +++++---- 3 files changed, 50 insertions(+), 4 deletions(-) diff --git a/sci-misc/oww/files/oww-0.86.5-configure.in.patch b/sci-misc/oww/files/oww-0.86.5-configure.in.patch new file mode 100644 index 000000000000..35959bd59e2a --- /dev/null +++ b/sci-misc/oww/files/oww-0.86.5-configure.in.patch @@ -0,0 +1,16 @@ +fix case handling of shell script +diff --git a/configure.in b/configure.in +index 8596d93..fc77bf0 100644 +--- a/configure.in ++++ b/configure.in +@@ -104,8 +104,8 @@ if $try_usb; then + fi + fi + case "$usb_msg" in +- yes*) AC_DEFINE(HAVE_USB,1,[Whether you have USB support enabled]) +- * ;; ++ yes*) AC_DEFINE(HAVE_USB,1,[Whether you have USB support enabled]) ;; ++ *) ;; + esac + dnl AM_CONDITIONAL(ENABLEUSB, test "x$try_usb" = "true") + diff --git a/sci-misc/oww/files/oww-0.86.5-fix-argument.patch b/sci-misc/oww/files/oww-0.86.5-fix-argument.patch new file mode 100644 index 000000000000..629ead3f57d7 --- /dev/null +++ b/sci-misc/oww/files/oww-0.86.5-fix-argument.patch @@ -0,0 +1,27 @@ +fix error on argument mismatch +diff --git a/src/applctn.c b/src/applctn.c +index a039639..674e3cf 100644 +--- a/src/applctn.c ++++ b/src/applctn.c +@@ -415,7 +415,7 @@ static gint anim_alarm_handler(gpointer user_data) + void applctn_quit_now(GtkMenuItem *menuitem, gpointer user_data) + { + applctn_quit = 1 ; +- state_machine_quit(0); ++ state_machine_quit(); + } + + void on_about_activate(GtkMenuItem *menuitem, gpointer user_data) +diff --git a/src/filesel.c b/src/filesel.c +index b06e257..46d9ab5 100644 +--- a/src/filesel.c ++++ b/src/filesel.c +@@ -8,7 +8,7 @@ + + typedef struct { + +- void (*func)(); ++ void (*func)(char *); + GtkWidget *filesel; + + } typFileSelectionData; diff --git a/sci-misc/oww/oww-0.86.5-r1.ebuild b/sci-misc/oww/oww-0.86.5-r2.ebuild similarity index 79% rename from sci-misc/oww/oww-0.86.5-r1.ebuild rename to sci-misc/oww/oww-0.86.5-r2.ebuild index 10f16d975869..d62b3a966f12 100644 --- a/sci-misc/oww/oww-0.86.5-r1.ebuild +++ b/sci-misc/oww/oww-0.86.5-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,11 +12,12 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"; LICENSE="Artistic" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="gtk nls usb" +IUSE="gtk nls" RDEPEND=" net-misc/curl - gtk? ( x11-libs/gtk+:2 )" + gtk? ( x11-libs/gtk+:2 ) + virtual/libusb:0" DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig @@ -27,6 +28,8 @@ PATCHES=( "${FILESDIR}"/${P}-format-security.patch "${FILESDIR}"/${P}-musl.patch "${FILESDIR}"/${P}-c99.patch + "${FILESDIR}"/${P}-configure.in.patch + "${FILESDIR}"/${P}-fix-argument.patch ) src_prepare() { @@ -40,5 +43,5 @@ src_configure() { --enable-interactive \ $(use_enable nls) \ $(use_enable gtk gui) \ - $(use_with usb) + --with-usb }
