endeavour-PLD.patch

   1 --- endeavour-3.1.4/endeavour2/config.h.orig    2014-02-02 19:38:07.061469313 +0100
   2 +++ endeavour-3.1.4/endeavour2/config.h 2014-02-02 19:41:30.348127450 +0100
   3 @@ -431,8 +431,8 @@
   4  # define EDV_PATH_PROG_DEF_TERMINAL    "x-terminal-emulator"
   5  # define EDV_CMD_DEF_TERMINAL_RUN      "x-terminal-emulator -e"
   6  #else
   7 -# define EDV_PATH_PROG_DEF_TERMINAL    "/usr/X11R6/bin/xterm"
   8 -# define EDV_CMD_DEF_TERMINAL_RUN      "/usr/X11R6/bin/xterm -e"
   9 +# define EDV_PATH_PROG_DEF_TERMINAL    "/usr/bin/xterm"
  10 +# define EDV_CMD_DEF_TERMINAL_RUN      "/usr/bin/xterm -e"
  11  #endif
  12
  13  #define EDV_PATH_PROG_DEF_FORMAT_FRONT EDV_PATH_DEF_GLOBAL_LIB_DIR     \
  14 diff -uNr endeavour-2.5.6.orig/endeavour2/edvcore.c endeavour-2.5.6.pld/endeavour2/edvcore.c
  15 --- endeavour-2.5.6.orig/endeavour2/edv_core.c  2005-10-07 09:01:51.000000000 +0200
  16 +++ endeavour-2.5.6.pld/endeavour2/edv_core.c   2005-12-23 15:27:37.817417472 +0100
  17 @@ -194,6 +194,11 @@
  18             EDV_CFG_PARM_FILE_MIME_TYPES,
  19             PrefixPaths(global_config_dir, EDV_DEF_MIMETYPES_FILE)
  20         );
  21 +#elif defined(PLD)
  22 +       EDV_SET_S(
  23 +           EDV_CFG_PARM_FILE_MIME_TYPES,
  24 +           PrefixPaths(global_config_dir, EDV_DEF_MIMETYPES_FILE)
  25 +       );
  26  #else
  27         EDV_SET_S(
  28             EDV_CFG_PARM_FILE_MIME_TYPES,
  29 --- endeavour-3.1.4/endeavour2/libendeavour2-base/endeavour2-base-config.c.orig 2014-02-02 19:50:52.794770512 +0100
  30 +++ endeavour-3.1.4/endeavour2/libendeavour2-base/endeavour2-base-config.c      2014-02-02 19:50:55.814770386 +0100
  31 @@ -8,7 +8,7 @@
  32  #include <string.h>
  33  #include "config.h"
  34
  35 -#define CFLAGS                 "-I/usr/lib/endeavour2/include"
  36 +#define CFLAGS                 "-I/usr/include/endeavour2"
  37
  38  #define LIBS                   "-lendeavour2-base"
  39
  40 --- endeavour-3.1.4/endeavour2/libendeavour2-base/Makefile.orig 2014-02-02 19:55:48.408091441 +0100
  41 +++ endeavour-3.1.4/endeavour2/libendeavour2-base/Makefile      2014-02-02 20:09:25.538057149 +0100
  42 @@ -6,8 +6,8 @@
  43  MAN1_DIR       = $(PREFIX)/man/man1
  44  MAN3_DIR       = $(PREFIX)/man/man3
  45  EDV_ARCH_DIR   = $(PREFIX)/lib/endeavour2
  46 -EDV_INCLUDE_DIR        = $(PREFIX)/lib/endeavour2/include
  47 -EDV_LIB_DIR    = $(PREFIX)/lib/endeavour2/lib
  48 +EDV_INCLUDE_DIR        = $(PREFIX)/include/endeavour2
  49 +EDV_LIB_DIR    = $(LIB_DIR)
  50  LIB            = libendeavour2-base.so
  51  LIB_CFG_BIN    = endeavour2-base-config
  52  LIB_CFG_MAN    = endeavour2-base-config.1.bz2
  53 --- endeavour-3.1.4/endeavour2/platforms.ini.orig       2009-09-12 09:00:00.000000000 +0200
  54 +++ endeavour-3.1.4/endeavour2/platforms.ini    2014-02-04 16:46:12.354650452 +0100
  55 @@ -410,20 +410,14 @@
  56  Platform = Linux
  57         Description = For most any Linux system
  58         PREFIX = /usr
  59 -       CFLAGS = -Wall -O2 -DNEED_STRCASESTR
  60 +       CFLAGS = $(OPTCFLAGS) -Wall
  61         LIBS = -lendeavour2-base -lm
  62         LIB_DIR = -L./libendeavour2-base
  63         CC = cc
  64         CPP = c++
  65         PlatformSearchPathInclude = /usr/include
  66 -       PlatformSearchPathInclude = /usr/X11R6/include
  67 -       PlatformSearchPathInclude = /usr/local/include
  68 -       PlatformSearchPathInclude = /opt/gnome/include
  69         PlatformSearchPathLib = /lib
  70         PlatformSearchPathLib = /usr/lib
  71 -       PlatformSearchPathLib = /usr/X11R6/lib
  72 -       PlatformSearchPathLib = /usr/local/lib
  73 -       PlatformSearchPathLib = /opt/gnome/lib
  74         PlatformSearchPathEtc = /etc
  75         PlatformSearchPathEtc = /usr/etc
  76         PlatformSearchPathEtc = /usr/local/etc
  77 @@ -432,45 +426,12 @@
  78         PlatformSearchPathBin = /usr/X11R6/bin
  79         PlatformSearchPathBin = /usr/local/bin
  80         PlatformSearchPathBin = /usr/games
  81 -       PlatformSearchPathBin = /opt/gnome/bin
  82         PlatformSearchPathData = /usr/share/icons
  83         PlatformSearchPathData = /usr/share/games
  84         PlatformFeature = debug
  85                 Description = Just adds -g to the CFLAGS for debugging
  86                 MustExist = No
  87                 FeatureCFLAGS = -g
  88 -       PlatformFeature = arch-i486
  89 -               Description = Adds -march=i486 for 486 specific optimizations
  90 -               MustExist = Preferred
  91 -               FeatureCFLAGS = -march=i486
  92 -               FeatureDepend = i486
  93 -                       DependType = Machine
  94 -                       MustExist = Yes
  95 -                       DependMachine = i486
  96 -       PlatformFeature = arch-i586
  97 -               Description = Adds -march=i586 for Pentium specific optimizations
  98 -               MustExist = Preferred
  99 -               FeatureCFLAGS = -march=i586
 100 -               FeatureDepend = i586
 101 -                       DependType = Machine
 102 -                       MustExist = Yes
 103 -                       DependMachine = i586
 104 -       PlatformFeature = arch-i686
 105 -               Description = Adds -march=i686 for Pentium Pro specific optimizations
 106 -               MustExist = Preferred
 107 -               FeatureCFLAGS = -march=i686
 108 -               FeatureDepend = i686
 109 -                       DependType = Machine
 110 -                       MustExist = Yes
 111 -                       DependMachine = i686
 112 -       PlatformFeature = arch-pentiumpro
 113 -               Description = Adds -march=pentiumpro for Pentium Pro specific optimizations
 114 -               MustExist = Preferred
 115 -               FeatureCFLAGS = -march=pentiumpro
 116 -               FeatureDepend = pentiumpro
 117 -                       DependType = Machine
 118 -                       MustExist = Yes
 119 -                       DependMachine = pentiumpro
 120          PlatformFeature = libz
 121                  Description = GNU Z Compression/Decompression Library
 122                  MustExist = Preffered
 123 @@ -591,7 +552,6 @@
 124                 MustExist = Preffered
 125                 FeatureCFLAGS = -DHAVE_LIBXPM
 126                 FeatureLIBS = -lXpm
 127 -               FeatureLIB_DIR = -L/usr/X11R6/lib/
 128                 FeatureDepend = libxpm-devel
 129                         DependType = Header
 130                         MustExist = Yes
 131 @@ -611,11 +571,10 @@
 132                  MustExist = Preferred
 133                  FeatureCFLAGS = -DHAVE_XF86_VIDMODE
 134                  FeatureLIBS = -lXxf86vm
 135 -                FeatureLIB_DIR = -L/usr/X11R6/lib/
 136                  FeatureDepend = xf86vidmode-lib
 137                          DependType = Library
 138                          MustExist = Yes
 139 -                        DependPath = libXxf86vm.a
 140 +                        DependPath = libXxf86vm.so
 141                          DependGrepString = XF86VidModeQueryExtension
 142                  FeatureDepend = xf86vidmode-devel
 143                          DependType = Header
 144 @@ -627,13 +586,11 @@
 145                 MustExist = Yes
 146                 FeatureCFLAGS = `gtk-config --cflags`
 147                 FeatureLIBS = `gtk-config --libs`
 148 -               FeatureLIB_DIR = -L/usr/X11R6/lib
 149                 FeatureDepend = gtk-devel
 150                         DependType = Program
 151                         MustExist = Yes
 152                         DependPath = gtk-config
 153
 154 -
 155  # Debian GNU/Linux
 156  #
 157  # Author: Christoph Berg <cb@df7cb.de>