1 |
commit: 5bc1b9779443926e9621d97436135624c25fd8ca |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 26 20:08:03 2018 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 28 13:49:08 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bc1b977 |
7 |
|
8 |
gnome-base/gnome-control-center: bump to 3.26.2 |
9 |
|
10 |
Also includes many fixes and updates from upstream |
11 |
unreleased 3.26 branch and our optionality patches. |
12 |
|
13 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
14 |
Package-Manager: Portage-2.3.49, Repoman-2.3.11 |
15 |
|
16 |
gnome-base/gnome-control-center/Manifest | 2 + |
17 |
.../gnome-control-center-3.26.2-r1.ebuild | 157 +++++++++++++++++++++ |
18 |
2 files changed, 159 insertions(+) |
19 |
|
20 |
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest |
21 |
index 1d9eb96f6f4..3f1db77fa71 100644 |
22 |
--- a/gnome-base/gnome-control-center/Manifest |
23 |
+++ b/gnome-base/gnome-control-center/Manifest |
24 |
@@ -1,2 +1,4 @@ |
25 |
DIST gnome-control-center-3.24.4-patchset.tar.xz 8076 BLAKE2B e70086987957b4c33fff6d3b5038ffc260fc47520de4606fa96a0993cee4eea699bb57e8c0a6406e7d5c99adde702351d6462bf0594398f48f6ba4c9bc217417 SHA512 6228bffb71b61a100248f2f3ffc659532e9a067579d0dcf869e58ba9fb5d0b3e745a3bda2a92caa5bc86f8809885268b543f6863262dc6fef52b61e74eaef927 |
26 |
DIST gnome-control-center-3.24.4.tar.xz 7320232 BLAKE2B 29a5860b8cc27f161451ae8c053db1d28e8c5f8714cbccac7674c00689569ac4e51f7deb0a341e0868b1467a095f87d685ea0ec733f69274f02ecaf5badfef6e SHA512 34a59d4d89971054b1f54e7a7e3cbc3c306a3fbe3cc94adf1241ad37076a6179c93f04a95e51e57982eda57187e578005060d711a5d955734d5a138e61b3598a |
27 |
+DIST gnome-control-center-3.26.2-patchset.tar.xz 159088 BLAKE2B 521af115f7d4372ecf645b915e9081607a6699528b2914e73f11856fc9a8ae80406c210ad97b5d84b616d324d0c1539e2155c5e6db4920cbd8355b85f21a8e3b SHA512 90bf9e19b98dcc39fe5af6604876e5d9fe31358a4da602fe518589d9b3a9261fee3b3785f40a889295e3e7b38370173d03350f475be576830efa2ad74718c19e |
28 |
+DIST gnome-control-center-3.26.2.tar.xz 7386516 BLAKE2B 156c24bc2ab60943ade1e255976e29478c9b0e9dbad12921a835ec55f09ad62c71886750a50fa74f2a0afb660cac073c9ff54cef4b72c790b6dd91c7cac8aaa9 SHA512 d3ad9067c7e66a3a6bf5b6c058f3862f6e4b59c0254fd47f0b4a9093f3b7e2d7f1900b510aba8bbdac7c1212a0f6cdd4974c3d04003af63edb72ed3e56f7dbca |
29 |
|
30 |
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r1.ebuild |
31 |
new file mode 100644 |
32 |
index 00000000000..ab4f3f3ce0f |
33 |
--- /dev/null |
34 |
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r1.ebuild |
35 |
@@ -0,0 +1,157 @@ |
36 |
+# Copyright 1999-2018 Gentoo Authors |
37 |
+# Distributed under the terms of the GNU General Public License v2 |
38 |
+ |
39 |
+EAPI=6 |
40 |
+GNOME2_LA_PUNT="yes" |
41 |
+GNOME2_EAUTORECONF="yes" |
42 |
+ |
43 |
+inherit bash-completion-r1 gnome2 |
44 |
+ |
45 |
+DESCRIPTION="GNOME's main interface to configure various aspects of the desktop" |
46 |
+HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/" |
47 |
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" |
48 |
+ |
49 |
+LICENSE="GPL-2+" |
50 |
+SLOT="2" |
51 |
+IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland" |
52 |
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" |
53 |
+ |
54 |
+# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login |
55 |
+# g-s-d[policykit] needed for bug #403527 |
56 |
+# kerberos unfortunately means mit-krb5; build fails with heimdal |
57 |
+# udev could be made optional, only conditions gsd-device-panel |
58 |
+# (mouse, keyboards, touchscreen, etc) |
59 |
+# display panel requires colord and gnome-settings-daemon[colord] |
60 |
+# printer panel requires cups and smbclient (the latter is not patch yet to be separately optional) |
61 |
+COMMON_DEPEND=" |
62 |
+ >=dev-libs/glib-2.53.0:2[dbus] |
63 |
+ >=x11-libs/gdk-pixbuf-2.23.0:2 |
64 |
+ >=x11-libs/gtk+-3.22.0:3[X,wayland?] |
65 |
+ >=gnome-base/gsettings-desktop-schemas-3.21.4 |
66 |
+ >=gnome-base/gnome-desktop-3.21.2:3= |
67 |
+ >=gnome-base/gnome-settings-daemon-3.25.90[colord,policykit] |
68 |
+ >=x11-misc/colord-0.1.34:0= |
69 |
+ |
70 |
+ >=dev-libs/libpwquality-1.2.2 |
71 |
+ dev-libs/libxml2:2 |
72 |
+ gnome-base/libgtop:2= |
73 |
+ media-libs/fontconfig |
74 |
+ >=sys-apps/accountsservice-0.6.39 |
75 |
+ |
76 |
+ >=media-libs/libcanberra-0.13[gtk3] |
77 |
+ >=media-sound/pulseaudio-2[glib] |
78 |
+ >=sys-auth/polkit-0.97 |
79 |
+ >=sys-power/upower-0.99:= |
80 |
+ |
81 |
+ virtual/libgudev |
82 |
+ x11-apps/xmodmap |
83 |
+ x11-libs/cairo |
84 |
+ x11-libs/libX11 |
85 |
+ x11-libs/libXxf86misc |
86 |
+ >=x11-libs/libXi-1.2 |
87 |
+ |
88 |
+ bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) |
89 |
+ colord? ( |
90 |
+ net-libs/libsoup:2.4 |
91 |
+ >=x11-misc/colord-0.1.34:0= |
92 |
+ >=x11-libs/colord-gtk-0.1.24 ) |
93 |
+ cups? ( |
94 |
+ >=net-print/cups-1.7[dbus] |
95 |
+ >=net-fs/samba-4.0.0[client] |
96 |
+ ) |
97 |
+ gnome-online-accounts? ( |
98 |
+ >=media-libs/grilo-0.3.0:0.3= |
99 |
+ >=net-libs/gnome-online-accounts-3.25.3:= ) |
100 |
+ ibus? ( >=app-i18n/ibus-1.5.2 ) |
101 |
+ kerberos? ( app-crypt/mit-krb5 ) |
102 |
+ networkmanager? ( |
103 |
+ >=gnome-extra/nm-applet-1.2.0 |
104 |
+ >=net-misc/networkmanager-1.2.0:=[modemmanager] |
105 |
+ >=net-misc/modemmanager-0.7.990 ) |
106 |
+ v4l? ( |
107 |
+ media-libs/clutter-gtk:1.0 |
108 |
+ >=media-video/cheese-3.5.91 ) |
109 |
+ input_devices_wacom? ( |
110 |
+ >=dev-libs/libwacom-0.7 |
111 |
+ >=media-libs/clutter-1.11.3:1.0 |
112 |
+ media-libs/clutter-gtk:1.0 |
113 |
+ >=x11-libs/libXi-1.2 ) |
114 |
+" |
115 |
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x |
116 |
+# libgnomekbd needed only for gkbd-keyboard-display tool |
117 |
+# |
118 |
+# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474 |
119 |
+# Also we need newer driver versions to allow wacom and libinput drivers to |
120 |
+# not collide |
121 |
+# |
122 |
+# system-config-printer provides org.fedoraproject.Config.Printing service and interface |
123 |
+# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy |
124 |
+RDEPEND="${COMMON_DEPEND} |
125 |
+ || ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) ) |
126 |
+ x11-themes/adwaita-icon-theme |
127 |
+ colord? ( >=gnome-extra/gnome-color-manager-3 ) |
128 |
+ cups? ( |
129 |
+ app-admin/system-config-printer |
130 |
+ net-print/cups-pk-helper ) |
131 |
+ input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] ) |
132 |
+ >=gnome-base/libgnomekbd-3 |
133 |
+ wayland? ( dev-libs/libinput ) |
134 |
+ !wayland? ( |
135 |
+ >=x11-drivers/xf86-input-libinput-0.19.0 |
136 |
+ input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) ) |
137 |
+ |
138 |
+ !<gnome-base/gdm-2.91.94 |
139 |
+ !<gnome-extra/gnome-color-manager-3.1.2 |
140 |
+ !gnome-extra/gnome-media[pulseaudio] |
141 |
+ !<gnome-extra/gnome-media-2.32.0-r300 |
142 |
+ !<net-wireless/gnome-bluetooth-3.3.2 |
143 |
+" |
144 |
+# PDEPEND to avoid circular dependency |
145 |
+PDEPEND=">=gnome-base/gnome-session-2.91.6-r1" |
146 |
+ |
147 |
+DEPEND="${COMMON_DEPEND} |
148 |
+ x11-base/xorg-proto |
149 |
+ |
150 |
+ dev-libs/libxml2:2 |
151 |
+ dev-libs/libxslt |
152 |
+ dev-util/glib-utils |
153 |
+ >=dev-util/intltool-0.40.1 |
154 |
+ >=sys-devel/gettext-0.17 |
155 |
+ virtual/pkgconfig |
156 |
+ |
157 |
+ gnome-base/gnome-common |
158 |
+ sys-devel/autoconf-archive |
159 |
+" |
160 |
+# Needed for autoreconf |
161 |
+# gnome-base/gnome-common |
162 |
+# sys-devel/autoconf-archive |
163 |
+ |
164 |
+PATCHES=( |
165 |
+ # Lots of patches from gnome-3-26 branch on top of 3.26.2 |
166 |
+ # Makes some panels and dependencies optional; requires eautoreconf |
167 |
+ # https://bugzilla.gnome.org/686840, 697478, 700145 |
168 |
+ # Fix some absolute paths to be appropriate for Gentoo |
169 |
+ "${WORKDIR}"/patches/ |
170 |
+) |
171 |
+ |
172 |
+src_configure() { |
173 |
+ gnome2_src_configure \ |
174 |
+ --disable-update-mimedb \ |
175 |
+ --disable-static \ |
176 |
+ --enable-documentation \ |
177 |
+ $(use_enable bluetooth) \ |
178 |
+ $(use_enable colord color) \ |
179 |
+ $(use_enable cups) \ |
180 |
+ $(usex debug --enable-debug=yes ' ') \ |
181 |
+ $(use_enable gnome-online-accounts goa) \ |
182 |
+ $(use_enable ibus) \ |
183 |
+ $(use_enable kerberos) \ |
184 |
+ $(use_enable networkmanager) \ |
185 |
+ $(use_with v4l cheese) \ |
186 |
+ $(use_enable input_devices_wacom wacom) \ |
187 |
+ $(use_enable wayland) |
188 |
+} |
189 |
+ |
190 |
+src_install() { |
191 |
+ gnome2_src_install completiondir="$(get_bashcompdir)" |
192 |
+} |