[DRE-commits] [ruby-rmagick] 09/15: drop allocation patches

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-rmagick.

commit 09c720aebdadeee6ebb2369c6e855dc7bfd64605
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Dec 4 10:06:28 2016 -0200

    drop allocation patches
---
 debian/changelog                                   |  7 ++---
 ...locate-DrawInfo-using-the-ImageMagick-API.patch | 32 ----------------------
 ...h => 0005-gemspec-fix-error-when-loading.patch} |  0
 ...age.patch => 0006-gemspec-drop-git-usage.patch} |  0
 debian/patches/series                              |  5 ++--
 5 files changed, 4 insertions(+), 40 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a683ce7..2a9ae8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,9 @@
 ruby-rmagick (2.16.0-1) UNRELEASED; urgency=medium
 
   * New upstream version 2.16.0
-  * 0005-Allocate-DrawInfo-using-the-ImageMagick-API.patch: use ImageMagick
-    API to allocate memory for DrawInfo struct, which is supposed to be opaque
-    (Closes: #591419)
   * Drop ruby-setup from Build-Depends:, not really needed
-  * 0006-gemspec-fix-error-when-loading.patch,
-    0007-gemspec-drop-git-usage.patch: adjust gemspec
+  * 0005-gemspec-fix-error-when-loading.patch,
+    0006-gemspec-drop-git-usage.patch: adjust gemspec
 
  -- Antonio Terceiro <terceiro at debian.org>  Sat, 03 Dec 2016 10:26:54 -0200
 
diff --git a/debian/patches/0005-Allocate-DrawInfo-using-the-ImageMagick-API.patch b/debian/patches/0005-Allocate-DrawInfo-using-the-ImageMagick-API.patch
deleted file mode 100644
index efb14ce..0000000
--- a/debian/patches/0005-Allocate-DrawInfo-using-the-ImageMagick-API.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Antonio Terceiro <terceiro at debian.org>
-Date: Sat, 3 Dec 2016 16:02:40 -0200
-Subject: Allocate DrawInfo using the ImageMagick API
-
-DrawInfo is supposed to be a opaque struct; RMagick should not need to
-know which size it is.
----
- ext/RMagick/rmdraw.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/ext/RMagick/rmdraw.c b/ext/RMagick/rmdraw.c
-index cf2171e..99054da 100644
---- a/ext/RMagick/rmdraw.c
-+++ b/ext/RMagick/rmdraw.c
-@@ -670,7 +670,7 @@ Draw_marshal_load(VALUE self, VALUE ddraw)
- 
-     Data_Get_Struct(self, Draw, draw);
- 
--    draw->info = magick_malloc(sizeof(DrawInfo));
-+    draw->info = AcquireDrawInfo();
-     if (!draw->info)
-     {
-         rb_raise(rb_eNoMemError, "not enough memory to continue");
-@@ -1727,7 +1727,7 @@ DrawOptions_initialize(VALUE self)
-     Draw *draw_options;
- 
-     Data_Get_Struct(self, Draw, draw_options);
--    draw_options->info = magick_malloc(sizeof(DrawInfo));
-+    draw_options->info = AcquireDrawInfo();
-     if (!draw_options->info)
-     {
-         rb_raise(rb_eNoMemError, "not enough memory to continue");
diff --git a/debian/patches/0006-gemspec-fix-error-when-loading.patch b/debian/patches/0005-gemspec-fix-error-when-loading.patch
similarity index 100%
rename from debian/patches/0006-gemspec-fix-error-when-loading.patch
rename to debian/patches/0005-gemspec-fix-error-when-loading.patch
diff --git a/debian/patches/0007-gemspec-drop-git-usage.patch b/debian/patches/0006-gemspec-drop-git-usage.patch
similarity index 100%
rename from debian/patches/0007-gemspec-drop-git-usage.patch
rename to debian/patches/0006-gemspec-drop-git-usage.patch
diff --git a/debian/patches/series b/debian/patches/series
index a48d162..13d762c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,5 @@
 0002-Ignore-removed-srgb.icm-file-in-tests.patch
 0003-Use-deterministic-label-for-image.patch
 0004-Seed-RNG-to-0-during-builds.patch
-0005-Allocate-DrawInfo-using-the-ImageMagick-API.patch
-0006-gemspec-fix-error-when-loading.patch
-0007-gemspec-drop-git-usage.patch
+0005-gemspec-fix-error-when-loading.patch
+0006-gemspec-drop-git-usage.patch

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