Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update README for Homebrew. #3991

Merged
merged 1 commit into from Nov 17, 2014
Merged

Update README for Homebrew. #3991

merged 1 commit into from Nov 17, 2014

Conversation

@Hoverbear
Copy link
Member

Hoverbear commented Nov 15, 2014

glfw3 is in the homebrew/versions keg.

~  brew install glfw3
Error: No available formula for glfw3
Searching formulae...
Searching taps...
homebrew/versions/glfw3

Simplest fix:

~  brew install homebrew/versions/glfw3
Cloning into '/usr/local/Library/Taps/homebrew/homebrew-versions'...
remote: Counting objects: 2495, done.
remote: Total 2495 (delta 0), reused 0 (delta 0)
Receiving objects: 100% (2495/2495), 820.05 KiB | 462.00 KiB/s, done.
Resolving deltas: 100% (1433/1433), done.
Checking connectivity... done.
Tapped 161 formulae
==> Installing glfw3 from homebrew/homebrew-versions
==> Downloading https://downloads.sourceforge.net/project/glfw/glfw/3.0.4/glfw-3.0.4.tar.bz2
Already downloaded: /Library/Caches/Homebrew/glfw3-3.0.4.tar.bz2
==> Patching
patching file CMakeLists.txt
Hunk #1 succeeded at 370 with fuzz 1 (offset 13 lines).
==> cmake -DCMAKE_INSTALL_PREFIX=/usr/local/Cellar/glfw3/3.0.4 -DCMAKE_BUILD_TYPE=None -DCMAKE_FIND_FRAMEWORK=LAST -DCMAKE_VERBOSE_MAKEFILE=ON -Wno-dev -DGLFW_USE_CHDIR=TRUE -DGLFW_USE_MENUBAR=TRUE -DBUIL
==> make install
🍺  /usr/local/Cellar/glfw3/3.0.4: 11 files, 220K, built in 9 seconds

Users who have homebrew/versions already tapped won't notice this, since after tapping homebrew/versions keg shouldn't notice, since after tapping, the library is available using just brew install glfw3.

~  brew tap
homebrew/versions
➜  ~  brew install glfw3
==> Installing glfw3 from homebrew/homebrew-versions
==> Downloading https://downloads.sourceforge.net/project/glfw/glfw/3.0.4/glfw-3.0.4.tar.bz2
Already downloaded: /Library/Caches/Homebrew/glfw3-3.0.4.tar.bz2
==> Patching
patching file CMakeLists.txt
Hunk #1 succeeded at 370 with fuzz 1 (offset 13 lines).
==> cmake -DCMAKE_INSTALL_PREFIX=/usr/local/Cellar/glfw3/3.0.4 -DCMAKE_BUILD_TYPE=None -DCMAKE_FIND_FRAMEWORK=LAST -DCMAKE_VERBOSE_MAKEFILE=ON -Wno-dev -DGLFW_USE_CHDIR=TRUE -DGLFW_USE_MENUBAR=TRUE -DBUIL
==> make install
🍺  /usr/local/Cellar/glfw3/3.0.4: 11 files, 220K, built in 9 seconds
@hoppipolla-critic-bot
Copy link

hoppipolla-critic-bot commented Nov 15, 2014

Critic review: https://critic.hoppipolla.co.uk/r/3174

This is an external review system which you may optionally use for the code review of your pull request.

In order to help critic track your changes, please do not make in-place history rewrites (e.g. via git rebase -i or git commit --amend) when updating this pull request.

@jdm
Copy link
Member

jdm commented Nov 15, 2014

There's a similar PR in #3895, but we actually should just remove glfw3 from the prerequisites entirely since it is no longer needed. Could you do that instead?

@Hoverbear
Copy link
Member Author

Hoverbear commented Nov 15, 2014

@jdm Yup. I pulled it from the other parts of the README.md too.

@jdm
Copy link
Member

jdm commented Nov 15, 2014

Thanks!

@jdm
Copy link
Member

jdm commented Nov 16, 2014

Hmm, looks like this need a rebase. Sorry.

@Hoverbear Hoverbear force-pushed the Hoverbear:patch-1 branch from 0a7339d to 4e747c0 Nov 16, 2014
@Hoverbear
Copy link
Member Author

Hoverbear commented Nov 16, 2014

Should be better.

@jdm
Copy link
Member

jdm commented Nov 16, 2014

Still can't merge for some reason :/

@jdm
Copy link
Member

jdm commented Nov 16, 2014

The reason being that the commit now includes a bunch of sniffer-related code in net/.

