From 1784ae53e47c8b8ffe1b53f33109a6e88aaace0c Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 26 Nov 2014 20:56:08 +0100 Subject: [PATCH] Other fixes in INSTALL --- doc/INSTALL.asciidoc | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/doc/INSTALL.asciidoc b/doc/INSTALL.asciidoc index 8a98aff2a..e0a96f685 100644 --- a/doc/INSTALL.asciidoc +++ b/doc/INSTALL.asciidoc @@ -1,5 +1,8 @@ +Installing qutebrowser +====================== + On Debian / Ubuntu -~~~~~~~~~~~~~~~~~~ +------------------ qutebrowser should run on these systems: @@ -27,7 +30,7 @@ Then install qutebrowser: ---- On Archlinux -~~~~~~~~~~~~ +------------ There's an Archlinux package available in the https://aur.archlinux.org/packages/qutebrowser-git/[Archlinux AUR]. @@ -44,7 +47,7 @@ $ makepkg -si or you could use an AUR helper, e.g. `yaourt -S qutebrowser-git`. On Gentoo -~~~~~~~~~ +--------- Running qutebrowser on Gentoo is unfortunately rather hard because Qt5 and PyQt5 are not packaged officially. https://github.com/posativ[@posativ] has @@ -108,7 +111,7 @@ $ ln -s ~/.pyenv/qutebrowser/bin/qutebrowser /usr/local/bin/ Your mileage may vary. On Windows -~~~~~~~~~~ +---------- // FIXME: use setup.py to install all dependencies @@ -118,10 +121,10 @@ http://www.riverbankcomputing.com/software/pyqt/download5[Riverbank computing] to get Qt and PyQt5. * Run `scripts/ez_setup.py` to get setuptools. * Get pip as described http://stackoverflow.com/a/12476379[on Stack Overflow]. -* Run +pip install pypeg2+ to install pypeg2. -* Run +pip install jinja2+ to install jinja2, or install it from +* Run `pip install pypeg2` to install pypeg2. +* Run `pip install jinja2` to install jinja2, or install it from http://www.lfd.uci.edu/~gohlke/pythonlibs/#jinja2. -* Run +pip install pygments+ to install pygments, or install it from +* Run `pip install pygments` to install pygments, or install it from http://www.lfd.uci.edu/~gohlke/pythonlibs/#pygments. As soon as v0.1 is out, a standalone .exe (built with @@ -129,7 +132,7 @@ http://cx-freeze.sourceforge.net/[cx_Freeze]) will be provided. In the meantime, you can simply ask in IRC if you need one. On OS X -~~~~~~~ +------- Running qutebrowser on OS X requires compiling PyQt5 by hand. These steps have been tested on OS X Mavericks: @@ -142,7 +145,7 @@ been tested on OS X Mavericks: * http://www.qt.io/download-open-source/[Download] and run the Qt5 installer. If you want, you can deselect Android/iOS when selecting the components to be installed. -* Run +sed -i -e 's/macosx10\.8/macosx10\.9/' ~/Qt/5.3/clang_64/mkspecs/qdevice.pri+ +* Run `sed -i -e 's/macosx10\.8/macosx10\.9/' ~/Qt/5.3/clang_64/mkspecs/qdevice.pri` * http://www.python.org/downloads/[Download] and install the Python 3 installer. After opening the `.dmg`, right-click on 'Python.mpkg' and click 'Open' to run it -- double-clicking won't work. @@ -154,12 +157,12 @@ SIP directory * Use `cd ~/Downloads` to get back to the download directory. * Use `tar xvf PyQt-*.tar` to extract PyQt and `cd PyQt-*` to change into the PyQt directory. -* Run +sed -i -e "s/qmake_QT=\['webkit', 'network'\]/qmake_QT=['webkit', -'network', 'printsupport']/" configure.py+ -* Run +sed -i -e "s/qmake_QT=\['webkitwidgets'\]/qmake_QT=['webkitwidgets', -'printsupport']/" configure.py+ -* Run +python3 configure.py --qmake ~/Qt/5.3/clang_64/bin/qmake --sip -/Library/Frameworks/Python.framework/Versions/3.4/bin/sip+ and accept +* Run `sed -i -e "s/qmake_QT=\['webkit', 'network'\]/qmake_QT=['webkit', +'network', 'printsupport']/" configure.py` +* Run `sed -i -e "s/qmake_QT=\['webkitwidgets'\]/qmake_QT=['webkitwidgets', +'printsupport']/" configure.py` +* Run `python3 configure.py --qmake ~/Qt/5.3/clang_64/bin/qmake --sip +/Library/Frameworks/Python.framework/Versions/3.4/bin/sip` and accept the license. * Run `make` and `sudo make install`. * Run `python3 setup.py install` to install all other dependencies @@ -178,4 +181,3 @@ After installing the requirements, you have these options: NOTE: If you're running qutebrowser from the git repository rather than a released version, you should run `scripts/asciidoc2html.py` to generate the documentation. -