commit: 92c6bdcfc2a7d9e35caf8486435bf09278bf95e7 Author: Cristian Othón Martínez Vera <cfuga <AT> cfuga <DOT> mx> AuthorDate: Fri Dec 12 16:33:04 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Jan 10 12:53:41 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92c6bdcf
x11-plugins/pidgin-libnotify: fix deps, change pkg-config to $PKG_CONF Signed-off-by: Cristian Othón Martínez Vera <cfuga <AT> 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 <AT> gentoo.org> .../files/pidgin-libnotify-0.14-configure.patch | 48 ++++++++++++++++++++++ .../pidgin-libnotify-0.14-r4.ebuild | 14 +++++-- 2 files changed, 59 insertions(+), 3 deletions(-) diff --git a/x11-plugins/pidgin-libnotify/files/pidgin-libnotify-0.14-configure.patch b/x11-plugins/pidgin-libnotify/files/pidgin-libnotify-0.14-configure.patch new file mode 100644 index 000000000000..cf83b8f9e595 --- /dev/null +++ b/x11-plugins/pidgin-libnotify/files/pidgin-libnotify-0.14-configure.patch @@ -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) + diff --git a/x11-plugins/pidgin-libnotify/pidgin-libnotify-0.14-r4.ebuild b/x11-plugins/pidgin-libnotify/pidgin-libnotify-0.14-r4.ebuild index 39714a0a234f..7d9d45bb3feb 100644 --- a/x11-plugins/pidgin-libnotify/pidgin-libnotify-0.14-r4.ebuild +++ b/x11-plugins/pidgin-libnotify/pidgin-libnotify-0.14-r4.ebuild @@ -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() {
