packages: psi/psi-appearance-mod.patch, psi/psi-desktop.patch, psi/psi-empt...

arekm arekm at pld-linux.org
Tue Jul 28 23:03:56 CEST 2009


Author: arekm                        Date: Tue Jul 28 21:03:56 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.13

---- Files affected:
packages/psi:
   psi-appearance-mod.patch (1.5 -> 1.6) , psi-desktop.patch (1.9 -> 1.10) , psi-empty_group-fix.patch (1.3 -> 1.4) , psi-fix_configure_for_ksh.patch (1.2 -> 1.3) , psi.spec (1.170 -> 1.171) , psi-qt4.5.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/psi/psi-appearance-mod.patch
diff -u packages/psi/psi-appearance-mod.patch:1.5 packages/psi/psi-appearance-mod.patch:1.6
--- packages/psi/psi-appearance-mod.patch:1.5	Sat Aug  9 22:20:56 2008
+++ packages/psi/psi-appearance-mod.patch	Tue Jul 28 23:03:51 2009
@@ -255,7 +255,7 @@
  	restoreColor(d->pb_cStatus, PsiOptions::instance()->getOption("options.ui.look.colors.contactlist.status-messages").value<QColor>());
  }
  
-@@ -322,20 +331,6 @@
+@@ -331,26 +331,6 @@
  	parentWidget = parentDialog;
  }
  
@@ -266,7 +266,13 @@
 -	int x = (bg_font->buttons()).indexOf(button);
 -	font.fromString( le_font[x]->fontName() );
 -
+-	// ensure we don't use the new native font dialog on mac with Qt 4.5,
+-	//   since it was broken last we checked (qt task #252000)
+-#if QT_VERSION >= 0x040500
+-	QString fnt = QFontDialog::getFont(&ok, font, parentWidget, QString(), QFontDialog::DontUseNativeDialog).toString();
+-#else
 -	QString fnt = QFontDialog::getFont(&ok, font, parentWidget).toString();
+-#endif
 -	le_font[x]->setFont(fnt);
 -
 -	if(ok)
@@ -585,28 +591,28 @@
 +      <item row="0" column="0" >
 +       <widget class="QLabel" name="tl_cProfileFore" >
 +        <property name="text" >
-+         <string>Account heading foreground</string>
++         <string>Account heading foreground:</string>
 +        </property>
 +       </widget>
 +      </item>
 +      <item row="1" column="0" >
 +       <widget class="QLabel" name="tl_cProfileBack" >
 +        <property name="text" >
-+         <string>Account heading background</string>
++         <string>Account heading background:</string>
 +        </property>
 +       </widget>
 +      </item>
 +      <item row="2" column="0" >
 +       <widget class="QLabel" name="tl_cGroupFore" >
 +        <property name="text" >
-+         <string>Group heading foreground</string>
++         <string>Group heading foreground:</string>
 +        </property>
 +       </widget>
 +      </item>
 +      <item row="3" column="0" >
 +       <widget class="QLabel" name="tl_cGroupBack" >
 +        <property name="text" >
-+         <string>Group heading background</string>
++         <string>Group heading background:</string>
 +        </property>
 +       </widget>
 +      </item>
@@ -620,14 +626,14 @@
 +      <item row="5" column="0" >
 +       <widget class="QLabel" name="tl_cAnimBack" >
 +        <property name="text" >
-+         <string>Nick animation background</string>
++         <string>Nick animation background:</string>
 +        </property>
 +       </widget>
 +      </item>
 +      <item row="6" column="0" >
         <widget class="QLabel" name="tl_cOnline" >
          <property name="text" >
-          <string>Online contacts</string>
+          <string>Online contacts:</string>
          </property>
         </widget>
        </item>
@@ -635,7 +641,7 @@
 +      <item row="7" column="0" >
         <widget class="QLabel" name="TextLabel1_2" >
          <property name="text" >
-          <string>Away contacts</string>
+          <string>Away contacts:</string>
          </property>
         </widget>
        </item>
@@ -643,7 +649,7 @@
 +      <item row="8" column="0" >
         <widget class="QLabel" name="tl_cDND" >
          <property name="text" >
-          <string>DND contacts</string>
+          <string>DND contacts:</string>
          </property>
         </widget>
        </item>
@@ -651,7 +657,7 @@
 +      <item row="9" column="0" >
         <widget class="QLabel" name="tl_cOffline" >
          <property name="text" >
-          <string>Offline contacts</string>
+          <string>Offline contacts:</string>
          </property>
         </widget>
        </item>
@@ -682,14 +688,14 @@
 -      <item row="4" column="3" >
 -       <widget class="QLabel" name="tl_cListBack" >
 -        <property name="text" >
--         <string>Contact list background</string>
+-         <string>Contact list background:</string>
 -        </property>
 -       </widget>
 -      </item>
 -      <item row="5" column="3" >
 -       <widget class="QLabel" name="tl_cStatus" >
          <property name="text" >
--         <string>Status messages</string>
+-         <string>Status messages:</string>
 +         <string/>
          </property>
         </widget>
@@ -719,7 +725,7 @@
 -      <item row="1" column="0" >
 -       <widget class="QLabel" name="tl_cProfileBack" >
 -        <property name="text" >
--         <string>Account heading background</string>
+-         <string>Account heading background:</string>
 +      <item row="3" column="1" >
 +       <widget class="QToolButton" name="pb_cGroupBack" >
 +        <property name="sizePolicy" >
@@ -741,7 +747,7 @@
 -      <item row="3" column="0" >
 -       <widget class="QLabel" name="tl_cGroupBack" >
          <property name="text" >
--         <string>Group heading background</string>
+-         <string>Group heading background:</string>
 +         <string/>
          </property>
         </widget>
@@ -830,8 +836,8 @@
 +      <item row="0" column="3" >
 +       <widget class="QLabel" name="tl_cListBack" >
          <property name="text" >
--         <string>Nick animation foreground</string>
-+         <string>Contact list background</string>
+-         <string>Nick animation foreground:</string>
++         <string>Contact list background:</string>
          </property>
         </widget>
        </item>
@@ -840,8 +846,8 @@
 +      <item row="1" column="3" >
 +       <widget class="QLabel" name="tl_cStatus" >
          <property name="text" >
--         <string>Nick animation background</string>
-+         <string>Status messages</string>
+-         <string>Nick animation background:</string>
++         <string>Status messages:</string>
          </property>
         </widget>
        </item>
@@ -850,8 +856,8 @@
 +      <item row="2" column="3" >
 +       <widget class="QLabel" name="tl_cChatSys" >
          <property name="text" >
--         <string>Account heading foreground</string>
-+         <string>System chat messages</string>
+-         <string>Account heading foreground:</string>
++         <string>System chat messages:</string>
          </property>
         </widget>
        </item>
@@ -860,8 +866,8 @@
 +      <item row="3" column="3" >
 +       <widget class="QLabel" name="tl_cChatSpool" >
          <property name="text" >
--         <string>Group heading foreground</string>
-+         <string>Spooled chat messages</string>
+-         <string>Group heading foreground:</string>
++         <string>Spooled chat messages:</string>
          </property>
         </widget>
        </item>
@@ -870,42 +876,42 @@
 +      <item row="4" column="3" >
 +       <widget class="QLabel" name="tl_cChatTo" >
 +        <property name="text" >
-+         <string>Outgoing chat message nick</string>
++         <string>Outgoing chat message nick:</string>
 +        </property>
 +       </widget>
 +      </item>
 +      <item row="5" column="3" >
 +       <widget class="QLabel" name="tl_cChatFrom" >
 +        <property name="text" >
-+         <string>Incoming chat message nick</string>
++         <string>Incoming chat message nick:</string>
 +        </property>
 +       </widget>
 +      </item>
 +      <item row="6" column="3" >
 +       <widget class="QLabel" name="tl_cGChatAler" >
 +        <property name="text" >
-+         <string>Groupchat alert messages</string>
++         <string>Groupchat alert messages:</string>
 +        </property>
 +       </widget>
 +      </item>
 +      <item row="7" column="3" >
 +       <widget class="QLabel" name="tl_cGChatSys" >
 +        <property name="text" >
-+         <string>Groupchat system messages</string>
++         <string>Groupchat system messages:</string>
 +        </property>
 +       </widget>
 +      </item>
 +      <item row="8" column="3" >
 +       <widget class="QLabel" name="tl_cGChatSpool" >
 +        <property name="text" >
-+         <string>Groupchat spooled messages</string>
++         <string>Groupchat spooled messages:</string>
 +        </property>
 +       </widget>
 +      </item>
 +      <item row="9" column="3" >
 +       <widget class="QLabel" name="tl_cGChatNick" >
 +        <property name="text" >
-+         <string>Groupchat non-colored nicks</string>
++         <string>Groupchat non-colored nicks:</string>
 +        </property>
 +       </widget>
 +      </item>
@@ -984,7 +990,7 @@
 +         </sizepolicy>
          </property>
 -        <property name="text" >
--         <string>Chat</string>
+-         <string>Chat:</string>
 +        <property name="maximumSize" >
 +         <size>
 +          <width>20</width>
@@ -996,7 +1002,7 @@
 -      <item row="1" column="0" >
 -       <widget class="QLabel" name="tl_fMessage" >
          <property name="text" >
--         <string>Message</string>
+-         <string>Message:</string>
 +         <string/>
          </property>
         </widget>
