GNOME.org
 

[GNOME-THEMES] Patch to update configure.in and enable versioning

After a little hacking, the version check in configure seem to work
fine. The patch is attached, please review it before I commit on cvs.

More info:
      * most of the changes are inspired by gedit configure.ac file
        (somewhere a simple cut-and-paste-and-rename)
      * the patch will modify also the autogen.sh script, using the same
        script available in other modules
      * I tried to keep configure.in updated to recent suggestions in
        autotools manuals (for example the AC_INIT usage), so applying
        this patch to cvs I'll change it from configure.in to
        configure.ac (as per autotools request)
      * the minor version check is performed using `expr` [1]. Should we
        check if this command is available?
      * I removed a lot of unuseful AC_* macros 'cause gnome-themes
        don't need C compiler or libtool
      * There is no extraversion feature (x.y.z.k) by now; I'll
        investigate later
      * There are a lot of missing files in .cvsignore: I'll fix them
        too.


Cheers, Luca.


[1] If you don't want to look the full patch, the test is

        test `expr $VERSION '%' 2` = "1"
        
It seems to work on Ubuntu (dash shell), but I'm not totally sure about
", ', and ` usage. :-|

? configure.lineno
? missing
? icon-themes/Crux/16x16/Makefile
? icon-themes/Crux/16x16/Makefile.in
? icon-themes/Crux/16x16/actions/Makefile
? icon-themes/Crux/16x16/actions/Makefile.in
? icon-themes/Crux/16x16/places/Makefile
? icon-themes/Crux/16x16/places/Makefile.in
? icon-themes/Crux/16x16/status/Makefile
? icon-themes/Crux/16x16/status/Makefile.in
? icon-themes/Crux/22x22/Makefile
? icon-themes/Crux/22x22/Makefile.in
? icon-themes/Crux/22x22/actions/Makefile
? icon-themes/Crux/22x22/actions/Makefile.in
? icon-themes/Crux/22x22/places/Makefile
? icon-themes/Crux/22x22/places/Makefile.in
? icon-themes/Crux/22x22/status/Makefile
? icon-themes/Crux/22x22/status/Makefile.in
? icon-themes/Crux/24x24/Makefile
? icon-themes/Crux/24x24/Makefile.in
? icon-themes/Crux/24x24/actions/Makefile
? icon-themes/Crux/24x24/actions/Makefile.in
? icon-themes/Crux/24x24/places/Makefile
? icon-themes/Crux/24x24/places/Makefile.in
? icon-themes/Crux/24x24/status/Makefile
? icon-themes/Crux/24x24/status/Makefile.in
? icon-themes/Crux/32x32/Makefile
? icon-themes/Crux/32x32/Makefile.in
? icon-themes/Crux/32x32/actions/Makefile
? icon-themes/Crux/32x32/actions/Makefile.in
? icon-themes/Crux/32x32/places/Makefile
? icon-themes/Crux/32x32/places/Makefile.in
? icon-themes/Crux/32x32/status/Makefile
? icon-themes/Crux/32x32/status/Makefile.in
? icon-themes/Crux/scalable/Makefile
? icon-themes/Crux/scalable/Makefile.in
? icon-themes/Crux/scalable/actions/Makefile
? icon-themes/Crux/scalable/actions/Makefile.in
? icon-themes/Crux/scalable/places/Makefile
? icon-themes/Crux/scalable/places/Makefile.in
? icon-themes/Crux/scalable/status/Makefile
? icon-themes/Crux/scalable/status/Makefile.in
? icon-themes/Mist/Makefile
? icon-themes/Mist/Makefile.in
? icon-themes/Mist/index.theme
? icon-themes/Mist/16x16/Makefile
? icon-themes/Mist/16x16/Makefile.in
? icon-themes/Mist/16x16/actions/Makefile
? icon-themes/Mist/16x16/actions/Makefile.in
? icon-themes/Mist/16x16/places/Makefile
? icon-themes/Mist/16x16/places/Makefile.in
? icon-themes/Mist/16x16/status/Makefile
? icon-themes/Mist/16x16/status/Makefile.in
? icon-themes/Mist/22x22/Makefile
? icon-themes/Mist/22x22/Makefile.in
? icon-themes/Mist/22x22/actions/Makefile
? icon-themes/Mist/22x22/actions/Makefile.in
? icon-themes/Mist/22x22/places/Makefile
? icon-themes/Mist/22x22/places/Makefile.in
? icon-themes/Mist/22x22/status/Makefile
? icon-themes/Mist/22x22/status/Makefile.in
? icon-themes/Mist/24x24/Makefile
? icon-themes/Mist/24x24/Makefile.in
? icon-themes/Mist/24x24/actions/Makefile
? icon-themes/Mist/24x24/actions/Makefile.in
? icon-themes/Mist/24x24/places/Makefile
? icon-themes/Mist/24x24/places/Makefile.in
? icon-themes/Mist/24x24/status/Makefile
? icon-themes/Mist/24x24/status/Makefile.in
? icon-themes/Mist/32x32/Makefile
? icon-themes/Mist/32x32/Makefile.in
? icon-themes/Mist/32x32/actions/Makefile
? icon-themes/Mist/32x32/actions/Makefile.in
? icon-themes/Mist/32x32/places/Makefile
? icon-themes/Mist/32x32/places/Makefile.in
? icon-themes/Mist/32x32/status/Makefile
? icon-themes/Mist/32x32/status/Makefile.in
? icon-themes/Mist/scalable/Makefile
? icon-themes/Mist/scalable/Makefile.in
? icon-themes/Mist/scalable/actions/Makefile
? icon-themes/Mist/scalable/actions/Makefile.in
? icon-themes/Mist/scalable/places/Makefile
? icon-themes/Mist/scalable/places/Makefile.in
? icon-themes/Mist/scalable/status/Makefile
? icon-themes/Mist/scalable/status/Makefile.in
? po/.intltool-merge-cache
Index: autogen.sh
===================================================================
RCS file: /cvs/gnome/gnome-themes/autogen.sh,v
retrieving revision 1.15
diff -n -u -r1.15 autogen.sh
--- autogen.sh	5 Sep 2005 22:22:42 -0000	1.15
+++ autogen.sh	20 Oct 2006 16:25:16 -0000
@@ -4,15 +4,19 @@
 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/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
