finch: Fix plugin linking to libpurple

Fixes #95.

diff --git a/packages/finch/bonjour-makefile.patch b/packages/finch/bonjour-makefile.patch
new file mode 100644 (file)
index 0000000..3f907aa
--- /dev/null
+++ b/packages/finch/bonjour-makefile.patch
@@ -0,0 +1,12 @@
+diff -u -r ../pidgin-2.10.12/libpurple/protocols/bonjour/Makefile.in ./libpurple/protocols/bonjour/Makefile.in
+--- ../pidgin-2.10.12/libpurple/protocols/bonjour/Makefile.in  2015-12-31 18:19:51.000000000 -0500
++++ ./libpurple/protocols/bonjour/Makefile.in  2016-05-05 04:28:23.297133517 -0400
+@@ -592,7 +592,7 @@
+       }
+ 
+ libbonjour.la: $(libbonjour_la_OBJECTS) $(libbonjour_la_DEPENDENCIES) $(EXTRA_libbonjour_la_DEPENDENCIES) 
+-      $(AM_V_CCLD)$(libbonjour_la_LINK) $(am_libbonjour_la_rpath) $(libbonjour_la_OBJECTS) $(libbonjour_la_LIBADD) $(LIBS)
++      $(AM_V_CCLD)$(libbonjour_la_LINK) $(am_libbonjour_la_rpath) $(libbonjour_la_OBJECTS) $(libbonjour_la_LIBADD) $(LIBS) -lpurple
+ 
+ mostlyclean-compile:
+       -rm -f *.$(OBJEXT)

diff --git a/packages/finch/build.sh b/packages/finch/build.sh
index e2d8332..f0f9760 100644 (file)
--- a/packages/finch/build.sh
+++ b/packages/finch/build.sh
@@ -1,10 +1,11 @@
 TERMUX_PKG_HOMEPAGE=http://pidgin.im/
 TERMUX_PKG_DESCRIPTION="Text-based multi-protocol instant messaging client"
 TERMUX_PKG_VERSION=2.10.12
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/pidgin/Pidgin/${TERMUX_PKG_VERSION}/pidgin-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_DEPENDS="libgnutls, libxml2, ncurses-ui-libs, glib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-gtkui --disable-gstreamer --disable-vv --disable-idn --disable-meanwhile --disable-avahi --disable-dbus --disable-perl --disable-tcl --without-zephyr --with-ncurses-headers=$TERMUX_PREFIX/include --without-python"
-TERMUX_PKG_RM_AFTER_INSTALL="share/sounds/purple"
+TERMUX_PKG_RM_AFTER_INSTALL="share/sounds/purple lib/purple-2/libmsn.so"
 
 # For arpa:
 CFLAGS="$CFLAGS -isystem $TERMUX_PKG_BUILDER_DIR"

diff --git a/packages/finch/dl.patch b/packages/finch/dl.patch
deleted file mode 100644 (file)
index 4f5044c..0000000
--- a/packages/finch/dl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r ../pidgin-2.10.11/libpurple/plugin.c ./libpurple/plugin.c
---- ../pidgin-2.10.11/libpurple/plugin.c       2014-11-23 11:41:25.000000000 -0500
-+++ ./libpurple/plugin.c       2015-12-17 17:31:41.038378834 -0500
-@@ -254,7 +254,7 @@
-                *
-                * G_MODULE_BIND_LOCAL was added in glib 2.3.3.
-                */
--              plugin->handle = g_module_open(filename, G_MODULE_BIND_LOCAL);
-+              plugin->handle = g_module_open(filename, G_MODULE_BIND_LOCAL/*test*/);
- 
-               if (plugin->handle == NULL)
-               {

diff --git a/packages/finch/gg-makefile.patch b/packages/finch/gg-makefile.patch
new file mode 100644 (file)
index 0000000..c377775
--- /dev/null
+++ b/packages/finch/gg-makefile.patch
@@ -0,0 +1,12 @@
+diff -u -r ../pidgin-2.10.12/libpurple/protocols/gg/Makefile.in ./libpurple/protocols/gg/Makefile.in
+--- ../pidgin-2.10.12/libpurple/protocols/gg/Makefile.in       2015-12-31 18:19:51.000000000 -0500
++++ ./libpurple/protocols/gg/Makefile.in       2016-05-05 04:29:27.412205753 -0400
+@@ -697,7 +697,7 @@
+       }
+ 
+ libgg.la: $(libgg_la_OBJECTS) $(libgg_la_DEPENDENCIES) $(EXTRA_libgg_la_DEPENDENCIES) 
+-      $(AM_V_CCLD)$(libgg_la_LINK) $(am_libgg_la_rpath) $(libgg_la_OBJECTS) $(libgg_la_LIBADD) $(LIBS)
++      $(AM_V_CCLD)$(libgg_la_LINK) $(am_libgg_la_rpath) $(libgg_la_OBJECTS) $(libgg_la_LIBADD) $(LIBS) -lpurple
+ 
+ mostlyclean-compile:
+       -rm -f *.$(OBJEXT)

