From b42458700185e08cbef73c0ba2aef0ae649aae74 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Sat, 23 Jan 2021 20:13:09 +0100 Subject: x11-wm/icewm: Revbump to fix application menu issue See https://github.com/bbidulock/icewm/issues/527 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Lars Wendler --- x11-wm/icewm/files/icewm-2.1.0-appmenu_fix.patch | 37 ++++++ x11-wm/icewm/icewm-2.1.0-r1.ebuild | 157 +++++++++++++++++++++++ x11-wm/icewm/icewm-2.1.0.ebuild | 153 ---------------------- 3 files changed, 194 insertions(+), 153 deletions(-) create mode 100644 x11-wm/icewm/files/icewm-2.1.0-appmenu_fix.patch create mode 100644 x11-wm/icewm/icewm-2.1.0-r1.ebuild delete mode 100644 x11-wm/icewm/icewm-2.1.0.ebuild (limited to 'x11-wm/icewm') diff --git a/x11-wm/icewm/files/icewm-2.1.0-appmenu_fix.patch b/x11-wm/icewm/files/icewm-2.1.0-appmenu_fix.patch new file mode 100644 index 000000000000..d159e4d38e3f --- /dev/null +++ b/x11-wm/icewm/files/icewm-2.1.0-appmenu_fix.patch @@ -0,0 +1,37 @@ +From 1d28361a69d773ba0d026119ff197d38900eac0a Mon Sep 17 00:00:00 2001 +From: Bert Gijsbers +Date: Sat, 23 Jan 2021 16:02:21 +0100 +Subject: [PATCH] Don't unarm menu popup buttons for issue #527. + +--- + src/ybutton.cc | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/src/ybutton.cc b/src/ybutton.cc +index 1c11756d..745a8f21 100644 +--- a/src/ybutton.cc ++++ b/src/ybutton.cc +@@ -58,7 +58,7 @@ YButton::~YButton() { + } + popdown(); + if (fPopup && fPopup->isShared() == false) { +- delete fPopup; ++ delete fPopup; fPopup = nullptr; + } + if (--buttonObjectCount == 0) { + normalButtonFont = null; +@@ -289,8 +289,13 @@ void YButton::handleButton(const XButtonEvent &button) { + setSelected(false); + } + } ++ bool unarm = fEnabled && fArmed ++ && button.type == ButtonRelease ++ && button.button == Button1 ++ && getClickCount() == 1 ++ && dragging(); + YWindow::handleButton(button); +- if (fEnabled && button.type == ButtonRelease && button.button == Button1) { ++ if (unarm && !fPopupActive) { + setArmed(false, false); + } + } diff --git a/x11-wm/icewm/icewm-2.1.0-r1.ebuild b/x11-wm/icewm/icewm-2.1.0-r1.ebuild new file mode 100644 index 000000000000..57f469f48b79 --- /dev/null +++ b/x11-wm/icewm/icewm-2.1.0-r1.ebuild @@ -0,0 +1,157 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools unpacker + +DESCRIPTION="Ice Window Manager with Themes" +HOMEPAGE="https://ice-wm.org/ https://github.com/ice-wm/icewm" +LICENSE="GPL-2" +SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.lz" + +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="+alsa ao bidi debug +gdk-pixbuf imlib nls truetype uclibc xinerama" + +# Tests broken in all versions, patches welcome, bug #323907, #389533 +RESTRICT="test" + +REQUIRED_USE="|| ( alsa ao )" +#?? ( gdk-pixbuf imlib ) + +#fix for icewm preversion package names +S="${WORKDIR}/${P/_}" + +# These are the core dependencies of icewm. +# Look into configure.ac and search for PKG_CHECK_MODULES([CORE] +CORE_DEPEND=" + media-libs/fontconfig + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXrender +" + +RDEPEND=" + ${CORE_DEPEND} + dev-libs/glib:2 + x11-libs/libICE + x11-libs/libSM + x11-libs/libXft + x11-libs/libXpm + x11-libs/libXrandr + alsa? ( + media-libs/alsa-lib + media-libs/libsndfile[alsa] + ) + ao? ( + media-libs/libao + media-libs/libsndfile + ) + bidi? ( dev-libs/fribidi ) + gdk-pixbuf? ( + x11-libs/gdk-pixbuf-xlib + >=x11-libs/gdk-pixbuf-2.42.0:2 + ) + !gdk-pixbuf? ( + imlib? ( + gnome-base/librsvg:2 + media-libs/imlib2 + ) + !imlib? ( + media-libs/libpng:0= + virtual/jpeg + ) + ) + xinerama? ( x11-libs/libXinerama ) +" +DEPEND=" + ${RDEPEND} + $(unpacker_src_uri_depends) + x11-base/xorg-proto + gdk-pixbuf? ( gnome-base/librsvg:2 ) +" + +BDEPEND=" + app-text/asciidoc + virtual/pkgconfig + nls? ( >=sys-devel/gettext-0.19.8 ) +" + +PATCHES=( + "${FILESDIR}/${P}-appmenu_fix.patch" +) + +pkg_pretend() { + if use gdk-pixbuf && use imlib ; then + einfo 'Confilcting USE flags have been enabled:' + einfo '"gdk-pixbuf" and "imlib" exclude each other!' + einfo 'Using "gdk-pixbuf".' + fi +} + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local icesound + if use alsa && use ao ; then + icesound="alsa,ao" + elif use alsa ; then + icesound="alsa" + elif use ao ; then + icesound="ao" + fi + + local myconf=( + --enable-logevents + --enable-xrandr + --with-cfgdir="${EPREFIX}"/etc/icewm + --with-docdir="${EPREFIX}"/usr/share/doc/${PF}/html + --with-icesound="${icesound}" + --with-libdir="${EPREFIX}"/usr/share/icewm + $(use_enable bidi fribidi) + $(use_enable debug) + $(use_enable debug logevents) + $(use_enable gdk-pixbuf) + $(use_enable imlib imlib2) + $(use_enable nls i18n) + $(use_enable nls) + $(use_enable xinerama) + ) + if use truetype ; then + myconf+=( + --enable-shape + ) + else + myconf+=( + --disable-xfreetype + --enable-corefonts + ) + fi + + econf "${myconf[@]}" + + sed \ + -e "s:/icewm-\$(VERSION)::" \ + -e "s:ungif:gif:" \ + -i src/Makefile || die +} + +src_install() { + local DOCS=( AUTHORS ChangeLog NEWS README.md TODO VERSION ) + + default + + docinto html + dodoc doc/icewm.html + dodoc man/*.html + + exeinto /etc/X11/Sessions + doexe "${FILESDIR}/icewm" +} diff --git a/x11-wm/icewm/icewm-2.1.0.ebuild b/x11-wm/icewm/icewm-2.1.0.ebuild deleted file mode 100644 index ec1d0545c005..000000000000 --- a/x11-wm/icewm/icewm-2.1.0.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools unpacker - -DESCRIPTION="Ice Window Manager with Themes" -HOMEPAGE="https://ice-wm.org/ https://github.com/ice-wm/icewm" -LICENSE="GPL-2" -SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.lz" - -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="+alsa ao bidi debug +gdk-pixbuf imlib nls truetype uclibc xinerama" - -# Tests broken in all versions, patches welcome, bug #323907, #389533 -RESTRICT="test" - -REQUIRED_USE="|| ( alsa ao )" -#?? ( gdk-pixbuf imlib ) - -#fix for icewm preversion package names -S="${WORKDIR}/${P/_}" - -# These are the core dependencies of icewm. -# Look into configure.ac and search for PKG_CHECK_MODULES([CORE] -CORE_DEPEND=" - media-libs/fontconfig - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrender -" - -RDEPEND=" - ${CORE_DEPEND} - dev-libs/glib:2 - x11-libs/libICE - x11-libs/libSM - x11-libs/libXft - x11-libs/libXpm - x11-libs/libXrandr - alsa? ( - media-libs/alsa-lib - media-libs/libsndfile[alsa] - ) - ao? ( - media-libs/libao - media-libs/libsndfile - ) - bidi? ( dev-libs/fribidi ) - gdk-pixbuf? ( - x11-libs/gdk-pixbuf-xlib - >=x11-libs/gdk-pixbuf-2.42.0:2 - ) - !gdk-pixbuf? ( - imlib? ( - gnome-base/librsvg:2 - media-libs/imlib2 - ) - !imlib? ( - media-libs/libpng:0= - virtual/jpeg - ) - ) - xinerama? ( x11-libs/libXinerama ) -" -DEPEND=" - ${RDEPEND} - $(unpacker_src_uri_depends) - x11-base/xorg-proto - gdk-pixbuf? ( gnome-base/librsvg:2 ) -" - -BDEPEND=" - app-text/asciidoc - virtual/pkgconfig - nls? ( >=sys-devel/gettext-0.19.8 ) -" - -pkg_pretend() { - if use gdk-pixbuf && use imlib ; then - einfo 'Confilcting USE flags have been enabled:' - einfo '"gdk-pixbuf" and "imlib" exclude each other!' - einfo 'Using "gdk-pixbuf".' - fi -} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local icesound - if use alsa && use ao ; then - icesound="alsa,ao" - elif use alsa ; then - icesound="alsa" - elif use ao ; then - icesound="ao" - fi - - local myconf=( - --enable-logevents - --enable-xrandr - --with-cfgdir="${EPREFIX}"/etc/icewm - --with-docdir="${EPREFIX}"/usr/share/doc/${PF}/html - --with-icesound="${icesound}" - --with-libdir="${EPREFIX}"/usr/share/icewm - $(use_enable bidi fribidi) - $(use_enable debug) - $(use_enable debug logevents) - $(use_enable gdk-pixbuf) - $(use_enable imlib imlib2) - $(use_enable nls i18n) - $(use_enable nls) - $(use_enable xinerama) - ) - if use truetype ; then - myconf+=( - --enable-shape - ) - else - myconf+=( - --disable-xfreetype - --enable-corefonts - ) - fi - - econf "${myconf[@]}" - - sed \ - -e "s:/icewm-\$(VERSION)::" \ - -e "s:ungif:gif:" \ - -i src/Makefile || die -} - -src_install() { - local DOCS=( AUTHORS ChangeLog NEWS README.md TODO VERSION ) - - default - - docinto html - dodoc doc/icewm.html - dodoc man/*.html - - exeinto /etc/X11/Sessions - doexe "${FILESDIR}/icewm" -} -- cgit v1.2.3-18-g5258