Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don’t worry, you can still create the pull request.
  • 13 commits
  • 2 files changed
  • 4 commit comments
  • 2 contributors
Commits on Jan 01, 2013
@jvalduvieco Add wxGTK to use wxwidgets 2.8 API on Mountain Lion as wxwidgets 2.8 …
…does not work with Mountain Lion.
e155d15
@jvalduvieco Add --with-wxgtk to use wxGTK and be able to use erlang's graphic too…
…ls like observer in Mountain Lion.

Erlang depends on wxWidgets 2.8 API as erlang graphic tools use it. In Mountain Lion WxWidgets 2.8 do not compile
because Carbon has been dropped from XCode 4.4.
To solve this issue WxGTK can be used as it has the same API as WxWidgets 2.8 and use X11 instead of Carbon.
b3ee54e
Commits on Jan 02, 2013
@jvalduvieco fix @adamv comments on erlang.rb d3dc354
@jvalduvieco fix @adamv comments on wxgtk.rb edf8972
Commits on Jan 05, 2013
@jvalduvieco Make WxGTK keg_only e0e62a1
Commits on Feb 23, 2013
@jvalduvieco Add wxGTK to use wxwidgets 2.8 API on Mountain Lion as wxwidgets 2.8 …
…does not work with Mountain Lion.
4cc27e3
@jvalduvieco Add --with-wxgtk to use wxGTK and be able to use erlang's graphic too…
…ls like observer in Mountain Lion.

Erlang depends on wxWidgets 2.8 API as erlang graphic tools use it. In Mountain Lion WxWidgets 2.8 do not compile
because Carbon has been dropped from XCode 4.4.
To solve this issue WxGTK can be used as it has the same API as WxWidgets 2.8 and use X11 instead of Carbon.
98a8291
@jvalduvieco fix @adamv comments on erlang.rb ed5aa45
@jvalduvieco fix @adamv comments on wxgtk.rb ff2af48
@jvalduvieco Make WxGTK keg_only 9941d48
@jvalduvieco Merge branch 'erlang-wxgtk' of https://github.com/jvalduvieco/homebrew
…into erlang-wxgtk
0ff474f
@jvalduvieco Add --with-wxgtk to use wxGTK and be able to use erlang's graphic too…
…ls like observer in Mountain Lion.

Erlang depends on wxWidgets 2.8 API as erlang graphic tools use it. In Mountain Lion WxWidgets 2.8 do not compile
because Carbon has been dropped from XCode 4.4.
To solve this issue WxGTK can be used as it has the same API as WxWidgets 2.8 and use X11 instead of Carbon.
497be96
Commits on Feb 24, 2013
@jvalduvieco Merge branch 'erlang-wxgtk' of https://github.com/jvalduvieco/homebrew
…into erlang-wxgtk
1673c00
Showing with 51 additions and 3 deletions.
  1. +13 −3 Library/Formula/erlang.rb
  2. +38 −0 Library/Formula/wxgtk.rb
View
16 Library/Formula/erlang.rb
@@ -37,7 +37,8 @@ class Erlang < Formula
# remove the autoreconf if possible
depends_on :automake
depends_on :libtool
-
+ depends_on 'wxgtk' if build.include? 'with-wxgtk'
+
fails_with :llvm do
build 2334
end
@@ -46,6 +47,12 @@ class Erlang < Formula
option 'halfword', 'Enable halfword emulator (64-bit builds only)'
option 'time', '`brew test --time` to include a time-consuming test'
option 'no-docs', 'Do not install documentation'
+ option 'with-wxgtk','Enable wx GTK, useful on mountain lion where wxwidgets 2.8 does not compile'
+
+ def patches
+ # Fix build for 64 bits machines
+ "https://gist.github.com/raw/4370480/181f8056668ad9c5989b9cc7c0d59ad97586c458/enable_wx_on_64bits.diff" if build.include? 'with-wxgtk'
+ end
def install
ohai "Compilation takes a long time; use `brew install -v erlang` to see progress" unless ARGV.verbose?
@@ -56,6 +63,8 @@ def install
ENV.append_to_cflags '-O0'
end
+ ENV.append 'LDFLAGS', '-framework AppKit' if build.include? 'with-wxgtk'
+
# Do this if building from a checkout to generate configure
system "./otp_build autoconf" if File.exist? "otp_build"
@@ -66,7 +75,6 @@ def install
"--enable-dynamic-ssl-lib",
"--enable-shared-zlib",
"--enable-smp-support"]
-
args << "--with-dynamic-trace=dtrace" unless MacOS.version == :leopard
unless build.include? 'disable-hipe'
@@ -82,7 +90,9 @@ def install
end
system "./configure", *args
- touch 'lib/wx/SKIP' if MacOS.version >= :snow_leopard
+ if (MacOS.version >= :snow_leopard && !build.include?('with-wxgtk'))
+ touch 'lib/wx/SKIP'
+ end
system "make"
system "make install"
View
38 Library/Formula/wxgtk.rb
@@ -0,0 +1,38 @@
+require 'formula'
+
+class Wxgtk < Formula
+ homepage 'http://www.wxwidgets.org'
+ url "http://downloads.sourceforge.net/project/wxwindows/2.8.12/wxGTK-2.8.12.tar.gz"
+ sha1 '56cc7f6622dd6f2fecd43fc210dc1c6cb155b37f'
+
+ keg_only 'This formula conflicts with wxwidgets 2.9 and by now is only used by erlang'
+
+ depends_on :x11 # if your formula requires any X11/XQuartz components
+ depends_on 'gtk+'
+
+ def install
+
+ args=[
+ "--with-libpng",
+ "--with-opengl",
+ "--with-libjpeg",
+ "--with-libtiff",
+ "--with-freetype",
+ "--with-zlib",
+ "--enable-unicode",
+ "--disable-debug",
+ "--prefix=#{prefix}",
+ "--with-gtk"
+ ]
+ ENV.append 'LDFLAGS', '-lX11 -lGL -lGLU'
+
+ system "./configure", *args
+
+ system "make install"
+
+ cd "contrib" do
+ system "make"
+ system "make install"
+ end
+ end
+end

Showing you all comments on commits in this comparison.

@adamv

Remove trailing comment

@adamv

Don't leave in commented-out code

@adamv

Don't add your name (?) as a comment

@adamv

newline after depends block

Something went wrong with that request. Please try again.