commit akonadi-google for openSUSE:Factory
Hello community,
here is the log from the commit of package akonadi-google for openSUSE:Factory
checked in at 2012-06-25 11:41:28
Comparing /work/SRC/openSUSE:Factory/akonadi-google (Old)
and /work/SRC/openSUSE:Factory/.akonadi-google.new (New)
Package is akonadi-google, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/akonadi-google/akonadi-google.changes
2012-05-07 22:43:38.0 +0200
+++ /work/SRC/openSUSE:Factory/.akonadi-google.new/akonadi-google.changes
2012-06-25 11:41:30.0 +0200
@@ -1,0 +2,8 @@
+Wed Jun 20 12:20:36 UTC 2012 - nico.laus.2...@gmx.de
+
+- backported all fixes from 0.4.1:
+ * kde#301240 – Parsing token page failed
+ * kde#300900 – Missing CMake check for QtWebKit
+ * fixed a memory leak in KGAPI::Reply (Montel Laurent)
+
+---
New:
300900-missing_cmake_check_for_QtWebKit.diff
301240-parsing_token_page.diff
fix_memleak.diff
fix_messages.diff
Other differences:
--
++ akonadi-google.spec ++
--- /var/tmp/diff_new_pack.wsaEJj/_old 2012-06-25 11:41:31.0 +0200
+++ /var/tmp/diff_new_pack.wsaEJj/_new 2012-06-25 11:41:31.0 +0200
@@ -25,6 +25,13 @@
Url:http://www.progdan.cz/
Source0:
http://www.progdan.cz/wp-content/uploads/%{name}-%{version}.tar.gz
Source1:%{name}-lang.tar.bz2
+# https://bugs.kde.org/show_bug.cgi?id=301240
+Patch0: 301240-parsing_token_page.diff
+# https://bugs.kde.org/show_bug.cgi?id=300900
+Patch1: 300900-missing_cmake_check_for_QtWebKit.diff
+# from 0.4.1:
+Patch2: fix_memleak.diff
+Patch3: fix_messages.diff
BuildRequires: fdupes
BuildRequires: libkde4-devel
BuildRequires: libkdepimlibs4-devel
@@ -66,6 +73,10 @@
%prep
%setup -q -a 1
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
echo add_subdirectory( po ) CMakeLists.txt
%build
++ 300900-missing_cmake_check_for_QtWebKit.diff ++
diff -U 3 -H -d -r -N -x .git -x .svn -- akonadi-google-0.3.1/CMakeLists.txt
akonadi-google-0.3.1.bug300900/CMakeLists.txt
--- akonadi-google-0.3.1/CMakeLists.txt 2012-04-27 15:40:31.0 +0200
+++ akonadi-google-0.3.1.bug300900/CMakeLists.txt 2012-06-20
14:03:37.547383659 +0200
@@ -4,7 +4,8 @@
cmake_policy(SET CMP0017 NEW)
endif()
-find_package(Qt4 4.7.0 REQUIRED)
+find_package(Qt4 4.7.0 REQUIRED QtCore QtWebKit QtNetwork QtXML)
+include(${QT_USE_FILE})
find_package(KDE4 4.6.0 REQUIRED)
include(KDE4Defaults)
include(MacroLibrary)
++ 301240-parsing_token_page.diff ++
diff -U 3 -H -d -r -N -x .git -x .svn --
akonadi-google-0.3.1/libkgoogle/authdialog.cpp
akonadi-google-0.3.1.bug301240/libkgoogle/authdialog.cpp
--- akonadi-google-0.3.1/libkgoogle/authdialog.cpp 2012-04-27
15:40:31.0 +0200
+++ akonadi-google-0.3.1.bug301240/libkgoogle/authdialog.cpp2012-06-20
14:19:39.406024236 +0200
@@ -102,13 +102,18 @@
}
if (url.host() == accounts.google.com url.path() ==
/o/oauth2/approval) {
-QWebElement el =
m_webiew-page()-mainFrame()-findFirstElement(textarea);
-if (el.isNull()) {
+QString title = m_webiew-title();
+QString token;
+
+if (title.startsWith(QLatin1String(success), Qt::CaseInsensitive)) {
+int pos = title.indexOf(QLatin1String(code=));
+/* Skip the 'code=' string as well */
+token = title.mid (pos + 5);
+} else {
emitError(KGoogle::AuthError, i18n(Parsing token page failed.));
return;
}
-QString token = el.toInnerXml();
if (token.isEmpty()) {
emitError(KGoogle::AuthError, i18n(Failed to obtain token.));
return;
++ fix_memleak.diff ++
diff -U 3 -H -d -r -N -x .git -x .svn --
akonadi-google-0.3.1/libkgoogle/reply.cpp
akonadi-google-0.3.1.memleak/libkgoogle/reply.cpp
--- akonadi-google-0.3.1/libkgoogle/reply.cpp 2012-04-27 15:40:31.0
+0200
+++ akonadi-google-0.3.1.memleak/libkgoogle/reply.cpp 2012-06-20
14:08:48.853358619 +0200
@@ -66,7 +66,9 @@
}
KGoogle::Reply::~Reply()
-{ }
+{
+ delete d_ptr;
+}
KGoogle::Request::RequestType KGoogle::Reply::requestType() const
{
++ fix_messages.diff ++
diff -U 3 -H -d -r -N -x .git -x .svn -- akonadi-google-0.3.1/Messages.sh
akonadi-google-0.3.1.messages/Messages.sh
--- akonadi-google-0.3.1/Messages.sh2012-04-27 15:40:31.0 +0200
+++ akonadi-google-0.3.1.messages/Messages.sh 2012-06-20 14:10:35.130056524
+0200
@@ -1,4 +1,4 @@
#! /usr/bin/env bash
$EXTRACTRC `find . -name \*.ui -o -name \*.kcfg` rc.cpp || exit 11
-$XGETTEXT `find . -name \*.cpp | grep -v '/tests/'` -o
commit akonadi-google for openSUSE:Factory
Hello community,
here is the log from the commit of package akonadi-google for openSUSE:Factory
checked in at 2012-05-07 22:43:36
Comparing /work/SRC/openSUSE:Factory/akonadi-google (Old)
and /work/SRC/openSUSE:Factory/.akonadi-google.new (New)
Package is akonadi-google, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/akonadi-google/akonadi-google.changes
2012-04-12 09:18:05.0 +0200
+++ /work/SRC/openSUSE:Factory/.akonadi-google.new/akonadi-google.changes
2012-05-07 22:43:38.0 +0200
@@ -1,0 +2,14 @@
+Sun May 6 14:45:24 UTC 2012 - asterios.dra...@gmail.com
+
+- Update to version 0.3.1:
+ * Fixed bugs and crashes:
+kde#296541 – Uncought exception in signal handler in Contacts resource
+kde#297824 – Uncought exception in signal handler in Calendar resource
+kde#297548 – Crash at akonadi start after having added a new contact
+resource
+kde#298054 - Can’t build libkgoogle with KCal
+kde#298518 – Unable to edit newly created events
+kde#298519 – Deleting events incorrectly reports an error
+ * Various improvements to libkgoogle to better work with 3rd party apps.
+
+---
Old:
akonadi-google-0.3.tar.gz
New:
akonadi-google-0.3.1.tar.gz
Other differences:
--
++ akonadi-google.spec ++
--- /var/tmp/diff_new_pack.ZL6pt8/_old 2012-05-07 22:43:40.0 +0200
+++ /var/tmp/diff_new_pack.ZL6pt8/_new 2012-05-07 22:43:40.0 +0200
@@ -17,12 +17,12 @@
Name: akonadi-google
-Version:0.3
+Version:0.3.1
Release:0
-License:GPL-3.0+
Summary:Extension for accessing your Google data
-Url:http://www.progdan.cz/
+License:GPL-3.0+
Group: System/GUI/KDE
+Url:http://www.progdan.cz/
Source0:
http://www.progdan.cz/wp-content/uploads/%{name}-%{version}.tar.gz
Source1:%{name}-lang.tar.bz2
BuildRequires: fdupes
@@ -39,14 +39,16 @@
%kde4_pimlibs_requires
%description
-An extension for accessing some Google services, such as Google Calendar,
Google Contacts and Google tasks
+An extension for accessing some Google services, such as Google Calendar,
+Google Contacts and Google tasks.
%package -n libkgoogle0
Summary:Akonadi resource to access your Google data
Group: Development/Libraries/KDE
%description -n libkgoogle0
-An extension for accessing some Google services, such as Google Calendar,
Google Contacts and Google tasks
+An extension for accessing some Google services, such as Google Calendar,
+Google Contacts and Google tasks.
%package -n libkgoogle-devel
Summary:Akonadi resource to access your Google data
@@ -57,9 +59,11 @@
Requires: libxslt-devel
%description -n libkgoogle-devel
-An extension for accessing some Google services, such as Google Calendar,
Google Contacts and Google tasks
+An extension for accessing some Google services, such as Google Calendar,
+Google Contacts and Google tasks.
%lang_package
+
%prep
%setup -q -a 1
echo add_subdirectory( po ) CMakeLists.txt
@@ -95,7 +99,7 @@
%files -n libkgoogle0
%defattr(-,root,root)
%doc LICENSE README
-%{_kde4_libdir}/libkgoogle.so.*
+%{_kde4_libdir}/libkgoogle.so.0*
%files -n libkgoogle-devel
%defattr(-,root,root)
++ akonadi-google-0.3.tar.gz - akonadi-google-0.3.1.tar.gz ++
6 lines of diff (skipped)
++ akonadi-google-lang.tar.bz2 ++
13090 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
