[arch-commits] Commit in psi/repos (20 files)
Pierre Schmitz
pierre at archlinux.org
Thu Oct 4 05:36:54 UTC 2012
Date: Thursday, October 4, 2012 @ 01:36:54
Author: pierre
Revision: 167954
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
psi/repos/extra-i686/PKGBUILD
(from rev 167953, psi/trunk/PKGBUILD)
psi/repos/extra-i686/archlinux.patch
(from rev 167953, psi/trunk/archlinux.patch)
psi/repos/extra-i686/psi.install
(from rev 167953, psi/trunk/psi.install)
psi/repos/extra-x86_64/PKGBUILD
(from rev 167953, psi/trunk/PKGBUILD)
psi/repos/extra-x86_64/archlinux.patch
(from rev 167953, psi/trunk/archlinux.patch)
psi/repos/extra-x86_64/psi.install
(from rev 167953, psi/trunk/psi.install)
Deleted:
psi/repos/extra-i686/PKGBUILD
psi/repos/extra-i686/affiliationlistconfigmuc.patch
psi/repos/extra-i686/archlinux.patch
psi/repos/extra-i686/configureroomcrash.patch
psi/repos/extra-i686/gcc-47.patch
psi/repos/extra-i686/input-validation.patch
psi/repos/extra-i686/psi.install
psi/repos/extra-x86_64/PKGBUILD
psi/repos/extra-x86_64/affiliationlistconfigmuc.patch
psi/repos/extra-x86_64/archlinux.patch
psi/repos/extra-x86_64/configureroomcrash.patch
psi/repos/extra-x86_64/gcc-47.patch
psi/repos/extra-x86_64/input-validation.patch
psi/repos/extra-x86_64/psi.install
---------------------------------------------+
extra-i686/PKGBUILD | 67 +++---
extra-i686/affiliationlistconfigmuc.patch | 92 ---------
extra-i686/archlinux.patch | 23 +-
extra-i686/configureroomcrash.patch | 40 ----
extra-i686/gcc-47.patch | 10 -
extra-i686/input-validation.patch | 257 --------------------------
extra-i686/psi.install | 23 +-
extra-x86_64/PKGBUILD | 67 +++---
extra-x86_64/affiliationlistconfigmuc.patch | 92 ---------
extra-x86_64/archlinux.patch | 23 +-
extra-x86_64/configureroomcrash.patch | 40 ----
extra-x86_64/gcc-47.patch | 10 -
extra-x86_64/input-validation.patch | 257 --------------------------
extra-x86_64/psi.install | 23 +-
14 files changed, 106 insertions(+), 918 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-10-04 05:36:12 UTC (rev 167953)
+++ extra-i686/PKGBUILD 2012-10-04 05:36:54 UTC (rev 167954)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=psi
-pkgver=0.14
-pkgrel=6
-pkgdesc='Instant messaging application designed for the Jabber IM'
-url='http://psi-im.org/'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('qca-ossl' 'qca-gnupg' 'enchant' 'libxss' 'xdg-utils')
-install='psi.install'
-source=("http://downloads.sourceforge.net/psi/psi-${pkgver}.tar.bz2"
- 'archlinux.patch' 'affiliationlistconfigmuc.patch'
- 'configureroomcrash.patch' 'gcc-47.patch' 'input-validation.patch')
-md5sums=('9d7dcce3bcab53b741a712199bd986be'
- 'a965c6a4ad1028f14a5897c3f5088ae8'
- '28258c884a0a6f2cbb297435a144ae04'
- '8291eee7110a8aa8163c2e2e38c6d491'
- 'd7acbb7b81671339d490622c74082d11'
- '259cf255ca2d2395840a25799056a58b')
-
-build() {
- cd ${srcdir}/psi-${pkgver}
- patch -p1 -i ${srcdir}/archlinux.patch
- patch -p1 -i ${srcdir}/affiliationlistconfigmuc.patch
- patch -p1 -i ${srcdir}/configureroomcrash.patch
- patch -p0 -i ${srcdir}/gcc-47.patch
- patch -p0 -i ${srcdir}/input-validation.patch
- ./configure --prefix=/usr --disable-bundled-qca --release --no-separate-debug-info
- make
-}
-
-package() {
- cd ${srcdir}/psi-${pkgver}
- make INSTALL_ROOT=${pkgdir} install
-}
Copied: psi/repos/extra-i686/PKGBUILD (from rev 167953, psi/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-10-04 05:36:54 UTC (rev 167954)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=psi
+pkgver=0.15
+pkgrel=1
+pkgdesc='Instant messaging application designed for the Jabber IM'
+url='http://psi-im.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+depends=('qca-ossl' 'qca-gnupg' 'enchant' 'libxss' 'xdg-utils')
+makedepends=('icu')
+install='psi.install'
+source=("http://downloads.sourceforge.net/psi/psi-${pkgver}.tar.bz2"
+ 'archlinux.patch')
+md5sums=('aea15f17cf93e7cea52f305523f761be'
+ '2ed44ef84007b5b7f9a3f0a4f5f6a86d')
+
+build() {
+ cd ${srcdir}/psi-${pkgver}
+ patch -p0 -i ${srcdir}/archlinux.patch
+ ./configure --prefix=/usr --release --no-separate-debug-info
+ make
+}
+
+package() {
+ cd ${srcdir}/psi-${pkgver}
+ make INSTALL_ROOT=${pkgdir} install
+ rm -rf ${pkgdir}/usr/share/psi/certs/
+}
Deleted: extra-i686/affiliationlistconfigmuc.patch
===================================================================
--- extra-i686/affiliationlistconfigmuc.patch 2012-10-04 05:36:12 UTC (rev 167953)
+++ extra-i686/affiliationlistconfigmuc.patch 2012-10-04 05:36:54 UTC (rev 167954)
@@ -1,92 +0,0 @@
-commit ef1df7a42e7aa7b6bfb1dca5b86b303f71739fc4
-Author: Rion <rion4ik at gmail.com>
-Date: Fri Dec 3 16:39:56 2010 +0500
-
- Fixed changing affiliations list from muc config dialog
-
-diff --git a/src/mucaffiliationsview.cpp b/src/mucaffiliationsview.cpp
-index 8632c43..94adcec 100644
---- a/src/mucaffiliationsview.cpp
-+++ b/src/mucaffiliationsview.cpp
-@@ -33,30 +33,6 @@ MUCAffiliationsView::MUCAffiliationsView(QWidget* parent) : QTreeView(parent)
- setDropIndicatorShown(true);
- }
-
--bool MUCAffiliationsView::addToCurrent(const QString& j)
--{
-- QModelIndex index = currentIndex();
-- if (!index.isValid())
-- return false;
--
-- if (index.parent().isValid())
-- index = index.parent();
--
-- if (!index.parent().isValid()) {
-- XMPP::Jid jid(j);
-- if (!jid.isValid())
-- return false;
--
-- // TODO: Check if the user is already in the list
--
-- int row = model()->rowCount(index);
-- model()->insertRows(row,1,index);
-- model()->setData(model()->index(row,0,index),QVariant(jid.bare()));
-- return true;
-- }
-- return false;
--}
--
- void MUCAffiliationsView::removeCurrent()
- {
- QModelIndex index = currentIndex();
-diff --git a/src/mucaffiliationsview.h b/src/mucaffiliationsview.h
-index 11f1446..54ee0ff 100644
---- a/src/mucaffiliationsview.h
-+++ b/src/mucaffiliationsview.h
-@@ -32,7 +32,6 @@ public:
-
- public slots:
- void removeCurrent();
-- bool addToCurrent(const QString&);
-
- signals:
- void addEnabled(bool);
-diff --git a/src/mucconfigdlg.cpp b/src/mucconfigdlg.cpp
-index a10f14e..dcf4a35 100644
---- a/src/mucconfigdlg.cpp
-+++ b/src/mucconfigdlg.cpp
-@@ -158,9 +158,31 @@ void MUCConfigDlg::add()
- {
- bool ok;
- QString text = QInputDialog::getText(this, tr("Add affiliation"), tr("Enter the JID of the user:"), QLineEdit::Normal, "", &ok);
-- if (ok) {
-- if (text.isEmpty() || !ui_.tv_affiliations->addToCurrent(text))
-- QMessageBox::critical(this, tr("Error"), tr("You have entered an invalid JID."));
-+ if (ok && ui_.tv_affiliations->currentIndex().isValid()) {
-+ if (!text.isEmpty()) {
-+
-+ QModelIndex index = affiliations_proxy_model_->mapToSource(ui_.tv_affiliations->currentIndex());
-+
-+ if (index.parent().isValid())
-+ index = index.parent();
-+
-+ if (!index.parent().isValid()) {
-+ XMPP::Jid jid(text);
-+ if (jid.isValid()) {
-+
-+ // TODO: Check if the user is already in the list
-+
-+ int row = affiliations_model_->rowCount(index);
-+ affiliations_model_->insertRows(row,1,index);
-+ QModelIndex newIndex = affiliations_model_->index(row,0,index);
-+ affiliations_model_->setData(newIndex, QVariant(jid.bare()));
-+ ui_.tv_affiliations->setCurrentIndex(affiliations_proxy_model_->mapFromSource(newIndex));
-+ return;
-+ }
-+ }
-+ }
-+
-+ QMessageBox::critical(this, tr("Error"), tr("You have entered an invalid JID."));
- }
- }
-
Deleted: extra-i686/archlinux.patch
===================================================================
--- extra-i686/archlinux.patch 2012-10-04 05:36:12 UTC (rev 167953)
+++ extra-i686/archlinux.patch 2012-10-04 05:36:54 UTC (rev 167954)
@@ -1,12 +0,0 @@
-diff -aur psi-0.12.old/src/systeminfo.cpp psi-0.12/src/systeminfo.cpp
---- psi-0.12.old/src/systeminfo.cpp 2007-04-08 10:37:46.000000000 +0200
-+++ psi-0.12/src/systeminfo.cpp 2009-05-11 15:09:14.000000000 +0200
-@@ -89,7 +89,7 @@
- { LinuxSlackware, OsAppendFile, "/etc/slackware-version", "Slackware Linux" },
- { LinuxPLD, OsUseFile, "/etc/pld-release", "PLD Linux" },
- { LinuxAurox, OsUseName, "/etc/aurox-release", "Aurox Linux" },
-- { LinuxArch, OsUseFile, "/etc/arch-release", "Arch Linux" },
-+ { LinuxArch, OsUseName, "/etc/arch-release", "Arch Linux" },
- { LinuxLFS, OsAppendFile, "/etc/lfs-release", "LFS Linux" },
-
- // untested
Copied: psi/repos/extra-i686/archlinux.patch (from rev 167953, psi/trunk/archlinux.patch)
===================================================================
--- extra-i686/archlinux.patch (rev 0)
+++ extra-i686/archlinux.patch 2012-10-04 05:36:54 UTC (rev 167954)
@@ -0,0 +1,11 @@
+--- src/systeminfo.cpp 2012-10-04 02:53:03.000000000 +0200
++++ src/systeminfo.cpp 2012-10-04 07:18:45.111088591 +0200
+@@ -114,7 +114,7 @@
+ { LinuxSlackware, OsAppendFile, "/etc/slackware-version", "Slackware Linux" },
+ { LinuxPLD, OsUseFile, "/etc/pld-release", "PLD Linux" },
+ { LinuxAurox, OsUseName, "/etc/aurox-release", "Aurox Linux" },
+- { LinuxArch, OsUseFile, "/etc/arch-release", "Arch Linux" },
++ { LinuxArch, OsUseName, "/etc/arch-release", "Arch Linux" },
+ { LinuxLFS, OsAppendFile, "/etc/lfs-release", "LFS Linux" },
+
+ // untested
Deleted: extra-i686/configureroomcrash.patch
===================================================================
--- extra-i686/configureroomcrash.patch 2012-10-04 05:36:12 UTC (rev 167953)
+++ extra-i686/configureroomcrash.patch 2012-10-04 05:36:54 UTC (rev 167954)
@@ -1,40 +0,0 @@
-commit ec91add0e6398ad20c7a8f14a1a08c5e3282c5bd
-Author: Michail Pishchagin <mblsha at users.sourceforge.net>
-Date: Tue Oct 19 11:26:31 2010 +0400
-
- Fix crash in MUCAffiliationsModel on Qt 4.7 (closes #1087)
- Based on 1610-psi-fix-crash-in-muc-configurator.diff from Psi+
-
-diff --git a/src/mucaffiliationsmodel.cpp b/src/mucaffiliationsmodel.cpp
-index 722b762..fd0a830 100644
---- a/src/mucaffiliationsmodel.cpp
-+++ b/src/mucaffiliationsmodel.cpp
-@@ -150,15 +150,18 @@ void MUCAffiliationsModel::resetAffiliationLists()
-
- void MUCAffiliationsModel::resetAffiliationList(MUCItem::Affiliation a)
- {
-+ emit layoutAboutToBeChanged();
- enabled_[(AffiliationListIndex) affiliationToIndex(a)] = false;
- QModelIndex index = affiliationListIndex(a);
- if (hasChildren(index)) {
- removeRows(0,rowCount(index),index);
- }
-+ emit layoutChanged();
- }
-
- void MUCAffiliationsModel::setAffiliationListEnabled(MUCItem::Affiliation a, bool b)
- {
-+ emit layoutAboutToBeChanged();
- QModelIndex index = affiliationListIndex(a);
- enabled_[(AffiliationListIndex) index.row()] = b;
- emit layoutChanged();
-@@ -208,6 +211,9 @@ void MUCAffiliationsModel::addItems(const QList<MUCItem>& items)
- foreach(MUCItem item, items) {
- QModelIndex list = affiliationListIndex(item.affiliation());
- if (list.isValid() && !item.jid().isEmpty()) {
-+ if (!dirty) {
-+ emit layoutAboutToBeChanged();
-+ }
- int row = rowCount(list);
- if (row == 0) {
- enabled_[(AffiliationListIndex) list.row()] = true;
Deleted: extra-i686/gcc-47.patch
===================================================================
--- extra-i686/gcc-47.patch 2012-10-04 05:36:12 UTC (rev 167953)
+++ extra-i686/gcc-47.patch 2012-10-04 05:36:54 UTC (rev 167954)
@@ -1,10 +0,0 @@
---- iris/src/irisnet/corelib/netinterface_unix.cpp.orig 2012-01-07 19:46:39.493999646 +0100
-+++ iris/src/irisnet/corelib/netinterface_unix.cpp 2012-01-07 19:46:57.251002321 +0100
-@@ -33,6 +33,7 @@
- #include <net/route.h>
- #include <netinet/in.h>
- #include <errno.h>
-+#include <unistd.h>
-
- // for solaris
- #ifndef SIOCGIFCONF
Deleted: extra-i686/input-validation.patch
===================================================================
--- extra-i686/input-validation.patch 2012-10-04 05:36:12 UTC (rev 167953)
+++ extra-i686/input-validation.patch 2012-10-04 05:36:54 UTC (rev 167954)
@@ -1,257 +0,0 @@
-commit c68fdd9926a38b2820bc5df97fd1905355a2640d
-Author: rion <rion4ik at gmail.com>
-Date: Fri Oct 7 22:19:05 2011 +0600
-
- Fixed QLabel CVE
-
---- src/Certificates/CertificateDisplay.ui 2011-10-19 08:30:15 +0000
-+++ src/Certificates/CertificateDisplay.ui 2011-10-19 08:31:23 +0000
-@@ -1,105 +1,118 @@
--<ui version="4.0" >
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ui version="4.0">
- <class>CertificateDisplay</class>
-- <widget class="QDialog" name="CertificateDisplay" >
-- <property name="geometry" >
-+ <widget class="QDialog" name="CertificateDisplay">
-+ <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
-- <width>518</width>
-+ <width>525</width>
- <height>369</height>
- </rect>
- </property>
-- <property name="windowTitle" >
-+ <property name="windowTitle">
- <string>Certificate Information</string>
- </property>
-- <layout class="QVBoxLayout" >
-- <property name="margin" >
-+ <layout class="QVBoxLayout">
-+ <property name="spacing">
-+ <number>6</number>
-+ </property>
-+ <property name="margin">
- <number>11</number>
- </property>
-- <property name="spacing" >
-- <number>6</number>
-- </property>
- <item>
-- <layout class="QHBoxLayout" >
-- <property name="margin" >
-+ <layout class="QHBoxLayout">
-+ <property name="spacing">
-+ <number>6</number>
-+ </property>
-+ <property name="margin">
- <number>0</number>
- </property>
-- <property name="spacing" >
-- <number>6</number>
-- </property>
- <item>
-- <layout class="QVBoxLayout" >
-- <property name="margin" >
-+ <layout class="QVBoxLayout">
-+ <property name="spacing">
-+ <number>6</number>
-+ </property>
-+ <property name="margin">
- <number>0</number>
- </property>
-- <property name="spacing" >
-- <number>6</number>
-- </property>
- <item>
-- <widget class="QLabel" name="textLabel4" >
-- <property name="text" >
-+ <widget class="QLabel" name="textLabel4">
-+ <property name="text">
- <string>Certificate Validation:</string>
- </property>
- </widget>
- </item>
- <item>
-- <widget class="QLabel" name="lb_valid" >
-- <property name="text" >
-+ <widget class="QLabel" name="lb_valid">
-+ <property name="text">
- <string/>
- </property>
-+ <property name="textFormat">
-+ <enum>Qt::PlainText</enum>
-+ </property>
- </widget>
- </item>
- <item>
-- <widget class="QLabel" name="textLabel2" >
-- <property name="text" >
-+ <widget class="QLabel" name="textLabel2">
-+ <property name="text">
- <string>Valid From:</string>
- </property>
- </widget>
- </item>
- <item>
-- <widget class="QLabel" name="lb_notBefore" >
-- <property name="text" >
-+ <widget class="QLabel" name="lb_notBefore">
-+ <property name="text">
- <string/>
- </property>
-+ <property name="textFormat">
-+ <enum>Qt::PlainText</enum>
-+ </property>
- </widget>
- </item>
- <item>
-- <widget class="QLabel" name="textLabel3" >
-- <property name="text" >
-+ <widget class="QLabel" name="textLabel3">
-+ <property name="text">
- <string>Valid Until:</string>
- </property>
- </widget>
- </item>
- <item>
-- <widget class="QLabel" name="lb_notAfter" >
-- <property name="text" >
-+ <widget class="QLabel" name="lb_notAfter">
-+ <property name="text">
- <string/>
- </property>
-+ <property name="textFormat">
-+ <enum>Qt::PlainText</enum>
-+ </property>
- </widget>
- </item>
- <item>
-- <widget class="QLabel" name="textLabel1" >
-- <property name="text" >
-+ <widget class="QLabel" name="textLabel1">
-+ <property name="text">
- <string>Serial Number:</string>
- </property>
- </widget>
- </item>
- <item>
-- <widget class="QLabel" name="lb_sn" >
-- <property name="text" >
-+ <widget class="QLabel" name="lb_sn">
-+ <property name="text">
- <string/>
- </property>
-+ <property name="textFormat">
-+ <enum>Qt::PlainText</enum>
-+ </property>
- </widget>
- </item>
- <item>
- <spacer>
-- <property name="orientation" >
-+ <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
-- <property name="sizeType" >
-+ <property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
- </property>
-- <property name="sizeHint" >
-+ <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>106</height>
-@@ -110,14 +123,14 @@
- </layout>
- </item>
- <item>
-- <widget class="QTextBrowser" name="tb_cert" >
-- <property name="minimumSize" >
-+ <widget class="QTextBrowser" name="tb_cert">
-+ <property name="minimumSize">
- <size>
- <width>350</width>
- <height>300</height>
- </size>
- </property>
-- <property name="horizontalScrollBarPolicy" >
-+ <property name="horizontalScrollBarPolicy">
- <enum>Qt::ScrollBarAlwaysOff</enum>
- </property>
- </widget>
-@@ -125,35 +138,35 @@
- </layout>
- </item>
- <item>
-- <widget class="Line" name="line1" >
-- <property name="frameShape" >
-+ <widget class="Line" name="line1">
-+ <property name="frameShape">
- <enum>QFrame::HLine</enum>
- </property>
-- <property name="frameShadow" >
-+ <property name="frameShadow">
- <enum>QFrame::Sunken</enum>
- </property>
-- <property name="orientation" >
-+ <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- <item>
-- <layout class="QHBoxLayout" >
-- <property name="margin" >
-+ <layout class="QHBoxLayout">
-+ <property name="spacing">
-+ <number>6</number>
-+ </property>
-+ <property name="margin">
- <number>0</number>
- </property>
-- <property name="spacing" >
-- <number>6</number>
-- </property>
- <item>
- <spacer>
-- <property name="orientation" >
-+ <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
-- <property name="sizeType" >
-+ <property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
- </property>
-- <property name="sizeHint" >
-+ <property name="sizeHint" stdset="0">
- <size>
- <width>421</width>
- <height>20</height>
-@@ -162,17 +175,17 @@
- </spacer>
- </item>
- <item>
-- <widget class="QPushButton" native="1" name="pb_close">
-- <property name="text">
-- <string>Close</string>
-- </property>
-- </widget>
-+ <widget class="QPushButton" name="pb_close">
-+ <property name="text">
-+ <string>Close</string>
-+ </property>
-+ </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
-- <layoutdefault spacing="6" margin="11" />
-+ <layoutdefault spacing="6" margin="11"/>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <tabstops>
- <tabstop>tb_cert</tabstop>
-
Deleted: extra-i686/psi.install
===================================================================
--- extra-i686/psi.install 2012-10-04 05:36:12 UTC (rev 167953)
+++ extra-i686/psi.install 2012-10-04 05:36:54 UTC (rev 167954)
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: psi/repos/extra-i686/psi.install (from rev 167953, psi/trunk/psi.install)
===================================================================
--- extra-i686/psi.install (rev 0)
+++ extra-i686/psi.install 2012-10-04 05:36:54 UTC (rev 167954)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-10-04 05:36:12 UTC (rev 167953)
+++ extra-x86_64/PKGBUILD 2012-10-04 05:36:54 UTC (rev 167954)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=psi
-pkgver=0.14
-pkgrel=6
-pkgdesc='Instant messaging application designed for the Jabber IM'
-url='http://psi-im.org/'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('qca-ossl' 'qca-gnupg' 'enchant' 'libxss' 'xdg-utils')
-install='psi.install'
-source=("http://downloads.sourceforge.net/psi/psi-${pkgver}.tar.bz2"
- 'archlinux.patch' 'affiliationlistconfigmuc.patch'
- 'configureroomcrash.patch' 'gcc-47.patch' 'input-validation.patch')
-md5sums=('9d7dcce3bcab53b741a712199bd986be'
- 'a965c6a4ad1028f14a5897c3f5088ae8'
- '28258c884a0a6f2cbb297435a144ae04'
- '8291eee7110a8aa8163c2e2e38c6d491'
- 'd7acbb7b81671339d490622c74082d11'
- '259cf255ca2d2395840a25799056a58b')
-
-build() {
- cd ${srcdir}/psi-${pkgver}
- patch -p1 -i ${srcdir}/archlinux.patch
- patch -p1 -i ${srcdir}/affiliationlistconfigmuc.patch
- patch -p1 -i ${srcdir}/configureroomcrash.patch
- patch -p0 -i ${srcdir}/gcc-47.patch
- patch -p0 -i ${srcdir}/input-validation.patch
- ./configure --prefix=/usr --disable-bundled-qca --release --no-separate-debug-info
- make
-}
-
-package() {
- cd ${srcdir}/psi-${pkgver}
- make INSTALL_ROOT=${pkgdir} install
-}
Copied: psi/repos/extra-x86_64/PKGBUILD (from rev 167953, psi/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-10-04 05:36:54 UTC (rev 167954)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=psi
+pkgver=0.15
+pkgrel=1
+pkgdesc='Instant messaging application designed for the Jabber IM'
+url='http://psi-im.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+depends=('qca-ossl' 'qca-gnupg' 'enchant' 'libxss' 'xdg-utils')
+makedepends=('icu')
+install='psi.install'
+source=("http://downloads.sourceforge.net/psi/psi-${pkgver}.tar.bz2"
+ 'archlinux.patch')
+md5sums=('aea15f17cf93e7cea52f305523f761be'
+ '2ed44ef84007b5b7f9a3f0a4f5f6a86d')
+
+build() {
+ cd ${srcdir}/psi-${pkgver}
+ patch -p0 -i ${srcdir}/archlinux.patch
+ ./configure --prefix=/usr --release --no-separate-debug-info
+ make
+}
+
+package() {
+ cd ${srcdir}/psi-${pkgver}
+ make INSTALL_ROOT=${pkgdir} install
+ rm -rf ${pkgdir}/usr/share/psi/certs/
+}
Deleted: extra-x86_64/affiliationlistconfigmuc.patch
===================================================================
--- extra-x86_64/affiliationlistconfigmuc.patch 2012-10-04 05:36:12 UTC (rev 167953)
+++ extra-x86_64/affiliationlistconfigmuc.patch 2012-10-04 05:36:54 UTC (rev 167954)
@@ -1,92 +0,0 @@
-commit ef1df7a42e7aa7b6bfb1dca5b86b303f71739fc4
-Author: Rion <rion4ik at gmail.com>
-Date: Fri Dec 3 16:39:56 2010 +0500
-
- Fixed changing affiliations list from muc config dialog
-
-diff --git a/src/mucaffiliationsview.cpp b/src/mucaffiliationsview.cpp
-index 8632c43..94adcec 100644
---- a/src/mucaffiliationsview.cpp
-+++ b/src/mucaffiliationsview.cpp
-@@ -33,30 +33,6 @@ MUCAffiliationsView::MUCAffiliationsView(QWidget* parent) : QTreeView(parent)
- setDropIndicatorShown(true);
- }
-
--bool MUCAffiliationsView::addToCurrent(const QString& j)
--{
-- QModelIndex index = currentIndex();
-- if (!index.isValid())
-- return false;
--
-- if (index.parent().isValid())
-- index = index.parent();
--
-- if (!index.parent().isValid()) {
-- XMPP::Jid jid(j);
-- if (!jid.isValid())
-- return false;
--
-- // TODO: Check if the user is already in the list
--
-- int row = model()->rowCount(index);
-- model()->insertRows(row,1,index);
-- model()->setData(model()->index(row,0,index),QVariant(jid.bare()));
-- return true;
-- }
-- return false;
--}
--
- void MUCAffiliationsView::removeCurrent()
- {
- QModelIndex index = currentIndex();
-diff --git a/src/mucaffiliationsview.h b/src/mucaffiliationsview.h
-index 11f1446..54ee0ff 100644
---- a/src/mucaffiliationsview.h
-+++ b/src/mucaffiliationsview.h
-@@ -32,7 +32,6 @@ public:
-
- public slots:
- void removeCurrent();
-- bool addToCurrent(const QString&);
-
- signals:
- void addEnabled(bool);
-diff --git a/src/mucconfigdlg.cpp b/src/mucconfigdlg.cpp
-index a10f14e..dcf4a35 100644
---- a/src/mucconfigdlg.cpp
-+++ b/src/mucconfigdlg.cpp
-@@ -158,9 +158,31 @@ void MUCConfigDlg::add()
- {
- bool ok;
- QString text = QInputDialog::getText(this, tr("Add affiliation"), tr("Enter the JID of the user:"), QLineEdit::Normal, "", &ok);
-- if (ok) {
-- if (text.isEmpty() || !ui_.tv_affiliations->addToCurrent(text))
-- QMessageBox::critical(this, tr("Error"), tr("You have entered an invalid JID."));
-+ if (ok && ui_.tv_affiliations->currentIndex().isValid()) {
-+ if (!text.isEmpty()) {
-+
-+ QModelIndex index = affiliations_proxy_model_->mapToSource(ui_.tv_affiliations->currentIndex());
-+
-+ if (index.parent().isValid())
-+ index = index.parent();
-+
-+ if (!index.parent().isValid()) {
-+ XMPP::Jid jid(text);
-+ if (jid.isValid()) {
-+
-+ // TODO: Check if the user is already in the list
-+
-+ int row = affiliations_model_->rowCount(index);
-+ affiliations_model_->insertRows(row,1,index);
-+ QModelIndex newIndex = affiliations_model_->index(row,0,index);
-+ affiliations_model_->setData(newIndex, QVariant(jid.bare()));
-+ ui_.tv_affiliations->setCurrentIndex(affiliations_proxy_model_->mapFromSource(newIndex));
-+ return;
-+ }
-+ }
-+ }
-+
-+ QMessageBox::critical(this, tr("Error"), tr("You have entered an invalid JID."));
- }
- }
-
Deleted: extra-x86_64/archlinux.patch
===================================================================
--- extra-x86_64/archlinux.patch 2012-10-04 05:36:12 UTC (rev 167953)
+++ extra-x86_64/archlinux.patch 2012-10-04 05:36:54 UTC (rev 167954)
@@ -1,12 +0,0 @@
-diff -aur psi-0.12.old/src/systeminfo.cpp psi-0.12/src/systeminfo.cpp
---- psi-0.12.old/src/systeminfo.cpp 2007-04-08 10:37:46.000000000 +0200
-+++ psi-0.12/src/systeminfo.cpp 2009-05-11 15:09:14.000000000 +0200
-@@ -89,7 +89,7 @@
- { LinuxSlackware, OsAppendFile, "/etc/slackware-version", "Slackware Linux" },
- { LinuxPLD, OsUseFile, "/etc/pld-release", "PLD Linux" },
- { LinuxAurox, OsUseName, "/etc/aurox-release", "Aurox Linux" },
-- { LinuxArch, OsUseFile, "/etc/arch-release", "Arch Linux" },
-+ { LinuxArch, OsUseName, "/etc/arch-release", "Arch Linux" },
- { LinuxLFS, OsAppendFile, "/etc/lfs-release", "LFS Linux" },
-
- // untested
Copied: psi/repos/extra-x86_64/archlinux.patch (from rev 167953, psi/trunk/archlinux.patch)
===================================================================
--- extra-x86_64/archlinux.patch (rev 0)
+++ extra-x86_64/archlinux.patch 2012-10-04 05:36:54 UTC (rev 167954)
@@ -0,0 +1,11 @@
+--- src/systeminfo.cpp 2012-10-04 02:53:03.000000000 +0200
++++ src/systeminfo.cpp 2012-10-04 07:18:45.111088591 +0200
+@@ -114,7 +114,7 @@
+ { LinuxSlackware, OsAppendFile, "/etc/slackware-version", "Slackware Linux" },
+ { LinuxPLD, OsUseFile, "/etc/pld-release", "PLD Linux" },
+ { LinuxAurox, OsUseName, "/etc/aurox-release", "Aurox Linux" },
+- { LinuxArch, OsUseFile, "/etc/arch-release", "Arch Linux" },
++ { LinuxArch, OsUseName, "/etc/arch-release", "Arch Linux" },
+ { LinuxLFS, OsAppendFile, "/etc/lfs-release", "LFS Linux" },
+
+ // untested
Deleted: extra-x86_64/configureroomcrash.patch
===================================================================
--- extra-x86_64/configureroomcrash.patch 2012-10-04 05:36:12 UTC (rev 167953)
+++ extra-x86_64/configureroomcrash.patch 2012-10-04 05:36:54 UTC (rev 167954)
@@ -1,40 +0,0 @@
-commit ec91add0e6398ad20c7a8f14a1a08c5e3282c5bd
-Author: Michail Pishchagin <mblsha at users.sourceforge.net>
-Date: Tue Oct 19 11:26:31 2010 +0400
-
- Fix crash in MUCAffiliationsModel on Qt 4.7 (closes #1087)
- Based on 1610-psi-fix-crash-in-muc-configurator.diff from Psi+
-
-diff --git a/src/mucaffiliationsmodel.cpp b/src/mucaffiliationsmodel.cpp
-index 722b762..fd0a830 100644
---- a/src/mucaffiliationsmodel.cpp
-+++ b/src/mucaffiliationsmodel.cpp
-@@ -150,15 +150,18 @@ void MUCAffiliationsModel::resetAffiliationLists()
-
- void MUCAffiliationsModel::resetAffiliationList(MUCItem::Affiliation a)
- {
-+ emit layoutAboutToBeChanged();
- enabled_[(AffiliationListIndex) affiliationToIndex(a)] = false;
- QModelIndex index = affiliationListIndex(a);
- if (hasChildren(index)) {
- removeRows(0,rowCount(index),index);
- }
-+ emit layoutChanged();
- }
-
- void MUCAffiliationsModel::setAffiliationListEnabled(MUCItem::Affiliation a, bool b)
- {
-+ emit layoutAboutToBeChanged();
- QModelIndex index = affiliationListIndex(a);
- enabled_[(AffiliationListIndex) index.row()] = b;
- emit layoutChanged();
-@@ -208,6 +211,9 @@ void MUCAffiliationsModel::addItems(const QList<MUCItem>& items)
- foreach(MUCItem item, items) {
- QModelIndex list = affiliationListIndex(item.affiliation());
- if (list.isValid() && !item.jid().isEmpty()) {
-+ if (!dirty) {
-+ emit layoutAboutToBeChanged();
-+ }
- int row = rowCount(list);
- if (row == 0) {
- enabled_[(AffiliationListIndex) list.row()] = true;
Deleted: extra-x86_64/gcc-47.patch
===================================================================
--- extra-x86_64/gcc-47.patch 2012-10-04 05:36:12 UTC (rev 167953)
+++ extra-x86_64/gcc-47.patch 2012-10-04 05:36:54 UTC (rev 167954)
@@ -1,10 +0,0 @@
---- iris/src/irisnet/corelib/netinterface_unix.cpp.orig 2012-01-07 19:46:39.493999646 +0100
-+++ iris/src/irisnet/corelib/netinterface_unix.cpp 2012-01-07 19:46:57.251002321 +0100
-@@ -33,6 +33,7 @@
- #include <net/route.h>
- #include <netinet/in.h>
- #include <errno.h>
-+#include <unistd.h>
-
- // for solaris
- #ifndef SIOCGIFCONF
Deleted: extra-x86_64/input-validation.patch
===================================================================
--- extra-x86_64/input-validation.patch 2012-10-04 05:36:12 UTC (rev 167953)
+++ extra-x86_64/input-validation.patch 2012-10-04 05:36:54 UTC (rev 167954)
@@ -1,257 +0,0 @@
-commit c68fdd9926a38b2820bc5df97fd1905355a2640d
-Author: rion <rion4ik at gmail.com>
-Date: Fri Oct 7 22:19:05 2011 +0600
-
- Fixed QLabel CVE
-
---- src/Certificates/CertificateDisplay.ui 2011-10-19 08:30:15 +0000
-+++ src/Certificates/CertificateDisplay.ui 2011-10-19 08:31:23 +0000
-@@ -1,105 +1,118 @@
--<ui version="4.0" >
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ui version="4.0">
- <class>CertificateDisplay</class>
-- <widget class="QDialog" name="CertificateDisplay" >
-- <property name="geometry" >
-+ <widget class="QDialog" name="CertificateDisplay">
-+ <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
-- <width>518</width>
-+ <width>525</width>
- <height>369</height>
- </rect>
- </property>
-- <property name="windowTitle" >
-+ <property name="windowTitle">
- <string>Certificate Information</string>
- </property>
-- <layout class="QVBoxLayout" >
-- <property name="margin" >
-+ <layout class="QVBoxLayout">
-+ <property name="spacing">
-+ <number>6</number>
-+ </property>
-+ <property name="margin">
- <number>11</number>
- </property>
-- <property name="spacing" >
-- <number>6</number>
-- </property>
- <item>
-- <layout class="QHBoxLayout" >
-- <property name="margin" >
-+ <layout class="QHBoxLayout">
-+ <property name="spacing">
-+ <number>6</number>
-+ </property>
-+ <property name="margin">
- <number>0</number>
- </property>
-- <property name="spacing" >
-- <number>6</number>
-- </property>
- <item>
-- <layout class="QVBoxLayout" >
-- <property name="margin" >
-+ <layout class="QVBoxLayout">
-+ <property name="spacing">
-+ <number>6</number>
-+ </property>
-+ <property name="margin">
- <number>0</number>
- </property>
-- <property name="spacing" >
-- <number>6</number>
-- </property>
- <item>
-- <widget class="QLabel" name="textLabel4" >
-- <property name="text" >
-+ <widget class="QLabel" name="textLabel4">
-+ <property name="text">
- <string>Certificate Validation:</string>
- </property>
- </widget>
- </item>
- <item>
-- <widget class="QLabel" name="lb_valid" >
-- <property name="text" >
-+ <widget class="QLabel" name="lb_valid">
-+ <property name="text">
- <string/>
- </property>
-+ <property name="textFormat">
-+ <enum>Qt::PlainText</enum>
-+ </property>
- </widget>
- </item>
- <item>
-- <widget class="QLabel" name="textLabel2" >
-- <property name="text" >
-+ <widget class="QLabel" name="textLabel2">
-+ <property name="text">
- <string>Valid From:</string>
- </property>
- </widget>
- </item>
- <item>
-- <widget class="QLabel" name="lb_notBefore" >
-- <property name="text" >
-+ <widget class="QLabel" name="lb_notBefore">
-+ <property name="text">
- <string/>
- </property>
-+ <property name="textFormat">
-+ <enum>Qt::PlainText</enum>
-+ </property>
- </widget>
- </item>
- <item>
-- <widget class="QLabel" name="textLabel3" >
-- <property name="text" >
-+ <widget class="QLabel" name="textLabel3">
-+ <property name="text">
- <string>Valid Until:</string>
- </property>
- </widget>
- </item>
- <item>
-- <widget class="QLabel" name="lb_notAfter" >
-- <property name="text" >
-+ <widget class="QLabel" name="lb_notAfter">
-+ <property name="text">
- <string/>
- </property>
-+ <property name="textFormat">
-+ <enum>Qt::PlainText</enum>
-+ </property>
- </widget>
- </item>
- <item>
-- <widget class="QLabel" name="textLabel1" >
-- <property name="text" >
-+ <widget class="QLabel" name="textLabel1">
-+ <property name="text">
- <string>Serial Number:</string>
- </property>
- </widget>
- </item>
- <item>
-- <widget class="QLabel" name="lb_sn" >
-- <property name="text" >
-+ <widget class="QLabel" name="lb_sn">
-+ <property name="text">
- <string/>
- </property>
-+ <property name="textFormat">
-+ <enum>Qt::PlainText</enum>
-+ </property>
- </widget>
- </item>
- <item>
- <spacer>
-- <property name="orientation" >
-+ <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
-- <property name="sizeType" >
-+ <property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
- </property>
-- <property name="sizeHint" >
-+ <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>106</height>
-@@ -110,14 +123,14 @@
- </layout>
- </item>
- <item>
-- <widget class="QTextBrowser" name="tb_cert" >
-- <property name="minimumSize" >
-+ <widget class="QTextBrowser" name="tb_cert">
-+ <property name="minimumSize">
- <size>
- <width>350</width>
- <height>300</height>
- </size>
- </property>
-- <property name="horizontalScrollBarPolicy" >
-+ <property name="horizontalScrollBarPolicy">
- <enum>Qt::ScrollBarAlwaysOff</enum>
- </property>
- </widget>
-@@ -125,35 +138,35 @@
- </layout>
- </item>
- <item>
-- <widget class="Line" name="line1" >
-- <property name="frameShape" >
-+ <widget class="Line" name="line1">
-+ <property name="frameShape">
- <enum>QFrame::HLine</enum>
- </property>
-- <property name="frameShadow" >
-+ <property name="frameShadow">
- <enum>QFrame::Sunken</enum>
- </property>
-- <property name="orientation" >
-+ <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- <item>
-- <layout class="QHBoxLayout" >
-- <property name="margin" >
-+ <layout class="QHBoxLayout">
-+ <property name="spacing">
-+ <number>6</number>
-+ </property>
-+ <property name="margin">
- <number>0</number>
- </property>
-- <property name="spacing" >
-- <number>6</number>
-- </property>
- <item>
- <spacer>
-- <property name="orientation" >
-+ <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
-- <property name="sizeType" >
-+ <property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
- </property>
-- <property name="sizeHint" >
-+ <property name="sizeHint" stdset="0">
- <size>
- <width>421</width>
- <height>20</height>
-@@ -162,17 +175,17 @@
- </spacer>
- </item>
- <item>
-- <widget class="QPushButton" native="1" name="pb_close">
-- <property name="text">
-- <string>Close</string>
-- </property>
-- </widget>
-+ <widget class="QPushButton" name="pb_close">
-+ <property name="text">
-+ <string>Close</string>
-+ </property>
-+ </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
-- <layoutdefault spacing="6" margin="11" />
-+ <layoutdefault spacing="6" margin="11"/>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <tabstops>
- <tabstop>tb_cert</tabstop>
-
Deleted: extra-x86_64/psi.install
===================================================================
--- extra-x86_64/psi.install 2012-10-04 05:36:12 UTC (rev 167953)
+++ extra-x86_64/psi.install 2012-10-04 05:36:54 UTC (rev 167954)
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: psi/repos/extra-x86_64/psi.install (from rev 167953, psi/trunk/psi.install)
===================================================================
--- extra-x86_64/psi.install (rev 0)
+++ extra-x86_64/psi.install 2012-10-04 05:36:54 UTC (rev 167954)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list