diff --git a/packages/finch/irc-makefile.patch.disabled b/packages/finch/irc-makefile.patch
similarity index 100%
rename from packages/finch/irc-makefile.patch.disabled
rename to packages/finch/irc-makefile.patch

diff --git a/packages/finch/jabber-makefile.patch b/packages/finch/jabber-makefile.patch
new file mode 100644 (file)
index 0000000..2a706d1
--- /dev/null
+++ b/packages/finch/jabber-makefile.patch
@@ -0,0 +1,16 @@
+diff -u -r ../pidgin-2.10.12/libpurple/protocols/jabber/Makefile.in ./libpurple/protocols/jabber/Makefile.in
+--- ../pidgin-2.10.12/libpurple/protocols/jabber/Makefile.in   2015-12-31 18:19:52.000000000 -0500
++++ ./libpurple/protocols/jabber/Makefile.in   2016-05-05 04:17:05.462969023 -0400
+@@ -649,10 +649,10 @@
+       }
+ 
+ libjabber.la: $(libjabber_la_OBJECTS) $(libjabber_la_DEPENDENCIES) $(EXTRA_libjabber_la_DEPENDENCIES) 
+-      $(AM_V_CCLD)$(libjabber_la_LINK) $(am_libjabber_la_rpath) $(libjabber_la_OBJECTS) $(libjabber_la_LIBADD) $(LIBS)
++      $(AM_V_CCLD)$(libjabber_la_LINK) $(am_libjabber_la_rpath) $(libjabber_la_OBJECTS) $(libjabber_la_LIBADD) $(LIBS) -lpurple
+ 
+ libxmpp.la: $(libxmpp_la_OBJECTS) $(libxmpp_la_DEPENDENCIES) $(EXTRA_libxmpp_la_DEPENDENCIES) 
+-      $(AM_V_CCLD)$(libxmpp_la_LINK) $(am_libxmpp_la_rpath) $(libxmpp_la_OBJECTS) $(libxmpp_la_LIBADD) $(LIBS)
++      $(AM_V_CCLD)$(libxmpp_la_LINK) $(am_libxmpp_la_rpath) $(libxmpp_la_OBJECTS) $(libxmpp_la_LIBADD) $(LIBS) -lpurple
+ 
+ mostlyclean-compile:
+       -rm -f *.$(OBJEXT)

diff --git a/packages/finch/libgnt-gntmain.c.patch b/packages/finch/libgnt-gntmain.c.patch
new file mode 100644 (file)
index 0000000..d01c08e
--- /dev/null
+++ b/packages/finch/libgnt-gntmain.c.patch
@@ -0,0 +1,13 @@
+diff -u -r ../pidgin-2.10.12/finch/libgnt/gntmain.c ./finch/libgnt/gntmain.c
+--- ../pidgin-2.10.12/finch/libgnt/gntmain.c   2015-12-31 18:19:40.000000000 -0500
++++ ./finch/libgnt/gntmain.c   2016-05-05 04:09:16.281843580 -0400
+@@ -493,7 +493,8 @@
+       refresh();
+ 
+ #ifdef ALL_MOUSE_EVENTS
+-      if ((mouse_enabled = gnt_style_get_bool(GNT_STYLE_MOUSE, FALSE)))
++       /* Termux modification: Enable mouse events by default. */
++      if ((mouse_enabled = gnt_style_get_bool(GNT_STYLE_MOUSE, TRUE)))
+               mousemask(ALL_MOUSE_EVENTS | REPORT_MOUSE_POSITION, NULL);
+ #endif
+ 

diff --git a/packages/finch/oscar-makefile.patch b/packages/finch/oscar-makefile.patch
new file mode 100644 (file)
index 0000000..b2015a9
--- /dev/null
+++ b/packages/finch/oscar-makefile.patch
@@ -0,0 +1,20 @@
+diff -u -r ../pidgin-2.10.12/libpurple/protocols/oscar/Makefile.in ./libpurple/protocols/oscar/Makefile.in
+--- ../pidgin-2.10.12/libpurple/protocols/oscar/Makefile.in    2015-12-31 18:19:52.000000000 -0500
++++ ./libpurple/protocols/oscar/Makefile.in    2016-05-05 04:27:46.529665679 -0400
+@@ -652,13 +652,13 @@
+       }
+ 
+ libaim.la: $(libaim_la_OBJECTS) $(libaim_la_DEPENDENCIES) $(EXTRA_libaim_la_DEPENDENCIES) 
+-      $(AM_V_CCLD)$(libaim_la_LINK) $(am_libaim_la_rpath) $(libaim_la_OBJECTS) $(libaim_la_LIBADD) $(LIBS)
++      $(AM_V_CCLD)$(libaim_la_LINK) $(am_libaim_la_rpath) $(libaim_la_OBJECTS) $(libaim_la_LIBADD) $(LIBS) -lpurple
+ 
+ libicq.la: $(libicq_la_OBJECTS) $(libicq_la_DEPENDENCIES) $(EXTRA_libicq_la_DEPENDENCIES) 
+-      $(AM_V_CCLD)$(libicq_la_LINK) $(am_libicq_la_rpath) $(libicq_la_OBJECTS) $(libicq_la_LIBADD) $(LIBS)
++      $(AM_V_CCLD)$(libicq_la_LINK) $(am_libicq_la_rpath) $(libicq_la_OBJECTS) $(libicq_la_LIBADD) $(LIBS) -lpurple
+ 
+ liboscar.la: $(liboscar_la_OBJECTS) $(liboscar_la_DEPENDENCIES) $(EXTRA_liboscar_la_DEPENDENCIES) 
+-      $(AM_V_CCLD)$(liboscar_la_LINK) $(am_liboscar_la_rpath) $(liboscar_la_OBJECTS) $(liboscar_la_LIBADD) $(LIBS)
++      $(AM_V_CCLD)$(liboscar_la_LINK) $(am_liboscar_la_rpath) $(liboscar_la_OBJECTS) $(liboscar_la_LIBADD) $(LIBS) -lpurple
+ 
+ mostlyclean-compile:
+       -rm -f *.$(OBJEXT)

diff --git a/packages/finch/sametime-makefile.patch b/packages/finch/sametime-makefile.patch
new file mode 100644 (file)
index 0000000..15e87d1
--- /dev/null
+++ b/packages/finch/sametime-makefile.patch
@@ -0,0 +1,12 @@
+diff -u -r ../pidgin-2.10.12/libpurple/protocols/sametime/Makefile.in ./libpurple/protocols/sametime/Makefile.in
+--- ../pidgin-2.10.12/libpurple/protocols/sametime/Makefile.in 2015-12-31 18:19:52.000000000 -0500
++++ ./libpurple/protocols/sametime/Makefile.in 2016-05-05 04:55:56.307866256 -0400
+@@ -565,7 +565,7 @@
+       }
+ 
+ libsametime.la: $(libsametime_la_OBJECTS) $(libsametime_la_DEPENDENCIES) $(EXTRA_libsametime_la_DEPENDENCIES) 
+-      $(AM_V_CCLD)$(libsametime_la_LINK) $(am_libsametime_la_rpath) $(libsametime_la_OBJECTS) $(libsametime_la_LIBADD) $(LIBS)
++      $(AM_V_CCLD)$(libsametime_la_LINK) $(am_libsametime_la_rpath) $(libsametime_la_OBJECTS) $(libsametime_la_LIBADD) $(LIBS) -lpurple
+ 
+ mostlyclean-compile:
+       -rm -f *.$(OBJEXT)

diff --git a/packages/finch/silc-makefile.patch b/packages/finch/silc-makefile.patch
new file mode 100644 (file)
index 0000000..d60fef1
--- /dev/null
+++ b/packages/finch/silc-makefile.patch
@@ -0,0 +1,12 @@
+diff -u -r ../pidgin-2.10.12/libpurple/protocols/silc/Makefile.in ./libpurple/protocols/silc/Makefile.in
+--- ../pidgin-2.10.12/libpurple/protocols/silc/Makefile.in     2015-12-31 18:19:52.000000000 -0500
++++ ./libpurple/protocols/silc/Makefile.in     2016-05-05 04:56:33.511264315 -0400
+@@ -582,7 +582,7 @@
+       }
+ 
+ libsilcpurple.la: $(libsilcpurple_la_OBJECTS) $(libsilcpurple_la_DEPENDENCIES) $(EXTRA_libsilcpurple_la_DEPENDENCIES) 
+-      $(AM_V_CCLD)$(libsilcpurple_la_LINK) $(am_libsilcpurple_la_rpath) $(libsilcpurple_la_OBJECTS) $(libsilcpurple_la_LIBADD) $(LIBS)
++      $(AM_V_CCLD)$(libsilcpurple_la_LINK) $(am_libsilcpurple_la_rpath) $(libsilcpurple_la_OBJECTS) $(libsilcpurple_la_LIBADD) $(LIBS) -lpurple
+ 
+ mostlyclean-compile:
+       -rm -f *.$(OBJEXT)

diff --git a/packages/finch/silc10-makefile.patch b/packages/finch/silc10-makefile.patch
new file mode 100644 (file)
index 0000000..498aefa
--- /dev/null
+++ b/packages/finch/silc10-makefile.patch
@@ -0,0 +1,12 @@
+diff -u -r ../pidgin-2.10.12/libpurple/protocols/silc10/Makefile.in ./libpurple/protocols/silc10/Makefile.in
+--- ../pidgin-2.10.12/libpurple/protocols/silc10/Makefile.in   2015-12-31 18:19:52.000000000 -0500
++++ ./libpurple/protocols/silc10/Makefile.in   2016-05-05 04:57:07.446716791 -0400
+@@ -571,7 +571,7 @@
+       }
+ 
+ libsilcpurple.la: $(libsilcpurple_la_OBJECTS) $(libsilcpurple_la_DEPENDENCIES) $(EXTRA_libsilcpurple_la_DEPENDENCIES) 
+-      $(AM_V_CCLD)$(libsilcpurple_la_LINK) $(am_libsilcpurple_la_rpath) $(libsilcpurple_la_OBJECTS) $(libsilcpurple_la_LIBADD) $(LIBS)
++      $(AM_V_CCLD)$(libsilcpurple_la_LINK) $(am_libsilcpurple_la_rpath) $(libsilcpurple_la_OBJECTS) $(libsilcpurple_la_LIBADD) $(LIBS) -lpurple
+ 
+ mostlyclean-compile:
+       -rm -f *.$(OBJEXT)

