mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
x11-plugins/pidgin-libnotify: fix deps, change pkg-config to $PKG_CONF
Signed-off-by: Cristian Othón Martínez Vera <cfuga@cfuga.mx> Part-of: https://github.com/gentoo/gentoo/pull/44930 Closes: https://github.com/gentoo/gentoo/pull/44930 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
committed by
Sam James
parent
b9668c9bdb
commit
92c6bdcfc2
@@ -0,0 +1,48 @@
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -59,11 +59,6 @@
|
||||
fi
|
||||
AC_SUBST(DEBUG_CFLAGS)
|
||||
|
||||
-if test "x$GCC" = "xyes"; then
|
||||
- CFLAGS="$CFLAGS -Wall -g3"
|
||||
-fi
|
||||
-AC_SUBST(CFLAGS)
|
||||
-
|
||||
#
|
||||
# Check for libnotify
|
||||
#
|
||||
@@ -82,6 +82,11 @@
|
||||
AC_SUBST(GTK_LIBS)
|
||||
|
||||
#
|
||||
+# Check for pkg-config before using it
|
||||
+#
|
||||
+PKG_PROG_PKG_CONFIG
|
||||
+
|
||||
+#
|
||||
# Check for libpurple
|
||||
#
|
||||
|
||||
@@ -91,8 +96,8 @@
|
||||
])
|
||||
|
||||
AC_SUBST(LIBPURPLE_CFLAGS)
|
||||
-LIBPURPLE_LIBDIR=`pkg-config --variable=libdir purple`
|
||||
-LIBPURPLE_DATADIR=`pkg-config --variable=datadir purple`
|
||||
+LIBPURPLE_LIBDIR=`$PKG_CONFIG --variable=libdir purple`
|
||||
+LIBPURPLE_DATADIR=`$PKG_CONFIG --variable=datadir purple`
|
||||
AC_SUBST(LIBPURPLE_LIBDIR)
|
||||
AC_SUBST(LIBPURPLE_DATADIR)
|
||||
|
||||
@@ -106,8 +111,8 @@
|
||||
])
|
||||
|
||||
AC_SUBST(PIDGIN_CFLAGS)
|
||||
-PIDGIN_LIBDIR=`pkg-config --variable=libdir pidgin`
|
||||
-PIDGIN_DATADIR=`pkg-config --variable=datadir pidgin`
|
||||
+PIDGIN_LIBDIR=`$PKG_CONFIG --variable=libdir pidgin`
|
||||
+PIDGIN_DATADIR=`$PKG_CONFIG --variable=datadir pidgin`
|
||||
AC_SUBST(PIDGIN_LIBDIR)
|
||||
AC_SUBST(PIDGIN_DATADIR)
|
||||
|
||||
@@ -8,28 +8,36 @@ HOMEPAGE="https://gaim-libnotify.sourceforge.net/"
|
||||
SRC_URI="https://downloads.sourceforge.net/gaim-libnotify/${P}.tar.gz
|
||||
mirror://debian/pool/main/p/${PN}/${PN}_${PV}-4.debian.tar.gz"
|
||||
|
||||
inherit autotools
|
||||
|
||||
LICENSE="GPL-2+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~riscv ~x86"
|
||||
IUSE="nls debug"
|
||||
|
||||
RDEPEND="
|
||||
>=x11-libs/libnotify-0.3.2
|
||||
dev-libs/glib:2
|
||||
net-im/pidgin[gui]
|
||||
x11-libs/gdk-pixbuf:2
|
||||
x11-libs/gtk+:2
|
||||
>=x11-libs/libnotify-0.3.2
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="virtual/pkgconfig"
|
||||
BDEPEND="
|
||||
sys-devel/gettext
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${WORKDIR}/debian/patches"
|
||||
"${FILESDIR}/${P}-libnotify-0.7.patch"
|
||||
"${FILESDIR}/${P}-configure.patch"
|
||||
"${FILESDIR}/${P}-fix-includes.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
sed -i -e '/CFLAGS/s:-g3::' configure || die "sed failed"
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
|
||||
Reference in New Issue
Block a user