From 3d40ec8b1585c464593bc92e55b1fccd9aff7419 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Wed, 6 Jan 2021 00:30:34 +0200 Subject: [PATCH 1/2] New package: libgnt-2.14.0. --- srcpkgs/libgnt | 1 - srcpkgs/libgnt-devel | 2 +- srcpkgs/libgnt/template | 24 ++++++++++++++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) delete mode 120000 srcpkgs/libgnt create mode 100644 srcpkgs/libgnt/template diff --git a/srcpkgs/libgnt b/srcpkgs/libgnt deleted file mode 120000 index d5dc3b19c84..00000000000 --- a/srcpkgs/libgnt +++ /dev/null @@ -1 +0,0 @@ -pidgin \ No newline at end of file diff --git a/srcpkgs/libgnt-devel b/srcpkgs/libgnt-devel index d5dc3b19c84..28acf62a72a 120000 --- a/srcpkgs/libgnt-devel +++ b/srcpkgs/libgnt-devel @@ -1 +1 @@ -pidgin \ No newline at end of file +libgnt \ No newline at end of file diff --git a/srcpkgs/libgnt/template b/srcpkgs/libgnt/template new file mode 100644 index 00000000000..912ca999812 --- /dev/null +++ b/srcpkgs/libgnt/template @@ -0,0 +1,24 @@ +# Template file for 'libgnt' +pkgname=libgnt +version=2.14.0 +revision=1 +build_style=meson +hostmakedepends="gobject-introspection pkg-config" +makedepends="libxml2-devel ncurses-devel python3-devel glib-devel gtk-doc" +short_desc="GLib Ncurses Toolkit" +maintainer="mobinmob " +license="GPL-2.0-or-later" +homepage="https://keep.imfreedom.org/libgnt/" +distfiles="${SOURCEFORGE_SITE}/pidgin/libgnt/${version}/libgnt-${version}.tar.xz" +checksum=6b7ea2030c9755ad9756ab4b1d3396dccaef4a712eccce34d3990042bb4b3abf + + +libgnt-devel_package() { + depends="libglib-devel libgnt>=${version}_${revision}" + short_desc="IM library extracted from Pidgin (GNT) - development files" + pkg_install() { + vmove usr/include/gnt + vmove usr/lib/pkgconfig/gnt.pc + vmove usr/lib/libgnt.so + } +} From 6cd11409a71e7a892413a51290abd76a9bdbe673 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Wed, 6 Jan 2021 00:30:45 +0200 Subject: [PATCH 2/2] pidgin: update to 2.14.1. --- .../patches/01-configure_ac-libnm_pc.patch | 11 ------- .../patches/02-libpurple-nm_state.patch | 19 ------------ srcpkgs/pidgin/template | 29 +++++-------------- 3 files changed, 7 insertions(+), 52 deletions(-) delete mode 100644 srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch delete mode 100644 srcpkgs/pidgin/patches/02-libpurple-nm_state.patch diff --git a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch deleted file mode 100644 index 0bc02926559..00000000000 --- a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac 2018-03-08 07:22:25.000000000 +0100 -+++ configure.ac 2020-02-11 04:14:37.777681920 +0100 -@@ -1428,7 +1428,7 @@ - dnl Check for NetworkManager.h; if we don't have it, oh well - if test "x$enable_dbus" = "xyes" ; then - if test "x$enable_nm" = "xyes" ; then -- PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [ -+ PKG_CHECK_MODULES(NETWORKMANAGER, [libnm >= 0.5.0], [ - AC_SUBST(NETWORKMANAGER_CFLAGS) - AC_SUBST(NETWORKMANAGER_LIBS) - AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.]) diff --git a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch deleted file mode 100644 index 802d64b89f2..00000000000 --- a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- libpurple/network.c 2018-03-06 07:00:49.000000000 +0100 -+++ libpurple/network.c 2020-02-11 04:30:20.163644344 +0100 -@@ -939,8 +939,16 @@ - #if NM_CHECK_VERSION(0,8,992) - case NM_STATE_DISCONNECTING: - #endif -+#if NM_CHECK_VERSION(0,8,992) -+ if (prev != NM_STATE_CONNECTED_LOCAL && -+ prev != NM_STATE_CONNECTED_SITE && -+ prev != NM_STATE_CONNECTED_GLOBAL && -+ prev != NM_STATE_UNKNOWN) -+ break; -+#else - if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN) - break; -+#endif - if (ui_ops != NULL && ui_ops->network_disconnected != NULL) - ui_ops->network_disconnected(); - break; diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template index a2668cf685e..6a6d7d447b5 100644 --- a/srcpkgs/pidgin/template +++ b/srcpkgs/pidgin/template @@ -1,12 +1,12 @@ # Template file for 'pidgin' pkgname=pidgin -version=2.13.0 -revision=3 +version=2.14.1 +revision=1 build_style=gnu-configure configure_args="--disable-schemas-install --disable-meanwhile --enable-cyrus-sasl --disable-doxygen --enable-nm --enable-vv --with-system-ssl-certs=/etc/ssl/certs --disable-tk --disable-tcl - --disable-gnutls --disable-perl + --disable-gnutls --disable-perl --enable-consoleui --with-ncurses-headers=${XBPS_CROSS_BASE}/usr/include --with-avahi-client-includes=${XBPS_CROSS_BASE}/usr/include --with-avahi-client-libs=${XBPS_CROSS_BASE}/usr/lib" @@ -15,7 +15,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://pidgin.im/" distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2" -checksum=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f +checksum=f132e18d551117d9e46acce29ba4f40892a86746c366999166a3862b51060780 python_version=2 #unverified lib32disabled=yes @@ -24,7 +24,7 @@ makedepends="libglib-devel gtk+-devel libXext-devel libXScrnSaver-devel gtkspell-devel startup-notification-devel ncurses-devel libxml2-devel gst-plugins-base1-devel libidn-devel python-devel avahi-glib-libs-devel dbus-glib-devel NetworkManager-devel nss-devel - libsasl-devel libSM-devel farstream-devel" + libsasl-devel libSM-devel farstream-devel libgnt-devel" depends="cyrus-sasl-modules gst-plugins-good1" CFLAGS="-Wno-deprecated-declarations" @@ -34,6 +34,7 @@ pre_configure() { } post_install() { rm -rf ${DESTDIR}/etc/gconf + } libpurple_package() { @@ -55,23 +56,7 @@ libpurple-devel_package() { vmove usr/share/aclocal/purple.m4 } } -libgnt_package() { - short_desc="IM library extracted from Pidgin (GNT)" - pkg_install() { - vmove "usr/lib/libgnt*.so*" - vmove usr/lib/finch - vmove usr/lib/gnt - } -} -libgnt-devel_package() { - depends="libglib-devel libgnt>=${version}_${revision}" - short_desc="IM library extracted from Pidgin (GNT) - development files" - pkg_install() { - vmove usr/include/gnt - vmove usr/lib/pkgconfig/gnt.pc - vmove usr/lib/libgnt.so - } -} + finch_package() { short_desc="Ncurses-based messaging client" pkg_install() {