diff options
Diffstat (limited to 'xfce-base/xfce4-panel')
| -rw-r--r-- | xfce-base/xfce4-panel/Manifest | 11 | ||||
| -rw-r--r-- | xfce-base/xfce4-panel/files/xfce4-panel-4.19.4-build.patch | 148 | ||||
| -rw-r--r-- | xfce-base/xfce4-panel/xfce4-panel-4.18.6.ebuild | 2 | ||||
| -rw-r--r-- | xfce-base/xfce4-panel/xfce4-panel-4.19.5.ebuild (renamed from xfce-base/xfce4-panel/xfce4-panel-4.19.3.ebuild) | 7 | ||||
| -rw-r--r-- | xfce-base/xfce4-panel/xfce4-panel-4.19.6.ebuild (renamed from xfce-base/xfce4-panel/xfce4-panel-4.19.4.ebuild) | 13 |
5 files changed, 14 insertions, 167 deletions
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest index aa66c6a5bc76..0402a6a30e35 100644 --- a/xfce-base/xfce4-panel/Manifest +++ b/xfce-base/xfce4-panel/Manifest @@ -1,8 +1,7 @@ -AUX xfce4-panel-4.19.4-build.patch 4252 BLAKE2B c65d1ebaaa96fecff13ae8cfca636180cb7cbfee4f28cfc9d56d833997abe49f3c37c5a9566a604798947ed24b8a5366b4f3ff04aa624028311707a9a01fcf52 SHA512 3d659983dc46b3093a3d3f7f194ac4501746b7b66b89aa80b202b91af4f2c04bf6cb548fdb1c5e2a5a5239e80320afad3db79ca2763a9fd5376519dfb43466e7 DIST xfce4-panel-4.18.6.tar.bz2 1595352 BLAKE2B e4f4eb2f3838cde69a2614021be184ba7281910e595cc868180eba5ce40898fb538cb82ef5317f8316273b6a926553e051730e4918f3d2d339e03729ac8c2a85 SHA512 a1c4597bbbb72d2f3ef90abe0082abe3404e0ea7fa6027e26ca50e31e03645464ce3e0a72f4d927e84c5775a775e3a70f70e25bd3d2e4358da869f9c474e6174 -DIST xfce4-panel-4.19.3.tar.bz2 2187643 BLAKE2B d6b597a8abb1d8a079315ccb386797fb98c4bdd332bbafacfcdc5965f528eeb34ff99a08f4c9abaa57be60bc642d164ef11a69b7a847cdeeebfded3ca2ccdedc SHA512 4d7912052bc4dae50fe1d32503987636d8579baa75313f038c647ba3c4662da63c4317ffa9cda3d0188d3e05357df038f739217f2a3f64d7151d8f8c9af261b7 -DIST xfce4-panel-4.19.4.tar.bz2 2237827 BLAKE2B 2f302a665c875cebf3d1017b13b658654bc9c0f1d498bc55e6d1fde036f2919759a9a77cbd06567796c43f34ce27d198391c10eed3c40907626a275e788e4b19 SHA512 c02d20931ec53817676a7c1c48b91075d79fbfd64ca0ecfe8d581d4206e86d7fb4893bcb8c2bd1e1bdf5040da0077e82a51988681928327fc791232af134fc8b -EBUILD xfce4-panel-4.18.6.ebuild 1556 BLAKE2B fe2bd5784ae8a7ef78b49aaa817a836bd521af830483073e579babcf8bca08c682849ad8c7766a5238e47c18983da7b1cf6d8f4d724ab2a1d6498123da03820e SHA512 f392bdbfc0a9238be123f2cdc69b5c00ae94dd8c3f68b9a7e523aac019de54fd8c454ba58dfaed9c6435e2de838d35477e0eec2541c2aeb75dd66ad87563a2bc -EBUILD xfce4-panel-4.19.3.ebuild 1808 BLAKE2B 40ddb156f53e444748d6821c5b016cec27441fd14fc0a0d62adc027c5720836fc22597d662e2c4fc6878a20996cb99579a912296da12a5b6e10873fd0f07c92a SHA512 99fbe723e1a9cbd425b734a2b6596ce1414486988ee0eae89b1f1cd57e2d57aa95481c36aa0ee07c9291016dcdb9d325357af2c1a3d06001717c8850fda42ef0 -EBUILD xfce4-panel-4.19.4.ebuild 1941 BLAKE2B d60338794b99f35c06159f951d5659712345109c49c72ec1487eae5e17981c1235d368e353fef5a359ff492d2b166e91729d60e733561ef14701a067307eb7ff SHA512 8af851fa1f234a342f86c6951914accff3a1ac80c9a9f57437555ffbfd5c91d6ea4431a95cf5c7c37988e38706edd035f83f6a1c2abc538f2f31bd310f2c86bb +DIST xfce4-panel-4.19.5.tar.bz2 2246334 BLAKE2B b64ae0c5fa78cdb18114be9c92a73d9e9b26564910600a2184d63e4c1bdd1ea1e66e45d584c2398b519e67ae9eca7dc2353ba86e8ad604dbc275ec6b28a26ba7 SHA512 05fe0f9f788bf5d8cd798bdde24797c7727d5909dcf96a780f4db4eb0ae4c2ec7185b1ae3e9f91cefed890f9bb5c547f4391adfc501ebf6c33849969bb25c246 +DIST xfce4-panel-4.19.6.tar.bz2 2261298 BLAKE2B 016c741445b836c8649d6158e0f8f51d691087a42b9a239c4051642e04717338b7186eef81d2311032dad22d601c4cd27d67215d7d74c9284e4b8326c0aec547 SHA512 9a7dd23850a5b70d872c337c249565c3b84ce152e57922a9a55734202d1e5d47f0ea59da71c13d8b1fe87ff64ec151a45bb40df0464e083d2c04c1eefa88ffed +EBUILD xfce4-panel-4.18.6.ebuild 1550 BLAKE2B ffb64ce0a5cdc42d20bc863e651c2ccb2278e429dd81b49c7e63637e7445873cf9101045166cf53c9d786935eea54ad298e44e6844febdddf727a30bf6d0736f SHA512 6ec09ed70975c6da94a715f1726e01c044e49a2394ecaa796c353fb89c79c8d3b409f3afee4e1d3c3634166b9da06a0624cc5277fbeb3fe6122b3b3896a9c0eb +EBUILD xfce4-panel-4.19.5.ebuild 1829 BLAKE2B 36918a629b045ed0196f979f9a9d94df27f9d087cc93141969d0485421355e953f22ea4df23def8fcb2fb3d1943df25d5c3dbdc388be194e90e0527512a09c26 SHA512 3597eea79749bb1fe6e549d651cba191c41306491a7b184ec1d3576d0aba0e2abc44034be65f480963a30cc8d6a4730b4bb991c10598887fb5f297893dad3011 +EBUILD xfce4-panel-4.19.6.ebuild 1829 BLAKE2B 36918a629b045ed0196f979f9a9d94df27f9d087cc93141969d0485421355e953f22ea4df23def8fcb2fb3d1943df25d5c3dbdc388be194e90e0527512a09c26 SHA512 3597eea79749bb1fe6e549d651cba191c41306491a7b184ec1d3576d0aba0e2abc44034be65f480963a30cc8d6a4730b4bb991c10598887fb5f297893dad3011 MISC metadata.xml 377 BLAKE2B a9ab246bf0acb1731905d6f7aaa6d558204ca06138e0f531b76570f1477353a636b504ccab11ed861044faa5d02fefa43c5cc08f8d6c742851f1e8976e08f3d6 SHA512 9269670fb22fc1179cbc6f4a3f7f160bd1164ab470f6bbfa4875d85d7c0fb29ac7ae05d46daaaba097a418890961e568ce249e60329ed0325ba3f5dc976946f8 diff --git a/xfce-base/xfce4-panel/files/xfce4-panel-4.19.4-build.patch b/xfce-base/xfce4-panel/files/xfce4-panel-4.19.4-build.patch deleted file mode 100644 index 7813ba1bb363..000000000000 --- a/xfce-base/xfce4-panel/files/xfce4-panel-4.19.4-build.patch +++ /dev/null @@ -1,148 +0,0 @@ -From fcee4201e254a417f8146723b24ce0716840c96b Mon Sep 17 00:00:00 2001 -From: Nicholas Vinson <nvinson234@gmail.com> -Date: Tue, 21 May 2024 01:10:10 +0200 -Subject: [PATCH] build: Add missing math.h includes - -Commit 0f786ce451297f8d26d41dc8492c10db08d8f87f added a math.h include -statement to libxfce4panel/xfce-panel-image.c to fix issue #833. -However, libm functions are used in more files than just -xfce-panel-image.c. - -Therefore, add math.h include to other files that use math functions. - -Signed-off-by: Nicholas Vinson <nvinson234 at gmail.com> -Fixes: https://bugs.gentoo.org/932303 ---- - panel/panel-base-window.c | 4 +++- - panel/panel-itembar.c | 4 ++++ - panel/panel-preferences-dialog.c | 4 +++- - plugins/clock/clock-analog.c | 4 ++++ - plugins/clock/clock-binary.c | 4 +++- - plugins/clock/clock-lcd.c | 4 ++++ - plugins/clock/clock.c | 4 ++++ - plugins/systray/systray-box.c | 4 ++++ - 8 files changed, 29 insertions(+), 3 deletions(-) - -diff --git a/panel/panel-base-window.c b/panel/panel-base-window.c -index 5e0f3a688..832520be6 100644 ---- a/panel/panel-base-window.c -+++ b/panel/panel-base-window.c -@@ -35,7 +35,9 @@ - #define gtk_layer_is_supported() FALSE - #endif - -- -+#ifdef HAVE_MATH_H -+#include <math.h> -+#endif - - #define PANEL_BASE_CSS ".xfce4-panel.background { border-style: solid; }" \ - ".xfce4-panel.background button { background: transparent; padding: 0; }" \ -diff --git a/panel/panel-itembar.c b/panel/panel-itembar.c -index 4ffcb5ba4..11ccf5d1d 100644 ---- a/panel/panel-itembar.c -+++ b/panel/panel-itembar.c -@@ -29,6 +29,10 @@ - #include "libxfce4panel/libxfce4panel.h" - #include "libxfce4panel/xfce-panel-plugin-provider.h" - -+#ifdef HAVE_MATH_H -+#include <math.h> -+#endif -+ - #define IS_HORIZONTAL(itembar) ((itembar)->mode == XFCE_PANEL_PLUGIN_MODE_HORIZONTAL) - #define HIGHLIGHT_SIZE 2 - -diff --git a/panel/panel-preferences-dialog.c b/panel/panel-preferences-dialog.c -index 9a54e9ab3..dfcc67db3 100644 ---- a/panel/panel-preferences-dialog.c -+++ b/panel/panel-preferences-dialog.c -@@ -37,7 +37,9 @@ - #include <libxfce4ui/libxfce4ui.h> - #include <libxfce4util/libxfce4util.h> - -- -+#ifdef HAVE_MATH_H -+#include<math.h> -+#endif - - static void - panel_preferences_dialog_finalize (GObject *object); -diff --git a/plugins/clock/clock-analog.c b/plugins/clock/clock-analog.c -index ae4ae21f4..50196352d 100644 ---- a/plugins/clock/clock-analog.c -+++ b/plugins/clock/clock-analog.c -@@ -27,6 +27,10 @@ - - #include <cairo/cairo.h> - -+#ifdef HAVE_MATH_H -+#include <math.h> -+#endif -+ - #define CLOCK_SCALE 0.08 - #define TICKS_TO_RADIANS(x) (G_PI - (G_PI / 30.0) * (x)) - #define HOURS_TO_RADIANS(x, y) (G_PI - (G_PI / 6.0) * (((x) > 12 ? (x) - 12 : (x)) + (y) / 60.0)) -diff --git a/plugins/clock/clock-binary.c b/plugins/clock/clock-binary.c -index 5ac4151af..36fe31c72 100644 ---- a/plugins/clock/clock-binary.c -+++ b/plugins/clock/clock-binary.c -@@ -27,7 +27,9 @@ - - #include <cairo/cairo.h> - -- -+#ifdef HAVE_MATH_H -+#include <math.h> -+#endif - - static void - xfce_clock_binary_set_property (GObject *object, -diff --git a/plugins/clock/clock-lcd.c b/plugins/clock/clock-lcd.c -index 97e041d58..8b7454dfd 100644 ---- a/plugins/clock/clock-lcd.c -+++ b/plugins/clock/clock-lcd.c -@@ -27,6 +27,10 @@ - - #include <cairo/cairo.h> - -+#ifdef HAVE_MATH_H -+#include <math.h> -+#endif -+ - #define RELATIVE_SPACE (0.10) - #define RELATIVE_DIGIT (5 * RELATIVE_SPACE) - #define RELATIVE_DOTS (3 * RELATIVE_SPACE) -diff --git a/plugins/clock/clock.c b/plugins/clock/clock.c -index 472ff8f17..ee1d4402b 100644 ---- a/plugins/clock/clock.c -+++ b/plugins/clock/clock.c -@@ -39,6 +39,10 @@ - #include <gtk/gtk.h> - #include <libxfce4ui/libxfce4ui.h> - -+#ifdef HAVE_MATH_H -+#include <math.h> -+#endif -+ - /* TRANSLATORS: adjust this accordingly for your locale format */ - #define DEFAULT_TOOLTIP_FORMAT NC_ ("Date", "%A %d %B %Y") - -diff --git a/plugins/systray/systray-box.c b/plugins/systray/systray-box.c -index 1fc22c925..f808acb97 100644 ---- a/plugins/systray/systray-box.c -+++ b/plugins/systray/systray-box.c -@@ -27,6 +27,10 @@ - #include "common/panel-debug.h" - #include "common/panel-private.h" - -+#ifdef HAVE_MATH_H -+#include <math.h> -+#endif -+ - #define SPACING (2) - #define OFFSCREEN (-9999) - --- -GitLab - diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.18.6.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.18.6.ebuild index 6556210ea537..ffb7657a9e80 100644 --- a/xfce-base/xfce4-panel/xfce4-panel-4.18.6.ebuild +++ b/xfce-base/xfce4-panel/xfce4-panel-4.18.6.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2" LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" IUSE="+dbusmenu introspection vala" REQUIRED_USE="vala? ( introspection )" diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.19.3.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.19.5.ebuild index 6329f2e10d87..9d303f602413 100644 --- a/xfce-base/xfce4-panel/xfce4-panel-4.19.3.ebuild +++ b/xfce-base/xfce4-panel/xfce4-panel-4.19.5.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2" LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="+dbusmenu introspection vala wayland X" REQUIRED_USE=" || ( wayland X ) @@ -29,16 +29,17 @@ DEPEND=" >=xfce-base/garcon-4.17.0:= >=xfce-base/libxfce4ui-4.17.1:= >=xfce-base/libxfce4util-4.17.2:=[introspection?,vala?] - >=xfce-base/libxfce4windowing-4.19.3:=[X?] + >=xfce-base/libxfce4windowing-4.19.6:=[X?] >=xfce-base/xfconf-4.13.2:= dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( >=dev-libs/gobject-introspection-1.66:= ) wayland? ( - >=dev-libs/wayland-1.15 + >=dev-libs/wayland-1.20 >=gui-libs/gtk-layer-shell-0.7.0 ) X? ( >=x11-libs/libX11-1.6.7 + >=x11-libs/libXext-1.0.0 x11-libs/libwnck:3 ) " diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.19.4.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.19.6.ebuild index 909458cf5c95..9d303f602413 100644 --- a/xfce-base/xfce4-panel/xfce4-panel-4.19.4.ebuild +++ b/xfce-base/xfce4-panel/xfce4-panel-4.19.6.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2" LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="+dbusmenu introspection vala wayland X" REQUIRED_USE=" || ( wayland X ) @@ -29,16 +29,17 @@ DEPEND=" >=xfce-base/garcon-4.17.0:= >=xfce-base/libxfce4ui-4.17.1:= >=xfce-base/libxfce4util-4.17.2:=[introspection?,vala?] - >=xfce-base/libxfce4windowing-4.19.3:=[X?] + >=xfce-base/libxfce4windowing-4.19.6:=[X?] >=xfce-base/xfconf-4.13.2:= dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( >=dev-libs/gobject-introspection-1.66:= ) wayland? ( - >=dev-libs/wayland-1.15 + >=dev-libs/wayland-1.20 >=gui-libs/gtk-layer-shell-0.7.0 ) X? ( >=x11-libs/libX11-1.6.7 + >=x11-libs/libXext-1.0.0 x11-libs/libwnck:3 ) " @@ -54,12 +55,6 @@ BDEPEND=" virtual/pkgconfig " -PATCHES=( - # fix build with USE=-wayland - # https://gitlab.xfce.org/xfce/xfce4-panel/-/issues/833 - "${FILESDIR}/${P}-build.patch" -) - src_configure() { local myconf=( $(use_enable introspection) |