Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
15548811 Incomplete pidgin instant messenger port, finch is missing
authorRich Burridge <rich.burridge@oracle.com>
Tue, 06 Sep 2016 15:11:54 -0700
changeset 6730 350ea6c4ff56
parent 6727 59610a35f7fc
child 6731 d80c638073cb
15548811 Incomplete pidgin instant messenger port, finch is missing
components/desktop/pidgin/Makefile file | annotate | diff | comparison | revisions
components/desktop/pidgin/patches/pidgin-21-correct-libpanel.patch file | annotate | diff | comparison | revisions
components/desktop/pidgin/pidgin.p5m file | annotate | diff | comparison | revisions 
--- a/components/desktop/pidgin/Makefile	Fri Sep 02 16:31:53 2016 -0700
+++ b/components/desktop/pidgin/Makefile	Tue Sep 06 15:11:54 2016 -0700
@@ -79,11 +79,31 @@
 CONFIGURE_OPTIONS +=	--enable-cap
 CONFIGURE_OPTIONS +=	--disable-meanwhile
 CONFIGURE_OPTIONS +=	--disable-nm
-CONFIGURE_OPTIONS +=	--disable-consoleui
+CONFIGURE_OPTIONS +=	--enable-consoleui
+CONFIGURE_OPTIONS +=	--with-ncurses-headers=/usr/include/ncurses
 CONFIGURE_OPTIONS +=	--disable-vv
 # 23200148 undo this once 23169155 Move developer/gnome/gettext to Userland
 CONFIGURE_OPTIONS +=	INTLTOOL_MERGE="$(PERL) /usr/bin/intltool-merge"
 
+# We have two implementations of libcurses in Solaris. finch needs to use the
+# ncurses one. The curses implementations in turn, use libpanel, but the
+# ncurses one is under /usr/gnu/lib. To make sure that it correctly uses that
+# one, and not the one under /usr/lib, we need to remove all occurences of
+# -L/usr/lib/$(MACH64), -L/usr/lib, -L/lib/$(MACH64) and -L/lib from all
+# Makefiles.
+COMPONENT_POST_CONFIGURE_ACTION = \
+	(cd $(@D) ; \
+	mlist=`/usr/bin/find . -name 'Makefile'` ; \
+	echo $$mlist ; \
+	for f in $$mlist ; do \
+		$(GSED) -i \
+			-e 's|-L/usr/lib/$(MACH64) ||g' \
+			-e 's|-L/usr/lib ||g' \
+			-e 's|-L/lib/$(MACH64) ||g' \
+			-e 's|-L/lib ||g' \
+			$$f ; \
+        done)
+
 # Always show the build and link lines for easier debugging.
 COMPONENT_BUILD_ARGS +=	V=1
 
@@ -106,6 +126,7 @@
 REQUIRED_PACKAGES += library/gnome/gnome-keyring
 REQUIRED_PACKAGES += library/libidn
 REQUIRED_PACKAGES += library/libxml2
