1 |
commit: 4b3ea121b6a785ca700ba7069ace074ab1d58e0d |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Oct 1 13:33:12 2017 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 30 21:26:10 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b3ea121 |
7 |
|
8 |
gnome-base/gnome-settings-daemon: remove unused patch. |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/5828 |
11 |
|
12 |
.../files/3.24.2-optional.patch | 145 --------------------- |
13 |
1 file changed, 145 deletions(-) |
14 |
|
15 |
diff --git a/gnome-base/gnome-settings-daemon/files/3.24.2-optional.patch b/gnome-base/gnome-settings-daemon/files/3.24.2-optional.patch |
16 |
deleted file mode 100644 |
17 |
index 64c47a92e3f..00000000000 |
18 |
--- a/gnome-base/gnome-settings-daemon/files/3.24.2-optional.patch |
19 |
+++ /dev/null |
20 |
@@ -1,145 +0,0 @@ |
21 |
-From 22f6a45b665e604f874e82a817d45bb976d8c5ae Mon Sep 17 00:00:00 2001 |
22 |
-From: Timo Tambet <ttambet@×××××.com> |
23 |
-Date: Sat, 25 Feb 2017 14:48:19 +0200 |
24 |
-Subject: [PATCH 1/1] [PATCH] Make colord and wacom support optional |
25 |
- |
26 |
---- |
27 |
- configure.ac | 56 +++++++++++++++++++++++++++++++---------------- |
28 |
- plugins/Makefile.am | 9 ++++++-- |
29 |
- plugins/dummy/Makefile.am | 5 ++++- |
30 |
- 3 files changed, 48 insertions(+), 22 deletions(-) |
31 |
- |
32 |
-diff --git a/configure.ac b/configure.ac |
33 |
-index 0d169c8f..792195aa 100644 |
34 |
---- a/configure.ac |
35 |
-+++ b/configure.ac |
36 |
-@@ -158,13 +158,23 @@ PKG_CHECK_MODULES(CLIPBOARD, |
37 |
- gtk+-x11-3.0 |
38 |
- x11) |
39 |
- |
40 |
--PKG_CHECK_MODULES(COLOR, |
41 |
-- colord >= 1.0.2 |
42 |
-- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION |
43 |
-- libcanberra-gtk3 |
44 |
-- libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION |
45 |
-- lcms2 >= $LCMS_REQUIRED_VERSION |
46 |
-- libnotify) |
47 |
-+AC_ARG_ENABLE([color], |
48 |
-+ AS_HELP_STRING([--disable-color], |
49 |
-+ [turn off color plugin]), |
50 |
-+ [], |
51 |
-+ [enable_color=yes]) |
52 |
-+ |
53 |
-+AS_IF([test "$enable_color" = "yes"], |
54 |
-+ [PKG_CHECK_MODULES(COLOR, |
55 |
-+ colord >= 1.0.2 |
56 |
-+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION |
57 |
-+ libcanberra-gtk3 |
58 |
-+ libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION |
59 |
-+ lcms2 >= $LCMS_REQUIRED_VERSION |
60 |
-+ libnotify) |
61 |
-+ AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled]) |
62 |
-+ ]) |
63 |
-+AM_CONDITIONAL(BUILD_COLOR, test "x$enable_color" = "xyes") |
64 |
- |
65 |
- PKG_CHECK_MODULES(DATETIME, |
66 |
- libnotify >= $LIBNOTIFY_REQUIRED_VERSION |
67 |
-@@ -268,23 +278,31 @@ case $host_os in |
68 |
- if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then |
69 |
- have_wacom=no |
70 |
- else |
71 |
-- if test x$enable_gudev != xno; then |
72 |
-- LIBWACOM_PKG="libwacom >= $LIBWACOM_REQUIRED_VERSION" |
73 |
-- PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION]) |
74 |
-- PKG_CHECK_MODULES(WACOM, [gtk+-3.0 pango >= $PANGO_REQUIRED_VERSION]) |
75 |
-- PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0]) |
76 |
-- else |
77 |
-+ have_wacom=no |
78 |
-+ AS_IF([test "$enable_gudev" != "no"], |
79 |
-+ [AC_ARG_ENABLE([wacom], |
80 |
-+ AS_HELP_STRING([--disable-wacom], |
81 |
-+ [turn off wacom plugin]), |
82 |
-+ [], |
83 |
-+ [enable_wacom=no]) dnl Default value |
84 |
-+ AS_IF([test "$enable_wacom" = "xyes"], |
85 |
-+ [ |
86 |
-+ PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION]) |
87 |
-+ PKG_CHECK_MODULES(WACOM, [gtk+-3.0, pango >= $PANGO_REQUIRED_VERSION]) |
88 |
-+ PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0]) |
89 |
-+ have_wacom=yes |
90 |
-+ AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available]) |
91 |
-+ ]) |
92 |
-+ ], [ |
93 |
- AC_MSG_ERROR([GUdev is necessary to compile Wacom support]) |
94 |
-- fi |
95 |
-- AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available]) |
96 |
-- have_wacom=yes |
97 |
-+ ]) |
98 |
- fi |
99 |
- ;; |
100 |
- *) |
101 |
-- have_wacom=no |
102 |
-- ;; |
103 |
-+ have_wacom=no |
104 |
-+ ;; |
105 |
- esac |
106 |
--AM_CONDITIONAL(HAVE_WACOM, test x$have_wacom = xyes) |
107 |
-+AM_CONDITIONAL(BUILD_WACOM, test x$have_wacom = xyes) |
108 |
- |
109 |
- dnl --------------------------------------------------------------------------- |
110 |
- dnl - common |
111 |
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am |
112 |
-index 9324b406..ee78d6d0 100644 |
113 |
---- a/plugins/Makefile.am |
114 |
-+++ b/plugins/Makefile.am |
115 |
-@@ -4,7 +4,6 @@ enabled_plugins = \ |
116 |
- a11y-keyboard \ |
117 |
- a11y-settings \ |
118 |
- clipboard \ |
119 |
-- color \ |
120 |
- datetime \ |
121 |
- dummy \ |
122 |
- power \ |
123 |
-@@ -22,13 +21,19 @@ enabled_plugins = \ |
124 |
- |
125 |
- disabled_plugins = $(NULL) |
126 |
- |
127 |
-+if BUILD_COLOR |
128 |
-+enabled_plugins += color |
129 |
-+else |
130 |
-+disabled_plugins += color |
131 |
-+endif |
132 |
-+ |
133 |
- if SMARTCARD_SUPPORT |
134 |
- enabled_plugins += smartcard |
135 |
- else |
136 |
- disabled_plugins += smartcard |
137 |
- endif |
138 |
- |
139 |
--if HAVE_WACOM |
140 |
-+if BUILD_WACOM |
141 |
- enabled_plugins += wacom |
142 |
- else |
143 |
- disabled_plugins += wacom |
144 |
-diff --git a/plugins/dummy/Makefile.am b/plugins/dummy/Makefile.am |
145 |
-index cb5856cf..06ac595a 100644 |
146 |
---- a/plugins/dummy/Makefile.am |
147 |
-+++ b/plugins/dummy/Makefile.am |
148 |
-@@ -22,10 +22,13 @@ gsd_dummy_LDADD = $(DUMMY_LIBS) $(top_builddir)/gnome-settings-daemon/libgsd.la |
149 |
- desktopdir = $(sysconfdir)/xdg/autostart |
150 |
- |
151 |
- desktop_DATA = |
152 |
-+if !BUILD_COLOR |
153 |
-+desktop_DATA += org.gnome.SettingsDaemon.Color.desktop |
154 |
-+endif |
155 |
- if !SMARTCARD_SUPPORT |
156 |
- desktop_DATA += org.gnome.SettingsDaemon.Smartcard.desktop |
157 |
- endif |
158 |
--if !HAVE_WACOM |
159 |
-+if !BUILD_WACOM |
160 |
- desktop_DATA += org.gnome.SettingsDaemon.Wacom.desktop |
161 |
- endif |
162 |
- if !BUILD_PRINT_NOTIFICATIONS |
163 |
--- |
164 |
-2.11.1 |
165 |
- |