GNOME.org
 

[gnome-applets/wip/muktupavels/icons] build: move more icons to data/icons

commit 1284825faffdbf263c93123ea539c03942a0cc44
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Tue Mar 24 22:34:06 2020 +0200

    build: move more icons to data/icons

 data/icons/16x16/apps/Makefile.am                  |   1 +
 .../icons/16x16/apps/gnome-eyes-applet.png         | Bin
 data/icons/22x22/apps/Makefile.am                  |   1 +
 .../icons/22x22/apps/gnome-eyes-applet.png         | Bin
 data/icons/24x24/apps/Makefile.am                  |   1 +
 .../icons/24x24/apps/gnome-eyes-applet.png         | Bin
 data/icons/32x32/apps/Makefile.am                  |   1 +
 .../icons/32x32/apps/gnome-eyes-applet.png         | Bin
 data/icons/48x48/apps/Makefile.am                  |   1 +
 .../icons/48x48/apps}/gnome-mini-commander.png     | Bin
 data/icons/scalable/apps/Makefile.am               |   1 +
 .../icons/scalable/apps}/gnome-eyes-applet.svg     |   0
 geyes/Makefile.am                                  |  55 +--------------------
 mini-commander/src/Makefile.am                     |  16 ------
 14 files changed, 7 insertions(+), 70 deletions(-)
---
diff --git a/data/icons/16x16/apps/Makefile.am b/data/icons/16x16/apps/Makefile.am
index 7f81e244c..5e6ccf026 100644
--- a/data/icons/16x16/apps/Makefile.am
+++ b/data/icons/16x16/apps/Makefile.am
@@ -7,6 +7,7 @@ context = apps
 iconsdir = $(themedir)/$(size)/$(context)
 icons_DATA = \
        gnome-brightness-applet.png \
+       gnome-eyes-applet.png \
        gnome-inhibit-applet.png \
        gnome-sticky-notes-applet.png \
        netspeed-applet.png \
diff --git a/geyes/gnome-eyes-applet.16.png b/data/icons/16x16/apps/gnome-eyes-applet.png
similarity index 100%
rename from geyes/gnome-eyes-applet.16.png
rename to data/icons/16x16/apps/gnome-eyes-applet.png
diff --git a/data/icons/22x22/apps/Makefile.am b/data/icons/22x22/apps/Makefile.am
index 55fb879dc..ed69bf48c 100644
--- a/data/icons/22x22/apps/Makefile.am
+++ b/data/icons/22x22/apps/Makefile.am
@@ -7,6 +7,7 @@ context = apps
 iconsdir = $(themedir)/$(size)/$(context)
 icons_DATA = \
        gnome-brightness-applet.png \
+       gnome-eyes-applet.png \
        gnome-inhibit-applet.png \
        gnome-sticky-notes-applet.png \
        netspeed-applet.png \
diff --git a/geyes/gnome-eyes-applet.22.png b/data/icons/22x22/apps/gnome-eyes-applet.png
similarity index 100%
rename from geyes/gnome-eyes-applet.22.png
rename to data/icons/22x22/apps/gnome-eyes-applet.png
diff --git a/data/icons/24x24/apps/Makefile.am b/data/icons/24x24/apps/Makefile.am
index cce5fd74d..be8f8c523 100644
--- a/data/icons/24x24/apps/Makefile.am
+++ b/data/icons/24x24/apps/Makefile.am
@@ -7,6 +7,7 @@ context = apps
 iconsdir = $(themedir)/$(size)/$(context)
 icons_DATA = \
        gnome-brightness-applet.png \
+       gnome-eyes-applet.png \
        gnome-inhibit-applet.png \
        gnome-sticky-notes-applet.png \
        netspeed-applet.png \
diff --git a/geyes/gnome-eyes-applet.24.png b/data/icons/24x24/apps/gnome-eyes-applet.png
similarity index 100%
rename from geyes/gnome-eyes-applet.24.png
rename to data/icons/24x24/apps/gnome-eyes-applet.png
diff --git a/data/icons/32x32/apps/Makefile.am b/data/icons/32x32/apps/Makefile.am
index ad2428700..71b950040 100644
--- a/data/icons/32x32/apps/Makefile.am
+++ b/data/icons/32x32/apps/Makefile.am
@@ -7,6 +7,7 @@ context = apps
 iconsdir = $(themedir)/$(size)/$(context)
 icons_DATA = \
        gnome-brightness-applet.png \
+       gnome-eyes-applet.png \
        gnome-inhibit-applet.png \
        gnome-sticky-notes-applet.png \
        netspeed-applet.png \
diff --git a/geyes/gnome-eyes-applet.32.png b/data/icons/32x32/apps/gnome-eyes-applet.png
similarity index 100%
rename from geyes/gnome-eyes-applet.32.png
rename to data/icons/32x32/apps/gnome-eyes-applet.png
diff --git a/data/icons/48x48/apps/Makefile.am b/data/icons/48x48/apps/Makefile.am
index 244606975..a95df916c 100644
--- a/data/icons/48x48/apps/Makefile.am
+++ b/data/icons/48x48/apps/Makefile.am
@@ -8,6 +8,7 @@ iconsdir = $(themedir)/$(size)/$(context)
 icons_DATA = \
        gnome-brightness-applet.png \
        gnome-inhibit-applet.png \
