From 59fb6ea4eff116f078307a57217645762b78aba7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 17 Jun 2023 19:45:55 +0100 Subject: gentoo auto-resync : 17:06:2023 - 19:45:55 --- x11-misc/piedock/Manifest | 3 +- .../piedock-1.6.9-clang16-register-narrowing.diff | 108 +++++++++++++++++++++ x11-misc/piedock/piedock-1.6.9-r1.ebuild | 61 ++++++++++++ x11-misc/piedock/piedock-1.6.9.ebuild | 60 ------------ 4 files changed, 171 insertions(+), 61 deletions(-) create mode 100644 x11-misc/piedock/files/piedock-1.6.9-clang16-register-narrowing.diff create mode 100644 x11-misc/piedock/piedock-1.6.9-r1.ebuild delete mode 100644 x11-misc/piedock/piedock-1.6.9.ebuild (limited to 'x11-misc/piedock') diff --git a/x11-misc/piedock/Manifest b/x11-misc/piedock/Manifest index db2a58f5985e..b95b89b9553f 100644 --- a/x11-misc/piedock/Manifest +++ b/x11-misc/piedock/Manifest @@ -1,6 +1,7 @@ AUX piedock-1.6.1-signals.patch 173 BLAKE2B 396549f932aa01f54e6c72fa653a5758351118858fda7ca28de7e354e5430c402f93497e30267cf44c4cda059af489d097b6ce44f7f747f09ec873b3528ef31f SHA512 c98aa7e22ce78fc60d778861e5bef12545553723c28bfa599b6a2d8b30c572b8d480f167b8730d84dad9c06c16cfb45f9e69665187f3e5c66053a0d4b35684fe +AUX piedock-1.6.9-clang16-register-narrowing.diff 3040 BLAKE2B 25cfceedccae02db4292c3326e61b14467f3245b986f319c26c860eb0cae813aeaabe835993ba2d12e311cb216b47df6591e2fbe376471292a677b5b6e897501 SHA512 a5194661ff28856dbc271396870ca0f7ad143a6ce356173e7d09d604b31fdfafa781a75df46c3c5d35692ce4102dc32c3a321e41704361865b429cb9d5f68608 AUX piedock-1.6.9-freetype_pkgconfig.patch 1233 BLAKE2B 41b39f3014e0e6adf8ab8d95ef2d01ef296660859576b5e7563be33f438fb469ec4e5b32f51e2f03cf58e034eea210987dc4374b55f5e936039f8c7dfd8fe301 SHA512 63ccd116bfae7ebb1456b304ce1258850e4669a9a71f55a83625f7867e22e92892f8deb9ce81204137dc98326c6ff3faf252e126596eab2ec16c44c3b202ce31 AUX piedock-1.6.9-gcc12-time.patch 970 BLAKE2B 743a8019e3c8f8ff0ff1081ede0f621a3eba20d602e493dd2917340527f07468f38a5812f76666b409b5081c54d32d74559a4d51379bd0c075f02985aebee6d8 SHA512 33f988c092527632e25b828120894b267e3e97ca964a54cb6b5f449a00348d265d9f0623c09a184622dae901a0bb7230ff53298f0207cd6b3eb298a57a1544b2 DIST piedock-1.6.9.tar.gz 290491 BLAKE2B 492c56d106616323a7f661e3c5d016755bdb421668bfe5251811df62ab1243838380395888c3e874c211069c30fdc7ea9141c245e907fa4c2eeea6d0a583329e SHA512 1244cc26d47c39c27c583f24aedf3dcdf0d879003f96a7cb1b512255384f0d81bf7c07dafa1b21ae1e6762bb7b41158cd20740b12b83f2d49daf7f24fbc96b69 -EBUILD piedock-1.6.9.ebuild 1137 BLAKE2B afff90c5b6f449fcf1f7a7170f15dae7205682af754f1251682cba43faacc0c39959288e83bcf929d8f62027e34a0ba1d2a7f9d4fb7a9e111d812f0905a1d339 SHA512 7542dcb1b69037b08e7614004fd6e26064e8d6548532f14a1ccdd52afe67b586f9072f0463804d3829e5f836c5f690736280cb461d639c3260001879fc659a32 +EBUILD piedock-1.6.9-r1.ebuild 1223 BLAKE2B 31df77f21a51a210181874eeaf9e7fe1fb3806d7759bc19767a56f5dae2fe9adf4149ff791d55c9d5a7af21ea9b98ae3100c0ab0772e452b09c842c374de6ac1 SHA512 922ad9ae0eeed48d8998ed7604c323d84daff4e16a73cabf45fdf6eec09024cfe0f33a3b9dcdbc8d2ffcb3d821f8c808392da2c01728b6d69f9f326ed3fe7309 MISC metadata.xml 252 BLAKE2B 6eb8265a9dc05bf95f1fddec065820b158737d586f35030b6f7a26497479669fc08ce2baa6acfc865c7384a7f8738d58fd6ca8054758e9ab66b1b41b6258bb22 SHA512 6e99925075149e08a1f884567523641cf43b066a269499557c86801a1de792eeb4cb4b6af7362d5d00820234bfde4a3d6a64d168899f0a4a06a1b1246a68aa5f diff --git a/x11-misc/piedock/files/piedock-1.6.9-clang16-register-narrowing.diff b/x11-misc/piedock/files/piedock-1.6.9-clang16-register-narrowing.diff new file mode 100644 index 000000000000..b32832f10e10 --- /dev/null +++ b/x11-misc/piedock/files/piedock-1.6.9-clang16-register-narrowing.diff @@ -0,0 +1,108 @@ +# Fix build with clang 16. There were two main issues: +# 1. Usage of regiter keyword, which has been removed since C++17 +# 2. Non-constant-expression cannot be narrowed +# This patch fixes both the issues. +# Bug: https://bugs.gentoo.org/898888 +--- a/src/Blender.cpp ++++ b/src/Blender.cpp +@@ -147,20 +147,20 @@ void Blender::blendInto32Bit(Details &details) { + a >>= 24; + mod = alphaMax / static_cast(a); + +- register int d = (*dest) & 0xff; +- register int blue = (*src) & 0xff; ++ int d = (*dest) & 0xff; ++ int blue = (*src) & 0xff; + blue -= d; + blue /= mod; + blue += d; + + d = (*dest>>8) & 0xff; +- register int green = (*src >> 8) & 0xff; ++ int green = (*src >> 8) & 0xff; + green -= d; + green /= mod; + green += d; + + d = (*dest >> 16) & 0xff; +- register int red = (*src >> 16) & 0xff; ++ int red = (*src >> 16) & 0xff; + red -= d; + red /= mod; + red += d; +@@ -282,9 +282,9 @@ void Blender::blendInto16Bit(Details &details) { + src += 4; + dest += 2; + } else if (a == 0xff && !useGlobalAlpha) { +- register int blue = *(src++); +- register int green = *(src++); +- register int red = *(src++); ++ int blue = *(src++); ++ int green = *(src++); ++ int red = *(src++); + + *(reinterpret_cast(dest)) = + static_cast((blue & 0xf8) >> 3) | +@@ -297,21 +297,21 @@ void Blender::blendInto16Bit(Details &details) { + mod = alphaMax/static_cast(a); + + uint16_t pixel = *(reinterpret_cast(dest)); +- register int db = (pixel << 3) & 0xf8; +- register int dg = (pixel >> 3) & 0xf8; +- register int dr = (pixel >> 8) & 0xf8; ++ int db = (pixel << 3) & 0xf8; ++ int dg = (pixel >> 3) & 0xf8; ++ int dr = (pixel >> 8) & 0xf8; + +- register int blue = *src++; ++ int blue = *src++; + blue -= db; + blue /= mod; + blue += db; + +- register int green = *src++; ++ int green = *src++; + green -= dg; + green /= mod; + green += dg; + +- register int red = *src++; ++ int red = *src++; + red -= dr; + red /= mod; + red += dr; +--- a/src/Cartouche.cpp ++++ b/src/Cartouche.cpp +@@ -110,7 +110,7 @@ void Cartouche::drawRoundedRectangle( + bottom - radius - 1, + right - radius - 1, + getBytesPerLine(), +- color, ++ static_cast( color ), + getData() + top * getBytesPerLine() + }; + +--- a/src/Settings.cpp ++++ b/src/Settings.cpp +@@ -614,7 +614,7 @@ void Settings::load(Display *d) { + !((*ki).modifier & (*mi))) { + Trigger trigger = { + (*ki).modifier | (*mi), +- (*ki).keySym, ++ static_cast( (*ki).keySym ), + (*ki).menuName, + (*ki).eventMask + }; +--- a/src/WildcardCompare.cpp ++++ b/src/WildcardCompare.cpp +@@ -91,8 +91,8 @@ const bool WildcardCompare::match( + return false; + } + } else { +- register unsigned char p = *pattern; +- register unsigned char l = *literal; ++ unsigned char p = *pattern; ++ unsigned char l = *literal; + + if (p > 64 && p < 91) { + p += 32; diff --git a/x11-misc/piedock/piedock-1.6.9-r1.ebuild b/x11-misc/piedock/piedock-1.6.9-r1.ebuild new file mode 100644 index 000000000000..f458b11594b0 --- /dev/null +++ b/x11-misc/piedock/piedock-1.6.9-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="A little bit like the famous OS X dock but in shape of a pie menu" +HOMEPAGE=" + http://markusfisch.de/PieDock + https://github.com/markusfisch/PieDock +" +SRC_URI="https://github.com/markusfisch/PieDock/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/PieDock-${PV}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gtk" + +BDEPEND="virtual/pkgconfig" +RDEPEND=" + media-libs/libpng:0= + x11-libs/libX11 + x11-libs/libXft + x11-libs/libXmu + x11-libs/libXrender + gtk? ( + >=app-accessibility/at-spi2-core-2.46.0 + dev-libs/glib + x11-libs/gdk-pixbuf + x11-libs/gtk+:2 + ) +" +DEPEND="${RDEPEND}" + +DOCS=( res/${PN}rc.sample AUTHORS ChangeLog NEWS ) + +PATCHES=( + "${FILESDIR}"/${PN}-1.6.1-signals.patch + "${FILESDIR}"/${PN}-1.6.9-freetype_pkgconfig.patch + "${FILESDIR}"/${PN}-1.6.9-gcc12-time.patch + "${FILESDIR}"/${PN}-1.6.9-clang16-register-narrowing.diff +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + $(use_enable gtk) + --disable-kde + --bindir="${EPREFIX}"/usr/bin + --enable-xft + --enable-xmu + --enable-xrender + ) + econf "${myeconfargs[@]}" +} diff --git a/x11-misc/piedock/piedock-1.6.9.ebuild b/x11-misc/piedock/piedock-1.6.9.ebuild deleted file mode 100644 index cd38c36006d0..000000000000 --- a/x11-misc/piedock/piedock-1.6.9.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="A little bit like the famous OS X dock but in shape of a pie menu" -HOMEPAGE=" - http://markusfisch.de/PieDock - https://github.com/markusfisch/PieDock -" -SRC_URI="https://github.com/markusfisch/PieDock/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/PieDock-${PV}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gtk" - -BDEPEND="virtual/pkgconfig" -RDEPEND=" - media-libs/libpng:0= - x11-libs/libX11 - x11-libs/libXft - x11-libs/libXmu - x11-libs/libXrender - gtk? ( - dev-libs/atk - dev-libs/glib - x11-libs/gdk-pixbuf - x11-libs/gtk+:2 - ) -" -DEPEND="${RDEPEND}" - -DOCS=( res/${PN}rc.sample AUTHORS ChangeLog NEWS ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.6.1-signals.patch - "${FILESDIR}"/${PN}-1.6.9-freetype_pkgconfig.patch - "${FILESDIR}"/${PN}-1.6.9-gcc12-time.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myeconfargs=( - $(use_enable gtk) - --disable-kde - --bindir="${EPREFIX}"/usr/bin - --enable-xft - --enable-xmu - --enable-xrender - ) - econf "${myeconfargs[@]}" -} -- cgit v1.2.3