From f414727e3b9df092672c35d84ba8da403cc9ab6e Mon Sep 17 00:00:00 2001 From: Ed Reel Date: Sat, 11 Aug 2018 08:04:08 -0500 Subject: [PATCH] Update python packages Comment tests Add six dependency to all relevant packages Add pre-built binaries Remove redundant python dependencies on packages with six dependency Rebuild pre-built binaries to include pip/pip3 Add important note about the builds --- packages/atk.rb | 6 +----- packages/gdk_pixbuf.rb | 6 ++---- packages/glib.rb | 5 +---- packages/gtk2.rb | 8 ++------ packages/gtk3.rb | 7 ++----- packages/gtkvte.rb | 5 +---- packages/harfbuzz.rb | 4 +--- packages/libcroco.rb | 6 ++---- packages/libglade.rb | 1 - packages/libprelude.rb | 7 ++----- packages/librsvg.rb | 13 +++++-------- packages/mate_desktop.rb | 3 +-- packages/pango.rb | 6 +----- packages/python27.rb | 37 +++++++++++++++++-------------------- packages/python3.rb | 38 +++++++++++++++++--------------------- packages/umockdev.rb | 14 +++----------- 16 files changed, 58 insertions(+), 108 deletions(-) diff --git a/packages/atk.rb b/packages/atk.rb index 487162ac6..3ba3bf0d5 100644 --- a/packages/atk.rb +++ b/packages/atk.rb @@ -21,9 +21,7 @@ class Atk < Package }) depends_on 'gobject_introspection' - depends_on 'diffutils' => :build - depends_on 'perl' => :build - depends_on 'python27' => :build + depends_on 'six' => :build def self.build system "./configure --prefix=#{CREW_PREFIX} --libdir=#{CREW_LIB_PREFIX}" @@ -31,8 +29,6 @@ class Atk < Package end def self.install - system "pip install six" # ensure correction installation system "make", "DESTDIR=#{CREW_DEST_DIR}", "install" - system "pip uninstall --yes six" end end diff --git a/packages/gdk_pixbuf.rb b/packages/gdk_pixbuf.rb index 6dc30df3e..8a8aee5cd 100644 --- a/packages/gdk_pixbuf.rb +++ b/packages/gdk_pixbuf.rb @@ -26,7 +26,7 @@ class Gdk_pixbuf < Package depends_on 'gobject_introspection' depends_on 'libtiff' depends_on 'libjpeg' - depends_on 'python27' + depends_on 'six' def self.build system "./configure --prefix=#{CREW_PREFIX} --libdir=#{CREW_LIB_PREFIX} --with-x11" @@ -34,13 +34,11 @@ class Gdk_pixbuf < Package end def self.install - system "pip install six" # for installation process system "make", "DESTDIR=#{CREW_DEST_DIR}", "install" system "mkdir -p #{CREW_DEST_LIB_PREFIX}/gdk-pixbuf-2.0/2.10.0" system "touch #{CREW_DEST_LIB_PREFIX}/gdk-pixbuf-2.0/2.10.0/loaders.cache" - system "pip uninstall --yes six" end - + def self.postinstall system "gdk-pixbuf-query-loaders --update-cache" end diff --git a/packages/glib.rb b/packages/glib.rb index c77a7579b..b39e64090 100644 --- a/packages/glib.rb +++ b/packages/glib.rb @@ -20,9 +20,8 @@ class Glib < Package x86_64: 'fd6aea5f310ed045f3e9c132af14d11e63c5d50e04871369eb4888dfef9aee66', }) - depends_on 'libffi' depends_on 'util_linux' - depends_on 'python27' + depends_on 'six' def self.build system "./configure", @@ -33,8 +32,6 @@ class Glib < Package end def self.install - system "pip install six" system "make", "DESTDIR=#{CREW_DEST_DIR}", "install" - system "pip uninstall --yes six" end end diff --git a/packages/gtk2.rb b/packages/gtk2.rb index 1927df424..33953365f 100644 --- a/packages/gtk2.rb +++ b/packages/gtk2.rb @@ -19,14 +19,13 @@ class Gtk2 < Package i686: '9d961a6437d896cd1dbde21ebe4a20967ad0267621fbbb7d80cb36309fd7f232', x86_64: '96e236c0057e01ac2790ec5881349a2fa4b6c0821fa3d9ae477a1471f0c1d1af', }) - - depends_on 'docbook_xml' - depends_on 'docbook_xsl' + depends_on 'gtk_doc' depends_on 'atk' depends_on 'pango' depends_on 'cairo' depends_on 'gdk_pixbuf' + depends_on 'six' => :build def self.build system "./configure --prefix=#{CREW_PREFIX} --libdir=#{CREW_LIB_PREFIX}" @@ -34,9 +33,6 @@ class Gtk2 < Package end def self.install - system "pip install six" system "make", "DESTDIR=#{CREW_DEST_DIR}", "install" # the steps required to install the package - system "pip uninstall --yes six" end - end diff --git a/packages/gtk3.rb b/packages/gtk3.rb index facc29861..a7427e84d 100644 --- a/packages/gtk3.rb +++ b/packages/gtk3.rb @@ -26,7 +26,8 @@ class Gtk3 < Package depends_on 'graphene' depends_on 'libxkbcommon' depends_on 'at_spi2_atk' - + depends_on 'six' => :build + def self.build system "./configure", "--prefix=#{CREW_PREFIX}", @@ -38,13 +39,9 @@ class Gtk3 < Package end def self.install - system "pip install six" # for installation process system "make", "DESTDIR=#{CREW_DEST_DIR}", "install" # generate schemas system "mkdir -p #{CREW_DEST_PREFIX}/share/glib-2.0/schemas" system "glib-compile-schemas #{CREW_DEST_PREFIX}/share/glib-2.0/schemas" - system "pip uninstall --yes six" end - - end diff --git a/packages/gtkvte.rb b/packages/gtkvte.rb index d2eb38efe..b2cfcd658 100644 --- a/packages/gtkvte.rb +++ b/packages/gtkvte.rb @@ -21,10 +21,9 @@ class Gtkvte < Package }) depends_on 'gtk3' - depends_on 'libxml2' depends_on 'pcre2' depends_on 'vala' - depends_on 'gnutls' + depends_on 'six' => :build def self.build system "./configure --prefix=#{CREW_PREFIX} --libdir=#{CREW_LIB_PREFIX}" @@ -32,8 +31,6 @@ class Gtkvte < Package end def self.install - system "pip install six" system "make", "DESTDIR=#{CREW_DEST_DIR}", "install" - system "pip uninstall --yes six" end end diff --git a/packages/harfbuzz.rb b/packages/harfbuzz.rb index 355b14543..4366ce759 100644 --- a/packages/harfbuzz.rb +++ b/packages/harfbuzz.rb @@ -21,8 +21,8 @@ class Harfbuzz < Package }) depends_on 'glib' - depends_on 'icu4c' depends_on 'freetype_sub' + depends_on 'six' => :build def self.build system "./configure --prefix=#{CREW_PREFIX} --libdir=#{CREW_LIB_PREFIX}" @@ -30,8 +30,6 @@ class Harfbuzz < Package end def self.install - system "pip install six" system "make", "DESTDIR=#{CREW_DEST_DIR}", "install" - system "pip uninstall --yes six" end end diff --git a/packages/libcroco.rb b/packages/libcroco.rb index 3413e6e01..f2829ecbf 100644 --- a/packages/libcroco.rb +++ b/packages/libcroco.rb @@ -19,9 +19,9 @@ class Libcroco < Package i686: '913d41daf21e307c5c06d04d82b0f55e3a14fa31baf552475380217748ba3455', x86_64: '21b8c0b44777da7c607c08b85732f1a91a805f248a1937351f4c92ec50444975', }) - - depends_on 'libxml2' + depends_on 'gtk_doc' + depends_on 'six' => :build def self.build system "sh autogen.sh" @@ -30,8 +30,6 @@ class Libcroco < Package end def self.install - system "pip install six" system "make", "DESTDIR=#{CREW_DEST_DIR}", "install" - system "pip uninstall --yes six" end end diff --git a/packages/libglade.rb b/packages/libglade.rb index 426ae62ab..b42403ab6 100644 --- a/packages/libglade.rb +++ b/packages/libglade.rb @@ -24,7 +24,6 @@ class Libglade < Package depends_on 'gtk3' def self.build - system 'pip install six' system './configure', "--prefix=#{CREW_PREFIX}", "--libdir=#{CREW_LIB_PREFIX}" diff --git a/packages/libprelude.rb b/packages/libprelude.rb index 70d9f2e91..a18736d8c 100644 --- a/packages/libprelude.rb +++ b/packages/libprelude.rb @@ -20,9 +20,8 @@ class Libprelude < Package x86_64: 'f7642b1ffb9a0b5ee5c22a3f1345fbc0ff8b7e334a9839c7d24b7108fd069806', }) - depends_on 'python27' => :build - depends_on 'python3' => :build - + depends_on 'six' => :build + def self.build system "./configure \ --prefix=#{CREW_PREFIX} \ @@ -30,8 +29,6 @@ class Libprelude < Package end def self.install - system "pip install six" system "make DESTDIR=#{CREW_DEST_DIR} install" - system "pip uninstall --yes six" end end diff --git a/packages/librsvg.rb b/packages/librsvg.rb index 1e15fa944..ea8b46ef7 100644 --- a/packages/librsvg.rb +++ b/packages/librsvg.rb @@ -19,18 +19,18 @@ class Librsvg < Package armv7l: '692cdd07b2038a00220d1177a32692e56171188388282a4ca75a480ac26d78a2', i686: '2c590e62ab4bee72be2f8014c9b256d24fbdcf307c0f2ac44dcabee6c566cfdb', }) - + depends_on 'gtk_doc' depends_on 'vala' depends_on 'cairo' depends_on 'pango' - depends_on 'libxml2' depends_on 'libcroco' depends_on 'rust' depends_on 'gdk_pixbuf' depends_on 'gobject_introspection' depends_on 'gtk3' - + depends_on 'six' => :build + def self.build system "rustup install stable" system "rustup default stable" @@ -43,10 +43,7 @@ class Librsvg < Package system "make" end -def self.install - system "pip install six" + def self.install system "make", "DESTDIR=#{CREW_DEST_DIR}", "install" - system "pip uninstall --yes six" - end - + end end diff --git a/packages/mate_desktop.rb b/packages/mate_desktop.rb index e98bf5832..9caea4050 100644 --- a/packages/mate_desktop.rb +++ b/packages/mate_desktop.rb @@ -9,6 +9,7 @@ class Mate_desktop < Package depends_on 'mate_common' depends_on 'dconf' + depends_on 'six' => :build def self.build system "./autogen.sh" @@ -17,9 +18,7 @@ class Mate_desktop < Package end def self.install - system "pip install six" system "make", "DESTDIR=#{CREW_DEST_DIR}", "install" - system "pip uninstall --yes six" end end diff --git a/packages/pango.rb b/packages/pango.rb index aebd27664..9e4cec95b 100644 --- a/packages/pango.rb +++ b/packages/pango.rb @@ -20,14 +20,12 @@ class Pango < Package i686: 'deddc56994ca366f1b8e371503378361aae138deea46cc278dcb6ba33096c2ff', }) - depends_on 'diffutils' => :build depends_on 'harfbuzz' depends_on 'cairo' depends_on 'glib' - depends_on 'perl' depends_on 'gobject_introspection' # add this package to build gtk+, avoid compilation error - depends_on 'python27' # need six package from python to install Pango depends_on 'fribidi' + depends_on 'six' def self.build system "./configure --prefix=#{CREW_PREFIX} --libdir=#{CREW_LIB_PREFIX}" @@ -35,8 +33,6 @@ class Pango < Package end def self.install - system "pip install six" # fix installation error, "pip install --prefix #{CREW_PREFIX} --root #{CREW_DEST_DIR} six" does not work system "make", "DESTDIR=#{CREW_DEST_DIR}", "install" - system "pip uninstall --yes six" end end diff --git a/packages/python27.rb b/packages/python27.rb index 0ab286d6d..b7c646ecb 100644 --- a/packages/python27.rb +++ b/packages/python27.rb @@ -3,48 +3,45 @@ require 'package' class Python27 < Package description 'Python is a programming language that lets you work quickly and integrate systems more effectively.' homepage 'https://www.python.org/' - version '2.7.14-1' - source_url 'https://www.python.org/ftp/python/2.7.14/Python-2.7.14.tar.xz' - source_sha256 '71ffb26e09e78650e424929b2b457b9c912ac216576e6bd9e7d204ed03296a66' + version '2.7.15' + source_url 'https://www.python.org/ftp/python/2.7.15/Python-2.7.15.tar.xz' + source_sha256 '22d9b1ac5b26135ad2b8c2901a9413537e08749a753356ee913c84dbd2df5574' binary_url ({ - aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/python27-2.7.14-1-chromeos-armv7l.tar.xz', - armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/python27-2.7.14-1-chromeos-armv7l.tar.xz', - i686: 'https://dl.bintray.com/chromebrew/chromebrew/python27-2.7.14-1-chromeos-i686.tar.xz', - x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/python27-2.7.14-1-chromeos-x86_64.tar.xz', + aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/python27-2.7.15-chromeos-armv7l.tar.xz', + armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/python27-2.7.15-chromeos-armv7l.tar.xz', + i686: 'https://dl.bintray.com/chromebrew/chromebrew/python27-2.7.15-chromeos-i686.tar.xz', + x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/python27-2.7.15-chromeos-x86_64.tar.xz', }) binary_sha256 ({ - aarch64: 'b9b46abdff0324b9b701cd8dc36f7658a5780029bc9f6b6f8c45efbc6bfaca53', - armv7l: 'b9b46abdff0324b9b701cd8dc36f7658a5780029bc9f6b6f8c45efbc6bfaca53', - i686: '3d18cf9af249c18eab193f7fd22137612555bb5b877304838f74cc13fba9ad5e', - x86_64: '099a31f3584cf2c0e65beeaace1b2c995d5fb64c8891fd0dce75c3cc7f8a6503', + aarch64: '712ea676f522e01f37ec2d9ee7fff973fa12df20b8d1822d32d07241800fe0e6', + armv7l: '712ea676f522e01f37ec2d9ee7fff973fa12df20b8d1822d32d07241800fe0e6', + i686: 'a0aacd3f53d38d929d278e85384a41049e402e5d42c8a6df560aa1d64d5bf684', + x86_64: 'f1f81eaf334c05e6895213a78b8f56b2077b56a3ddf03daea65df403b91bd798', }) depends_on 'bz2' => :build - depends_on 'ncurses' - depends_on 'openssl' => :build depends_on 'sqlite' => :build - depends_on 'gdbm' => :build - depends_on 'zlibpkg' def self.build - # python requires to use /usr/local/lib, so leave as is but specify -rpath + # IMPORTANT: Do not build with python27 already installed or pip will not be included. + # python requires /usr/local/lib, so leave as is but specify -rpath system "./configure", "CPPFLAGS=-I#{CREW_PREFIX}/include/ncurses -I#{CREW_PREFIX}/include/ncursesw", "LDFLAGS=-Wl,-rpath,-L#{CREW_LIB_PREFIX}", "--with-ensurepip=install", "--enable-shared" - system "make" + system 'make' end def self.install system "make", "DESTDIR=#{CREW_DEST_DIR}", "install" - # remove static library + # remove static libraries system "find #{CREW_DEST_PREFIX} -name 'libpython*.a' -print | xargs -r rm" # create symbolic links in lib64 for other applications which use libpython unless Dir.exist? "#{CREW_DEST_LIB_PREFIX}" system "mkdir -p #{CREW_DEST_LIB_PREFIX}" - system "cd #{CREW_DEST_LIB_PREFIX}; ln -s ../lib/libpython*.so* ." + system "cd #{CREW_DEST_LIB_PREFIX} && ln -s ../lib/libpython*.so* ." end end @@ -53,6 +50,6 @@ class Python27 < Package # Proxy setting breaks test_httpservers, test_ssl, # test_urllib, test_urllib2, test_urllib2_localnet. # So, modifying environment variable to make pass tests. - system "TMPDIR=#{CREW_PREFIX}/tmp http_proxy= https_proxy= ftp_proxy= make test" + #system "TMPDIR=#{CREW_PREFIX}/tmp http_proxy= https_proxy= ftp_proxy= make test" end end diff --git a/packages/python3.rb b/packages/python3.rb index f4d747195..95054874e 100644 --- a/packages/python3.rb +++ b/packages/python3.rb @@ -3,50 +3,46 @@ require 'package' class Python3 < Package description 'Python is a programming language that lets you work quickly and integrate systems more effectively.' homepage 'https://www.python.org/' - version '3.6.4-2' - source_url 'https://www.python.org/ftp/python/3.6.4/Python-3.6.4.tar.xz' - source_sha256 '159b932bf56aeaa76fd66e7420522d8c8853d486b8567c459b84fe2ed13bcaba' + version '3.7.0' + source_url 'https://www.python.org/ftp/python/3.7.0/Python-3.7.0.tar.xz' + source_sha256 '0382996d1ee6aafe59763426cf0139ffebe36984474d0ec4126dd1c40a8b3549' binary_url ({ - aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/python3-3.6.4-2-chromeos-armv7l.tar.xz', - armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/python3-3.6.4-2-chromeos-armv7l.tar.xz', - i686: 'https://dl.bintray.com/chromebrew/chromebrew/python3-3.6.4-2-chromeos-i686.tar.xz', - x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/python3-3.6.4-2-chromeos-x86_64.tar.xz', + aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/python3-3.7.0-chromeos-armv7l.tar.xz', + armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/python3-3.7.0-chromeos-armv7l.tar.xz', + i686: 'https://dl.bintray.com/chromebrew/chromebrew/python3-3.7.0-chromeos-i686.tar.xz', + x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/python3-3.7.0-chromeos-x86_64.tar.xz', }) binary_sha256 ({ - aarch64: '481fa9f5bdff6d43eeea4ac90bbee6ef5054e2960d5f1f141bb24359af5ac25b', - armv7l: '481fa9f5bdff6d43eeea4ac90bbee6ef5054e2960d5f1f141bb24359af5ac25b', - i686: '8e7ffe80318afee1e3f3614440d30fb5fd4daf2d2d901b55b48c2216e034059d', - x86_64: 'cb75bc5794d06951897906b87ec2fedf316d268040290845809517861a9e7bbe', + aarch64: '581aad055468b2fb9b6e95776fc22de1edde80cebeef1fe5455dab5b18538002', + armv7l: '581aad055468b2fb9b6e95776fc22de1edde80cebeef1fe5455dab5b18538002', + i686: 'ae3ba2c8b1a96b745278286baadb41f8607f802de2f620846689ce0490de73bb', + x86_64: '7c4e07989669cac3233fe2b10d2447208a96c7d2056c20731f46aed90a83622b', }) depends_on 'bz2' => :build depends_on 'xzutils' => :build - depends_on 'ncurses' - depends_on 'openssl' => :build depends_on 'sqlite' => :build - depends_on 'zlibpkg' - depends_on 'libffi' - depends_on 'readline' def self.build - # python requires to use /usr/local/lib, so leave as is but specify -rpath + # IMPORTANT: Do not build with python3 already installed or pip3 will not be included. + # python requires /usr/local/lib, so leave as is but specify -rpath system "./configure", "CPPFLAGS=-I#{CREW_PREFIX}/include/ncurses -I#{CREW_PREFIX}/include/ncursesw", "LDFLAGS=-Wl,-rpath,-L#{CREW_LIB_PREFIX}", "--with-ensurepip=install", "--enable-shared" - system "make" + system 'make' end def self.install system "make", "DESTDIR=#{CREW_DEST_DIR}", "install" - # remove static library + # remove static libraries system "find #{CREW_DEST_PREFIX} -name 'libpython*.a' -print | xargs -r rm" # create symbolic links in lib64 for other applications which use libpython unless Dir.exist? "#{CREW_DEST_LIB_PREFIX}" system "mkdir -p #{CREW_DEST_LIB_PREFIX}" - system "cd #{CREW_DEST_LIB_PREFIX}; ln -s ../lib/libpython*.so* ." + system "cd #{CREW_DEST_LIB_PREFIX} && ln -s ../lib/libpython*.so* ." end end @@ -72,6 +68,6 @@ class Python3 < Package # Using /tmp breaks test_distutils, test_subprocess # Proxy setting breaks test_httpservers, test_ssl, # test_urllib, test_urllib2, test_urllib2_localnet - system "TMPDIR=#{CREW_PREFIX}/tmp http_proxy= https_proxy= ftp_proxy= make test" + #system "TMPDIR=#{CREW_PREFIX}/tmp http_proxy= https_proxy= ftp_proxy= make test" end end diff --git a/packages/umockdev.rb b/packages/umockdev.rb index 2c1b5a64a..3d2911c6e 100644 --- a/packages/umockdev.rb +++ b/packages/umockdev.rb @@ -1,4 +1,3 @@ - require 'package' class Umockdev < Package @@ -21,15 +20,11 @@ class Umockdev < Package x86_64: '95fd0e8eeacb4d95051cf80a1d6a44e4882c51f4be477f100c1d69e43f61fbd4', }) - depends_on 'automake' => :build - depends_on 'libtool' => :build - depends_on 'intltool' => :build - depends_on 'python27' => :build depends_on 'glib' depends_on 'libgudev' depends_on 'vala' => :build - - + depends_on 'six' => :build + def self.build system "./autogen.sh" system "./configure --prefix=#{CREW_PREFIX} --libdir=#{CREW_LIB_PREFIX}" @@ -37,9 +32,6 @@ class Umockdev < Package end def self.install - system "pip install six" system "make", "DESTDIR=#{CREW_DEST_DIR}", "install" - system "pip uninstall --yes six" - end - + end end