GNOME.org
 

gnome-themes r1563 - in trunk: . icon-themes/HighContrast-SVG/scalable/actions

Author: lferrett
Date: Tue Oct 14 19:22:53 2008
New Revision: 1563
URL: http://svn.gnome.org/viewvc/gnome-themes?rev=1563&view=rev

Log:
2008-10-14  Luca Ferretti <elle uca libero it>

	reviewed by: Calum Benson  <calum benson sun com>

	* autogen.sh:
	* configure.in:

	Add support to placeholder icons. Closes bug #451878
	Side effects: clean up autogen.sh and configure.in, replace
	--disable-legacy-icon-mapping option with --enable-icon-mapping,
	and add --enable-placeholders, update required icon-naming-utils
	to 0.8.7 (following gnome-icon-theme).

	Note that now by default gnome-themes during development
	release	(odd minor) will not create symlinks for legacy icons
	and will install placeholder icons, automatically. On stable
	releases this behavior is, of course, swithched.

	Vendors can force this policy using provide --enable-* options
	at configure time.
	
	* icon-themes/HighContrast-SVG/scalable/actions/Makefile.am:

	Start using placeholders. More will come.



Modified:
   trunk/ChangeLog
   trunk/autogen.sh
   trunk/configure.in
   trunk/icon-themes/HighContrast-SVG/scalable/actions/Makefile.am

Modified: trunk/autogen.sh
==============================================================================
--- trunk/autogen.sh	(original)
+++ trunk/autogen.sh	Tue Oct 14 19:22:53 2008
@@ -4,15 +4,20 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-ORIGDIR=`pwd`
-PKG_NAME=gnome-themes
+PKG_NAME="gnome-themes"
 
-REQUIRED_AUTOMAKE_VERSION=1.9
+(test -f $srcdir/configure.in \
+  && test -f $srcdir/README \
+  && test -d $srcdir/icon-themes/HighContrast) || {
+    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+    echo " top-level $PKG_NAME directory"
+    exit 1
+}
 
-if [ ! -f "$srcdir/gnome-themes.spec.in" ]; then
- echo "$srcdir doesn't look like source directory for $PKG_NAME" >&2
- exit 1
-fi
+which gnome-autogen.sh || {
+    echo "You need to install gnome-common from the GNOME CVS"
+    exit 1
+}
 
-. gnome-autogen.sh
+REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh
 

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Oct 14 19:22:53 2008
@@ -5,28 +5,24 @@
 AC_CONFIG_SRCDIR([icon-themes])
 
 AM_INIT_AUTOMAKE([1.9 tar-ustar])
-AM_CONFIG_HEADER([config.h])
-AM_MAINTAINER_MODE
-
-dnl Honor aclocal flags
-ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
-AC_SUBST(ACLOCAL_AMFLAGS)
 
 IT_PROG_INTLTOOL([0.35.0])
+PKG_PROG_PKG_CONFIG([0.19])
+
+GETTEXT_PACKAGE="${PACKAGE}"
+AC_SUBST(GETTEXT_PACKAGE)
 
-AC_PROG_CC
-# Checks for header files.
-AC_HEADER_STDC
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-# Checks for library functions.
-AC_TYPE_SIGNAL
-AC_FUNC_ALLOCA
-AC_CHECK_FUNCS(setenv putenv)
+AM_GLIB_GNU_GETTEXT
+
+# AM_GLIB_GNU_GETTEXT above subst. $DATADIRNAME
+# this is the directory where the *.{mo,gmo} files are installed
+localedir='${prefix}/${DATADIRNAME}/locale'
+AC_SUBST(localedir)
 
-AM_PROG_LIBTOOL
+# Workaround to make aclocal get the right flags
+AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}")
 
