mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-08 06:17:07 -08:00
x11-misc/idesk: fix build w/ newer imlib2
Closes: https://bugs.gentoo.org/827478 Closes: https://bugs.gentoo.org/828962 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
@@ -0,0 +1,38 @@
|
||||
https://github.com/antonialoytorrens/idesk/pull/1
|
||||
|
||||
From b13626bbe2669b8a267ad53df93f1060379a462e Mon Sep 17 00:00:00 2001
|
||||
From: Sam James <sam@gentoo.org>
|
||||
Date: Fri, 15 Jul 2022 08:22:12 +0100
|
||||
Subject: [PATCH] build: use pkg-config to find imlib2
|
||||
|
||||
imlib2 1.7.5+ drops imlib2-config, hence pkg-config
|
||||
must now be used to find it.
|
||||
|
||||
Bug: https://bugs.gentoo.org/828962
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -94,19 +94,10 @@ LIBS="$LIBS $Xext_lib"
|
||||
|
||||
dnl Imlib2 detection
|
||||
|
||||
-AC_PATH_GENERIC(imlib2, , [
|
||||
- AC_SUBST(IMLIB_LIBS)
|
||||
- AC_SUBST(IMLIB_CXXFLAGS) ],
|
||||
- AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in the path?
|
||||
- You need Imlib2 to build Idesk. Verify that you have Imlib2-dev))
|
||||
-
|
||||
-dnl the above doesn't work for some reason :/
|
||||
-IMLIB_LIBS=`imlib2-config --libs`
|
||||
-IMLIB_CFLAGS=`imlib2-config --cflags`
|
||||
-AC_SUBST(IMLIB_LIBS)
|
||||
-AC_SUBST(IMLIB_CXXFLAGS)
|
||||
-
|
||||
-CXXFLAGS="$CXXFLAGS $IMLIB_CXXFLAGS"
|
||||
+PKG_PROG_PKG_CONFIG
|
||||
+PKG_CHECK_MODULES([IMLIB], [imlib2 > 1.0])
|
||||
+
|
||||
+CXXFLAGS="$CXXFLAGS $IMLIB_CFLAGS"
|
||||
LIBS="$LIBS $IMLIB_LIBS"
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
MY_P="${PN}-v${PV}"
|
||||
|
||||
inherit autotools
|
||||
|
||||
DESCRIPTION="Utility to place icons on the root window"
|
||||
HOMEPAGE="https://github.com/antonialoytorrens/idesk/"
|
||||
SRC_URI="https://github.com/antonialoytorrens/idesk/releases/download/v1/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/glib
|
||||
dev-libs/libxml2
|
||||
media-libs/freetype
|
||||
media-libs/imlib2[X]
|
||||
media-libs/libart_lgpl
|
||||
x11-libs/libXft
|
||||
x11-libs/gtk+:3
|
||||
x11-libs/pango
|
||||
x11-libs/startup-notification
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="virtual/pkgconfig"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1-use-pkg-config-imlib2.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
sed -i -e 's,/usr/local/,/usr/,' examples/default.lnk || die
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf --enable-libsn
|
||||
}
|
||||
Reference in New Issue
Block a user