Skip to content
This repository has been archived by the owner on May 10, 2018. It is now read-only.

Mac: Repair current OpenSSL undefined reference from homebrew to dynamic #1971

Merged
merged 8 commits into from
May 14, 2016
Merged

Mac: Repair current OpenSSL undefined reference from homebrew to dynamic #1971

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b937359
Repair current OpenSSL static reference from homebrew
May 11, 2016
d361d39
Mac: Scrape `brew` output for openssl working install directory as pe…
May 13, 2016
957ed9e
Fix BUILDING to BUILDING.md
May 13, 2016
30d7a54
Fix `brew` to Homebrew
May 13, 2016
0eaba8f
Yet another change
May 14, 2016
edbb1ef
Add a single newline for @cranes-bill
May 14, 2016
a96dad0
More flow of README.md
May 14, 2016
7e43eac
Use non-standard markdown for "newlines"
May 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion BUILDING → BUILDING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ Linux / Unix
MAC OS X
----------------------------------------------------------------------------------

There is no extra dependency, you only need Qt tools and XCode.
You need to have Xcode from the Apple App Store installed in Applications, [Command Line Tools for the same Xcode version](https://developer.apple.com/),
[Homebrew](http://brew.sh/), and `$ brew install openssl` for openssl.
Next compulsory requirement is Qt 5 (>= 5.6) with QtWebEngine.
After successful compilation, you need to run macdeploy.sh script to correctly
build the application bundle. You will do it with following command:

Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ Version 1.4.0
* use .qupzilla/tmp instead of /tmp for temporary data
* saving passwords should now work for much more sites
* don't steal Ctrl+B/U/I shortcuts from page
* disabled by default opacity effect on tab previews - see BUILDING
* disabled by default opacity effect on tab previews - see BUILDING.md
* improved showing navigation toolbar in fullscreen
* moved config directory into ~/.config/qupzilla
* certificates bundle is now only used on windows
Expand Down
10 changes: 5 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
QupZilla Web Browser
----------------------------------------------------------------------------------------

[![Build Status](https://travis-ci.org/QupZilla/qupzilla.svg?branch=master)](https://travis-ci.org/QupZilla/qupzilla)
Homepage: [http://www.qupzilla.com](http://www.qupzilla.com)
Blog: [http://blog.qupzilla.com](http://blog.qupzilla.com)
IRC: `#qupzilla` at `irc.freenode.net`
[![Build Status](https://travis-ci.org/QupZilla/qupzilla.svg?branch=master)](https://travis-ci.org/QupZilla/qupzilla)
Homepage: [http://www.qupzilla.com](http://www.qupzilla.com)
Blog: [http://blog.qupzilla.com](http://blog.qupzilla.com)
IRC: `#qupzilla` at `irc.freenode.net`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes break newlines, the double space at the end of line must stay.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They might indeed... however my editor is permanently set to strip trailing spaces and is done automatically. The MD could use some fine tuning for sure outside of this issue.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not an issue, those newlines are intended (double space in md = newline).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What a pain.. this isn't quite what I was expecting... and yes I did test it in the GH editor before committing... so GH has a bug with their preview too... Give me a minute and I'll go find that option. Eventually this should be phased out.

Copy link
Contributor Author

@Martii Martii May 14, 2016 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Btw who's spec is that? I've never seen that in CommonMark nor Daring Fireballs... but since this is a new discovery I may have missed it. Is it GH specific?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure, it may indeed be GitHub extension.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When you do want to insert a <br /> break tag using Markdown, you end a line with two or more spaces, then type return.

http://daringfireball.net/projects/markdown/syntax#p

Translations: [https://www.transifex.com](https://www.transifex.com/projects/p/qupzilla)

About QupZilla
Expand Down Expand Up @@ -34,7 +34,7 @@ Compiling
----------------------------------------------------------------------------------------

Before you start compiling, make sure that you have installed the Qt (>= 5.6) development libraries
and you have read the [BUILDING](https://github.com/QupZilla/qupzilla/blob/master/BUILDING) information.
and you have read the [BUILDING.md](https://github.com/QupZilla/qupzilla/blob/master/BUILDING.md) information.

**Linux**

Expand Down
5 changes: 3 additions & 2 deletions src/lib/lib.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,8 +480,9 @@ os2 {

mac {
# homebrew openssl
INCLUDEPATH += /opt/local/include
LIBS += -L/opt/local/lib
BREW_OPENSSL = $$system("brew --prefix openssl")
INCLUDEPATH += $$BREW_OPENSSL/include
LIBS += -L$$BREW_OPENSSL/lib

LIBS += -lcrypto -framework CoreServices
}
Expand Down