-# theme engines
+# Check GTK+ theme engines
 PKG_CHECK_MODULES(THEME_ENGINE,
  [gtk+-2.0 >= 2.0.0 dnl
   gdk-pixbuf-2.0 >= 2.0.0 dnl
@@ -35,44 +31,65 @@
 GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
 AC_SUBST(GTK_VERSION)
 
-# icon-naming-utils
-UTILS_REQUIRED=0.8.0
-AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED])
-PKG_CHECK_EXISTS(icon-naming-utils >= $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`"
-   case "$host" in
-      *-*-solaris*) ICONMAP="icon-name-mapping" ;;
-      *) ICONMAP="$UTILS_PATH/icon-name-mapping" ;;
-   esac
-   AC_SUBST(ICONMAP)
+# Check if it's a development (odd minor) version
+AC_MSG_CHECKING([development series build])
+MINOR_VERSION="`echo $PACKAGE_VERSION|cut -d. -f2`"
+if expr $MINOR_VERSION % 2 > /dev/null != "0"; then
+   # Development version, disable mapping
+   # and enable placeholder by default
+   icon_mapping_policy=no
+   placeholders_policy=yes
    AC_MSG_RESULT([yes])
 else
-   AC_MSG_RESULT([no])
-   AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build
-                 and install gnome-themes])
+  # Stable version, enable mapping
+  # and disable placeholders by default
+  icon_mapping_policy=yes
+  placeholders_policy=no
+  AC_MSG_RESULT([no])
 fi
 
-# gettext stuff
-GETTEXT_PACKAGE=gnome-themes
-AC_SUBST(GETTEXT_PACKAGE)
-
-AM_GLIB_GNU_GETTEXT
+# Configure option to force placeholders
+AC_ARG_ENABLE([placeholders],
+	AC_HELP_STRING([--enable-placeholders],
+			[Enable placeholder icons [default=auto]]),
+	enable_placeholders=$enableval,
+	enable_placeholders=$placeholders_policy)
+	      
+AM_CONDITIONAL(PLACEHOLDERS, test "x$enable_placeholders" != "xno")
+
+# Configure option to force icon mapping
+AC_ARG_ENABLE([icon-mapping],
+        AC_HELP_STRING([--enable-icon-mapping],
+                        [Enable compatibility symlinks [default=auto]]),
+        enable_mapping=$enableval,
+        enable_mapping=$icon_mapping_policy)
+
+# Check for icon-naming-utils
+ICONMAP="true"
+if test "x$enable_mapping" != "xno"; then
+   UTILS_REQUIRED=0.8.7
+
+   AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED])
+   PKG_CHECK_EXISTS(icon-naming-utils >= $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_MSG_RESULT([yes])
+   else
+	AC_MSG_RESULT([no])
+   	AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build and install gnome-themes])
+   fi
+fi
+AC_SUBST(ICONMAP)
+AM_CONDITIONAL(LEGACY_ICON_MAPPING, test "x$enable_mapping" != "xno")
 
+# Configure options for extra a11y themes
 AC_ARG_ENABLE(all-themes,
  AC_HELP_STRING([--enable-all-themes],
      [Install all a11y theme sets, default is core a11y themes only]),,
  [enable_all_themes=no])
 AM_CONDITIONAL(CORE_THEMES_ONLY, test "$enable_all_themes" = no)
 
-AC_ARG_ENABLE(legacy-icon-mapping,
- AC_HELP_STRING([--disable-legacy-icon-mapping],
-     [Disable symlinking of legacy icon filenames to icon naming spec-compliant filenames (not supported by all themes)]),,
- [legacy_icon_mapping=yes])
-AM_CONDITIONAL(LEGACY_ICON_MAPPING, test "$legacy_icon_mapping" = yes)
-
 ### Icon sizes for all large print themes
 
 LARGEPRINT_DND="48,48"
@@ -253,3 +270,14 @@
 ])
 
 AC_OUTPUT
+
+dnl ==========================================================================
+echo "
+gnome-themes-$VERSION:
+
+        Installation prefix:	${prefix}
+
+	Enable placeholders: ${enable_placeholders}
+	Enable legacy icons: ${enable_mapping}
+	Enable all themes:   ${enable_all_themes}
+"

Modified: trunk/icon-themes/HighContrast-SVG/scalable/actions/Makefile.am
==============================================================================
--- trunk/icon-themes/HighContrast-SVG/scalable/actions/Makefile.am	(original)
+++ trunk/icon-themes/HighContrast-SVG/scalable/actions/Makefile.am	Tue Oct 14 19:22:53 2008
@@ -4,10 +4,8 @@
 
 icondir = $(themedir)/$(size)/$(context)
 
-icon_DATA =					\
-	address-book-new.svg \
+icon_DATA = \
 	application-exit.svg \
-	appointment-new.svg \
 	contact-new.svg \
 	dialog-cancel.svg \
 	dialog-close.svg \
@@ -15,7 +13,6 @@
 	document-new.svg \
 	document-open-recent.svg \
 	document-open.svg \
-	document-page-setup.svg \
 	document-print-preview.svg \
 	document-print.svg \
 	document-properties.svg \
@@ -30,7 +27,6 @@
 	edit-find.svg \
 	edit-paste.svg \
 	edit-redo.svg \
-	edit-select-all.svg \
 	edit-undo.svg \
 	folder-new.svg \
 	format-indent-less.svg \
@@ -40,8 +36,6 @@
 	format-justify-left.svg \
 	format-justify-right.svg \
 	format-text-bold.svg \
-	format-text-direction-ltr.svg \
-	format-text-direction-rtl.svg \
 	format-text-italic.svg \
 	format-text-strikethrough.svg \
 	format-text-underline.svg \
@@ -58,23 +52,15 @@
 	help-about.svg \
 	help-contents.svg \
 	help-faq.svg \
-	insert-image.svg \
-	insert-link.svg \
 	insert-object.svg \
-	insert-text.svg \
 	list-add.svg \
 	list-remove.svg \
 	mail-forward.svg \
 	mail-mark-important.svg \
-	mail-mark-junk.svg \
-	mail-mark-notjunk.svg \
 	mail-mark-read.svg \
 	mail-mark-unread.svg \
 	mail-message-new.svg \
-	mail-reply-all.svg \
 	mail-reply-sender.svg \
-	mail-send-receive.svg \
-	mail-send.svg \
 	media-eject.svg \
 	media-playback-pause.svg \
 	media-playback-start.svg \
@@ -108,9 +94,30 @@
 	zoom-original.svg \
 	zoom-out.svg
 
+placeholder_FILES = \
+	address-book-new.svg \
+	appointment-new.svg \
+	document-page-setup.svg \
+	edit-select-all.svg \
+	format-text-direction-ltr.svg \
+	format-text-direction-rtl.svg \
+	insert-image.svg \
+	insert-link.svg \
+	insert-text.svg \
+	mail-mark-junk.svg \
+	mail-mark-notjunk.svg \
+	mail-reply-all.svg \
+	mail-send.svg \
+	mail-send-receive.svg
+
+if PLACEHOLDERS
+icon_DATA += $(placeholder_FILES)
+endif
+
 
 EXTRA_DIST =				\
-	$(icon_DATA)
+	$(icon_DATA)	\
+	$(placeholder_FILES)
 
 if LEGACY_ICON_MAPPING
 install-data-local: install-iconDATA
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]