diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
commit | 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch) | |
tree | 356496503d52354aa6d9f2d36126302fed5f3a73 /gnome-base/gnome-control-center | |
parent | fcc5224904648a8e6eb528d7603154160a20022f (diff) |
gentoo resync : 20.03.2022
Diffstat (limited to 'gnome-base/gnome-control-center')
-rw-r--r-- | gnome-base/gnome-control-center/Manifest | 13 | ||||
-rw-r--r-- | gnome-base/gnome-control-center/gnome-control-center-40.0.ebuild | 179 | ||||
-rw-r--r-- | gnome-base/gnome-control-center/gnome-control-center-40.7.ebuild | 179 | ||||
-rw-r--r-- | gnome-base/gnome-control-center/gnome-control-center-41.4.ebuild (renamed from gnome-base/gnome-control-center/gnome-control-center-41.2.ebuild) | 8 | ||||
-rw-r--r-- | gnome-base/gnome-control-center/metadata.xml | 1 |
5 files changed, 5 insertions, 375 deletions
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest index 159cea031628..13a51ce27441 100644 --- a/gnome-base/gnome-control-center/Manifest +++ b/gnome-base/gnome-control-center/Manifest @@ -1,11 +1,4 @@ -DIST gnome-control-center-40.0-patchset-2.tar.xz 7396 BLAKE2B 9d3c0461c065cbf0f2051847e516066a38ebffc0972f12060fc41a7d283dd0eecd1a3e581518e13c1dcd545d600e7a2bece5d33d10e8c50adcb2b05f9558e8d0 SHA512 3a93c0c2f0f2bc422e6992c259334d9a90678151882e2df3035e4c233fa8e6c557073cc6679044b27bbfaafaa06d59b76724154dcd63612724e1e89817c99a36 -DIST gnome-control-center-40.0.tar.xz 6463616 BLAKE2B 7c79b79a0cb9bb847cdeb31613e9520b446f7720031fc7cda927a82b6e0acc6af03a047fe296a45f6e171c4ab1659b4ed5c6d07f83c9ffa554b1bdcce6fa26fe SHA512 26980cd18c414b12d2bf7e61be200e02302e170d53aba4f064154eda4c006648160919b6d4c9d168d8c5a461c05dc6593a52066b144af577c6aac420b9723cb9 -DIST gnome-control-center-40.7-patchset.tar.xz 7232 BLAKE2B bdf97bd666dcdd8cf87e1a553b849b42e3e1713e508e22450073ea8c4849a7086fc8f5effde39c939e0b8c26decadf9056fb93cfcb530fe287b0039c322fd989 SHA512 cbd7e7ca734ad49fd343f0d5d21c5153ba48ebedcd58ed225c7f196b0c79167f769609803f5752585e43edd7649ac73fe3ed1d9264e3d103107a9f5b4b091058 -DIST gnome-control-center-40.7.tar.xz 6473212 BLAKE2B 94a97297857ebdf8dcc9c4a45f64cabbc7e2210cf0cce00174c016290c17393c9c6b73073873c8fb9917ca4ed9f18c20947730127e3ad7ed4658a2bf3d99ede5 SHA512 2a5235b8659fa72521b50fb05bb4c2daceac88ea127492ea7cb544da1831370faa3c70c98b1a25e314121d85f82aa8f606c8c6f3a082d577ba5cf85b14d1cc48 -DIST gnome-control-center-41.2-meson-0.61-build.patch.bz2 2356 BLAKE2B c739cb6e0ce181a4724aafc5996469f92ac85e89d6673fa6f3c051e0db0b8c2280c57c5a07fae35318a8d5e407b377a47d5a93e86071a79eb2ff44274919ebd3 SHA512 8f78444e275f5e89ee041ccb13887427cba7d19c456347dea9fb20f66b6a29f5d89b049487b402bb62886e29d43c22f2019dba770cbb4c7bd7fd568e9efb3f06 DIST gnome-control-center-41.2-patchset.tar.xz 6380 BLAKE2B de9eacf549686e43870df486994c5cd319f996edb2b09a7d3b5e9021c50b74c067e8c3cbabbc0ca68741fb3b4c5a2d65cc1ea72e20057ec59dab952fa886d527 SHA512 292737b34316ceff5eb43c598b0a8d2a7895e2891215137ba59defb935c6184e78f19e2485963a8642621a409ee87e0e2a1582403fd90ee3c83b2bc1f3334e27 -DIST gnome-control-center-41.2.tar.xz 6619180 BLAKE2B 1ddc68b87482d66f093f72690d287691dce6e02b071878e1facb33a646e7b487a75ba04b8ec18bb6e717a8c6c27a393bf0dd30fcb371ae833edd18c6e645bad3 SHA512 9ea19e4bd1bd708f78a62c746102467dd2e801b84a64589a043a4f849d297353edc54291a5c59db1f8dd3c2c24088aec0f1d98a6270b0373384a2e19e7dde332 -EBUILD gnome-control-center-40.0.ebuild 6317 BLAKE2B 36e5c618b07bf8222c84cd5e1fb417566ce11b96ec55dff5704185546cca209039f3809b672d1484e0d9631f42be6185ec2bfad71c5a1df34c200e1d6967a50e SHA512 fee96d3c1d422725c6c10f97aad539bf007890fe0e0afcd13988040d6da5b69d0d2c3e056de139e4c8c9ff85d234abca0ac85d88c3d7f83ccb454b8672765717 -EBUILD gnome-control-center-40.7.ebuild 6311 BLAKE2B dd4bfb4da3f67fa0cbba9206e7040cd2471bfc94e11a4d6ba14e6a65a39582e2507eba07a4be1631f295d509dbb72a782a4257273725ed3c8539176a2039b5f1 SHA512 5c6ca1809a208efa728ea488cb05014104fd4ae5d7e16465e5f1e1810980408b4d5330b667f90d078010054011920ac7bea9800fc11a1f91d6a26d7177850b49 -EBUILD gnome-control-center-41.2.ebuild 6272 BLAKE2B 1976bf80a9615ffa4647cf07027384c07cbf5a95ce12651325cf96065191774b44e1f5b9c2295e427864a4b987721340bbeeab7e2c3f771fab9201251211c67b SHA512 baaca029d73c5cb8372641871b6a5e8f03b81b94be878bbe0016d5934c1c858ec71df1b9cb03cfb16ce8af8a16552422ba81b3c93f65f1bb80e9de0abcbc4ead -MISC metadata.xml 589 BLAKE2B cc1f65e04e51a669bd160ddd7530d9365ae3086cc16d8c3120c5dc35b6079d2cab4a090dec76f5bb884e5d0e843887c16e447d95269f7e734693cdbef53507a6 SHA512 e7c7d1e5084cdc3373723c610a239759695fd1f6e346d1e32476679d4fe60be87df1ba5af7efb2bd1751b54af8e11be8b851b092caa6c8c672c163b19be2977a +DIST gnome-control-center-41.4.tar.xz 6616908 BLAKE2B 7c1a2692667c0447590d81c17ae990bff4b3bb7b85007ec70f8623d284cc0743ca79380dc60f1a9f97c01f897260c74acae0d730b197e8d4314e8002c7eec826 SHA512 63fa20041a06f5075d172b543176b4f037fcd623d9fa5ca5f785e047a9b95ccd002c423d29de673dcb28b7d99a83157b39d7bd65ef77fe70065e9a03b5ae38a4 +EBUILD gnome-control-center-41.4.ebuild 6116 BLAKE2B 48f777af0401e6a64b8b86ac4a8c565a2fe81efc99c04b240284053a668ad0512e4786677797349c341c090e1a11fd7708085ec1cf457b853df481aa4dc9643f SHA512 2755e695e61b24f029d437f9afb3f8c82b727bf336ae88ab343a6e6c3dd939ca950e5fc6a1eb7f57533e0db649dc58d72628385f265775f9a72eedc665c810eb +MISC metadata.xml 497 BLAKE2B 27aa6d9d725a3ce90d351442da83bdb5680f9931d78e5d6a653a1d2d392df118406e3eab36c77bbaeefc581be3a62c5df13fdfb611b2db27fc9c7440ba4ceae3 SHA512 c44903fa5a9462871c065bc776450c25bcca1dfe2f52d6bf676568f587bc308a0465bd5cb6e095fb0ecaefd0b8471df90df3b96164c7e7de76a86fbbe416a82b diff --git a/gnome-base/gnome-control-center/gnome-control-center-40.0.ebuild b/gnome-base/gnome-control-center/gnome-control-center-40.0.ebuild deleted file mode 100644 index 61e996591618..000000000000 --- a/gnome-base/gnome-control-center/gnome-control-center-40.0.ebuild +++ /dev/null @@ -1,179 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) - -inherit gnome.org gnome2-utils meson python-any-r1 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}-40.0-patchset-2.tar.xz" - -LICENSE="GPL-2+" -SLOT="2" -IUSE="+bluetooth +cups debug elogind flickr +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test v4l wayland" -RESTRICT="!test? ( test )" -REQUIRED_USE=" - flickr? ( gnome-online-accounts ) - ^^ ( elogind systemd ) -" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough -KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv x86" - -# meson.build depends on python unconditionally -BDEPEND="${PYTHON_DEPS}" - -# 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=" - >=gui-libs/libhandy-1:1= - gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.25.3:= ) - >=media-sound/pulseaudio-2.0[glib] - >=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.56.0:2 - >=gnome-base/gnome-desktop-3.33.4:3= - >=gnome-base/gnome-settings-daemon-3.27.90[colord,input_devices_wacom?] - >=gnome-base/gsettings-desktop-schemas-3.37.0 - dev-libs/libxml2:2 - >=sys-auth/polkit-0.114 - >=sys-power/upower-0.99.8:= - >=dev-libs/libgudev-232 - x11-libs/libX11 - >=x11-libs/libXi-1.2 - media-libs/libepoxy - flickr? ( >=media-libs/grilo-0.3.0:0.3= ) - >=x11-libs/gtk+-3.22.0:3[X,wayland=] - cups? ( - >=net-print/cups-1.7[dbus] - >=net-fs/samba-4.0.0[client] - ) - v4l? ( - >=media-video/cheese-3.28.0 ) - ibus? ( >=app-i18n/ibus-1.5.2 ) - networkmanager? ( - >=net-libs/libnma-1.8.0 - >=net-misc/networkmanager-1.24.0:=[modemmanager] - >=net-misc/modemmanager-0.7.990 ) - bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) - input_devices_wacom? ( >=dev-libs/libwacom-0.27 ) - kerberos? ( app-crypt/mit-krb5 ) - - x11-libs/cairo[glib] - >=x11-libs/colord-gtk-0.1.24 - net-libs/libsoup:2.4 - media-libs/fontconfig - gnome-base/libgtop:2= - >=sys-fs/udisks-2.1.8:2 - app-crypt/libsecret - media-libs/gsound - >=dev-libs/libpwquality-1.2.2 -" -# 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} - 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 ) ) - flickr? ( media-plugins/grilo-plugins:0.3[flickr,gnome-online-accounts] ) -" -# 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 - -BDEPEND=" - 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}] - ') ) -" - -PATCHES=( - # Patches from gnome-40 branch on top of 40.0 - # 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 - has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]" -} - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_prepare() { - xdg_src_prepare - # 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) - $(meson_use v4l cheese) - -Dcups=$(usex cups enabled disabled) - -Ddocumentation=true # manpage - -Dgoa=$(usex gnome-online-accounts enabled disabled) - -Dgrilo=$(usex flickr enabled disabled) - $(meson_use ibus) - -Dkerberos=$(usex kerberos enabled disabled) - -Dmalcontent=false # unpackaged - $(meson_use networkmanager network_manager) - -Dprivileged_group=wheel - -Dsnap=false - $(meson_use test tests) - $(meson_use debug tracing) - $(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) - ) - meson_src_configure -} - -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-40.7.ebuild b/gnome-base/gnome-control-center/gnome-control-center-40.7.ebuild deleted file mode 100644 index 35eb6612f6b3..000000000000 --- a/gnome-base/gnome-control-center/gnome-control-center-40.7.ebuild +++ /dev/null @@ -1,179 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) - -inherit gnome.org gnome2-utils meson python-any-r1 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/~leio/distfiles/${PF}-patchset.tar.xz" - -LICENSE="GPL-2+" -SLOT="2" -IUSE="+bluetooth +cups debug elogind flickr +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test v4l wayland" -RESTRICT="!test? ( test )" -REQUIRED_USE=" - flickr? ( gnome-online-accounts ) - ^^ ( elogind systemd ) -" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86" - -# meson.build depends on python unconditionally -BDEPEND="${PYTHON_DEPS}" - -# 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=" - >=gui-libs/libhandy-1:1= - gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.25.3:= ) - >=media-sound/pulseaudio-2.0[glib] - >=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.56.0:2 - >=gnome-base/gnome-desktop-3.33.4:3= - >=gnome-base/gnome-settings-daemon-3.27.90[colord,input_devices_wacom?] - >=gnome-base/gsettings-desktop-schemas-40_alpha - dev-libs/libxml2:2 - >=sys-auth/polkit-0.114 - >=sys-power/upower-0.99.8:= - >=dev-libs/libgudev-232 - x11-libs/libX11 - >=x11-libs/libXi-1.2 - media-libs/libepoxy - flickr? ( >=media-libs/grilo-0.3.0:0.3= ) - >=x11-libs/gtk+-3.22.0:3[X,wayland=] - cups? ( - >=net-print/cups-1.7[dbus] - >=net-fs/samba-4.0.0[client] - ) - v4l? ( - >=media-video/cheese-3.28.0 ) - ibus? ( >=app-i18n/ibus-1.5.2 ) - networkmanager? ( - >=net-libs/libnma-1.8.0 - >=net-misc/networkmanager-1.24.0:=[modemmanager] - >=net-misc/modemmanager-0.7.990 ) - bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) - input_devices_wacom? ( >=dev-libs/libwacom-0.27 ) - kerberos? ( app-crypt/mit-krb5 ) - - x11-libs/cairo[glib] - >=x11-libs/colord-gtk-0.1.24 - net-libs/libsoup:2.4 - media-libs/fontconfig - gnome-base/libgtop:2= - >=sys-fs/udisks-2.1.8:2 - app-crypt/libsecret - media-libs/gsound - >=dev-libs/libpwquality-1.2.2 -" -# 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} - 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 ) ) - flickr? ( media-plugins/grilo-plugins:0.3[flickr,gnome-online-accounts] ) -" -# 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 - -BDEPEND=" - 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}] - ') ) -" - -PATCHES=( - # Patches from gnome-40 branch on top of 40.0 - # 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 - has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]" -} - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_prepare() { - xdg_src_prepare - # 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) - $(meson_use v4l cheese) - -Dcups=$(usex cups enabled disabled) - -Ddocumentation=true # manpage - -Dgoa=$(usex gnome-online-accounts enabled disabled) - -Dgrilo=$(usex flickr 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 debug tracing) - $(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 - ) - meson_src_configure -} - -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-41.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-41.4.ebuild index 6843ae5bfd33..5f10276513a1 100644 --- a/gnome-base/gnome-control-center/gnome-control-center-41.2.ebuild +++ b/gnome-base/gnome-control-center/gnome-control-center-41.4.ebuild @@ -8,8 +8,7 @@ inherit gnome.org gnome2-utils meson python-any-r1 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/${PF}-patchset.tar.xz" -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-meson-0.61-build.patch.bz2" +SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-41.2-patchset.tar.xz" LICENSE="GPL-2+" SLOT="2" @@ -18,7 +17,7 @@ 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 ~ia64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv x86" # meson.build depends on python unconditionally BDEPEND="${PYTHON_DEPS}" @@ -125,9 +124,6 @@ PATCHES=( # https://bugzilla.gnome.org/686840, 697478, 700145 # Fix some absolute paths to be appropriate for Gentoo "${WORKDIR}"/patches/ - - # bug #831435 - "${WORKDIR}"/${P}-meson-0.61-build.patch ) python_check_deps() { diff --git a/gnome-base/gnome-control-center/metadata.xml b/gnome-base/gnome-control-center/metadata.xml index d6a9c29d21a7..1e05158abc3a 100644 --- a/gnome-base/gnome-control-center/metadata.xml +++ b/gnome-base/gnome-control-center/metadata.xml @@ -6,7 +6,6 @@ <name>Gentoo GNOME Desktop</name> </maintainer> <use> - <flag name="flickr">Add support for using photos from flickr as desktop background</flag> <flag name="gnome-online-accounts">Enable configuration panel for <pkg>net-libs/gnome-online-accounts</pkg> accounts</flag> <flag name="ibus">Enable support for enhanced input methods through <pkg>app-i18n/ibus</pkg></flag> </use> |