Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:ykoba:ruby
rubygem-charlock_holmes
charlock_holmes-0.6.6_system_libmagick.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File charlock_holmes-0.6.6_system_libmagick.patch of Package rubygem-charlock_holmes
Index: ext/charlock_holmes/extconf.rb =================================================================== --- ext/charlock_holmes/extconf.rb.orig +++ ext/charlock_holmes/extconf.rb @@ -49,28 +49,28 @@ end # libmagic dependency # -src = File.basename('file-5.08.tar.gz') -dir = File.basename(src, '.tar.gz') - -Dir.chdir("#{CWD}/src") do - FileUtils.rm_rf(dir) if File.exists?(dir) - - sys("tar zxvf #{src}") - Dir.chdir(dir) do - sys("./configure --prefix=#{CWD}/dst/ --disable-shared --enable-static --with-pic") - sys("patch -p0 < ../file-soft-check.patch") - sys("make -C src install") - sys("make -C magic install") - end -end - -FileUtils.cp "#{CWD}/dst/lib/libmagic.a", "#{CWD}/libmagic_ext.a" - -$INCFLAGS[0,0] = " -I#{CWD}/dst/include " -$LDFLAGS << " -L#{CWD} " - +# src = File.basename('file-5.08.tar.gz') +# dir = File.basename(src, '.tar.gz') +# +# Dir.chdir("#{CWD}/src") do +# FileUtils.rm_rf(dir) if File.exists?(dir) +# +# sys("tar zxvf #{src}") +# Dir.chdir(dir) do +# sys("./configure --prefix=#{CWD}/dst/ --disable-shared --enable-static --with-pic") +# sys("patch -p0 < ../file-soft-check.patch") +# sys("make -C src install") +# sys("make -C magic install") +# end +# end +# +# FileUtils.cp "#{CWD}/dst/lib/libmagic.a", "#{CWD}/libmagic_ext.a" +# +# $INCFLAGS[0,0] = " -I#{CWD}/dst/include " +# $LDFLAGS << " -L#{CWD} " +# dir_config 'magic' -unless have_library 'magic_ext' and have_header 'magic.h' +unless have_library 'magic' and have_header 'magic.h' STDERR.puts "\n\n" STDERR.puts "***************************************************************************************" STDERR.puts "********* error compiling and linking libmagic. please report issue on github *********" Index: ext/charlock_holmes/encoding_detector.c =================================================================== --- ext/charlock_holmes/encoding_detector.c.orig +++ ext/charlock_holmes/encoding_detector.c @@ -278,6 +278,9 @@ static VALUE rb_encdec__alloc(VALUE klas if (detector->magic == NULL) { rb_raise(rb_eStandardError, "%s", magic_error(detector->magic)); } + if (-1 == magic_load(detector->magic, NULL)) { + rb_raise(rb_eStandardError, "%s", magic_error(detector->magic)); + } return obj; }
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor