Commit 76b55b95 authored by Fabio Porcedda's avatar Fabio Porcedda Committed by Thomas Petazzoni
Browse files

imlib2: imlib2-config: delete old reference to @my_libs@ 

The script "imlib2-config" returns "@my_libs@" that causes build failures
on the programs that use it.
This is a regression of version v1.4.6.

Add a upstream patch to fix it and reorder the patches to follow
upstream branch order.

Fixes:
http://autobuild.buildroot.net/results/e1a7691a6528d635c308d7bf47a8be8aa0594190
http://autobuild.buildroot.net/results/23fea2e4d668d69565d5f50493635fc834c54ce1



Signed-off-by: default avatarFabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 6aa6a84d

package/imlib2/0003-imlib2-config-delete-old-reference-to-my_libs.patch

0 → 100644
+28 −0
Original line number Diff line number Diff line 
From 534e736e52b6be0da58397ef05f55d47f3794ea7 Mon Sep 17 00:00:00 2001

From: Mike Frysinger <vapier@gentoo.org>

Date: Sat, 18 Jan 2014 13:56:54 -0500

Subject: [PATCH 3/6] 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.3.1

package/imlib2/0003-fix-X_DISPLAY_MISSING-redefined-warnings-when-X-is-d.patch→package/imlib2/0004-fix-X_DISPLAY_MISSING-redefined-warnings-when-X-is-d.patch

+2 −2
Original line number Diff line number Diff line 
From aaf62d4c605726e6c5f6869bd6834eca03c50d9c Mon Sep 17 00:00:00 2001

From 7fb1a4468b9d0314cffcdd1fd2a156e6f8c5101b Mon Sep 17 00:00:00 2001

From: Mike Frysinger <vapier@gentoo.org>

Date: Mon, 28 Jul 2014 22:59:35 -0400

Subject: [PATCH 3/5] fix X_DISPLAY_MISSING redefined warnings when X is

Subject: [PATCH 4/6] fix X_DISPLAY_MISSING redefined warnings when X is

 disabled



This is set up in config.h by configure, so avoid defining it again.

package/imlib2/0004-do-not-link-with-X-libs-when-X-is-disabled.patch→package/imlib2/0005-do-not-link-with-X-libs-when-X-is-disabled.patch

+2 −2
Original line number Diff line number Diff line 
From c7f6ae523bbe165e50c44c21744f56f6f4b575c5 Mon Sep 17 00:00:00 2001

From 19d568d7a58e88a6e0a43500175d731fb43f97cd Mon Sep 17 00:00:00 2001

From: Mike Frysinger <vapier@gentoo.org>

Date: Mon, 28 Jul 2014 23:01:23 -0400

Subject: [PATCH 4/5] do not link with X libs when X is disabled

Subject: [PATCH 5/6] do not link with X libs when X is disabled



URL: https://bugs.gentoo.org/517670

---

package/imlib2/0005-GIF-loader-Fix-for-libgif-version-5.1.patch→package/imlib2/0006-GIF-loader-Fix-for-libgif-version-5.1.patch

+2 −2
Original line number Diff line number Diff line 
From 8531957235f8702f8bdafac31059812d66e95c23 Mon Sep 17 00:00:00 2001

From aa16abfa6c0198668b6a4e101fde8b42ec9cdb68 Mon Sep 17 00:00:00 2001

From: Heiko Becker <heirecka@exherbo.org>

Date: Mon, 13 Oct 2014 17:41:25 +0200

Subject: [PATCH 5/5] GIF loader: Fix for libgif version 5.1

Subject: [PATCH 6/6] GIF loader: Fix for libgif version 5.1



Summary:

From giflib-5.1.0's NEWS: