Skip to content

Commit fc4d01e

Browse files
committed
Added patches to use charlock_holmes version that linked against system libmagic library.
1 parent 3b67eca commit fc4d01e

File tree

3 files changed

+45
-0
lines changed

3 files changed

+45
-0
lines changed

patches/01_Gemfile.patch

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
--- a/Gemfile 2013-03-15 11:51:22.361386708 +0100
2+
+++ b/Gemfile 2013-03-15 11:51:52.992992856 +0100
3+
@@ -10,6 +10,9 @@
4+
5+
gem "rails", "3.2.12"
6+
7+
+# Use patched charlock_holmes with linking against system libmagic library.
8+
+gem "charlock_holmes", "0.6.9", :git => "https://github.com/Danie/charlock_holmes.git", :branch => "gitlab_patch"
9+
+
10+
# Supported DBs
11+
gem "mysql2", group: :mysql
12+
gem "pg", group: :postgres
13+

patches/02_Gemfile.lock.patch

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
--- a/Gemfile.lock 2013-03-15 11:51:22.365386676 +0100
2+
+++ b/Gemfile.lock 2013-03-15 11:51:58.352923477 +0100
3+
@@ -1,4 +1,11 @@
4+
GIT
5+
+ remote: https://github.com/Danie/charlock_holmes.git
6+
+ revision: 53562045174aadcb739e365822a006a996201569
7+
+ branch: gitlab_patch
8+
+ specs:
9+
+ charlock_holmes (0.6.9)
10+
+
11+
+GIT
12+
remote: https://github.com/ctran/annotate_models.git
13+
revision: be4e26825b521f0b2d86b181e2dff89901aa9b1e
14+
specs:
15+
@@ -70,7 +77,6 @@
16+
celluloid (0.12.4)
17+
facter (>= 1.6.12)
18+
timers (>= 1.0.0)
19+
- charlock_holmes (0.6.9)
20+
childprocess (0.3.8)
21+
ffi (~> 1.0, >= 1.0.11)
22+
chosen-rails (0.9.8)
23+
@@ -476,6 +482,7 @@
24+
bootstrap-sass (= 2.2.1.1)
25+
capybara (= 2.0.2)
26+
carrierwave
27+
+ charlock_holmes (= 0.6.9)!
28+
chosen-rails (= 0.9.8)
29+
coffee-rails (~> 3.2.2)
30+
colored

patches/series

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
01_Gemfile.patch
2+
02_Gemfile.lock.patch

0 commit comments

Comments
 (0)