diff options
Diffstat (limited to 'gnome-base/gnome-control-center')
8 files changed, 348 insertions, 16 deletions
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest index 96aead137b51..803cedaa2bc6 100644 --- a/gnome-base/gnome-control-center/Manifest +++ b/gnome-base/gnome-control-center/Manifest @@ -1,11 +1,18 @@ AUX 3.26.2-gnome-desktop-3-28-compat.patch 2726 BLAKE2B 033eda60333bc08ff6c9a766d00f49f881ff86a0e19f8a33e75b9ee2c75cd8ef49ae6cf466d42dc9f9d8852f63da68992b1c78d0a5a36b809ee75c04bc257bc5 SHA512 d49d634ce59a10512cb91f96da494a5c4d732622acdb3b1c0e89b6428fe3269f0404bd60f6fc2456c08b6e7e6fb34180d8bd8ae4a5687bd9f6fffd2ff933c2fc AUX 3.26.2-goa-lifecycle.patch 3691 BLAKE2B dd41ac81c11bbe41c2b68017b5dfde12718c1c198e2e57357a5c4614ab65618599908dbc2fd0eef5cee8b3b1448c2da4b44b2b8321697cb70479d5752de8137c SHA512 6d8234687ca4dedbeda83f4e5b77195287b4f5fb6d94aa0ac52516cc9ed71b20f6e24ac5cd0ee6a6b3fcddb3584013b693e1688d7b58f762787cde11d9fe975c AUX 3.26.2-without-wayland-fix.patch 1546 BLAKE2B a675dbf8c7b8a5e5a6fdcd8204d673018a09836022d8ccd3e582b3c991a1fc9a796fcb23cd5e6779c5c8cb11b88153819c1bb6f28d5d9495ecf3bcf1e47a23bf SHA512 d7dd7f1cb4db63a771c8116288ebdc4c0bf8dd515ea9f94c6f4f8f76c2dc5fe4cb21e178e76e351b8a50f7acfbf818be9f3864e3c8df5b0604b8b285d49d7978 +AUX 3.30.3-conditional-cups-tests.patch 767 BLAKE2B 7f92f98da527c96dd6c6cd236085af41a0292ad635c9c68f078eb0c9a54ada04c51d7fba805dbb0b1340b7de94f49d65d9492c942600722830719f6d551c10f2 SHA512 37481ac8ffcd2a56fb55521f179bee03007cc93ef40e74d7571be501ac4a4447099a17a41df78ae9ecf5f6f04138c31d74dfe41ecc656d870190027209a26113 DIST gnome-control-center-3.24.4-patchset.tar.xz 8076 BLAKE2B e70086987957b4c33fff6d3b5038ffc260fc47520de4606fa96a0993cee4eea699bb57e8c0a6406e7d5c99adde702351d6462bf0594398f48f6ba4c9bc217417 SHA512 6228bffb71b61a100248f2f3ffc659532e9a067579d0dcf869e58ba9fb5d0b3e745a3bda2a92caa5bc86f8809885268b543f6863262dc6fef52b61e74eaef927 DIST gnome-control-center-3.24.4.tar.xz 7320232 BLAKE2B 29a5860b8cc27f161451ae8c053db1d28e8c5f8714cbccac7674c00689569ac4e51f7deb0a341e0868b1467a095f87d685ea0ec733f69274f02ecaf5badfef6e SHA512 34a59d4d89971054b1f54e7a7e3cbc3c306a3fbe3cc94adf1241ad37076a6179c93f04a95e51e57982eda57187e578005060d711a5d955734d5a138e61b3598a DIST gnome-control-center-3.26.2-patchset.tar.xz 159088 BLAKE2B 521af115f7d4372ecf645b915e9081607a6699528b2914e73f11856fc9a8ae80406c210ad97b5d84b616d324d0c1539e2155c5e6db4920cbd8355b85f21a8e3b SHA512 90bf9e19b98dcc39fe5af6604876e5d9fe31358a4da602fe518589d9b3a9261fee3b3785f40a889295e3e7b38370173d03350f475be576830efa2ad74718c19e DIST gnome-control-center-3.26.2.tar.xz 7386516 BLAKE2B 156c24bc2ab60943ade1e255976e29478c9b0e9dbad12921a835ec55f09ad62c71886750a50fa74f2a0afb660cac073c9ff54cef4b72c790b6dd91c7cac8aaa9 SHA512 d3ad9067c7e66a3a6bf5b6c058f3862f6e4b59c0254fd47f0b4a9093f3b7e2d7f1900b510aba8bbdac7c1212a0f6cdd4974c3d04003af63edb72ed3e56f7dbca -EBUILD gnome-control-center-3.24.4.ebuild 4964 BLAKE2B 6888715dafc3e6c56690687a41ad1dc7bbc41083e224023349c677d322378f830084038ee18b6628249bddc4422a834577c951fab757b32249a041f4211192de SHA512 d2510b19b0600459a86a56c6f5d0ed8fcfe35b00e9b767782ebd8ae9336c2a1be9f8345d841acfc05f28d38e226df500823f96cf3c5d6e3fa396106aba305f85 -EBUILD gnome-control-center-3.26.2-r28.ebuild 5310 BLAKE2B 2f1c9591fd74f25a78fb2ae3bcbcce6c5075852f5880f648e659e80bb75400aa2c5231056e942bf355246920af69170e042f8dd3948333bb5e486456cc957ee5 SHA512 350030f5b682f914147c5b58a258bbf2a75c003d2f2861a4da7a60fd090d7d5a1908d227e8499a5864c437f391e7d775ea61c557babbf2c4242aff89997fb548 -EBUILD gnome-control-center-3.26.2-r3.ebuild 5322 BLAKE2B f51934179a425e3ad83a09d8542d8049ae62f68a7d224969f1522957ef58fb9c04da3cb35577c507b09af02685528598dd6e413b614e37995860fcd8234794b9 SHA512 389d2c46c13d4b6295296d69d1d384531085931012f0018112a3e2376bd7129bbe982901d2da9454aa46d28ed83ca8918860375dd256e97baa887d8390822eb1 -MISC metadata.xml 592 BLAKE2B b868af571d6fb58f3a7baaa586261025de5be5a928f963f6fde8db3b6549b6dd30c0d73752e296f9ba3b128c96f3a942ed6cecc8acb98d745502483822c9866b SHA512 af75d12dbd91e798b6f81933f5e6cbb73aa0a81858ec711e88e79c2a4a239dbefa9da0375bf01f2614b5098af6a883b5baf27f2f74fc166838ab00e00108b104 +DIST gnome-control-center-3.28.2-patchset.tar.xz 75820 BLAKE2B 7f7cda69248862eb9ddba5d69d84c6cf1e550a9db6d914d4f5327b107d01bcb4b40152889ffc13700a8e777b805b037a267e9b641df65612a86099e0851ab417 SHA512 927287e98d1b958b27a644a90fe3da38ba3040a60e4318268f46e764226906d851148370635ab232748f5ef78cf9406b71025738cdec951582042ce4282914c6 +DIST gnome-control-center-3.28.2.tar.xz 5857128 BLAKE2B 253c220fdc759a26f23210a7665323ccdfb18e5f76652791718f2523badbac1f42c9c0fd75e5505c1e3d5f7391abc344b47cb101741ef35ed60859c4c16d7988 SHA512 3e1b54cf1a603ee7c47d8b0f1fb025405c8d133c9e0dbe0eaf2f287eff82109e95581c79f131d227422d682b7049ccb6e6297dba1ff2276cff5f715308195d7f +DIST gnome-control-center-3.30.3-patchset.tar.xz 65244 BLAKE2B d210f94e0058e628401ea74fa90582721aaffddfb0e3f8e78013edde0d2f712d4433c316b3da08c9ec1038200cfd4e9b1a315b224d2e881d056b0f685f7067eb SHA512 99519c54ef223b94d5101987b7d7dc203c447765ef79374a3f0911282cd77917f64dea7318d70c63b8df8506c058fa1fcb1d71b23488b3ca9be993667509b7d1 +DIST gnome-control-center-3.30.3.tar.xz 5889900 BLAKE2B a03153cb689edc3c8c96a0f184f8831a8df218691fefd035842170871eebb6f17e34405e7c4c18da6a191b92c7b58fcd40b252cdb67154becdf7e7ac6a63aa8f SHA512 85c7b51d6bc32f73d7f4ad6df8d4cc14c59e19da88d7a17b7337f995483f41008213ca829247a3c9db43c4b31eae0be321ed6804570660fbe0356da3dd0948dc +EBUILD gnome-control-center-3.24.4.ebuild 4912 BLAKE2B d850ac29017bc316776eea8c6f5fccc61d0189bcf539c05812c2aea4b9ab84fd6a7f49b59aa2278115c9c98707f94f5c67dd5d8a2663f6353db8a78be7422161 SHA512 bf26a543f04fbd28c7c27b0833210946a1c03a803bbe676cde97906fa15bd1c655b3e91bfedd469947b1669be863b8708422993a74eb6cca55a827a67a5910b8 +EBUILD gnome-control-center-3.26.2-r28.ebuild 5258 BLAKE2B c4b203840af046a6ccc95d74ccab2304306ac094840ec18c6e6ba56f95fa59c4091160778bc1e6d62277c3457f32131b8aee8146ac997bcb7ecd36646f01599e SHA512 a83508a628d7bccf46c77a9fd77ca9c952dd31c7417b6642d13706698c6ba74a9be261643a5b36dfde1a995c231ed399b2c467511a4a8216f0c808382999c053 +EBUILD gnome-control-center-3.26.2-r3.ebuild 5270 BLAKE2B e5dcca2bc3a6ab5d474ec1461d19072b5b1933e08319b9d7c8df8d59dffce3b1dc111b3fd834187c69fc53ee110f77173ba65c60c5f37a1429d0cf673e909801 SHA512 34eebe34fe2b6cd05164bb364c4b6eaf6f2c064792cb032e9a53202030ca029314669eb92e9aeffd3095158e2e4d605aa772c72f4dfddd14527b10cd82c3e995 +EBUILD gnome-control-center-3.28.2.ebuild 5235 BLAKE2B 4a6094a68fec23b788565f78e034ae798e1ebee31b9f03a4b3f880b84863b7507e579530403e5e575f6568e12805f2495ebdc298a199f1db65b347d2c70e1b8a SHA512 0ea26b9e5f265c16a5280d81d864717f8bfbe999c6b26e1863259c4a4d60fa8435c126b686fa9879c5448135ff7436f24dda0cdf215b9054eae6ee88cd5b2b8b +EBUILD gnome-control-center-3.30.3.ebuild 5449 BLAKE2B deba6ca1be7aa03a8ac2f84848512001acf095a31dac0083fcf18c6a3755ffb43cea96e5ab4005c080b7400f0c46fb891b54332b796424f98c1ed4d755d1a8f8 SHA512 fb1ad500a5e25b0dba48e42bf746209fdf051805a99e953a802d4dd949d3e198b4a33d29ac6cc5675915ed48716eeeb7a6b41ed0a4a3f0de2f4e41f45520a5ee +MISC metadata.xml 675 BLAKE2B e22d57c5a893d8c2a20851671a82741ea1918a6792444898a808a2b50668fd0fc6d712025b167fff6371644e7eaa182ef4bfd0a85718f7fee57fb0d586ff62cf SHA512 debac95237dacc2b937bb9d4a75f569f10c7798434a2b22cff342d51b7c50a6a78af1aeddf0ee3274cac332b55d25b2d3da8482b49d8d355e6428aca11e1b908 diff --git a/gnome-base/gnome-control-center/files/3.30.3-conditional-cups-tests.patch b/gnome-base/gnome-control-center/files/3.30.3-conditional-cups-tests.patch new file mode 100644 index 000000000000..8b9d738c10fb --- /dev/null +++ b/gnome-base/gnome-control-center/files/3.30.3-conditional-cups-tests.patch @@ -0,0 +1,28 @@ +From f724fb0f41672bfa5cd6fe098223acc795de90a4 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +Date: Thu, 14 Mar 2019 23:35:08 +0200 +Subject: [PATCH] build: Conditionalize printer panel tests with enable_cups + +3.30 moved various tests from being alongside the panels to a +separate toplevel tests/ subdirectory, which was missed while +porting the patchset. Fix it. +--- + tests/meson.build | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/tests/meson.build b/tests/meson.build +index 7c894e480..fb39c9f48 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -3,5 +3,7 @@ subdir('common') + #if host_is_linux + # subdir('network') + #endif +-subdir('printers') ++if enable_cups ++ subdir('printers') ++endif + subdir('info') +-- +2.17.0 + diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.24.4.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.24.4.ebuild index 81390ad69ec9..1bc940b88887 100644 --- a/gnome-base/gnome-control-center/gnome-control-center-3.24.4.ebuild +++ b/gnome-base/gnome-control-center/gnome-control-center-3.24.4.ebuild @@ -17,7 +17,6 @@ IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +ibus input_devices_ KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" # gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login -# g-s-d[policykit] needed for bug #403527 # kerberos unfortunately means mit-krb5; build fails with heimdal # udev could be made optional, only conditions gsd-device-panel # (mouse, keyboards, touchscreen, etc) @@ -31,7 +30,7 @@ COMMON_DEPEND=" >=gnome-base/gsettings-desktop-schemas-3.21.4 >=gnome-base/gnome-desktop-3.21.2:3= <gnome-base/gnome-desktop-3.27.90:3 - >=gnome-base/gnome-settings-daemon-3.23.90[colord,policykit] + >=gnome-base/gnome-settings-daemon-3.23.90[colord] >=x11-misc/colord-0.1.34:0= >=dev-libs/libpwquality-1.2.2 diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r28.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r28.ebuild index 616a44779d21..62bb2625cd02 100644 --- a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r28.ebuild +++ b/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r28.ebuild @@ -17,7 +17,6 @@ IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +ibus input_devices_ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" # gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login -# g-s-d[policykit] needed for bug #403527 # kerberos unfortunately means mit-krb5; build fails with heimdal # udev could be made optional, only conditions gsd-device-panel # (mouse, keyboards, touchscreen, etc) @@ -29,7 +28,7 @@ COMMON_DEPEND=" >=x11-libs/gtk+-3.22.0:3[X,wayland=] >=gnome-base/gsettings-desktop-schemas-3.21.4 >=gnome-base/gnome-desktop-3.27.3:3= - >=gnome-base/gnome-settings-daemon-3.25.90[colord,policykit] + >=gnome-base/gnome-settings-daemon-3.25.90[colord] >=x11-misc/colord-0.1.34:0= >=dev-libs/libpwquality-1.2.2 diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r3.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r3.ebuild index 9078a9e52045..3cb36611c3d0 100644 --- a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r3.ebuild +++ b/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r3.ebuild @@ -17,7 +17,6 @@ IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +ibus input_devices_ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" # gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login -# g-s-d[policykit] needed for bug #403527 # kerberos unfortunately means mit-krb5; build fails with heimdal # udev could be made optional, only conditions gsd-device-panel # (mouse, keyboards, touchscreen, etc) @@ -31,7 +30,7 @@ COMMON_DEPEND=" >=gnome-base/gsettings-desktop-schemas-3.21.4 >=gnome-base/gnome-desktop-3.21.2:3= <gnome-base/gnome-desktop-3.27.90:3 - >=gnome-base/gnome-settings-daemon-3.25.90[colord,policykit] + >=gnome-base/gnome-settings-daemon-3.25.90[colord] >=x11-misc/colord-0.1.34:0= >=dev-libs/libpwquality-1.2.2 diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.28.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.28.2.ebuild new file mode 100644 index 000000000000..e48ea0dd21f7 --- /dev/null +++ b/gnome-base/gnome-control-center/gnome-control-center-3.28.2.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit gnome.org gnome2-utils meson xdg + +DESCRIPTION="GNOME's main interface to configure various aspects of the desktop" +HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/" +SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" + +LICENSE="GPL-2+" +SLOT="2" +IUSE="+bluetooth +cups debug flickr +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland" +REQUIRED_USE="flickr? ( gnome-online-accounts )" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" + +# 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) +# >=polkit-0.114 for .policy files gettext ITS +clutter_gtk_dep="media-libs/clutter-gtk:1.0" +# 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 +COMMON_DEPEND=" + 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.53.0:2 + >=gnome-base/gnome-desktop-3.27.90:3= + >=gnome-base/gnome-settings-daemon-3.25.90[colord,input_devices_wacom?] + >=gnome-base/gsettings-desktop-schemas-3.27.2 + dev-libs/libxml2:2 + >=sys-auth/polkit-0.114 + >=sys-power/upower-0.99:= + x11-libs/libX11 + >=x11-libs/libXi-1.2 + 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? ( + ${clutter_gtk_dep} + >=media-video/cheese-3.28.0 ) + ibus? ( >=app-i18n/ibus-1.5.2 ) + wayland? ( virtual/libgudev ) + networkmanager? ( + >=gnome-extra/nm-applet-1.2.0 + >=net-misc/networkmanager-1.2.0:=[modemmanager] + >=net-misc/modemmanager-0.7.990 ) + bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) + input_devices_wacom? ( + ${clutter_gtk_dep} + >=dev-libs/libwacom-0.27 + >=media-libs/clutter-1.11.3:1.0 ) + 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= + >=media-libs/libcanberra-0.13[gtk3] + >=dev-libs/libpwquality-1.2.2 +" +# 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="${COMMON_DEPEND} + || ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) ) + 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] ) + + !<gnome-base/gdm-2.91.94 + !gnome-extra/gnome-media[pulseaudio] + !<gnome-extra/gnome-media-2.32.0-r300 + !<net-wireless/gnome-bluetooth-3.3.2 +" +# 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" + +DEPEND="${COMMON_DEPEND} + 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 +" + +PATCHES=( + # Patches from gnome-3-28 branch on top of 3.28.2 + # Makes some panels and dependencies optional + # https://bugzilla.gnome.org/686840, 697478, 700145 + # Fix some absolute paths to be appropriate for Gentoo + "${WORKDIR}"/patches/ +) + +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) + $(meson_use input_devices_wacom wacom) + $(meson_use wayland) + # 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-3.30.3.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.30.3.ebuild new file mode 100644 index 000000000000..7beb2fd313cc --- /dev/null +++ b/gnome-base/gnome-control-center/gnome-control-center-3.30.3.ebuild @@ -0,0 +1,153 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit gnome.org gnome2-utils meson xdg + +DESCRIPTION="GNOME's main interface to configure various aspects of the desktop" +HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/" +SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" + +LICENSE="GPL-2+" +SLOT="2" +IUSE="+bluetooth +cups debug flickr +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland" +REQUIRED_USE="flickr? ( gnome-online-accounts )" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" + +# 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) +# >=polkit-0.114 for .policy files gettext ITS +clutter_gtk_dep="media-libs/clutter-gtk:1.0" +# 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 +COMMON_DEPEND=" + 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.53.0:2 + >=gnome-base/gnome-desktop-3.27.90:3= + >=gnome-base/gnome-settings-daemon-3.25.90[colord,input_devices_wacom?] + >=gnome-base/gsettings-desktop-schemas-3.27.2 + dev-libs/libxml2:2 + >=sys-auth/polkit-0.114 + >=sys-power/upower-0.99:= + x11-libs/libX11 + >=x11-libs/libXi-1.2 + 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? ( + ${clutter_gtk_dep} + >=media-video/cheese-3.28.0 ) + ibus? ( >=app-i18n/ibus-1.5.2 ) + wayland? ( virtual/libgudev ) + networkmanager? ( + >=gnome-extra/nm-applet-1.8.0 + >=net-misc/networkmanager-1.10.0:=[modemmanager] + >=net-misc/modemmanager-0.7.990 ) + bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) + input_devices_wacom? ( + ${clutter_gtk_dep} + >=dev-libs/libwacom-0.27 + >=media-libs/clutter-1.11.3:1.0 ) + 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= + app-crypt/libsecret + >=media-libs/libcanberra-0.13[gtk3] + >=dev-libs/libpwquality-1.2.2 +" +# 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="${COMMON_DEPEND} + || ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) ) + 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] ) + + !<gnome-base/gdm-2.91.94 + !gnome-extra/gnome-media[pulseaudio] + !<gnome-extra/gnome-media-2.32.0-r300 + !<net-wireless/gnome-bluetooth-3.3.2 +" +# 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" + +DEPEND="${COMMON_DEPEND} + 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 +" + +PATCHES=( + # Patches from gnome-3-28 branch on top of 3.28.2 + # Makes some panels and dependencies optional + # https://bugzilla.gnome.org/686840, 697478, 700145 + # Fix some absolute paths to be appropriate for Gentoo + "${WORKDIR}"/patches/ + # Extra patch to fix incomplete USE=-cups support in patchset; amend it into the cups optionality commit for next patchset + "${FILESDIR}"/${PV}-conditional-cups-tests.patch +) + +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) + -Dtracing=false + $(meson_use input_devices_wacom wacom) + $(meson_use wayland) + # 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/metadata.xml b/gnome-base/gnome-control-center/metadata.xml index 4e40862668dd..f1ac0fd9a7be 100644 --- a/gnome-base/gnome-control-center/metadata.xml +++ b/gnome-base/gnome-control-center/metadata.xml @@ -6,11 +6,9 @@ <name>Gentoo GNOME Desktop</name> </maintainer> <use> - <flag name="colord">Support color management using - <pkg>x11-misc/colord</pkg></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> + <flag name="colord">Support color management using <pkg>x11-misc/colord</pkg></flag> + <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> </pkgmetadata> |