-
-. gnome-autogen.sh
+which gnome-autogen.sh || {
+    echo "You need to install gnome-common from the GNOME CVS"
+    exit 1
+}
 
+REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh
\ No newline at end of file
Index: configure.in
===================================================================
RCS file: /cvs/gnome/gnome-themes/configure.in,v
retrieving revision 1.198
diff -n -u -r1.198 configure.in
--- configure.in	6 Oct 2006 14:51:28 -0000	1.198
+++ configure.in	20 Oct 2006 16:25:16 -0000
@@ -1,30 +1,43 @@
-AC_PREREQ(2.53)
 
-AC_INIT([gnome-themes], [2.17.0],
-        [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-themes])
-AC_CONFIG_SRCDIR([LargePrint])
+# Making releae:
+#   GNOMETHEMES_MICRO_VERSION += 1
+#
+m4_define(gnomethemes_major_version,  2)
+m4_define(gnomethemes_minor_version, 17)
+m4_define(gnomethemes_micro_version,  0)
+m4_define(gnomethemes_version, gnomethemes_major_version.gnomethemes_minor_version.gnomethemes_micro_version)
+
+
+AC_INIT(gnome-themes, gnomethemes_version, http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-themes)
+AC_CONFIG_SRCDIR(LargePrint/index.theme.in.in)
+
+AC_DEFINE(GNOMETHEMES_MAJOR_VERSION, gnomethemes_major_version, [Gnomethemes major version])
+AC_SUBST(GNOMETHEMES_MAJOR_VERSION, gnomethemes_major_version)
+AC_DEFINE(GNOMETHEMES_MINOR_VERSION, gnomethemes_minor_version, [Gnomethemes minor version])
+AC_SUBST(GNOMETHEMES_MINOR_VERSION, gnomethemes_minor_version)
+AC_DEFINE(GNOMETHEMES_MICRO_VERSION, gnomethemes_micro_version, [Gnomethemes micro version])
+AC_SUBST(GNOMETHEMES_MICRO_VERSION, gnomethemes_micro_version)
 
 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)
