Download as
Browse Code »

Commit b096aa745958efd8181d4624e9db4d0870c8d134

Authored by Rodrigo Souto
1 parent e95275da
Exists in master and in 8 other branches cherry-pick-62193d8b, federation, gemfile-changes, rails4, rails5, stable-1.2, stable-1.3, stable-1.5

Revert "add the nokogiri gem as dependency" 

This reverts commit a3fb85d903790d565983e4e0f22acf557d8292dc.

Reverting substitution of hpricot for nokogiri on macros infra due to
segfault problem with nokogiri 1.4.0.

Conflicts:

	INSTALL
	script/install-dependencies/debian-squeeze.sh
Showing 4 changed files with 2 additions and 5 deletions   Show diff stats
@@ -23,7 +23,7 @@ You need to install some packages Noosfero depends on. On Debian GNU/Linux or De @@ -23,7 +23,7 @@ You need to install some packages Noosfero depends on. On Debian GNU/Linux or De
23 # apt-get install ruby rake po4a libgettext-ruby-util libgettext-ruby1.8 \ 23 # apt-get install ruby rake po4a libgettext-ruby-util libgettext-ruby1.8 \
24 libsqlite3-ruby rcov librmagick-ruby libredcloth-ruby libhpricot-ruby \ 24 libsqlite3-ruby rcov librmagick-ruby libredcloth-ruby libhpricot-ruby \
25 libwill-paginate-ruby iso-codes libfeedparser-ruby libdaemons-ruby thin \ 25 libwill-paginate-ruby iso-codes libfeedparser-ruby libdaemons-ruby thin \
26 - tango-icon-theme libnokogiri-ruby 26 + tango-icon-theme
27 27
28 On other systems, they may or may not be available through your regular package management system. Below are the links to their homepages. 28 On other systems, they may or may not be available through your regular package management system. Below are the links to their homepages.
29 29
@@ -41,7 +41,6 @@ On other systems, they may or may not be available through your regular package @@ -41,7 +41,6 @@ On other systems, they may or may not be available through your regular package
41 * Thin: http://code.macournoyer.com/thin 41 * Thin: http://code.macournoyer.com/thin
42 * tango-icon-theme: http://tango.freedesktop.org/Tango_Icon_Library 42 * tango-icon-theme: http://tango.freedesktop.org/Tango_Icon_Library
43 * Hpricot: http://hpricot.com 43 * Hpricot: http://hpricot.com
44 -* Nokogiri: http://nokogiri.org/  
45 44
46 If you manage to install Noosfero successfully on other systems than Debian, 45 If you manage to install Noosfero successfully on other systems than Debian,
47 please feel free to contact the Noosfero development mailing with the 46 please feel free to contact the Noosfero development mailing with the
config/initializers/dependencies.rb
  Diff comments   View file @b096aa7
@@ -8,4 +8,3 @@ require 'route_if' @@ -8,4 +8,3 @@ require 'route_if'
8 8
9 # third-party libraries 9 # third-party libraries
10 require 'will_paginate' 10 require 'will_paginate'
11 -require 'nokogiri'  
debian/control
  Diff comments   View file @b096aa7
@@ -41,7 +41,6 @@ Depends: @@ -41,7 +41,6 @@ Depends:
41 thin, 41 thin,
42 tango-icon-theme, 42 tango-icon-theme,
43 libhpricot-ruby, 43 libhpricot-ruby,
44 - libnokogiri-ruby,  
45 memcached, 44 memcached,
46 debconf, 45 debconf,
47 dbconfig-common, 46 dbconfig-common,
script/install-dependencies/debian-squeeze.sh
  Diff comments   View file @b096aa7
@@ -5,7 +5,7 @@ run sudo apt-get -y install $runtime_dependencies @@ -5,7 +5,7 @@ run sudo apt-get -y install $runtime_dependencies
5 sudo apt-get -y install iceweasel || sudo apt-get -y install firefox 5 sudo apt-get -y install iceweasel || sudo apt-get -y install firefox
6 6
7 # needed for development 7 # needed for development
8 -run sudo apt-get -y install libtidy-ruby libhpricot-ruby libnokogiri-ruby libmocha-ruby imagemagick po4a xvfb libxml2-dev libxslt-dev postgresql openjdk-6-jre 8 +run sudo apt-get -y install libtidy-ruby libhpricot-ruby libmocha-ruby imagemagick po4a xvfb libxml2-dev libxslt-dev postgresql openjdk-6-jre
9 gem which bundler >/dev/null 2>&1 || gem_install bundler 9 gem which bundler >/dev/null 2>&1 || gem_install bundler
10 setup_rubygems_path 10 setup_rubygems_path
11 run bundle install 11 run bundle install