+REQUIRED_PACKAGES += library/ncurses
 REQUIRED_PACKAGES += library/nspr
 REQUIRED_PACKAGES += library/perl-5/xml-parser
 REQUIRED_PACKAGES += library/python/python-dbus-27
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/pidgin/patches/pidgin-21-correct-libpanel.patch	Tue Sep 06 15:11:54 2016 -0700
@@ -0,0 +1,15 @@
+The libgnt library needs to be linked against the GNU version of libpanel.
+
+This patch should be send upstream when sanitized into an acceptable form.
+
+--- pidgin-2.11.0/configure.ac.orig	2016-09-02 14:27:14.528745431 +0000
++++ pidgin-2.11.0/configure.ac	2016-09-02 14:28:33.444799880 +0000
+@@ -688,7 +688,7 @@
+ 		# ncursesw was not found. Look for plain old ncurses
+ 		enable_consoleui=yes
+ 		AC_CHECK_LIB(ncurses, initscr, [GNT_LIBS="-lncurses"], [enable_consoleui=no])
+-		AC_CHECK_LIB(panel, update_panels, [GNT_LIBS="$GNT_LIBS -lpanel"],
++		AC_CHECK_LIB(panel, update_panels, [GNT_LIBS="$GNT_LIBS -L/usr/gnu/lib/64 -R/usr/gnu/lib/64 -lpanel"],
+ 		    [enable_consoleui=no], [$GNT_LIBS])
+ 		AC_DEFINE(NO_WIDECHAR, 1, [Define to 1 if you don't have wide-character support.])
+ 		if test x"$ac_ncurses_includes" != "x"; then
--- a/components/desktop/pidgin/pidgin.p5m	Fri Sep 02 16:31:53 2016 -0700
+++ b/components/desktop/pidgin/pidgin.p5m	Tue Sep 06 15:11:54 2016 -0700
@@ -40,6 +40,7 @@
 file usr/etc/gconf/schemas/purple.schemas \
     path=etc/gconf/schemas/purple.schemas \
     restart_fmri=svc:/application/desktop-cache/gconf-cache:default
+file path=usr/bin/finch
 file path=usr/bin/pidgin
 file path=usr/bin/purple-remote
 file path=usr/bin/purple-send
@@ -48,6 +49,53 @@
 # from one of two different places: urllib (for Python 2.X), and urllib.parse
 # (for Python 3.X).
 file path=usr/bin/purple-url-handler pkg.depend.bypass-generate=.*/urllib.*
+file path=usr/include/finch/finch.h
+file path=usr/include/finch/gntaccount.h
+file path=usr/include/finch/gntblist.h
+file path=usr/include/finch/gntcertmgr.h
+file path=usr/include/finch/gntconn.h
+file path=usr/include/finch/gntconv.h
+file path=usr/include/finch/gntdebug.h
+file path=usr/include/finch/gntft.h
+file path=usr/include/finch/gntidle.h
+file path=usr/include/finch/gntlog.h
+file path=usr/include/finch/gntmedia.h
+file path=usr/include/finch/gntnotify.h
+file path=usr/include/finch/gntplugin.h
+file path=usr/include/finch/gntpounce.h
+file path=usr/include/finch/gntprefs.h
+file path=usr/include/finch/gntrequest.h
+file path=usr/include/finch/gntroomlist.h
+file path=usr/include/finch/gntsound.h
+file path=usr/include/finch/gntstatus.h
+file path=usr/include/finch/gntui.h
+file path=usr/include/gnt/gnt.h
+file path=usr/include/gnt/gntbindable.h
+file path=usr/include/gnt/gntbox.h
+file path=usr/include/gnt/gntbutton.h
+file path=usr/include/gnt/gntcheckbox.h
+file path=usr/include/gnt/gntclipboard.h
+file path=usr/include/gnt/gntcolors.h
+file path=usr/include/gnt/gntcombobox.h
+file path=usr/include/gnt/gntentry.h
+file path=usr/include/gnt/gntfilesel.h
+file path=usr/include/gnt/gntkeys.h
+file path=usr/include/gnt/gntlabel.h
+file path=usr/include/gnt/gntline.h
+file path=usr/include/gnt/gntmarshal.h
+file path=usr/include/gnt/gntmenu.h
+file path=usr/include/gnt/gntmenuitem.h
+file path=usr/include/gnt/gntmenuitemcheck.h
+file path=usr/include/gnt/gntprogressbar.h
+file path=usr/include/gnt/gntslider.h
+file path=usr/include/gnt/gntstyle.h
+file path=usr/include/gnt/gnttextview.h
+file path=usr/include/gnt/gnttree.h
+file path=usr/include/gnt/gntutils.h
+file path=usr/include/gnt/gntwidget.h
+file path=usr/include/gnt/gntwindow.h
+file path=usr/include/gnt/gntwm.h
+file path=usr/include/gnt/gntws.h
 file path=usr/include/libpurple/account.h
 file path=usr/include/libpurple/accountopt.h
 file path=usr/include/libpurple/blist.h
@@ -169,6 +217,17 @@
 file path=usr/include/pidgin/pidgin.h
 file path=usr/include/pidgin/pidginstock.h
 file path=usr/include/pidgin/pidgintooltip.h
+file path=usr/lib/$(MACH64)/finch/gntclipboard.so
+file path=usr/lib/$(MACH64)/finch/gntgf.so
+file path=usr/lib/$(MACH64)/finch/gnthistory.so
+file path=usr/lib/$(MACH64)/finch/gntlastlog.so
+file path=usr/lib/$(MACH64)/finch/gnttinyurl.so
+file path=usr/lib/$(MACH64)/finch/grouping.so
+file path=usr/lib/$(MACH64)/gnt/irssi.so
+file path=usr/lib/$(MACH64)/gnt/s.so
+link path=usr/lib/$(MACH64)/libgnt.so target=libgnt.so.0.8.10
+link path=usr/lib/$(MACH64)/libgnt.so.0 target=libgnt.so.0.8.10
+file path=usr/lib/$(MACH64)/libgnt.so.0.8.10
 link path=usr/lib/$(MACH64)/libpurple-client.so \
     target=libpurple-client.so.0.11.0
 link path=usr/lib/$(MACH64)/libpurple-client.so.0 \
@@ -200,6 +259,8 @@
 file path=usr/lib/$(MACH64)/pidgin/timestamp_format.so
 file path=usr/lib/$(MACH64)/pidgin/xmppconsole.so
 file path=usr/lib/$(MACH64)/pidgin/xmppdisco.so
+file path=usr/lib/$(MACH64)/pkgconfig/finch.pc
+file path=usr/lib/$(MACH64)/pkgconfig/gnt.pc
 file path=usr/lib/$(MACH64)/pkgconfig/pidgin.pc
 file path=usr/lib/$(MACH64)/pkgconfig/purple.pc
 file path=usr/lib/$(MACH64)/purple-2/autoaccept.so
@@ -360,6 +421,7 @@
 file path=usr/share/locale/zh_CN/LC_MESSAGES/pidgin.mo
 file path=usr/share/locale/zh_HK/LC_MESSAGES/pidgin.mo
 file path=usr/share/locale/zh_TW/LC_MESSAGES/pidgin.mo
+file path=usr/share/man/man1/finch.1
 file path=usr/share/man/man1/pidgin.1
 file path=usr/share/man/man3/Pidgin.3
 file path=usr/share/man/man3/Purple.3
upstream/oracle/userland-gate