diff options
Diffstat (limited to 'gnome-base')
19 files changed, 752 insertions, 92 deletions
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz Binary files differindex 538f2e04cf10..35ea37e695e2 100644 --- a/gnome-base/Manifest.gz +++ b/gnome-base/Manifest.gz diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest index 13a51ce27441..6f709dbcd087 100644 --- a/gnome-base/gnome-control-center/Manifest +++ b/gnome-base/gnome-control-center/Manifest @@ -1,4 +1,4 @@ DIST gnome-control-center-41.2-patchset.tar.xz 6380 BLAKE2B de9eacf549686e43870df486994c5cd319f996edb2b09a7d3b5e9021c50b74c067e8c3cbabbc0ca68741fb3b4c5a2d65cc1ea72e20057ec59dab952fa886d527 SHA512 292737b34316ceff5eb43c598b0a8d2a7895e2891215137ba59defb935c6184e78f19e2485963a8642621a409ee87e0e2a1582403fd90ee3c83b2bc1f3334e27 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 +EBUILD gnome-control-center-41.4-r1.ebuild 6117 BLAKE2B 91a6d1c145971c45330865eb6017546cc4df1d99b87c441ba21edaef1ca3fa2eef9a8ce4396ad741a27557a3fa8e87e11ee54b35fb4d42321e129b5fe55bb742 SHA512 f7db79a7888306f9291c3e90eae254ffb85c7db5deb747b6af9d103a9cc9ea430e4a01642ec1017899fd452f24545031cde765c87c86168744f0973f0b58c588 MISC metadata.xml 497 BLAKE2B 27aa6d9d725a3ce90d351442da83bdb5680f9931d78e5d6a653a1d2d392df118406e3eab36c77bbaeefc581be3a62c5df13fdfb611b2db27fc9c7440ba4ceae3 SHA512 c44903fa5a9462871c065bc776450c25bcca1dfe2f52d6bf676568f587bc308a0465bd5cb6e095fb0ecaefd0b8471df90df3b96164c7e7de76a86fbbe416a82b diff --git a/gnome-base/gnome-control-center/gnome-control-center-41.4.ebuild b/gnome-base/gnome-control-center/gnome-control-center-41.4-r1.ebuild index 5f10276513a1..4d9543777d07 100644 --- a/gnome-base/gnome-control-center/gnome-control-center-41.4.ebuild +++ b/gnome-base/gnome-control-center/gnome-control-center-41.4-r1.ebuild @@ -57,7 +57,7 @@ DEPEND=" >=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:= ) + bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:2= ) input_devices_wacom? ( >=dev-libs/libwacom-0.27 ) kerberos? ( app-crypt/mit-krb5 ) diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest index fc11eb0f513c..5d1ffb3fa49a 100644 --- a/gnome-base/gnome-session/Manifest +++ b/gnome-base/gnome-session/Manifest @@ -5,5 +5,7 @@ AUX Gnome 2391 BLAKE2B ac78e23bb1172844c1da04a2615f03209b703d25d3e4d8976b7d62cc5 AUX defaults.list-r5 19379 BLAKE2B 9299c535bcb3ce6f291ba66dfe655f7e793d554f5fd7a5df5e8db665e43372f8c08a5ea8480e63e318befc5b2e56e4b027ca873947972aa2b19d14ba85f0ec3e SHA512 edee1126e11c3b49ebcea1e1a6929d55a28d09b6c382666d6d6a32271a4cf22af23927f7a5e15ecbd4a4cdaa41ac2f1ffc09350f4e48257e2e5e29ade08635ac AUX gnome-session-3.38.0-meson-Support-elogind.patch 2808 BLAKE2B da7ad139fe118edc4c53570acc5e56d59e3073caae7941c54b11c59208675eaa148eb03d437d0edfa0f0d024880b77bc60ba65140422f25319ac132299dfe972 SHA512 2a57894b95662ca4488f95110943076a82ecbe7f3bb8ed4d95e2c8082276839f4b1a7ecc20915557378e73e1947df856e4ff57d9d5b9ae32a9673f2cc3b2fbc2 DIST gnome-session-41.3.tar.xz 483396 BLAKE2B b5672868459b362452f62e6b543243df536a2edeaaa75dae09c5dedc9574fa58f6024aea5e0853361ae46cff6dcbfd257e6bc0da7ddfb028c3b0ae58d8ead63d SHA512 a75c038639301ccd1f0abf83f944890f74986e94dc32f45c97c1872ddc09bcebbb94116f7f865b1d9fa40a81133ec14fbfb75d585061750d9809af4abba3aa9a +DIST gnome-session-42.0.tar.xz 485616 BLAKE2B 0e77ad7fa2403c6cf22d087508d98281900d2f0e83ddbc8e25e6c0905398e04a893049ce90c79aebeddfeaafdcc16d7913c546294d92e488725fe4ec4e751928 SHA512 3d340700958b5800039e3009618709add2cdbaecb58344d9d2f93e4e761a737ef003091c380c68f95386dbb078b3d12f70732f0022611ab4a10e1c1eb988b4fa EBUILD gnome-session-41.3.ebuild 3462 BLAKE2B 2202d8a6e5dee7aa3559625101a7a03f0902b688e1ccdd496a267121af8b9ad4fd13c1b189d5458950cf37cbd4c436f5bfc732ca4444fd7a310a9994084dbc6d SHA512 06997a93a0859ab1d4b39a8ffc4ba8c065f4c9da41736efc7640d8f922bf93ab4375fa97cf2051c15455be2333e8ff8832500d548386e38b502ea7b2a5440c06 +EBUILD gnome-session-42.0.ebuild 3481 BLAKE2B db0d6d738d9fe6ef88d7362ff41bb9c5313d5805efab8902ba366ea1ef7047573ef1c2702556bc6adcd5425b3c8fc9c299b125cffccf18ba78b918d695925257 SHA512 3af3a0d0fddbe48b12d1ab564d4e655c27887b06d80f74b252124b5f0960a04fbf7088a143525fe3942f52b9279910aecfda4d901856b9bfab9e3673489c6cc1 MISC metadata.xml 349 BLAKE2B 675e33de85c98218f36cb44ac7e756e310530782ea6ef1f9e40a08e0ffaea810aaac0a72176a299c13192f92f03938fea5132b9726bce0fc6f50e1b1e42aba07 SHA512 c174185512a6df3648511062dfbeca054184f2357df8fd468553cb87421b72b876fe933161df738a8fa21f0637ad65963747ab761f2ada398061616ffb6f0f8a diff --git a/gnome-base/gnome-session/gnome-session-42.0.ebuild b/gnome-base/gnome-session/gnome-session-42.0.ebuild new file mode 100644 index 000000000000..7452977b4652 --- /dev/null +++ b/gnome-base/gnome-session/gnome-session-42.0.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit desktop gnome.org gnome2-utils meson xdg + +DESCRIPTION="Gnome session manager" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="doc elogind systemd" +# There is a null backend available, thus ?? not ^^ +REQUIRED_USE="?? ( elogind systemd )" + +DEPEND=" + >=dev-libs/glib-2.46.0:2 + >=x11-libs/gtk+-3.22.0:3 + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + >=gnome-base/gnome-desktop-3.34.2:3= + >=dev-libs/json-glib-0.10 + media-libs/mesa[egl(+),gles2,X(+)] + media-libs/libepoxy + x11-libs/libXcomposite + + systemd? ( >=sys-apps/systemd-242:0= ) + elogind? ( >=sys-auth/elogind-239.4 ) +" + +# Pure-runtime deps from the session files should *NOT* be added here. +# >=gnome-settings-daemon-3.35.91 for UsbProtection required component. +# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and +# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_* +# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below). +# sys-apps/dbus[X] is needed for session management. +# Our 90-xcursor-theme-gnome reads a setting from gsettings-desktop-schemas. +RDEPEND="${DEPEND} + >=gnome-base/gnome-settings-daemon-3.35.91 + >=gnome-base/gsettings-desktop-schemas-0.1.7 + sys-apps/dbus[X] + + x11-misc/xdg-user-dirs + x11-misc/xdg-user-dirs-gtk +" +BDEPEND=" + dev-libs/libxslt + dev-util/gdbus-codegen + >=sys-devel/gettext-0.19.8 + x11-libs/xtrans + virtual/pkgconfig + doc? ( app-text/xmlto + app-text/docbook-xml-dtd:4.1.2 ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-3.38.0-meson-Support-elogind.patch +) + +src_prepare() { + default + xdg_environment_reset + + # Install USE=doc in ${PF} if enabled + sed -i -e "s:meson\.project_name(), 'dbus':'${PF}', 'dbus':" doc/dbus/meson.build || die +} + +src_configure() { + local emesonargs=( + -Ddeprecation_flags=false + $(meson_use elogind) + -Dsession_selector=true # gnome-custom-session + $(meson_use systemd) + -Dsystemd_session=$(usex systemd default disable) + $(meson_use systemd systemd_journal) + $(meson_use doc docbook) + -Dconsolekit=false + -Dman=true + ) + meson_src_configure +} + +src_install() { + meson_src_install + + exeinto /etc/X11/Sessions + doexe "${FILESDIR}/Gnome" + + newmenu "${FILESDIR}/defaults.list-r5" gnome-mimeapps.list + + exeinto /etc/X11/xinit/xinitrc.d/ + newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome + + # This should be done here as discussed in bug #270852 + newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome + + # Set XCURSOR_THEME from current dconf setting instead of installing + # default cursor symlink globally and affecting other DEs (bug #543488) + # https://bugzilla.gnome.org/show_bug.cgi?id=711703 + newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update + + if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; then + ewarn "If you use a custom .xinitrc for your X session," + ewarn "make sure that the commands in the xinitrc.d scripts are run." + fi + + if ! use systemd && ! use elogind; then + ewarn "You are building without systemd or elogind support." + ewarn "gnome-session won't be able to correctly track and manage your session." + fi +} + +pkg_postrm() { + xdg_pkg_postinst + gnome2_schemas_update +} diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest index 89fc5f76deb3..fc02dd9aed01 100644 --- a/gnome-base/gnome-settings-daemon/Manifest +++ b/gnome-base/gnome-settings-daemon/Manifest @@ -1,9 +1,11 @@ +AUX 42.1-build-Make-wacom-optional-and-controllable-via-meson.patch 1759 BLAKE2B e734dfb341143f3f246d268ff479a528fa09d6c5e496611e06e4ffea914098349eab2b2c5a4a55e8b47e5032b68bf6b929b76a1aa899402953cdcc1d3cf0589e SHA512 faffde0cd940ac6a8dabdab09ea38bd126e11822e75df5adf1a0bb3b055135a8c52abbb6ecb4d71476899ec0c5d8a78ba0075cb84cfebafe6c3aa5310dfca308 AUX gnome-settings-daemon-3.38.1-Allow-udev-optional-on-Linux.patch 4505 BLAKE2B a61199b8da339dbe9bbe7e8941a56958f5a69fafeb95c6f7027c483e35b193854560ad12f2df45dd8374db1abcefd9bfb8dae5b5381be3215755f907a73726ec SHA512 468a73b69f441886d1ce5e0e5f263ea695170a3610f6124100e3eaed1d8dd62c3439193461620d6f8b18c81d2066163ff2c1839194ebcfeec424868163f46997 AUX gnome-settings-daemon-3.38.1-build-Allow-NM-optional-on-Linux.patch 694 BLAKE2B e4f32a376c2b1c55a396504e98c8a69d512bb9161a854482aa877023a2761e59d3fc682d724398ffb53bc138b010c33276071359d42ac19bcac2d9af87d42eef SHA512 618ad312b54709d0f95e5d881c2896c156246ae41eee1925f76b0a398b7ce6815a7466f8587f2291b07f7a34d1a3e1afb7df33823d9b52ebe8ad46a3f5f1e84d AUX gnome-settings-daemon-3.38.1-build-Make-colord-and-wacom-optional-and-controllabl.patch 3096 BLAKE2B 44587b5a73c5c1a622a8e5a422f03da414856e79edce30056f56fe93a7dcea0ca5a84be737de7fe723f023bb65714d589f60819667432109a212fc03ec4c7b68 SHA512 5ebfd528f7c446c02bf2c4160b91600e7dc27a3f6c17fec071ab9a72c6e4fffc3ba81427bdf7ba10d19cb5059238ec798ab136711018bd3269bbd658ed1c0632 -AUX gnome-settings-daemon-40.0.1-build-fix-str-bool-comparison.patch 909 BLAKE2B ae6115763a16d2ec54ad96c970f5b5a4df310a6818059ab9bb9e9a6f874f209ac05f17cd248e8a335631d9822a3df3de975d63704c458af0ccab3fd8da91b815 SHA512 7635b8c7370410921ae39a9f1278e45147261ad9a2b30b95ed07f1d08c9e0de86acdaafca99c04e4a78d646490f8f5356472887accff2d8e6057887ba52d8438 AUX gnome-settings-daemon-41.0-meson-0.61-build.patch 843 BLAKE2B 0f922f7f35e6801795508d5cabfb388e091c436f97d4745eb93fa5f0ea71d53f73c341315f65d4af1855bbef08555201fd38cc01e6e2fcf32d997fd0f1e2dae8 SHA512 2eda9c6e9a2c5cd82dc16a95b8f8043db47f996b27f3c2d3d30b56476d5f5cd8fb125e31ea622d0efabdeb76d769050e33bbd41d97376fc024ab36919d5ac9c2 AUX org.gnome.settings-daemon.plugins.power.gschema.override 75 BLAKE2B 1c80bbb15e998de9f5fddc956dab862552ecc3734083391f124ef577dd2efb70e29efd230511cca83536dcd8c32118ecebcfe52b2927d6f0094540ec73a6ae23 SHA512 9c4b1e1b63b1a6d97eed962969704accca2fc53763a4b7806e2a3e4ff49ecc7d4a0d7f8253ff2e33d83e766908d852721ffa33f363aed7d04c20002bfdee173b DIST gnome-settings-daemon-41.0.tar.xz 1477876 BLAKE2B f17005b03cbee142434f0805e8f590d6d9edad0f09b3226bb40ab7e312ee13bcd46c211efb140303d4a351d8818238a28bd9aa3fe760fb617fb006e97eebde61 SHA512 2c6848a749f84fd0c3a9ade6f4a83ae3ff7464da429b2d73030c9dcbd278b070c40475c678c819e31464941f2bd38d81f11b96f24d0d1fb05271267c3a1ecc2a +DIST gnome-settings-daemon-42.1.tar.xz 1481432 BLAKE2B d045b2e2a17c6c54f0014db03e1b2d645086d907383b849de82f972af39463acf06ab1207817f171fd3b7a33b60303d058f04495158bb49aab7899da740f732c SHA512 20e87fc2318d77af016ec071cc6070f43ac42eaaf60a1f9bdb4278f59e038268e0a37759f0ab31068d8701b9dc64d142c0a875f0eeaa700ad47e0dbca3b9d141 EBUILD gnome-settings-daemon-41.0.ebuild 3954 BLAKE2B a1e545560d68d18ed28bf025197b2998756ef08219727acd547e652dfed4573961307741eac8cb3a7021c9edd7adcf18bd281737e8330195457705f4d051fd02 SHA512 b8ef84e4dc1294b9dd4c9e1a0dc24b6406292e78b3e7276c9d407933aeb6d844ed8e67a3ff734e2df1118f75954aa34c3a324e9462e685b60ee44cd0f6571103 +EBUILD gnome-settings-daemon-42.1.ebuild 3910 BLAKE2B 777dcb7e34c39976e3cddfe9ca4e4f5faf22d638c668f7a5af3ebe9c2c44c894524fb61efc0b629163c96adb64189f6314eb31b759b03f62d89e215321958014 SHA512 3c09129d05c6437decf691b07252af19231b3bd9a503b24629e4085b4a398a0a9a2b01822925a80234bb91b0d1cd9593fbec67c68faa457760be70d9a044f74f MISC metadata.xml 547 BLAKE2B ef7c1ef4b899bd7ba6f1d05b725a5c2205e949d03d41ae4922559e740fd94ecf767c25da34a9a45a4da796e336133ed250f675a525fec9db5fb53c4c7df35dd4 SHA512 ddc99a174f19c7c949cee4d130082572bcf71dc9c50d637cd94ea0f3609b9d032ff603552c2b077245cadc6cf03f8726cf81efe89fbf2e8b3e5293dcc572005c diff --git a/gnome-base/gnome-settings-daemon/files/42.1-build-Make-wacom-optional-and-controllable-via-meson.patch b/gnome-base/gnome-settings-daemon/files/42.1-build-Make-wacom-optional-and-controllable-via-meson.patch new file mode 100644 index 000000000000..3956b7413978 --- /dev/null +++ b/gnome-base/gnome-settings-daemon/files/42.1-build-Make-wacom-optional-and-controllable-via-meson.patch @@ -0,0 +1,40 @@ +From 1e07481d4fd989828a7237c365e5420f50196ddd Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +Date: Thu, 14 Mar 2019 09:43:00 +0200 +Subject: [PATCH] build: Make wacom optional and controllable via meson_options + +--- + meson.build | 4 ++-- + meson_options.txt | 1 + + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index a8955a49..0ac4f3ba 100644 +--- a/meson.build ++++ b/meson.build +@@ -154,8 +154,8 @@ if enable_wayland + endif + config_h.set10('HAVE_WAYLAND', enable_wayland) + +-# wacom (disabled for s390/s390x and non Linux platforms) +-enable_wacom = host_is_linux_not_s390 ++# wacom ++enable_wacom = get_option('wacom') + if enable_wacom + assert(enable_gudev, 'GUDev support is required for wacom support.') + libwacom_dep = dependency('libwacom', version: '>= 0.7') +diff --git a/meson_options.txt b/meson_options.txt +index 3e04cf64..010053e2 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -9,6 +9,7 @@ option('network_manager', type: 'boolean', value: true, description: 'build with + option('rfkill', type: 'boolean', value: true, description: 'build with rfkill support (not optional on Linux platforms)') + option('smartcard', type: 'boolean', value: true, description: 'build with smartcard support') + option('usb-protection', type: 'boolean', value: true, description: 'build with usb-protection support') ++option('wacom', type: 'boolean', value: true, description: 'build with Wacom devices support') + option('wayland', type: 'boolean', value: true, description: 'build with Wayland support') + option('wwan', type: 'boolean', value: true, description: 'build with WWAN support') + option('colord', type: 'boolean', value: true, description: 'build with colord support') +-- +2.34.1 + diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-40.0.1-build-fix-str-bool-comparison.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-40.0.1-build-fix-str-bool-comparison.patch deleted file mode 100644 index 19cb682ca296..000000000000 --- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-40.0.1-build-fix-str-bool-comparison.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 28e28e9e598342c897ae5ca350d0da6f4aea057b Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Fri, 16 Jul 2021 16:02:36 +0200 -Subject: [PATCH] build: Fix str/bool comparison - -gnome-settings-daemon/meson.build:87: WARNING: Trying to compare values of different types (str, bool) using ==. -The result of this is undefined and will become a hard error in a future Meson release. ---- - meson.build | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/meson.build b/meson.build -index fdf71713..ba2a90ca 100644 ---- a/meson.build -+++ b/meson.build -@@ -82,9 +82,7 @@ elif gsd_buildtype.contains('release') - common_flags += ['-DG_DISABLE_CAST_CHECKS'] - endif - --# Workaround for meson's bug --# https://github.com/mesonbuild/meson/pull/1896 --if get_option('b_ndebug') == true -+if get_option('b_ndebug') == 'true' - common_flags += ['-DG_DISABLE_ASSERT'] - endif - --- -GitLab - diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.1.ebuild new file mode 100644 index 000000000000..43fc4b23d465 --- /dev/null +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.1.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{8..10} ) + +inherit gnome.org gnome2-utils python-any-r1 meson udev virtualx xdg + +DESCRIPTION="Gnome Settings Daemon" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-settings-daemon" + +LICENSE="GPL-2+ LGPL-2+" +SLOT="0" +IUSE="+colord +cups debug elogind input_devices_wacom modemmanager networkmanager smartcard systemd test +udev wayland" +RESTRICT="!test? ( test )" +REQUIRED_USE=" + ^^ ( elogind systemd ) + input_devices_wacom? ( udev ) + wayland? ( udev ) +" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" + +DEPEND=" + >=sci-geosciences/geocode-glib-3.10 + >=dev-libs/glib-2.58:2 + >=gnome-base/gnome-desktop-3.37.1:3= + >=gnome-base/gsettings-desktop-schemas-42 + >=x11-libs/gtk+-3.15.3:3[X,wayland?] + >=dev-libs/libgweather-4.0.0:4= + colord? ( + >=x11-misc/colord-1.4.5:= + >=media-libs/lcms-2.2:2 + ) + media-libs/libcanberra[gtk3] + >=app-misc/geoclue-2.3.1:2.0 + >=x11-libs/libnotify-0.7.3 + >=media-sound/pulseaudio-12.99.3[glib] + >=sys-auth/polkit-0.114 + >=sys-power/upower-0.99.12:= + x11-libs/libX11 + >=x11-libs/libXfixes-6.0.0 + udev? ( dev-libs/libgudev:= ) + wayland? ( dev-libs/wayland ) + input_devices_wacom? ( + >=dev-libs/libwacom-0.7 + >=x11-libs/pango-1.20.0 + x11-libs/gdk-pixbuf:2 + ) + smartcard? ( >=dev-libs/nss-3.11.2 ) + cups? ( >=net-print/cups-1.4[dbus] ) + modemmanager? ( + >=app-crypt/gcr-3.7.5:= + >=net-misc/modemmanager-1.0:= + ) + networkmanager? ( >=net-misc/networkmanager-1.0 ) + media-libs/alsa-lib + x11-libs/libXi + x11-libs/libXext + media-libs/fontconfig + systemd? ( + >=sys-apps/systemd-243 + ) +" +# logind needed for power and session management, bug #464944 +# gnome-session-3.33.90/gdm-3.33.90/gnome-shell-extensions-3.34.1/gnome-flashback-3.33.1 adapt to Clipboard and Mouse component removals (moved to mutter) +RDEPEND="${DEPEND} + gnome-base/dconf + elogind? ( sys-auth/elogind ) + !<gnome-base/gnome-session-3.33.90 + !<gnome-base/gdm-3.33.90 + !<gnome-extra/gnome-shell-extensions-3.34.1 + !<gnome-base/gnome-flashback-3.33.1 +" +# rfkill requires linux/rfkill.h (and USE=udev), thus linux-headers dep, not os-headers. If this package wants to work on other kernels, we need to make rfkill conditional instead +BDEPEND=" + sys-kernel/linux-headers + dev-util/glib-utils + dev-util/gdbus-codegen + x11-base/xorg-proto + ${PYTHON_DEPS} + test? ( + $(python_gen_any_dep ' + dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-python/python-dbusmock[${PYTHON_USEDEP}] + ') + gnome-base/gnome-session + ) + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/42.1-build-Make-wacom-optional-and-controllable-via-meson.patch + "${FILESDIR}"/${PN}-3.38.1-build-Allow-NM-optional-on-Linux.patch + "${FILESDIR}"/${PN}-3.38.1-Allow-udev-optional-on-Linux.patch +) + +python_check_deps() { + if use test; then + has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" && + has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]" + fi +} + +pkg_setup() { + python-any-r1_pkg_setup +} + +src_configure() { + local emesonargs=( + #-Dnssdb_dir # TODO: Is the default /etc/pki/nssdb path correct for our nss? + -Dudev_dir="$(get_udevdir)" + $(meson_use systemd) + -Dalsa=true + $(meson_use udev gudev) + $(meson_use colord) + $(meson_use cups) + $(meson_use networkmanager network_manager) + $(meson_use udev rfkill) + $(meson_use smartcard) + $(meson_use input_devices_wacom wacom) + $(meson_use wayland) + $(meson_use modemmanager wwan) + ) + meson_src_configure +} + +src_install() { + meson_src_install + # Don't auto-suspend by default on AC power + insinto /usr/share/glib-2.0/schemas + doins "${FILESDIR}"/org.gnome.settings-daemon.plugins.power.gschema.override +} + +src_test() { + virtx meson_src_test +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest index 3e4aff219284..3713d27a872e 100644 --- a/gnome-base/gnome-shell/Manifest +++ b/gnome-base/gnome-shell/Manifest @@ -1,6 +1,9 @@ AUX 40.0-defaults.patch 1412 BLAKE2B e36f7215cf756586479b8bdc71339beb3bbde53ca9745ddc4ef1c3feb59c720e4920e8aa4aadd7912874c386e7495a4b5d554e0d0616db17a81c4ec52a2baa6b SHA512 d82cf1e329d5974755738e29e6366bb10452620021a5db6c2ec63c4ee38e87a65dada34d57026e9510dbffa78c7060ae6f2ccec1739e3026bb0c67dab95f94a9 AUX 40.0-optional-bluetooth.patch 2034 BLAKE2B 9df252dbef229d372bae87ab017d49086090a4194644fc0f7f3dc78226f78fa58cb99d67d4aac2b156894721658c6094aa6609c0da8c707cf0a8dac5a9a404ee SHA512 ec82f1ef7a9123134af2617526c22fa4258413edb6d68acdcd074911b98ed27d2e761904ccd88a364d9064d79bdefd402988bc53e1139f0e54f993c84242f19f AUX 41.3-fix-build-with-meson-0.61.1.patch 3166 BLAKE2B 85378cb7a5ccf02833c409c9c0735d6004d59aa7cb915902b1b518d41235f89b649b353ecefce6228ff42724d6a299c18b3397f7bd584509a06356784871ce48 SHA512 70af8bc42e7a15d68834eed58dd3cac0074e2aa0ccc55c028112b9e06aaf79ffd41a135e1366a1d8131f5acd3857d282cf2471845df7cb301b1de10503e47e1f +AUX 42.0-optional-bluetooth.patch 2032 BLAKE2B 635ba18f5bb5ca0c9f44fe11c2b52652355e1de4647c277524e3f19ef6d57870e75f32b8a2be10eb4e3be4ecf885765b8f0899ab71906f71324795763effa23a SHA512 5fb17c6ffd0486e43b5451747b346e5e9feb3f918f4ef23adc517c43bf61eb5b8850b03022e84848e446de1f0b2145a9dd2b954dde9994e9da176559cd6e48a8 DIST gnome-shell-41.4.tar.xz 1899464 BLAKE2B 202408be8886bb5eb5615328a774993bea8dfe2fb78d304fde2806096ca68eff3fae7d5bdb4972b627cf10192ff76e3d457dc37eaa806cd4ed57d1558c235a48 SHA512 6ed5f215fcf9a1cf450b406620568aeceb3d255e0bb979151ccd2260565748e69825d7f5f7fb0c6768ed584a530599a8dcbc713c1ec12617551ae9df782c5ad7 -EBUILD gnome-shell-41.4.ebuild 7392 BLAKE2B 508fe29d8ea87a2edca732cef755467d6311bc28f14ee15eb5148d871b72e4621c2561c57ce6c3c94e46a40183bed406dbed529ea3481231352d6973a6a4fa2c SHA512 1993d9bf8edeb8d45eb466f5175bf7567805ec62998f2ec0922a7341f83b30dde31f170c16b8ef1e04d43a79ca1d75219bac954ad99b326face76aea23011959 +DIST gnome-shell-42.0.tar.xz 1918044 BLAKE2B 742d13ad92795fb71bbe8376a86b8e9a828882288f105f026cf98304ef2e9eae8fb967fa978ec322f5c621303a1798d3490c001bbd63c704b0cddc5db688389d SHA512 39b56d3c09a238d9ca387145fdbddfaa929b124d4006f097b792de2dceb882e50cbce1255b0b4585aea04b522a92a4e7a743367f43a863f95bb6386401e73935 +EBUILD gnome-shell-41.4-r1.ebuild 7395 BLAKE2B 3769ab65768b699cf7394ea80a22274279c3d410da4b3d05ceb7f1ce33d9aa41524a0bb4de2a5b11acf9b540cf11c5c9a23c236e4a2df6e41544a74577a37ab7 SHA512 4af8c66e12a16e05e82389a7a28a7e49ae34ed72e68b6ce373a8c223be207f2fdbc007ec9d8fe57b4a53e5612c41f062225fe47d6851cd5481e3d34051cec2da +EBUILD gnome-shell-42.0.ebuild 7339 BLAKE2B 4601218900ac4c6704401ce87422fd66f1917c593434e1b43f89fa066bb3f94f75a312b6168d94dcd9de165c8ad3fa94dcf036893be72e142b4d820b3ced4a55 SHA512 d51e4861fcd4854b16ce50f4fd23eacc057b6a49d4f92eec2601f91868c57031484feced5c502a7060e66f0f65d8f6da888e5cee5ef8f12503ecbeed7d60c2e5 MISC metadata.xml 1051 BLAKE2B 86f9156deb6546719e6bcd09ad609b2837901743dd390f430521226df6b9e8f54387d2c93411d63d0099261ee0463428fb8854ce2c47463b999827b377807d84 SHA512 f6a3efe242c1726508a56506a7817c3beea3cb17fbe37d2d38403bc6f4f1d11fd366b68b5c9c6ce44f200a21d48da6ccfcf07c9758369481376b5882ea872129 diff --git a/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch b/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch new file mode 100644 index 000000000000..c7fe07dd69de --- /dev/null +++ b/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch @@ -0,0 +1,59 @@ +From d7cfd7bff4f9fa9d8528f72d4275e07551c6b288 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +Date: Thu, 28 Feb 2019 00:50:19 +0200 +Subject: [PATCH] build: Make bluetooth support optional + +--- + js/misc/meson.build | 2 +- + meson.build | 7 ++++++- + meson_options.txt | 6 ++++++ + 3 files changed, 13 insertions(+), 2 deletions(-) + +diff --git a/js/misc/meson.build b/js/misc/meson.build +index 582562711..ec9c62645 100644 +--- a/js/misc/meson.build ++++ b/js/misc/meson.build +@@ -3,7 +3,7 @@ jsconf.set('PACKAGE_NAME', meson.project_name()) + jsconf.set('PACKAGE_VERSION', meson.project_version()) + jsconf.set('GETTEXT_PACKAGE', meson.project_name()) + jsconf.set('LIBMUTTER_API_VERSION', mutter_api_version) +-jsconf.set10('HAVE_BLUETOOTH', bt_dep.found()) ++jsconf.set10('HAVE_BLUETOOTH', have_bluetooth) + jsconf.set10('HAVE_NETWORKMANAGER', have_networkmanager) + jsconf.set10('HAVE_SOUP2', have_soup2) + jsconf.set('datadir', datadir) +diff --git a/meson.build b/meson.build +index 8d7478f9b..79d340840 100644 +--- a/meson.build ++++ b/meson.build +@@ -93,7 +93,12 @@ x11_dep = dependency('x11') + schemas_dep = dependency('gsettings-desktop-schemas', version: schemas_req) + gnome_desktop_dep = dependency('gnome-desktop-3.0', version: gnome_desktop_req) + +-bt_dep = dependency('gnome-bluetooth-3.0', version: bt_req, required: false) ++if get_option('bluetooth') ++ bt_dep = dependency('gnome-bluetooth-3.0', version: bt_req) ++ have_bluetooth = true ++else ++ have_bluetooth = false ++endif + gst_dep = dependency('gstreamer-1.0', version: gst_req, required: false) + gst_base_dep = dependency('gstreamer-base-1.0', required: false) + pipewire_dep = dependency('libpipewire-0.3', required: false) +diff --git a/meson_options.txt b/meson_options.txt +index f0f2ecf6c..85fc58ea4 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,3 +1,9 @@ ++option('bluetooth', ++ type: 'boolean', ++ value: true, ++ description: 'Enable bluetooth support' ++) ++ + option('extensions_tool', + type: 'boolean', + value: true, +-- +2.34.1 + diff --git a/gnome-base/gnome-shell/gnome-shell-41.4.ebuild b/gnome-base/gnome-shell/gnome-shell-41.4-r1.ebuild index 1d1c98f736d5..a0a38c2b4fa2 100644 --- a/gnome-base/gnome-shell/gnome-shell-41.4.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-41.4-r1.ebuild @@ -34,7 +34,7 @@ DEPEND=" >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.19 >=gnome-base/gnome-desktop-3.35.90:3=[introspection] - bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) + bluetooth? ( >=net-wireless/gnome-bluetooth-3.9:2=[introspection] ) >=media-libs/gstreamer-0.11.92:1.0 media-libs/gst-plugins-base:1.0 >=media-video/pipewire-0.3.0:= diff --git a/gnome-base/gnome-shell/gnome-shell-42.0.ebuild b/gnome-base/gnome-shell/gnome-shell-42.0.ebuild new file mode 100644 index 000000000000..db9135e544bf --- /dev/null +++ b/gnome-base/gnome-shell/gnome-shell-42.0.ebuild @@ -0,0 +1,202 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{8..10} ) + +inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg + +DESCRIPTION="Provides core UI functions for the GNOME desktop" +HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell" + +LICENSE="GPL-2+ LGPL-2+" +SLOT="0" +IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy test" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + ?? ( elogind systemd )" +RESTRICT="!test? ( test )" + +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + +# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h> +# FIXME: +# * gstreamer/pipewire support is currently automagic +DEPEND=" + >=gnome-extra/evolution-data-server-3.33.1:= + >=app-crypt/gcr-3.7.5[introspection] + >=dev-libs/glib-2.68:2 + >=dev-libs/gobject-introspection-1.49.1:= + >=dev-libs/gjs-1.71.1 + >=x11-libs/gtk+-3.15.0:3[introspection] + >=x11-wm/mutter-42.0:0/10[introspection,test?] + >=sys-auth/polkit-0.100[introspection] + >=gnome-base/gsettings-desktop-schemas-42_beta[introspection] + >=x11-libs/startup-notification-0.11 + >=app-i18n/ibus-1.5.19 + >=gnome-base/gnome-desktop-3.35.90:3=[introspection] + bluetooth? ( net-wireless/gnome-bluetooth:3=[introspection] ) + >=media-libs/gstreamer-0.11.92:1.0 + media-libs/gst-plugins-base:1.0 + >=media-video/pipewire-0.3.0:= + networkmanager? ( + >=net-misc/networkmanager-1.10.4:=[introspection] + net-libs/libnma[introspection] + >=app-crypt/libsecret-0.18 + dev-libs/dbus-glib ) + systemd? ( >=sys-apps/systemd-242 + >=gnome-base/gnome-desktop-3.34.2:3=[systemd] ) + elogind? ( >=sys-auth/elogind-237 ) + + app-arch/gnome-autoar + dev-libs/json-glib + + >=app-accessibility/at-spi2-atk-2.5.3 + x11-libs/gdk-pixbuf:2[introspection] + dev-libs/libxml2:2 + x11-libs/libX11 + + >=media-sound/pulseaudio-2[glib] + >=dev-libs/atk-2[introspection] + dev-libs/libical:= + >=x11-libs/libXfixes-5.0 + + gui-libs/gtk:4[introspection] + + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_USEDEP}] + ') + media-libs/mesa[X(+)] +" +# Runtime-only deps are probably incomplete and approximate. +# Introspection deps generated from inspection of the output of: +# for i in `rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- |sort -u`; do echo $i ;done |cut -d, -f1 |sort -u +# or +# rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- | sed -e 's:[{}]::g' | awk '{$1=$1; print}' | awk -F',' '{$1=$1;print}' | tr ' ' '\n' | sort -u | sed -e 's/://g' +# These will give a lot of unnecessary things due to greedy matching (TODO), and `(?s).*?` doesn't seem to work as desired. +# Compare with `grep -rhI 'imports.gi.versions' |sort -u` for any SLOT requirements +# Each block: +# 1. Introspection stuff needed via imports.gi (those that build time check may be listed above already) +# 2. gnome-session needed for shutdown/reboot/inhibitors/etc +# 3. Control shell settings +# 4. xdg-utils needed for xdg-open, used by extension tool +# 5. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+) +# 6. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c # TODO: Review +# 7. IBus is needed for nls integration +# 8. Optional telepathy chat integration +# 9. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too) +# 10. xdg-desktop-portal-gtk for various integration, e.g. #764632 +# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper +RDEPEND="${DEPEND} + >=sys-apps/accountsservice-0.6.14[introspection] + app-accessibility/at-spi2-core:2[introspection] + app-misc/geoclue[introspection] + media-libs/graphene[introspection] + >=dev-libs/libgweather-4.0.0:4[introspection] + x11-libs/pango[introspection] + net-libs/libsoup:2.4[introspection] + >=sys-power/upower-0.99:=[introspection] + gnome-base/librsvg:2[introspection] + + >=gnome-base/gnome-session-2.91.91 + >=gnome-base/gnome-settings-daemon-3.8.3 + + x11-misc/xdg-utils + + >=x11-themes/adwaita-icon-theme-3.26 + + networkmanager? ( + net-misc/mobile-broadband-provider-info + sys-libs/timezone-data ) + ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] ) + telepathy? ( + >=net-im/telepathy-logger-0.2.4[introspection] + >=net-libs/telepathy-glib-0.19[introspection] ) + media-fonts/cantarell + + sys-apps/xdg-desktop-portal-gtk +" +# avoid circular dependency, see bug #546134 +PDEPEND=" + >=gnome-base/gdm-3.5[introspection(+)] + >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?] + browser-extension? ( gnome-extra/chrome-gnome-shell ) +" +BDEPEND=" + dev-libs/libxslt + >=dev-util/gdbus-codegen-2.45.3 + dev-util/glib-utils + gtk-doc? ( >=dev-util/gtk-doc-1.17 + app-text/docbook-xml-dtd:4.5 ) + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" +# These are not needed from tarballs, unless stylesheets or manpage get patched with patchset: +# dev-lang/sassc +# app-text/asciidoc + +PATCHES=( + # Fix automagic gnome-bluetooth dep, bug #398145 + "${FILESDIR}"/42.0-optional-bluetooth.patch + # Change favorites defaults, bug #479918 + "${FILESDIR}"/40.0-defaults.patch +) + +src_prepare() { + xdg_src_prepare + # Hack in correct python shebang + sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die +} + +src_configure() { + local emesonargs=( + $(meson_use bluetooth) + -Dextensions_tool=true + -Dextensions_app=true + $(meson_use gtk-doc gtk_doc) + -Dman=true + $(meson_use test tests) + $(meson_use networkmanager) + $(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4 + # (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session) + # suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary + -Dsoup2=true # libslot SLOT needs to match with what libgweather is using + ) + meson_src_configure +} + +src_test() { + gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed + virtx meson_src_test +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update + + if ! has_version 'media-libs/gst-plugins-good:1.0' || \ + ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then + ewarn "To make use of GNOME Shell's built-in screen recording utility," + ewarn "you need to either install media-libs/gst-plugins-good:1.0" + ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" + ewarn "apps.gnome-shell.recorder/pipeline to what you want to use." + fi + + if ! has_version "media-libs/mesa[llvm]"; then + elog "llvmpipe is used as fallback when no 3D acceleration" + elog "is available. You will need to enable llvm USE for" + elog "media-libs/mesa if you do not have hardware 3D setup." + fi + + # https://bugs.gentoo.org/show_bug.cgi?id=563084 + # TODO: Is this still the case after various fixed in 3.28 for detecting non-working KMS for wayland (to fall back to X)? + if has_version "x11-drivers/nvidia-drivers[-kms]"; then + ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers," + ewarn "otherwise Gnome will fail to start" + fi +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest index 9ea76638c48f..47c32e934cc4 100644 --- a/gnome-base/gsettings-desktop-schemas/Manifest +++ b/gnome-base/gsettings-desktop-schemas/Manifest @@ -1,4 +1,6 @@ AUX 3.32.0-default-fonts.patch 1386 BLAKE2B 7d1c4a8279b9b8ca752804ea45efed9b61ec9844843793dc568e3012d3cd80c7a5f7a921e8dcc42406c6e15010fa472edf9cb10b7c86d1f8f69da2f6a3a034b7 SHA512 190129064554a36b56ba308f8dd75a9b8ee5ccfadffc0b5d528b5ba70324bcb3436acab116ad7768f59d316c3c2bd85dad9e8147050cb475b21fce439cb92705 DIST gsettings-desktop-schemas-41.0.tar.xz 705240 BLAKE2B 2f2eb797fbdb7317666839a4ddffd65405ddcca80724a480bd1decfc164acc4c0db193ca6a3e3bcd71fbeb479fe51c5262c0bcf40fe85cfb2d6bda5b47d5b6e5 SHA512 58f9f60d818f0ddce20ad70e6ca64d3e1fb5a5dfd45b737cc055901f7dd5f1625902451e765a26969bdd72e3b37300dacbd3555a4bc3f33c6667dbf9b1869739 +DIST gsettings-desktop-schemas-42.0.tar.xz 709372 BLAKE2B abe682b32dc3c419a65b3752b9fa6821ed0058f06a4b123728a8d095ff3b6f65b569d9b80d43aac28fa5d79439c316cb628f0c63cd500c7ebc40cc4eff704bdb SHA512 db73988a6b38857d1aa6588ccac42099c57dcc187ef01776567cc7c28aff67dc06d6a8a067e0c69167d03cd865f0c1d58e75469a40f969084bb2537b088f8664 EBUILD gsettings-desktop-schemas-41.0.ebuild 1124 BLAKE2B 3aba04271de57a81acb84c9acd623692b31debdbcec74680fc067458139e70301d1a53558122740cfa7ca417cd29cad10ebfa6c4c43986dfd33a40d1cb96a038 SHA512 ad6e8e6b60ed13b2cac922007566481377883537d344eef8a759b972378381851cc051eaa6b41a14ca0f4449f62d9625d0c52f372e2474030c3e5098027635b8 +EBUILD gsettings-desktop-schemas-42.0.ebuild 1131 BLAKE2B 06bda37dd9ef06b89fbfe3d8b795c638be5cf9ac066c995489875f4e04d02ecb9c12f3ee6ce15b42b995c7ad7c68accf3983079dac16b1d4605a4baa20d0bccf SHA512 48349d9f5b74a149d6993dd49b8949317e564b946d03a6c6e48badc8be51d4fcbdaec72dc0521682bdec7b7d67a3fbab85d0ae138d5d7c726abf4b3422a7be9d MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8 diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-42.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-42.0.ebuild new file mode 100644 index 000000000000..9af8626a7cbc --- /dev/null +++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-42.0.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) +inherit gnome.org gnome2-utils meson python-any-r1 xdg + +DESCRIPTION="Collection of GSettings schemas for GNOME desktop" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas" + +LICENSE="LGPL-2.1+" +SLOT="0" +IUSE="+introspection" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris" + +BDEPEND=" + introspection? ( >=dev-libs/gobject-introspection-1.54:= ) + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + ${PYTHON_DEPS} +" + +PATCHES=( + # Revert change to 'Source Code Pro 10' and 'Cantarell 11' fonts back to generic sans and monospace aliases + "${FILESDIR}"/3.32.0-default-fonts.patch +) + +src_prepare() { + default + + python_fix_shebang build-aux/meson/post-install.py +} + +src_configure() { + meson_src_configure $(meson_use introspection) +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest index 0ca01b2b4952..0ffc2eb358cf 100644 --- a/gnome-base/librsvg/Manifest +++ b/gnome-base/librsvg/Manifest @@ -2,7 +2,9 @@ AUX librsvg-2.40.12-gtk-optional.patch 2193 BLAKE2B fcde3effa4cf68e89387ff64638f DIST librsvg-2.40.21.tar.xz 1655860 BLAKE2B a3fd7915d39984057e860da90115d9d95cef97e61d3f5e4c3aaaf399c4b3bfe781e6a7b969958ae84a3b7f2c788576fe26f56b037ca0a6a2e059b53f2bd1b9fc SHA512 db0563d8e0edaae642a6b2bcd239cf54191495058ac8c7ff614ebaf88c0e30bd58dbcd41f58d82a9d5ed200ced45fc5bae22f2ed3cf3826e9348a497009e1280 DIST librsvg-2.52.6.tar.xz 23662708 BLAKE2B 21108297aa4f87a852d0decb9cc7b8a5cdb546e00075d16f0f86502752adc176a67b56607eb90b034ca4e2dddbf8f82a3d81727496a5ae1a2b94715cdbbd87ac SHA512 be4830fb34c4859bdbe0c86da7b5de0807f28bb63fc124b4405ca8f9ef6ee45add77b4c43b9031d00157870eceb458df30cf5ee25e73d3894797d622b465f38d DIST librsvg-2.52.7.tar.xz 23709632 BLAKE2B 4eb83d71b77b851c408ddba711fe39ed23863aa6466634020a19ffc30e00c12f7dea81f11fdc09eb53c0c72efb35adc4528568b3c27e5dc0e886426d145d347f SHA512 15c075d696ebba35555f93456be088e6398da5b7992119edc78f1ee1d376a70425248e36b138dc86234aec13cb139fded11d6d74523c44f9a49eb19c2151fcb7 +DIST librsvg-2.54.0.tar.xz 23489972 BLAKE2B 04fcbb688b18e98dcbef81e84106a99280d45f242152a355ac6f202410c13b289b281bd10f9e77854997362b7d3e88832d3274d7d63ace8adc05613da99e2aab SHA512 3357ca8cf7537fe2792ee2d9a1719622656f3e1d7f30da062799a4b3ca8788cc07333a00e1c9da53a53da2b67a2aa5895a4c8fce35003da659fb7f98048b68eb EBUILD librsvg-2.40.21.ebuild 2600 BLAKE2B 21f2ee7a8c11fc1d1dea3ff8cc804951fbeb5b555841b79a9230a7c67ef9d2c6ae571a5b775835565f9995b134eede674a5f254b568dab34bd1cb30603461f76 SHA512 be3bfd885134bfbc97170d7349689e54d0be0eece6b4a85e4761ec697bb496aa2c2723c6e82b97df29dc6a7e4676a7bec3c83a00a3a33f6d0fca4187bef5d4a7 EBUILD librsvg-2.52.6.ebuild 2533 BLAKE2B 6ca050d7e942cbad64bedbeefbe2f14fadb86b3f121e1fef6eb686f811e88815a59d6f5615a870c9c08bf678ae5c51ac0481d4d9b7193a48edc55b5d6fd09755 SHA512 d7b8b9b48bae3ef5cf8e8723fa23a94df8f6355c14b2bdccaedfb8649b9bac5c66a86a113e65594e7277139628dee2c2f311d82ec00d84b7a49d759e2f5f9788 EBUILD librsvg-2.52.7.ebuild 2538 BLAKE2B 94f34eae9a6ec5584a591ccba117611df6e322db538e707e773970431aa9e4a6217c7901487a2ddceebdb7da2c110e3884a9bf7d10dafcd49d9cbe05218c0727 SHA512 9578a4ba5bfd9f3222f367fb4be6ab509b376fe7c3cf59860b9e447552947779921bdcd0de7ae35193eb46b9afc49767da6a900572a53036cd44e1f1b4d7d93f +EBUILD librsvg-2.54.0.ebuild 3077 BLAKE2B 6eaeed128935c3930360e06e70ebd5efd8d832438486e7261c5d4c9d62f5cd5e0d97b0f5537e5f9c856e55d571d811743f9b2492c3d517a9233c80f4c4128931 SHA512 e97f2697e41de6d474ef7c587885d10f20ea2aa25655d468725edf6f6892b7c69c7b0ad34b9197cfed4a58751755a80083aa4bb5cd7ce1f7f3ce83b5f2dd90b5 MISC metadata.xml 312 BLAKE2B 9a8c74fbf88673a6fee588b6c7368d4d40287b3dbb46d591878f5744ce3eaf5fc6b4e711cd50d2ff830e9c0139cd99f629cb378039376dded59373216ec19038 SHA512 0715a267ceda6ecb4d9499951b0d3343b5ccedbfc85441f3001d9293dfdd2d31b214f907c5466676cce899c67f4249cf4b643a46b4d16e1ab6b89ccaac763e26 diff --git a/gnome-base/librsvg/librsvg-2.54.0.ebuild b/gnome-base/librsvg/librsvg-2.54.0.ebuild new file mode 100644 index 000000000000..efdb0bdf2148 --- /dev/null +++ b/gnome-base/librsvg/librsvg-2.54.0.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +VALA_USE_DEPEND="vapigen" +VALA_MIN_API_VERSION=0.46 +PYTHON_COMPAT=( python3_{8..10} ) + +inherit gnome2 multilib-minimal python-any-r1 rust-toolchain vala + +DESCRIPTION="Scalable Vector Graphics (SVG) rendering library" +HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg" + +LICENSE="LGPL-2+" +SLOT="2" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" + +IUSE="+introspection +vala" +REQUIRED_USE="vala? ( introspection )" + +RDEPEND=" + >=x11-libs/cairo-1.16.0[glib,svg,${MULTILIB_USEDEP}] + >=media-libs/freetype-2.9:2[${MULTILIB_USEDEP}] + >=x11-libs/gdk-pixbuf-2.20:2[introspection?,${MULTILIB_USEDEP}] + >=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}] + >=media-libs/harfbuzz-2.0.0:=[${MULTILIB_USEDEP}] + >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}] + >=x11-libs/pango-1.48.11[${MULTILIB_USEDEP}] + + introspection? ( >=dev-libs/gobject-introspection-0.10.8:= ) +" +DEPEND="${RDEPEND} + >=virtual/rust-1.56[${MULTILIB_USEDEP}] + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]') + dev-util/gi-docgen + virtual/pkgconfig + vala? ( $(vala_depend) ) +" +# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf + +QA_FLAGS_IGNORED=" + usr/bin/rsvg-convert + usr/lib.*/librsvg.* +" + +RESTRICT="test" # Lots of issues on 32bit builds, 64bit build seems to get into an infinite compilation sometimes, etc. + +src_prepare() { + # Documentation is built unconditionally and depends on introspection, + # but introspection is only built for the primary ABI. + # Disable documentation and manually build the doc subdirectory separately. + sed -i -e '/SUBDIRS =/s/ doc//' Makefile.in Makefile.am || die + + use vala && vala_src_prepare + gnome2_src_prepare +} + +multilib_src_configure() { + local myconf=( + --disable-static + --disable-debug + $(multilib_native_use_enable introspection) + $(multilib_native_use_enable vala) + --enable-pixbuf-loader + ) + + if ! multilib_is_native_abi; then + myconf+=( + # Set the rust target, which can differ from CHOST + RUST_TARGET="$(rust_abi)" + # RUST_TARGET is only honored if cross_compiling, but non-native ABIs aren't cross as + # far as C parts and configure auto-detection are concerned as CHOST equals CBUILD + cross_compiling=yes + ) + fi + + ECONF_SOURCE=${S} \ + gnome2_src_configure "${myconf[@]}" + + if multilib_is_native_abi; then + ln -s "${S}"/doc/html doc/html || die + fi +} + +multilib_src_compile() { + gnome2_src_compile + + if multilib_is_native_abi && use introspection; then + emake -C doc + fi +} + +multilib_src_install() { + gnome2_src_install + + if multilib_is_native_abi && use introspection; then + emake DESTDIR="${D}" install -C doc + fi +} + +multilib_src_install_all() { + find "${ED}" -name '*.la' -delete || die + + if use introspection; then + mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die + mv "${ED}"/usr/share/doc/${PF}/Rsvg-2.0 "${ED}"/usr/share/gtk-doc/html/ || die + fi +} + +pkg_postinst() { + multilib_foreach_abi gnome2_pkg_postinst +} + +pkg_postrm() { + multilib_foreach_abi gnome2_pkg_postrm +} diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest index 6313d20173d1..34a051ab8510 100644 --- a/gnome-base/nautilus/Manifest +++ b/gnome-base/nautilus/Manifest @@ -1,5 +1,4 @@ AUX 3.30.5-docs-build.patch 1054 BLAKE2B c4a9bbd1f63f74130d48737e430a4e3e5e894049df2dfdebf75f0f519eb715aba5bd590f4b57a718f78238ee50242215ef2b648fd3e3e8e8dddebc2ff1b45be2 SHA512 3a0925262643eb84d4c1731cad6b3c2c427def000503a3a680b06b68828f53492b4367d02ac6de36c35b6460e3d0967e3ce26203f8257271b222883990047459 -AUX 3.32.3-optional-gstreamer.patch 1592 BLAKE2B 5c0326638ed4c2714fe72e460256bd01cfad547c6455e1ec3e0273550d5f16e7ddf2e32e4928b7d45e1ea877625fce5a8ea3171d67f5c87359a9ddc2944fe9cc SHA512 40bcbbad8ad7d831e7af0659a710af0f378e8aaafff89f764528f577dcb78d96d38af475112bcd4c615d5c78249955c31ce196bcbebd590bdeb6f52127ce3a3a AUX 41.1-optional-gstreamer.patch 1592 BLAKE2B 877421d758d9b0911bc94b3d5132867e3a78532ce90c3e10017b164dcf4ae8f2cd8a49a23878936ed7adfe1112e5fbaff06542a62d7c6a0f515a53cff1dbb03e SHA512 3f1e0cb25237b5c9c6f29a7ac7a50afcf7a1b9844a4a9c6e134cbabebecf374846295de7b5d4416e1def8a1a2fb111e557caf27096836d8d19c51f9325799807 DIST nautilus-41.2.tar.xz 3248212 BLAKE2B be4e4e8fc03751259a1a5d4d1eb726e3026d24376da3fa680c412598219bfb3ced52f9b809004913dffdb9bb1c176dede07288c440c100487b3a337d8eaab417 SHA512 adb14fa1cf37a4797f57ae5162bddcd5b012de270cf955051b69276bc266b1dbfd8027b835f627ae19a1252356b344b1c8a4b7ca79a22512f3138a2c13fd2f3e EBUILD nautilus-41.2.ebuild 3187 BLAKE2B 0ef6a93741ea846684150262e296a5775aef7af8395803ecf683ce093fff3d67df20c3786233afcc790d816996b54ac0d8b6c257f866c11edab76b6b980913ce SHA512 523a7f96bf4d2beed2f3906ee4ed8b73bad71de0b7ce6d1fa952778608b45e25cfebabc9674d1cfba875c18a4fcaa963e20da0a2ff238d9f37c85d5d7499e67e diff --git a/gnome-base/nautilus/files/3.32.3-optional-gstreamer.patch b/gnome-base/nautilus/files/3.32.3-optional-gstreamer.patch deleted file mode 100644 index f28e9575d783..000000000000 --- a/gnome-base/nautilus/files/3.32.3-optional-gstreamer.patch +++ /dev/null @@ -1,57 +0,0 @@ -From f2d55bc9a9398ed1c36e1b856bcb33080abbf7c0 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <leio@gentoo.org> -Date: Thu, 19 Sep 2019 22:26:08 +0300 -Subject: [PATCH] build: Optional gstreamer - ---- - extensions/meson.build | 4 +++- - meson.build | 2 ++ - meson_options.txt | 6 ++++++ - 3 files changed, 11 insertions(+), 1 deletion(-) - -diff --git a/extensions/meson.build b/extensions/meson.build -index 5c6f64cef..bd8c41d3e 100644 ---- a/extensions/meson.build -+++ b/extensions/meson.build -@@ -1,3 +1,5 @@ - subdir('image-properties') --subdir('audio-video-properties') -+if get_option('gstreamer') -+ subdir('audio-video-properties') -+endif - subdir('sendto') -diff --git a/meson.build b/meson.build -index 0a267d670..ccb2b8cc1 100644 ---- a/meson.build -+++ b/meson.build -@@ -122,8 +122,10 @@ libm = cc.find_library('m') - - if get_option('extensions') - gexiv = dependency('gexiv2', version: '>= 0.10.0') -+ if get_option('gstreamer') - gst_tag_dep = dependency('gstreamer-tag-1.0') - gst_pbutils_dep = dependency('gstreamer-pbutils-1.0') -+ endif - endif - gio = dependency('gio-2.0', version: glib_ver) - gio_unix = dependency('gio-unix-2.0', version: glib_ver) -diff --git a/meson_options.txt b/meson_options.txt -index fce5f16f9..1fa8f8952 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -13,6 +13,12 @@ option( - value: true, - description: 'Build stock extensions', - ) -+option( -+ 'gstreamer', -+ type: 'boolean', -+ value: true, -+ description: 'Build audio-video properties extension (requires "extensions")', -+) - option( - 'introspection', - type: 'boolean', --- -2.20.1 - |