@Hoverbear
Copy link
Member Author

Hoverbear commented Nov 16, 2014

Oy, yeah, what the heck.

glfw3 is in the `homebrew/homebrew-versions` repository.
@Hoverbear Hoverbear force-pushed the Hoverbear:patch-1 branch from 4e747c0 to 3b2fcb0 Nov 16, 2014
@Hoverbear
Copy link
Member Author

Hoverbear commented Nov 16, 2014

@jdm Sorry about that. Should be happy now. Oh the folly of git rebase -i.

@jdm

This comment has been minimized.

Copy link

jdm commented on 3b2fcb0 Nov 16, 2014

r+

This comment has been minimized.

Copy link

jdm replied Nov 17, 2014

@bors: retry

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo commented on 3b2fcb0 Nov 16, 2014

saw approval from jdm
at Hoverbear@3b2fcb0

This comment has been minimized.

Copy link
Contributor

bors-servo replied Nov 16, 2014

merging Hoverbear/servo/patch-1 = 3b2fcb0 into auto

This comment has been minimized.

Copy link
Contributor

bors-servo replied Nov 16, 2014

Hoverbear/servo/patch-1 = 3b2fcb0 merged ok, testing candidate = 4a5b704

This comment has been minimized.

Copy link
Contributor

bors-servo replied Nov 16, 2014

This comment has been minimized.

Copy link
Contributor

bors-servo replied Nov 17, 2014

saw approval from jdm
at Hoverbear@3b2fcb0

This comment has been minimized.

Copy link
Contributor

bors-servo replied Nov 17, 2014

merging Hoverbear/servo/patch-1 = 3b2fcb0 into auto

This comment has been minimized.

Copy link
Contributor

bors-servo replied Nov 17, 2014

Hoverbear/servo/patch-1 = 3b2fcb0 merged ok, testing candidate = b9dcaa3

This comment has been minimized.

This comment has been minimized.

Copy link
Contributor

bors-servo replied Nov 17, 2014

fast-forwarding master to auto = b9dcaa3

bors-servo pushed a commit that referenced this pull request Nov 16, 2014
glfw3 is in the `homebrew/versions` keg.

```bash
➜  ~  brew install glfw3
Error: No available formula for glfw3
Searching formulae...
Searching taps...
homebrew/versions/glfw3
```

Simplest fix:

```bash
➜  ~  brew install homebrew/versions/glfw3
Cloning into '/usr/local/Library/Taps/homebrew/homebrew-versions'...
remote: Counting objects: 2495, done.
remote: Total 2495 (delta 0), reused 0 (delta 0)
Receiving objects: 100% (2495/2495), 820.05 KiB | 462.00 KiB/s, done.
Resolving deltas: 100% (1433/1433), done.
Checking connectivity... done.
Tapped 161 formulae
==> Installing glfw3 from homebrew/homebrew-versions
==> Downloading https://downloads.sourceforge.net/project/glfw/glfw/3.0.4/glfw-3.0.4.tar.bz2
Already downloaded: /Library/Caches/Homebrew/glfw3-3.0.4.tar.bz2
==> Patching
patching file CMakeLists.txt
Hunk #1 succeeded at 370 with fuzz 1 (offset 13 lines).
==> cmake -DCMAKE_INSTALL_PREFIX=/usr/local/Cellar/glfw3/3.0.4 -DCMAKE_BUILD_TYPE=None -DCMAKE_FIND_FRAMEWORK=LAST -DCMAKE_VERBOSE_MAKEFILE=ON -Wno-dev -DGLFW_USE_CHDIR=TRUE -DGLFW_USE_MENUBAR=TRUE -DBUIL
==> make install
🍺  /usr/local/Cellar/glfw3/3.0.4: 11 files, 220K, built in 9 seconds
```

Users who have `homebrew/versions` already tapped won't notice this, since after tapping `homebrew/versions` keg shouldn't notice, since after tapping, the library is available using just ` brew install glfw3`.

```bash
➜  ~  brew tap
homebrew/versions
➜  ~  brew install glfw3
==> Installing glfw3 from homebrew/homebrew-versions
==> Downloading https://downloads.sourceforge.net/project/glfw/glfw/3.0.4/glfw-3.0.4.tar.bz2
Already downloaded: /Library/Caches/Homebrew/glfw3-3.0.4.tar.bz2
==> Patching
patching file CMakeLists.txt
Hunk #1 succeeded at 370 with fuzz 1 (offset 13 lines).
==> cmake -DCMAKE_INSTALL_PREFIX=/usr/local/Cellar/glfw3/3.0.4 -DCMAKE_BUILD_TYPE=None -DCMAKE_FIND_FRAMEWORK=LAST -DCMAKE_VERBOSE_MAKEFILE=ON -Wno-dev -DGLFW_USE_CHDIR=TRUE -DGLFW_USE_MENUBAR=TRUE -DBUIL
==> make install
🍺  /usr/local/Cellar/glfw3/3.0.4: 11 files, 220K, built in 9 seconds
```
bors-servo pushed a commit that referenced this pull request Nov 17, 2014
glfw3 is in the `homebrew/versions` keg.

