games-kids/gcompris/files/gcompris-15.02-build.patch

   1 --- gcompris-13.11.orig/Makefile.am
   2 +++ gcompris-13.11/Makefile.am
   3 @@ -7,7 +7,7 @@
   4  # endif
   5
   6
   7 -icondir=$(datadir)/pixmaps
   8 +icondir=/usr/share/pixmaps
   9  icon_DATA = gcompris.png gcompris-edit.png
  10
  11  if BUILD_MINGW32
  12 @@ -15,7 +15,7 @@
  13  Applications_in_files =
  14  Applications_DATA =
  15  else
  16 -Applicationsdir = $(datadir)/applications/
  17 +Applicationsdir = /usr/share/applications/
  18  Applications_in_files = gcompris.desktop.in gcompris-edit.desktop.in
  19  Applications_DATA = gcompris.desktop gcompris-edit.desktop
  20  endif
  21 --- gcompris-13.11.orig/configure.ac
  22 +++ gcompris-13.11/configure.ac
  23 @@ -57,7 +57,8 @@
  24    gtk+-2.0 >= $GTK_REQUIRED \
  25    librsvg-2.0 >= $LIBRSVG_REQUIRED \
  26    libxml-2.0 >= $LIBXML_REQUIRED \
  27 -  gthread-2.0 )
  28 +  gthread-2.0 \
  29 +  gmodule-2.0 )
  30
  31  AC_SUBST(GCOMPRIS_CFLAGS)
  32  AC_SUBST(GCOMPRIS_LIBS)
  33 @@ -204,10 +205,8 @@
  34            USE_DEBUG="$enableval", USE_DEBUG="no")
  35  if test "x$USE_DEBUG" == "xyes" ; then
  36      AC_DEFINE_UNQUOTED(DEBUG, 1, "Enable debug messages.")
  37 -    CFLAGS="$CFLAGS $OSX_CFLAGS -Wall -g"
  38 -else
  39 -    CFLAGS="$CFLAGS $OSX_CFLAGS -Wall -O2"
  40  fi
  41 +CFLAGS="$CFLAGS $OSX_CFLAGS -Wall"
  42
  43  dnl disable activation code
  44  AC_ARG_ENABLE(disable-activation-code,
  45 @@ -336,21 +335,21 @@
  46    fi
  47  else
  48    dnl Set PACKAGE_LOCALE_DIR in config.h.
  49 -  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${myprefix}/${DATADIRNAME}/locale", [GCompris locale directory])
  50 +  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "/usr/share/locale", [GCompris locale directory])
  51
  52    dnl Set PACKAGE_DATA_DIR
  53    PACKAGE_DATA_DIR="boards"
  54    AC_SUBST(PACKAGE_DATA_DIR)
  55 -  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${myprefix}/${DATADIRNAME}", [GCompris data directory])
  56 +  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}", [GCompris data directory])
  57
  58    dnl Plugin Directory
  59    my_libdir=`eval echo "${libdir}"`
  60 -  AC_DEFINE_UNQUOTED(PACKAGE_CLIB_DIR, "${my_libdir}", [Gcompris plugins directory])
  61 +  AC_DEFINE_UNQUOTED(PACKAGE_CLIB_DIR, "${libdir}", [Gcompris plugins directory])
  62    plugindir=$libdir/gcompris
  63    AC_SUBST(plugindir)
  64
  65    dnl Python plugin Directory
  66 -  PYTHON_PLUGIN_DIR="${myprefix}/${DATADIRNAME}/${PACKAGE}/python"
  67 +  PYTHON_PLUGIN_DIR="${datadir}/${PACKAGE}/python"
  68    AC_SUBST(PYTHON_PLUGIN_DIR)
  69
  70    dnl System GCompris config directory
  71 --- gcompris-13.11.orig/src/gcompris/gcompris.c
  72 +++ gcompris-13.11/src/gcompris/gcompris.c
  73 @@ -1322,7 +1322,7 @@
  74      properties->package_plugin_dir = g_strconcat(pkg_clib_dir, "/gcompris", NULL);
  75      properties->package_python_plugin_dir = g_strconcat(pkg_data_dir, "/gcompris/python",
  76                                                         NULL);
  77 -    properties->system_icon_dir = g_strconcat(pkg_data_dir, "/pixmaps", NULL);
  78 +    properties->system_icon_dir = g_strconcat("/usr/share", "/pixmaps", NULL);
  79      properties->menu_dir = g_strdup(properties->package_data_dir);
  80      g_free(pkg_data_dir);
  81      g_free(pkg_clib_dir);