haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

libpurple: bump to version 2.14.14, cleanup (#13496)

Browse Source 
* use $commandBinDir for cmd:finch
 * move aclocal to the devel package
 * use make pure_install for the perl module to not install perllocal.pod
 * move finch libraries to finch package, add finch_devel package
This commit is contained in:
Joachim Mairböck
2025-12-27 18:11:35 +01:00
committed by GitHub
parent 981e533b12
commit 8e9ee5923b
2 changed files with 57 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
dev-libs/libpurple/libpurple-2.14.13.recipe → dev-libs/libpurple/libpurple-2.14.14.recipe
View File

@@ -6,14 +6,21 @@ HOMEPAGE="https://pidgin.im/"
COPYRIGHT="1998-2024 Rob Flynn et al."
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="http://downloads.sourceforge.net/project/pidgin/Pidgin/$portVersion/pidgin-$portVersion.tar.bz2"
CHECKSUM_SHA256="120049dc8e17e09a2a7d256aff2191ff8491abb840c8c7eb319a161e2df16ba8"
SOURCE_URI="https://downloads.sourceforge.net/project/pidgin/Pidgin/$portVersion/pidgin-$portVersion.tar.bz2"
CHECKSUM_SHA256="0ffc9994def10260f98a55cd132deefa8dc4a9835451cc0e982747bd458e2356"
SOURCE_DIR="pidgin-$portVersion"
PATCHES="libpurple-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
commandSuffix=$secondaryArchSuffix
commandBinDir=$binDir
if [ "$targetArchitecture" = x86_gcc2 ]; then
commandSuffix=
commandBinDir=$prefix/bin
fi
libVersionVar="`echo "$portVersion" | cut -b3-7`"
libVersion=0.${libVersionVar}
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
@@ -66,7 +73,7 @@ REQUIRES_devel="
PROVIDES_finch="
libpurple${secondaryArchSuffix}_finch = $portVersion
cmd:finch$secondaryArchSuffix
cmd:finch$commandSuffix
"
REQUIRES_finch="
haiku${secondaryArchSuffix}
@@ -86,6 +93,15 @@ REQUIRES_finch="
lib:libz$secondaryArchSuffix
"
PROVIDES_finch_devel="
libpurple${secondaryArchSuffix}_finch_devel = $portVersion
devel:finch$secondaryArchSuffix # this isn't a real library
"
REQUIRES_finch_devel="
haiku${secondaryArchSuffix}_devel
libpurple${secondaryArchSuffix}_finch == $portVersion base
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libfreebl3$secondaryArchSuffix
@@ -135,7 +151,8 @@ BUILD()
autoreconf -vfi
CPPFLAGS="-D_BSD_SOURCE" \
LIBS="-lbsd" \
runConfigure ./configure \
runConfigure --omit-dirs "binDir" ./configure \
--bindir=$commandBinDir \
--disable-avahi \
--disable-dbus \
--disable-dependency-tracking \
@@ -168,7 +185,6 @@ INSTALL()
rm -rf $prefix/share
rm -f \
$libDir/finch/*.la \
$libDir/gnt/*.la \
$libDir/purple-2/*.la \
$libDir/lib*.la
@@ -177,11 +193,17 @@ INSTALL()
prepareInstalledDevelLib libpurple
fixPkgconfig
packageEntries finch_devel \
$developLibDir/pkgconfig/finch.pc \
$includeDir/finch
packageEntries devel \
$developDir
$developDir \
$dataDir/aclocal
packageEntries finch \
$binDir \
$commandBinDir \
$libDir/finch \
$manDir
}

31
dev-libs/libpurple/patches/libpurple-2.14.13.patchset → dev-libs/libpurple/patches/libpurple-2.14.14.patchset
View File

@@ -1,4 +1,4 @@
From 1802b78b8901506a4efa58276e6bf8f59e4e33d2 Mon Sep 17 00:00:00 2001
From 954e7f0f7be2363ca0e06ff22365eaf04a3b3b6a Mon Sep 17 00:00:00 2001
From: Peppersawce <michaelpeppers89@yahoo.it>
Date: Mon, 30 Sep 2024 16:06:57 +0200
Subject: Set correct settings folder
@@ -18,7 +18,7 @@ index 9f6cc08..ee94d7b 100644
purple_buddy_icons_set_account_icon(ret, (guchar*)contents, len);
}
diff --git a/libpurple/util.c b/libpurple/util.c
index fa650c2..ecd2fd9 100644
index fa650c2..2d29d2a 100644
--- a/libpurple/util.c
+++ b/libpurple/util.c
@@ -2568,7 +2568,7 @@ const char *
@@ -40,5 +40,30 @@ index fa650c2..ecd2fd9 100644
return user_dir;
}
--
2.45.2
2.52.0
From 2871854c76327bb2926ce3a1afbeb7a72a8e10ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
Date: Sat, 27 Dec 2025 09:48:55 +0100
Subject: use make pure_install to install the perl module
This avoids installing perllocal.pod, which is useless and wrong in a packaged
installation.
diff --git a/libpurple/plugins/perl/Makefile.am b/libpurple/plugins/perl/Makefile.am
index 142f73b..b7e938d 100644
--- a/libpurple/plugins/perl/Makefile.am
+++ b/libpurple/plugins/perl/Makefile.am
@@ -118,7 +118,7 @@ all-local: common/Makefile
install-exec-local:
@for dir in $(perl_dirs); do \
cd $$dir; \
- $(MAKE) install; \
+ $(MAKE) pure_install; \
cd ..; \
done
--
2.52.0