```bash
➜  ~  brew install glfw3
Error: No available formula for glfw3
Searching formulae...
Searching taps...
homebrew/versions/glfw3
```

Simplest fix:

```bash
➜  ~  brew install homebrew/versions/glfw3
Cloning into '/usr/local/Library/Taps/homebrew/homebrew-versions'...
remote: Counting objects: 2495, done.
remote: Total 2495 (delta 0), reused 0 (delta 0)
Receiving objects: 100% (2495/2495), 820.05 KiB | 462.00 KiB/s, done.
Resolving deltas: 100% (1433/1433), done.
Checking connectivity... done.
Tapped 161 formulae
==> Installing glfw3 from homebrew/homebrew-versions
==> Downloading https://downloads.sourceforge.net/project/glfw/glfw/3.0.4/glfw-3.0.4.tar.bz2
Already downloaded: /Library/Caches/Homebrew/glfw3-3.0.4.tar.bz2
==> Patching
patching file CMakeLists.txt
Hunk #1 succeeded at 370 with fuzz 1 (offset 13 lines).
==> cmake -DCMAKE_INSTALL_PREFIX=/usr/local/Cellar/glfw3/3.0.4 -DCMAKE_BUILD_TYPE=None -DCMAKE_FIND_FRAMEWORK=LAST -DCMAKE_VERBOSE_MAKEFILE=ON -Wno-dev -DGLFW_USE_CHDIR=TRUE -DGLFW_USE_MENUBAR=TRUE -DBUIL
==> make install
🍺  /usr/local/Cellar/glfw3/3.0.4: 11 files, 220K, built in 9 seconds
```

Users who have `homebrew/versions` already tapped won't notice this, since after tapping `homebrew/versions` keg shouldn't notice, since after tapping, the library is available using just ` brew install glfw3`.

```bash
➜  ~  brew tap
homebrew/versions
➜  ~  brew install glfw3
==> Installing glfw3 from homebrew/homebrew-versions
==> Downloading https://downloads.sourceforge.net/project/glfw/glfw/3.0.4/glfw-3.0.4.tar.bz2
Already downloaded: /Library/Caches/Homebrew/glfw3-3.0.4.tar.bz2
==> Patching
patching file CMakeLists.txt
Hunk #1 succeeded at 370 with fuzz 1 (offset 13 lines).
==> cmake -DCMAKE_INSTALL_PREFIX=/usr/local/Cellar/glfw3/3.0.4 -DCMAKE_BUILD_TYPE=None -DCMAKE_FIND_FRAMEWORK=LAST -DCMAKE_VERBOSE_MAKEFILE=ON -Wno-dev -DGLFW_USE_CHDIR=TRUE -DGLFW_USE_MENUBAR=TRUE -DBUIL
==> make install
🍺  /usr/local/Cellar/glfw3/3.0.4: 11 files, 220K, built in 9 seconds
```
@bors-servo bors-servo closed this Nov 17, 2014
@bors-servo bors-servo merged commit 3b2fcb0 into servo:master Nov 17, 2014
1 check passed
1 check passed
default all tests passed
@Hoverbear Hoverbear deleted the Hoverbear:patch-1 branch Nov 17, 2014
@@ -32,7 +28,7 @@ On Debian-based Linuxes:
sudo apt-get install curl freeglut3-dev \
libfreetype6-dev libgl1-mesa-dri libglib2.0-dev xorg-dev \
msttcorefonts gperf g++ cmake python-virtualenv \
libssl-dev libglfw-dev libbz2-dev

This comment has been minimized.

This comment has been minimized.

@SimonSapin

SimonSapin Nov 20, 2014

Member

To clarify: bzip2 should not have been removed here and in other places.

@Hoverbear
Copy link
Member Author

Hoverbear commented Nov 20, 2014

@SimonSapin Sorry about that. I didn't notice that when I was attempting to rebase. :(

@SimonSapin
Copy link
Member

SimonSapin commented Nov 20, 2014

Don’t worry, it’s nothing we can’t fix :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.