diff options
Diffstat (limited to 'x11-plugins')
56 files changed, 331 insertions, 924 deletions
diff --git a/x11-plugins/asclock/asclock-2.0.12-r3.ebuild b/x11-plugins/asclock/asclock-2.0.12-r3.ebuild index db24660028b2..c7d6b2cded3f 100644 --- a/x11-plugins/asclock/asclock-2.0.12-r3.ebuild +++ b/x11-plugins/asclock/asclock-2.0.12-r3.ebuild @@ -1,14 +1,14 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit eutils toolchain-funcs +inherit toolchain-funcs -IUSE="" DESCRIPTION="Clock applet for AfterStep" -SRC_URI="http://www.tigr.net/afterstep/download/asclock/${P}.tar.gz" HOMEPAGE="https://tigr.net/afterstep/applets/" +SRC_URI="http://www.tigr.net/afterstep/download/asclock/${P}.tar.gz" + LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" @@ -16,7 +16,10 @@ KEYWORDS="amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" DEPEND="x11-libs/libXpm" RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}"/${PN}-gcc41.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-gcc41.patch + "${FILESDIR}"/${P}-fno-common.patch +) src_prepare() { default @@ -59,7 +62,7 @@ src_install() { insinto ${themesdir} doins -r themes/* dodoc README README.THEMES TODO - cd "${D}"/${themesdir} || die - rm -f Freeamp/Makefile{,.*} || die + cd "${ED}"/${themesdir} || die + rm Freeamp/Makefile{,.*} || die ln -s classic default_theme || die } diff --git a/x11-plugins/asclock/files/asclock-2.0.12-fno-common.patch b/x11-plugins/asclock/files/asclock-2.0.12-fno-common.patch new file mode 100644 index 000000000000..39adebdf912b --- /dev/null +++ b/x11-plugins/asclock/files/asclock-2.0.12-fno-common.patch @@ -0,0 +1,21 @@ +--- a/config.c ++++ b/config.c +@@ -1,6 +1,7 @@ + #include "asclock.h" + + extern char *Geometry; ++extern int itdocks; + + /* load the variables from a predefined theme ****************************************/ + +--- a/symbols.c ++++ b/symbols.c +@@ -62,7 +62,7 @@ symbol config_symbols[] = { + { "beats_elem_height",&beats_elem_height}, + { NULL, NULL} }; + +-int itdocks; ++extern int itdocks; + int itblinks; + int showampm; + diff --git a/x11-plugins/hexchat-javascript/Manifest b/x11-plugins/hexchat-javascript/Manifest index e1d2d22ca393..dd8a1ddfafad 100644 --- a/x11-plugins/hexchat-javascript/Manifest +++ b/x11-plugins/hexchat-javascript/Manifest @@ -1,2 +1 @@ -DIST hexchat-javascript-0.3.1.tar.gz 27150 BLAKE2B 6e898483cfb620477cacd423d70d08bd3343b423efce4f858026fc22ce8eb92d76dfd746fd30a8996c1a64377cc67b1578e77571ca6079dbc41f43645f91c824 SHA512 8a59d26d9aa4fba19f3058b646a0a7da4facb936a88cec9a8f7c8f4ff4a865263665377edec5acbc33890786b7d576667d39323ba35e9b0ce05dc4d132a50502 DIST hexchat-javascript-0.3.2.tar.gz 27542 BLAKE2B ebd5ddef39a744a3149f562ad235ecd97fef3326e13558a00f9308ff7a078bf03d64564198e003d7730e55c20df6a48a0bab9b3fba66be57d032548c614d23e5 SHA512 2829ddda5d35e50c4528b56c898c96a51d5b416d55e1631f97104fa8326952ae2bde041d07d9ef652a3b92a7d33ae99307d30605c2deaacd317e71599c9708a0 diff --git a/x11-plugins/hexchat-javascript/hexchat-javascript-0.3.1.ebuild b/x11-plugins/hexchat-javascript/hexchat-javascript-0.3.1.ebuild deleted file mode 100644 index 7756e2e41eda..000000000000 --- a/x11-plugins/hexchat-javascript/hexchat-javascript-0.3.1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit toolchain-funcs - -DESCRIPTION="Javascript interface for HexChat" -HOMEPAGE="https://github.com/TingPing/hexchat-javascript" -SRC_URI="https://github.com/TingPing/hexchat-javascript/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MPL-2.0" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="examples" - -RDEPEND=" - dev-lang/spidermonkey:0 - >=net-irc/hexchat-2.9.6[plugins(+)]" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -pkg_setup() { - if [[ ${MERGE_TYPE} != binary ]]; then - tc-export CXX PKG_CONFIG - fi -} - -src_install() { - default - if use examples ; then - dodoc -r examples - fi -} diff --git a/x11-plugins/hexchat-javascript/hexchat-javascript-0.3.2.ebuild b/x11-plugins/hexchat-javascript/hexchat-javascript-0.3.2.ebuild index 65978b6b7f10..3233b98d08a0 100644 --- a/x11-plugins/hexchat-javascript/hexchat-javascript-0.3.2.ebuild +++ b/x11-plugins/hexchat-javascript/hexchat-javascript-0.3.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/TingPing/hexchat-javascript/archive/${PV}.tar.gz -> LICENSE="MPL-2.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="examples" RDEPEND=" diff --git a/x11-plugins/pidgin-telegram/Manifest b/x11-plugins/pidgin-telegram/Manifest index 1f2e5e31fdd5..a00c5606393e 100644 --- a/x11-plugins/pidgin-telegram/Manifest +++ b/x11-plugins/pidgin-telegram/Manifest @@ -1,2 +1,2 @@ -DIST telegram-purple_1.4.3.orig.tar.gz 491997 BLAKE2B 30d42b34525c6553498c67f8a28cfe789442555a3a135a116195edc982611b8ccae6d7c53006358ebdca679258ae6a40b29a1d2ebb764e082bc2ee77d39584db SHA512 697d070da5c6671dd54a1709b37153d4b569ae1cd19d574a2d92a777a89ebd7884596b35829564a7f6fd49104f5d26e35cbe9634f64c678b5f061af8197fba16 DIST telegram-purple_1.4.4.orig.tar.gz 495386 BLAKE2B 7ecac3a334f88f3d9c0367c5910d3de03b1e6749f18628a58f90c0ae3602dd04d0a1bec79b1016af236375bfe3eb7d4c40437c31fbbee0e9648e5425e40bb43d SHA512 9907da48b978294749f0697313cc7dbf26358535d6528190d8b61cdce5e478af8e756528a212af806025eb75b7f7ec90054ee763eea327f101ef469d0f4fd43e +DIST telegram-purple_1.4.6.orig.tar.gz 497757 BLAKE2B 1f666aaf4ef1913420cf735e3d85e1d91be8a2f07932785d55bc0be37e2cd8cabaf6b0be2b520afafc6636a692086be180d3bd4438215f8b14ae867da9891e18 SHA512 bf3e14a2d1dec7382833011ea891ba5bce81820766b3d6adee582bf0257baadeb7aa7eab7aa6e20adf8dd7728eb653db35b1d8f56bfffe7a92f9bf7506401e6e diff --git a/x11-plugins/pidgin-telegram/files/pidgin-telegram-1.4.3-change-metadata-location.patch b/x11-plugins/pidgin-telegram/files/pidgin-telegram-1.4.3-change-metadata-location.patch deleted file mode 100644 index 6971fb8d5075..000000000000 --- a/x11-plugins/pidgin-telegram/files/pidgin-telegram-1.4.3-change-metadata-location.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d18d4c7a46539c37eec30fdbdbb7b56b08469f12 Mon Sep 17 00:00:00 2001 -From: mirabilos <tg@debian.org> -Date: Sat, 25 Apr 2020 19:29:28 +0200 -Subject: [PATCH] Use newer AppStream metadata location - ---- - Makefile.in | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 48bfae92..bbaed9df 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -216,15 +216,16 @@ install: noicon_install - install -m $(FILE_PERM) imgs/telegram22.png $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/22/telegram.png - mkdir -m $(DIR_PERM) -p $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/48 - install -m $(FILE_PERM) imgs/telegram48.png $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/48/telegram.png -- mkdir -m $(DIR_PERM) -p $(DESTDIR)$(datarootdir)/appdata -- install -m $(FILE_PERM) AppStream/telegram-purple.metainfo.xml $(DESTDIR)$(datarootdir)/appdata/telegram-purple.metainfo.xml -+ mkdir -m $(DIR_PERM) -p $(DESTDIR)$(datarootdir)/metainfo -+ install -m $(FILE_PERM) AppStream/telegram-purple.metainfo.xml $(DESTDIR)$(datarootdir)/metainfo/telegram-purple.metainfo.xml - - .PHONY: uninstall - uninstall: noicon_uninstall - rm -f $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/16/telegram.png - rm -f $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/22/telegram.png - rm -f $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/48/telegram.png -- rm -f $(DESTDIR)$(datarootdir)/appdata/telegram-purple.metainfo.xml -+ rm -f $(DESTDIR)$(datarootdir)/appdata/telegram-purple.metainfo.xml # old location -+ rm -f $(DESTDIR)$(datarootdir)/metainfo/telegram-purple.metainfo.xml # new location - - - ### == The local_{,un}install targets, in case you're not root. == ### diff --git a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.4.ebuild b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.4.ebuild index 653d01bdc92e..3687b6477ca2 100644 --- a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.4.ebuild +++ b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,7 +8,7 @@ HOMEPAGE="https://github.com/majn/telegram-purple" SRC_URI="https://github.com/majn/telegram-purple/releases/download/v${PV}/telegram-purple_${PV}.orig.tar.gz" LICENSE="GPL-2+" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" SLOT="0" IUSE="gcrypt libressl +nls +png +webp" diff --git a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.3.ebuild b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.6.ebuild index 2683ce2015f4..06014ab6c69c 100644 --- a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.3.ebuild +++ b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,9 +6,10 @@ EAPI=7 DESCRIPTION="A libpurple protocol plugin that adds support for the Telegram messenger" HOMEPAGE="https://github.com/majn/telegram-purple" SRC_URI="https://github.com/majn/telegram-purple/releases/download/v${PV}/telegram-purple_${PV}.orig.tar.gz" +S="${WORKDIR}/telegram-purple" LICENSE="GPL-2+" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" SLOT="0" IUSE="gcrypt libressl +nls +png +webp" @@ -31,20 +32,13 @@ BDEPEND=" virtual/pkgconfig " -S="${WORKDIR}/telegram-purple" - DOCS=( "AUTHORS" "CHANGELOG.md" "HACKING.md" "HACKING.BUILD.md" "README.md" ) -PATCHES=( - "${FILESDIR}/${P}-change-metadata-location.patch" - "${FILESDIR}/${P}-clang.patch" -) - src_prepare() { default # Remove '-Werror' to make it compile - find -name 'Makefile*' -exec sed -i -e 's/-Werror //' {} + || die + find -name 'Makefile*' -exec sed -i -e 's/-Werror //' {} + || die } src_configure() { diff --git a/x11-plugins/pidgin-window_merge/pidgin-window_merge-0.3.ebuild b/x11-plugins/pidgin-window_merge/pidgin-window_merge-0.3.ebuild index 95abeb686964..9927a83926b6 100644 --- a/x11-plugins/pidgin-window_merge/pidgin-window_merge-0.3.ebuild +++ b/x11-plugins/pidgin-window_merge/pidgin-window_merge-0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 diff --git a/x11-plugins/purple-facebook/purple-facebook-20190113.ebuild b/x11-plugins/purple-facebook/purple-facebook-20190113.ebuild index 5954a74a3264..d9c29b05113a 100644 --- a/x11-plugins/purple-facebook/purple-facebook-20190113.ebuild +++ b/x11-plugins/purple-facebook/purple-facebook-20190113.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SRC_URI="https://github.com/dequis/${PN}/releases/download/v${MY_PV}/${PN}-${MY_ LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="" RDEPEND="dev-libs/json-glib diff --git a/x11-plugins/vicious/metadata.xml b/x11-plugins/vicious/metadata.xml index eba6c3352f05..4e133ef87e4d 100644 --- a/x11-plugins/vicious/metadata.xml +++ b/x11-plugins/vicious/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>maksbotan@gentoo.org</email> - <name>Maxim Koltsov</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="contrib">Install extra widgets, some for less common hardware, some contributed by Vicious users.</flag> </use> diff --git a/x11-plugins/wmbattery/Manifest b/x11-plugins/wmbattery/Manifest index ab78250d2104..0b9532910b5b 100644 --- a/x11-plugins/wmbattery/Manifest +++ b/x11-plugins/wmbattery/Manifest @@ -1,3 +1 @@ -DIST wmbattery-2.50.tar.gz 40938 BLAKE2B 1193e164af78d1839ed3f6ac251cb01fe36f8630d418aefa3c2f485e03ac37b027274d4146c139afacbb4f59ffbbb4c7471620bf8cb9806a4ddcd95613ce2b50 SHA512 f96b98d2819a9ecf189b9ebc60c107abc6715cf76bb73c98f1d3649dd2ef6112e052559f13fc5620ec7d71466f2e4d6a5e7e86b0f5f0675e02d6e038a9411794 -DIST wmbattery-2.51.tar.gz 164657 BLAKE2B f2432c9d31f4440a88ed67a0aa1b3bc494df2584175df9269c12e08430783777e46ec882bd2d71a1bc5530d2dbb1e277ccc8d1bd8dce2136df8584aaa2013a8b SHA512 2ad508e796a4f5c826bd7c785c3cf1c2ee77923db92c99e75031cd305b351d82fbce158c69cc5393b904afe639574aea38186438fbedfa20243ff03c7824186b DIST wmbattery-2.54.tar.gz 87925 BLAKE2B 692549909d52096ecf7997de5122f07d9fd59b3e2d99c1421b871671a9e43f2bbdb9742e89f835a58114238509b8f8b03fd0619da4a66d8e43b6b787d4e5f6a9 SHA512 58c901ed85d3ea7e0c750bb968c3250706ed693162fe4684d75683a3897df7ff02ee4afbe12a5d26b1f1b632d4c6f9902713a632e6784173ea49bad312fd30aa diff --git a/x11-plugins/wmbattery/wmbattery-2.50.ebuild b/x11-plugins/wmbattery/wmbattery-2.50.ebuild deleted file mode 100644 index 82511c3347c3..000000000000 --- a/x11-plugins/wmbattery/wmbattery-2.50.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools - -DESCRIPTION="A dockable app to report APM, ACPI, or SPIC battery status" -HOMEPAGE="https://www.dockapps.net/wmbattery" -SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc -sparc x86" -IUSE="apm +upower" - -RDEPEND="apm? ( sys-apps/apmd ) - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXpm - upower? ( >=sys-power/upower-0.9.23 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS=( ChangeLog README TODO ) - -src_prepare() { - sed -i \ - -e '/^icondir/s:icons:pixmaps:' \ - autoconf/makeinfo.in || die - - use upower || { sed -i -e 's:USE_UPOWER = 1:#&:' autoconf/makeinfo.in || die; } - - eautoreconf -} diff --git a/x11-plugins/wmbattery/wmbattery-2.51.ebuild b/x11-plugins/wmbattery/wmbattery-2.51.ebuild deleted file mode 100644 index 686ef8df70ea..000000000000 --- a/x11-plugins/wmbattery/wmbattery-2.51.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools - -DESCRIPTION="A dockable app to report APM, ACPI, or SPIC battery status" -HOMEPAGE="https://www.dockapps.net/wmbattery" -SRC_URI="https://www.dockapps.net/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc -sparc ~x86" -IUSE="apm +upower" - -RDEPEND="apm? ( sys-apps/apmd ) - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXpm - upower? ( >=sys-power/upower-0.9.23 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS=( ChangeLog README TODO ) - -src_prepare() { - default - - sed -i \ - -e '/^icondir/s:icons:pixmaps:' \ - autoconf/makeinfo.in || die - - use upower || { sed -i -e 's:USE_UPOWER = 1:#&:' autoconf/makeinfo.in || die; } - - eautoreconf -} diff --git a/x11-plugins/wmbattery/wmbattery-2.54.ebuild b/x11-plugins/wmbattery/wmbattery-2.54.ebuild index 1163ee081469..f8aa6f8bd2fa 100644 --- a/x11-plugins/wmbattery/wmbattery-2.54.ebuild +++ b/x11-plugins/wmbattery/wmbattery-2.54.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc -sparc x86" +KEYWORDS="amd64 ~ppc -sparc x86" IUSE="apm +upower" RDEPEND="apm? ( sys-apps/apmd ) diff --git a/x11-plugins/wmbiff/Manifest b/x11-plugins/wmbiff/Manifest index 897f8bac2c2a..7a83388e04ce 100644 --- a/x11-plugins/wmbiff/Manifest +++ b/x11-plugins/wmbiff/Manifest @@ -1,3 +1 @@ -DIST wmbiff-0.4.28.tar.gz 111398 BLAKE2B 39ba4dbf50639b02c8969ae72b696fa83353ec3dcd46802f8333eb597f068d3d0d209f39a352a8f53830695c19c897b7d6f970c5362c2910128b80b0cdb24d32 SHA512 a17fd4b4c3de09a907b7ffccc50f4560a7fddd5cb4dd01c72460806dc55259ba0b587d75f7505171a2a833f6735ddc4ded0a484d4227bfd552cc7343d79d7720 -DIST wmbiff-0.4.35.tar.gz 265332 BLAKE2B 049f01dafaf71af614c47379fa1e59593e6d7904ecc7e63721edc06d06a4705141c5a339f773b7352984b288c32cb7d324fcca72c4459890328672b0d0a4b4e8 SHA512 7a276c33545351dd1e3c072b4b702fabb293744c3b26326739ebc278f18eda3fe971eeaa8392445eb49514eeb430677638b100076409ec6216915a1388a491c4 DIST wmbiff-0.4.36.tar.gz 266288 BLAKE2B 7f90ae23ff228ed775c4693beffb3e71930bc594083d75cbe25d9eb992cae3a35bc8d57699da53b034a19486846d05625dee607b0da38519ddfc50faac4cf6da SHA512 b8b14f9676ebd576f9e568bd59638c3000337713c6ef8cf5d7799ed0adea59d1ca1fe0d9c67ceb997814b1e6d26590a0c4052b1f031cee28601d7273bbd3fd23 diff --git a/x11-plugins/wmbiff/files/wmbiff-0.4.36-ar.patch b/x11-plugins/wmbiff/files/wmbiff-0.4.36-ar.patch new file mode 100644 index 000000000000..da1f194dd4cf --- /dev/null +++ b/x11-plugins/wmbiff/files/wmbiff-0.4.36-ar.patch @@ -0,0 +1,11 @@ +diff -Naur wmbiff-0.4.36.orig/configure.ac wmbiff-0.4.36/configure.ac +--- wmbiff-0.4.36.orig/configure.ac 2020-04-17 19:30:26.000000000 +0200 ++++ wmbiff-0.4.36/configure.ac 2021-01-03 00:27:57.522698494 +0100 +@@ -13,6 +13,7 @@ + AH_TEMPLATE([VERSION], [wmbiff's release version]) + AC_SUBST(VERSION) + ++AM_PROG_AR + AC_PROG_INSTALL + AC_PROG_CC + AC_PROG_RANLIB diff --git a/x11-plugins/wmbiff/wmbiff-0.4.28.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.28.ebuild deleted file mode 100644 index 8e73b022cf3e..000000000000 --- a/x11-plugins/wmbiff/wmbiff-0.4.28.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils - -DESCRIPTION="WMBiff is a dock applet for WindowMaker which can monitor up to 5 mailboxes" -HOMEPAGE="https://www.dockapps.net/wmbiff" -SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="crypt" - -RDEPEND="x11-libs/libX11 - x11-libs/libXext - x11-libs/libXpm - crypt? ( - >=dev-libs/libgcrypt-1.2.1:0 - >=net-libs/gnutls-2.2.0 - )" -DEPEND="${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto" - -S=${WORKDIR}/dockapps - -DOCS="ChangeLog FAQ NEWS README TODO wmbiff/sample.wmbiffrc" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.4.27-invalid-strncpy.patch - eautoreconf -} - -src_configure() { - econf $(use_enable crypt crypto) -} diff --git a/x11-plugins/wmbiff/wmbiff-0.4.35.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.35.ebuild deleted file mode 100644 index 9200caafc51c..000000000000 --- a/x11-plugins/wmbiff/wmbiff-0.4.35.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools eutils - -DESCRIPTION="WMBiff is a dock applet for WindowMaker which can monitor up to 5 mailboxes" -HOMEPAGE="https://www.dockapps.net/wmbiff" -SRC_URI="https://www.dockapps.net/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="crypt" - -RDEPEND="x11-libs/libX11 - x11-libs/libXext - x11-libs/libXpm - crypt? ( - >=dev-libs/libgcrypt-1.2.1:0 - >=net-libs/gnutls-2.2.0 - )" -DEPEND="${RDEPEND} - x11-base/xorg-proto" -BDEPEND="virtual/pkgconfig" - -DOCS="ChangeLog FAQ NEWS README TODO wmbiff/sample.wmbiffrc" -PATCHES=( - "${FILESDIR}"/${PN}-0.4.27-invalid-strncpy.patch - "${FILESDIR}"/${P}-fno-common.patch - ) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf $(use_enable crypt crypto) -} diff --git a/x11-plugins/wmbiff/wmbiff-0.4.36.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.36.ebuild index a7c57b290a75..7f44590d0960 100644 --- a/x11-plugins/wmbiff/wmbiff-0.4.36.ebuild +++ b/x11-plugins/wmbiff/wmbiff-0.4.36.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit autotools DESCRIPTION="WMBiff is a dock applet for WindowMaker which can monitor up to 5 mailboxes" HOMEPAGE="https://www.dockapps.net/wmbiff" @@ -9,7 +10,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ppc x86" +KEYWORDS="amd64 ppc x86" IUSE="crypt" RDEPEND="x11-libs/libX11 @@ -26,8 +27,14 @@ BDEPEND="virtual/pkgconfig" DOCS="ChangeLog FAQ NEWS README TODO wmbiff/sample.wmbiffrc" PATCHES=( "${FILESDIR}"/${PN}-0.4.27-invalid-strncpy.patch + "${FILESDIR}"/${P}-ar.patch ) +src_prepare() { + default + eautoreconf +} + src_configure() { econf $(use_enable crypt crypto) } diff --git a/x11-plugins/wmblob/Manifest b/x11-plugins/wmblob/Manifest index cdc2ee8d0de6..655731361c88 100644 --- a/x11-plugins/wmblob/Manifest +++ b/x11-plugins/wmblob/Manifest @@ -1,2 +1 @@ -DIST wmblob-1.0.3.tar.bz2 160657 BLAKE2B e36f7b8c6dd38466da490bd85d03ff2f378caced8d5908b00422428223aaa1fc3754bfd35dcacb2f162b0d44c8c04b509cf5c00d678d687e5b90cad886ce98a6 SHA512 4d8c7e30218d9ec7dc965c69e69b0fb5839c468f695ec2cc9fd9bb0b8fbc89b1386122e11b75906169bb16d13dae16cd8287c5bcf8bd28ccbbad4d4f057b3414 DIST wmblob-1.0.4.tar.bz2 179284 BLAKE2B 79025a4d80c05bd8f9d1a962762680e24ae0eb09c8bf961833f4f4c59b086ecc8563ef71c28678c969da75f1f074c691c9fd6a6919358886e64f7fcb814611a3 SHA512 d325711e6c6c865a97386793a7c3f0e0833044001ccc336f2a4e9974799e5ff00936b0d90a0dc4a3280ba27a8d1f97239ba51d61e6e5b104e7cf82c8aeed5ec1 diff --git a/x11-plugins/wmblob/wmblob-1.0.3.ebuild b/x11-plugins/wmblob/wmblob-1.0.3.ebuild deleted file mode 100644 index 4d31557be81d..000000000000 --- a/x11-plugins/wmblob/wmblob-1.0.3.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools multilib - -DESCRIPTION="a fancy but useless dockapp with moving blobs" -HOMEPAGE="https://github.com/bbidulock/wmblob" -SRC_URI="https://github.com/bbidulock/wmblob/releases/download/${PV}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc sparc x86" -IUSE="" - -RDEPEND="x11-libs/gtk+:2 - x11-libs/libX11 - x11-libs/libXpm - x11-libs/libXext" -DEPEND="${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto - x11-libs/libXt" - -DOCS="AUTHORS ChangeLog NEWS README doc/how_it_works" - -src_prepare() { - sed -i \ - -e "s|-O2|${CFLAGS}|g" \ - -e "s|\$x_libraries|/usr/$(get_libdir)|" \ - configure.ac || die - - eautoreconf -} diff --git a/x11-plugins/wmblob/wmblob-1.0.4.ebuild b/x11-plugins/wmblob/wmblob-1.0.4.ebuild index 60206498e9ec..215c1fd29f0e 100644 --- a/x11-plugins/wmblob/wmblob-1.0.4.ebuild +++ b/x11-plugins/wmblob/wmblob-1.0.4.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/bbidulock/wmblob/releases/download/${PV}/${P}.tar.bz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ppc sparc x86" +KEYWORDS="amd64 ppc sparc x86" IUSE="" RDEPEND="x11-libs/gtk+:2 diff --git a/x11-plugins/wmbutton/Manifest b/x11-plugins/wmbutton/Manifest index 42a221c11360..956ecff140d7 100644 --- a/x11-plugins/wmbutton/Manifest +++ b/x11-plugins/wmbutton/Manifest @@ -1,3 +1 @@ -DIST wmbutton-0.7.0.tar.gz 48381 BLAKE2B 051a6da83e575425aca44c88e3011e1c9413d2321ecf3d2387520270d4f5f23eb23df0526332d8913d9a5aaa5f813e5d179f8deca39b705d64687506d9e3da8b SHA512 dc631caca0b1ed6daf8781a0893464b91d788b3d0f81dc22a33d13715cda7becbb145d2d3d34ab93a9a343ed178171c376f81e2eb25e9436d1da8ee2d6455ce2 DIST wmbutton-0.7.1.tar.gz 140293 BLAKE2B 55ab4926b833ae4e57e73cbd4e0fdb6177510099a140bd17d1378c31fe4f42a5fa35c1dbe58398412d465ceb99065a3c7a45a496dc3cb71d045edd879bd70f18 SHA512 61e846c2c7edf6375fdf7e86490ef80feab986b24ce83110283b7e336562a670142e326bfda24ddad832c563da0cb4bc2c3d7379e88e647954c6d93a4dcf6068 -DIST wmbutton-buttons.xpm 25003 BLAKE2B 84830b939cf22605977796ab756d03c110bae8e565eec2b75f479a5b19d9027851ef0178e170da34537b0725073f24544dc0f9c1c701f0f0089701bdfaffd87b SHA512 eb73812b8a4060a6bb13a477275224a2e6d50f7b77944f2f674c4995e0053f3d3c667d483c86dda98b69f398fd332e4c836ddf9eb3410e1e29b69449b874537c diff --git a/x11-plugins/wmbutton/files/sample.wmbutton b/x11-plugins/wmbutton/files/sample.wmbutton deleted file mode 100644 index a4177a24e081..000000000000 --- a/x11-plugins/wmbutton/files/sample.wmbutton +++ /dev/null @@ -1,43 +0,0 @@ -# Buttons are numbered as follows -# Left 1 2 3 Middle 11 12 13 Right 21 22 23 -# button 4 5 6 button 14 15 16 button 24 25 26 -# 7 8 9 17 18 19 27 28 29 -# - -1 mozilla & -11 firefox & -21 opera & - -2 evolution & -12 mozilla -mail & -22 gftp & - -3 xterm -T 'xterm' & -13 Eterm -T 'Eterm' & -23 aterm -T 'Aterm' & - -4 psi & -14 gaim & -24 kadu & - -5 gentoo & -15 xterm -T 'Midnight Commander' -e mc & -25 xffm & - -6 ooffice & -16 gnumeric & -26 acroread & - -7 xmms & -17 gmplayer & -27 audacity & - -8 gimp-2.0 & -18 sodipodi & -28 kpaint & - -9 kghostview & -19 ggv & -29 xpdf & -# The above don't need to be in any particular order. -# Repeated entries should be ignored diff --git a/x11-plugins/wmbutton/files/wmbutton-0.7.0-Makefile.patch b/x11-plugins/wmbutton/files/wmbutton-0.7.0-Makefile.patch deleted file mode 100644 index f9197842b44a..000000000000 --- a/x11-plugins/wmbutton/files/wmbutton-0.7.0-Makefile.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- Makefile.orig 2014-10-06 15:20:41.300883734 +0200 -+++ Makefile 2014-10-06 15:22:08.936939085 +0200 -@@ -1,6 +1,6 @@ - INCLUDES =-I/usr/include -I/usr/local/include --LIBINC =-L/usr/X11R6/lib -L/usr/include/lib - LIBS = -lX11 -lXpm -lXext -+CC = gcc - - TARGET = wmbutton - OBJECTS = wmbutton.o wmb_libs.o -@@ -14,13 +14,11 @@ - INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755 - INSTALL_FILE = $(INSTALL) -p -o root -g root -m 644 - --CFLAGS += -Wall -O2 -- - .c.o: -- gcc -c ${CFLAGS} ${INCLUDES} $< -o $*.o -+ ${CC} -c ${CFLAGS} ${INCLUDES} $< -o $*.o - - ${TARGET}: ${OBJECTS} -- gcc -o ${TARGET} ${OBJECTS} ${LIBINC} ${LIBS} -+ ${CC} ${LDFLAGS} ${OBJECTS} ${LIBS} -o ${TARGET} - - clean:: - for i in ${OBJECTS}; do if [ -e $$i ] ; then rm $$i; fi; done diff --git a/x11-plugins/wmbutton/wmbutton-0.7.0.ebuild b/x11-plugins/wmbutton/wmbutton-0.7.0.ebuild deleted file mode 100644 index 4a5bc61a5db6..000000000000 --- a/x11-plugins/wmbutton/wmbutton-0.7.0.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils toolchain-funcs - -DESCRIPTION="a dockapp application that displays nine configurable buttons" -HOMEPAGE="https://www.dockapps.net/wmbutton" -SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz - branding? ( mirror://gentoo/${PN}-buttons.xpm )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc sparc x86" -IUSE="branding" - -RDEPEND="x11-libs/libX11 - x11-libs/libXpm - x11-libs/libXext" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -S=${WORKDIR}/dockapps - -src_prepare() { - epatch "${FILESDIR}"/${P}-Makefile.patch - use branding && cp "${DISTDIR}"/${PN}-buttons.xpm buttons.xpm -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - dobin ${PN} - dodoc README - use branding && dodoc "${FILESDIR}"/sample.wmbutton - use branding || dodoc sample.wmbutton -} diff --git a/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild b/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild index 9beb0fa72849..4a90d6d6e8a4 100644 --- a/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild +++ b/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc sparc x86" +KEYWORDS="amd64 ~ppc sparc x86" IUSE="branding" RDEPEND="x11-libs/libX11 diff --git a/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild b/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild index c594a1502d22..ab96aa7eae23 100644 --- a/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild +++ b/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild @@ -9,7 +9,7 @@ SRC_URI="http://hules.free.fr/${PN}/download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ppc ~x86" +KEYWORDS="amd64 ppc ~x86" IUSE="nls xinerama" RDEPEND="x11-libs/gtk+:2 diff --git a/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild b/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild index 6865c6ecdb65..c813349ccd5f 100644 --- a/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild +++ b/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild @@ -13,13 +13,8 @@ SLOT="0" KEYWORDS="amd64 ppc ~sparc x86" IUSE="" -RDEPEND="|| ( - ( - x11-libs/gdk-pixbuf:2[X] - >=x11-libs/gdk-pixbuf-2.42.0:2 - ) - <x11-libs/gdk-pixbuf-2.42.0:2[X] - ) +RDEPEND="x11-libs/gdk-pixbuf-xlib + >=x11-libs/gdk-pixbuf-2.42.0:2 x11-libs/gtk+:2" DEPEND="${RDEPEND} virtual/pkgconfig" diff --git a/x11-plugins/wmgtemp/wmgtemp-1.2.ebuild b/x11-plugins/wmgtemp/wmgtemp-1.2.ebuild index 5040d25087d5..cfe8a2453c50 100644 --- a/x11-plugins/wmgtemp/wmgtemp-1.2.ebuild +++ b/x11-plugins/wmgtemp/wmgtemp-1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 diff --git a/x11-plugins/wminet/files/wminet-3.0.0-fno-common.patch b/x11-plugins/wminet/files/wminet-3.0.0-fno-common.patch new file mode 100644 index 000000000000..606dada2fb30 --- /dev/null +++ b/x11-plugins/wminet/files/wminet-3.0.0-fno-common.patch @@ -0,0 +1,23 @@ +diff -Naur wminet-3.0.0.orig/src/wmgeneral.h wminet-3.0.0/src/wmgeneral.h +--- wminet-3.0.0.orig/src/wmgeneral.h 2001-12-02 19:03:14.000000000 +0100 ++++ wminet-3.0.0/src/wmgeneral.h 2021-01-01 22:51:46.875206930 +0100 +@@ -15,7 +15,7 @@ + /* Global variable */ + /*******************/ + +-Display *display; ++extern Display *display; + + /***********************/ + /* Function Prototypes */ +diff -Naur wminet-3.0.0.orig/src/wminet.c wminet-3.0.0/src/wminet.c +--- wminet-3.0.0.orig/src/wminet.c 2001-11-24 12:03:32.000000000 +0100 ++++ wminet-3.0.0/src/wminet.c 2021-01-01 22:51:41.493202753 +0100 +@@ -78,6 +78,7 @@ + /* Globals */ + /******************************************/ + ++Display *display; + char mask[MASK_WIDTH * MASK_HEIGHT]; + int monitor_tcp = 0; + int monitor_udp = 0; diff --git a/x11-plugins/wminet/wminet-3.0.0-r2.ebuild b/x11-plugins/wminet/wminet-3.0.0-r2.ebuild index 7ada3b2b1324..2c5a0ae6dd61 100644 --- a/x11-plugins/wminet/wminet-3.0.0-r2.ebuild +++ b/x11-plugins/wminet/wminet-3.0.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -19,7 +19,9 @@ RDEPEND="x11-libs/libX11 DEPEND="${RDEPEND} x11-base/xorg-proto" -PATCHES=( "${FILESDIR}"/${P}-list.patch ) +PATCHES=( "${FILESDIR}"/${P}-list.patch + "${FILESDIR}"/${P}-fno-common.patch + ) DOCS=( AUTHORS ChangeLog NEWS README wminetrc ) diff --git a/x11-plugins/wmix/Manifest b/x11-plugins/wmix/Manifest index bf77a69bdd0e..e8444b54a2de 100644 --- a/x11-plugins/wmix/Manifest +++ b/x11-plugins/wmix/Manifest @@ -1,3 +1 @@ -DIST wmix-3.2.tar.gz 33504 BLAKE2B cafc6d4d1d52094edc459db8ab82b46ea0a216ca8035a2882be7ab2dba6945c155a73c2fc3601e9697076f8cf032b7943617680fd70ef889590a9976c2b147a8 SHA512 8382ab849aeacfc88d28cd094c0d9a3218f8aa26b763d9fb4fd8b9837c275a835cc3e29df0659c244fa94b884ebc36b571fe824eaa785a736e630dc2e0081417 -DIST wmix-3.4.tar.gz 116220 BLAKE2B 01aac1603c34298d9b4aa45ec3425ec52e75965634f6c64ae554c44b95a9bea08021527519fe15729f103d2b8aa93757d6dbabbc2223b35cbb37520554fdfa2b SHA512 791e0f22c73d48fd97ce59a0a8d740a2647626fd6d5f172238ae41abac700fb40d7cd95e28463199fd20d14eae3807428949b78c095ee5bd0a347c26aaed1e75 DIST wmix-3.5.tar.gz 118052 BLAKE2B 54461c59d46a2ccf7f81aaf422b9e9fadf260001621396543deb996cb346a1dea5d100b38517b79974acc4d429d6a2f4fcde10e88d114e9f6978d1c0bb599d2e SHA512 ca702368cd5db55958e5f25c9703bf6659987534795fe58fd1ade426220f468ae3979e98ed1a00ffa162b094e53e37974d626a6bc48e2f6099c8c6eaa1f3dfd6 diff --git a/x11-plugins/wmix/files/wmix-3.4-gcc-10.patch b/x11-plugins/wmix/files/wmix-3.4-gcc-10.patch deleted file mode 100644 index 4e91a1a53d78..000000000000 --- a/x11-plugins/wmix/files/wmix-3.4-gcc-10.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff -Naur wmix-3.4.orig/include/mixer.h wmix-3.4/include/mixer.h ---- wmix-3.4.orig/include/mixer.h 2018-04-30 14:17:50.000000000 +0200 -+++ wmix-3.4/include/mixer.h 2020-01-29 19:07:14.932404252 +0100 -@@ -55,28 +55,28 @@ - * - Muting must occur independently of the volume level. - */ - --void (*mixer_init)(const char *mixer_device, -+extern void (*mixer_init)(const char *mixer_device, - bool verbose, - const char *exclude[]); --bool (*mixer_is_changed)(void); --int (*mixer_get_channel_count)(void); --int (*mixer_get_channel)(void); --const char *(*mixer_get_channel_name)(void); --const char *(*mixer_get_short_name)(void); --void (*mixer_set_channel)(int channel); --void (*mixer_set_channel_rel)(int delta_channel); --float (*mixer_get_volume)(void); --void (*mixer_set_volume)(float volume); --void (*mixer_set_volume_rel)(float delta_volume); --float (*mixer_get_balance)(void); --void (*mixer_set_balance)(float balance); --void (*mixer_set_balance_rel)(float delta_balance); --void (*mixer_toggle_mute)(void); --void (*mixer_toggle_rec)(void); --bool (*mixer_is_muted)(void); --bool (*mixer_is_stereo)(void); --bool (*mixer_is_rec)(void); --bool (*mixer_can_rec)(void); --bool (*is_exclude)(const char *short_name, -+extern bool (*mixer_is_changed)(void); -+extern int (*mixer_get_channel_count)(void); -+extern int (*mixer_get_channel)(void); -+extern const char *(*mixer_get_channel_name)(void); -+extern const char *(*mixer_get_short_name)(void); -+extern void (*mixer_set_channel)(int channel); -+extern void (*mixer_set_channel_rel)(int delta_channel); -+extern float (*mixer_get_volume)(void); -+extern void (*mixer_set_volume)(float volume); -+extern void (*mixer_set_volume_rel)(float delta_volume); -+extern float (*mixer_get_balance)(void); -+extern void (*mixer_set_balance)(float balance); -+extern void (*mixer_set_balance_rel)(float delta_balance); -+extern void (*mixer_toggle_mute)(void); -+extern void (*mixer_toggle_rec)(void); -+extern bool (*mixer_is_muted)(void); -+extern bool (*mixer_is_stereo)(void); -+extern bool (*mixer_is_rec)(void); -+extern bool (*mixer_can_rec)(void); -+extern bool (*is_exclude)(const char *short_name, - const char *exclude[]); --void (*mixer_tick)(void); -+extern void (*mixer_tick)(void); -diff -Naur wmix-3.4.orig/wmix.c wmix-3.4/wmix.c ---- wmix-3.4.orig/wmix.c 2019-07-12 18:44:38.000000000 +0200 -+++ wmix-3.4/wmix.c 2020-01-29 19:06:52.685402994 +0100 -@@ -53,6 +53,31 @@ - static int mouse_drag_home_y; - static int idle_loop; - -+void (*mixer_init)(const char *mixer_device, -+ bool verbose, -+ const char *exclude[]); -+bool (*mixer_is_changed)(void); -+int (*mixer_get_channel_count)(void); -+int (*mixer_get_channel)(void); -+const char *(*mixer_get_channel_name)(void); -+const char *(*mixer_get_short_name)(void); -+void (*mixer_set_channel)(int channel); -+void (*mixer_set_channel_rel)(int delta_channel); -+float (*mixer_get_volume)(void); -+void (*mixer_set_volume)(float volume); -+void (*mixer_set_volume_rel)(float delta_volume); -+float (*mixer_get_balance)(void); -+void (*mixer_set_balance)(float balance); -+void (*mixer_set_balance_rel)(float delta_balance); -+void (*mixer_toggle_mute)(void); -+void (*mixer_toggle_rec)(void); -+bool (*mixer_is_muted)(void); -+bool (*mixer_is_stereo)(void); -+bool (*mixer_is_rec)(void); -+bool (*mixer_can_rec)(void); -+bool (*is_exclude)(const char *short_name, -+ const char *exclude[]); -+void (*mixer_tick)(void); - /* local stuff */ - static void signal_catch(int sig); - static void button_press_event(XButtonEvent *event); diff --git a/x11-plugins/wmix/files/wmix.1 b/x11-plugins/wmix/files/wmix.1 deleted file mode 100644 index afd65224bbe5..000000000000 --- a/x11-plugins/wmix/files/wmix.1 +++ /dev/null @@ -1,68 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" -.\" This documentation may be distributed under the terms of -.\" the GNU General Public Licence version 2. -.\" -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH wmix 1 "Jul 19, 2004" "Michele Noberasco" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp <n> insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -wmix \- Dockapp mixer for OSS or ALSA - - -.SH SYNOPSIS -.B wmix -.RI "{ " options " }" - - -.SH DESCRIPTION -.B wmix -Dockapp mixer for OSS or ALSA. Allows toggling record source, -muting individual channels, adjusting volume and balance, all in a -compact dockapp size, with TV\-like on\-screen\-display for volume levels. -.LP -Supports mousewheel to adjust current channelvolume -and can be controlled remotely with SIGUSR1 / SIGUSR2 to adjust the volume. -Keeps a simple configuration file for user\-defined settings. - - -.SH OPTIONS -.TP -.BI "\-d " dsp -Connect to remote X display. -.TP -.BI "\-f " file -Use alternate config file (default is \fI~/.wmixrc\fP) -.TP -.BI "\-m " dev -Use this mixer device (default is \fI/dev/mixer\fP) -.TP -.BI "\-h" -Display list of command line options. -.TP -.BI "\-v" -Use verbose output messages. -.TP -.BI "\-e " name -Exclude a channel, can be used many times. - - -.SH AUTHORS -wmix was written by <timecop@japan.co.jp> and <skunk@mit.edu> -.LP -This man page was written by Fredrik Steen <stone@debian.org> for the Debian -distribution. Updated and fixed by Michele Noberasco <s4t4n@gentoo.org> -for the Gentoo distribution. diff --git a/x11-plugins/wmix/wmix-3.2.ebuild b/x11-plugins/wmix/wmix-3.2.ebuild deleted file mode 100644 index 6164f74253cb..000000000000 --- a/x11-plugins/wmix/wmix-3.2.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils toolchain-funcs - -DESCRIPTION="Dockapp mixer for OSS or ALSA" -HOMEPAGE="https://www.dockapps.net/wmix" -SRC_URI="https://www.dockapps.net/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc sparc x86" -IUSE="" - -RDEPEND="x11-libs/libX11 - x11-libs/libXext - x11-libs/libXpm" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -S=${WORKDIR}/dockapps - -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" -} - -src_install() { - dobin ${PN} - doman "${FILESDIR}"/${PN}.1 - dodoc AUTHORS BUGS NEWS README sample.wmixrc -} diff --git a/x11-plugins/wmix/wmix-3.4.ebuild b/x11-plugins/wmix/wmix-3.4.ebuild deleted file mode 100644 index 5f69dde7b3ac..000000000000 --- a/x11-plugins/wmix/wmix-3.4.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs - -DESCRIPTION="Dockapp mixer for OSS or ALSA" -HOMEPAGE="https://www.dockapps.net/wmix" -SRC_URI="https://www.dockapps.net/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="" - -RDEPEND="media-libs/alsa-lib - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXpm - x11-libs/libXrandr" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch ) diff --git a/x11-plugins/wmix/wmix-3.5.ebuild b/x11-plugins/wmix/wmix-3.5.ebuild index 1853696d8c69..c0b6a38e180f 100644 --- a/x11-plugins/wmix/wmix-3.5.ebuild +++ b/x11-plugins/wmix/wmix-3.5.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc sparc x86" +KEYWORDS="amd64 ~ppc sparc x86" IUSE="" RDEPEND="media-libs/alsa-lib diff --git a/x11-plugins/wmmaiload/Manifest b/x11-plugins/wmmaiload/Manifest index 36a127f866d1..34d5d4ac2950 100644 --- a/x11-plugins/wmmaiload/Manifest +++ b/x11-plugins/wmmaiload/Manifest @@ -1,2 +1 @@ -DIST wmmaiload-2.2.1.tar.gz 183538 BLAKE2B 5859051ca2040399d1cc3db863e89a1d779a22f9c47a171c11e5bfee6a835b03eaaaa7f47ef95ddc9cb29a24b914e84a4b448600a001959ab5471afa409ec646 SHA512 2f4cd4980feefb1022384880a57aea628d3e976dad7d1c838a23dbeb8bf86df6c061c14661bb562e36c51e2ca40d5f9ed3d465d9d26b9c7b9193fe448dbb9394 DIST wmmaiload-2.3.0.tar.bz2 42852 BLAKE2B abee44716ff74e48a480881c3327bc4a4f02600044a587b3322429567a3454f01c733542fbaa42cb074a2da48ecd1c453d19ed42c30efc04e634c44330d729d3 SHA512 c4e63eb2868474e3b76f5f4f401bdd23172f23dfdb0e90712e3eca607494057e067805b83a53490d38b6f7b2c876e2ec8fdb1d95b871d3febeeda35369550de9 diff --git a/x11-plugins/wmmaiload/files/wmmaiload-2.2.1-gtk.patch b/x11-plugins/wmmaiload/files/wmmaiload-2.2.1-gtk.patch deleted file mode 100644 index 38c8625e51ac..000000000000 --- a/x11-plugins/wmmaiload/files/wmmaiload-2.2.1-gtk.patch +++ /dev/null @@ -1,157 +0,0 @@ -diff -ur wmmaiload-2.2.1.orig/wmmaiload/dockapp.c wmmaiload-2.2.1/wmmaiload/dockapp.c ---- wmmaiload-2.2.1.orig/wmmaiload/dockapp.c 2005-07-12 22:39:47.000000000 +0300 -+++ wmmaiload-2.2.1/wmmaiload/dockapp.c 2008-01-12 11:53:00.000000000 +0200 -@@ -27,6 +27,7 @@ - #include <sys/time.h> - #include <sys/types.h> - #include <unistd.h> -+#include <stdlib.h> - - #define WINDOWED_SIZE_W 64 - #define WINDOWED_SIZE_H 64 -diff -ur wmmaiload-2.2.1.orig/wmmaiload-config/actions.c wmmaiload-2.2.1/wmmaiload-config/actions.c ---- wmmaiload-2.2.1.orig/wmmaiload-config/actions.c 2005-07-13 22:54:46.000000000 +0300 -+++ wmmaiload-2.2.1/wmmaiload-config/actions.c 2008-01-12 11:54:15.000000000 +0200 -@@ -3,6 +3,7 @@ - */ - - #include <stdlib.h> -+#include <string.h> - #include "defines.h" - #include "variables.h" - #include "dialogs.h" -diff -ur wmmaiload-2.2.1.orig/wmmaiload-config/dialogs.c wmmaiload-2.2.1/wmmaiload-config/dialogs.c ---- wmmaiload-2.2.1.orig/wmmaiload-config/dialogs.c 2005-07-07 21:54:17.000000000 +0300 -+++ wmmaiload-2.2.1/wmmaiload-config/dialogs.c 2008-01-12 11:47:42.000000000 +0200 -@@ -38,7 +38,6 @@ - bouton, TRUE, TRUE, 0); - GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT); - gtk_widget_grab_default(GTK_WIDGET(bouton)); -- gtk_widget_draw_default(GTK_WIDGET(bouton)); - gtk_widget_show(bouton); - - bouton = gtk_button_new_with_label("No"); -@@ -97,7 +96,6 @@ - bouton, TRUE, TRUE, 0); - GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT); - gtk_widget_grab_default(GTK_WIDGET(bouton)); -- gtk_widget_draw_default(GTK_WIDGET(bouton)); - gtk_widget_show(bouton); - - gtk_container_set_border_width(GTK_CONTAINER -diff -ur wmmaiload-2.2.1.orig/wmmaiload-config/Init.make wmmaiload-2.2.1/wmmaiload-config/Init.make ---- wmmaiload-2.2.1.orig/wmmaiload-config/Init.make 2005-08-26 21:37:33.000000000 +0300 -+++ wmmaiload-2.2.1/wmmaiload-config/Init.make 2008-01-12 11:48:12.000000000 +0200 -@@ -35,9 +35,9 @@ - # - - CROSS_COMPILE = --USER_CPPFLAGS = `gtk-config --cflags` -+USER_CPPFLAGS = `pkg-config gtk+-2.0 --cflags` - USER_CFLAGS = --USER_LDFLAGS = `gtk-config --libs` -lX11 -+USER_LDFLAGS = `pkg-config gtk+-2.0 --libs` -lX11 - - - #***************************************************************** -Only in wmmaiload-2.2.1/wmmaiload-config: Init.make.orig -diff -ur wmmaiload-2.2.1.orig/wmmaiload-config/main.c wmmaiload-2.2.1/wmmaiload-config/main.c ---- wmmaiload-2.2.1.orig/wmmaiload-config/main.c 2005-07-13 22:51:28.000000000 +0300 -+++ wmmaiload-2.2.1/wmmaiload-config/main.c 2008-01-12 11:54:01.000000000 +0200 -@@ -3,6 +3,8 @@ - */ - - #include <stdio.h> -+#include <stdlib.h> -+#include <string.h> - #include <gtk/gtk.h> - #include "config.h" - #include "defines.h" -diff -ur wmmaiload-2.2.1.orig/wmmaiload-config/mainwindow.c wmmaiload-2.2.1/wmmaiload-config/mainwindow.c ---- wmmaiload-2.2.1.orig/wmmaiload-config/mainwindow.c 2005-07-13 22:51:52.000000000 +0300 -+++ wmmaiload-2.2.1/wmmaiload-config/mainwindow.c 2008-01-12 11:47:42.000000000 +0200 -@@ -10,9 +10,9 @@ - #include "actions.h" - - --static GtkWidget *edit; --static GtkWidget *set; --static GtkWidget *remove; -+static GtkWidget *b_edit; -+static GtkWidget *b_set; -+static GtkWidget *b_remove; - - static gint list_sel_cb (GtkCList *clist, - gint row, -@@ -21,9 +21,9 @@ - void *data) - { - selected_row = row; -- gtk_widget_set_sensitive(edit, TRUE); -- gtk_widget_set_sensitive(set, TRUE); -- gtk_widget_set_sensitive(remove, TRUE); -+ gtk_widget_set_sensitive(b_edit, TRUE); -+ gtk_widget_set_sensitive(b_set, TRUE); -+ gtk_widget_set_sensitive(b_remove, TRUE); - return TRUE; - } - -@@ -35,9 +35,9 @@ - void *data) - { - selected_row = -1; -- gtk_widget_set_sensitive(edit, FALSE); -- gtk_widget_set_sensitive(set, FALSE); -- gtk_widget_set_sensitive(remove, FALSE); -+ gtk_widget_set_sensitive(b_edit, FALSE); -+ gtk_widget_set_sensitive(b_set, FALSE); -+ gtk_widget_set_sensitive(b_remove, FALSE); - return TRUE; - } - -@@ -230,7 +230,7 @@ - gtk_table_attach_defaults(GTK_TABLE(table), bouton, 0, 1, 0, 1); - gtk_widget_set_sensitive(bouton, FALSE); - gtk_widget_show(bouton); -- edit = bouton; -+ b_edit = bouton; - - bouton = gtk_button_new_with_label(" Set default "); - gtk_signal_connect(GTK_OBJECT(bouton), "clicked", -@@ -238,7 +238,7 @@ - gtk_table_attach_defaults(GTK_TABLE(table), bouton, 1, 2, 0, 1); - gtk_widget_set_sensitive(bouton, FALSE); - gtk_widget_show(bouton); -- set = bouton; -+ b_set = bouton; - - bouton = gtk_button_new_with_label(" Remove box "); - gtk_signal_connect(GTK_OBJECT(bouton), "clicked", -@@ -246,7 +246,7 @@ - gtk_table_attach_defaults(GTK_TABLE(table), bouton, 2, 3, 0, 1); - gtk_widget_set_sensitive(bouton, FALSE); - gtk_widget_show(bouton); -- remove = bouton; -+ b_remove = bouton; - - /*--- Frame 5 ---*/ - frame = gtk_frame_new(NULL); -@@ -322,7 +322,6 @@ - gtk_box_pack_start(GTK_BOX(buttons_hbox), bouton, TRUE, TRUE, 0); - GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT); - gtk_widget_grab_default(GTK_WIDGET(bouton)); -- gtk_widget_draw_default(GTK_WIDGET(bouton)); - gtk_widget_show(bouton); - - bouton = gtk_button_new_with_label(" Cancel "); -diff -ur wmmaiload-2.2.1.orig/wmmaiload-config/popedit.c wmmaiload-2.2.1/wmmaiload-config/popedit.c ---- wmmaiload-2.2.1.orig/wmmaiload-config/popedit.c 2005-07-07 21:54:17.000000000 +0300 -+++ wmmaiload-2.2.1/wmmaiload-config/popedit.c 2008-01-12 11:47:42.000000000 +0200 -@@ -68,7 +68,6 @@ - bouton, TRUE, TRUE, 0); - GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT); - gtk_widget_grab_default(GTK_WIDGET(bouton)); -- gtk_widget_draw_default(GTK_WIDGET(bouton)); - gtk_widget_show(bouton); - - bouton = gtk_button_new_with_label("Cancel"); diff --git a/x11-plugins/wmmaiload/files/wmmaiload-2.3.0-fno-common.patch b/x11-plugins/wmmaiload/files/wmmaiload-2.3.0-fno-common.patch new file mode 100644 index 000000000000..f4c0eb9763b6 --- /dev/null +++ b/x11-plugins/wmmaiload/files/wmmaiload-2.3.0-fno-common.patch @@ -0,0 +1,113 @@ +diff -Naur wmmaiload-2.3.0.orig/wmmaiload-config/main.c wmmaiload-2.3.0/wmmaiload-config/main.c +--- wmmaiload-2.3.0.orig/wmmaiload-config/main.c 2005-07-13 21:51:28.000000000 +0200 ++++ wmmaiload-2.3.0/wmmaiload-config/main.c 2020-12-20 22:04:03.170530520 +0100 +@@ -11,6 +11,18 @@ + #include "mainwindow.h" + #include "actions.h" + ++int backlight; ++int update_interval; ++int boxnum; ++int check_delay; ++int switch_authorized; ++int run_once; ++int test_size; ++char *config_file; ++char *light_color; ++char *command; ++char *notif_cmd; ++MailBox *mboxes; + + void Usage () + { +diff -Naur wmmaiload-2.3.0.orig/wmmaiload-config/mainwindow.c wmmaiload-2.3.0/wmmaiload-config/mainwindow.c +--- wmmaiload-2.3.0.orig/wmmaiload-config/mainwindow.c 2009-02-23 03:58:00.000000000 +0100 ++++ wmmaiload-2.3.0/wmmaiload-config/mainwindow.c 2020-12-20 22:05:14.978622375 +0100 +@@ -9,6 +9,19 @@ + #include "mainwindow.h" + #include "actions.h" + ++GtkWidget *application; ++GtkWidget *filelist; ++GtkWidget *wid_backlight; ++GtkWidget *wid_blink; ++GtkWidget *wid_interval; ++GtkWidget *wid_checkdelay; ++GtkWidget *wid_color; ++GtkWidget *wid_command; ++GtkWidget *wid_notify; ++GtkWidget *wid_runonce; ++GtkWidget *wid_testsize; ++ ++int selected_row; + + static GtkWidget *b_edit; + static GtkWidget *b_set; +diff -Naur wmmaiload-2.3.0.orig/wmmaiload-config/mainwindow.h wmmaiload-2.3.0/wmmaiload-config/mainwindow.h +--- wmmaiload-2.3.0.orig/wmmaiload-config/mainwindow.h 2005-07-07 20:54:17.000000000 +0200 ++++ wmmaiload-2.3.0/wmmaiload-config/mainwindow.h 2020-12-20 22:05:14.978622375 +0100 +@@ -7,19 +7,19 @@ + + #include <gtk/gtk.h> + +-GtkWidget *application; +-GtkWidget *filelist; +-GtkWidget *wid_backlight; +-GtkWidget *wid_blink; +-GtkWidget *wid_interval; +-GtkWidget *wid_checkdelay; +-GtkWidget *wid_color; +-GtkWidget *wid_command; +-GtkWidget *wid_notify; +-GtkWidget *wid_runonce; +-GtkWidget *wid_testsize; ++extern GtkWidget *application; ++extern GtkWidget *filelist; ++extern GtkWidget *wid_backlight; ++extern GtkWidget *wid_blink; ++extern GtkWidget *wid_interval; ++extern GtkWidget *wid_checkdelay; ++extern GtkWidget *wid_color; ++extern GtkWidget *wid_command; ++extern GtkWidget *wid_notify; ++extern GtkWidget *wid_runonce; ++extern GtkWidget *wid_testsize; + +-int selected_row; ++extern int selected_row; + + gint list_unsel_cb (GtkCList *clist, + gint row, +diff -Naur wmmaiload-2.3.0.orig/wmmaiload-config/variables.h wmmaiload-2.3.0/wmmaiload-config/variables.h +--- wmmaiload-2.3.0.orig/wmmaiload-config/variables.h 2005-07-07 20:54:17.000000000 +0200 ++++ wmmaiload-2.3.0/wmmaiload-config/variables.h 2020-12-20 22:04:03.170530520 +0100 +@@ -7,17 +7,17 @@ + + #include "defines.h" + +-int backlight; +-int update_interval; +-int boxnum; +-int check_delay; +-int switch_authorized; +-int run_once; +-int test_size; +-char *config_file; +-char *light_color; +-char *command; +-char *notif_cmd; +-MailBox *mboxes; ++extern int backlight; ++extern int update_interval; ++extern int boxnum; ++extern int check_delay; ++extern int switch_authorized; ++extern int run_once; ++extern int test_size; ++extern char *config_file; ++extern char *light_color; ++extern char *command; ++extern char *notif_cmd; ++extern MailBox *mboxes; + + #endif diff --git a/x11-plugins/wmmaiload/files/wmmaiload-2.3.0-ssl.patch b/x11-plugins/wmmaiload/files/wmmaiload-2.3.0-ssl.patch new file mode 100644 index 000000000000..812563486256 --- /dev/null +++ b/x11-plugins/wmmaiload/files/wmmaiload-2.3.0-ssl.patch @@ -0,0 +1,24 @@ +diff -Naur wmmaiload-2.3.0.orig/wmmaiload/Init.make wmmaiload-2.3.0/wmmaiload/Init.make +--- wmmaiload-2.3.0.orig/wmmaiload/Init.make 2005-08-28 21:14:57.000000000 +0200 ++++ wmmaiload-2.3.0/wmmaiload/Init.make 2020-12-20 22:10:24.487996211 +0100 +@@ -45,7 +45,7 @@ + # SPECIFIC INFORMATIONS : + # + +-LIB_SSL = $(shell grep -q '^OPTIONS.*HAVE_SSL' ../Config.make && echo '-lssl') ++LIB_SSL = $(shell grep -q '^OPTIONS.*HAVE_SSL' ../Config.make && echo '-lssl -lcrypto') + LIB_THREADS = $(shell grep -q '^OPTIONS.*HAVE_THREADS' ../Config.make && echo '-lpthread') + + CROSS_COMPILE = +diff -Naur wmmaiload-2.3.0.orig/wmmaiload/ssl.c wmmaiload-2.3.0/wmmaiload/ssl.c +--- wmmaiload-2.3.0.orig/wmmaiload/ssl.c 2005-07-30 15:52:55.000000000 +0200 ++++ wmmaiload-2.3.0/wmmaiload/ssl.c 2020-12-20 22:10:30.327001632 +0100 +@@ -39,7 +39,7 @@ + + OpenSSL_add_all_algorithms(); + +- method = SSLv2_client_method(); ++ method = SSLv23_client_method(); + ctx = SSL_CTX_new(method); + return ctx; + } diff --git a/x11-plugins/wmmaiload/wmmaiload-2.3.0-r1.ebuild b/x11-plugins/wmmaiload/wmmaiload-2.3.0-r1.ebuild index bf335b428a78..16e0b8b4f366 100644 --- a/x11-plugins/wmmaiload/wmmaiload-2.3.0-r1.ebuild +++ b/x11-plugins/wmmaiload/wmmaiload-2.3.0-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://tnemeth.free.fr/projets/programmes/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ppc ~ppc64 sparc x86" +KEYWORDS="amd64 ppc ~ppc64 sparc x86" IUSE="" RDEPEND="x11-libs/gtk+:2 diff --git a/x11-plugins/wmmaiload/wmmaiload-2.2.1-r1.ebuild b/x11-plugins/wmmaiload/wmmaiload-2.3.0-r2.ebuild index a3ceeedd56ac..0fbcc47ee3b2 100644 --- a/x11-plugins/wmmaiload/wmmaiload-2.2.1-r1.ebuild +++ b/x11-plugins/wmmaiload/wmmaiload-2.3.0-r2.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 +inherit toolchain-funcs DESCRIPTION="dockapp that monitors one or more mailboxes" HOMEPAGE="https://tnemeth.free.fr/projets/dockapps.html" -SRC_URI="http://tnemeth.free.fr/projets/programmes/${P}.tar.gz" +SRC_URI="http://tnemeth.free.fr/projets/programmes/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" @@ -18,12 +18,11 @@ RDEPEND="x11-libs/gtk+:2 DEPEND="${RDEPEND} virtual/pkgconfig" -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-gtk.patch \ - "${FILESDIR}"/${P}-checkthread.patch - sed -i -e "s/-lssl/\0 -lcrypto/" wmmaiload/Init.make || die "sed failed" -} +PATCHES=( + "${FILESDIR}"/${PN}-2.2.1-checkthread.patch + "${FILESDIR}"/${P}-fno-common.patch + "${FILESDIR}"/${P}-ssl.patch +) src_configure() { # The ./configure script is not autoconf based, therefore don't use econf: @@ -33,6 +32,7 @@ src_configure() { src_compile() { emake \ CC="$(tc-getCC)" \ + CPP="$(tc-getCPP)" \ CFLAGS="${CFLAGS}" \ DEBUG_LDFLAGS="" \ LDFLAGS="${LDFLAGS}" \ diff --git a/x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild b/x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild index 3cce437b9804..541f47f08c3e 100644 --- a/x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild +++ b/x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild @@ -12,13 +12,8 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" -RDEPEND="|| ( - ( - x11-libs/gdk-pixbuf:2[X] - >=x11-libs/gdk-pixbuf-2.42.0:2 - ) - <x11-libs/gdk-pixbuf-2.42.0:2[X] - ) +RDEPEND="x11-libs/gdk-pixbuf-xlib + >=x11-libs/gdk-pixbuf-2.42.0:2 >=x11-libs/libdockapp-0.7:=" DEPEND="${RDEPEND}" diff --git a/x11-plugins/wmpasman/files/wmpasman-0.8.5.3-list.patch b/x11-plugins/wmpasman/files/wmpasman-0.8.5.3-list.patch deleted file mode 100644 index 3769d09d30ee..000000000000 --- a/x11-plugins/wmpasman/files/wmpasman-0.8.5.3-list.patch +++ /dev/null @@ -1,116 +0,0 @@ -diff -Naur wmgeneral.orig/list.c wmgeneral/list.c ---- wmgeneral.orig/list.c 2016-01-04 13:18:09.361133006 +0100 -+++ wmgeneral/list.c 2016-01-04 13:18:21.789137166 +0100 -@@ -40,7 +40,7 @@ - - /* Return a cons cell produced from (head . tail) */ - --inline LinkedList* -+LinkedList* - list_cons(void* head, LinkedList* tail) - { - LinkedList* cell; -@@ -53,7 +53,7 @@ - - /* Return the length of a list, list_length(NULL) returns zero */ - --inline int -+int - list_length(LinkedList* list) - { - int i = 0; -@@ -68,7 +68,7 @@ - /* Return the Nth element of LIST, where N count from zero. If N - larger than the list length, NULL is returned */ - --inline void* -+void* - list_nth(int index, LinkedList* list) - { - while(index-- != 0) -@@ -83,7 +83,7 @@ - - /* Remove the element at the head by replacing it by its successor */ - --inline void -+void - list_remove_head(LinkedList** list) - { - if (!*list) return; -@@ -103,7 +103,7 @@ - - /* Remove the element with `car' set to ELEMENT */ - /* --inline void -+void - list_remove_elem(LinkedList** list, void* elem) - { - while (*list) -@@ -114,7 +114,7 @@ - } - }*/ - --inline LinkedList * -+LinkedList * - list_remove_elem(LinkedList* list, void* elem) - { - LinkedList *tmp; -@@ -134,7 +134,7 @@ - - /* Return element that has ELEM as car */ - --inline LinkedList* -+LinkedList* - list_find(LinkedList* list, void* elem) - { - while(list) -@@ -148,7 +148,7 @@ - - /* Free list (backwards recursive) */ - --inline void -+void - list_free(LinkedList* list) - { - if(list) -@@ -160,7 +160,7 @@ - - /* Map FUNCTION over all elements in LIST */ - --inline void -+void - list_mapcar(LinkedList* list, void(*function)(void*)) - { - while(list) -diff -Naur wmgeneral.orig/list.h wmgeneral/list.h ---- wmgeneral.orig/list.h 2016-01-04 13:18:09.361133006 +0100 -+++ wmgeneral/list.h 2016-01-04 13:18:26.007138577 +0100 -@@ -36,20 +36,20 @@ - struct LinkedList *tail; - } LinkedList; - --inline LinkedList* list_cons(void* head, LinkedList* tail); -+LinkedList* list_cons(void* head, LinkedList* tail); - --inline int list_length(LinkedList* list); -+int list_length(LinkedList* list); - --inline void* list_nth(int index, LinkedList* list); -+void* list_nth(int index, LinkedList* list); - --inline void list_remove_head(LinkedList** list); -+void list_remove_head(LinkedList** list); - --inline LinkedList *list_remove_elem(LinkedList* list, void* elem); -+LinkedList *list_remove_elem(LinkedList* list, void* elem); - --inline void list_mapcar(LinkedList* list, void(*function)(void*)); -+void list_mapcar(LinkedList* list, void(*function)(void*)); - --inline LinkedList*list_find(LinkedList* list, void* elem); -+LinkedList*list_find(LinkedList* list, void* elem); - --inline void list_free(LinkedList* list); -+void list_free(LinkedList* list); - - #endif diff --git a/x11-plugins/wmpasman/files/wmpasman-2.2-ar.patch b/x11-plugins/wmpasman/files/wmpasman-2.2-ar.patch new file mode 100644 index 000000000000..8244fadd7c5b --- /dev/null +++ b/x11-plugins/wmpasman/files/wmpasman-2.2-ar.patch @@ -0,0 +1,11 @@ +diff -Naur wmpasman-2.2.orig/configure.ac wmpasman-2.2/configure.ac +--- wmpasman-2.2.orig/configure.ac 2018-12-16 17:39:47.000000000 +0100 ++++ wmpasman-2.2/configure.ac 2021-01-03 00:17:27.934691093 +0100 +@@ -9,6 +9,7 @@ + AC_SUBST(VERSION) + + # Checks for programs. ++AM_PROG_AR + AC_PROG_AWK + AC_PROG_CC + AC_PROG_CC_STDC diff --git a/x11-plugins/wmpasman/wmpasman-2.2.ebuild b/x11-plugins/wmpasman/wmpasman-2.2.ebuild index fea3eb770322..04ba57ef0952 100644 --- a/x11-plugins/wmpasman/wmpasman-2.2.ebuild +++ b/x11-plugins/wmpasman/wmpasman-2.2.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit autotools DESCRIPTION="Password storage/retrieval in a dockapp" HOMEPAGE="https://sourceforge.net/projects/wmpasman/" @@ -18,3 +19,10 @@ DEPEND="${RDEPEND} virtual/pkgconfig" DOCS="ChangeLog WARNINGS" + +PATCHES=( "${FILESDIR}"/${P}-ar.patch ) + +src_prepare() { + default + eautoreconf +} diff --git a/x11-plugins/wmpower/files/wmpower-0.4.3-ar.patch b/x11-plugins/wmpower/files/wmpower-0.4.3-ar.patch new file mode 100644 index 000000000000..b59fcf6bbe38 --- /dev/null +++ b/x11-plugins/wmpower/files/wmpower-0.4.3-ar.patch @@ -0,0 +1,11 @@ +diff -Naur wmpower-0.4.3.orig/configure.in wmpower-0.4.3/configure.in +--- wmpower-0.4.3.orig/configure.in 2008-11-25 11:05:58.000000000 +0100 ++++ wmpower-0.4.3/configure.in 2021-01-03 00:30:15.977692665 +0100 +@@ -3,6 +3,7 @@ + AC_CONFIG_SRCDIR(src/wmpower.c) + AM_INIT_AUTOMAKE([1.7 check-news dist-bzip2]) + ++AM_PROG_AR + AC_GNU_SOURCE + AC_PROG_INSTALL + AC_PROG_CC diff --git a/x11-plugins/wmpower/wmpower-0.4.3-r1.ebuild b/x11-plugins/wmpower/wmpower-0.4.3-r1.ebuild index b3fe60697fe6..851ba37873b1 100644 --- a/x11-plugins/wmpower/wmpower-0.4.3-r1.ebuild +++ b/x11-plugins/wmpower/wmpower-0.4.3-r1.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit autotools DESCRIPTION="a dockapp to get/set power management status for laptops (APM, ACPI and CPUfreq)" @@ -18,10 +19,18 @@ RDEPEND="x11-libs/libX11 DEPEND="${RDEPEND} x11-base/xorg-proto" -PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch ) +PATCHES=( + "${FILESDIR}"/${P}-gcc-10.patch + "${FILESDIR}"/${P}-ar.patch + ) DOCS=( AUTHORS BUGS ChangeLog LEGGIMI NEWS README README.compal THANKS TODO ) +src_prepare() { + default + eautoreconf +} + src_configure() { # override wmpower self-calculated cflags econf MY_CFLAGS="${CFLAGS}" diff --git a/x11-plugins/wmsystemtray/files/wmsystemtray-1.4-ar.patch b/x11-plugins/wmsystemtray/files/wmsystemtray-1.4-ar.patch new file mode 100644 index 000000000000..785893a989fd --- /dev/null +++ b/x11-plugins/wmsystemtray/files/wmsystemtray-1.4-ar.patch @@ -0,0 +1,11 @@ +diff -Naur wmsystemtray-1.4.orig/configure.ac wmsystemtray-1.4/configure.ac +--- wmsystemtray-1.4.orig/configure.ac 2014-02-23 03:14:09.000000000 +0100 ++++ wmsystemtray-1.4/configure.ac 2021-01-03 00:23:12.004713692 +0100 +@@ -9,6 +9,7 @@ + AC_SUBST(VERSION) + + # Checks for programs. ++AM_PROG_AR + AC_PROG_AWK + AC_PROG_CC + AC_PROG_CC_STDC diff --git a/x11-plugins/wmsystemtray/wmsystemtray-1.4-r2.ebuild b/x11-plugins/wmsystemtray/wmsystemtray-1.4-r2.ebuild index 568d2c1936e0..47d0230996a8 100644 --- a/x11-plugins/wmsystemtray/wmsystemtray-1.4-r2.ebuild +++ b/x11-plugins/wmsystemtray/wmsystemtray-1.4-r2.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit autotools DESCRIPTION="a system tray dockapp with the ability to display more than just four tray icons" HOMEPAGE="https://sourceforge.net/projects/wmsystemtray/" @@ -16,3 +17,10 @@ DEPEND="x11-libs/libXext x11-libs/libXmu x11-libs/libXpm" RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-ar.patch ) + +src_prepare() { + default + eautoreconf +} diff --git a/x11-plugins/wmweather+/files/wmweather+-2.18-ar.patch b/x11-plugins/wmweather+/files/wmweather+-2.18-ar.patch new file mode 100644 index 000000000000..f87fdfa0ef08 --- /dev/null +++ b/x11-plugins/wmweather+/files/wmweather+-2.18-ar.patch @@ -0,0 +1,11 @@ +diff -Naur wmweather+-2.18.orig/configure.ac wmweather+-2.18/configure.ac +--- wmweather+-2.18.orig/configure.ac 2020-04-24 20:31:43.000000000 +0200 ++++ wmweather+-2.18/configure.ac 2021-01-03 00:25:30.443705781 +0100 +@@ -18,6 +18,7 @@ + AC_SUBST(WMGENERAL_GUI) + + # Checks for programs. ++AM_PROG_AR + AC_PROG_AWK + AC_PROG_CC + AC_PROG_CC_STDC diff --git a/x11-plugins/wmweather+/wmweather+-2.18.ebuild b/x11-plugins/wmweather+/wmweather+-2.18.ebuild index 01b450a84cce..7dffde689df7 100644 --- a/x11-plugins/wmweather+/wmweather+-2.18.ebuild +++ b/x11-plugins/wmweather+/wmweather+-2.18.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit autotools DESCRIPTION="A dockapp for displaying data collected from METAR, AVN, ETA, and MRF forecasts" HOMEPAGE="https://www.sourceforge.net/projects/wmweatherplus/" @@ -19,3 +20,10 @@ DEPEND="dev-libs/libpcre x11-libs/libX11 x11-wm/windowmaker" RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-ar.patch ) + +src_prepare() { + default + eautoreconf +} |