1
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 01:22:10 +01:00

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

* Repair current OpenSSL static reference from homebrew

* These are the default locations, as of today, for Mac OS X 10.11.4 *(El Capitan)*

**NOTES**
* This could really use some environment variables for homebrew root and which SSL version is in use. Not familiar enough yet with recent Qt to do this at this time.
* Symbolic links could also be used but again determining the current homebrew SSL installed is something to be desired e.g. similar to `$ openssl version` e.g. perhaps a `cut` of `$ brew info openssl`?

Refs:
* http://brew.sh/ *(homepage)*
* https://github.com/Homebrew/brew *(repo)*

Historical refs:
* #1888
* #1850

* Mac: Scrape `brew` output for openssl working install directory as per @nowrep

* Addresses a long standing bug on Mac compiling with this project
* Also correct the BUILDING markdown file for OS X... was awaiting response from the owner to do this to see which direction to move.

**NOTES**
* Quotes **are required** when using `$$system` here otherwise `cut` fails with no switch argument found

Applies to #1971

* Fix BUILDING to BUILDING.md

* Do this so it actually parses markdown

Indirectly related to #1971

* Fix `brew` to Homebrew

* Even though the project is named `brew` and owner is `Homebrew` their pages refers to it as `Homebrew`

Applies to #1971

* Yet another change

* There are more symlinks... so the results from `brew --prefix openssl` yields a symlinked path and adding `/include` and `/lib` to them resolve alternately to the `Cellar`. Feel **much** better about using this one since it's an exact API as I mentioned earlier in the PR

Applies to #1971

* Add a single newline for @cranes-bill

* Only one newline is needed and has nothing to do with trailing spaces... at least according to the GH editor
* Restores the flow :)

Applies to #1971

* More flow of README.md

* GH preview said it didn't need this but I guess it does... we'll try newlines everywhere ;)

Applies to #1971

* Use non-standard markdown for "newlines"

* Restore the spaces manually

**NOTES**
This is not any known specification but it's what @nowrep wants

Refs:
* [CommonMark](http://commonmark.org/)
* [Daring Fireballs](http://daringfireball.net/projects/markdown/)
This commit is contained in:
Marti Martz 2016-05-14 04:45:28 -06:00 committed by David Rosca
parent 2fd838184c
commit 1fe3bed362
4 changed files with 8 additions and 5 deletions

View File

@ -44,7 +44,9 @@ Linux / Unix
MAC OS X 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 After successful compilation, you need to run macdeploy.sh script to correctly
build the application bundle. You will do it with following command: build the application bundle. You will do it with following command:

View File

@ -344,7 +344,7 @@ Version 1.4.0
* use .qupzilla/tmp instead of /tmp for temporary data * use .qupzilla/tmp instead of /tmp for temporary data
* saving passwords should now work for much more sites * saving passwords should now work for much more sites
* don't steal Ctrl+B/U/I shortcuts from page * 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 * improved showing navigation toolbar in fullscreen
* moved config directory into ~/.config/qupzilla * moved config directory into ~/.config/qupzilla
* certificates bundle is now only used on windows * certificates bundle is now only used on windows

View File

@ -34,7 +34,7 @@ Compiling
---------------------------------------------------------------------------------------- ----------------------------------------------------------------------------------------
Before you start compiling, make sure that you have installed the Qt (>= 5.6) development libraries 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** **Linux**

View File

@ -480,8 +480,9 @@ os2 {
mac { mac {
# homebrew openssl # homebrew openssl
INCLUDEPATH += /opt/local/include BREW_OPENSSL = $$system("brew --prefix openssl")
LIBS += -L/opt/local/lib INCLUDEPATH += $$BREW_OPENSSL/include
LIBS += -L$$BREW_OPENSSL/lib
LIBS += -lcrypto -framework CoreServices LIBS += -lcrypto -framework CoreServices
} }