From a70f42c65202d88c203c40910fef8f96f333d1ee Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 2 Jan 2018 14:45:16 +0000 Subject: gentoo resync : 02.01.2018 --- x11-plugins/Manifest.gz | Bin 32412 -> 32227 bytes x11-plugins/enigmail/Manifest | 9 -- x11-plugins/enigmail/enigmail-1.9.6.1-r1.ebuild | 56 -------- x11-plugins/enigmail/enigmail-1.9.8.1.ebuild | 56 -------- x11-plugins/enigmail/enigmail-1.9.8.2.ebuild | 56 -------- x11-plugins/enigmail/enigmail-1.9.8.3-r1.ebuild | 74 ----------- x11-plugins/enigmail/enigmail-1.9.8.3.ebuild | 56 -------- x11-plugins/qled/Manifest | 3 - x11-plugins/qled/metadata.xml | 8 -- x11-plugins/qled/qled-0.6.2.ebuild | 23 ---- x11-plugins/wmcpuwatch/Manifest | 3 +- .../wmcpuwatch/files/wmcpuwatch-0.2-cmake.patch | 33 +++++ x11-plugins/wmcpuwatch/wmcpuwatch-0.2-r1.ebuild | 31 +++++ x11-plugins/wmcpuwatch/wmcpuwatch-0.2.ebuild | 17 --- x11-plugins/wmcube/Manifest | 1 - x11-plugins/wmcube/files/wmcube-0.98-list.patch | 127 ------------------- x11-plugins/wmload/Manifest | 3 - x11-plugins/wmload/files/wmload-0.9.2-prefix.patch | 11 -- .../files/wmload-ComplexProgramTargetNoMan.patch | 8 -- x11-plugins/wmload/files/wmload.solaris.patch | 141 --------------------- x11-plugins/wmtz/Manifest | 2 - x11-plugins/wmtz/files/wmtz-0.7-list.patch | 127 ------------------- x11-plugins/wmtz/files/wmtz-0.7.patch | 48 ------- 23 files changed, 66 insertions(+), 827 deletions(-) delete mode 100644 x11-plugins/enigmail/enigmail-1.9.6.1-r1.ebuild delete mode 100644 x11-plugins/enigmail/enigmail-1.9.8.1.ebuild delete mode 100644 x11-plugins/enigmail/enigmail-1.9.8.2.ebuild delete mode 100644 x11-plugins/enigmail/enigmail-1.9.8.3-r1.ebuild delete mode 100644 x11-plugins/enigmail/enigmail-1.9.8.3.ebuild delete mode 100644 x11-plugins/qled/Manifest delete mode 100644 x11-plugins/qled/metadata.xml delete mode 100644 x11-plugins/qled/qled-0.6.2.ebuild create mode 100644 x11-plugins/wmcpuwatch/files/wmcpuwatch-0.2-cmake.patch create mode 100644 x11-plugins/wmcpuwatch/wmcpuwatch-0.2-r1.ebuild delete mode 100644 x11-plugins/wmcpuwatch/wmcpuwatch-0.2.ebuild delete mode 100644 x11-plugins/wmcube/files/wmcube-0.98-list.patch delete mode 100644 x11-plugins/wmload/files/wmload-0.9.2-prefix.patch delete mode 100644 x11-plugins/wmload/files/wmload-ComplexProgramTargetNoMan.patch delete mode 100644 x11-plugins/wmload/files/wmload.solaris.patch delete mode 100644 x11-plugins/wmtz/files/wmtz-0.7-list.patch delete mode 100644 x11-plugins/wmtz/files/wmtz-0.7.patch (limited to 'x11-plugins') diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz index 3bfd76510e84..efed959fb2ba 100644 Binary files a/x11-plugins/Manifest.gz and b/x11-plugins/Manifest.gz differ diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest index adf38ea4cad1..3e29d49fefa0 100644 --- a/x11-plugins/enigmail/Manifest +++ b/x11-plugins/enigmail/Manifest @@ -1,13 +1,4 @@ -DIST enigmail-1.9.6.1.tar.gz 1745021 BLAKE2B 0fdc1e2e3f16491759cb360593e2132524150b34bb30234d520802f30aef8869367ac9a6e9fe75722ac2aa9a60dbf4ffb71293a07f8d460ea3672e78a8cb6772 SHA512 e6ab69734a39a4953e0167e07b06f0d5c83fb42956515392319a1cd9d665ca274f6a12b4141e2dfa373ef074f0526f3d7330a48d29d600fc38f724d26518ff84 -DIST enigmail-1.9.8.1.tar.gz 1776673 BLAKE2B 9a8251ced15ee4feeceafc3ee261f877886783428224dcb1616e411864f70f6fd822503ba82ebe9fe61462cb25baabda6c5cf65ff8738a53719b7e212eca8e78 SHA512 af280040e96eb69529e723e52e65621e42743c974b0ed42598e73458004f0a59688da7257d2b556e95a56c4cad3ac48f527d4d9a7a54c9c92eaff132257e0cfd -DIST enigmail-1.9.8.2.tar.gz 1776792 BLAKE2B 901bc4d735c461e1fad39bc7f2a613eac6c087af5053f7d15ee80fdef790c4a022cffd8972dbd2570d39e9f51ac29db287ed6c04745f36f07b93312401262cc5 SHA512 4db069752a8251f4989ab9736600b83f005a066f99b2830add088514d0afec69871c998c148535e5dc212d3635c35990a90161a47c18398805e1c51497263431 -DIST enigmail-1.9.8.3.tar.gz 1776756 BLAKE2B 3de3c81b5bd1c79583ea32f79c3654337417f42f1cd11ee7df5e6b1064144eac584ba8d7368834910b9e460deb9c2d150940efdcef61c5f67803067201049e6e SHA512 d8c08b1824352353c7596750b801604f7216bc5a138563b1fbd5fb890901e9c7c03cb2df099c9158d6bf3125fa17c900f65fb21bc40a8ced67a6812cdc0e02d9 DIST enigmail-1.9.9.tar.gz 1787556 BLAKE2B 729cf7e404b4cc5d964df476e627b476916cd6c834ce5f220a26738bc32eabbd9fd2c4c3cbaccef6e1d8c4b5b7313b54278a4170808f8b722443b338fda87b55 SHA512 39b37305362c88527d897ed95aa9d8457137d5f026359d19b838ab9df531c14099e157afdc8fefae78a6fa2ddded8dbfbeaf84eb91ac6cfbb05ae808731da2cb -EBUILD enigmail-1.9.6.1-r1.ebuild 1302 BLAKE2B 2d553c9ca2a117f39c2aea293a57f61371c13100147ad85b24217ebd7c75d779bfa3c1d5a6c5d69683e02416c308ca56ae985bd61f2d5d633d5805fdd1bfcf6f SHA512 a62356a3ea2dc1d7befb86548f41e47d89a0f838088c0467879a4b2304695bbee52ce5dc4478323b266cfe747c4ac86eeb971a8125a091232948d2d2d5a6bea7 -EBUILD enigmail-1.9.8.1.ebuild 1302 BLAKE2B 2d553c9ca2a117f39c2aea293a57f61371c13100147ad85b24217ebd7c75d779bfa3c1d5a6c5d69683e02416c308ca56ae985bd61f2d5d633d5805fdd1bfcf6f SHA512 a62356a3ea2dc1d7befb86548f41e47d89a0f838088c0467879a4b2304695bbee52ce5dc4478323b266cfe747c4ac86eeb971a8125a091232948d2d2d5a6bea7 -EBUILD enigmail-1.9.8.2.ebuild 1306 BLAKE2B 9f835cf1b1f4c9fea8ffb1e146ef1ffab92310e4ff4a3ff2c15abee6795abea636256596eccd8e355eea1215c68083ab34deb951285bfc3875014142af79c8f4 SHA512 97c14d79f519aba74d595ab4df7a65fcff86ad27cc2027def749fec4f04c5a46a6f513cb005dc23c71fb7dca729662b0eaaa1366efba2c202beb728f725e7402 -EBUILD enigmail-1.9.8.3-r1.ebuild 1924 BLAKE2B 9bbca182873498d5623a40d8355560c246358be1a404fc1cf97502e15a683ba99e9abba6be590b47176fdc880a082d718a0055a136e9a5bb70a038dc80dd1720 SHA512 daaccfd03847c51ab76dfb3327dadddae920cdd4cc1a493ab65e68997a7210a01e300ba1269b5f469ff533e9bef1cdd72309bbcc4f7730ee603d785be97be4f2 -EBUILD enigmail-1.9.8.3.ebuild 1306 BLAKE2B 9f835cf1b1f4c9fea8ffb1e146ef1ffab92310e4ff4a3ff2c15abee6795abea636256596eccd8e355eea1215c68083ab34deb951285bfc3875014142af79c8f4 SHA512 97c14d79f519aba74d595ab4df7a65fcff86ad27cc2027def749fec4f04c5a46a6f513cb005dc23c71fb7dca729662b0eaaa1366efba2c202beb728f725e7402 EBUILD enigmail-1.9.9.ebuild 1922 BLAKE2B 91c9d28229704a6fc1b529a3b9948c3b4b32e097a2f9ec4d44e9e036ad2b7615314c1cf14120e536304cfb43c3ce0d71a6e327f92992c4f79b51ad484ffad6dd SHA512 b2e8dd3b86c1aaf37954c067bdaae67217f7446317817af837f9a2affd4c886d0e3d3b81b10f402105cd54a4534449a86ebe69673024367a34467fea400b6cba EBUILD enigmail-9999.ebuild 1915 BLAKE2B ccff9cc03869ccc02a313a3f96cdf25081424b295e03dca6f6a69449da99013708efc20fd5141e61cff2b68640d466a6141a60df51b29803c4ac11a47eebdcd6 SHA512 4b8c948bf8aef1eb2d2a422ee66d8ad0df4a0ef312ca7c16dbe12654b0bcc504e3882bbd258e5630a0e51977f14028b059940b47fb464bb7534daf47d6270374 MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b diff --git a/x11-plugins/enigmail/enigmail-1.9.6.1-r1.ebuild b/x11-plugins/enigmail/enigmail-1.9.6.1-r1.ebuild deleted file mode 100644 index f10b469ea882..000000000000 --- a/x11-plugins/enigmail/enigmail-1.9.6.1-r1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit python-any-r1 - -DESCRIPTION="Mozilla extension to provide GPG support in mail clients" -HOMEPAGE="http://www.enigmail.net/" - -KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux" -SLOT="0" -LICENSE="MPL-2.0 GPL-3" -IUSE="" -SRC_URI="http://www.enigmail.net/download/source/${P}.tar.gz" - -RDEPEND="|| ( - ( >=app-crypt/gnupg-2.0 - || ( - app-crypt/pinentry[gtk(-)] - app-crypt/pinentry[qt4(-)] - app-crypt/pinentry[qt5(-)] - ) - ) - =app-crypt/gnupg-1.4* - )" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - app-arch/zip - dev-lang/perl - " - -S="${WORKDIR}/${PN}" - -src_compile() { - emake ipc public ui package lang - emake xpi - -} - -src_install() { - insinto /usr/share/${PN} - doins -r build/dist/{chrome,components,defaults,modules,wrappers,chrome.manifest,install.rdf} -} - -pkg_postinst() { - local peimpl=$(eselect --brief --colour=no pinentry show) - case "${peimpl}" in - *gtk*|*qt*) ;; - *) ewarn "The pinentry front-end currently selected is not one supported by thunderbird." - ewarn "You may be prompted for your password in an inaccessible shell!!" - ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end" - ;; - esac -} diff --git a/x11-plugins/enigmail/enigmail-1.9.8.1.ebuild b/x11-plugins/enigmail/enigmail-1.9.8.1.ebuild deleted file mode 100644 index f10b469ea882..000000000000 --- a/x11-plugins/enigmail/enigmail-1.9.8.1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit python-any-r1 - -DESCRIPTION="Mozilla extension to provide GPG support in mail clients" -HOMEPAGE="http://www.enigmail.net/" - -KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux" -SLOT="0" -LICENSE="MPL-2.0 GPL-3" -IUSE="" -SRC_URI="http://www.enigmail.net/download/source/${P}.tar.gz" - -RDEPEND="|| ( - ( >=app-crypt/gnupg-2.0 - || ( - app-crypt/pinentry[gtk(-)] - app-crypt/pinentry[qt4(-)] - app-crypt/pinentry[qt5(-)] - ) - ) - =app-crypt/gnupg-1.4* - )" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - app-arch/zip - dev-lang/perl - " - -S="${WORKDIR}/${PN}" - -src_compile() { - emake ipc public ui package lang - emake xpi - -} - -src_install() { - insinto /usr/share/${PN} - doins -r build/dist/{chrome,components,defaults,modules,wrappers,chrome.manifest,install.rdf} -} - -pkg_postinst() { - local peimpl=$(eselect --brief --colour=no pinentry show) - case "${peimpl}" in - *gtk*|*qt*) ;; - *) ewarn "The pinentry front-end currently selected is not one supported by thunderbird." - ewarn "You may be prompted for your password in an inaccessible shell!!" - ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end" - ;; - esac -} diff --git a/x11-plugins/enigmail/enigmail-1.9.8.2.ebuild b/x11-plugins/enigmail/enigmail-1.9.8.2.ebuild deleted file mode 100644 index ff5e7f5079a3..000000000000 --- a/x11-plugins/enigmail/enigmail-1.9.8.2.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit python-any-r1 - -DESCRIPTION="Mozilla extension to provide GPG support in mail clients" -HOMEPAGE="http://www.enigmail.net/" - -KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" -SLOT="0" -LICENSE="MPL-2.0 GPL-3" -IUSE="" -SRC_URI="http://www.enigmail.net/download/source/${P}.tar.gz" - -RDEPEND="|| ( - ( >=app-crypt/gnupg-2.0 - || ( - app-crypt/pinentry[gtk(-)] - app-crypt/pinentry[qt4(-)] - app-crypt/pinentry[qt5(-)] - ) - ) - =app-crypt/gnupg-1.4* - )" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - app-arch/zip - dev-lang/perl - " - -S="${WORKDIR}/${PN}" - -src_compile() { - emake ipc public ui package lang - emake xpi - -} - -src_install() { - insinto /usr/share/${PN} - doins -r build/dist/{chrome,components,defaults,modules,wrappers,chrome.manifest,install.rdf} -} - -pkg_postinst() { - local peimpl=$(eselect --brief --colour=no pinentry show) - case "${peimpl}" in - *gtk*|*qt*) ;; - *) ewarn "The pinentry front-end currently selected is not one supported by thunderbird." - ewarn "You may be prompted for your password in an inaccessible shell!!" - ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end" - ;; - esac -} diff --git a/x11-plugins/enigmail/enigmail-1.9.8.3-r1.ebuild b/x11-plugins/enigmail/enigmail-1.9.8.3-r1.ebuild deleted file mode 100644 index 03f1324ee127..000000000000 --- a/x11-plugins/enigmail/enigmail-1.9.8.3-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit python-any-r1 - -DESCRIPTION="Mozilla extension to provide GPG support in mail clients" -HOMEPAGE="http://www.enigmail.net/" - -KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux" -SLOT="0" -LICENSE="MPL-2.0 GPL-3" -IUSE="" -SRC_URI="http://www.enigmail.net/download/source/${P}.tar.gz" - -RDEPEND="|| ( - ( >=app-crypt/gnupg-2.0 - || ( - app-crypt/pinentry[gtk(-)] - app-crypt/pinentry[qt4(-)] - app-crypt/pinentry[qt5(-)] - ) - ) - =app-crypt/gnupg-1.4* - ) - !/!d; s/.*\({.*}\).*/\1/; p; q' build/dist/install.rdf) - [[ -n ${emid} ]] || die "Could not scrape EM:ID from install.rdf" - - mv build/enigmail*.xpi build/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID' - - # thunderbird - insinto "/usr/share/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}" - doins build/"${emid}.xpi" - - # seamonkey - insinto "/usr/share/mozilla/extensions/{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}" - doins build/"${emid}.xpi" -} - -pkg_postinst() { - local peimpl=$(eselect --brief --colour=no pinentry show) - case "${peimpl}" in - *gtk*|*qt*) ;; - *) ewarn "The pinentry front-end currently selected is not one supported by thunderbird." - ewarn "You may be prompted for your password in an inaccessible shell!!" - ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end" - ;; - esac - if [[ -n ${REPLACING_VERSIONS} ]]; then - elog "" - elog "Please restart thunderbird and/or seamonkey in order for them to use" - elog "the newly installed version of enigmail." - fi -} diff --git a/x11-plugins/enigmail/enigmail-1.9.8.3.ebuild b/x11-plugins/enigmail/enigmail-1.9.8.3.ebuild deleted file mode 100644 index ff5e7f5079a3..000000000000 --- a/x11-plugins/enigmail/enigmail-1.9.8.3.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit python-any-r1 - -DESCRIPTION="Mozilla extension to provide GPG support in mail clients" -HOMEPAGE="http://www.enigmail.net/" - -KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" -SLOT="0" -LICENSE="MPL-2.0 GPL-3" -IUSE="" -SRC_URI="http://www.enigmail.net/download/source/${P}.tar.gz" - -RDEPEND="|| ( - ( >=app-crypt/gnupg-2.0 - || ( - app-crypt/pinentry[gtk(-)] - app-crypt/pinentry[qt4(-)] - app-crypt/pinentry[qt5(-)] - ) - ) - =app-crypt/gnupg-1.4* - )" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - app-arch/zip - dev-lang/perl - " - -S="${WORKDIR}/${PN}" - -src_compile() { - emake ipc public ui package lang - emake xpi - -} - -src_install() { - insinto /usr/share/${PN} - doins -r build/dist/{chrome,components,defaults,modules,wrappers,chrome.manifest,install.rdf} -} - -pkg_postinst() { - local peimpl=$(eselect --brief --colour=no pinentry show) - case "${peimpl}" in - *gtk*|*qt*) ;; - *) ewarn "The pinentry front-end currently selected is not one supported by thunderbird." - ewarn "You may be prompted for your password in an inaccessible shell!!" - ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end" - ;; - esac -} diff --git a/x11-plugins/qled/Manifest b/x11-plugins/qled/Manifest deleted file mode 100644 index e085bb6a5ad9..000000000000 --- a/x11-plugins/qled/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST 72482-QLed-0.6.2.zip 720788 BLAKE2B ae03e4d1c7bb77a8b06f1762c6d022cdea868bf81d4ea30fd6ac9a1bc62b29a2ba5fb9a2f3e73f091b8e39a09db89b8c28b270e1d2d1191963a76b562f5ec6f1 SHA512 407df6b873b3b846d53847f96d145cbfb62a9878bdd3bc0c7157cd8f8a7e0ecdd903061059ab37dc62ad7c909483d94c540505f295761debe9727579fcb35cd1 -EBUILD qled-0.6.2.ebuild 546 BLAKE2B b462a4ae36de7ec30476ed219c01092c06cc2e2fc64c522b533a88f3042d2736cc35ff622bde6faa671af69738505876dcd9c0674aa8a64c663db73823226c28 SHA512 37c4fd42f8a2dd4ee3d7efc553df5a4a768ff41cf478100d90062e1333525ccdabb6792e3783b269827d8d7649577d5f76f84f9cf19c0d1a630416e49f441f98 -MISC metadata.xml 244 BLAKE2B c4578615fd9f129ba63401a677b05631e811fc780e4c1f3e95ad1da14adb53c59705683a04a0ad1e54ec8ae3730b412d77ecd844b664272ff22c27dd00aafe53 SHA512 c0661c87a34d45258dc8236baf4e1fd4fcb3f418f4a6bb13670ae91141c7474ea8d423cb7df3c8f45cc4441e22783e6ceb807a84ccb8a75c574ea079f8a02117 diff --git a/x11-plugins/qled/metadata.xml b/x11-plugins/qled/metadata.xml deleted file mode 100644 index 2028cee3c389..000000000000 --- a/x11-plugins/qled/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - -hwoarang@gentoo.org -Markos Chandras - - diff --git a/x11-plugins/qled/qled-0.6.2.ebuild b/x11-plugins/qled/qled-0.6.2.ebuild deleted file mode 100644 index 60a382ce2f2e..000000000000 --- a/x11-plugins/qled/qled-0.6.2.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=3 - -inherit qt4-r2 - -MY_PN="QLed" -MY_P="${MY_PN}-${PV}" -DESCRIPTION="Custom Led widget plugin for Qt-Designer" -HOMEPAGE="http://qt-apps.org/content/show.php?content=72482" -SRC_URI="http://qt-apps.org/CONTENT/content-files/72482-${MY_P}.zip" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND=" - || ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) - #include - #include -+#ifdef sun -+#include -+#include -+#include -+#endif - - #include "back.xpm" - #include "mask2.xbm" -@@ -214,7 +219,7 @@ - NormalGC = XCreateGC(dpy, Root, gcm, &gcv); - - if (ONLYSHAPE) { /* try to make shaped window here */ -- pixmask = XCreateBitmapFromData(dpy, win, mask2_bits, mask2_width, -+ pixmask = XCreateBitmapFromData(dpy, win, (char *)mask2_bits, mask2_width, - mask2_height); - XShapeCombineMask(dpy, win, ShapeBounding, 0, 0, pixmask, ShapeSet); - XShapeCombineMask(dpy, iconwin, ShapeBounding, 0, 0, pixmask, ShapeSet); -@@ -410,6 +415,107 @@ - return (char *)p; - } - -+#ifdef sun -+ -+static kstat_ctl_t *kc; -+static kstat_t **cpu_ksp_list; -+static int ncpus; -+ -+void -+cpu_stats_init() -+{ -+ int i = 0; -+ kstat_t *ksp; -+ static int kstats_ready = 0; -+ -+ if (!kstats_ready) { -+ if ((kc = kstat_open()) == NULL) { -+ fprintf(stderr,"wmload: can't open /dev/kstat\n"); -+ exit (1); -+ } -+ kstats_ready = 1; -+ } -+ -+ for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) { -+ if (strcmp(ksp->ks_module, "cpu_stat") == 0) -+ i++; -+ } -+ -+ if (cpu_ksp_list) { -+ free(cpu_ksp_list); -+ } -+ cpu_ksp_list = (kstat_t **) calloc(i * sizeof (kstat_t *), 1); -+ ncpus = i; -+ -+ /* -+ * stash the ksp for each CPU. -+ */ -+ i = 0; -+ for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) { -+ if (strcmp(ksp->ks_module, "cpu_stat") == 0) { -+ cpu_ksp_list[i] = ksp; -+ i++; -+ } -+ } -+} -+ -+int -+get_cpu_stats() -+{ -+ int i; -+ cpu_stat_t stat; -+ static int firsttime = 1; -+ -+ if (firsttime) { -+ firsttime = 0; -+ return (1); /* force code to go initialize kstat stuff */ -+ } -+ -+ /* -+ * Read each cpu's data. If the chain has changed (a state change -+ * has happened, maybe a new cpu was added to the system), then -+ * return 1. This will cause the code to reinitialize the cpu_ksp_list -+ * array. word. -+ */ -+ cp_time[0] = cp_time[1] = cp_time[2] = cp_time[3] = 0; -+ for (i = 0; i < ncpus; i++) { -+ if (kstat_read(kc, cpu_ksp_list[i], (void *) &stat) == -1) -+ return (1); -+ cp_time[0] += stat.cpu_sysinfo.cpu[CPU_USER]; /* user */ -+ cp_time[1] += stat.cpu_sysinfo.cpu[CPU_WAIT]; /* "nice" */ -+ cp_time[2] += stat.cpu_sysinfo.cpu[CPU_KERNEL]; /* sys */ -+ cp_time[3] += stat.cpu_sysinfo.cpu[CPU_IDLE]; /* idle ("free")*/ -+ } -+ return (0); -+} -+ -+void GetLoad(int Maximum, int *usr, int *nice, int *sys, int *free) -+{ -+ int total; -+ -+ while (get_cpu_stats() != 0) { -+ cpu_stats_init(); -+ } -+ -+ *usr = cp_time[0] - last[0]; -+ *nice = cp_time[1] - last[1]; -+ *sys = cp_time[2] - last[2]; -+ *free = cp_time[3] - last[3]; -+ -+ /* printf("[%d %d %d %d]\n", *usr, *nice, *sys, *free); */ -+ -+ total = *usr + *nice + *sys + *free; -+ last[0] = cp_time[0]; -+ last[1] = cp_time[1]; -+ last[2] = cp_time[2]; -+ last[3] = cp_time[3]; -+ -+ *usr = rint(Maximum * (float)(*usr) /total); -+ *nice =rint(Maximum * (float)(*nice) /total); -+ *sys = rint(Maximum * (float)(*sys) /total); -+ *free = rint(Maximum * (float)(*free) /total); -+} -+#else /* sun */ - void GetLoad(int Maximum, int *usr, int *nice, int *sys, int *free) - { - char buffer[100];/*[4096+1];*/ -@@ -445,6 +551,7 @@ - *sys = rint(Maximum * (float)(*sys) /total); - *free = rint(Maximum * (float)(*free) /total); - } -+#endif - - void InsertLoad() - { diff --git a/x11-plugins/wmtz/Manifest b/x11-plugins/wmtz/Manifest index c7452fdfebaa..8d0c467fa0fd 100644 --- a/x11-plugins/wmtz/Manifest +++ b/x11-plugins/wmtz/Manifest @@ -1,5 +1,3 @@ -AUX wmtz-0.7-list.patch 2918 BLAKE2B 393e76edcefa54d814229cc2d8d21556d7437580c1a226d454470175de6ad1e9a688555aabdc60aaa328d578b4d04b300e64ae431efe9d7680400118d52116d5 SHA512 2a6da4a9b676ea51bbcc400b3255f3c10240db13fd6da46921f6c91d5529ecf50120e195b815e58a1b0a8bad81a944e8da3cba261a69579f36165f35ad23f144 -AUX wmtz-0.7.patch 1305 BLAKE2B 13b09b49fda781a04e73a29d56dc87e1aec8a71a4ea643d49797fb15c2b6eecd390d02885c9fbdb17e5614285ddc7831f4d1c75b9fb58976aefe4aeb78c05bff SHA512 4e04a1a95d39ebe9982d4f26acf827fbbeb953f4dcc695c5b39dcb46423bd9d58336838a3d8a28af142b9a5391625a6965ece158b735514adce4438afa662194 DIST wmtz-0.7_p20150816.tar.gz 19310 BLAKE2B 7f3bc0b077a9a667211cc588f1fb7c3d1d246256724a6cf5a17f028d2d334d02f898a798aca6fae11910868d312844bbe8ac5bfd190229f3ae829e97e50e2247 SHA512 60c9b66423332b155ce262d30026a5091c0379eb3257f547af1203d331968e9f334a533ed03832476512893d06cea857db9c044b30115978904510f9725e8455 EBUILD wmtz-0.7_p20150816.ebuild 909 BLAKE2B 1779da6b58b351f016470ae11fe49c583be86456f19c26c0a2d46a4d8d43c0afc0984db1a002004522686cacff9d0819339b1d7bea81ac16a97b76bf256c1dc0 SHA512 ac4cab3641b4e772f945afb41694c88d9d8a7a28bf44b91e42af6997d2ed9ff49c4ef1c9aa8fcafb8607d474e70a54471ec4c6023e131a846c3fc2601b05feec MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d diff --git a/x11-plugins/wmtz/files/wmtz-0.7-list.patch b/x11-plugins/wmtz/files/wmtz-0.7-list.patch deleted file mode 100644 index 1b1ac317669e..000000000000 --- a/x11-plugins/wmtz/files/wmtz-0.7-list.patch +++ /dev/null @@ -1,127 +0,0 @@ -diff -Naur wmgeneral.orig/list.c wmgeneral/list.c ---- wmgeneral.orig/list.c 2016-01-04 13:28:36.583339716 +0100 -+++ wmgeneral/list.c 2016-01-04 13:28:48.694343645 +0100 -@@ -38,7 +38,7 @@ - - /* Return a cons cell produced from (head . tail) - --INLINE LinkedList* -+LinkedList* - list_cons(void* head, LinkedList* tail) - { - LinkedList* cell; -@@ -51,7 +51,7 @@ - - /* Return the length of a list, list_length(NULL) returns zero - --INLINE int -+int - list_length(LinkedList* list) - { - int i = 0; -@@ -66,7 +66,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) -@@ -81,7 +81,7 @@ - - /* Remove the element at the head by replacing it by its successor - --INLINE void -+void - list_remove_head(LinkedList** list) - { - if (!*list) return; -@@ -101,7 +101,7 @@ - - /* Remove the element with `car' set to ELEMENT - /* --INLINE void -+void - list_remove_elem(LinkedList** list, void* elem) - { - while (*list) -@@ -112,7 +112,7 @@ - } - - --INLINE LinkedList * -+LinkedList * - list_remove_elem(LinkedList* list, void* elem) - { - LinkedList *tmp; -@@ -132,7 +132,7 @@ - - /* Return element that has ELEM as car - --INLINE LinkedList* -+LinkedList* - list_find(LinkedList* list, void* elem) - { - while(list) -@@ -146,7 +146,7 @@ - - /* Free list (backwards recursive) - --INLINE void -+void - list_free(LinkedList* list) - { - if(list) -@@ -158,7 +158,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:28:36.583339716 +0100 -+++ wmgeneral/list.h 2016-01-04 13:28:39.471340654 +0100 -@@ -29,31 +29,25 @@ - #ifndef __LIST_H_ - #define __LIST_H_ - --#if defined(__GNUC__) && !defined(__STRICT_ANSI__) --# define INLINE inline --#else --# define INLINE --#endif -- - typedef struct LinkedList { - void *head; - 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/wmtz/files/wmtz-0.7.patch b/x11-plugins/wmtz/files/wmtz-0.7.patch deleted file mode 100644 index adb5c68f1b6c..000000000000 --- a/x11-plugins/wmtz/files/wmtz-0.7.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -ur wmtz-0.7.orig/wmtz/Makefile wmtz-0.7/wmtz/Makefile ---- wmtz-0.7.orig/wmtz/Makefile 2001-03-11 15:57:59.000000000 +0200 -+++ wmtz-0.7/wmtz/Makefile 2008-01-12 15:24:29.000000000 +0200 -@@ -1,5 +1,5 @@ - CC = gcc --LIBDIR = -L/usr/X11R6/lib -+LIBDIR = -L/usr/lib - LIBS = -lXpm -lXext -lX11 -lm - FLAGS = -O2 - DESTDIR = /usr/local -@@ -10,7 +10,7 @@ - - - .c.o: -- $(CC) -I/usr/X11R6/include $(FLAGS) -c -Wall $< -o $*.o -+ $(CC) -I/usr/include $(FLAGS) -c -Wall $< -o $*.o - - wmtz: $(OBJS) - $(CC) $(FLAGS) -o wmtz $^ -lXext $(LIBDIR) $(LIBS) -diff -ur wmtz-0.7.orig/wmtz/wmtz.c wmtz-0.7/wmtz/wmtz.c ---- wmtz-0.7.orig/wmtz/wmtz.c 2001-04-16 22:26:34.000000000 +0300 -+++ wmtz-0.7/wmtz/wmtz.c 2008-01-12 15:17:37.000000000 +0200 -@@ -51,8 +51,7 @@ - #define STRSIZE 10 - #define LMST 1 - #define GMST 0 --#define ABOUT "xmessage -center -buttons \"Close\" \"WMTZ - Window Maker Time Zone dockapp v0.7 --http://www.geocities.com/jl1n/wmtz/wmtz.html\"" -+#define ABOUT "xmessage -center -buttons \"Close\" \"WMTZ - Window Maker Time Zone dockapp v0.7\nhttp://www.geocities.com/jl1n/wmtz/wmtz.html\"" - - - /* -@@ -479,6 +478,7 @@ - but_stat = -1; - break; - default: -+ break; - } - } - -@@ -529,6 +529,7 @@ - exit(0); - break; - default: -+ break; - } - return; - } -- cgit v1.2.3