Add patch to drop icon theme dependency
This commit is contained in:
parent
bc15113715
commit
39140eaeb3
2 changed files with 40 additions and 1 deletions
37
evolution-3.12.5-drop-icon-theme-dep.patch
Normal file
37
evolution-3.12.5-drop-icon-theme-dep.patch
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
diff -up evolution-3.12.5/configure.ac.drop-icon-theme-dep evolution-3.12.5/configure.ac
|
||||
--- evolution-3.12.5/configure.ac.drop-icon-theme-dep 2014-08-11 13:24:33.451075847 +0200
|
||||
+++ evolution-3.12.5/configure.ac 2014-08-11 13:25:05.785074477 +0200
|
||||
@@ -49,7 +49,6 @@ m4_define([gtkhtml_minimum_version], [4.
|
||||
m4_define([gdk_pixbuf_minimum_version], [2.24.0])
|
||||
m4_define([gcr_minimum_version], [3.4])
|
||||
m4_define([gnome_desktop_minimum_version], [2.91.3])
|
||||
-m4_define([gnome_icon_theme_minimum_version], [2.30.2.1])
|
||||
m4_define([gsettings_desktop_schemas_minimum_version], [2.91.92])
|
||||
m4_define([webkitgtk_minimum_version], [2.0.1])
|
||||
m4_define([libgdata_minimum_version], [0.10])
|
||||
@@ -505,25 +504,6 @@ AC_CHECK_HEADERS(sys/wait.h, AC_DEFINE(H
|
||||
AC_CHECK_FUNCS(mkdtemp)
|
||||
|
||||
dnl **************************************************
|
||||
-dnl Gnome Icon Theme
|
||||
-dnl **************************************************
|
||||
-AC_MSG_CHECKING(for icon theme)
|
||||
-PKG_CHECK_EXISTS([gnome-icon-theme >= gnome_icon_theme_minimum_version],
|
||||
- have_icon_theme=yes, have_icon_theme=no)
|
||||
-if test "x$have_icon_theme" != "xyes"; then
|
||||
- PKG_CHECK_EXISTS([adwaita-icon-theme],
|
||||
- have_icon_theme=yes, have_icon_theme=no)
|
||||
-fi
|
||||
-
|
||||
-if test "x$have_icon_theme" != "xyes"; then
|
||||
- AC_MSG_RESULT(no)
|
||||
- AC_MSG_FAILURE([You need to have gnome-icon-theme or adwaita-icon-theme installed.])
|
||||
-else
|
||||
- AC_MSG_RESULT(yes)
|
||||
-fi
|
||||
-
|
||||
-
|
||||
-dnl **************************************************
|
||||
dnl Accessibility support
|
||||
dnl **************************************************
|
||||
PKG_CHECK_MODULES([A11Y], [atk])
|
||||
|
|
@ -50,6 +50,8 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch
|
|||
# RH bug #589555
|
||||
Patch02: evolution-2.30.1-help-contents.patch
|
||||
|
||||
Patch03: evolution-3.12.5-drop-icon-theme-dep.patch
|
||||
|
||||
## Dependencies ###
|
||||
|
||||
Requires: gvfs
|
||||
|
|
@ -58,7 +60,6 @@ Requires: highlight
|
|||
|
||||
### Build Dependencies ###
|
||||
|
||||
BuildRequires: adwaita-icon-theme
|
||||
BuildRequires: autoconf >= 2.59
|
||||
BuildRequires: automake >= 1.9
|
||||
BuildRequires: desktop-file-utils
|
||||
|
|
@ -206,6 +207,7 @@ This package contains the plugin to import Microsoft Personal Storage Table
|
|||
%setup -q -n evolution-%{version}
|
||||
%patch01 -p1 -b .ldaphack
|
||||
%patch02 -p1 -b .help-contents
|
||||
%patch03 -p1 -b .drop-icon-theme-dep
|
||||
|
||||
# Remove the welcome email from Novell
|
||||
for inbox in mail/default/*/Inbox; do
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue