diff options
| -rw-r--r-- | nonprism/pidgin/PKGBUILD | 25 | ||||
| -rw-r--r-- | nonprism/pidgin/nonprism.patch | 36 | ||||
| -rw-r--r-- | nonprism/pidgin/pidgin-py3-fixes.patch | 12 |
3 files changed, 19 insertions, 54 deletions
diff --git a/nonprism/pidgin/PKGBUILD b/nonprism/pidgin/PKGBUILD index 4225de74e..ee6072ccf 100644 --- a/nonprism/pidgin/PKGBUILD +++ b/nonprism/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 284792 2016-12-26 09:52:45Z bpiotrowski $ +# $Id: PKGBUILD 290450 2017-03-10 02:57:28Z foutrelis $ # Maintainer (Arch): Evangelos Foutras <evangelos@foutrelis.com> # Contributor (Arch): Ionut Biru <ibiru@archlinux.org> # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> @@ -8,21 +8,21 @@ # Contributor: Márcio Silva <coadde@parabola.nu> pkgname=('pidgin' 'libpurple' 'finch') -pkgver=2.11.0 -pkgrel=2.nonprism1 +pkgver=2.12.0 +pkgrel=1.nonprism1 arch=('i686' 'x86_64' 'armv7h') url="http://pidgin.im/" license=('GPL') makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' 'libidn' 'python' 'hicolor-icon-theme' 'farstream' 'avahi' 'tk' 'ca-certificates' 'intltool' 'networkmanager') -source=(https://downloads.sourceforge.net/project/$pkgname/Pidgin/$pkgver/$pkgname-$pkgver.tar.bz2{,.asc} +source=(https://bitbucket.org/pidgin/main/downloads/$pkgname-$pkgver.tar.bz2{,.asc} pidgin-py3-fixes.patch nonprism.patch) -sha256sums=('f72613440586da3bdba6d58e718dce1b2c310adf8946de66d8077823e57b3333' +sha256sums=('8c3d3536d6d3c971bd433ff9946678af70a0f6aa4e6969cc2a83bb357015b7f8' 'SKIP' - 'e38bd61e0dcfcc2e5761078ea709b92c5bf8d025d5eb1288aa8a550715babb7e' - 'f720dc9aca3191b65cd89828ab7266e06d93203b7f0de9ac6b506227b00b0bc0') + '2ae003adc19c2012186a2efc68163843d2037bdaf7540347185bb872424e18da' + '8156cd8248a1b318d5868c46f49c2d82e916d57ca95b0020eaf4c8a56f4b7c3e') validpgpkeys=('364E2EB38EA6A8D61FB963AD75FE259AA8AC8032') prepare() { @@ -78,15 +78,14 @@ package_pidgin(){ rm "$pkgdir/usr/share/man/man1/finch.1" msg "Removing PRISM images" - rm -v "$pkgdir"/usr/share/pixmaps/pidgin/emblems/{16/aol-client.png,scalable/aol-client.svg} - rm -v "$pkgdir"/usr/share/pixmaps/pidgin/emotes/default/msn{,-away,-busy,_online}.png - rm -v "$pkgdir"/usr/share/pixmaps/pidgin/protocols/{16,22}/google-talk.png - rm -v "$pkgdir"/usr/share/pixmaps/pidgin/protocols/{16,22,48}/{aim,facebook,gadu-gadu,icq,meanwhile,msn,mxit,myspace,novell,yahoo}.png - rm -v "$pkgdir"/usr/share/pixmaps/pidgin/protocols/scalable/{aim,gadu-gadu,google-talk,icq,meanwhile,msn,mxit,novell,yahoo}.svg + rm -v "$pkgdir"/usr/share/pixmaps/pidgin/emblems/{16/aol-client.png,scalable/aol-client.svg} + rm -v "$pkgdir"/usr/share/pixmaps/pidgin/protocols/{16,22}/google-talk.png + rm -v "$pkgdir"/usr/share/pixmaps/pidgin/protocols/{16,22,48}/{aim,facebook,gadu-gadu,icq,meanwhile,novell}.png + rm -v "$pkgdir"/usr/share/pixmaps/pidgin/protocols/scalable/{aim,gadu-gadu,google-talk,icq,meanwhile,novell}.svg msg "Pidgin desktop patching" sed -i "\|Comment\[|d - s|Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more|Supports Jabber/XMPP and more| + s|Supports AIM, Google Talk, Jabber/XMPP, and more|Supports Jabber/XMPP and more| " "$pkgdir"/usr/share/applications/pidgin.desktop } diff --git a/nonprism/pidgin/nonprism.patch b/nonprism/pidgin/nonprism.patch index d57c1ddd8..fd8bbdd8a 100644 --- a/nonprism/pidgin/nonprism.patch +++ b/nonprism/pidgin/nonprism.patch @@ -1,20 +1,21 @@ ---- pidgin-2.10.10.orig/pidgin/gtkutils.c 2014-10-16 22:19:33.000000000 -0200 -+++ pidgin-2.10.10/pidgin/gtkutils.c 2014-10-22 16:16:10.310955981 -0200 -@@ -677,7 +677,6 @@ +diff --git a/pidgin/gtkutils.c b/pidgin/gtkutils.c +index e5a3565b7..f5ca3d0eb 100644 +--- a/pidgin/gtkutils.c ++++ b/pidgin/gtkutils.c +@@ -677,7 +677,6 @@ create_protocols_menu(const char *default_proto_id) GdkPixbuf *pixbuf = NULL; GtkSizeGroup *sg; GList *p; -- const char *gtalk_name = NULL, *facebook_name = NULL; +- const char *gtalk_name = NULL; int i; aop_menu = g_malloc0(sizeof(AopMenu)); -@@ -686,63 +685,12 @@ +@@ -686,39 +685,12 @@ create_protocols_menu(const char *default_proto_id) gtk_widget_show(aop_menu->menu); sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); - if (purple_find_prpl("prpl-jabber")) { - gtalk_name = _("Google Talk"); -- facebook_name = _("Facebook (XMPP)"); - } - for (p = purple_plugins_get_protocols(), i = 0; @@ -46,29 +47,6 @@ - i++; - } - -- if (facebook_name && strcmp(facebook_name, plugin->info->name) < 0) { -- char *filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols", -- "16", "facebook.png", NULL); -- GtkWidget *item; -- -- pixbuf = pidgin_pixbuf_new_from_file(filename); -- g_free(filename); -- -- gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu), -- item = aop_menu_item_new(sg, pixbuf, facebook_name, "prpl-jabber", "protocol")); -- g_object_set_data(G_OBJECT(item), "fakefacebook", GINT_TO_POINTER(1)); -- -- if (pixbuf) -- g_object_unref(pixbuf); -- -- /* libpurple3 compatibility */ -- if (g_strcmp0(default_proto_id, "prpl-facebook-xmpp") == 0) -- aop_menu->default_item = i; -- -- facebook_name = NULL; -- i++; -- } -- pixbuf = pidgin_create_prpl_icon_from_prpl(plugin, PIDGIN_PRPL_ICON_SMALL, NULL); gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu), diff --git a/nonprism/pidgin/pidgin-py3-fixes.patch b/nonprism/pidgin/pidgin-py3-fixes.patch index 1acf25a09..9385e242f 100644 --- a/nonprism/pidgin/pidgin-py3-fixes.patch +++ b/nonprism/pidgin/pidgin-py3-fixes.patch @@ -67,15 +67,3 @@ diff -uprb pidgin-2.10.12.orig/libpurple/purple-remote pidgin-2.10.12/libpurple/ - print output - + print(output) -diff -uprb pidgin-2.10.12.orig/libpurple/purple-url-handler pidgin-2.10.12/libpurple/purple-url-handler ---- pidgin-2.10.12.orig/libpurple/purple-url-handler 2016-01-01 01:19:41.000000000 +0200 -+++ pidgin-2.10.12/libpurple/purple-url-handler 2016-01-02 05:39:43.084532314 +0200 -@@ -249,7 +249,7 @@ def msnim(uri): - - def myim(uri): - protocol = "prpl-myspace" -- print "TODO: send uri: ", uri -+ print("TODO: send uri: %s" % uri) - assert False, "Not implemented" - - def sip(uri): |