[gentoo-commits] repo/gentoo:master commit in: dev-ruby/rmagick/files/

[gentoo-commits] repo/gentoo:master commit in: dev-ruby/rmagick/files/

[Conrad Kostecki]

commit:     6d249fc1cbc22232b22ef2884dfe10feb2f8fef4
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Apr  1 15:56:37 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Apr  1 19:12:43 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d249fc1

dev-ruby/rmagick: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/30434
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../rmagick/files/rmagick-4.2.5-empty-rpath.patch  | 30 ----------------------
 1 file changed, 30 deletions(-)

diff --git a/dev-ruby/rmagick/files/rmagick-4.2.5-empty-rpath.patch b/dev-ruby/rmagick/files/rmagick-4.2.5-empty-rpath.patch
deleted file mode 100644
index 13defdd24099..000000000000
--- a/dev-ruby/rmagick/files/rmagick-4.2.5-empty-rpath.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit fef59858eaba843b876c5b5f253f623ddb4d0f1c
-Author: Hans de Graaff <hans@degraaff.org>
-Date:   Sat Apr 23 08:54:42 2022 +0200
-
-    Guard against an empty rpath
-    
-    Some ImageMagick installations (e.g. on Gentoo Linux when installed
-    with the package manager) don't return any -L options in pkg-config.
-    Including an empty rpath is a security risk and should be avoided.
-    
-    Fixes #1332
-
-diff --git a/ext/RMagick/extconf.rb b/ext/RMagick/extconf.rb
-index 7b4ce1ad..3eef6cbd 100644
---- a/ext/RMagick/extconf.rb
-+++ b/ext/RMagick/extconf.rb
-@@ -69,11 +69,12 @@ module RMagick
- 
-         libdir  = `pkg-config --libs-only-L #{$magick_package}`.chomp.sub('-L', '')
-         ldflags = "#{ENV['LDFLAGS']} " + `pkg-config --libs #{$magick_package}`.chomp
-+        rpath   = libdir.empty? ? '' : "-Wl,-rpath,#{libdir}"
- 
-         # Save flags
-         $CPPFLAGS   = "#{ENV['CPPFLAGS']} " + `pkg-config --cflags #{$magick_package}`.chomp
-         $LOCAL_LIBS = "#{ENV['LIBS']} "     + `pkg-config --libs #{$magick_package}`.chomp
--        $LDFLAGS    = "#{ldflags} -Wl,-rpath,#{libdir}"
-+        $LDFLAGS    = "#{ldflags} #{rpath}"
- 
-         unless try_link("int main() { }")
-           # if linker does not recognizes '-Wl,-rpath,somewhere' option, it revert to original option