BABA,
I've posted updates for rstudio-desktop/rstudio-server-0.99.902-1 on
fink tracking at https://sourceforge.net/p/fink/package-submissions/4674/
to allow the package to build on 10.11 by using fink openssl100 in the
build and to switch the package from R 3.2 to 3.3. The
rstudio-desktop.patch contains two new hunks...
diff -uNr rstudio-0.99.902.orig/src/cpp/desktop-mac/GwtCallbacks.mm
rstudio-0.99.902/src/cpp/desktop-mac/GwtCallbacks.mm
--- rstudio-0.99.902.orig/src/cpp/desktop-mac/GwtCallbacks.mm 2016-05-11
12:03:49.000000000 -0400
+++ rstudio-0.99.902/src/cpp/desktop-mac/GwtCallbacks.mm 2016-06-13
23:52:23.000000000 -0400
@@ -297,8 +297,8 @@
event4 = CGEventCreateKeyboardEvent (NULL, (CGKeyCode)6, false);
event5 = CGEventCreateKeyboardEvent (NULL, (CGKeyCode)56, false);
event6 = CGEventCreateKeyboardEvent (NULL, (CGKeyCode)55, false);
- CGEventSetFlags(event3, kCGEventFlagMaskCommand |
kCGEventFlagMaskShift);
- CGEventSetFlags(event4, kCGEventFlagMaskCommand |
kCGEventFlagMaskShift);
+ CGEventSetFlags(event3, (CGEventFlags)(kCGEventFlagMaskCommand |
kCGEventFlagMaskShift));
+ CGEventSetFlags(event4, (CGEventFlags)(kCGEventFlagMaskCommand |
kCGEventFlagMaskShift));
CGEventPost(kCGHIDEventTap, event1);
CGEventPost(kCGHIDEventTap, event2);
CGEventPost(kCGHIDEventTap, event3);
to deal with Xcode 7 compiler strictness and
diff -uNr rstudio-0.99.902.orig/src/cpp/core/CMakeLists.txt
rstudio-0.99.902/src/cpp/core/CMakeLists.txt
--- rstudio-0.99.902.orig/src/cpp/core/CMakeLists.txt 2016-05-11
12:03:49.000000000 -0400
+++ rstudio-0.99.902/src/cpp/core/CMakeLists.txt 2016-06-13
23:52:08.000000000 -0400
@@ -177,22 +177,14 @@
# handle El Capitan moving OpenSSL away
if(APPLE)
- if(${MACOSX_VERSION} VERSION_GREATER "10.10"
- AND EXISTS "/usr/local/opt/openssl")
-
set(CORE_SYSTEM_LIBRARIES
${CORE_SYSTEM_LIBRARIES}
- -lssl -lcrypto)
+ @PREFIX@/lib/libssl.dylib @PREFIX@/lib/libcrypto.dylib)
set(CORE_INCLUDE_DIRS
${CORE_INCLUDE_DIRS}
- /usr/local/opt/openssl/include)
+ @PREFIX@/include)
- if(NOT DEFINED OPENSSL_ROOT_DIR)
- set(OPENSSL_ROOT_DIR
- /usr/local/opt/openssl)
- endif()
- endif()
endif()
if(RSTUDIO_SERVER)
to use the fink openssl100 package.
Jack
------------------------------------------------------------------------------
What NetFlow Analyzer can do for you? Monitors network bandwidth and traffic
patterns at an interface-level. Reveals which users, apps, and protocols are
consuming the most bandwidth. Provides multi-vendor support for NetFlow,
J-Flow, sFlow and other flows. Make informed decisions using capacity
planning reports. https://ad.doubleclick.net/ddm/clk/305295220;132659582;e
_______________________________________________
Fink-devel mailing list
Fink-devel@lists.sourceforge.net
List archive:
http://news.gmane.org/gmane.os.apple.fink.devel
Subscription management:
https://lists.sourceforge.net/lists/listinfo/fink-devel
