package/xscreensaver/0002-fix-minixpm-build-problem.patch

   1 Fix compile and link errors related to the minixpm code.
   2
   3 Signed-off-by: Simon Dawson <spdawson@gmail.com>
   4
   5 diff -Nurp a/hacks/Makefile.in b/hacks/Makefile.in
   6 --- a/hacks/Makefile.in 2013-07-16 10:23:32.000000000 +0100
   7 +++ b/hacks/Makefile.in 2013-09-22 18:47:56.389238980 +0100
   8 @@ -73,17 +73,22 @@ UTIL_SRCS   = $(UTILS_SRC)/alpha.c $(UTILS
   9                   $(UTILS_SRC)/minixpm.c \
  10                   $(UTILS_SRC)/yarandom.c $(UTILS_SRC)/erase.c \
  11                   $(UTILS_SRC)/xshm.c $(UTILS_SRC)/xdbe.c \
  12 -                 $(UTILS_SRC)/textclient.c
  13 +                 $(UTILS_SRC)/colorbars.c \
  14 +                 $(UTILS_SRC)/fade.c \
  15 +                 $(UTILS_SRC)/textclient.c \
  16 +                 $(UTILS_SRC)/overlay.c
  17  UTIL_OBJS      = $(UTILS_BIN)/alpha.o $(UTILS_BIN)/colors.o \
  18                   $(UTILS_BIN)/grabclient.o \
  19                   $(UTILS_BIN)/hsv.o $(UTILS_BIN)/resources.o \
  20                   $(UTILS_BIN)/spline.o $(UTILS_BIN)/usleep.o \
  21                   $(UTILS_BIN)/visual.o $(UTILS_BIN)/logo.o \
  22 -                 $(UTILS_SRC)/minixpm.c \
  23 +                 $(UTILS_BIN)/minixpm.o \
  24                   $(UTILS_BIN)/yarandom.o $(UTILS_BIN)/erase.o \
  25                   $(UTILS_BIN)/xshm.o $(UTILS_BIN)/xdbe.o \
  26                   $(UTILS_BIN)/colorbars.o \
  27 -                 $(UTILS_SRC)/textclient.o
  28 +                 $(UTILS_BIN)/fade.o \
  29 +                 $(UTILS_BIN)/textclient.o \
  30 +                 $(UTILS_BIN)/overlay.o
  31
  32  SRCS           = attraction.c blitspin.c bouboule.c braid.c bubbles.c \
  33                   bubbles-default.c decayscreen.c deco.c drift.c flag.c \
  34 @@ -559,11 +564,11 @@ xscreensaver-sgigl: xscreensaver-sgigl.c
  35  attraction:    attraction.o    $(HACK_OBJS) $(COL) $(SPL)
  36         $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(COL) $(SPL) $(HACK_LIBS)
  37
  38 -blitspin:      blitspin.o      $(HACK_OBJS) $(GRAB) $(XPM)
  39 -       $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(GRAB) $(XPM) $(XPM_LIBS)
  40 +blitspin:      blitspin.o      $(HACK_OBJS) $(GRAB) $(XPM) $(MINIXPM)
  41 +       $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(GRAB) $(XPM) $(MINIXPM) $(XPM_LIBS)
  42
  43 -bubbles:       bubbles.o       $(HACK_OBJS) bubbles-default.o $(XPM)
  44 -       $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) bubbles-default.o $(XPM) $(XPM_LIBS)
  45 +bubbles:       bubbles.o       $(HACK_OBJS) bubbles-default.o $(XPM) $(MINIXPM)
  46 +       $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) bubbles-default.o $(XPM) $(MINIXPM) $(XPM_LIBS)
  47
  48  decayscreen:   decayscreen.o   $(HACK_OBJS) $(GRAB)
  49         $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(GRAB) $(HACK_LIBS)
  50 @@ -604,8 +609,8 @@ moire:              moire.o         $(HACK_OBJS) $(COL) $(S
  51  moire2:                moire2.o        $(HACK_OBJS) $(COL) $(DBE)
  52         $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(COL) $(DBE) $(HACK_LIBS)
  53
  54 -noseguy:       noseguy.o       $(HACK_OBJS) $(XPM) $(TEXT)
  55 -       $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(XPM) $(TEXT) $(XPM_LIBS) $(TEXT_LIBS)
  56 +noseguy:       noseguy.o       $(HACK_OBJS) $(XPM) $(TEXT) $(MINIXPM)
  57 +       $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(XPM) $(TEXT) $(MINIXPM) $(XPM_LIBS) $(TEXT_LIBS)
  58
  59  pedal:         pedal.o         $(HACK_OBJS) $(HSV) $(ERASE)
  60         $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(HSV) $(ERASE) $(HACK_LIBS)
  61 @@ -658,14 +663,14 @@ interference:  interference.o     $(HACK_OBJ
  62  truchet:        truchet.o      $(HACK_OBJS) $(COL)
  63         $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(COL) $(HACK_LIBS)
  64
  65 -bsod:          bsod.o          $(HACK_OBJS) $(GRAB) $(APPLE2) $(XPM)
  66 -       $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(GRAB) $(APPLE2) $(XPM) $(XPM_LIBS)
  67 +bsod:          bsod.o          $(HACK_OBJS) $(GRAB) $(APPLE2) $(XPM) $(MINIXPM)
  68 +       $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(GRAB) $(APPLE2) $(XPM) $(MINIXPM) $(XPM_LIBS)
  69
  70  apple2:                apple2.o apple2-main.o  $(HACK_OBJS) $(ATV) $(GRAB) $(TEXT)
  71         $(CC_HACK) -o $@ $@.o   apple2-main.o $(HACK_OBJS) $(ATV) $(GRAB) $(TEXT) $(XPM_LIBS) $(TEXT_LIBS)
  72
  73 -xanalogtv:     xanalogtv.o     $(HACK_OBJS) $(ATV) $(GRAB) $(XPM)
  74 -       $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(ATV) $(GRAB) $(XPM) $(XPM_LIBS) $(HACK_LIBS)
  75 +xanalogtv:     xanalogtv.o     $(HACK_OBJS) $(ATV) $(GRAB) $(XPM) $(MINIXPM)
  76 +       $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(ATV) $(GRAB) $(XPM) $(MINIXPM) $(XPM_LIBS) $(HACK_LIBS)
  77
  78  distort:       distort.o       $(HACK_OBJS) $(GRAB) $(SHM)
  79         $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(GRAB) $(SHM) $(HACK_LIBS)
  80 @@ -688,8 +693,8 @@ compass:    compass.o       $(HACK_OBJS) $(DBE)
  81  squiral:       squiral.o       $(HACK_OBJS) $(COL)
  82         $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(COL) $(HACK_LIBS)
  83
  84 -xflame:                xflame.o        $(HACK_OBJS) $(SHM) $(XPM)
  85 -       $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(SHM) $(XPM) $(XPM_LIBS)
  86 +xflame:                xflame.o        $(HACK_OBJS) $(SHM) $(XPM) $(MINIXPM)
  87 +       $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(SHM) $(XPM) $(MINIXPM) $(XPM_LIBS)
  88
  89  wander:                wander.o        $(HACK_OBJS) $(COL) $(ERASE)
  90         $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(COL) $(ERASE) $(HACK_LIBS)
  91 @@ -703,8 +708,8 @@ critical:   critical.o      $(HACK_OBJS) $(COL)
  92  phosphor:      phosphor.o      $(HACK_OBJS) $(TEXT) $(COL)
  93         $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(TEXT) $(COL) $(HACK_LIBS) $(TEXT_LIBS)
  94
  95 -xmatrix:       xmatrix.o       $(HACK_OBJS) $(TEXT) $(XPM)
  96 -       $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(TEXT) $(XPM) $(XPM_LIBS) $(TEXT_LIBS)
  97 +xmatrix:       xmatrix.o       $(HACK_OBJS) $(TEXT) $(XPM) $(MINIXPM)
  98 +       $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(TEXT) $(XPM) $(MINIXPM) $(XPM_LIBS) $(TEXT_LIBS)
  99
 100  petri:         petri.o         $(HACK_OBJS) $(COL) $(SPL)
 101         $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(COL) $(SPL) $(HACK_LIBS)
 102 @@ -787,8 +792,8 @@ cloudlife:  cloudlife.o     $(HACK_OBJS) $(CO
 103  fontglide:     fontglide.o     $(HACK_OBJS) $(DBE) $(TEXT)
 104         $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(DBE) $(TEXT) $(HACK_LIBS) $(TEXT_LIBS)
 105
 106 -pong:  pong.o  $(HACK_OBJS) $(ATV) $(GRAB) $(XPM)
 107 -       $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(ATV) $(GRAB) $(XPM) $(XPM_LIBS) $(HACK_LIBS)
 108 +pong:  pong.o  $(HACK_OBJS) $(ATV) $(GRAB) $(XPM) $(MINIXPM)
 109 +       $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(ATV) $(GRAB) $(XPM) $(MINIXPM) $(XPM_LIBS) $(HACK_LIBS)
 110
 111  wormhole:      wormhole.o      $(HACK_OBJS)
 112         $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(HACK_LIBS)
 113 @@ -856,8 +861,8 @@ braid:              braid.o         $(XLOCK_OBJS) $(ERASE)
 114  drift:         drift.o         $(XLOCK_OBJS) $(ERASE)
 115         $(CC_HACK) -o $@ $@.o   $(XLOCK_OBJS) $(ERASE) $(HACK_LIBS)
 116
 117 -flag:          flag.o          $(XLOCK_OBJS) $(XPM)
 118 -       $(CC_HACK) -o $@ $@.o   $(XLOCK_OBJS) $(XPM) $(XPM_LIBS)
 119 +flag:          flag.o          $(XLOCK_OBJS) $(XPM) $(MINIXPM)
 120 +       $(CC_HACK) -o $@ $@.o   $(XLOCK_OBJS) $(XPM) $(MINIXPM) $(XPM_LIBS)
 121
 122  forest:                forest.o        $(XLOCK_OBJS) $(ERASE)
 123         $(CC_HACK) -o $@ $@.o   $(XLOCK_OBJS) $(ERASE) $(HACK_LIBS)
 124 @@ -959,8 +964,8 @@ thornbird:  thornbird.o     $(XLOCK_OBJS)
 125         $(CC_HACK) -o $@ $@.o   $(XLOCK_OBJS) $(HACK_LIBS)
 126
 127  PACOBJS=pacman_ai.o pacman_level.o
 128 -pacman:                pacman.o        $(PACOBJS) $(XLOCK_OBJS) $(XPM)
 129 -       $(CC_HACK) -o $@ $@.o   $(PACOBJS) $(XLOCK_OBJS) $(XPM) $(XPM_LIBS)
 130 +pacman:                pacman.o        $(PACOBJS) $(XLOCK_OBJS) $(XPM) $(MINIXPM)
 131 +       $(CC_HACK) -o $@ $@.o   $(PACOBJS) $(XLOCK_OBJS) $(XPM) $(MINIXPM) $(XPM_LIBS)
 132
 133  fiberlamp:     fiberlamp.o     $(XLOCK_OBJS)
 134         $(CC_HACK) -o $@ $@.o   $(XLOCK_OBJS) $(HACK_LIBS)