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

Anatol Pomozov anatolik at archlinux.org
Wed Nov 18 23:59:36 UTC 2020


    Date: Wednesday, November 18, 2020 @ 23:59:35
  Author: anatolik
Revision: 757320

FS#68569: add irb to bundler to make rails console working again

Added:
  gitlab/trunk/fixes.patch
Modified:
  gitlab/trunk/PKGBUILD

-------------+
 PKGBUILD    |    3 +++
 fixes.patch |   19 +++++++++++++++++++
 2 files changed, 22 insertions(+)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-18 23:58:48 UTC (rev 757319)
+++ PKGBUILD	2020-11-18 23:59:35 UTC (rev 757320)
@@ -28,6 +28,7 @@
         "etc/logrotate.d/gitlab")
 source=(git+https://gitlab.com/gitlab-org/gitlab-foss.git#tag=v$pkgver
         configs.patch
+        fixes.patch
         environment
         gitlab-puma.service
         gitlab-sidekiq.service
@@ -40,6 +41,7 @@
 install='gitlab.install'
 sha512sums=('SKIP'
             '282a2063a9ac04272ab46c04417aedecc46ff99db6e35cf8b6bf04b3c38f1dc7492677d95f95773e756a52fcc5fba85e844931271dab52aa582598cbb9cacde3'
+            '790611d868e8206b83694f8509c38e49f92fc85678b9ff81e0d158dcb3f4c8251f231b8e71b77e216eb254dedbaf68ea46348896aa327f04c6dd4cb08a661dbd'
             '5b1ca2958f03a5baf1c5576a1568072e8ed749e2d15745ecbcc4860d2dbd543f2f3ed077e8d87afac2670c9436b19fe498217b49916d56a4e31fb9811aeb9067'
             '75bf9e5ad238a862dfc2638101fb74101227d88958a5f0fdf1ced3833e403f91b6a5908dfb97c5172f75748737212bf87d05b7d39bbe90ed5d3a6c248c1c1ab6'
             '18f4a31935d0626c26d1be1942b715128cf3edcb114f672af16e4a145d8ac693e1afc7d59094cae3702e47e4c6c4cb4a62a009bafcbec500e69120a2dd400a2a'
@@ -62,6 +64,7 @@
   # GitLab tries to read its revision information from a file.
   git rev-parse --short HEAD > REVISION
 
+  patch -p1 < ../fixes.patch
   patch -p1 < ../configs.patch
   # '/home/git' path in the config files indicates a default path that need to be adjusted
   grep -FqR '/home/git' config || exit 1

Added: fixes.patch
===================================================================
--- fixes.patch	                        (rev 0)
+++ fixes.patch	2020-11-18 23:59:35 UTC (rev 757320)
@@ -0,0 +1,19 @@
+commit 63bed07c7377f890a46d4cfec3b82acea2dd0c24
+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 51f9d36cef9..bc8185c0e84 100644
+--- a/Gemfile
++++ b/Gemfile
+@@ -319,6 +319,8 @@ gem 'gettext_i18n_rails', '~> 1.8.0'
+ gem 'gettext_i18n_rails_js', '~> 1.3'
+ gem 'gettext', '~> 3.3', require: false, group: :development
+ 
++gem 'irb' # https://bugs.archlinux.org/task/68569
++
+ gem 'batch-loader', '~> 1.4.0'
+ 
+ # Perf bar


More information about the arch-commits mailing list