[DRE-commits] [ruby-gd] 01/02: Enable additional features in a less intrusive way

[Christian Hofstaedtler]

This is an automated email from the git hooks/post-receive script.

zeha pushed a commit to branch master
in repository ruby-gd.

commit d3ebc7873208128077eac9919dc9e9a1daaf2a40
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Fri Dec 27 16:37:01 2013 +0100

    Enable additional features in a less intrusive way
---
 debian/patches/options-extconf.patch | 65 ------------------------------------
 debian/patches/series                |  1 -
 debian/rules                         |  2 ++
 3 files changed, 2 insertions(+), 66 deletions(-)

diff --git a/debian/patches/options-extconf.patch b/debian/patches/options-extconf.patch
deleted file mode 100644
index bbe4c3d..0000000
--- a/debian/patches/options-extconf.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Description: force options in extconf.rb
- There is no way for the moment to pass options to extconf.rb with gem2deb
-Author: Cédric Boutillier <boutil at debian.org>
-Origin: vendor
-Forwarded: not-needed
-Last-Update: 2013-12-27
-
---- a/extconf.rb
-+++ b/extconf.rb
-@@ -34,22 +34,16 @@
-   dir_config("X11", "/usr/X11R6/include", "/usr/X11R6/lib")
- end
- 
--if with_config('jpeg')
--  have_library('jpeg')
--end
-+have_library('jpeg')
- 
- if with_config('ttf')
-   have_library('ttf')
- end
- 
--if with_config('xpm')
--  have_library('X11')
--  have_library('Xpm')
--end
-+have_library('X11')
-+have_library('Xpm')
- 
--if with_config('freetype')
--  have_library('freetype')
--end
-+have_library('freetype')
- 
- if have_library('z') and have_library('png') and 
-     have_library('gd', 'gdImagePng') and have_library('m')
-@@ -60,23 +54,14 @@
-   
-   have_func('gdImageColorResolve')
- 
--  if with_config('xpm') and not have_func('gdImageCreateFromXpm')
--    delete_link('Xpm')
--    delete_link('X11')
--  end
-+  have_func('gdImageCreateFromXpm')
- 
--  if with_config('jpeg') and not have_func('gdImageCreateFromJpeg')
--    delete_link('jpeg')
--  end
-+  have_func('gdImageCreateFromJpeg')
-   
--  if with_config('freetype') and not have_func('gdImageStringFT')
--    delete_link('freetype')
--  end
-+  have_func('gdImageStringFT')
-   
--  if enable_config("gd2_0", false)
--    if have_func("gdImageAlphaBlending")
--      $CFLAGS += ' -DENABLE_GD_2_0'
--    end
-+  if have_func("gdImageAlphaBlending")
-+    $CFLAGS += ' -DENABLE_GD_2_0'
-   end
- 
-   create_makefile('GD')
diff --git a/debian/patches/series b/debian/patches/series
index 5856309..221b0c4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ fix-compilation-with-ruby19.patch
 restore-ruby18-support.patch
 fix-memory-leak.patch
 compatibility-with-ruby192.patch
-options-extconf.patch
diff --git a/debian/rules b/debian/rules
index a5e7dc8..1525b22 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,5 +11,7 @@
 # If you need to specify the .gemspec (eg there is more than one)
 #export DH_RUBY_GEMSPEC=gem.gemspec
 
+export CONFIGURE_ARGS=--with-xpm --with-jpeg --with-freetype --with-ttf --enable-gd2_0
+
 %:
 	dh $@ --buildsystem=ruby --with ruby

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-gd.git