+       gnome-mini-commander.png \
        netspeed-applet.png \
        $(NULL)
 
diff --git a/mini-commander/src/gnome-mini-commander.png b/data/icons/48x48/apps/gnome-mini-commander.png
similarity index 100%
rename from mini-commander/src/gnome-mini-commander.png
rename to data/icons/48x48/apps/gnome-mini-commander.png
diff --git a/data/icons/scalable/apps/Makefile.am b/data/icons/scalable/apps/Makefile.am
index 8e04f457d..1f43d0fab 100644
--- a/data/icons/scalable/apps/Makefile.am
+++ b/data/icons/scalable/apps/Makefile.am
@@ -7,6 +7,7 @@ context = apps
 iconsdir = $(themedir)/$(size)/$(context)
 icons_DATA = \
        gnome-brightness-applet.svg \
+       gnome-eyes-applet.svg \
        gnome-inhibit-applet.svg \
        gnome-sticky-notes-applet.svg \
        netspeed-applet.svg \
diff --git a/geyes/gnome-eyes-applet.svg b/data/icons/scalable/apps/gnome-eyes-applet.svg
similarity index 100%
rename from geyes/gnome-eyes-applet.svg
rename to data/icons/scalable/apps/gnome-eyes-applet.svg
diff --git a/geyes/Makefile.am b/geyes/Makefile.am
index 8883d5040..5f90101ff 100644
--- a/geyes/Makefile.am
+++ b/geyes/Makefile.am
@@ -21,63 +21,10 @@ CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA)
 uidir = $(pkgdatadir)/ui
 ui_DATA = geyes-applet-menu.xml
 
-themesdir = $(pkgdatadir)/geyes
-
-icons =        \
-       gnome-eyes-applet.svg    \
-       gnome-eyes-applet.32.png \
-       gnome-eyes-applet.24.png \
-       gnome-eyes-applet.22.png \
-       gnome-eyes-applet.16.png
-
 EXTRA_DIST = \
             README.themes                                      \
             org.gnome.applets.GeyesApplet.panel-applet.in.in   \
              $(service_in_files)                               \
-            $(ui_DATA)                                         \
-            $(icons)
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-
-uninstall-local:
-       for icon in $(icons); do \
-               SIZE=`echo $$icon | cut -d. -f2`; \
-               FILE=`echo $$icon | cut -d. -f1,3`; \
-               if [ "$$SIZE" = "svg" ]; then \
-                       SIZE="scalable"; \
-                       FILE="$$FILE.svg"; \
-               else \
-                       SIZE="$${SIZE}x$${SIZE}"; \
-               fi; \
-               rm -f $(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/$$FILE; \
-       done
-       @-if test -z "$(DESTDIR)"; then \
-               echo "Updating Gtk icon cache."; \
-               $(gtk_update_icon_cache); \
-       else \
-               echo "*** Icon cache not updated. After install, run this:"; \
-               echo "***   $(gtk_update_icon_cache)"; \
-       fi
-
-install-data-local:
-       for icon in $(icons); do \
-               SIZE=`echo $$icon | cut -d. -f2`; \
-               FILE=`echo $$icon | cut -d. -f1,3`; \
-               if [ "$$SIZE" = "svg" ]; then \
-                       SIZE="scalable"; \
-                       FILE="$$FILE.svg"; \
-               else \
-                       SIZE="$${SIZE}x$${SIZE}"; \
-               fi; \
-               mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/; \
-               $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/$$FILE; \
-       done
-       @-if test -z "$(DESTDIR)"; then \
-               echo "Updating Gtk icon cache."; \
-               $(gtk_update_icon_cache); \
-       else \
-               echo "*** Icon cache not updated. After install, run this:"; \
-               echo "***   $(gtk_update_icon_cache)"; \
-       fi
+            $(ui_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/mini-commander/src/Makefile.am b/mini-commander/src/Makefile.am
index 57a0e8f90..26519ee0f 100644
--- a/mini-commander/src/Makefile.am
+++ b/mini-commander/src/Makefile.am
@@ -59,21 +59,6 @@ BITMAPS =                    \
        browser-mini.xpm        \
        history-mini.xpm
 
-desktop_iconsdir = $(datadir)/icons/hicolor/48x48/apps
-desktop_icons_DATA = gnome-mini-commander.png
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-install-data-hook: update-icon-cache
-uninstall-hook: update-icon-cache
-update-icon-cache:
-       @-if test -z "$(DESTDIR)"; then \
-               echo "Updating Gtk icon cache."; \
-               $(gtk_update_icon_cache); \
-       else \
-               echo "*** Icon cache not updated.  After (un)install, run this:"; \
-               echo "***   $(gtk_update_icon_cache)"; \
-       fi
-
 APPLET_LOCATION=$(pkglibdir)/libmini-commander-applet.so
 
 appletdir       = $(LIBPANEL_APPLET_DIR)
@@ -96,7 +81,6 @@ ui_DATA = mini-commander-applet-menu.xml
 EXTRA_DIST =                                                           \
        org.gnome.applets.MiniCommanderApplet.panel-applet.in.in        \
        $(service_in_files)                                             \
-       $(desktop_icons_DATA)                                           \
        $(BITMAPS)                                                      \
        $(ui_DATA)                                                      \
        $(builder_DATA)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]