Updated wine.rb (#2561)

* Updated wine and freetype

packages/freetype.rb

@@ -3,21 +3,13 @@ require 'package'
 class Freetype < Package
   description 'FreeType is a freely available software library to render fonts.'
   homepage 'https://www.freetype.org/'
-  version '2.9-0'
-  source_url 'http://download.savannah.gnu.org/releases/freetype/freetype-2.9.tar.bz2'
-  source_sha256 'e6ffba3c8cef93f557d1f767d7bc3dee860ac7a3aaff588a521e081bc36f4c8a'
+  version '2.9.1'
+  source_url 'https://download.savannah.gnu.org/releases/freetype/freetype-2.9.1.tar.gz'
+  source_sha256 'ec391504e55498adceb30baceebd147a6e963f636eb617424bcfc47a169898ce'
 
   binary_url ({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/freetype-2.9-0-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/freetype-2.9-0-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/freetype-2.9-0-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/freetype-2.9-0-chromeos-x86_64.tar.xz',
   })
   binary_sha256 ({
-    aarch64: '7fd752cc084ee8a101030e682b0dbce39551049fddbf547762b6f8e60450e131',
-     armv7l: '7fd752cc084ee8a101030e682b0dbce39551049fddbf547762b6f8e60450e131',
-       i686: '1c2688c3070e37d61db309a6310a5a613aa89c419a89cbc79d9055b56c1c82fc',
-     x86_64: '1490d08a9b385ef3abc323c914aaf218f0b59961885e3cda64278d971ace71c9',
   })
 
   depends_on 'expat'
@@ -26,6 +18,7 @@ class Freetype < Package
   depends_on 'harfbuzz'
 
   def self.build
+	system "sed -i 's,/usr/include/freetype2,#{CREW_PREFIX}/include/freetype2,g' configure"
     system "./configure \
             CFLAGS=\" -fPIC\" \
             --prefix=#{CREW_PREFIX} \

packages/wine.rb

@@ -4,33 +4,26 @@ require 'fileutils'
 class Wine < Package
   description 'Wine (originally an acronym for "Wine Is Not an Emulator") is a compatibility layer capable of running Windows applications on several POSIX-compliant operating systems, such as Linux, macOS, & BSD.'
   homepage 'https://www.winehq.org/'
-  version '2.10-1'
-  source_url 'https://dl.winehq.org/wine/source/2.x/wine-2.10.tar.xz'
-  source_sha256 '488df7ffd2e81da455bf428fc9eb784bb4273a890334500895665711bd52f179'
+  version '3.13'
+  source_url 'https://dl.winehq.org/wine/source/3.x/wine-3.13.tar.xz'
+  source_sha256 '0785d74852232c1f6e07ac081875e92219a4428ddcc8931632fcf1924941bbd4'
 
   binary_url ({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/wine-2.10-1-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/wine-2.10-1-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/wine-2.10-1-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/wine-2.10-1-chromeos-x86_64.tar.xz',
   })
   binary_sha256 ({
-    aarch64: 'de6c0bdaf7e2b913a4170588eb1474b34ef48cca4de848aabd8e1b875c6323b4',
-     armv7l: 'de6c0bdaf7e2b913a4170588eb1474b34ef48cca4de848aabd8e1b875c6323b4',
-       i686: 'f741ba56e1d18d26813feab82a2997017ae3325e19cf449c32a61589717178dd',
-     x86_64: '217be92db577ede5038f0bceb1800453bad4e89f2af8f26cdab6afe99384ae2a',
   })
 
   depends_on 'bison'
+  depends_on 'sommelier'
   depends_on 'flex'
   depends_on 'freetype'
 
   def self.build
     case ARCH
     when "i686", "armv7l", "aarch64"
-      system "./configure --without-x"
+      system "./configure"
     when "x86_64"
-      system "./configure --without-x --enable-win64"
+      system "./configure --enable-win64"
     else
       abort "Error getting your device configuration."
     end