From 12f7db7941fbc4ceb7cd43c38f662ee32180565b Mon Sep 17 00:00:00 2001 From: Hib Eris Date: Thu, 10 Dec 2009 15:22:16 +0000 Subject: Drop gnome-icon-theme dependency As far as I can tell, Evince required only 3 icons from gnome-icon-theme, 'object-rotate-left', 'object-rotate-right' and 'x-office-presentation'. This patch adds copies for these icons from gnome-icon-theme-2.24. It also removes the compile-time check for gnome-icon-theme on all platforms execpt gnome. Note, when gnome-icon-theme is installed, the icons from that theme take precedence over the icons from this patch. Therefore, evince uses the icons from this patch only as a backup when no gnome-icon-theme is installed. All added icons are copied from gnome-icon-theme-2.24, which is licensed under GNU GPLv2. --- diff --git a/configure.ac b/configure.ac index 6d9a8f9..441559f 100644 --- a/configure.ac +++ b/configure.ac @@ -150,8 +150,21 @@ case "$with_platform" in hildon) AC_DEFINE([PLATFORM_HILDON],[1],[Define if building for the hildon platform]) SHELL_PLATFORM_PKGS="hildon-1 hildon-fm-2 libosso" ;; - *) SHELL_PLATFORM_PKGS="gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED" - ;; + gnome) + # Evince has a rather soft run-time dependency on hicolor-icon-theme. + # If the hicolor theme is not available, Evince fails to display some + # icons. Because we cannot check for it at run-time, we instead + # would like to require the icon theme at compile-time. But, because + # the hicolor-icon-theme does not have a pkgconfig file, on gnome we + # require the gnome icon theme instead. + SHELL_PLATFORM_PKGS="gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED" + ;; + *) + # On all other platforms we issue a warning about the runtime + # dependency. + AC_MSG_WARN([Evince has a soft run-time dependency on hicolor-icon-theme. You are advised to have this theme installed when running Evince.]); + SHELL_PLATFORM_PKGS="" + ;; esac PKG_CHECK_MODULES([SHELL_CORE],[libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gthread-2.0 $SHELL_PLATFORM_PKGS]) @@ -757,19 +770,25 @@ data/icons/Makefile data/icons/16x16/Makefile data/icons/16x16/apps/Makefile data/icons/16x16/actions/Makefile +data/icons/16x16/mimetypes/Makefile data/icons/22x22/Makefile data/icons/22x22/apps/Makefile data/icons/22x22/actions/Makefile +data/icons/22x22/mimetypes/Makefile data/icons/24x24/Makefile data/icons/24x24/apps/Makefile data/icons/24x24/actions/Makefile +data/icons/24x24/mimetypes/Makefile data/icons/32x32/Makefile data/icons/32x32/actions/Makefile +data/icons/32x32/mimetypes/Makefile data/icons/48x48/Makefile data/icons/48x48/apps/Makefile data/icons/48x48/actions/Makefile data/icons/scalable/Makefile data/icons/scalable/apps/Makefile +data/icons/scalable/actions/Makefile +data/icons/scalable/mimetypes/Makefile help/Makefile help/reference/Makefile help/reference/libdocument/Makefile diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am index 4497479..b02d3a8 100644 --- a/data/icons/16x16/Makefile.am +++ b/data/icons/16x16/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = actions apps +SUBDIRS = actions apps mimetypes -include $(top_srcdir)/git.mk diff --git a/data/icons/16x16/actions/Makefile.am b/data/icons/16x16/actions/Makefile.am index 266a84a..5d19e26 100644 --- a/data/icons/16x16/actions/Makefile.am +++ b/data/icons/16x16/actions/Makefile.am @@ -9,7 +9,9 @@ icons_DATA = \ view-page-facing.png \ zoom.png \ zoom-fit-page.png \ - zoom-fit-width.png + zoom-fit-width.png \ + object-rotate-left.png \ + object-rotate-right.png noinst_DATA = \ view-page-continuous.xcf \ diff --git a/data/icons/16x16/actions/object-rotate-left.png b/data/icons/16x16/actions/object-rotate-left.png new file mode 100644 index 0000000..c455b53 --- /dev/null +++ b/data/icons/16x16/actions/object-rotate-left.png Binary files differ diff --git a/data/icons/16x16/actions/object-rotate-right.png b/data/icons/16x16/actions/object-rotate-right.png new file mode 100644 index 0000000..49e5727 --- /dev/null +++ b/data/icons/16x16/actions/object-rotate-right.png Binary files differ diff --git a/data/icons/16x16/mimetypes/Makefile.am b/data/icons/16x16/mimetypes/Makefile.am new file mode 100644 index 0000000..9a2164c --- /dev/null +++ b/data/icons/16x16/mimetypes/Makefile.am @@ -0,0 +1,14 @@ +themedir = $(pkgdatadir)/icons/hicolor +size = 16x16 +context = mimetypes + +iconsdir = $(themedir)/$(size)/$(context) + +icons_DATA = \ + x-office-presentation.png + +noinst_DATA = + +EXTRA_DIST = \ + $(icons_DATA) \ + $(noinst_DATA) diff --git a/data/icons/16x16/mimetypes/x-office-presentation.png b/data/icons/16x16/mimetypes/x-office-presentation.png new file mode 100644 index 0000000..da0546d --- /dev/null +++ b/data/icons/16x16/mimetypes/x-office-presentation.png Binary files differ diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am index 4497479..b02d3a8 100644 --- a/data/icons/22x22/Makefile.am +++ b/data/icons/22x22/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = actions apps +SUBDIRS = actions apps mimetypes -include $(top_srcdir)/git.mk diff --git a/data/icons/22x22/actions/Makefile.am b/data/icons/22x22/actions/Makefile.am index c1b56f6..eba54c2 100644 --- a/data/icons/22x22/actions/Makefile.am +++ b/data/icons/22x22/actions/Makefile.am @@ -6,6 +6,8 @@ iconsdir = $(themedir)/$(size)/$(context) icons_DATA = \ eye.png \ + object-rotate-left.png \ + object-rotate-right.png \ view-page-continuous.png \ view-page-facing.png \ zoom.png \ diff --git a/data/icons/22x22/actions/object-rotate-left.png b/data/icons/22x22/actions/object-rotate-left.png new file mode 100644 index 0000000..cbd71e5 --- /dev/null +++ b/data/icons/22x22/actions/object-rotate-left.png Binary files differ diff --git a/data/icons/22x22/actions/object-rotate-right.png b/data/icons/22x22/actions/object-rotate-right.png new file mode 100644 index 0000000..b0e33dc --- /dev/null +++ b/data/icons/22x22/actions/object-rotate-right.png Binary files differ diff --git a/data/icons/22x22/mimetypes/Makefile.am b/data/icons/22x22/mimetypes/Makefile.am new file mode 100644 index 0000000..b81bf64 --- /dev/null +++ b/data/icons/22x22/mimetypes/Makefile.am @@ -0,0 +1,14 @@ +themedir = $(pkgdatadir)/icons/hicolor +size = 22x22 +context = mimetypes + +iconsdir = $(themedir)/$(size)/$(context) + +icons_DATA = \ + x-office-presentation.png + +noinst_DATA = + +EXTRA_DIST = \ + $(icons_DATA) \ + $(noinst_DATA) diff --git a/data/icons/22x22/mimetypes/x-office-presentation.png b/data/icons/22x22/mimetypes/x-office-presentation.png new file mode 100644 index 0000000..6c8fb62 --- /dev/null +++ b/data/icons/22x22/mimetypes/x-office-presentation.png Binary files differ diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am index 4497479..b02d3a8 100644 --- a/data/icons/24x24/Makefile.am +++ b/data/icons/24x24/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = actions apps +SUBDIRS = actions apps mimetypes -include $(top_srcdir)/git.mk diff --git a/data/icons/24x24/actions/Makefile.am b/data/icons/24x24/actions/Makefile.am index f97a4b0..d40169d 100644 --- a/data/icons/24x24/actions/Makefile.am +++ b/data/icons/24x24/actions/Makefile.am @@ -10,7 +10,9 @@ icons_DATA = \ view-page-facing.png \ zoom.png \ zoom-fit-page.png \ - zoom-fit-width.png + zoom-fit-width.png \ + object-rotate-left.png \ + object-rotate-right.png noinst_DATA = diff --git a/data/icons/24x24/actions/object-rotate-left.png b/data/icons/24x24/actions/object-rotate-left.png new file mode 100644 index 0000000..29aa9ab --- /dev/null +++ b/data/icons/24x24/actions/object-rotate-left.png Binary files differ diff --git a/data/icons/24x24/actions/object-rotate-right.png b/data/icons/24x24/actions/object-rotate-right.png new file mode 100644 index 0000000..dea855a --- /dev/null +++ b/data/icons/24x24/actions/object-rotate-right.png Binary files differ diff --git a/data/icons/24x24/mimetypes/Makefile.am b/data/icons/24x24/mimetypes/Makefile.am new file mode 100644 index 0000000..abc9554 --- /dev/null +++ b/data/icons/24x24/mimetypes/Makefile.am @@ -0,0 +1,14 @@ +themedir = $(pkgdatadir)/icons/hicolor +size = 24x24 +context = mimetypes + +iconsdir = $(themedir)/$(size)/$(context) + +icons_DATA = \ + x-office-presentation.png + +noinst_DATA = + +EXTRA_DIST = \ + $(icons_DATA) \ + $(noinst_DATA) diff --git a/data/icons/24x24/mimetypes/x-office-presentation.png b/data/icons/24x24/mimetypes/x-office-presentation.png new file mode 100644 index 0000000..4133d22 --- /dev/null +++ b/data/icons/24x24/mimetypes/x-office-presentation.png Binary files differ diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am index 6b7db23..02d9f74 100644 --- a/data/icons/32x32/Makefile.am +++ b/data/icons/32x32/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = actions +SUBDIRS = actions mimetypes -include $(top_srcdir)/git.mk diff --git a/data/icons/32x32/actions/Makefile.am b/data/icons/32x32/actions/Makefile.am index 52a99cf..09e2049 100644 --- a/data/icons/32x32/actions/Makefile.am +++ b/data/icons/32x32/actions/Makefile.am @@ -5,6 +5,8 @@ context = actions iconsdir = $(themedir)/$(size)/$(context) icons_DATA = \ + object-rotate-left.png \ + object-rotate-right.png \ view-page-continuous.png \ view-page-facing.png diff --git a/data/icons/32x32/actions/object-rotate-left.png b/data/icons/32x32/actions/object-rotate-left.png new file mode 100644 index 0000000..26e74b0 --- /dev/null +++ b/data/icons/32x32/actions/object-rotate-left.png Binary files differ diff --git a/data/icons/32x32/actions/object-rotate-right.png b/data/icons/32x32/actions/object-rotate-right.png new file mode 100644 index 0000000..9164b5d --- /dev/null +++ b/data/icons/32x32/actions/object-rotate-right.png Binary files differ diff --git a/data/icons/32x32/mimetypes/Makefile.am b/data/icons/32x32/mimetypes/Makefile.am new file mode 100644 index 0000000..014f357 --- /dev/null +++ b/data/icons/32x32/mimetypes/Makefile.am @@ -0,0 +1,14 @@ +themedir = $(pkgdatadir)/icons/hicolor +size = 32x32 +context = mimetypes + +iconsdir = $(themedir)/$(size)/$(context) + +icons_DATA = \ + x-office-presentation.png + +noinst_DATA = + +EXTRA_DIST = \ + $(icons_DATA) \ + $(noinst_DATA) diff --git a/data/icons/32x32/mimetypes/x-office-presentation.png b/data/icons/32x32/mimetypes/x-office-presentation.png new file mode 100644 index 0000000..251800d --- /dev/null +++ b/data/icons/32x32/mimetypes/x-office-presentation.png Binary files differ diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am index 906a50e..b02d3a8 100644 --- a/data/icons/scalable/Makefile.am +++ b/data/icons/scalable/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = apps +SUBDIRS = actions apps mimetypes -include $(top_srcdir)/git.mk diff --git a/data/icons/scalable/actions/Makefile.am b/data/icons/scalable/actions/Makefile.am new file mode 100644 index 0000000..45fbb93 --- /dev/null +++ b/data/icons/scalable/actions/Makefile.am @@ -0,0 +1,15 @@ +themedir = $(pkgdatadir)/icons/hicolor +size = scalable +context = actions + +iconsdir = $(themedir)/$(size)/$(context) + +icons_DATA = \ + object-rotate-left.svg \ + object-rotate-right.svg + +noinst_DATA = + +EXTRA_DIST = \ + $(icons_DATA) \ + $(noinst_DATA) diff --git a/data/icons/scalable/actions/object-rotate-left.svg b/data/icons/scalable/actions/object-rotate-left.svg new file mode 100644 index 0000000..b0df370 --- /dev/null +++ b/data/icons/scalable/actions/object-rotate-left.svg @@ -0,0 +1,208 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Lapo Calamandrei + + + + Rotate Left + 2006-10-02 + + + object + rotate + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/scalable/actions/object-rotate-right.svg b/data/icons/scalable/actions/object-rotate-right.svg new file mode 100644 index 0000000..847329b --- /dev/null +++ b/data/icons/scalable/actions/object-rotate-right.svg @@ -0,0 +1,210 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Lapo Calamandrei + + + + Rotate Left + 2006-10-02 + + + object + rotate + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/scalable/mimetypes/Makefile.am b/data/icons/scalable/mimetypes/Makefile.am new file mode 100644 index 0000000..0fbf88d --- /dev/null +++ b/data/icons/scalable/mimetypes/Makefile.am @@ -0,0 +1,14 @@ +themedir = $(pkgdatadir)/icons/hicolor +size = scalable +context = mimetypes + +iconsdir = $(themedir)/$(size)/$(context) + +icons_DATA = \ + x-office-presentation.svg + +noinst_DATA = + +EXTRA_DIST = \ + $(icons_DATA) \ + $(noinst_DATA) diff --git a/data/icons/scalable/mimetypes/x-office-presentation.svg b/data/icons/scalable/mimetypes/x-office-presentation.svg new file mode 100644 index 0000000..8ded5a2 --- /dev/null +++ b/data/icons/scalable/mimetypes/x-office-presentation.svg @@ -0,0 +1,686 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Lapo Calamandrei + + + Presentation + + + Based of Hylke Bons Work + + + + + + presentation + slides + powerpoint + spreadsheet + impress + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v0.9.1