Guest User

Untitled

a guest
Jan 7th, 2016
104
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. Index: Portfile
  2. ===================================================================
  3. --- Portfile (revision 144297)
  4. +++ Portfile (working copy)
  5. @@ -5,7 +5,7 @@
  6.  
  7. name openmotif
  8. version 2.3.4
  9. -revision 3
  10. +revision 5
  11. categories x11
  12. license LGPL
  13. platforms darwin
  14. @@ -47,12 +47,11 @@
  15. port:xorg-libXp \
  16. port:xorg-libXt
  17.  
  18. -require_active_variants xorg-libXt flat_namespace
  19. -
  20. patchfiles patch-uintptr_t-cast.diff \
  21. patch-lib-XmP.h.diff \
  22. patch-autogen.sh.diff \
  23. - patch-automake-1.13.diff
  24. + patch-automake-1.13.diff \
  25. + vendorShellWidgetClass.patch
  26.  
  27. # See #42847
  28. if {[string match "*clang*" ${configure.compiler}]} {
  29. Index: files/vendorShellWidgetClass.patch
  30. ===================================================================
  31. --- files/vendorShellWidgetClass.patch (nonexistent)
  32. +++ files/vendorShellWidgetClass.patch (working copy)
  33. @@ -0,0 +1,37 @@
  34. +--- lib/Xm/VendorS.c.orig 2016-01-06 23:18:35.000000000 -0800
  35. ++++ lib/Xm/VendorS.c 2016-01-06 23:22:28.000000000 -0800
  36. +@@ -458,7 +458,22 @@ static XmBaseClassExtRec baseClassExtRec
  37. + GetValuesPosthook, /* get_values_posthook */
  38. + };
  39. +
  40. ++#if defined(__APPLE__)
  41. ++extern WidgetClass vendorShellWidgetClass; /* from Xt/Vendor.c */
  42. ++extern VendorShellClassRec _XmVendorShellClassRec;
  43. ++
  44. ++__attribute__((constructor))
  45. ++static void __VendorShellHack(void)
  46. ++{
  47. ++ vendorShellWidgetClass = (WidgetClass)(&_XmVendorShellClassRec);
  48. ++}
  49. ++#endif
  50. ++
  51. ++#if defined(__APPLE__)
  52. ++#define vendorShellClassRec _XmVendorShellClassRec
  53. ++#else
  54. + externaldef(vendorshellclassrec)
  55. ++#endif
  56. + VendorShellClassRec vendorShellClassRec = {
  57. + {
  58. + (WidgetClass) &wmShellClassRec, /* superclass */
  59. +@@ -512,9 +527,10 @@ VendorShellClassRec vendorShellClassRec
  60. + }
  61. + };
  62. +
  63. ++#if !defined(__APPLE__)
  64. + externaldef(vendorshellwidgetclass) WidgetClass
  65. + vendorShellWidgetClass = (WidgetClass) (&vendorShellClassRec);
  66. +-
  67. ++#endif
  68. +
  69. +
  70. +
RAW Paste Data