[arch-commits] Commit in gitlab/trunk (PKGBUILD build_fix.patch)

[Anatol Pomozov]

    Date: Saturday, March 21, 2020 @ 17:08:56
  Author: anatolik
Revision: 602853

upgpkg: gitlab 12.9.0-1

Modified:
  gitlab/trunk/PKGBUILD
  gitlab/trunk/build_fix.patch

-----------------+
 PKGBUILD        |    4 ++--
 build_fix.patch |   23 ++++++++++-------------
 2 files changed, 12 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-21 17:08:51 UTC (rev 602852)
+++ PKGBUILD	2020-03-21 17:08:56 UTC (rev 602853)
@@ -10,7 +10,7 @@
 # commit log for an old fix on how to tell it to use older versions of Ruby. I'm afraid we'll
 # need this again at some point in the future.
 pkgname=gitlab
-pkgver=12.8.7
+pkgver=12.9.0
 pkgrel=1
 pkgdesc="Project management and code hosting application"
 arch=('x86_64')
@@ -40,7 +40,7 @@
         ruby27-pop-extra-arg.patch)
 install='gitlab.install'
 sha512sums=('SKIP'
-            'baeb28cc87be9f5e36f9bb3c98f8c81caf1f0eadab1726bcd80d89f94dfb9d00c2e086966f4ce80ac91b27dbd6b550868167e29f6b04bee6a22ead41e30c604b'
+            '9623de113358d3d6e49047f688e272d9394579734ace1bd647497e8717a90784546d27e547a29197a16c80d72ad9f2c79eb65f8edc631deadf2ec90ee86ea44b'
             '1ad15b48890ad48e97a6fcea56132582f2b22aa27f4a1a1f4590f3ea72de4726e13ef6f3db2bc0984da1ef140bde092e74e0c9f8f1778f207f3fac4a31a77e4b'
             '8ca36771f7568b190823ec47afeaf6ff75f61c5b6f31ce5d837a6dcd84a5b3da23fb07a1eceeda0752b2e61c4a8f4d17bf368fa2913e1487567944a8d29eeb58'
             '0cbb9a1631b529a83d5c6db95fd3a684c8f06073890b31f6262c339360444e7452275d804fb6a119a3d61a0ef1b76d0e956f260a12f032d54c00308e8d9520b0'

Modified: build_fix.patch
===================================================================
--- build_fix.patch	2020-03-21 17:08:51 UTC (rev 602852)
+++ build_fix.patch	2020-03-21 17:08:56 UTC (rev 602853)
@@ -1,13 +1,19 @@
+commit 96ff060075dc13332347c0c4d69bd4df5c6be8b7
+Author: Anatol Pomozov <anatol.pomozov at gmail.com>
+Date:   Sat Mar 21 09:13:31 2020 -0700
+
+    ArchLinux fixes
+
 diff --git a/Gemfile b/Gemfile
-index 951ae73a318..ce5c0aba42f 100644
+index 51350401807..60b49c90adf 100644
 --- a/Gemfile
 +++ b/Gemfile
-@@ -311,6 +311,12 @@ gem 'gettext_i18n_rails', '~> 1.8.0'
+@@ -310,6 +310,12 @@ gem 'gettext_i18n_rails', '~> 1.8.0'
  gem 'gettext_i18n_rails_js', '~> 1.3'
  gem 'gettext', '~> 3.2.2', require: false, group: :development
  
-+# Pin the gems that are needed for the old gettext
-+# https://github.com/ruby-gettext/gettext/issues/64 the issue been fixed by upstream in gettext 3.3.0
++# Ping the gems that are needed for the old gettext
++# https://github.com/ruby-gettext/gettext/issues/64 the fix is available in gettext 3.3.0
 +gem 'irb', '~> 1.1.0'  # use irb version that matches ruby 2.6. Later irb versions heavily modified its API and it breaks gettext
 +gem 'e2mmap' # 'irb' 1.1.1 requires it
 +
@@ -15,12 +21,3 @@
  gem 'batch-loader', '~> 1.4.0'
  
  # Perf bar
-@@ -376,7 +382,7 @@ group :development, :test do
-   gem 'scss_lint', '~> 0.56.0', require: false
-   gem 'haml_lint', '~> 0.34.0', require: false
-   gem 'simplecov', '~> 0.16.1', require: false
--  gem 'bundler-audit', '~> 0.5.0', require: false
-+  gem 'bundler-audit', '>= 0', require: false # Get the latest gem that is compatible with the new bundler
- 
-   gem 'benchmark-ips', '~> 2.3.0', require: false
-