@@ -1004,7 +1010,7 @@
 -      <item row="1" column="4" >
 -       <widget class="QPushButton" name="pb_fMessage" >
 -        <property name="text" >
--         <string>Choose</string>
+-         <string>Choose...</string>
 +      <item row="5" column="4" >
 +       <widget class="QToolButton" name="pb_cChatFrom" >
 +        <property name="sizePolicy" >
@@ -1028,7 +1034,7 @@
 +         </size>
          </property>
          <property name="text" >
--         <string>Choose</string>
+-         <string>Choose...</string>
 +         <string/>
          </property>
         </widget>
@@ -1054,7 +1060,7 @@
 +         </size>
          </property>
          <property name="text" >
--         <string>Choose</string>
+-         <string>Choose...</string>
 +         <string/>
          </property>
         </widget>
@@ -1078,7 +1084,7 @@
 +         </size>
 +        </property>
          <property name="text" >
--         <string>Choose</string>
+-         <string>Choose...</string>
 +         <string/>
          </property>
         </widget>
@@ -1102,7 +1108,7 @@
 +         </size>
 +        </property>
          <property name="text" >
--         <string>Roster</string>
+-         <string>Roster:</string>
 +         <string/>
          </property>
         </widget>
@@ -1126,7 +1132,7 @@
 +         </size>
 +        </property>
          <property name="text" >
--         <string>Popup</string>
+-         <string>Popup:</string>
 +         <string/>
          </property>
         </widget>
@@ -1209,21 +1215,6 @@
 diff -urN psi-0.12.orig/src/psi_profiles.cpp psi-0.12/src/psi_profiles.cpp
 --- psi-0.12.orig/src/psi_profiles.cpp	2008-04-24 20:06:44.000000000 +0200
 +++ psi-0.12/src/psi_profiles.cpp	2008-08-09 21:55:03.000000000 +0200
-@@ -660,6 +660,14 @@
- 	LEGOPTP.color[cGroupBack] = QColor("#F0F0F0");
- 	LEGOPTP.color[cAnimFront] = QColor("#000000");
- 	LEGOPTP.color[cAnimBack] 	= QColor("#969696");
-+	LEGOPTP.color[cChatSys] 	= QColor("#00A000");
-+	LEGOPTP.color[cChatSpool] 	= QColor("#008000");
-+	LEGOPTP.color[cChatTo] 		= QColor("#FF0000");
-+	LEGOPTP.color[cChatFrom] 	= QColor("#0000FF");
-+	LEGOPTP.color[cGChatAlert] 	= QColor("#FF0000");
-+	LEGOPTP.color[cGChatSys] 	= QColor("#00A000");
-+	LEGOPTP.color[cGChatSpool] 	= QColor("#008000");
-+	LEGOPTP.color[cGChatNick] 	= QColor("#000000");
- 
- 	LEGOPTP.font[fRoster] = QApplication::font().toString();
- 	LEGOPTP.font[fMessage] = QApplication::font().toString();
 @@ -1231,6 +1239,14 @@
  				migrateColorEntry(tag, "profileback", "options.ui.look.colors.contactlist.profile.header-background");
  				migrateColorEntry(tag, "animfront", "options.ui.look.contactlist.status-change-animation.color1");

================================================================
Index: packages/psi/psi-desktop.patch
diff -u packages/psi/psi-desktop.patch:1.9 packages/psi/psi-desktop.patch:1.10
--- packages/psi/psi-desktop.patch:1.9	Fri Jan 25 12:35:41 2008
+++ packages/psi/psi-desktop.patch	Tue Jul 28 23:03:51 2009
@@ -15,9 +15,4 @@
  
  # Translations
  GenericName[ca]=Client Jabber
-@@ -27,3 +27,5 @@
- Comment[pt_BR]=Comunique-se através da rede Jabber
- GenericName[sl]=Odjemalec za Jabber
- Comment[sl]=Komuniciranje prek omrežja Jabber
-+
-+# vi: encoding=utf-8
+

================================================================
Index: packages/psi/psi-empty_group-fix.patch
diff -u packages/psi/psi-empty_group-fix.patch:1.3 packages/psi/psi-empty_group-fix.patch:1.4
--- packages/psi/psi-empty_group-fix.patch:1.3	Sat Jan 26 00:36:12 2008
+++ packages/psi/psi-empty_group-fix.patch	Tue Jul 28 23:03:51 2009
@@ -1,5 +1,5 @@
---- psi-0.11/iris/xmpp-im/types.cpp.orig	2007-10-14 16:00:50.000000000 +0200
-+++ psi-0.11/iris/xmpp-im/types.cpp	2008-01-25 23:56:27.523786094 +0100
+--- psi-0.11/iris/src/xmpp/xmpp-im/types.cpp.orig	2007-10-14 16:00:50.000000000 +0200
++++ psi-0.11/iris/src/xmpp/xmpp-im/types.cpp	2008-01-25 23:56:27.523786094 +0100
 @@ -2618,7 +2618,7 @@
  
  bool RosterItem::addGroup(const QString &g)
