From b9ad890e4c91d8b70cfb524980ed4ce4d613faee Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Fri, 2 Jul 2021 18:33:21 +0200 Subject: [PATCH] libpurple, bump version (#6027) --- dev-libs/libpurple/libpurple-2.12.0.recipe | 151 ------------------ ...-2.13.0.recipe => libpurple-2.14.5.recipe} | 69 ++++---- ...3.0.patchset => libpurple-2.14.5.patchset} | 0 3 files changed, 39 insertions(+), 181 deletions(-) delete mode 100644 dev-libs/libpurple/libpurple-2.12.0.recipe rename dev-libs/libpurple/{libpurple-2.13.0.recipe => libpurple-2.14.5.recipe} (79%) rename dev-libs/libpurple/patches/{libpurple-2.13.0.patchset => libpurple-2.14.5.patchset} (100%) diff --git a/dev-libs/libpurple/libpurple-2.12.0.recipe b/dev-libs/libpurple/libpurple-2.12.0.recipe deleted file mode 100644 index d0074d332..000000000 --- a/dev-libs/libpurple/libpurple-2.12.0.recipe +++ /dev/null @@ -1,151 +0,0 @@ -SUMMARY="A library for IM communication" -DESCRIPTION="libpurple is a library for IM communication used by many open \ -source IM clients. It implements a variety of protocols, for example IRC, \ -Jabber or ICQ." -HOMEPAGE="https://pidgin.im/" -COPYRIGHT="1998-2015 Rob Flynn et al." -LICENSE="GNU GPL v2" -REVISION="3" -SOURCE_URI="http://downloads.sourceforge.net/project/pidgin/Pidgin/$portVersion/pidgin-$portVersion.tar.bz2" -CHECKSUM_SHA256="8c3d3536d6d3c971bd433ff9946678af70a0f6aa4e6969cc2a83bb357015b7f8" -SOURCE_DIR="pidgin-$portVersion" - -ARCHITECTURES="!x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - libpurple$secondaryArchSuffix = $portVersion - lib:libgnt$secondaryArchSuffix = $portVersion - lib:libpurple$secondaryArchSuffix = $portVersion - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libffi$secondaryArchSuffix - lib:libfreebl3$secondaryArchSuffix - lib:libglib_2.0$secondaryArchSuffix - lib:libgmodule_2.0$secondaryArchSuffix - lib:libgobject_2.0$secondaryArchSuffix - lib:libgthread_2.0$secondaryArchSuffix - lib:libiconv$secondaryArchSuffix - lib:libidn$secondaryArchSuffix - lib:libintl$secondaryArchSuffix - lib:libncursesw$secondaryArchSuffix - lib:libnspr4$secondaryArchSuffix - lib:libnss3$secondaryArchSuffix - lib:libnss3$secondaryArchSuffix - lib:libnssckbi$secondaryArchSuffix - lib:libnssdbm3$secondaryArchSuffix - lib:libnssutil3$secondaryArchSuffix - lib:libpanelw$secondaryArchSuffix - lib:libperl$secondaryArchSuffix - lib:libpython2.7$secondaryArchSuffix - lib:libsmime3$secondaryArchSuffix - lib:libsoftokn3$secondaryArchSuffix - lib:libssl$secondaryArchSuffix - lib:libssl3$secondaryArchSuffix - lib:libxml2$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " - -PROVIDES_devel=" - libpurple${secondaryArchSuffix}_devel = $portVersion - devel:libgnt$secondaryArchSuffix = $portVersion - devel:libpurple$secondaryArchSuffix = $portVersion - " -REQUIRES_devel=" - haiku${secondaryArchSuffix}_devel - libpurple$secondaryArchSuffix == $portVersion base - " - -PROVIDES_finch=" - libpurple${secondaryArchSuffix}_finch = $portVersion - cmd:finch$secondaryArchSuffix - " -REQUIRES_finch=" - haiku${secondaryArchSuffix} - libpurple$secondaryArchSuffix == $portVersion base - lib:libffi$secondaryArchSuffix - lib:libglib_2.0$secondaryArchSuffix - lib:libgmodule_2.0$secondaryArchSuffix - lib:libgobject_2.0$secondaryArchSuffix - lib:libgthread_2.0$secondaryArchSuffix - lib:libiconv$secondaryArchSuffix - lib:libidn$secondaryArchSuffix - lib:libintl$secondaryArchSuffix - lib:libncurses$secondaryArchSuffix - lib:libpython2.7$secondaryArchSuffix - lib:libxml2$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libfreebl3$secondaryArchSuffix - devel:libglib_2.0$secondaryArchSuffix - devel:libgmodule_2.0$secondaryArchSuffix - devel:libgobject_2.0$secondaryArchSuffix - devel:libgthread_2.0$secondaryArchSuffix - devel:libidn$secondaryArchSuffix - devel:libncurses$secondaryArchSuffix - devel:libnspr4$secondaryArchSuffix - devel:libnss3$secondaryArchSuffix - devel:libnss3$secondaryArchSuffix - devel:libnssckbi$secondaryArchSuffix - devel:libnssdbm3$secondaryArchSuffix - devel:libnssutil3$secondaryArchSuffix - devel:libsmime3$secondaryArchSuffix - devel:libsoftokn3$secondaryArchSuffix - devel:libssl$secondaryArchSuffix - devel:libssl3$secondaryArchSuffix - devel:libxml2$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:automake - cmd:awk - cmd:gcc$secondaryArchSuffix - cmd:gettext - cmd:intltool_update - cmd:libtoolize$secondaryArchSuffix - cmd:make - cmd:pkg_config$secondaryArchSuffix - cmd:python2 - cmd:sed - " - -PATCH() -{ - sed -i 's/resolv/network/g' configure.ac -} - -BUILD() -{ - autoreconf -fi - CFLAGS="-D__SVR4 -D__sun -D_XPG5 -D_BSD_SOURCE" \ - LDFLAGS="-lbsd" \ - runConfigure ./configure \ - --disable-gtkui --disable-screensaver \ - --disable-meanwhile --disable-dbus --disable-gstreamer --disable-vv \ - --disable-avahi --disable-gnutls --disable-tcl -enable-textui \ - --with-nspr-includes=$(finddir B_SYSTEM_HEADERS_DIRECTORY)/${secondaryArchSubDir} \ - --with-nspr-libs=$(finddir B_SYSTEM_LIB_DIRECTORY)/${secondaryArchSubDir} \ - --with-nss-includes=$(finddir B_SYSTEM_HEADERS_DIRECTORY)/${secondaryArchSubDir}/nss \ - --with-nss-libs=$(finddir B_SYSTEM_LIB_DIRECTORY)/${secondaryArchSubDir} \ - --with-ncurses-headers=$(finddir B_SYSTEM_HEADERS_DIRECTORY)/${secondaryArchSubDir} \ - --disable-dependency-tracking - make $jobArgs -} - -INSTALL() -{ - make install - - rm -rf $prefix/share $libDir/lib*.la - - packageEntries finch $binDir - - prepareInstalledDevelLib libpurple - prepareInstalledDevelLib libgnt - packageEntries devel $developDir -} diff --git a/dev-libs/libpurple/libpurple-2.13.0.recipe b/dev-libs/libpurple/libpurple-2.14.5.recipe similarity index 79% rename from dev-libs/libpurple/libpurple-2.13.0.recipe rename to dev-libs/libpurple/libpurple-2.14.5.recipe index 089cf75b7..caff42554 100644 --- a/dev-libs/libpurple/libpurple-2.13.0.recipe +++ b/dev-libs/libpurple/libpurple-2.14.5.recipe @@ -4,25 +4,22 @@ source IM clients. It implements a variety of protocols, for example IRC, \ Jabber or ICQ." HOMEPAGE="https://pidgin.im/" LICENSE="GNU GPL v2" -REVISION="5" +REVISION="1" SOURCE_URI="http://downloads.sourceforge.net/project/pidgin/Pidgin/$portVersion/pidgin-$portVersion.tar.bz2" -CHECKSUM_SHA256="2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f" +CHECKSUM_SHA256="26db80d2a3c1e740952757bd53c15b8fc8dd780dc8819a74b53b2ef3bfaf041f" COPYRIGHT="1998-2018 Rob Flynn et al." SOURCE_DIR="pidgin-$portVersion" PATCHES="libpurple-$portVersion.patchset" -ARCHITECTURES="!x86_gcc2 x86 x86_64" +ARCHITECTURES="!x86_gcc2 x86_64" SECONDARY_ARCHITECTURES="x86" -libpurpleVersion=0.13.0 -libgntVersion=0.8.10 -libpurpleVersionCompat="$libpurpleVersion compat >= ${libpurpleVersion%%.*}" -libgntVersionCompat="$libgntVersion compat >= ${libgntVersion%%.*}" +libVersion=0.14.5 +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" libpurple$secondaryArchSuffix = $portVersion - lib:libgnt$secondaryArchSuffix = $libgntVersionCompat - lib:libpurple$secondaryArchSuffix = $libpurpleVersionCompat + lib:libpurple$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -30,6 +27,7 @@ REQUIRES=" lib:libfreebl3$secondaryArchSuffix lib:libglib_2.0$secondaryArchSuffix lib:libgmodule_2.0$secondaryArchSuffix + lib:libgnt$secondaryArchSuffix lib:libgobject_2.0$secondaryArchSuffix lib:libgthread_2.0$secondaryArchSuffix lib:libiconv$secondaryArchSuffix @@ -42,24 +40,26 @@ REQUIRES=" lib:libnssdbm3$secondaryArchSuffix lib:libnssutil3$secondaryArchSuffix lib:libpanelw$secondaryArchSuffix - lib:libperl$secondaryArchSuffix - lib:libpython2.7$secondaryArchSuffix +# lib:libperl$secondaryArchSuffix lib:libsmime3$secondaryArchSuffix lib:libsoftokn3$secondaryArchSuffix + lib:libpython3.7m$secondaryArchSuffix + lib:libsasl2$secondaryArchSuffix lib:libssl$secondaryArchSuffix lib:libssl3$secondaryArchSuffix lib:libxml2$secondaryArchSuffix lib:libz$secondaryArchSuffix " + PROVIDES_devel=" libpurple${secondaryArchSuffix}_devel = $portVersion - devel:libgnt$secondaryArchSuffix = $libgntVersionCompat - devel:libpurple$secondaryArchSuffix = $libpurpleVersionCompat + devel:libpurple$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" haiku${secondaryArchSuffix}_devel libpurple$secondaryArchSuffix == $portVersion base " + PROVIDES_finch=" libpurple${secondaryArchSuffix}_finch = $portVersion cmd:finch$secondaryArchSuffix @@ -70,24 +70,28 @@ REQUIRES_finch=" lib:libffi$secondaryArchSuffix lib:libglib_2.0$secondaryArchSuffix lib:libgmodule_2.0$secondaryArchSuffix + lib:libgnt$secondaryArchSuffix lib:libgobject_2.0$secondaryArchSuffix lib:libgthread_2.0$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libidn$secondaryArchSuffix lib:libintl$secondaryArchSuffix lib:libncurses$secondaryArchSuffix - lib:libpython2.7$secondaryArchSuffix + lib:libpanelw$secondaryArchSuffix lib:libxml2$secondaryArchSuffix lib:libz$secondaryArchSuffix " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libfreebl3$secondaryArchSuffix devel:libglib_2.0$secondaryArchSuffix devel:libgmodule_2.0$secondaryArchSuffix + devel:libgnt$secondaryArchSuffix devel:libgobject_2.0$secondaryArchSuffix devel:libgthread_2.0$secondaryArchSuffix devel:libidn$secondaryArchSuffix + devel:libintl$secondaryArchSuffix devel:libncurses$secondaryArchSuffix devel:libnspr4$secondaryArchSuffix devel:libnss3$secondaryArchSuffix @@ -96,6 +100,8 @@ BUILD_REQUIRES=" devel:libnssutil3$secondaryArchSuffix devel:libsmime3$secondaryArchSuffix devel:libsoftokn3$secondaryArchSuffix + devel:libpython3.7m$secondaryArchSuffix + devel:libsasl2$secondaryArchSuffix devel:libssl$secondaryArchSuffix devel:libssl3$secondaryArchSuffix devel:libxml2$secondaryArchSuffix @@ -109,7 +115,6 @@ BUILD_PREREQUIRES=" cmd:libtoolize$secondaryArchSuffix cmd:make cmd:pkg_config$secondaryArchSuffix - cmd:python2 cmd:sed " @@ -119,30 +124,34 @@ PATCH() } defineDebugInfoPackage libpurple$secondaryArchSuffix \ - "$libDir"/libpurple.so.$libpurpleVersion \ - "$libDir"/libgnt.so.$libgntVersion + "$libDir"/libpurple.so.$libVersion BUILD() { - autoreconf -fi + autoreconf -vfi CPPFLAGS="-D_BSD_SOURCE" \ LIBS="-lbsd" \ runConfigure ./configure \ - --disable-gtkui \ - --disable-screensaver \ - --disable-meanwhile \ - --disable-dbus \ - --disable-gstreamer \ - --disable-vv \ --disable-avahi \ + --disable-dbus \ + --disable-dependency-tracking \ --disable-gnutls \ + --disable-gstreamer \ + --disable-gtkui \ + --disable-meanwhile \ + --disable-schemas-install \ + --disable-screensaver \ --disable-tcl \ - --enable-textui \ + --disable-vv \ + --enable-consoleui \ + --enable-cyrus-sasl \ --with-nspr-includes=$(finddir B_SYSTEM_HEADERS_DIRECTORY)/${secondaryArchSubDir} \ --with-nspr-libs=$(finddir B_SYSTEM_LIB_DIRECTORY)/${secondaryArchSubDir} \ --with-nss-includes=$(finddir B_SYSTEM_HEADERS_DIRECTORY)/${secondaryArchSubDir}/nss \ --with-nss-libs=$(finddir B_SYSTEM_LIB_DIRECTORY)/${secondaryArchSubDir} \ - --with-ncurses-headers=$(finddir B_SYSTEM_HEADERS_DIRECTORY)/${secondaryArchSubDir} + --with-ncurses-headers=$(finddir B_SYSTEM_HEADERS_DIRECTORY)/${secondaryArchSubDir} \ + --with-system-ssl-certs=$(finddir B_SYSTEM_DATA_DIRECTORY)/ssl/certs \ + --with-python3=$(finddir B_SYSTEM_HEADERS_DIRECTORY)/python3.7m make $jobArgs } @@ -157,15 +166,15 @@ INSTALL() $libDir/purple-2/*.la \ $libDir/lib*.la + prepareInstalledDevelLib libpurple fixPkgconfig + packageEntries devel \ + $developDir + packageEntries finch \ $binDir \ $manDir - - prepareInstalledDevelLibs libpurple libgnt - - packageEntries devel $developDir } TEST() diff --git a/dev-libs/libpurple/patches/libpurple-2.13.0.patchset b/dev-libs/libpurple/patches/libpurple-2.14.5.patchset similarity index 100% rename from dev-libs/libpurple/patches/libpurple-2.13.0.patchset rename to dev-libs/libpurple/patches/libpurple-2.14.5.patchset