diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-04-28 23:59:44 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-04-28 23:59:44 +0100 |
commit | 5f0030fd1370c4d03dbb2e0d3086f5e618a33749 (patch) | |
tree | d3996b456278fbe1e1528053ddd115c4bac05401 /gnome-base/gnome-control-center | |
parent | 413421048cc2b0df9a218f0ab3cb151846809eb5 (diff) |
gentoo auto-resync : 28:04:2024 - 23:59:44
Diffstat (limited to 'gnome-base/gnome-control-center')
-rw-r--r-- | gnome-base/gnome-control-center/Manifest | 8 | ||||
-rw-r--r-- | gnome-base/gnome-control-center/files/45.2-fix_incompatible_type_warnings.patch | 39 | ||||
-rw-r--r-- | gnome-base/gnome-control-center/gnome-control-center-44.3.ebuild | 202 | ||||
-rw-r--r-- | gnome-base/gnome-control-center/gnome-control-center-45.4.ebuild (renamed from gnome-base/gnome-control-center/gnome-control-center-45.2.ebuild) | 13 |
4 files changed, 6 insertions, 256 deletions
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest index 25526bd463e8..375b387a4d63 100644 --- a/gnome-base/gnome-control-center/Manifest +++ b/gnome-base/gnome-control-center/Manifest @@ -1,12 +1,8 @@ -AUX 45.2-fix_incompatible_type_warnings.patch 1391 BLAKE2B 7f3cd577cedeb57b5be0626c5f4fac0c4ea8a9533cf06fb8e28578350447d51aec1ba6ee769fb512460fcf6dd681a9b6b50e282da6f12676eea8a1e40ac4f329 SHA512 adceb0afd9c45734b9f361024e774170d292911f55d78fdae452c05141ead79bb1a04f1178ef65887fee68fafc580f20f3b9cd4195d8e218ca5bfb5b3e528cff -DIST gnome-control-center-44.0-patchset.tar.xz 6004 BLAKE2B a647cd83fe5d2283edc341afaa6d55661b905fea740729cf21679c3593e5e339aec507b835fd57c11d1fdde8db338b57ff8e24f464bb1296ad7a5bd1fb7319c3 SHA512 85cdcf4d55028550cfd871285729d265f1f8b74ec46ad656ada122f511ec617a21c5927923e4000f3a2d7ca08f49aafc28cecbd4ab840db377fa2d4054997b6f -DIST gnome-control-center-44.3.tar.xz 7634240 BLAKE2B edd9cdd0f2cccd628670020f58f4c56f90fe7264593f8546a4d98c46cd12a1d3618f92532b1afdbd405e1ac8921d69f4f02a91e68507e8c3cd6aa29637ec0f41 SHA512 4eb4b2bd0109acc4626d64eaf948dc2b0442602a8219a9be880472710c124d2b4dabbcc74aaab1192d6bef74ad2757e719efd81b5d09850f348bc925d6f60355 DIST gnome-control-center-45.0-patchset.tar.xz 5888 BLAKE2B 7b7d818392e8758ca4d9247f55b84e4e8a37419859040e35d8fb3cef16f09423ad74a88a821a5f5947b3f36543ccc328f9a61cb71f92155b6a14669732569910 SHA512 e58adc6bb61d04f8c5ecf36335fedd190e063e42eed8e1023dcac95665a270d57c7cbd377fd0f5239f2c144040a9699b428536ffdbac798655b2c9aef25e71ae -DIST gnome-control-center-45.2.tar.xz 7715304 BLAKE2B 5b0b42cf8b1e4e908cbf4dc24018fd645cf4e9643f0233e953bcce5975302eb103306dae37270cce11f0fbe059fbd5dfd6b10cb6dcc08cf4765f648f8f73b32b SHA512 08749b6246e401982bd9c0088a5e2e517c7e8e2cea2fdce5fd29841a6c73b6bad9fba2d2af726f31cde3b64705cc9db22982673117f170cea27bae48911775de DIST gnome-control-center-45.3.tar.xz 7757512 BLAKE2B 2f38b9b6a5c7171eefd8899bb9156b49f6b41f60ce2bfb36d7ade7261cd038ddb60bcc9a6a71e6c49209f0f3c13c49b38758a19f02cc9735cea2874368602434 SHA512 0aad27f3324940292551c0aa9fa79771d1d41cc5a633970c709836a2d6af575f688df8553755f936495f75a02268a5a1f89e7f3b5fb03512140c73bf14fc4cf5 +DIST gnome-control-center-45.4.tar.xz 7764264 BLAKE2B 5e3632901b1203fc71b839a71aad50f63741412dfc673b8b8f87c72716fda386a1c7641b64642be811f94d6b2c54263deb45c4624d828ec66726d2a833a272e4 SHA512 d16b3c1cffeb7db27e9743106b6bc7ad925a832162764d0714b4931d0c21c9e02137b5b5e101be93dd8a92aebaa8556f6ce52e83c5e05e9e3d7e40d46b8c11d5 DIST gnome-control-center-gentoo-logo-dark.svg 14293 BLAKE2B 570e9326b8abe45849c31fd5cdb3fcfb1b2f18eac522f958928df5c3b747b0699f50a882f31cf7c0ae1f2138194f18596f738f42c942b57d340c53d46d82c551 SHA512 91227dafcf2091bb1568b0f9eec68b5e371ec64c9a6bc3605821f60d6bf2bd94dec0564f6a16a4a70d1db4d4df49fc25b6c910367bae3b85205cc609a9f2701b DIST gnome-control-center-gentoo-logo.svg 14288 BLAKE2B 371fc68b1015c8672db3e3858ae9077b1e3a9937e6add8690c39db36302ec031391c4d35e0c0b87094ca474a00c4187849e2d7111df34f43bc5bd7be52678527 SHA512 cf88933546de54ca15e2e830ac1086a78c4150f0ff59b8091e7e1cade5961c4e4cb83120a818a960b77841353ce3584ddc8f36b6edbde05543600283a143ad7b -EBUILD gnome-control-center-44.3.ebuild 6847 BLAKE2B 4efed8be7ec86008ee9261c78f5346159fd4064c79d3e1c50d39eb85f75f487d17e769fbc7f97358609e3b6fdc19c9c051f55b7c69c81e63a9ecbff31bce070c SHA512 1e0c490b2611acb4b085371cfcefefea2317ce4a6f3c5dad06db6cfb5b4759b77ca32a583107864ce31b9311af6894bcc77e3036cf67696230595461630c7085 -EBUILD gnome-control-center-45.2.ebuild 7127 BLAKE2B a99a4d68c56dacdf5cb287ec639cd0d27590eb3833cae5760b6b0bed41a8e4a54891b905797b1fa43bb0b143b4c24380a543151713d1cb3dd0c840ed91b33a48 SHA512 545f10842e0902f6e05b4a6c64896f88570002ffd7f0f38e3a2f046b65a56016e74bcfeb62452b03dfa039f6392bb873b2f45c869cbd8710825d55e4f64032eb EBUILD gnome-control-center-45.3.ebuild 6991 BLAKE2B cfd679ed132bcc2e905ae03cffabd68e6af4c182c5d5aa74e92b354ea46e4422f215ffc95dd43c070f7701f1050a4976435917753b5bc676a38c0e153407b23f SHA512 bcca94e30d5ee285a9b65b872c4c66a67ff53cc1d21859f24d915a185de4ccb75a22eb6d2f1df775d4fc7a30dcd1e863da7f8670b66ef720601afc31383607e6 +EBUILD gnome-control-center-45.4.ebuild 6994 BLAKE2B d8d04a03518430f884ed1a650c7a668770c2b60ea277827f2cc808110ad87fb0dbb02087412089fef23bbd26423609a9e19b805af68a595c89446a25a38c0de3 SHA512 055b162efa655329d2a60f14ce6318bcdb1c156e681f8726826d1aa932096ddeb99b36c89300de61b88e73a65cdecae1a636f6fbd7852491c5a04cabc77b722c MISC metadata.xml 610 BLAKE2B 33cb646209b89a151b412f3a5be10b29cf85cde070e8a55b50f18417b02806763f940a1f56684ec8f494f9bd07258e9219b4dc2dc01ef6710aedc03bb609d42e SHA512 1d1fd521a3901c3601d3bd4ab78ac95c44d058fc0de2506df38c5ad8ba5156ff04c4b112b7a801a13f5ed9c37243c64629cf7038ca156196fa5f3229606a1f9c diff --git a/gnome-base/gnome-control-center/files/45.2-fix_incompatible_type_warnings.patch b/gnome-base/gnome-control-center/files/45.2-fix_incompatible_type_warnings.patch deleted file mode 100644 index 4b0867bfa0b2..000000000000 --- a/gnome-base/gnome-control-center/files/45.2-fix_incompatible_type_warnings.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 13c939659a844049ddc68e90c7830bf96ebe174d Mon Sep 17 00:00:00 2001 -From: Marco Melorio <marco.melorio@protonmail.com> -Date: Thu, 5 Oct 2023 19:21:39 +0200 -Subject: [PATCH] misc: Fix incompatible type warnings - ---- - panels/datetime/cc-datetime-panel.c | 2 +- - panels/network/net-device-wifi.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/panels/datetime/cc-datetime-panel.c b/panels/datetime/cc-datetime-panel.c -index 3544411d04..204b8ce44d 100644 ---- a/panels/datetime/cc-datetime-panel.c -+++ b/panels/datetime/cc-datetime-panel.c -@@ -695,7 +695,7 @@ list_box_row_activated (CcDateTimePanel *self, - } - else if (row == GTK_LIST_BOX_ROW (self->timezone_row)) - { -- present_window (self, self->timezone_dialog); -+ present_window (self, GTK_WINDOW (self->timezone_dialog)); - } - } - -diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c -index dd4453d0f8..3cb66e19fa 100644 ---- a/panels/network/net-device-wifi.c -+++ b/panels/network/net-device-wifi.c -@@ -780,7 +780,7 @@ net_device_wifi_dispose (GObject *object) - NetDeviceWifi *self = NET_DEVICE_WIFI (object); - - if (self->hotspot_dialog) { -- gtk_window_destroy (self->hotspot_dialog); -+ gtk_window_destroy (GTK_WINDOW (self->hotspot_dialog)); - self->hotspot_dialog = NULL; - } - --- -GitLab - diff --git a/gnome-base/gnome-control-center/gnome-control-center-44.3.ebuild b/gnome-base/gnome-control-center/gnome-control-center-44.3.ebuild deleted file mode 100644 index 0f5bbbb36bd9..000000000000 --- a/gnome-base/gnome-control-center/gnome-control-center-44.3.ebuild +++ /dev/null @@ -1,202 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) - -inherit gnome.org gnome2-utils meson python-any-r1 virtualx xdg - -DESCRIPTION="GNOME's main interface to configure various aspects of the desktop" -HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-control-center" -SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-44.0-patchset.tar.xz" -SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-gentoo-logo.svg" -SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-gentoo-logo-dark.svg" -# Logo is CC-BY-SA-2.5 -LICENSE="GPL-2+ CC-BY-SA-2.5" -SLOT="2" -IUSE="+bluetooth +cups debug elogind +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test wayland" -RESTRICT="!test? ( test )" -REQUIRED_USE=" - ^^ ( elogind systemd ) -" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86" - -# kerberos unfortunately means mit-krb5; build fails with heimdal -# display panel requires colord and gnome-settings-daemon[colord] -# wacom panel requires gsd-enums.h from gsd at build time, probably also runtime support -# printer panel requires cups and smbclient (the latter is not patched yet to be separately optional) -# First block is toplevel meson.build deps in order of occurrence (plus deeper deps if in same conditional). Second block is dependency() from subdir meson.builds, sorted by directory name occurrence order -DEPEND=" - gnome-online-accounts? ( - x11-libs/gtk+:3 - >=net-libs/gnome-online-accounts-3.25.3:= - ) - >=media-libs/libpulse-2.0[glib] - >=gui-libs/gtk-4.9.3:4[X,wayland=] - >=gui-libs/libadwaita-1.2.0:1 - >=sys-apps/accountsservice-0.6.39 - >=x11-misc/colord-0.1.34:0= - >=x11-libs/gdk-pixbuf-2.23.0:2 - >=dev-libs/glib-2.75.0:2 - gnome-base/gnome-desktop:4= - >=gnome-base/gnome-settings-daemon-41.0[colord,input_devices_wacom?] - >=gnome-base/gsettings-desktop-schemas-42_alpha - dev-libs/libxml2:2 - >=sys-power/upower-0.99.8:= - >=dev-libs/libgudev-232 - >=x11-libs/libX11-1.8 - >=x11-libs/libXi-1.2 - media-libs/libepoxy - app-crypt/gcr:0= - >=dev-libs/libpwquality-1.2.2 - >=sys-auth/polkit-0.114 - cups? ( - >=net-print/cups-1.7[dbus] - >=net-fs/samba-4.0.0[client] - ) - ibus? ( >=app-i18n/ibus-1.5.2 ) - networkmanager? ( - >=net-libs/libnma-1.10.2 - >=net-misc/networkmanager-1.24.0[modemmanager] - >=net-misc/modemmanager-0.7.990:= - ) - bluetooth? ( net-wireless/gnome-bluetooth:3= ) - input_devices_wacom? ( >=dev-libs/libwacom-0.27:= ) - kerberos? ( app-crypt/mit-krb5 ) - - x11-libs/cairo[glib] - >=x11-libs/colord-gtk-0.3.0:= - media-libs/fontconfig - gnome-base/libgtop:2= - >=sys-fs/udisks-2.1.8:2 - app-crypt/libsecret - net-libs/gnutls:= - media-libs/gsound - - x11-libs/pango -" -# media-libs/libcanberra[pulseaudio,sound] needed for Speaker tests in -# Settings/Sound/Output/Output Device, bug #814110 -# systemd/elogind USE flagged because package manager will potentially try to satisfy a -# "|| ( systemd ( elogind openrc-settingsd)" via systemd if openrc-settingsd isn't already installed. -# libgnomekbd needed only for gkbd-keyboard-display tool -# gnome-color-manager needed for gcm-calibrate and gcm-viewer calls from color panel -# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x -# -# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474 -# Also we need newer driver versions to allow wacom and libinput drivers to -# not collide -# -# system-config-printer provides org.fedoraproject.Config.Printing service and interface -# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy -RDEPEND="${DEPEND} - media-libs/libcanberra[pulseaudio,sound] - systemd? ( >=sys-apps/systemd-31 ) - elogind? ( - app-admin/openrc-settingsd - sys-auth/elogind - ) - x11-themes/adwaita-icon-theme - >=gnome-extra/gnome-color-manager-3.1.2 - cups? ( - app-admin/system-config-printer - net-print/cups-pk-helper - ) - >=gnome-base/libgnomekbd-3 - wayland? ( dev-libs/libinput ) - !wayland? ( - >=x11-drivers/xf86-input-libinput-0.19.0 - input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) - ) -" -# PDEPEND to avoid circular dependency; gnome-session-check-accelerated called by info panel -# gnome-session-2.91.6-r1 also needed so that 10-user-dirs-update is run at login -PDEPEND=">=gnome-base/gnome-session-2.91.6-r1 - networkmanager? ( gnome-extra/nm-applet )" # networking panel can call into nm-connection-editor - -# meson.build depends on python unconditionally -BDEPEND="${PYTHON_DEPS} - dev-libs/libxslt - app-text/docbook-xsl-stylesheets - app-text/docbook-xml-dtd:4.2 - x11-base/xorg-proto - dev-libs/libxml2:2 - dev-util/gdbus-codegen - dev-util/glib-utils - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - test? ( - $(python_gen_any_dep ' - dev-python/python-dbusmock[${PYTHON_USEDEP}] - ') - x11-apps/setxkbmap - ) -" - -PATCHES=( - # Patches from gnome-43 branch - # Makes some panels and dependencies optional - # https://bugzilla.gnome.org/686840, 697478, 700145 - # Fix some absolute paths to be appropriate for Gentoo - "${WORKDIR}"/patches/ -) - -python_check_deps() { - use test || return 0 - python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]" -} - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_prepare() { - default - xdg_environment_reset - # Mark python tests with shebang executable, so that meson will launch them directly, instead - # of via its own python-single-r1 version, which might not match what we get from python_check_deps - chmod a+x tests/network/test-network-panel.py tests/datetime/test-datetime.py || die -} - -src_configure() { - local emesonargs=( - $(meson_use bluetooth) - -Dcups=$(usex cups enabled disabled) - -Ddocumentation=true # manpage - -Dgoa=$(usex gnome-online-accounts enabled disabled) - $(meson_use ibus) - -Dkerberos=$(usex kerberos enabled disabled) - $(meson_use networkmanager network_manager) - -Dprivileged_group=wheel - -Dsnap=false - $(meson_use test tests) - $(meson_use input_devices_wacom wacom) - #$(meson_use wayland) # doesn't do anything in 3.34 and 3.36 due to unified gudev handling code - # bashcompletions installed to $datadir/bash-completion/completions by v3.28.2, which is the same as $(get_bashcompdir) - -Dmalcontent=false # unpackaged - -Ddistributor_logo=/usr/share/pixmaps/gnome-control-center-gentoo-logo.svg - -Ddark_mode_distributor_logo=/usr/share/pixmaps/gnome-control-center-gentoo-logo-dark.svg - ) - meson_src_configure -} - -src_test() { - virtx meson_src_test -} - -src_install() { - meson_src_install - insinto /usr/share/pixmaps - doins "${DISTDIR}"/gnome-control-center-gentoo-logo.svg - doins "${DISTDIR}"/gnome-control-center-gentoo-logo-dark.svg -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/gnome-base/gnome-control-center/gnome-control-center-45.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-45.4.ebuild index 4dc180b6f5ed..e51277b7a52c 100644 --- a/gnome-base/gnome-control-center/gnome-control-center-45.2.ebuild +++ b/gnome-base/gnome-control-center/gnome-control-center-45.4.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit flag-o-matic gnome.org gnome2-utils meson python-any-r1 virtualx xdg @@ -20,10 +20,7 @@ REQUIRED_USE=" ^^ ( elogind systemd ) " # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, # but needs testing if handled gracefully enough -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" - -# meson.build depends on python unconditionally -BDEPEND="${PYTHON_DEPS}" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" # kerberos unfortunately means mit-krb5; build fails with heimdal # display panel requires colord and gnome-settings-daemon[colord] @@ -118,7 +115,8 @@ RDEPEND="${DEPEND} PDEPEND=">=gnome-base/gnome-session-2.91.6-r1 networkmanager? ( gnome-extra/nm-applet )" # networking panel can call into nm-connection-editor -BDEPEND=" +# meson.build depends on python unconditionally +BDEPEND="${PYTHON_DEPS} dev-libs/libxslt app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.2 @@ -137,13 +135,10 @@ BDEPEND=" " PATCHES=( - # Patches from gnome-43 branch # Makes some panels and dependencies optional # https://bugzilla.gnome.org/686840, 697478, 700145 # Fix some absolute paths to be appropriate for Gentoo "${WORKDIR}"/patches/ - # misc: Fix incompatible type warnings - "${FILESDIR}"/45.2-fix_incompatible_type_warnings.patch ) python_check_deps() { |