From 45a5e9621aff9059059a7aefa2bfdd9dc275722c Mon Sep 17 00:00:00 2001 From: bill-auger Date: Mon, 24 May 2021 10:47:26 -0400 Subject: [pidgin]: upgrade to v2.14.4 --- nonprism/pidgin/PKGBUILD | 20 +++++++++++++++----- nonprism/pidgin/remove-services.patch | 22 ++++------------------ 2 files changed, 19 insertions(+), 23 deletions(-) (limited to 'nonprism') diff --git a/nonprism/pidgin/PKGBUILD b/nonprism/pidgin/PKGBUILD index 255bc75b1..aa11adeca 100644 --- a/nonprism/pidgin/PKGBUILD +++ b/nonprism/pidgin/PKGBUILD @@ -9,12 +9,12 @@ # parabola changes and rationale: -# - remove modules for non-privacy-respecting services +# - remove modules for and artwork non-privacy-respecting services pkgname=('pidgin' 'libpurple' 'finch') -pkgver=2.14.1 -pkgrel=3 +pkgver=2.14.4 +pkgrel=1 pkgrel+=.nonprism1 arch=('x86_64') arch+=('armv7h' 'i686') @@ -25,11 +25,12 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' 'libnsl' 'avahi' 'ca-certificates' 'intltool' 'libnm' 'dbus-glib' 'libgnt' 'libxcrypt') makedepends=(${makedepends[*]/libgadu}) +options=('!emptydirs') source=(https://downloads.sourceforge.net/project/pidgin/Pidgin/$pkgver/$pkgname-$pkgver.tar.bz2{,.asc}) source+=(remove-services.patch) -sha256sums=('f132e18d551117d9e46acce29ba4f40892a86746c366999166a3862b51060780' +sha256sums=('67c1a0104b0624a50100c6d73cd5504d53c9d221922b1b28fa86020531a9904e' 'SKIP') -sha256sums+=('25dd0f14b58939dbf9bcc4b95f1471f2a2438b5c9e5f9aca717d48c337229981') +sha256sums+=('49b54d48ada9008b88c16af0cb059f307a2e90ad81a2d0f9f727cf573784962e') validpgpkeys=('40DE1DC7288FE3F50AB938C548F66AFFD9BDB729') # Gary Kramlich @@ -67,6 +68,7 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --disable-schemas-install \ + --disable-gevolution \ --disable-meanwhile \ --disable-gnutls \ --enable-cyrus-sasl \ @@ -95,6 +97,10 @@ package_pidgin(){ make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES rm "$pkgdir/usr/share/man/man1/finch.1" + + # https://bugs.archlinux.org/task/53770 + # https://bugs.archlinux.org/task/69026 + find "$pkgdir/usr/lib/perl5" -name perllocal.pod -delete } package_libpurple(){ @@ -113,6 +119,10 @@ package_libpurple(){ for _dir in libpurple share/sounds share/ca-certs m4macros po; do make -C "$_dir" DESTDIR="$pkgdir" install done + + # https://bugs.archlinux.org/task/53770 + # https://bugs.archlinux.org/task/69026 + find "$pkgdir/usr/lib/perl5" -name perllocal.pod -delete } package_finch(){ diff --git a/nonprism/pidgin/remove-services.patch b/nonprism/pidgin/remove-services.patch index f7e4e0264..b2a667e43 100644 --- a/nonprism/pidgin/remove-services.patch +++ b/nonprism/pidgin/remove-services.patch @@ -1,5 +1,5 @@ diff --git a/pidgin/gtkutils.c b/pidgin/gtkutils.c -index 8ae28e1..7c94cbf 100644 +index 8a60983..8d2a405 100644 --- a/pidgin/gtkutils.c +++ b/pidgin/gtkutils.c @@ -677,7 +677,6 @@ create_protocols_menu(const char *default_proto_id) @@ -51,7 +51,7 @@ index 8ae28e1..7c94cbf 100644 gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu), diff --git a/pidgin/pixmaps/Makefile.am b/pidgin/pixmaps/Makefile.am -index 8c24469..77f8469 100644 +index 1d5ebe5..77f8469 100644 --- a/pidgin/pixmaps/Makefile.am +++ b/pidgin/pixmaps/Makefile.am @@ -89,7 +89,6 @@ DIALOGS_SCALABLE = \ @@ -70,15 +70,12 @@ index 8c24469..77f8469 100644 emblems/scalable/blocked.svg \ emblems/scalable/bot.svg \ emblems/scalable/external.svg \ -@@ -201,29 +199,17 @@ EMOTES_SMALL_16_SCALABLE = \ - emotes/small/16/scalable/pidgin-emotes.svg +@@ -202,24 +200,16 @@ EMOTES_SMALL_16_SCALABLE = \ PROTOCOLS_16_SCALABLE = \ -- protocols/16/scalable/aim.svg \ protocols/16/scalable/bonjour.svg \ - protocols/16/scalable/gadu-gadu.svg \ - protocols/16/scalable/novell.svg \ -- protocols/16/scalable/icq.svg \ protocols/16/scalable/irc.svg \ protocols/16/scalable/jabber.svg \ - protocols/16/scalable/meanwhile.svg \ @@ -87,28 +84,23 @@ index 8c24469..77f8469 100644 protocols/16/scalable/zephyr.svg PROTOCOLS_16 = \ -- protocols/16/aim.png \ protocols/16/bonjour.png \ - protocols/16/facebook.png \ - protocols/16/gadu-gadu.png \ - protocols/16/google-talk.png \ - protocols/16/novell.png \ -- protocols/16/icq.png \ protocols/16/irc.png \ protocols/16/jabber.png \ - protocols/16/meanwhile.png \ protocols/16/silc.png \ protocols/16/simple.png \ protocols/16/zephyr.png -@@ -250,57 +236,33 @@ ICONS_48 = icons/hicolor/48x48/apps/pidgin.png - ICONS_SCALABLE = icons/hicolor/scalable/apps/pidgin.svg +@@ -247,48 +237,32 @@ ICONS_SCALABLE = icons/hicolor/scalable/apps/pidgin.svg PROTOCOLS_22_SCALABLE = \ -- protocols/22/scalable/aim.svg \ protocols/22/scalable/bonjour.svg \ - protocols/22/scalable/gadu-gadu.svg \ - protocols/22/scalable/novell.svg \ -- protocols/22/scalable/icq.svg \ protocols/22/scalable/irc.svg \ protocols/22/scalable/jabber.svg \ - protocols/22/scalable/meanwhile.svg \ @@ -117,13 +109,11 @@ index 8c24469..77f8469 100644 protocols/22/scalable/zephyr.svg PROTOCOLS_22 = \ -- protocols/22/aim.png \ protocols/22/bonjour.png \ - protocols/22/facebook.png \ - protocols/22/gadu-gadu.png \ - protocols/22/google-talk.png \ - protocols/22/novell.png \ -- protocols/22/icq.png \ protocols/22/irc.png \ protocols/22/jabber.png \ - protocols/22/meanwhile.png \ @@ -132,12 +122,10 @@ index 8c24469..77f8469 100644 protocols/22/zephyr.png PROTOCOLS_48 = \ -- protocols/48/aim.png \ protocols/48/bonjour.png \ - protocols/48/facebook.png \ - protocols/48/gadu-gadu.png \ - protocols/48/novell.png \ -- protocols/48/icq.png \ protocols/48/irc.png \ protocols/48/jabber.png \ - protocols/48/meanwhile.png \ @@ -146,12 +134,10 @@ index 8c24469..77f8469 100644 protocols/48/zephyr.png PROTOCOLS_SCALABLE = \ -- protocols/scalable/aim.svg \ protocols/scalable/bonjour.svg \ - protocols/scalable/gadu-gadu.svg \ - protocols/scalable/google-talk.svg \ - protocols/scalable/novell.svg \ -- protocols/scalable/icq.svg \ protocols/scalable/irc.svg \ protocols/scalable/jabber.svg \ - protocols/scalable/meanwhile.svg \ -- cgit v1.2.3