+AC_PREREQ(2.59)
+
+AC_CONFIG_HEADER(config.h)
+
+# make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
+AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}")
+
+AM_MAINTAINER_MODE
 
 IT_PROG_INTLTOOL([0.35.0])
+PKG_PROG_PKG_CONFIG([0.19])
+
+# gettext stuff
+GETTEXT_PACKAGE=gnome-themes
+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_PROG_LIBTOOL
 
 # theme engines
 PKG_CHECK_MODULES(THEME_ENGINE,
@@ -36,7 +49,7 @@
 AC_SUBST(GTK_VERSION)
 
 # icon-naming-utils (optional for now, only used by HighContrast-SVG)
-UTILS_REQUIRED=0.8.0
+UTILS_REQUIRED=0.8.1
 AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED])
 PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED,
                  have_utils=yes, have_utils=no)
@@ -52,18 +65,18 @@
                  and install gnome-themes])
 fi
 
-# gettext stuff
-GETTEXT_PACKAGE=gnome-themes
-AC_SUBST(GETTEXT_PACKAGE)
-
-AM_GLIB_GNU_GETTEXT
-
 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)
 
+# check for development version to enable placeholders icons
+# GNOME_MINOR_VERSION is odd for development version
+#
+AM_CONDITIONAL(ENABLE_PLACEHOLDERS, test `expr $GNOMETHEMES_MINOR_VERSION '%' 2` = "1")
+
+
 ### Icon sizes for all large print themes
 
 LARGEPRINT_DND="48,48"
@@ -87,7 +100,7 @@
 AC_SUBST(LARGEPRINT_DESKTOP_FONT)
 AC_SUBST(LARGEPRINT_MONOSPACE_FONT)
 
-dnl used to substitute in common sections of theme gtkrc files
+### Used to substitute in common sections of theme gtkrc files
 gtk_stock_icons_rc=${srcdir}/common/gtk-stock-icons.rc
 panel_stock_icons_rc=${srcdir}/common/panel-stock-icons.rc
 media_stock_icons_rc=${srcdir}/common/media-stock-icons.rc
Index: icon-themes/HighContrast-SVG/scalable/categories/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-themes/icon-themes/HighContrast-SVG/scalable/categories/Makefile.am,v
retrieving revision 1.3
diff -n -u -r1.3 Makefile.am
--- icon-themes/HighContrast-SVG/scalable/categories/Makefile.am	4 Oct 2006 14:00:06 -0000	1.3
+++ icon-themes/HighContrast-SVG/scalable/categories/Makefile.am	20 Oct 2006 16:25:18 -0000
@@ -4,6 +4,16 @@
 
 icondir = $(themedir)/$(size)/$(context)
 
+placeholder_FILES =				\
+	applications-development.svg		\
+	applications-engineering.svg		\
+	applications-multimedia.svg		\
+	applications-office.svg			\
+	applications-other.svg			\
+	applications-science.svg		\
+	applications-system.svg			\
+	applications-utilities.svg
+
 icon_DATA =					\
 	applications-accessories.svg		\
 	applications-games.svg			\
@@ -11,8 +21,13 @@
 	applications-internet.svg		\
 	preferences-desktop.svg	
 
-EXTRA_DIST =				\
-	$(icon_DATA)
+if ENABLE_PLACEHOLDERS
+        icon_DATA += $(placeholder_FILES)
+endif
+
+EXTRA_DIST =					\
+	$(icon_DATA)				\
+	$(placeholder_FILES)
 
 install-data-local: install-iconDATA
 	if  test -n "$(ICONMAP)" ; then \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]