From 291cb2763d3e6adf9343f565045417ae2b9805ff Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Mon, 04 Aug 2008 07:44:10 +0000
Subject: Trac #7641: Install GTK compatibility symlinks using icon-naming-utils package.

The GTK stock icons use pre-standardized icon names.  The sugar theme uses
icon names from

  http://www.freedesktop.org/wiki/Specifications/icon-naming-spec

but GTK still uses its internal names for stock icons.  In order for
stock buttons, icons, and existing GTK applications to be themed correctly,
we need to install symlinks.

This commit adds a build dependency on the icon-naming-utils package,
available in both Fedora and Debian.  Packagers, take note.

Patch by C. Scott Ananian <cscott@laptop.org>
Minor cleanups by me
---
diff --git a/configure.ac b/configure.ac
index 3a5f752..9f040aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,3 +1,5 @@
+AC_PREREQ(2.53)
+
 AC_INIT([sugar-artwork],[0.81.3],[],[sugar-artwork])
 
 AM_CONFIG_HEADER(config.h)
@@ -5,7 +7,9 @@ AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip])
 
 AM_DISABLE_STATIC
-	
+
+PKG_PROG_PKG_CONFIG([0.19])
+
 AC_PROG_CC
 AC_HEADER_STDC
 AC_PROG_LIBTOOL
@@ -23,6 +27,22 @@ PKG_CHECK_MODULES(ENGINE, gtk+-2.0 >= 2.0 gobject-2.0 >= 2.0 cairo >= 0.1.1)
 GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
 AC_SUBST(GTK_VERSION)
 
+ICON_NAMING_UTILS_REQUIRED=0.8.2
+
+AC_MSG_CHECKING([icon-naming-utils >= $ICON_NAMING_UTILS_REQUIRED])
+PKG_CHECK_EXISTS(icon-naming-utils >= $ICON_NAMING_UTILS_REQUIRED,
+                 have_utils=yes, have_utils=no)
+if test "x$have_utils" = "xyes"; then
+   UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`"
+   ICONMAP="$UTILS_PATH/icon-name-mapping"
+   AC_SUBST(ICONMAP)
+   AC_MSG_RESULT([yes])
+else
+   AC_MSG_RESULT([no])
+   AC_MSG_ERROR([icon-naming-utils >= $ICON_NAMING_UTILS_REQUIRED is required to build
+                 and install the icon theme])
+fi
+
 AC_OUTPUT([
 Makefile
 cursor/Makefile
diff --git a/icons/scalable/actions/Makefile.am b/icons/scalable/actions/Makefile.am
index c884544..3719485 100644
--- a/icons/scalable/actions/Makefile.am
+++ b/icons/scalable/actions/Makefile.am
@@ -82,3 +82,6 @@ icon_DATA =						\
 	zoom-out.svg
 
 EXTRA_DIST = $(icon_DATA)
+
+install-data-local: install-iconDATA
+	(cd $(DESTDIR)$(icondir)/.. && $(ICONMAP) -c $(category))
diff --git a/icons/scalable/control/Makefile.am b/icons/scalable/control/Makefile.am
index b100ff9..e194cdb 100644
--- a/icons/scalable/control/Makefile.am
+++ b/icons/scalable/control/Makefile.am
@@ -6,3 +6,6 @@ icon_DATA =				\
 	control-popup-arrow.svg
 
 EXTRA_DIST = $(icon_DATA)
+
+install-data-local: install-iconDATA
+	(cd $(DESTDIR)$(icondir)/.. && $(ICONMAP) -c $(category))
diff --git a/icons/scalable/device/Makefile.am b/icons/scalable/device/Makefile.am
index 26881d2..ab281d5 100644
--- a/icons/scalable/device/Makefile.am
+++ b/icons/scalable/device/Makefile.am
@@ -70,3 +70,6 @@ icon_DATA =				\
 	speaker-muted-100.svg		
 
 EXTRA_DIST = $(icon_DATA)
+
+install-data-local: install-iconDATA
+	(cd $(DESTDIR)$(icondir)/.. && $(ICONMAP) -c $(category))
diff --git a/icons/scalable/emblems/Makefile.am b/icons/scalable/emblems/Makefile.am
index 1ec547b..79d67c9 100644
--- a/icons/scalable/emblems/Makefile.am
+++ b/icons/scalable/emblems/Makefile.am
@@ -12,5 +12,8 @@ icon_DATA =			\
 	emblem-outofrange.svg	\
 	emblem-question.svg	\
 	emblem-warning.svg
-	
+
 EXTRA_DIST = $(icon_DATA)
+
+install-data-local: install-iconDATA
+	(cd $(DESTDIR)$(icondir)/.. && $(ICONMAP) -c $(category))
diff --git a/icons/scalable/mimetypes/Makefile.am b/icons/scalable/mimetypes/Makefile.am
index 4614fd3..706e224 100644
--- a/icons/scalable/mimetypes/Makefile.am
+++ b/icons/scalable/mimetypes/Makefile.am
@@ -12,3 +12,6 @@ icon_DATA =					\
 	video-x-generic.svg
 
 EXTRA_DIST = $(icon_DATA)
+
+install-data-local: install-iconDATA
+	(cd $(DESTDIR)$(icondir)/.. && $(ICONMAP) -c $(category))
diff --git a/icons/scalable/status/Makefile.am b/icons/scalable/status/Makefile.am
index 6bb5e62..b863f9d 100644
--- a/icons/scalable/status/Makefile.am
+++ b/icons/scalable/status/Makefile.am
@@ -6,3 +6,6 @@ icon_DATA =			\
 	image-missing.svg
 
 EXTRA_DIST = $(icon_DATA)
+
+install-data-local: install-iconDATA
+	(cd $(DESTDIR)$(icondir)/.. && $(ICONMAP) -c $(category))
--
cgit v0.9.1