components/desktop/notion-3/patches/notion-3.patch

   1 diff -ur notion-3-2014052800/build/rules.mk notion-3-2014052800.mangled/build/rules.mk
   2 --- notion-3-2014052800/build/rules.mk  2014-05-27 15:00:18.000000000 -0700
   3 +++ notion-3-2014052800.mangled/build/rules.mk  2014-08-03 09:55:00.518894966 -0700
   4 @@ -104,8 +104,8 @@
   5  TO_CLEAN += preload.c
   6  else # !PRELOAD_MODULES
   7  LDFLAGS += $(EXPORT_DYNAMIC)
   8 -WHOLEA = -Wl,-whole-archive
   9 -NO_WHOLEA = -Wl,-no-whole-archive
  10 +WHOLEA = #-Wl,-whole-archive
  11 +NO_WHOLEA = #-Wl,-no-whole-archive
  12  endif # !PRELOAD_MODULES
  13
  14  preload.c:
  15 diff -ur notion-3-2014052800/libtu/Makefile notion-3-2014052800.mangled/libtu/Makefile
  16 --- notion-3-2014052800/libtu/Makefile  2014-05-27 15:00:18.000000000 -0700
  17 +++ notion-3-2014052800.mangled/libtu/Makefile  2014-08-03 10:00:43.998570080 -0700
  18 @@ -16,7 +16,7 @@
  19
  20  #INCLUDES += $(LIBTU_INCLUDES) $(LUA_INCLUDES)
  21
  22 -CFLAGS += $(C98_SOURCE) $(POSIX_SOURCE) $(WARN)
  23 +CFLAGS += $(C99_SOURCE) $(POSIX_SOURCE) $(WARN)
  24
  25  SOURCES=iterable.c  map.c  misc.c  obj.c  objlist.c  optparser.c  output.c  parser.c  prefix.c  ptrlist.c  rb.c  setparam.c  stringstore.c  tokenizer.c  util.c errorlog.c
  26
  27 diff -ur notion-3-2014052800/mod_notionflux/notionflux/Makefile notion-3-2014052800.mangled/mod_notionflux/notionflux/Makefile
  28 --- notion-3-2014052800/mod_notionflux/notionflux/Makefile      2014-05-27 15:00:18.000000000 -0700
  29 +++ notion-3-2014052800.mangled/mod_notionflux/notionflux/Makefile      2014-08-03 09:49:09.092115438 -0700
  30 @@ -12,7 +12,7 @@
  31
  32  INCLUDES += $(X11_INCLUDES) -I$(TOPDIR)
  33
  34 -LIBS += $(X11_LIBS)
  35 +LIBS += $(X11_LIBS) -lsocket
  36
  37  EXTRA_EXECUTABLE = notionflux
  38
  39 diff -ur notion-3-2014052800/system-autodetect.mk notion-3-2014052800.mangled/system-autodetect.mk
  40 --- notion-3-2014052800/system-autodetect.mk    2014-05-27 15:00:18.000000000 -0700
  41 +++ notion-3-2014052800.mangled/system-autodetect.mk    2014-08-03 10:01:18.006992409 -0700
  42 @@ -9,7 +9,7 @@
  43  # Installation path prefix. Unless you know what you're doing, the default
  44  # of /usr/local is likely the correct choice.
  45  #DIST: PREFIX=/usr/local
  46 -PREFIX ?= /usr/local
  47 +PREFIX ?= /usr
  48
  49  # Unless you are creating a package conforming to some OS's standards, you
  50  # probably do not want to modify the following directories:
  51 @@ -96,7 +96,7 @@
  52
  53  # Remap F11 key to SunF36 and F12 to SunF37? You may want to set this
  54  # on SunOS.
  55 -#DEFINES += -DCF_SUN_F1X_REMAP
  56 +DEFINES += -DCF_SUN_F1X_REMAP
  57
  58
  59  ##
  60 @@ -150,10 +150,10 @@
  61  WARN=-W -Wall -pedantic
  62
  63  CFLAGS += -Os $(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) \
  64 -          -DHAS_SYSTEM_ASPRINTF=$(HAS_SYSTEM_ASPRINTF)
  65 +          -DHAS_SYSTEM_ASPRINTF=$(HAS_SYSTEM_ASPRINTF) -std=c99 -D_XPG6
  66
  67 -LDFLAGS += -Wl,--as-needed $(LIBS) $(EXTRA_LIBS)
  68 -EXPORT_DYNAMIC=-Xlinker --export-dynamic
  69 +LDFLAGS += $(LIBS) $(EXTRA_LIBS)
  70 +EXPORT_DYNAMIC=#-Xlinker --export-dynamic
  71
  72  # The following options are mainly for development use and can be used
  73  # to check that the code seems to conform to some standards. Depending