From d7ed2b01311f15ba54fe8ea872aab7d59ab2b193 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 29 Jan 2021 18:03:51 +0000 Subject: gentoo resync : 29.01.2021 --- x11-wm/icewm/Manifest | 7 +- x11-wm/icewm/files/icewm-2.1.0-appmenu_fix.patch | 37 ++++++ x11-wm/icewm/icewm-2.0.0.ebuild | 153 ---------------------- x11-wm/icewm/icewm-2.1.0-r1.ebuild | 157 +++++++++++++++++++++++ x11-wm/icewm/icewm-2.1.1.ebuild | 153 ++++++++++++++++++++++ 5 files changed, 352 insertions(+), 155 deletions(-) create mode 100644 x11-wm/icewm/files/icewm-2.1.0-appmenu_fix.patch delete mode 100644 x11-wm/icewm/icewm-2.0.0.ebuild create mode 100644 x11-wm/icewm/icewm-2.1.0-r1.ebuild create mode 100644 x11-wm/icewm/icewm-2.1.1.ebuild (limited to 'x11-wm/icewm') diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest index 449e9b226d85..a7f6581fd887 100644 --- a/x11-wm/icewm/Manifest +++ b/x11-wm/icewm/Manifest @@ -1,8 +1,11 @@ AUX icewm 33 BLAKE2B 5605658012ad8ed16bbd4cf0c4cb7cbe5204f73c20ef2c3d9fef1011a80b9e68863de64b45e4b043604b147c9d31f3f5d2617d067b694f5ec5329ad895472b0e SHA512 3fe619e59cc5d354242ccd85d3b1982dd7db6d0f6170f46f9d33975872f6d5a342a08d69db763162dc43681eedb96e9ba5075455bf54adf4fb86bf19887bf6e0 +AUX icewm-2.1.0-appmenu_fix.patch 1200 BLAKE2B c68ccef66b08e43eb97da0624218aa36bea070c6030c8a8c1e8724fce3f12590270620b1e56d09ac01fa713f90b71e82344227fdc62941938c54a6cbc05f23f6 SHA512 7cecdcf8d55ec49ee3c3fa145dc492c6a143690abfd3677937799ef636a5f9db3d7cb65790225337895c32d7cb26c2c888052c6374831123ec56ba1f826b2309 DIST icewm-1.9.2.tar.lz 1694602 BLAKE2B cf30a695ba48093b386aa2f3af5120e78a9fcc57da9038bcd546ade0986e1bc359a3da91d2eeeb8d3a105173f5d755223675a84b38cfc8c907269efd2561c706 SHA512 7b4f8c47c636a0113af576bc1bcd9fde111ae70eb0bcf21fb1d906ca43bea4d8b0337a728e5da35bcfeabd56c66fd0d14581d7377f063dd750fdf01362b24be2 -DIST icewm-2.0.0.tar.lz 1694653 BLAKE2B 36feb02d653256b4d6755618da89400c3925279757da32695d6b8c2206d69228bcf392852eaba8b9096d06b60b5f021a0b6b474140a7754c4865d575d8a868dc SHA512 58b9a62d15add73c9c535e8602711636058b67b5e89b6189656a2d0668d2e647b9a59c45b5602f634ffd89abe7fb8a03be094524f3ff6d2b136bb8e21bc79fa3 DIST icewm-2.0.1.tar.lz 1694439 BLAKE2B 1476f33fa7350a98b7eca8c5c265455d0a78b28bcbd35ab78969b528ae02d3c960fb73cf2b24ea999ee5e08c9f0641d3502c7d5ed8b285777162c334d645b6db SHA512 ac4126b38d592aed60d2269f58c5a1612b61e871565e3c3e51bc2b430e4da6a4708f78e86c16091fa4dfb9eefd4109ae89102ab708e3bce9a44f1e5fe1970c59 +DIST icewm-2.1.0.tar.lz 1696214 BLAKE2B ba91eac4ea425fc9979d1c64fbc2a4c59f1d8004138f31b1e184484cfcaaca7c1a550cd160ff3683a4f663e54efdd5f8ded001317765485259a1f19b8de794a3 SHA512 a57ebbf76640b5296c90c105bdc9b9b2cc55546d324fa18b2e7bfc6bee4442b56176bda4a584d6a73b2297203e1966d7646354bb6e0baaf64fdf0acdb357ee58 +DIST icewm-2.1.1.tar.lz 1695855 BLAKE2B 81903735a71e13953635a4d70547f2518983b5e58fd9e90124e4aecb6b9b53827d48f77bbff3cec59b929456f4c1ab14fde999bbc45f90c8916bbb1017b8eb20 SHA512 7d0acd655f505755fe0b1186b7422a254805bd1c56f00170ecac90272c31c1c0673f781e4e89e04682515b7313dd57b78797398a81edc62b86abc6991abfc45c EBUILD icewm-1.9.2.ebuild 2751 BLAKE2B ffbbde71ff1e7e055de75878203dfcfe4ddf47e0883f9c51d9ed4a68d007c1d294d2bc33ce0009b0fb4b5b8c679a341aefc30252fe3fd3cc0a963574a3b31955 SHA512 42c3df4c4709f963e23264785acb1e56df30fb1b580fbdc06029e86cb7c7fe1b78b4dc46d250cae50195404ccd166582d2560940076f7823e368e36de333e333 -EBUILD icewm-2.0.0.ebuild 2949 BLAKE2B e8e0ac64383edd04cbe752917c001dade85ba729d440d6711cd9f80f2506dbd6565fbd0fcd70ab4e0d8051df82c4597040882dc79ff4056762d020bbe25e9e6d SHA512 14ea2d985d54b32c8788a0b35f4ddfeccfbe6edbd45f751992340127575bcecdee972543c37d339541fe24daf3b5b8f828c6918af4a79f11fbd0b2ec8792a323 EBUILD icewm-2.0.1.ebuild 2949 BLAKE2B 7cbb263b4244bc2112c5dd6ac91a0b970d31e3ce36034a31d036e1fd77d34923da8de8bfe64ef4d212984640d932727a9b362bf7f2ff6ecea10a9ae57db15906 SHA512 96ef7961a4754b355678b222b1c99f5ea7efc2cf2ec5badf951458fadee580c26a5614dccb540b9685d118e6761cf20df14b71b7ce7ef98f84b8df8bfb596e19 +EBUILD icewm-2.1.0-r1.ebuild 3000 BLAKE2B 08a69f1874b68ed1192dbe7025c4f77f66325577350d670df66030e23f86d2b8c978e21fec1858112148c5249abdafc44d663c01a9410aae1a00ed337333012a SHA512 5240155015ce0f1fec204f6e0b724ce9de66be497dd2c8e253a7d0b33b3c5c50f0539fcece9394b24e1b9898f6051e4b052a64c681bbc5ba91d7e49b8b55ac6a +EBUILD icewm-2.1.1.ebuild 2949 BLAKE2B 7cbb263b4244bc2112c5dd6ac91a0b970d31e3ce36034a31d036e1fd77d34923da8de8bfe64ef4d212984640d932727a9b362bf7f2ff6ecea10a9ae57db15906 SHA512 96ef7961a4754b355678b222b1c99f5ea7efc2cf2ec5badf951458fadee580c26a5614dccb540b9685d118e6761cf20df14b71b7ce7ef98f84b8df8bfb596e19 MISC metadata.xml 747 BLAKE2B a986dc65f9b603519ef92fecc63cadd2921d6569e8735956a55ce91673426082e367664cce23c2b80cec19e0d997da357ac8f9d3d78c738ad92f42f6f426c225 SHA512 f9b84c60b780b5999c8a295b64bdf1bdb734108984e48f1271257cb35602df024a347560526de52f43ede16f67031551f4ae3f37401d3320e4dbdfb913e557fe 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.0.0.ebuild b/x11-wm/icewm/icewm-2.0.0.ebuild deleted file mode 100644 index e00f833b8352..000000000000 --- a/x11-wm/icewm/icewm-2.0.0.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 1999-2020 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" -} 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.1.ebuild b/x11-wm/icewm/icewm-2.1.1.ebuild new file mode 100644 index 000000000000..ec1d0545c005 --- /dev/null +++ b/x11-wm/icewm/icewm-2.1.1.ebuild @@ -0,0 +1,153 @@ +# 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