Hello community, here is the log from the commit of package psi+ for openSUSE:Factory checked in at 2015-03-30 19:32:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/psi+ (Old) and /work/SRC/openSUSE:Factory/.psi+.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "psi+" Changes: -------- --- /work/SRC/openSUSE:Factory/psi+/psi+.changes 2015-01-15 15:59:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.psi+.new/psi+.changes 2015-03-30 19:32:35.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Mar 17 09:44:10 UTC 2015 - [email protected] + +- update to 20150227 + * updated translations + * some bugfixes +- port to qt5 ready, waiting for fixed packages to reach factory +- added kill-Q_WS_X11.patch +- added qca-qt5.patch +- added proper-activate.patch + +------------------------------------------------------------------- Old: ---- psi+-20150103.tar.xz New: ---- kill-Q_WS_X11.patch proper-activate.patch psi+-20150227.tar.xz qca-qt5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ psi+.spec ++++++ --- /var/tmp/diff_new_pack.Rrlzlm/_old 2015-03-30 19:32:36.000000000 +0200 +++ /var/tmp/diff_new_pack.Rrlzlm/_new 2015-03-30 19:32:36.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package psi+ # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,31 +15,50 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%if 0%{?suse_version} > 1320 +#%%define with_qt5 1 +%endif Name: psi+ Url: http://code.google.com/p/psi-dev/ -Version: 20150103 +Version: 20150227 Release: 0 Summary: Jabber client using Qt License: GPL-2.0+ Group: Productivity/Networking/Talk/Clients Source0: psi+-%{version}.tar.xz Source1: psi-plus-l10n-1.tar.xz +Patch0: kill-Q_WS_X11.patch +Patch1: proper-activate.patch +Patch100: qca-qt5.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: aspell-devel BuildRequires: fdupes BuildRequires: gdb BuildRequires: libidn-devel BuildRequires: libproxy-devel -BuildRequires: libqca2-devel -%if 0%{?suse_version} < 1230 -BuildRequires: libotr-devel -%else BuildRequires: libotr2-devel -%endif BuildRequires: gcc-c++ +%if 0%{?with_qt5} +BuildRequires: pkgconfig(qca2-qt5) +BuildRequires: pkgconfig(Qt5Concurrent) +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5DBus) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Multimedia) +BuildRequires: pkgconfig(Qt5PrintSupport) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5WebKit) +BuildRequires: pkgconfig(Qt5WebKitWidgets) +BuildRequires: pkgconfig(Qt5X11Extras) +BuildRequires: pkgconfig(Qt5Xml) +BuildRequires: libqt5-linguist +BuildRequires: qconf +%else +BuildRequires: libqca2-devel BuildRequires: libQtWebKit-devel BuildRequires: libqt4-devel +%endif BuildRequires: libtidy-devel BuildRequires: openssl-devel BuildRequires: update-desktop-files @@ -314,6 +333,13 @@ %prep %setup -q -b 1 +%patch0 -p1 +%patch1 -p1 + +%if 0%{?with_qt5} +%patch100 -p1 +sed -i 's@\<lrelease\>@&-qt5@' ../psi-plus-l10n-1/update-repo.sh +%endif # generic/antievil does not build (yet) # generic/consoledump does not build (yet) @@ -323,23 +349,62 @@ # generic/null is a nop # generic/python does not build (needs old python 2 and has invalid -I) # generic/urlwatcher does not build (yet) -%define plugins generic/attentionplugin generic/autoreplyplugin generic/birthdayreminderplugin generic/captchaformsplugin generic/cleanerplugin generic/clientswitcherplugin generic/conferenceloggerplugin generic/contentdownloaderplugin generic/extendedmenuplugin generic/extendedoptionsplugin generic/gmailserviceplugin generic/gnupgplugin generic/gomokugameplugin generic/historykeeperplugin generic/chessplugin generic/icqdieplugin generic/imageplugin generic/jabberdiskplugin generic/juickplugin generic/otrplugin generic/pepchangenotifyplugin generic/qipxstatusesplugin generic/screenshotplugin generic/skinsplugin generic/stopspamplugin generic/storagenotesplugin generic/translateplugin generic/videostatusplugin generic/watcherplugin unix/gnome3supportplugin +GENERIC_PLUGINS="attentionplugin autoreplyplugin birthdayreminderplugin + captchaformsplugin cleanerplugin clientswitcherplugin + conferenceloggerplugin contentdownloaderplugin extendedmenuplugin + extendedoptionsplugin gmailserviceplugin gnupgplugin gomokugameplugin + historykeeperplugin chessplugin icqdieplugin imageplugin + jabberdiskplugin juickplugin otrplugin pepchangenotifyplugin + qipxstatusesplugin screenshotplugin skinsplugin stopspamplugin + storagenotesplugin translateplugin videostatusplugin watcherplugin" +UNIX_PLUGINS="gnome3supportplugin" +PLUGINS="`echo -n $GENERIC_PLUGINS | sed 's@\<@generic/@g'`" +PLUGINS="$PLUGINS `echo -n $UNIX_PLUGINS | sed 's@\<@unix/@g'`" + +%if 0%{?with_qt5} +QMAKE=qmake-qt5 +%else +QMAKE=qmake +%endif + +# generate Makefile for plugins +cat >src/plugins/Makefile <<EOF +SUBDIRS=$PLUGINS +PLUGINS_PATH=/usr/lib64/ +INSTALL=install + +all: \$(SUBDIRS) + +install: + \$(INSTALL) -d \$(PLUGINS_PATH) + for DIR in \$(SUBDIRS); do \ + PLUGIN="lib\`basename \$\$DIR\`.so"; \ + \$(INSTALL) -m 755 \$\$DIR/\$\$PLUGIN \$(PLUGINS_PATH); \ + done + +\$(SUBDIRS):: + cd \$@; $QMAKE + \$(MAKE) -C \$@ \$(MAKECMDGOALS) +EOF %build +%if 0%{?with_qt5} +qconf +%endif # do not use %%configure - not real configure script export QMAKE_CXXFLAGS="%{optflags}" ./configure --prefix=%{_prefix} --libdir=%{_libdir} \ --enable-plugins \ --enable-webkit \ --enable-whiteboarding \ +%if 0%{?with_qt5} + --with-qca-inc=/usr/include/qt5/Qca-qt5/ \ + --with-qca-lib=/usr/lib64 \ +%endif --debug --no-separate-debug-info make %{?_smp_mflags} -for i in %plugins; do - cd %{_builddir}/psi+-%{version}/src/plugins/$i/ - qmake - make %{?_smp_mflags} -done +make -C src/plugins %{?_smp_mflags} cd %{_builddir}/psi-plus-l10n-1/ ./update-repo.sh make @@ -349,12 +414,13 @@ rm -f %{buildroot}%{_datadir}/psi-plus/{COPYING,README} rm -f %{buildroot}%{_datadir}/psi-plus/iconsets/emoticons/utils/smiles_conv.zip %suse_update_desktop_file psi-plus + +# plugins +make -C src/plugins %{?_smp_mflags} install \ + PLUGINS_PATH="%{buildroot}%{pluginspath}" + +# translations install -m 0644 -t %{buildroot}%{_datadir}/psi-plus ../psi-plus-l10n-1/out/*.qm -mkdir -p %{buildroot}%{_libdir}/psi-plus/plugins -for i in %plugins; do - file="lib`basename $i`.so" - install -m 755 %{_builddir}/psi+-%{version}/src/plugins/$i/$file %{buildroot}%{pluginspath} -done %fdupes $RPM_BUILD_ROOT/%{_datadir} ++++++ kill-Q_WS_X11.patch ++++++ From: Jiri Slaby <[email protected]> QT5 does not define Q_WS_X11. So define it because we have X11 :). --- src/plugins/generic/videostatusplugin/videostatusplugin.cpp | 4 ++++ 1 file changed, 4 insertions(+) --- a/src/plugins/generic/videostatusplugin/videostatusplugin.cpp +++ b/src/plugins/generic/videostatusplugin/videostatusplugin.cpp @@ -28,6 +28,10 @@ #include "ui_options.h" +#ifndef Q_WS_X11 +#define Q_WS_X11 1 +#endif + #ifdef Q_WS_WIN #include "windows.h" #elif defined (Q_WS_X11) ++++++ proper-activate.patch ++++++ From: Jiri Slaby <[email protected]> With QT5, this tries to load kdeui.so which loads libqt4 -> boom. Instead of the hack, properly send an alert for the widget. --- src/common.cpp | 13 +------------ src/tools/advwidget/advwidget.cpp | 4 ++++ 2 files changed, 5 insertions(+), 12 deletions(-) --- a/src/common.cpp +++ b/src/common.cpp @@ -586,18 +586,7 @@ void bringToFront(QWidget *widget, bool) w->raise(); w->activateWindow(); - // hack to real bring to front in kde. kde (at least 4.8.5) forbids stilling - // focus from other applications. this may be fixed on more recent versions. - // should be removed some day. preferable way for such hacks is plugins. - // probably works only with gcc. - if (qgetenv("DESKTOP_SESSION") == "kde-plasma") { - typedef int (*ActWinFunction)(WId, long); - ActWinFunction kwinActivateWindow = (ActWinFunction)QLibrary::resolve( - "libkdeui", 5, "_ZN13KWindowSystem17forceActiveWindowEml"); - if (kwinActivateWindow) { - kwinActivateWindow(widget->winId(), 0); - } - } + QApplication::alert(w); } bool operator!=(const QMap<QString, QString> &m1, const QMap<QString, QString> &m2) --- a/src/tools/advwidget/advwidget.cpp +++ b/src/tools/advwidget/advwidget.cpp @@ -229,6 +229,9 @@ bool GAdvancedWidget::Private::flashing( void GAdvancedWidget::Private::doFlash(bool yes) { + if (yes) + QApplication::alert(parentWidget_->window()); + flashing_ = yes; if (parentWidget_->window() != parentWidget_) return; @@ -285,6 +288,7 @@ void GAdvancedWidget::Private::doFlash(b } XSendEvent(xdisplay, rootwin, False, (SubstructureRedirectMask | SubstructureNotifyMask), &e); + qDebug() << "tried to flash a window"; #else Q_UNUSED(yes) #endif ++++++ psi+-20150103.tar.xz -> psi+-20150227.tar.xz ++++++ /work/SRC/openSUSE:Factory/psi+/psi+-20150103.tar.xz /work/SRC/openSUSE:Factory/.psi+.new/psi+-20150227.tar.xz differ: char 25, line 1 ++++++ psi-plus-l10n-1.tar.xz ++++++ ++++ 27837 lines of diff (skipped) ++++++ qca-qt5.patch ++++++ From: Jiri Slaby <[email protected]> qca for qt5 is named qca-qt5, not qca. Fix this. --- iris/qcm/qca.qcm | 2 +- qcm/qca.qcm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- a/iris/qcm/qca.qcm +++ b/iris/qcm/qca.qcm @@ -31,7 +31,7 @@ static QString internal_crypto_prf(const "isEmpty(LINKAGE) {\n" " INCLUDEPATH += $$QCA_INCDIR/QtCrypto\n" " LIBS += -L$$QCA_LIBDIR\n" -" LINKAGE = -lqca\n" +" LINKAGE = -lqca-qt5\n" " CONFIG(debug, debug|release) {\n" " windows:LINKAGE = -lqcad\n" " mac:LINKAGE = -lqca_debug\n" --- a/qcm/qca.qcm +++ b/qcm/qca.qcm @@ -33,7 +33,7 @@ static QString internal_crypto_prf(const "isEmpty(LINKAGE) {\n" " !isEmpty(QCA_INCDIR):INCLUDEPATH += $$QCA_INCDIR/QtCrypto\n" " !isEmpty(QCA_LIBDIR):LIBS += -L$$QCA_LIBDIR\n" -" LINKAGE = -lqca\n" +" LINKAGE = -lqca-qt5\n" " CONFIG(debug, debug|release) {\n" " windows:LINKAGE = -lqcad\n" " mac:LINKAGE = -lqca_debug\n"
