pkgs/desktops/gnustep/gui/fixup-all.patch

   1 diff -r -u gnustep-gui-0.24.0/GNUmakefile.postamble gnustep-gui-0.24.0.patched/GNUmakefile.postamble
   2 --- gnustep-gui-0.24.0/GNUmakefile.postamble    2010-05-17 22:38:59.000000000 +0600
   3 +++ gnustep-gui-0.24.0.patched/GNUmakefile.postamble    2014-12-01 13:44:05.000000000 +0600
   4 @@ -40,20 +40,20 @@
   5  # The following rule is important mainly for packaging, because in that case
   6  # you install into a fake system tree, and the directory is not there.
   7  #
   8 -$(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional:
   9 -       $(MKDIRS) $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional
  10 +$(DESTDIR_GNUSTEP_MAKEFILES)/Additional:
  11 +       $(MKDIRS) $(DESTDIR_GNUSTEP_MAKEFILES)/Additional
  12
  13  # Things to do before installing
  14 -before-install:: $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional
  15 +before-install:: $(DESTDIR_GNUSTEP_MAKEFILES)/Additional
  16         $(INSTALL_DATA) gui.make \
  17 -          $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional/gui.make
  18 +          $(DESTDIR_GNUSTEP_MAKEFILES)/Additional/gui.make
  19
  20  # Things to do after installing
  21  # after-install::
  22
  23  # Things to do before uninstalling
  24   before-uninstall::
  25 -       rm -f $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional/gui.make
  26 +       rm -f $(DESTDIR_GNUSTEP_MAKEFILES)/Additional/gui.make
  27
  28  # Things to do after uninstalling
  29  # after-uninstall::
  30 diff -r -u gnustep-gui-0.24.0/TextConverters/RTF/GNUmakefile.preamble gnustep-gui-0.24.0.patched/TextConverters/RTF/GNUmakefile.preamble
  31 --- gnustep-gui-0.24.0/TextConverters/RTF/GNUmakefile.preamble  2008-06-10 10:01:49.000000000 +0600
  32 +++ gnustep-gui-0.24.0.patched/TextConverters/RTF/GNUmakefile.preamble  2014-12-01 13:02:11.000000000 +0600
  33 @@ -49,7 +49,7 @@
  34  ADDITIONAL_INCLUDE_DIRS +=-I../../Headers/Additions -I../../Headers
  35
  36  # Additional LDFLAGS to pass to the linker
  37 -#ADDITIONAL_LDFLAGS +=
  38 +ADDITIONAL_LDFLAGS += -lgnustep-gui
  39
  40  # Additional library directories the linker should search
  41  ADDITIONAL_LIB_DIRS += -L../../Source/$(GNUSTEP_OBJ_DIR)
  42 diff -r -u gnustep-gui-0.24.0/Tools/GNUmakefile.preamble gnustep-gui-0.24.0.patched/Tools/GNUmakefile.preamble
  43 --- gnustep-gui-0.24.0/Tools/GNUmakefile.preamble       2006-02-22 12:43:48.000000000 +0600
  44 +++ gnustep-gui-0.24.0.patched/Tools/GNUmakefile.preamble       2014-12-01 12:52:41.000000000 +0600
  45 @@ -32,9 +32,11 @@
  46  ADDITIONAL_LIB_DIRS += -L../Source/$(GNUSTEP_OBJ_DIR) -L../Model/$(GNUSTEP_OBJ_DIR)
  47
  48  # Additional libraries when linking tools
  49 +make_services_TOOL_LIBS += -lgnustep-base
  50  gpbs_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS)
  51  set_show_service_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS)
  52  gopen_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS)
  53 +gclose_TOOL_LIBS += -lgnustep-base
  54  gcloseall_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS)
  55  GSspell_TOOL_LIBS += $(ADDITIONAL_DEPENDS)
  56