Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/40ae70a811c23b6ce0bf02a6ecbe9eab098ee52c
...commit
http://git.netsurf-browser.org/netsurf.git/commit/40ae70a811c23b6ce0bf02a6ecbe9eab098ee52c
...tree
http://git.netsurf-browser.org/netsurf.git/tree/40ae70a811c23b6ce0bf02a6ecbe9eab098ee52c
The branch, svenw/cocoa has been updated
via 40ae70a811c23b6ce0bf02a6ecbe9eab098ee52c (commit)
via aa976b0cec95ca53d6efa32f76f0d8d30c00b59b (commit)
from f70ed78b65b9acda2569ed5ee4e8f0d7847ed615 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=40ae70a811c23b6ce0bf02a6ecbe9eab098ee52c
commit 40ae70a811c23b6ce0bf02a6ecbe9eab098ee52c
Author: Sven Weidauer <[email protected]>
Commit: Sven Weidauer <[email protected]>
Remove extra semicolon
diff --git a/frontends/cocoa/BrowserView.m b/frontends/cocoa/BrowserView.m
index 31d4335..110214d 100644
--- a/frontends/cocoa/BrowserView.m
+++ b/frontends/cocoa/BrowserView.m
@@ -102,7 +102,7 @@ static const NSTimeInterval CaretBlinkTime = 0.8;
[self setCaretTimer:nil];
}
-- (void)addCaretAtX: (int)caretX Y: (int)caretY height: (int)caretHeight;
+- (void)addCaretAtX: (int)caretX Y: (int)caretY height: (int)caretHeight
{
if (hasCaret) {
[self setNeedsDisplayInRect:self.caretRect];
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=aa976b0cec95ca53d6efa32f76f0d8d30c00b59b
commit aa976b0cec95ca53d6efa32f76f0d8d30c00b59b
Author: Sven Weidauer <[email protected]>
Commit: Sven Weidauer <[email protected]>
Add libcurl prefix. System provided curl crashes when using SSL.
diff --git a/frontends/cocoa/NetSurf.xcodeproj/project.pbxproj
b/frontends/cocoa/NetSurf.xcodeproj/project.pbxproj
index 0da6f1e..b64b256 100644
--- a/frontends/cocoa/NetSurf.xcodeproj/project.pbxproj
+++ b/frontends/cocoa/NetSurf.xcodeproj/project.pbxproj
@@ -1812,7 +1812,7 @@
buildSettings = {
MKDIR = "mkdir -p";
PATH = "$(PATH):$NETSURF_LIB_PREFIX/bin";
- PKG_CONFIG_PATH =
"$(NETSURF_LIB_PREFIX)/lib/pkgconfig:$(OPENSSL_PREFIX)/lib/pkgconfig:$(RSVG_PREFIX)/lib/pkgconfig";
+ PKG_CONFIG_PATH =
"$(NETSURF_LIB_PREFIX)/lib/pkgconfig:$(CURL_PREFIX)/lib/pkgconfig:$(OPENSSL_PREFIX)/lib/pkgconfig:$(RSVG_PREFIX)/lib/pkgconfig";
PRODUCT_NAME = NetSurf;
RSVG_PREFIX = /usr/local/opt/librsvg;
};
@@ -1823,7 +1823,7 @@
buildSettings = {
MKDIR = "mkdir -p";
PATH = "$(PATH):$NETSURF_LIB_PREFIX/bin";
- PKG_CONFIG_PATH =
"$(NETSURF_LIB_PREFIX)/lib/pkgconfig:$(OPENSSL_PREFIX)/lib/pkgconfig:$(RSVG_PREFIX)/lib/pkgconfig";
+ PKG_CONFIG_PATH =
"$(NETSURF_LIB_PREFIX)/lib/pkgconfig:$(CURL_PREFIX)/lib/pkgconfig:$(OPENSSL_PREFIX)/lib/pkgconfig:$(RSVG_PREFIX)/lib/pkgconfig";
PRODUCT_NAME = NetSurf;
RSVG_PREFIX = /usr/local/opt/librsvg;
};
@@ -2011,6 +2011,7 @@
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ CURL_PREFIX = /usr/local/opt/curl;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_NO_COMMON_BLOCKS = YES;
@@ -2047,6 +2048,7 @@
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ CURL_PREFIX = /usr/local/opt/curl;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-----------------------------------------------------------------------
Summary of changes:
frontends/cocoa/BrowserView.m | 2 +-
frontends/cocoa/NetSurf.xcodeproj/project.pbxproj | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/frontends/cocoa/BrowserView.m b/frontends/cocoa/BrowserView.m
index 31d4335..110214d 100644
--- a/frontends/cocoa/BrowserView.m
+++ b/frontends/cocoa/BrowserView.m
@@ -102,7 +102,7 @@ static const NSTimeInterval CaretBlinkTime = 0.8;
[self setCaretTimer:nil];
}
-- (void)addCaretAtX: (int)caretX Y: (int)caretY height: (int)caretHeight;
+- (void)addCaretAtX: (int)caretX Y: (int)caretY height: (int)caretHeight
{
if (hasCaret) {
[self setNeedsDisplayInRect:self.caretRect];
diff --git a/frontends/cocoa/NetSurf.xcodeproj/project.pbxproj
b/frontends/cocoa/NetSurf.xcodeproj/project.pbxproj
index 0da6f1e..b64b256 100644
--- a/frontends/cocoa/NetSurf.xcodeproj/project.pbxproj
+++ b/frontends/cocoa/NetSurf.xcodeproj/project.pbxproj
@@ -1812,7 +1812,7 @@
buildSettings = {
MKDIR = "mkdir -p";
PATH = "$(PATH):$NETSURF_LIB_PREFIX/bin";
- PKG_CONFIG_PATH =
"$(NETSURF_LIB_PREFIX)/lib/pkgconfig:$(OPENSSL_PREFIX)/lib/pkgconfig:$(RSVG_PREFIX)/lib/pkgconfig";
+ PKG_CONFIG_PATH =
"$(NETSURF_LIB_PREFIX)/lib/pkgconfig:$(CURL_PREFIX)/lib/pkgconfig:$(OPENSSL_PREFIX)/lib/pkgconfig:$(RSVG_PREFIX)/lib/pkgconfig";
PRODUCT_NAME = NetSurf;
RSVG_PREFIX = /usr/local/opt/librsvg;
};
@@ -1823,7 +1823,7 @@
buildSettings = {
MKDIR = "mkdir -p";
PATH = "$(PATH):$NETSURF_LIB_PREFIX/bin";
- PKG_CONFIG_PATH =
"$(NETSURF_LIB_PREFIX)/lib/pkgconfig:$(OPENSSL_PREFIX)/lib/pkgconfig:$(RSVG_PREFIX)/lib/pkgconfig";
+ PKG_CONFIG_PATH =
"$(NETSURF_LIB_PREFIX)/lib/pkgconfig:$(CURL_PREFIX)/lib/pkgconfig:$(OPENSSL_PREFIX)/lib/pkgconfig:$(RSVG_PREFIX)/lib/pkgconfig";
PRODUCT_NAME = NetSurf;
RSVG_PREFIX = /usr/local/opt/librsvg;
};
@@ -2011,6 +2011,7 @@
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ CURL_PREFIX = /usr/local/opt/curl;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_NO_COMMON_BLOCKS = YES;
@@ -2047,6 +2048,7 @@
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ CURL_PREFIX = /usr/local/opt/curl;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
