summaryrefslogtreecommitdiff
path: root/packages/media-libs/imlib2
diff options
context:
space:
mode:
authorAvatar Heiko Becker <heirecka@exherbo.org> 2014-10-09 20:56:47 +0200
committerAvatar Heiko Becker <heirecka@exherbo.org> 2014-10-10 19:27:43 +0200
commita705d73606f9554298f17619bfe191d255848b28 (patch)
treec0773ada4d401b0b7ae09a0f46a1e21e9c854c1b /packages/media-libs/imlib2
parent4d81685588126140fdad04d2d7b0ab25d2d32545 (diff)
downloadmedia-a705d73606f9554298f17619bfe191d255848b28.tar.gz
media-a705d73606f9554298f17619bfe191d255848b28.tar.xz
imlib2: replace sed invocation with upstream patch
Change-Id: I9ad32d2407239f46a2c103a97afb1ed0dfd5c542
Diffstat (limited to 'packages/media-libs/imlib2')
-rw-r--r--packages/media-libs/imlib2/files/imlib2-1.4.6-imlib2-config-delete-old-reference-to-my_libs.patch30
-rw-r--r--packages/media-libs/imlib2/imlib2-1.4.6-r1.exheres-010
2 files changed, 34 insertions, 6 deletions
diff --git a/packages/media-libs/imlib2/files/imlib2-1.4.6-imlib2-config-delete-old-reference-to-my_libs.patch b/packages/media-libs/imlib2/files/imlib2-1.4.6-imlib2-config-delete-old-reference-to-my_libs.patch
new file mode 100644
index 00000000..24d4d203
--- /dev/null
+++ b/packages/media-libs/imlib2/files/imlib2-1.4.6-imlib2-config-delete-old-reference-to-my_libs.patch
@@ -0,0 +1,30 @@
+Upstream: yes
+
+From 5dde234b2d3caf067ea827858c53adc5d4c56c13 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 18 Jan 2014 13:56:54 -0500
+Subject: [PATCH] imlib2-config: delete old reference to @my_libs@
+
+This was cleaned up a while ago, but this file was missed.
+
+URL: https://bugs.gentoo.org/497894
+---
+ imlib2-config.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/imlib2-config.in b/imlib2-config.in
+index cf814c6..965f7c3 100644
+--- a/imlib2-config.in
++++ b/imlib2-config.in
+@@ -46,7 +46,7 @@ while test $# -gt 0; do
+ ;;
+ --libs)
+ libdirs=-L@libdir@
+- echo $libdirs -lImlib2 @my_libs@
++ echo $libdirs -lImlib2
+ ;;
+ *)
+ echo "${usage}" 1>&2
+--
+2.1.2
+
diff --git a/packages/media-libs/imlib2/imlib2-1.4.6-r1.exheres-0 b/packages/media-libs/imlib2/imlib2-1.4.6-r1.exheres-0
index 5038ead1..0c594219 100644
--- a/packages/media-libs/imlib2/imlib2-1.4.6-r1.exheres-0
+++ b/packages/media-libs/imlib2/imlib2-1.4.6-r1.exheres-0
@@ -35,12 +35,10 @@ DEPENDENCIES="
)
"
-DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}"/${PNV}-GIF-loader-Fix-for-libgif-version-5.patch )
-
-src_prepare() {
- default
- edo sed -i -e 's: @my_libs@::' imlib2-config.in
-}
+DEFAULT_SRC_PREPARE_PATCHES=(
+ "${FILES}"/${PNV}-GIF-loader-Fix-for-libgif-version-5.patch
+ "${FILES}"/${PNV}-imlib2-config-delete-old-reference-to-my_libs.patch
+)
src_configure() {
local myconf=()