@@ -16,7 +16,7 @@
 -		if(i.tagName() == "group")
 +		if(i.tagName() == "group") {
  			g += tagContent(i);
-+			g.remove(QString(""));
++			g.removeAll(QString(""));
 +		}
  	}
  	QString a = item.attribute("ask");

================================================================
Index: packages/psi/psi-fix_configure_for_ksh.patch
diff -u packages/psi/psi-fix_configure_for_ksh.patch:1.2 packages/psi/psi-fix_configure_for_ksh.patch:1.3
--- packages/psi/psi-fix_configure_for_ksh.patch:1.2	Fri Jan 25 15:36:42 2008
+++ packages/psi/psi-fix_configure_for_ksh.patch	Tue Jul 28 23:03:51 2009
@@ -18,12 +18,15 @@
  		conf->addDefine(certPathString);
  
  		return true;
-@@ -1078,7 +1078,7 @@
+@@ -1142,8 +1142,8 @@
  		QFile file("src/config.h");
  		if ( file.open(QIODevice::WriteOnly | QIODevice::Text) ) {
  			QTextStream stream( &file );
+-			stream << "#define PSI_LIBDIR \"" << conf->getenv("LIBDIR") << "/psi\"" << endl;
 -			stream << "#define PSI_DATADIR \"" << conf->getenv("DATADIR") << "/psi\"" << endl;
++			stream << "#define PSI_LIBDIR \\"" << conf->getenv("LIBDIR") << "/psi\\"" << endl;
 +			stream << "#define PSI_DATADIR \\"" << conf->getenv("DATADIR") << "/psi\\"" << endl;
  		}
- 		
+ 
  		conf->addDefine("HAVE_CONFIG");
+

================================================================
Index: packages/psi/psi.spec
diff -u packages/psi/psi.spec:1.170 packages/psi/psi.spec:1.171
--- packages/psi/psi.spec:1.170	Tue Jun 30 18:54:22 2009
+++ packages/psi/psi.spec	Tue Jul 28 23:03:51 2009
@@ -3,12 +3,12 @@
 Summary(de.UTF-8):	PSI - ein Instant Messaging Client-Programm für Jabber
 Summary(pl.UTF-8):	PSI - klient Jabbera
 Name:		psi
-Version:	0.12.1
-Release:	2
+Version:	0.13
+Release:	1
 License:	GPL v2
 Group:		Applications/Communications
 Source0:	http://dl.sourceforge.net/psi/%{name}-%{version}.tar.bz2
-# Source0-md5:	da273e45daef04ffc8338708e96e9173
+# Source0-md5:	ddc1a2a35dc155ca46ad6ecaeccdf894
 Patch0:		%{name}-fix_configure_for_ksh.patch
 Patch1:		%{name}-desktop.patch
 Patch2:		%{name}-home_etc.patch
@@ -19,7 +19,6 @@
 Patch7:		%{name}-appearance-mod.patch
 # http://machekku.uaznia.net/xmpp/psi/patches/
 Patch8:		%{name}-machekku-avatars_in_tooltip.patch
-Patch9:		%{name}-qt4.5.patch
 URL:		http://psi-im.org/
 BuildRequires:	Qt3Support-devel
 BuildRequires:	QtCore-devel
@@ -29,8 +28,8 @@
 BuildRequires:	libstdc++-devel
 BuildRequires:	openssl-devel >= 0.9.7c
 BuildRequires:	qca-devel >= 2.0.0
-BuildRequires:	qt4-build >= 4.3.3-3
-BuildRequires:	qt4-qmake >= 4.3.3-3
+BuildRequires:	qt4-build >= 4.4.0
+BuildRequires:	qt4-qmake >= 4.4.0
 #BuildRequires:	QtDBus-devel >= 4.3.3-3
 BuildRequires:	which
 BuildRequires:	xorg-lib-libX11-devel
@@ -70,7 +69,6 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p0
 
 rm -rf third-party
 
@@ -110,6 +108,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.171  2009/07/28 21:03:51  arekm
+- up to 0.13
+
 Revision 1.170  2009/06/30 16:54:22  hawk
 - release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/psi/psi-appearance-mod.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/psi/psi-desktop.patch?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/psi/psi-empty_group-fix.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/psi/psi-fix_configure_for_ksh.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/psi/psi.spec?r1=1.170&r2=1.171&f=u



More information about the pld-cvs-commit mailing list