Broken dependencies build on 10.9.2

[Tomasz Wasilczyk]

Hi,








Tomek

[1] https://trac.adium.im/wiki/GettingLibpurpleSource

diff --git a/Library/Contributions/cmd/brew-frameworks.rb b/Library/Contributions/cmd/brew-frameworks.rb
index 5d75951..a75b3e6 100755
--- a/Library/Contributions/cmd/brew-frameworks.rb
+++ b/Library/Contributions/cmd/brew-frameworks.rb
@@ -13,6 +13,7 @@ Dir[frameworks].each {|fr|
 frameworks.mkpath
 
 libraries = [ { "name" => "gettext", "libs" => ["libintl.8.dylib"] },
+	          { "name" => "libffi", "libs" => ["libffi.6.dylib"] },
 			  { "name" => "glib", "libs" => ["libglib-2.0.0.dylib", "libgmodule-2.0.0.dylib", "libgobject-2.0.0.dylib", "libgthread-2.0.0.dylib"] },
 	          { "name" => "meanwhile", "libs" => ["libmeanwhile.1.0.2.dylib"] },
 	          { "name" => "libgcrypt", "libs" => ["libgcrypt.11.dylib"] },
@@ -99,10 +100,13 @@ libraries.each { | l |
 			ohai "Something is wrong with #{libname}! Check 'otool -L #{frameworks}/#{libname}.subproj/#{libname}.framework/#{libname}'"
 			exit
 		end
-		system "file #{frameworks}/#{libname}.subproj/#{libname}.framework/Versions/#{f.version}/#{libname} | grep -E --invert-match \"Mach-O fat file with 2 architectures\""
+		system "file #{frameworks}/#{libname}.subproj/#{libname}.framework/Versions/#{f.version}/#{libname} | grep -E --invert-match \"Mach-O fat file with 2 architectures\" &> /dev/null"
 		if $? == 0 then
-			ohai "Something is wrong with #{libname}! Check 'file -L #{frameworks}/#{libname}.subproj/#{libname}.framework/Versions/#{f.version}/#{libname}'"
-			exit
+			system "file #{frameworks}/#{libname}.subproj/#{libname}.framework/Versions/#{f.version}/#{libname} | grep -E --invert-match \" \\(for architecture [a-z0-9_]+\\):\" | grep -E --invert-match \"Mach-O universal binary with 2 architectures\" &> /dev/null"
+			if $? == 0 then
+				ohai "Something is wrong with #{libname}! Check 'file -L #{frameworks}/#{libname}.subproj/#{libname}.framework/Versions/#{f.version}/#{libname}'"
+				exit
+			end
 		end
 	}
 }
diff --git a/Library/Formula/libotr.rb b/Library/Formula/libotr.rb
index ac04469..9ed6e22 100644
--- a/Library/Formula/libotr.rb
+++ b/Library/Formula/libotr.rb
@@ -2,8 +2,8 @@ require 'formula'
 
 class Libotr < Formula
   homepage 'http://www.cypherpunks.ca/otr/'
-  url 'http://www.cypherpunks.ca/otr/libotr-3.2.1.tar.gz'
-  sha1 '898bf00d019f49ca34cd0116dd2e22685c67c394'
+  url 'http://www.cypherpunks.ca/otr/libotr-4.0.0.tar.gz'
+  sha1 '8865e9011b8674290837afcf7caf90c492ae09cc'
 
   depends_on 'libgcrypt'
 
diff --git a/Library/Formula/libpurple.rb b/Library/Formula/libpurple.rb
index a516f77..67c1718 100644
--- a/Library/Formula/libpurple.rb
+++ b/Library/Formula/libpurple.rb
@@ -39,6 +39,8 @@ class Libpurple < Formula
     ENV.append_to_cflags("-D_FORTIFY_SOURCE=2")
     ENV.append_to_cflags("-fstack-protector-all")
 
+    ENV['PKG_CONFIG_PATH'] = "#{HOMEBREW_PREFIX}/lib/pkgconfig"
+
     ohai "CFLAGS: #{ENV['CFLAGS']}"
 
     args = %W[

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -8,6 +8,7 @@
 build
 Icon*
 Docs
+Dependencies/Brew
 Dependencies/build
 Dependencies/source
 Dependencies/Frameworks

as I recently mentioned on #adium-devl, dependencies [1] do not build properly for current default branch and on current OS X. I have managed to fix it. Just take a look at adium-brew.patch. It possibly needs to create another Brew branch for Adium 1.7 (because of bumped libotr). Additionally, it seems that Adium's .hgignore is missing an exception for a Brew directory, so it's very annoying to review hg changes with that external repo installed here. Look at adium-hgignore.patch.

smime.p7s
Description: Kryptograficzna sygnatura S/MIME