* [gentoo-commits] repo/gentoo:master commit in: x11-wm/icewm/, x11-wm/icewm/files/
@ 2017-02-06 0:37 Lars Wendler
0 siblings, 0 replies; 2+ messages in thread
From: Lars Wendler @ 2017-02-06 0:37 UTC (permalink / raw
To: gentoo-commits
commit: b5f4edb22fa3845eff88fef95f2691bcfd87f587
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 6 00:36:34 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Feb 6 00:37:27 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5f4edb2
x11-wm/icewm: Removed old.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
x11-wm/icewm/Manifest | 1 -
x11-wm/icewm/files/icewm-1.3.9-uclibc.patch | 64 --------------
x11-wm/icewm/icewm-1.3.11.ebuild | 125 ----------------------------
3 files changed, 190 deletions(-)
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index 330098a..8e8e800 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,3 +1,2 @@
-DIST icewm-1.3.11.tar.gz 930484 SHA256 a8e697e92e1697109522eb286eaa282bee10dcdb747b18bbb26d7d21a3d99588 SHA512 d64d324a51f793d8c1c820fb406c310fd7f3cfe9d9e328226103958d9f266830d08cd92fac1a0785e68e1055cdd22cd64e15d0c844008f6f1505473219bb348b WHIRLPOOL 9f4d5e8f9ee16f8e7d96f7b5e5012049190dfa6eb178859262835383c672e27d1915c8faf5258953bf1afe86fb23adb329e934f0cf98c3db7ea69fda90976cd9
DIST icewm-1.3.12.tar.gz 944617 SHA256 e7e0fe0fb07e297fa40f0c9d149c0cf6da19e13b98178fc779dca9ed81b3b232 SHA512 b2704ab69a1910cab6711ca11b79fa32f66747fe04468eff86813812fa855423ed43144ab0290e245221520a919755c0e153b60ff238ace60f9546af595063ee WHIRLPOOL bc7ec26e2a9de14e2b67da60de741205e2716233074a77465ce490e291d9a19deee61fa896ac31c1489d181b5929a325c1df7b30a0e3c428b0b6bf6bcd8fdccf
DIST icewm-1.3.8.tar.gz 905680 SHA256 17588d9e0bbbb23587bc04c83da9dd94fd4da6894ecfee6d7f3ed50d780dcd18 SHA512 ce9bf3e736a2f3fad4bbf731647b4e4ad0168cd2c4af66b1c43beef9ceeee39d14909714d2fc73ab13f6c285a74dfe31fffc9677ae8bd2d1077716cd6d6afb72 WHIRLPOOL 5bb0f6fa830ea10978bb8fd31805596c849a370d619626736e1218e844de72e142ed1aaa87b2f2aeb40603fcf2cfaa88ffae242c726ae1151045c6a792d5cf6c
diff --git a/x11-wm/icewm/files/icewm-1.3.9-uclibc.patch b/x11-wm/icewm/files/icewm-1.3.9-uclibc.patch
deleted file mode 100644
index 5019b68..00000000
--- a/x11-wm/icewm/files/icewm-1.3.9-uclibc.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -Naur a/configure.ac b/configure.ac
---- a/configure.ac 2015-01-02 16:27:05.093088172 +0000
-+++ b/configure.ac 2015-01-02 16:29:58.563094214 +0000
-@@ -75,6 +75,7 @@
- AC_CHECK_HEADERS([libgen.h])
- AC_CHECK_HEADERS([machine/apmvar.h])
- AC_CHECK_HEADERS([machine/apm_bios.h])
-+AC_CHECK_HEADERS([execinfo.h])
-
- # Checks for typedefs, structures, and compiler characteristics.
- AC_CHECK_HEADER_STDBOOL
-diff -Naur a/src/acpustatus.cc b/src/acpustatus.cc
---- a/src/acpustatus.cc 2014-09-01 10:21:57.000000000 +0000
-+++ b/src/acpustatus.cc 2015-01-02 16:28:35.738091329 +0000
-@@ -25,17 +25,12 @@
- #include "sysdep.h"
- #include "default.h"
-
--#if defined(linux)
--//#include <linux/kernel.h>
--#include <sys/sysinfo.h>
--#endif
- #if defined(sun) && defined(SVR4)
- #include <sys/loadavg.h>
- #endif
- #ifdef HAVE_KSTAT_H
- #include <sys/resource.h>
- #include <kstat.h>
--#include <sys/sysinfo.h>
- #endif
-
- #ifdef HAVE_SYS_PARAM_H
-@@ -56,6 +51,10 @@
- #include <dirent.h>
- #include "intl.h"
-
-+#if defined(linux) || defined(HAVE_KSTAT_H)
-+#include <sys/sysinfo.h>
-+#endif
-+
- #if (defined(linux) || defined(HAVE_KSTAT_H)) || defined(HAVE_SYSCTL_CP_TIME)
-
- extern ref<YPixmap> taskbackPixmap;
-diff -Naur a/src/misc.cc b/src/misc.cc
---- a/src/misc.cc 2014-09-01 10:21:57.000000000 +0000
-+++ b/src/misc.cc 2015-01-02 16:31:00.722096379 +0000
-@@ -15,7 +15,7 @@
- #include <libgen.h>
- #endif
-
--#ifdef linux
-+#if defined(linux) && defined(HAVE_EXECINFO_H)
- #include <execinfo.h>
- #endif
-
-@@ -543,7 +543,7 @@
- }
-
- void show_backtrace() {
--#ifdef linux
-+#if defined(linux) && defined(HAVE_EXECINFO_H)
- void *array[20];
-
- fprintf(stderr, "\nbacktrace:\n");
diff --git a/x11-wm/icewm/icewm-1.3.11.ebuild b/x11-wm/icewm/icewm-1.3.11.ebuild
deleted file mode 100644
index 32e1aea..00000000
--- a/x11-wm/icewm/icewm-1.3.11.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils python-single-r1
-
-DESCRIPTION="Ice Window Manager with Themes"
-HOMEPAGE="http://www.icewm.org/ https://github.com/bbidulock/icewm"
-LICENSE="GPL-2"
-SRC_URI="https://github.com/bbidulock/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="bidi debug doc gnome minimal nls truetype uclibc xinerama"
-REQUIRED_USE="gnome? ( ${PYTHON_REQUIRED_USE} )"
-
-# Tests broken in all versions, patches welcome, bug #323907, #389533
-RESTRICT="test"
-
-#fix for icewm preversion package names
-S=${WORKDIR}/${P/_}
-
-RDEPEND="
- media-libs/fontconfig
- x11-libs/gdk-pixbuf:2[X]
- x11-libs/libX11
- x11-libs/libXrandr
- x11-libs/libXext
- x11-libs/libXpm
- x11-libs/libXrender
- x11-libs/libXft
- x11-libs/libSM
- x11-libs/libICE
- xinerama? ( x11-libs/libXinerama )
- bidi? ( dev-libs/fribidi )
- gnome? (
- ${PYTHON_DEPS}
- dev-python/pyxdg
- gnome-base/gnome-desktop:2
- gnome-base/gnome-menus
- gnome-base/libgnomeui )
-"
-DEPEND="${RDEPEND}
- >=sys-apps/sed-4
- x11-proto/xproto
- x11-proto/xextproto
- doc? ( app-text/linuxdoc-tools )
- nls? ( >=sys-devel/gettext-0.19.5 )
- truetype? ( >=media-libs/freetype-2.0.9 )
- xinerama? ( x11-proto/xineramaproto )
-"
-
-pkg_setup() {
- if use truetype && use minimal; then
- ewarn "You have both 'truetype' and 'minimal' use flags enabled."
- ewarn "If you really want a minimal install, you will have to turn off"
- ewarn "the truetype flag for this package."
- fi
-}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.3.10-menu.patch
-)
-
-src_prepare() {
- epatch "${PATCHES[@]}"
-
- # Fix bug #486710
- use uclibc && epatch "${FILESDIR}/${PN}-1.3.8-uclibc.patch"
-
- if ! use doc ; then
- sed '/^SUBDIRS =/s@ doc@@' -i Makefile.am || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- if use truetype ; then
- myconf="${myconf} --enable-gradients --enable-shape --enable-shaped-decorations"
- else
- myconf="${myconf} --disable-xfreetype --enable-corefonts
- $(use_enable minimal lite)"
- fi
-
- myconf="${myconf}
- --with-libdir=/usr/share/icewm
- --with-cfgdir=/etc/icewm
- --with-docdir=/usr/share/doc/${PF}/html
- $(use_enable bidi fribidi)
- $(use_enable debug)
- $(use_enable gnome menus-gnome2)
- $(use_enable nls i18n)
- $(use_enable nls)
- $(use_enable xinerama)"
-
- CXXFLAGS="${CXXFLAGS}" econf ${myconf}
-
- sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die
- sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
-}
-
-src_install(){
- default
-
- if use gnome; then
- dobin "${FILESDIR}"/icewm-xdg-menu
- exeinto /usr/share/icewm/
- newexe "${FILESDIR}"/icewm-startup startup
- fi
-
- dodoc AUTHORS BUGS CHANGES PLATFORMS README* TODO VERSION
-
- if ! use doc ; then
- dohtml -a html,sgml doc/*
- cp doc/${PN}.man "${T}"/${PN}.1
- doman "${T}"/${PN}.1
- fi
-
- exeinto /etc/X11/Sessions
- doexe "${FILESDIR}/icewm"
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/icewm/, x11-wm/icewm/files/
@ 2021-01-23 19:13 Lars Wendler
0 siblings, 0 replies; 2+ messages in thread
From: Lars Wendler @ 2021-01-23 19:13 UTC (permalink / raw
To: gentoo-commits
commit: b42458700185e08cbef73c0ba2aef0ae649aae74
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 19:13:09 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 19:13:36 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4245870
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 <polynomial-c <AT> gentoo.org>
| 37 ++++++++++++++++++++++
.../{icewm-2.1.0.ebuild => icewm-2.1.0-r1.ebuild} | 4 +++
2 files changed, 41 insertions(+)
--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 00000000000..d159e4d38e3
--- /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 <gijsbers@science.uva.nl>
+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.ebuild b/x11-wm/icewm/icewm-2.1.0-r1.ebuild
similarity index 98%
rename from x11-wm/icewm/icewm-2.1.0.ebuild
rename to x11-wm/icewm/icewm-2.1.0-r1.ebuild
index ec1d0545c00..57f469f48b7 100644
--- a/x11-wm/icewm/icewm-2.1.0.ebuild
+++ b/x11-wm/icewm/icewm-2.1.0-r1.ebuild
@@ -81,6 +81,10 @@ BDEPEND="
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:'
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-01-23 19:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-06 0:37 [gentoo-commits] repo/gentoo:master commit in: x11-wm/icewm/, x11-wm/icewm/files/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2021-01-23 19:13 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox