diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | configure.in | 7 | ||||
| -rw-r--r-- | gcompris-edit.desktop.in | 2 | ||||
| -rw-r--r-- | gcompris.desktop.in | 2 | ||||
| -rw-r--r-- | src/libgnomecanvas/Makefile.am | 1 |
5 files changed, 19 insertions, 4 deletions
@@ -1,3 +1,14 @@ +2007-09-10 Bruno coudoin <bruno.coudoin@free.fr> + + - removed unmaitained spec file + - fixed menu file not to include icon extension + - fixed bug#475301 missing freetype includes to compile libgnomecanvas + + * configure.in: + * gcompris-edit.desktop.in: + * gcompris.desktop.in: + * src/libgnomecanvas/Makefile.am: + 2007-09-09 Bruno coudoin <bruno.coudoin@free.fr> * Makefile.am: no more distribute an rpm spec file diff --git a/configure.in b/configure.in index 80f06b1..a00a26d 100644 --- a/configure.in +++ b/configure.in @@ -151,6 +151,10 @@ PKG_CHECK_MODULES(XML, libxml-2.0) AC_SUBST(XML_CFLAGS) AC_SUBST(XML_LIBS) +dnl Freetype2 flags (needed for libgnomecanvas) +PKG_CHECK_MODULES(FT2, freetype2) +AC_SUBST(FT2_CFLAGS) + dnl glib-genmarshal AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) @@ -559,8 +563,7 @@ fi # ]) dnl Autoconf output -AC_OUTPUT([ gcompris.spec -Makefile.mingw +AC_OUTPUT([ Makefile.mingw config.h.mingw gcompris-installer.nsi Makefile diff --git a/gcompris-edit.desktop.in b/gcompris-edit.desktop.in index 60a847c..a1cc1e7 100644 --- a/gcompris-edit.desktop.in +++ b/gcompris-edit.desktop.in @@ -3,7 +3,7 @@ Encoding=UTF-8 Name=GCompris Administration _Comment=Administration for gcompris Exec=gcompris -a --nolockcheck -Icon=gcompris-edit.png +Icon=gcompris-edit Terminal=false Type=Application Categories=Education; diff --git a/gcompris.desktop.in b/gcompris.desktop.in index b0d18ab..d895d96 100644 --- a/gcompris.desktop.in +++ b/gcompris.desktop.in @@ -4,7 +4,7 @@ _Name=Educational suite GCompris _GenericName=Multi-activity educational game _Comment=Educational game for ages 2 to 10 Exec=gcompris -Icon=gcompris.png +Icon=gcompris Terminal=false Type=Application Categories=Game;KidsGame; diff --git a/src/libgnomecanvas/Makefile.am b/src/libgnomecanvas/Makefile.am index 597ceff..3c7cb7e 100644 --- a/src/libgnomecanvas/Makefile.am +++ b/src/libgnomecanvas/Makefile.am @@ -5,6 +5,7 @@ INCLUDES = \ -I$(top_srcdir)/src \ $(WARN_CFLAGS) \ $(GCOMPRIS_CFLAGS) \ + $(FT2_CFLAGS) \ -DGNOMECANVASLIBDIR=\""$(libdir)"\" \ -DGNOMECANVASDATADIR=\""$(datadir)"\" \ -DGNOMECANVASPIXMAPDIR=\""$(datadir)/pixmaps"\" \ |