[DRE-commits] [ruby-sass-rails] 03/03: drop patches already applied upstream
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Mon Mar 30 11:02:20 UTC 2015
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master
in repository ruby-sass-rails.
commit 09b82e05de4581cc05188a3bc962ea6f3ea6cdbd
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Mon Mar 30 16:30:18 2015 +0530
drop patches already applied upstream
---
debian/patches/series | 1 -
debian/patches/sprockets-2.x.patch | 358 -------------------------------------
2 files changed, 359 deletions(-)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ab31a25..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-sprockets-2.x.patch
diff --git a/debian/patches/sprockets-2.x.patch b/debian/patches/sprockets-2.x.patch
deleted file mode 100644
index 90bfdb8..0000000
--- a/debian/patches/sprockets-2.x.patch
+++ /dev/null
@@ -1,358 +0,0 @@
-Description: Restore compatibility with sprockets >= 2.12
- This patch is a combination of the following upstream commits:
- - e56c2fbf60ef2bd879aae6f6163c90326b4017be
- - bd63297c31aceb079595c3a3d9007b0e4df505b6
- - a62bdf85e56a678aa5fded3d4ed0d10bbc0b7a7b
- .
- Changes to non-essential files such as Gemfile's were dropped.
- .
- metadata.yml, which is specific to the Debian package, was modified to reflect
- the changes to sass-rails.gemspec.
-Author:
- Rafael Mendonça França <rafaelmfranca at gmail.com>,
- Matthew Draper <matthew at trebex.net>,
-Reviewed-By: Antonio Terceiro <terceiro at debian.org>
-
-Index: ruby-sass-rails/lib/sass/rails/railtie.rb
-===================================================================
---- ruby-sass-rails.orig/lib/sass/rails/railtie.rb
-+++ ruby-sass-rails/lib/sass/rails/railtie.rb
-@@ -52,6 +52,9 @@ module Sass::Rails
- end
-
- if app.assets
-+ app.assets.register_engine '.sass', Sass::Rails::SassTemplate
-+ app.assets.register_engine '.scss', Sass::Rails::ScssTemplate
-+
- app.assets.context_class.extend(SassContext)
- app.assets.context_class.sass_config = app.config.sass
- end
-Index: ruby-sass-rails/lib/sass/rails/template.rb
-===================================================================
---- ruby-sass-rails.orig/lib/sass/rails/template.rb
-+++ ruby-sass-rails/lib/sass/rails/template.rb
-@@ -1,28 +1,42 @@
- require "sprockets/sass_template"
-
--module Sprockets
-- class SassTemplate
-- def evaluate(context, locals, &block)
-- cache_store = SassCacheStore.new(context.environment)
--
-- options = {
-- :filename => eval_file,
-- :line => line,
-- :syntax => syntax,
-- :cache_store => cache_store,
-- :importer => SassImporter.new(context, context.pathname),
-- :load_paths => context.environment.paths.map { |path| SassImporter.new(context, path) },
-- :sprockets => {
-- :context => context,
-- :environment => context.environment
-+module Sass
-+ module Rails
-+ class SassTemplate < Sprockets::SassTemplate
-+
-+ def evaluate(context, locals, &block)
-+ cache_store = Sprockets::SassCacheStore.new(context.environment)
-+
-+ options = {
-+ :filename => eval_file,
-+ :line => line,
-+ :syntax => syntax,
-+ :cache_store => cache_store,
-+ :importer => SassImporter.new(context, context.pathname.to_s),
-+ :load_paths => context.environment.paths.map { |path| SassImporter.new(context, path.to_s) },
-+ :sprockets => {
-+ :context => context,
-+ :environment => context.environment
-+ }
- }
-- }
-
-- sass_config = context.environment.context_class.sass_config.merge(options)
-- ::Sass::Engine.new(data, sass_config).render
-- rescue ::Sass::SyntaxError => e
-- context.__LINE__ = e.sass_backtrace.first[:line]
-- raise e
-+ sass_config = context.environment.context_class.sass_config.merge(options)
-+
-+ ::Sass::Engine.new(data, sass_config).render
-+ rescue ::Sass::SyntaxError => e
-+ context.__LINE__ = e.sass_backtrace.first[:line]
-+ raise e
-+ end
-+ end
-+
-+ class ScssTemplate < SassTemplate
-+ def self.default_mime_type
-+ 'text/css'
-+ end
-+
-+ def syntax
-+ :scss
-+ end
- end
- end
- end
-Index: ruby-sass-rails/sass-rails.gemspec
-===================================================================
---- ruby-sass-rails.orig/sass-rails.gemspec
-+++ ruby-sass-rails/sass-rails.gemspec
-@@ -15,10 +15,10 @@ Gem::Specification.new do |s|
-
- s.rubyforge_project = "sass-rails"
-
-- s.add_dependency 'sass', '~> 3.2.2'
-+ s.add_dependency 'sass', '~> 3.2'
- s.add_dependency 'railties', '>= 4.0.0', '< 5.0'
- s.add_dependency 'sprockets-rails', '~> 2.0'
-- s.add_dependency 'sprockets', '~> 2.8', '< 2.12'
-+ s.add_dependency 'sprockets', '~> 2.12'
-
- s.files = [".gitignore",".travis.yml","CHANGELOG.md","Gemfile","MIT-LICENSE","README.md","Rakefile","lib/rails/generators/sass/assets/assets_generator.rb","lib/rails/generators/sass/assets/templates/stylesheet.css.sass","lib/rails/generators/sass/scaffold/scaffold_generator.rb","lib/rails/generators/sass_scaffold.rb","lib/rails/generators/scss/assets/assets_generator.rb","lib/rails/generators/scss/assets/templates/stylesheet.css.scss","lib/rails/generators/scss/scaffold/scaffo [...]
- s.executables = []
-Index: ruby-sass-rails/sass-rails.gemspec.erb
-===================================================================
---- ruby-sass-rails.orig/sass-rails.gemspec.erb
-+++ ruby-sass-rails/sass-rails.gemspec.erb
-@@ -15,10 +15,10 @@ Gem::Specification.new do |s|
-
- s.rubyforge_project = "sass-rails"
-
-- s.add_dependency 'sass', '~> 3.2.2'
-+ s.add_dependency 'sass', '~> 3.2'
- s.add_dependency 'railties', '>= 4.0.0', '< 5.0'
- s.add_dependency 'sprockets-rails', '~> 2.0'
-- s.add_dependency 'sprockets', '~> 2.8', '< 2.12'
-+ s.add_dependency 'sprockets', '~> 2.12'
-
- s.files = [<%= files.map(&:inspect).join ',' %>]
- s.executables = [<%= executables.map(&:inspect).join ',' %>]
-Index: ruby-sass-rails/lib/sass/rails/importer.rb
-===================================================================
---- ruby-sass-rails.orig/lib/sass/rails/importer.rb
-+++ ruby-sass-rails/lib/sass/rails/importer.rb
-@@ -1,104 +1,96 @@
- require 'sprockets/sass_importer'
-
--module Sprockets
-- class SassImporter < Sass::Importers::Filesystem
-- GLOB = /\*|\[.+\]/
--
-- attr_reader :context
-- private :context
--
-- def extensions
-- {
-- 'css' => :scss,
-- 'css.scss' => :scss,
-- 'css.sass' => :sass,
-- 'css.erb' => :scss,
-- 'scss.erb' => :scss,
-- 'sass.erb' => :sass,
-- 'css.scss.erb' => :scss,
-- 'css.sass.erb' => :sass
-- }.merge!(super)
-- end
--
-- def find_relative(name, base, options)
-- if name =~ GLOB
-- glob_imports(name, Pathname.new(base), options)
-- else
-- engine_from_path(name, File.dirname(base), options)
-- end
-- end
--
-- def find(name, options)
-- if name =~ GLOB
-- nil # globs must be relative
-- else
-- engine_from_path(name, root, options)
-- end
-- end
--
-- def each_globbed_file(glob, base_pathname, options)
-- Dir["#{base_pathname}/#{glob}"].sort.each do |filename|
-- next if filename == options[:filename]
-- yield filename if File.directory?(filename) || context.asset_requirable?(filename)
-+module Sass
-+ module Rails
-+ class SassImporter < Sass::Importers::Filesystem
-+ GLOB = /\*|\[.+\]/
-+
-+ attr_reader :context
-+ def initialize(context, *args)
-+ @context = context
-+ super(*args)
-+ end
-+
-+ def extensions
-+ {
-+ 'css' => :scss,
-+ 'css.scss' => :scss,
-+ 'css.sass' => :sass,
-+ 'css.erb' => :scss,
-+ 'scss.erb' => :scss,
-+ 'sass.erb' => :sass,
-+ 'css.scss.erb' => :scss,
-+ 'css.sass.erb' => :sass
-+ }.merge!(super)
-+ end
-+
-+ def find_relative(name, base, options)
-+ if name =~ GLOB
-+ glob_imports(name, Pathname.new(base), options)
-+ else
-+ engine_from_path(name, File.dirname(base), options)
-+ end
- end
-- end
-
-- def glob_imports(glob, base_pathname, options)
-- contents = ""
-- each_globbed_file(glob, base_pathname.dirname, options) do |filename|
-- if File.directory?(filename)
-- depend_on(filename)
-- elsif context.asset_requirable?(filename)
-- depend_on(filename)
-- contents << "@import #{Pathname.new(filename).relative_path_from(base_pathname.dirname).to_s.inspect};\n"
-+ def find(name, options)
-+ if name =~ GLOB
-+ nil # globs must be relative
-+ else
-+ engine_from_path(name, root, options)
- end
- end
-- return nil if contents.empty?
-- Sass::Engine.new(contents, options.merge(
-- :filename => base_pathname.to_s,
-- :importer => self,
-- :syntax => :scss
-- ))
-- end
-
-- private
-+ private
-
-- def depend_on(filename)
-- context.depend_on(filename)
-- context.depend_on(globbed_file_parent(filename))
-- end
-+ def each_globbed_file(glob, base_pathname, options)
-+ Dir["#{base_pathname}/#{glob}"].sort.each do |filename|
-+ next if filename == options[:filename]
-+ if File.directory?(filename)
-+ context.depend_on(filename)
-+ context.depend_on(File.expand_path('..', filename))
-+ elsif context.asset_requirable?(filename)
-+ context.depend_on(File.dirname(filename))
-+ yield filename
-+ end
-+ end
-+ end
-
-- def globbed_file_parent(filename)
-- if File.directory?(filename)
-- File.expand_path('..', filename)
-- else
-- File.dirname(filename)
-+ def glob_imports(glob, base_pathname, options)
-+ contents = ""
-+ each_globbed_file(glob, base_pathname.dirname, options) do |filename|
-+ contents << "@import #{Pathname.new(filename).relative_path_from(base_pathname.dirname).to_s.inspect};\n"
-+ end
-+ return nil if contents.empty?
-+ Sass::Engine.new(contents, options.merge(
-+ :filename => base_pathname.to_s,
-+ :importer => self,
-+ :syntax => :scss
-+ ))
- end
-- end
-
-- def engine_from_path(name, dir, options)
-- full_filename, syntax = Sass::Util.destructure(find_real_file(dir, name, options))
-- return unless full_filename && File.readable?(full_filename)
-
-- engine = Sass::Engine.new(evaluate(full_filename), options.merge(
-- syntax: syntax,
-- filename: full_filename,
-- importer: self
-- ))
-+ def engine_from_path(name, dir, options)
-+ full_filename, syntax = Sass::Util.destructure(find_real_file(dir, name, options))
-+ return unless full_filename && File.readable?(full_filename)
-+
-+ context.depend_on full_filename
-+ engine = Sass::Engine.new(evaluate(full_filename), options.merge(
-+ syntax: syntax,
-+ filename: full_filename,
-+ importer: self
-+ ))
-
-- if engine && (filename = engine.options[:filename])
-- @context.depend_on(filename)
-+ engine
- end
-
-- engine
-- end
-+ def evaluate(filename)
-+ attributes = context.environment.attributes_for(filename)
-+ processors = context.environment.preprocessors(attributes.content_type) +
-+ attributes.engines.reverse - [Sass::Rails::ScssTemplate, Sass::Rails::SassTemplate]
-
-- def evaluate(filename)
-- attributes = context.environment.attributes_for(filename)
-- processors = context.environment.preprocessors(attributes.content_type) +
-- attributes.engines.reverse - [Sprockets::ScssTemplate, Sprockets::SassTemplate]
-+ context.evaluate(filename, processors: processors)
-+ end
-
-- context.evaluate(filename, processors: processors)
-- end
-+ end
- end
- end
-Index: ruby-sass-rails/metadata.yml
-===================================================================
---- ruby-sass-rails.orig/metadata.yml
-+++ ruby-sass-rails/metadata.yml
-@@ -17,14 +17,14 @@ dependencies:
- requirements:
- - - "~>"
- - !ruby/object:Gem::Version
-- version: 3.2.2
-+ version: '3.2'
- type: :runtime
- prerelease: false
- version_requirements: !ruby/object:Gem::Requirement
- requirements:
- - - "~>"
- - !ruby/object:Gem::Version
-- version: 3.2.2
-+ version: '3.2'
- - !ruby/object:Gem::Dependency
- name: railties
- requirement: !ruby/object:Gem::Requirement
-@@ -65,9 +65,6 @@ dependencies:
- requirements:
- - - "~>"
- - !ruby/object:Gem::Version
-- version: '2.8'
-- - - "<"
-- - !ruby/object:Gem::Version
- version: '2.12'
- type: :runtime
- prerelease: false
-@@ -75,9 +72,6 @@ dependencies:
- requirements:
- - - "~>"
- - !ruby/object:Gem::Version
-- version: '2.8'
-- - - "<"
-- - !ruby/object:Gem::Version
- version: '2.12'
- description: Sass adapter for the Rails asset pipeline.
- email:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-sass-rails.git
More information about the Pkg-ruby-extras-commits
mailing list