[DRE-commits] [ruby-gpgme] 04/04: [evol] dynamic_build patch obsolete, use --use-system-libraries instead

[Marc Dequènes]

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

duck pushed a commit to branch master
in repository ruby-gpgme.

commit 106235b03401ed0f20fda90d93d074e511355fc6
Author: Marc Dequènes (Duck) <Duck at DuckCorp.org>
Date:   Tue Apr 29 14:48:46 2014 +0200

    [evol] dynamic_build patch obsolete, use --use-system-libraries instead
---
 debian/changelog                   |  2 ++
 debian/patches/dynamic_build.patch | 62 --------------------------------------
 debian/patches/series              |  1 -
 debian/rules                       |  4 +++
 4 files changed, 6 insertions(+), 63 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d6df5ce..7af7977 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ ruby-gpgme (2.0.5-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release.
   * Increased Standards-Version to 3.9.5 (no changes).
+  * Removed obsolete patch for dynamic build (with gpgme-config) and use
+    --use-system-libraries option instead.
 
  -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Tue, 29 Apr 2014 14:34:26 +0200
 
diff --git a/debian/patches/dynamic_build.patch b/debian/patches/dynamic_build.patch
deleted file mode 100644
index df9d96a..0000000
--- a/debian/patches/dynamic_build.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Index: ruby-gpgme/ext/gpgme/extconf.rb
-===================================================================
---- ruby-gpgme.orig/ext/gpgme/extconf.rb	2013-08-12 19:41:44.719877511 +0200
-+++ ruby-gpgme/ext/gpgme/extconf.rb	2013-08-12 19:43:09.543079685 +0200
-@@ -4,50 +4,18 @@
- SRC     = File.expand_path(File.dirname(__FILE__))
- PREFIX  = "#{BUILD}/dst"
- 
--def sys(*cmd)
--  puts "  -- #{cmd.join(' ')}"
-+$CFLAGS << " " + `gpgme-config --cflags`.strip
-+$LDFLAGS << " " + `gpgme-config --libs`.strip
- 
--  unless ret = xsystem(cmd.join(' '))
--    raise "#{cmd.join(' ')} failed!"
--  end
-+# avoid useless links wrongly introduced by gpgme-config
-+$LDFLAGS.gsub!(/-l(assuan|gpg-error)/, "")
- 
--  ret
--end
--
--def build(tgz, *flags)
--  sys("tar xjvf #{tgz}")
--
--  Dir.chdir(File.basename(tgz, '.tar.bz2')) do
--    sys("./configure --prefix=#{PREFIX} --libdir=#{PREFIX}/lib --disable-shared --enable-static --with-pic", *flags)
--    sys("make")
--    sys("make install")
--  end
--end
--
--libgpg_error_tgz  = File.join(SRC, 'libgpg-error-1.11.tar.bz2')
--libassuan_tgz     = File.join(SRC, 'libassuan-2.1.0.tar.bz2')
--gpgme_tgz         = File.join(SRC, 'gpgme-1.4.0.tar.bz2')
--
--# build deps
--
--build(libgpg_error_tgz, "--disable-nls")
--build(libassuan_tgz, "--with-gpg-error-prefix=#{PREFIX}")
--build(gpgme_tgz, "--with-gpg-error-prefix=#{PREFIX}", "--with-libassuan-prefix=#{PREFIX}")
--
--# copy gpgme
--
--
--%w[ libassuan libgpg-error libgpgme ].each do |lib|
--  FileUtils.cp "#{PREFIX}/lib/#{lib}.a", "#{BUILD}/#{lib}_ext.a"
--end
--
--$INCFLAGS[0,0] = " -I#{PREFIX}/include "
--#$LDFLAGS << " -L#{PREFIX}/lib "
--$CFLAGS << " -fPIC "
-+puts "CFLAGS: #{$CFLAGS}"
-+puts "LDFLAGS: #{$LDFLAGS}"
- 
- # build gpgme extension
- 
--unless have_library 'gpg-error_ext' and have_library 'assuan_ext' and have_library 'gpgme_ext' and have_header 'gpgme.h'
-+unless have_library 'gpgme' and have_header 'gpgme.h'
-   STDERR.puts "\n\n"
-   STDERR.puts "*********************************************************"
-   STDERR.puts "********* error compiling and linking libgpgme. *********"
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 2fe44ab..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-dynamic_build.patch
diff --git a/debian/rules b/debian/rules
index a5e7dc8..b25a062 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,5 +11,9 @@
 # If you need to specify the .gemspec (eg there is more than one)
 #export DH_RUBY_GEMSPEC=gem.gemspec
 
+# no way to pass --use-system-libraries to extconf (yet)
+export RUBY_GPGME_USE_SYSTEM_LIBRARIES=1
+
 %:
 	dh $@ --buildsystem=ruby --with ruby
+

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