diff --git a/packages/finch/simple-makefile.patch b/packages/finch/simple-makefile.patch
new file mode 100644 (file)
index 0000000..3e91261
--- /dev/null
+++ b/packages/finch/simple-makefile.patch
@@ -0,0 +1,12 @@
+diff -u -r ../pidgin-2.10.12/libpurple/protocols/simple/Makefile.in ./libpurple/protocols/simple/Makefile.in
+--- ../pidgin-2.10.12/libpurple/protocols/simple/Makefile.in   2015-12-31 18:19:52.000000000 -0500
++++ ./libpurple/protocols/simple/Makefile.in   2016-05-05 04:58:18.813569692 -0400
+@@ -565,7 +565,7 @@
+       }
+ 
+ libsimple.la: $(libsimple_la_OBJECTS) $(libsimple_la_DEPENDENCIES) $(EXTRA_libsimple_la_DEPENDENCIES) 
+-      $(AM_V_CCLD)$(libsimple_la_LINK) $(am_libsimple_la_rpath) $(libsimple_la_OBJECTS) $(libsimple_la_LIBADD) $(LIBS)
++      $(AM_V_CCLD)$(libsimple_la_LINK) $(am_libsimple_la_rpath) $(libsimple_la_OBJECTS) $(libsimple_la_LIBADD) $(LIBS) -lpurple
+ 
+ mostlyclean-compile:
+       -rm -f *.$(OBJEXT)

diff --git a/packages/finch/yahoo-makefile.patch b/packages/finch/yahoo-makefile.patch
new file mode 100644 (file)
index 0000000..dca9b17
--- /dev/null
+++ b/packages/finch/yahoo-makefile.patch
@@ -0,0 +1,20 @@
+diff -u -r ../pidgin-2.10.12/libpurple/protocols/yahoo/Makefile.in ./libpurple/protocols/yahoo/Makefile.in
+--- ../pidgin-2.10.12/libpurple/protocols/yahoo/Makefile.in    2015-12-31 18:19:53.000000000 -0500
++++ ./libpurple/protocols/yahoo/Makefile.in    2016-05-05 04:24:33.584460111 -0400
+@@ -616,13 +616,13 @@
+       }
+ 
+ libyahoo.la: $(libyahoo_la_OBJECTS) $(libyahoo_la_DEPENDENCIES) $(EXTRA_libyahoo_la_DEPENDENCIES) 
+-      $(AM_V_CCLD)$(libyahoo_la_LINK) $(am_libyahoo_la_rpath) $(libyahoo_la_OBJECTS) $(libyahoo_la_LIBADD) $(LIBS)
++      $(AM_V_CCLD)$(libyahoo_la_LINK) $(am_libyahoo_la_rpath) $(libyahoo_la_OBJECTS) $(libyahoo_la_LIBADD) $(LIBS) -lpurple
+ 
+ libyahoojp.la: $(libyahoojp_la_OBJECTS) $(libyahoojp_la_DEPENDENCIES) $(EXTRA_libyahoojp_la_DEPENDENCIES) 
+-      $(AM_V_CCLD)$(libyahoojp_la_LINK) $(am_libyahoojp_la_rpath) $(libyahoojp_la_OBJECTS) $(libyahoojp_la_LIBADD) $(LIBS)
++      $(AM_V_CCLD)$(libyahoojp_la_LINK) $(am_libyahoojp_la_rpath) $(libyahoojp_la_OBJECTS) $(libyahoojp_la_LIBADD) $(LIBS) -lpurple
+ 
+ libymsg.la: $(libymsg_la_OBJECTS) $(libymsg_la_DEPENDENCIES) $(EXTRA_libymsg_la_DEPENDENCIES) 
+-      $(AM_V_CCLD)$(libymsg_la_LINK) $(am_libymsg_la_rpath) $(libymsg_la_OBJECTS) $(libymsg_la_LIBADD) $(LIBS)
++      $(AM_V_CCLD)$(libymsg_la_LINK) $(am_libymsg_la_rpath) $(libymsg_la_OBJECTS) $(libymsg_la_LIBADD) $(LIBS) -lpurple
+ 
+ mostlyclean-compile:
+       -rm -f *.$(OBJEXT)