On Fri Jul 03, 2020 at 04:25:50PM +0200, Landry Breuil wrote: > On Fri, Jul 03, 2020 at 04:16:49PM +0200, Rafael Sadowski wrote: > > Hi All > > > > My goal is to remove QCA and PSI is the last consumer, so I would like > > to remove PSI(Qt4) and QCA(Qt4) I have tried to update net/psi several > > times but I can't get a connection to xmpp server. > > > > I don't think it makes sense to have an old XMPP client in the tree. > > There are plenty of alternatives. > > Sure there are, but psi is still alive (last release nov 2018), so at > least commit what you have if it builds against qt5, mark it BROKEN, and > then remove, qca ? > > Landry >
Sound like a plan. Here is a update diff to the latest stable version. Broken at runtime. Every TLS connection fails with "Connection Error: Unable to connect to server". Index: Makefile =================================================================== RCS file: /cvs/ports/net/psi/Makefile,v retrieving revision 1.33 diff -u -p -u -p -r1.33 Makefile --- Makefile 12 Jul 2019 20:48:44 -0000 1.33 +++ Makefile 3 Jul 2020 17:11:04 -0000 @@ -1,77 +1,50 @@ # $OpenBSD: Makefile,v 1.33 2019/07/12 20:48:44 sthen Exp $ +BROKEN = Connection Error: Unable to connect to server + COMMENT= multiplatform Jabber client -DISTNAME= psi-0.15 -REVISION= 11 +DISTNAME= psi-1.4 CATEGORIES= net HOMEPAGE= https://psi-im.org/ -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=psi/} -EXTRACT_SUFX= .tar.bz2 +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=psi/Psi/1.4/} +EXTRACT_SUFX= .tar.xz # GPLv2 PERMIT_PACKAGE= Yes -WANTLIB += ICE QtDBus QtGui QtNetwork QtXml SM X11 Xext Xi Xinerama -WANTLIB += Xrender Xss c enchant fontconfig freetype glib-2.0 -WANTLIB += gmodule-2.0 iconv intl m pthread qca ${COMPILER_LIBCXX} z - -COMPILER = base-clang ports-gcc base-gcc - -MODULES= x11/qt4 +WANTLIB += ${COMPILER_LIBCXX} ICE Qt5Concurrent Qt5Core Qt5DBus +WANTLIB += Qt5Gui Qt5Multimedia Qt5Network Qt5Positioning Qt5PrintSupport +WANTLIB += Qt5Qml Qt5Quick Qt5Svg Qt5WebChannel Qt5WebEngine Qt5WebEngineCore +WANTLIB += Qt5WebEngineWidgets Qt5Widgets Qt5X11Extras Qt5Xml +WANTLIB += SM X11 Xext c hunspell-1.6 idn m qca-qt5 xcb z + +MODULES= devel/cmake \ + x11/qt5 + +LIB_DEPENDS= devel/libidn \ + security/qca-qt5 \ + textproc/hunspell \ + x11/qt5/qtmultimedia \ + x11/qt5/qtsvg \ + x11/qt5/qtwebengine \ + x11/qt5/qtx11extras -USE_GMAKE= Yes - -LIB_DEPENDS= security/qca \ - textproc/enchant RUN_DEPENDS= devel/desktop-file-utils \ - security/qca,-gnupg \ - security/qca,-ossl \ x11/gtk+3,-guic -CONFIGURE_STYLE= simple - -CONFIGURE_ARGS+= --prefix=${LOCALBASE} \ - --qtdir=${MODQT4_QTDIR} \ - --disable-growl +CONFIGURE_ARGS= -DUSE_CCACHE=OFF # For QSettings to write its setup PORTHOME= ${WRKDIST} NO_TEST= Yes -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/psi ${PREFIX}/bin - ${INSTALL_DATA_DIR} ${PREFIX}/share/psi - ${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/psi - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/psi - cp -R ${WRKSRC}/iconsets ${PREFIX}/share/psi - cp -R ${WRKSRC}/sound ${PREFIX}/share/psi - cp -R ${WRKSRC}/certs ${PREFIX}/share/psi - - ${INSTALL_DATA_DIR} ${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKSRC}/psi.desktop ${PREFIX}/share/applications/ - - ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/16x16/apps - ${INSTALL_DATA} ${WRKSRC}/iconsets/system/default/logo_16.png \ - ${PREFIX}/share/icons/hicolor/16x16/apps/psi.png - - ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/32x32/apps - ${INSTALL_DATA} ${WRKSRC}/iconsets/system/default/logo_32.png \ - ${PREFIX}/share/icons/hicolor/32x32/apps/psi.png - - ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/48x48/apps - ${INSTALL_DATA} ${WRKSRC}/iconsets/system/default/logo_48.png \ - ${PREFIX}/share/icons/hicolor/48x48/apps/psi.png - - ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/64x64/apps - ${INSTALL_DATA} ${WRKSRC}/iconsets/system/default/logo_64.png \ - ${PREFIX}/share/icons/hicolor/64x64/apps/psi.png - - ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/128x128/apps - ${INSTALL_DATA} ${WRKSRC}/iconsets/system/default/logo_128.png \ - ${PREFIX}/share/icons/hicolor/128x128/apps/psi.png +post-patch: + # Avoid conflict with C++20 <version> by adding .txt suffix + mv ${WRKSRC}/version ${WRKSRC}/version.txt + sed -i 's,SOURCE_DIR}/version,&.txt,' ${WRKSRC}/CMakeLists.txt .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/net/psi/distinfo,v retrieving revision 1.7 diff -u -p -u -p -r1.7 distinfo --- distinfo 21 Apr 2013 13:56:27 -0000 1.7 +++ distinfo 3 Jul 2020 17:11:04 -0000 @@ -1,2 +1,2 @@ -SHA256 (psi-0.15.tar.bz2) = WTtd3Xk0r2nCRa+w5ykAR/197c/YdluspaOgJMVpx+Y= -SIZE (psi-0.15.tar.bz2) = 1984777 +SHA256 (psi-1.4.tar.xz) = dhk0wcYtr2khXwhbok1/nNTbBe8K1zU4PWj7A9IVca0= +SIZE (psi-1.4.tar.xz) = 2119840 Index: patches/patch-iris_iris_pri =================================================================== RCS file: patches/patch-iris_iris_pri diff -N patches/patch-iris_iris_pri --- patches/patch-iris_iris_pri 21 Apr 2013 13:56:27 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-iris_iris_pri,v 1.1 2013/04/21 13:56:27 shadchin Exp $ ---- iris/iris.pri.orig Mon Aug 1 18:06:20 2011 -+++ iris/iris.pri Mon Aug 1 18:06:29 2011 -@@ -1,7 +1,7 @@ - IRIS_BASE = $$PWD - include(common.pri) - --CONFIG *= depend_prl -+#CONFIG *= depend_prl - - INCLUDEPATH += $$IRIS_BASE/include $$IRIS_BASE/include/iris $$IRIS_BASE/src - Index: patches/patch-iris_src_jdns_jdns_p_h =================================================================== RCS file: patches/patch-iris_src_jdns_jdns_p_h diff -N patches/patch-iris_src_jdns_jdns_p_h --- patches/patch-iris_src_jdns_jdns_p_h 21 Apr 2013 13:56:27 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-iris_src_jdns_jdns_p_h,v 1.1 2013/04/21 13:56:27 shadchin Exp $ ---- iris/src/jdns/jdns_p.h.orig Mon Aug 1 02:19:45 2011 -+++ iris/src/jdns/jdns_p.h Mon Aug 1 02:20:09 2011 -@@ -40,6 +40,8 @@ - # define JDNS_OS_FREEBSD - #elif defined(__NetBSD__) - # define JDNS_OS_NETBSD -+#elif defined(__OpenBSD__) -+# define JDNS_OS_OPENBSD - #elif defined(sun) || defined(__sun) - # define JDNS_OS_SOLARIS - #elif defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__) || defined(__xlc__)) Index: patches/patch-iris_src_jdns_jdns_sys_c =================================================================== RCS file: patches/patch-iris_src_jdns_jdns_sys_c diff -N patches/patch-iris_src_jdns_jdns_sys_c --- patches/patch-iris_src_jdns_jdns_sys_c 9 Oct 2013 16:52:24 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,37 +0,0 @@ -$OpenBSD: patch-iris_src_jdns_jdns_sys_c,v 1.2 2013/10/09 16:52:24 shadchin Exp $ ---- iris/src/jdns/jdns_sys.c.orig Thu Oct 4 06:53:09 2012 -+++ iris/src/jdns/jdns_sys.c Sun Jul 14 21:45:39 2013 -@@ -752,6 +752,7 @@ static jdns_dnsparams_t *dnsparams_get_unixsys() - if(n == -1) - return params; - -+#ifndef JDNS_OS_OPENBSD - // nameservers - ipv6 - for(n = 0; n < MAXNS && n < RESVAR._u._ext.nscount; ++n) - { -@@ -775,6 +776,7 @@ static jdns_dnsparams_t *dnsparams_get_unixsys() - jdns_dnsparams_append_nameserver(params, addr, JDNS_UNICAST_PORT); - jdns_address_delete(addr); - } -+#endif - - // nameservers - ipv4 - for(n = 0; n < MAXNS && n < RESVAR.nscount; ++n) -@@ -829,6 +831,9 @@ static jdns_dnsparams_t *dnsparams_get_unix() - { - jdns_dnsparams_t *params; - -+#if defined(JDNS_OS_OPENBSD) -+ params = dnsparams_get_unixfiles(); -+#else - // prefer system calls over files - params = dnsparams_get_unixsys(); - if(params->nameservers->count == 0) -@@ -836,6 +841,7 @@ static jdns_dnsparams_t *dnsparams_get_unix() - jdns_dnsparams_delete(params); - params = dnsparams_get_unixfiles(); - } -+#endif - - apply_hosts_file(params, "/etc/hosts"); - Index: patches/patch-iris_src_xmpp_base64_base64_cpp =================================================================== RCS file: patches/patch-iris_src_xmpp_base64_base64_cpp diff -N patches/patch-iris_src_xmpp_base64_base64_cpp --- patches/patch-iris_src_xmpp_base64_base64_cpp 15 Apr 2019 17:39:43 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -$OpenBSD: patch-iris_src_xmpp_base64_base64_cpp,v 1.1 2019/04/15 17:39:43 cwen Exp $ - -ppc, arm: char is unsigned by default, fix narrowing on these platforms - -Index: iris/src/xmpp/base64/base64.cpp ---- iris/src/xmpp/base64/base64.cpp.orig -+++ iris/src/xmpp/base64/base64.cpp -@@ -45,7 +45,7 @@ QByteArray Base64::decode(const QString& input) - // 64 specifies eof - // everything else specifies data - -- char tbl[] = { -+ signed char tbl[] = { - -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, - -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, - -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-1,-1,-1,63, Index: patches/patch-iris_src_xmpp_xmpp-im_filetransfer_cpp =================================================================== RCS file: patches/patch-iris_src_xmpp_xmpp-im_filetransfer_cpp diff -N patches/patch-iris_src_xmpp_xmpp-im_filetransfer_cpp --- patches/patch-iris_src_xmpp_xmpp-im_filetransfer_cpp 21 Jan 2019 20:55:38 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-iris_src_xmpp_xmpp-im_filetransfer_cpp,v 1.1 2019/01/21 20:55:38 naddy Exp $ - -Index: iris/src/xmpp/xmpp-im/filetransfer.cpp ---- iris/src/xmpp/xmpp-im/filetransfer.cpp.orig -+++ iris/src/xmpp/xmpp-im/filetransfer.cpp -@@ -422,7 +422,7 @@ FileTransfer *FileTransferManager::takeIncoming() - - bool FileTransferManager::isActive(const FileTransfer *ft) const - { -- return d->list.contains(const_cast<FileTransfer*>(ft)) > 0; -+ return d->list.contains(const_cast<FileTransfer*>(ft)); - } - - void FileTransferManager::setDisabled(const QString &ns, bool state) Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/psi/pkg/PLIST,v retrieving revision 1.9 diff -u -p -u -p -r1.9 PLIST --- pkg/PLIST 29 Jun 2018 22:16:19 -0000 1.9 +++ pkg/PLIST 3 Jul 2020 17:11:04 -0000 @@ -1,19 +1,135 @@ @comment $OpenBSD: PLIST,v 1.9 2018/06/29 22:16:19 espie Exp $ @bin bin/psi share/applications/psi.desktop -share/icons/hicolor/128x128/apps/psi.png -share/icons/hicolor/16x16/apps/psi.png -share/icons/hicolor/32x32/apps/psi.png -share/icons/hicolor/48x48/apps/psi.png -share/icons/hicolor/64x64/apps/psi.png +share/pixmaps/ +share/pixmaps/psi.png share/psi/ -share/psi/COPYING -share/psi/README share/psi/certs/ share/psi/certs/README share/psi/certs/startcom_ca.crt share/psi/certs/startcom_ca_new.crt +share/psi/client_icons.txt share/psi/iconsets/ +share/psi/iconsets/activities/ +share/psi/iconsets/activities/default/ +share/psi/iconsets/activities/default/doing_chores.png +share/psi/iconsets/activities/default/doing_chores_buying_groceries.png +share/psi/iconsets/activities/default/doing_chores_cleaning.png +share/psi/iconsets/activities/default/doing_chores_cooking.png +share/psi/iconsets/activities/default/doing_chores_doing_maintenance.png +share/psi/iconsets/activities/default/doing_chores_doing_the_dishes.png +share/psi/iconsets/activities/default/doing_chores_doing_the_laundry.png +share/psi/iconsets/activities/default/doing_chores_gardening.png +share/psi/iconsets/activities/default/doing_chores_running_an_errand.png +share/psi/iconsets/activities/default/doing_chores_walking_the_dog.png +share/psi/iconsets/activities/default/drinking.png +share/psi/iconsets/activities/default/drinking_having_a_beer.png +share/psi/iconsets/activities/default/drinking_having_coffee.png +share/psi/iconsets/activities/default/drinking_having_tea.png +share/psi/iconsets/activities/default/eating.png +share/psi/iconsets/activities/default/eating_having_a_snack.png +share/psi/iconsets/activities/default/eating_having_breakfast.png +share/psi/iconsets/activities/default/eating_having_dinner.png +share/psi/iconsets/activities/default/eating_having_lunch.png +share/psi/iconsets/activities/default/exercising.png +share/psi/iconsets/activities/default/exercising_cycling.png +share/psi/iconsets/activities/default/exercising_dancing.png +share/psi/iconsets/activities/default/exercising_hiking.png +share/psi/iconsets/activities/default/exercising_jogging.png +share/psi/iconsets/activities/default/exercising_playing_sports.png +share/psi/iconsets/activities/default/exercising_running.png +share/psi/iconsets/activities/default/exercising_skiing.png +share/psi/iconsets/activities/default/exercising_swimming.png +share/psi/iconsets/activities/default/exercising_working_out.png +share/psi/iconsets/activities/default/grooming.png +share/psi/iconsets/activities/default/grooming_at_the_spa.png +share/psi/iconsets/activities/default/grooming_brushing_teeth.png +share/psi/iconsets/activities/default/grooming_getting_a_haircut.png +share/psi/iconsets/activities/default/grooming_shaving.png +share/psi/iconsets/activities/default/grooming_taking_a_bath.png +share/psi/iconsets/activities/default/grooming_taking_a_shower.png +share/psi/iconsets/activities/default/having_appointment.png +share/psi/iconsets/activities/default/icondef.xml +share/psi/iconsets/activities/default/inactive.png +share/psi/iconsets/activities/default/inactive_day_off.png +share/psi/iconsets/activities/default/inactive_hanging_out.png +share/psi/iconsets/activities/default/inactive_hiding.png +share/psi/iconsets/activities/default/inactive_on_vacation.png +share/psi/iconsets/activities/default/inactive_praying.png +share/psi/iconsets/activities/default/inactive_scheduled_holiday.png +share/psi/iconsets/activities/default/inactive_sleeping.png +share/psi/iconsets/activities/default/inactive_thinking.png +share/psi/iconsets/activities/default/relaxing.png +share/psi/iconsets/activities/default/relaxing_fishing.png +share/psi/iconsets/activities/default/relaxing_gaming.png +share/psi/iconsets/activities/default/relaxing_going_out.png +share/psi/iconsets/activities/default/relaxing_partying.png +share/psi/iconsets/activities/default/relaxing_reading.png +share/psi/iconsets/activities/default/relaxing_rehearsing.png +share/psi/iconsets/activities/default/relaxing_shopping.png +share/psi/iconsets/activities/default/relaxing_smoking.png +share/psi/iconsets/activities/default/relaxing_socializing.png +share/psi/iconsets/activities/default/relaxing_sunbathing.png +share/psi/iconsets/activities/default/relaxing_watching_a_movie.png +share/psi/iconsets/activities/default/relaxing_watching_tv.png +share/psi/iconsets/activities/default/talking.png +share/psi/iconsets/activities/default/talking_in_real_life.png +share/psi/iconsets/activities/default/talking_on_the_phone.png +share/psi/iconsets/activities/default/talking_on_video_phone.png +share/psi/iconsets/activities/default/traveling.png +share/psi/iconsets/activities/default/traveling_commuting.png +share/psi/iconsets/activities/default/traveling_cycling.png +share/psi/iconsets/activities/default/traveling_driving.png +share/psi/iconsets/activities/default/traveling_in_a_car.png +share/psi/iconsets/activities/default/traveling_on_a_bus.png +share/psi/iconsets/activities/default/traveling_on_a_plane.png +share/psi/iconsets/activities/default/traveling_on_a_train.png +share/psi/iconsets/activities/default/traveling_on_a_trip.png +share/psi/iconsets/activities/default/traveling_walking.png +share/psi/iconsets/activities/default/unknown.png +share/psi/iconsets/activities/default/working_coding.png +share/psi/iconsets/activities/default/working_in_a_meeting.png +share/psi/iconsets/activities/default/working_studying.png +share/psi/iconsets/activities/default/working_working.png +share/psi/iconsets/activities/default/working_writing.png +share/psi/iconsets/affiliations/ +share/psi/iconsets/affiliations/default/ +share/psi/iconsets/affiliations/default/admin.png +share/psi/iconsets/affiliations/default/icondef.xml +share/psi/iconsets/affiliations/default/member.png +share/psi/iconsets/affiliations/default/noaffiliation.png +share/psi/iconsets/affiliations/default/outcast.png +share/psi/iconsets/affiliations/default/owner.png +share/psi/iconsets/clients/ +share/psi/iconsets/clients/default/ +share/psi/iconsets/clients/default/.directory +share/psi/iconsets/clients/default/adium.png +share/psi/iconsets/clients/default/bitlbee.png +share/psi/iconsets/clients/default/bot.png +share/psi/iconsets/clients/default/conversations.png +share/psi/iconsets/clients/default/gajim.png +share/psi/iconsets/clients/default/icondef.xml +share/psi/iconsets/clients/default/isida-bot.png +share/psi/iconsets/clients/default/jtalk.png +share/psi/iconsets/clients/default/kadu.png +share/psi/iconsets/clients/default/kopete.png +share/psi/iconsets/clients/default/leechcraft-azoth.png +share/psi/iconsets/clients/default/mcabber.png +share/psi/iconsets/clients/default/miranda-ng.png +share/psi/iconsets/clients/default/miranda.png +share/psi/iconsets/clients/default/pidgin.png +share/psi/iconsets/clients/default/poezio.png +share/psi/iconsets/clients/default/psi.png +share/psi/iconsets/clients/default/psiplus.png +share/psi/iconsets/clients/default/qip.png +share/psi/iconsets/clients/default/qutim.png +share/psi/iconsets/clients/default/sawim.png +share/psi/iconsets/clients/default/swift.png +share/psi/iconsets/clients/default/tkabber.png +share/psi/iconsets/clients/default/vacuum.png +share/psi/iconsets/clients/default/vk4xmpp.png +share/psi/iconsets/clients/default/xabber.png +share/psi/iconsets/clients/default/yaxim.png share/psi/iconsets/emoticons/ share/psi/iconsets/emoticons/default/ share/psi/iconsets/emoticons/default/angry.png @@ -54,12 +170,94 @@ share/psi/iconsets/emoticons/default/ton share/psi/iconsets/emoticons/default/unhappy.png share/psi/iconsets/emoticons/default/wink.png share/psi/iconsets/emoticons/default/yes.png +share/psi/iconsets/moods/ +share/psi/iconsets/moods/default/ +share/psi/iconsets/moods/default/Afraid.png +share/psi/iconsets/moods/default/Amazed.png +share/psi/iconsets/moods/default/Amorous.png +share/psi/iconsets/moods/default/Angry.png +share/psi/iconsets/moods/default/Annoyed.png +share/psi/iconsets/moods/default/Anxious.png +share/psi/iconsets/moods/default/Aroused.png +share/psi/iconsets/moods/default/Ashamed.png +share/psi/iconsets/moods/default/Bored.png +share/psi/iconsets/moods/default/Brave.png +share/psi/iconsets/moods/default/Calm.png +share/psi/iconsets/moods/default/Cautious.png +share/psi/iconsets/moods/default/Cold.png +share/psi/iconsets/moods/default/Confident.png +share/psi/iconsets/moods/default/Confused.png +share/psi/iconsets/moods/default/Contemplative.png +share/psi/iconsets/moods/default/Contented.png +share/psi/iconsets/moods/default/Cranky.png +share/psi/iconsets/moods/default/Crazy.png +share/psi/iconsets/moods/default/Creative.png +share/psi/iconsets/moods/default/Curious.png +share/psi/iconsets/moods/default/Dejected.png +share/psi/iconsets/moods/default/Depressed.png +share/psi/iconsets/moods/default/Disappointed.png +share/psi/iconsets/moods/default/Disgusted.png +share/psi/iconsets/moods/default/Dismayed.png +share/psi/iconsets/moods/default/Distracted.png +share/psi/iconsets/moods/default/Embarrassed.png +share/psi/iconsets/moods/default/Envious.png +share/psi/iconsets/moods/default/Excited.png +share/psi/iconsets/moods/default/Flirtatious.png +share/psi/iconsets/moods/default/Frustrated.png +share/psi/iconsets/moods/default/Grumpy.png +share/psi/iconsets/moods/default/Guilty.png +share/psi/iconsets/moods/default/Happy.png +share/psi/iconsets/moods/default/Hopeful.png +share/psi/iconsets/moods/default/Hot.png +share/psi/iconsets/moods/default/Humbled.png +share/psi/iconsets/moods/default/Humiliated.png +share/psi/iconsets/moods/default/Hungry.png +share/psi/iconsets/moods/default/Hurt.png +share/psi/iconsets/moods/default/Impressed.png +share/psi/iconsets/moods/default/In_awe.png +share/psi/iconsets/moods/default/In_love.png +share/psi/iconsets/moods/default/Indignant.png +share/psi/iconsets/moods/default/Interested.png +share/psi/iconsets/moods/default/Intoxicated.png +share/psi/iconsets/moods/default/Invincible.png +share/psi/iconsets/moods/default/Jealous.png +share/psi/iconsets/moods/default/Lonely.png +share/psi/iconsets/moods/default/Lucky.png +share/psi/iconsets/moods/default/Mean.png +share/psi/iconsets/moods/default/Moody.png +share/psi/iconsets/moods/default/Nervous.png +share/psi/iconsets/moods/default/Neutral.png +share/psi/iconsets/moods/default/Offended.png +share/psi/iconsets/moods/default/Outraged.png +share/psi/iconsets/moods/default/Playful.png +share/psi/iconsets/moods/default/Proud.png +share/psi/iconsets/moods/default/Readme.txt +share/psi/iconsets/moods/default/Relaxed.png +share/psi/iconsets/moods/default/Relieved.png +share/psi/iconsets/moods/default/Remorseful.png +share/psi/iconsets/moods/default/Restless.png +share/psi/iconsets/moods/default/Sad.png +share/psi/iconsets/moods/default/Sarcastic.png +share/psi/iconsets/moods/default/Serious.png +share/psi/iconsets/moods/default/Shocked.png +share/psi/iconsets/moods/default/Shy.png +share/psi/iconsets/moods/default/Sick.png +share/psi/iconsets/moods/default/Sleepy.png +share/psi/iconsets/moods/default/Spontaneous.png +share/psi/iconsets/moods/default/Stressed.png +share/psi/iconsets/moods/default/Strong.png +share/psi/iconsets/moods/default/Surprised.png +share/psi/iconsets/moods/default/Thankful.png +share/psi/iconsets/moods/default/Thirsty.png +share/psi/iconsets/moods/default/Tired.png +share/psi/iconsets/moods/default/Undefined.png +share/psi/iconsets/moods/default/Weak.png +share/psi/iconsets/moods/default/Worried.png +share/psi/iconsets/moods/default/icondef.xml share/psi/iconsets/roster/ share/psi/iconsets/roster/README -share/psi/iconsets/roster/crystal-aim.jisp share/psi/iconsets/roster/crystal-gadu.jisp share/psi/iconsets/roster/crystal-icq.jisp -share/psi/iconsets/roster/crystal-msn.jisp share/psi/iconsets/roster/crystal-roster.jisp share/psi/iconsets/roster/crystal-service.jisp share/psi/iconsets/roster/crystal-sms.jisp @@ -84,38 +282,63 @@ share/psi/iconsets/roster/default/online share/psi/iconsets/roster/default/online.png share/psi/iconsets/roster/default/perr.png share/psi/iconsets/roster/default/system.png +share/psi/iconsets/roster/default/typing.png share/psi/iconsets/roster/default/xa.png share/psi/iconsets/roster/stellar-1.jisp share/psi/iconsets/system/ share/psi/iconsets/system/README share/psi/iconsets/system/default/ share/psi/iconsets/system/default/account.png +share/psi/iconsets/system/default/action_button_send.png +share/psi/iconsets/system/default/action_contacts_manager.png +share/psi/iconsets/system/default/action_direct_presence.png +share/psi/iconsets/system/default/action_muc_hide.png +share/psi/iconsets/system/default/action_muc_leave.png +share/psi/iconsets/system/default/action_muc_show.png +share/psi/iconsets/system/default/action_templates.png +share/psi/iconsets/system/default/action_templates_edit.png +share/psi/iconsets/system/default/activity.png share/psi/iconsets/system/default/add.png +share/psi/iconsets/system/default/advanced-plus.png share/psi/iconsets/system/default/advanced.png share/psi/iconsets/system/default/appearance.png share/psi/iconsets/system/default/arrow_down.png share/psi/iconsets/system/default/arrow_left.png share/psi/iconsets/system/default/arrow_right.png share/psi/iconsets/system/default/arrow_up.png +share/psi/iconsets/system/default/autojid.png +share/psi/iconsets/system/default/avcall.png +share/psi/iconsets/system/default/bookmark_add.png +share/psi/iconsets/system/default/bookmark_remove.png +share/psi/iconsets/system/default/bookmarks.png share/psi/iconsets/system/default/browse.png share/psi/iconsets/system/default/cancel.png share/psi/iconsets/system/default/changeacc.png share/psi/iconsets/system/default/chatclear.png share/psi/iconsets/system/default/close.png share/psi/iconsets/system/default/closetab.png +share/psi/iconsets/system/default/cm_check.png +share/psi/iconsets/system/default/cm_invertcheck.png +share/psi/iconsets/system/default/cm_uncheck.png share/psi/iconsets/system/default/command.png share/psi/iconsets/system/default/configure-room.png share/psi/iconsets/system/default/configure_toolbars.png +share/psi/iconsets/system/default/default_avatar.png share/psi/iconsets/system/default/disco.png share/psi/iconsets/system/default/download.png +share/psi/iconsets/system/default/enable-groups.png share/psi/iconsets/system/default/events.png +share/psi/iconsets/system/default/export.png share/psi/iconsets/system/default/eye_blue.png share/psi/iconsets/system/default/filemanager.png +share/psi/iconsets/system/default/geolocation.png share/psi/iconsets/system/default/groupchat.png share/psi/iconsets/system/default/gstreamer-logo-50.png share/psi/iconsets/system/default/help.png share/psi/iconsets/system/default/history.png share/psi/iconsets/system/default/icondef.xml +share/psi/iconsets/system/default/ignore_global_actions.png +share/psi/iconsets/system/default/import.png share/psi/iconsets/system/default/info.png share/psi/iconsets/system/default/jabber.png share/psi/iconsets/system/default/key.png @@ -126,11 +349,22 @@ share/psi/iconsets/system/default/logo_1 share/psi/iconsets/system/default/logo_32.png share/psi/iconsets/system/default/logo_48.png share/psi/iconsets/system/default/logo_64.png +share/psi/iconsets/system/default/manage_contact.png +share/psi/iconsets/system/default/mood.png +share/psi/iconsets/system/default/notification_chat_delivery_ok.png +share/psi/iconsets/system/default/notification_chat_delivery_ok_pgp.png +share/psi/iconsets/system/default/notification_chat_info.png +share/psi/iconsets/system/default/notification_chat_receive.png +share/psi/iconsets/system/default/notification_chat_receive_pgp.png +share/psi/iconsets/system/default/notification_chat_send.png +share/psi/iconsets/system/default/notification_chat_send_pgp.png +share/psi/iconsets/system/default/notification_chat_time.png share/psi/iconsets/system/default/ok.png share/psi/iconsets/system/default/options.png share/psi/iconsets/system/default/pgp.png share/psi/iconsets/system/default/play.png share/psi/iconsets/system/default/play_sounds.png +share/psi/iconsets/system/default/plugins.png share/psi/iconsets/system/default/psilogo.png share/psi/iconsets/system/default/psimain.png share/psi/iconsets/system/default/publish_tune.png @@ -138,6 +372,7 @@ share/psi/iconsets/system/default/quit.p share/psi/iconsets/system/default/register.png share/psi/iconsets/system/default/reload.png share/psi/iconsets/system/default/remove.png +share/psi/iconsets/system/default/roster_icon.png share/psi/iconsets/system/default/search.png share/psi/iconsets/system/default/self.png share/psi/iconsets/system/default/send.png @@ -151,8 +386,11 @@ share/psi/iconsets/system/default/ssl_ye share/psi/iconsets/system/default/start-chat.png share/psi/iconsets/system/default/status.png share/psi/iconsets/system/default/stop.png +share/psi/iconsets/system/default/text.png +share/psi/iconsets/system/default/throbber.png share/psi/iconsets/system/default/time.png share/psi/iconsets/system/default/tip.png +share/psi/iconsets/system/default/tune.png share/psi/iconsets/system/default/upload.png share/psi/iconsets/system/default/url.png share/psi/iconsets/system/default/vcard.png @@ -187,5 +425,20 @@ share/psi/sound/ft_incoming.wav share/psi/sound/offline.wav share/psi/sound/online.wav share/psi/sound/send.wav +share/psi/themes/ +share/psi/themes/chatview/ +share/psi/themes/chatview/adium/ +share/psi/themes/chatview/adium/Template.html +share/psi/themes/chatview/adium/adapter.js +share/psi/themes/chatview/moment-with-locales.js +share/psi/themes/chatview/psi/ +share/psi/themes/chatview/psi/adapter.js +share/psi/themes/chatview/psi/classic/ +share/psi/themes/chatview/psi/classic/index.html +share/psi/themes/chatview/psi/classic/load.js +share/psi/themes/chatview/psi/new_classic/ +share/psi/themes/chatview/psi/new_classic/index.html +share/psi/themes/chatview/psi/new_classic/load.js +share/psi/themes/chatview/psi/new_classic/screenshot.png +share/psi/themes/chatview/util.js @tag update-desktop-database -@tag gtk-update-icon-cache %D/share/icons/hicolor
