game/ltris/ltris-1.0.19-aros.diff

   1 diff -Naur ltris-1.0.19-orig/Makefile.in ltris-1.0.19/Makefile.in
   2 --- ltris-1.0.19-orig/Makefile.in       2013-10-29 16:37:31.000000000 +0100
   3 +++ ltris-1.0.19/Makefile.in    2013-10-29 16:37:31.000000000 +0100
   4 @@ -104,7 +104,7 @@
   5           $(am__cd) "$$dir" && rm -f $$files; }; \
   6    }
   7  am__installdirs = "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(icondir)"
   8 -DATA = $(desktop_DATA) $(icon_DATA)
   9 +DATA = $(icon_DATA)
  10  RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
  11    distclean-recursive maintainer-clean-recursive
  12  AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
  13 @@ -294,10 +294,9 @@
  14  SUBDIRS = intl m4 po src icons
  15  EXTRA_DIST = config.rpath  AUTHORS COPYING ChangeLog INSTALL \
  16  README TODO touchall ABOUT-NLS po/tr.po_full po/pt.po_full \
  17 -po/nonascii.pl ltris32.gif ltris48.gif ltris.desktop.in
  18 +po/nonascii.pl ltris32.gif ltris48.gif
  19
  20  desktopdir = $(datadir)/applications
  21 -desktop_DATA = ltris.desktop
  22  icondir = $(datadir)/icons
  23  icon_DATA = ltris48.gif
  24  AUTOMAKE_OPTIONS = foreign
  25 @@ -357,18 +356,6 @@
  26         -rm -f config.h stamp-h1
  27  intl/Makefile: $(top_builddir)/config.status $(top_srcdir)/intl/Makefile.in
  28         cd $(top_builddir) && $(SHELL) ./config.status $@
  29 -install-desktopDATA: $(desktop_DATA)
  30 -       @$(NORMAL_INSTALL)
  31 -       test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
  32 -       @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
  33 -       for p in $$list; do \
  34 -         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
  35 -         echo "$$d$$p"; \
  36 -       done | $(am__base_list) | \
  37 -       while read files; do \
  38 -         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopdir)'"; \
  39 -         $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \
  40 -       done
  41
  42  uninstall-desktopDATA:
  43         @$(NORMAL_UNINSTALL)
  44 @@ -847,14 +834,6 @@
  45         pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
  46         uninstall-desktopDATA uninstall-iconDATA
  47
  48 -
  49 -# We can't use static desktop file because of icon location. Is this
  50 -# the right way to handle it? At least it works... as long as $datadir
  51 -# does not contain plus signs. :-)
  52 -ltris.desktop:
  53 -       @sed -e "s+Icon=+Icon=$(datadir)/icons/ltris48.gif+" \
  54 -       < ltris.desktop.in > ltris.desktop
  55 -
  56  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  57  # Otherwise a system limit (for SysV at least) may be exceeded.
  58  .NOEXPORT:
  59 diff -Naur ltris-1.0.19-orig/src/config.c ltris-1.0.19/src/config.c
  60 --- ltris-1.0.19-orig/src/config.c      2013-05-03 19:13:11.000000000 +0200
  61 +++ ltris-1.0.19/src/config.c   2013-10-29 16:37:31.000000000 +0100
  62 @@ -38,11 +38,15 @@
  63  /* check if config directory exists; if not create it and set config_dir */
  64  void config_check_dir()
  65  {
  66 +#ifdef __AROS__
  67 +    snprintf( config.dir_name, sizeof(config.dir_name)-1, "%s/%s", "/PROGDIR", CONFIG_DIR_NAME );
  68 +#else
  69  #ifdef DISABLE_INSTALL
  70      sprintf( config.dir_name, "." );
  71  #else
  72      snprintf( config.dir_name, sizeof(config.dir_name)-1, "%s/%s", getenv( "HOME" ), CONFIG_DIR_NAME );
  73  #endif
  74 +#endif
  75      if ( opendir( config.dir_name ) == 0 ) {
  76          fprintf( stderr, "couldn't find/open config directory '%s'\n", config.dir_name );
  77          fprintf( stderr, "attempting to create it... " );
  78 diff -Naur ltris-1.0.19-orig/src/manager.c ltris-1.0.19/src/manager.c
  79 --- ltris-1.0.19-orig/src/manager.c     2013-05-03 19:13:11.000000000 +0200
  80 +++ ltris-1.0.19/src/manager.c  2013-10-29 16:37:31.000000000 +0100
  81 @@ -143,7 +143,11 @@
  82          return;
  83      }
  84      /* get file name + path */
  85 +#ifdef __AROS__
  86 +    snprintf( fname, sizeof(fname)-1, "%s/%s/levels/%s", "/PROGDIR", CONFIG_DIR_NAME, levelset_home_names[config.levelset_home_id] );
  87 +#else
  88      snprintf( fname, sizeof(fname)-1, "%s/%s/levels/%s", getenv( "HOME" ), CONFIG_DIR_NAME, levelset_home_names[config.levelset_home_id] );
  89 +#endif
  90      remove( fname );
  91      levelsets_load_names(); /* reinit name lists and configs indices */
  92      /* reassign these name lists as position in memory has changed */