[adwaita-icon-theme] Fix installation of symbolic pngs



commit c9c23f529e888c0642507591357afdf8f47bad0b
Author: Alexander Larsson <alexl redhat com>
Date:   Tue Aug 12 14:30:54 2014 +0200

    Fix installation of symbolic pngs
    
    This adds 24 px symbolic pngs allowing the small size and
    better hidpi handling (which uses the double size icon). It also
    ensures we have directories for the 64 & 96 size symbolic pngs
    in the index.theme file.

 Makefile.am                         |    2 +-
 configure.ac                        |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/Adwaita/64x64/actions/.gitignore b/Adwaita/64x64/actions/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/Adwaita/64x64/apps/.gitignore b/Adwaita/64x64/apps/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/Adwaita/64x64/categories/.gitignore b/Adwaita/64x64/categories/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/Adwaita/64x64/devices/.gitignore b/Adwaita/64x64/devices/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/Adwaita/64x64/emblems/.gitignore b/Adwaita/64x64/emblems/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/Adwaita/64x64/emotes/.gitignore b/Adwaita/64x64/emotes/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/Adwaita/64x64/mimetypes/.gitignore b/Adwaita/64x64/mimetypes/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/Adwaita/64x64/places/.gitignore b/Adwaita/64x64/places/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/Adwaita/64x64/status/.gitignore b/Adwaita/64x64/status/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/Adwaita/96x96/actions/.gitignore b/Adwaita/96x96/actions/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/Adwaita/96x96/apps/.gitignore b/Adwaita/96x96/apps/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/Adwaita/96x96/categories/.gitignore b/Adwaita/96x96/categories/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/Adwaita/96x96/devices/.gitignore b/Adwaita/96x96/devices/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/Adwaita/96x96/emblems/.gitignore b/Adwaita/96x96/emblems/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/Adwaita/96x96/emotes/.gitignore b/Adwaita/96x96/emotes/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/Adwaita/96x96/mimetypes/.gitignore b/Adwaita/96x96/mimetypes/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/Adwaita/96x96/places/.gitignore b/Adwaita/96x96/places/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/Adwaita/96x96/status/.gitignore b/Adwaita/96x96/status/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/Makefile.am b/Makefile.am
index eaff9ff..7cf1a44 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,7 @@ cursor_DATA = $(wildcard $(srcdir)/Adwaita/cursors/*)
 theme_in_files = index.theme.in.in
 theme_DATA = $(theme_in_files:.theme.in.in=.theme)
 
-THEME_DIRS=$(shell SIZES="$(render_sizes)"; for size in $$SIZES; do for dir in `find 
$(srcdir)/$(SVGOUTDIR)/$$size/* -type d`; do printf "$$dir,"; done; done; echo 
"scalable/actions,scalable/apps,scalable/categories,scalable/devices,scalable/emblems,scalable/emotes,scalable/mimetypes,scalable/places,scalable/status,scalable-up-to-32/status,")
+THEME_DIRS=$(shell SIZES="$(install_sizes)"; for size in $$SIZES; do for dir in `find 
$(srcdir)/$(SVGOUTDIR)/$$size/* -type d`; do printf "$$dir,"; done; done; echo 
"scalable/actions,scalable/apps,scalable/categories,scalable/devices,scalable/emblems,scalable/emotes,scalable/mimetypes,scalable/places,scalable/status,scalable-up-to-32/status,")
 
 %.theme.in: %.theme.in.in $(SVGOUTDIR) Makefile
        dirs="`echo $(THEME_DIRS) | sed -e 's#$(srcdir)/Adwaita/##g'`"; \
diff --git a/configure.ac b/configure.ac
index bd0b706..2beff07 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,6 +29,7 @@ AC_SUBST(SVGSRCDIR, "src/symbolic")
 # Icon sizes we want to install
 AC_SUBST([render_sizes], ["8x8 16x16 22x22 24x24 32x32 48x48 256x256"])
 AC_SUBST([symbolic_render_sizes], [""])
+AC_SUBST([install_sizes], ["8x8 16x16 22x22 24x24 32x32 48x48 64x64 96x96 256x256"])
 
 AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache)
 if test -z "$GTK_UPDATE_ICON_CACHE"; then
@@ -51,7 +52,7 @@ if test "x$INKSCAPE" = "xfalse"; then
 fi
 AM_CONDITIONAL(ALLOW_RENDERING, test "x$allow_rendering" = "xyes")
 
-symbolic_encode_sizes="16x16 32x32 48x48 64x64 96x96"
+symbolic_encode_sizes="16x16 24x24 32x32 48x48 64x64 96x96"
 AC_PATH_PROG([GTK_ENCODE_SYMBOLIC_SVG], [gtk-encode-symbolic-svg], [false])
 if test "x$GTK_ENCODE_SYMBOLIC_SVG" = "xfalse"; then
    symbolic_encode_sizes=""


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]