Re: kopete mediastreamer

2014-05-13 Thread Harald Sitter
fix committed to bzr

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Kubuntu Council Elections 2014 - Call for Nominations

2014-05-13 Thread Rohan Garg
The Kubuntu Council terms for Jonathan Riddell, Jussi Schultink, and
Scott Kitterman
expire on 2014-06-17.  This is a call for nominations for the Kubuntu
Council to elect three members.

The term will be for two years, 2014-06-17 to 2016-06-17.

As in the past, the election will be conducted using CIVS (Condorcet Internet
Voting Service - http://www.cs.cornell.edu/andru/civs.html ).  The top three
ranking vote recipients will be elected.

Schedule:

Nomination period: Now to 2014-06-1
Ballot Preparation: 2013-06-01 to 2013-06-02
Voting Period: 2014-06-02 to 2014-06-15
End Poll/Results Announced: 2014-06-16
New Term Begins: 2014-06-17

Eligibility:

All Kubuntu Members ( https://launchpad.net/~kubuntu-members/+members ) are
eligible to be nominated and to vote.  If you have a public email address in
Launchpad, you need take no further action to receive your voting ballot.  If
you do not have a public email address, please contact me offlist with the
address you'd like your ballot sent to, otherwise you will be unable to vote.

Nominations:

All Kubuntu members are eligible.  The Kubuntu Council is intended to
represent all of the Kubuntu community.  Applications from involved non-
developers are encouraged.  If you are nominating someone else, please confirm
their willingness to serve before nominating them.  Nominations should be done
in public via either kubuntu-users or kubuntu-devel mailing lists.  If there
is some extraordinary reason that precludes that, contact me directly.

Commitment:

The Kubuntu Council is the leadership body of Kubuntu.  Members of the council
are expected to be active in Kubuntu.  The Kubuntu Council has three primary
roles:
 - Approve development plans for future Kubuntu releases
 - Approve Kubuntu membership applications
 - Resolve disputes within the Kubuntu project

The time commitment is not large.  Meetings are generally only once every
several months and conducted via IRC.

Questions:

If there are questions, you can contact me (preferably) via this mailing list
or (if really necessary) via direct mail.

Rohan Garg
For the Kubuntu Council

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: kopete mediastreamer

2014-05-13 Thread Scott Kitterman
On Tuesday, May 13, 2014 10:55:33 Harald Sitter wrote:
 On Mon, May 12, 2014 at 10:47 PM, Pali Rohár pali.ro...@gmail.com wrote:
  Hello,
  
  what is reason for this kubuntu specific patch for kopete?
  
  http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kopete/vi
  ew/head:/debian/patches/kubuntu_03_no_mediastreamer_in_wlm.diff
  
  It disabling mediastreamer support in wlm even if mediastreamer
  is build dependency:
  
  http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kopete/vi
  ew/head:/debian/control#L13
  
  Are there any compile errors?
 
   * Add kubuntu_03_no_mediastramer_in_wlm.diff to stop wlm protocl
 linking against libmediastreamer which brings in libavcodecs52 which
 can not be on the CD
 
 
 can be dropped I reckon

Why?  It still can't be in the ISO.

Scott K

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_cherrypickpatches into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src

2014-05-13 Thread Timo Jyrinki
Timo Jyrinki has proposed merging 
lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_cherrypickpatches into 
lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.

Commit message:
* debian/patches/Don-t-crash-on-Runtime-getQmlImportedScripts.patch
  - Backport from upstream code submittal (LP: #1294181)
* debian/patches/Fix-global-object-handling-in-worker-script-JS-files.patch
  - Backport a fix from upstream (LP: #1294019)
* debian/patches/V4-JIT-save-restore-ebx-GOT-ptr-on-linux-x86.patch
  debian/patches/V4-fix-range-sorting.patch
  debian/patches/V4-regalloc-fix-interval-splitting-when-register-pre.patch
  - Replace Don-t-use-ebx-in-the-x86-register-allocator.patch with a newer
set of fixes from upstream (LP: #1271033)

Requested reviews:
  Kubuntu Packagers (kubuntu-packagers)
Related bugs:
  Bug #1271033 in webbrowser-app: webbrowser's tst_QmlTest fails on armhf and 
i386 with Qt 5.2
  https://bugs.launchpad.net/webbrowser-app/+bug/1271033
  Bug #1294019 in qtdeclarative-opensource-src (Ubuntu): WorkerScript loaded 
script cannot define functions or variables
  
https://bugs.launchpad.net/ubuntu/+source/qtdeclarative-opensource-src/+bug/1294019
  Bug #1294181 in Ubuntu Calendar App: Autopilot tests crashing in 
switch_to_tab helper
  https://bugs.launchpad.net/ubuntu-calendar-app/+bug/1294181

For more details, see:
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtdeclarative_cherrypickpatches/+merge/212351
-- 
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtdeclarative_cherrypickpatches/+merge/212351
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_cherrypickpatches into 
lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.
=== modified file 'debian/changelog'
--- debian/changelog	2014-03-14 09:39:06 +
+++ debian/changelog	2014-03-24 06:29:04 +
@@ -1,3 +1,17 @@
+qtdeclarative-opensource-src (5.2.1-3ubuntu11) trusty; urgency=medium
+
+  * debian/patches/Don-t-crash-on-Runtime-getQmlImportedScripts.patch
+- Backport from upstream code submittal (LP: #1294181)
+  * debian/patches/Fix-global-object-handling-in-worker-script-JS-files.patch
+- Backport a fix from upstream (LP: #1294019)
+  * debian/patches/V4-JIT-save-restore-ebx-GOT-ptr-on-linux-x86.patch
+debian/patches/V4-fix-range-sorting.patch
+debian/patches/V4-regalloc-fix-interval-splitting-when-register-pre.patch
+- Replace Don-t-use-ebx-in-the-x86-register-allocator.patch with a newer 
+  set of fixes from upstream (LP: #1271033)
+
+ -- Timo Jyrinki timo-jyri...@ubuntu.com  Mon, 24 Mar 2014 06:27:18 +
+
 qtdeclarative-opensource-src (5.2.1-3ubuntu10) trusty; urgency=medium
 
   * debian/patches/Fix-crash-when-appending-arrays-to-sub-models-in-lis.patch

=== added file 'debian/patches/Don-t-crash-on-Runtime-getQmlImportedScripts.patch'
--- debian/patches/Don-t-crash-on-Runtime-getQmlImportedScripts.patch	1970-01-01 00:00:00 +
+++ debian/patches/Don-t-crash-on-Runtime-getQmlImportedScripts.patch	2014-03-24 06:29:04 +
@@ -0,0 +1,42 @@
+From b4f14b1942698dea537bb08222907db56575a906 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid albert.ast...@canonical.com
+Date: Thu, 20 Mar 2014 16:28:15 +0100
+Subject: [PATCH] Don't crash on Runtime::getQmlImportedScripts
+
+Task-number: QTBUG-37303
+
+Change-Id: I083ca0cc3223fe0dbf1c768ad43a0d4927579867
+---
+ src/qml/jsruntime/qv4runtime.cpp   |  4 +++
+ tests/auto/qml/qqmlecmascript/data/Types.js|  3 ++
+ ...rtedScriptsAccessOnObjectWithInvalidContext.qml | 42 ++
+ .../auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp | 11 ++
+ 4 files changed, 60 insertions(+)
+ create mode 100644 tests/auto/qml/qqmlecmascript/data/Types.js
+ create mode 100644 tests/auto/qml/qqmlecmascript/data/importedScriptsAccessOnObjectWithInvalidContext.qml
+
+diff --git a/src/qml/jsruntime/qv4runtime.cpp b/src/qml/jsruntime/qv4runtime.cpp
+index 2b63632..99b7d98 100644
+--- a/src/qml/jsruntime/qv4runtime.cpp
 b/src/qml/jsruntime/qv4runtime.cpp
+@@ -1245,6 +1245,8 @@ ReturnedValue __qmljs_get_id_array(NoThrowContext *ctx)
+ ReturnedValue __qmljs_get_context_object(NoThrowContext *ctx)
+ {
+ QQmlContextData *context = QmlContextWrapper::callingContext(ctx-engine);
++if (!context)
++return Encode::undefined();
+ return QObjectWrapper::wrap(ctx-engine, context-contextObject);
+ }
+ 
+@@ -1292,6 +1294,8 @@ void __qmljs_set_qobject_property(ExecutionContext *ctx, const ValueRef object,
+ ReturnedValue __qmljs_get_imported_scripts(NoThrowContext *ctx)
+ {
+ QQmlContextData *context = QmlContextWrapper::callingContext(ctx-engine);
++if (!context)
++return Encode::undefined();
+ return context-importedScripts.value();
+ }
+ 
+-- 
+1.9.0
+

=== removed file 'debian/patches/Don-t-use-ebx-in-the-x86-register-allocator.patch'
--- 

[Merge] lp:~chris.gagnon/kubuntu-packaging/qtscript-opensource-src-enable-tests-again into lp:~kubuntu-packagers/kubuntu-packaging/qtscript-opensource-src

2014-05-13 Thread Chris Gagnon
The proposal to merge 
lp:~chris.gagnon/kubuntu-packaging/qtscript-opensource-src-enable-tests-again 
into lp:~kubuntu-packagers/kubuntu-packaging/qtscript-opensource-src has been 
updated.

Commit Message changed to:

enable tens of thousands of tests again, while disabling one bad test

For more details, see:
https://code.launchpad.net/~chris.gagnon/kubuntu-packaging/qtscript-opensource-src-enable-tests-again/+merge/215068
-- 
https://code.launchpad.net/~chris.gagnon/kubuntu-packaging/qtscript-opensource-src-enable-tests-again/+merge/215068
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~chris.gagnon/kubuntu-packaging/qtscript-opensource-src-enable-tests-again 
into lp:~kubuntu-packagers/kubuntu-packaging/qtscript-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~mitya57/kubuntu-packaging/qtlocation-prepare-merge into lp:~kubuntu-packagers/kubuntu-packaging/qtlocation-opensource-src

2014-05-13 Thread Timo Jyrinki
A couple of small comments even though WIP:
- maybe use the -s '-screen 0 640x480x24' for xvfb still as needed for 
executing OpenGL/QML tests on the builders
- qt3d dependency shouldn't 5.2.x

Looking great otherwise.
-- 
https://code.launchpad.net/~mitya57/kubuntu-packaging/qtlocation-prepare-merge/+merge/212316
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~mitya57/kubuntu-packaging/qtlocation-prepare-merge into 
lp:~kubuntu-packagers/kubuntu-packaging/qtlocation-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_fix_smoothedanimation_and_sync_with_archives into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src

2014-05-13 Thread Timo Jyrinki
The proposal to merge 
lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_fix_smoothedanimation_and_sync_with_archives
 into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src has 
been updated.

Commit Message changed to:

* Fix_QSmoothedAnimation_sometimes_getting_stuck.patch
  - Fix SmoothedAnimation getting stuck (LP: #1305015) (LP: #1300326)

For more details, see:
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtdeclarative_fix_smoothedanimation_and_sync_with_archives/+merge/215080
-- 
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtdeclarative_fix_smoothedanimation_and_sync_with_archives/+merge/215080
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_fix_smoothedanimation_and_sync_with_archives
 into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_cherrypickpatches into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src

2014-05-13 Thread Timo Jyrinki
The proposal to merge 
lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_cherrypickpatches into 
lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src has been 
updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtdeclarative_cherrypickpatches/+merge/212351
-- 
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtdeclarative_cherrypickpatches/+merge/212351
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_rfc2822_dateformat into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src

2014-05-13 Thread Timo Jyrinki
The proposal to merge 
lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_rfc2822_dateformat into 
lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src has been 
updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtdeclarative_rfc2822_dateformat/+merge/213977
-- 
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtdeclarative_rfc2822_dateformat/+merge/213977
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_rfc2822_dateformat into 
lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_cherrypickpatches into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src

2014-05-13 Thread Timo Jyrinki
The proposal to merge 
lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_cherrypickpatches into 
lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src has been 
updated.

Commit Message changed to:

* debian/patches/Don-t-crash-on-Runtime-getQmlImportedScripts.patch
  - Backport from upstream code submittal (LP: #1294181)
* debian/patches/Fix-global-object-handling-in-worker-script-JS-files.patch
  - Backport a fix from upstream (LP: #1294019)
* debian/patches/V4-JIT-save-restore-ebx-GOT-ptr-on-linux-x86.patch
  debian/patches/V4-fix-range-sorting.patch
  debian/patches/V4-regalloc-fix-interval-splitting-when-register-pre.patch
  - Replace Don-t-use-ebx-in-the-x86-register-allocator.patch with a newer
set of fixes from upstream (LP: #1271033)

For more details, see:
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtdeclarative_cherrypickpatches/+merge/212351
-- 
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtdeclarative_cherrypickpatches/+merge/212351
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_cherrypickpatches into 
lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~mitya57/kubuntu-packaging/qtbase-fix-keymap-update-handling into lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src

2014-05-13 Thread Timo Jyrinki
Review: Needs Fixing

This seems to fail to build, because it'd apparently require libxkbcommon 0.4.0 
while Ubuntu only has 0.3.2. 
https://launchpadlibrarian.net/171564066/buildlog_ubuntu-trusty-amd64.qtbase-opensource-src_5.2.1%2Bdfsg-1ubuntu12_FAILEDTOBUILD.txt.gz

0.4.0 will probably be available in the u series in ~3 weeks since it should be 
autosynced as soon as Debian sync is enabled.
-- 
https://code.launchpad.net/~mitya57/kubuntu-packaging/qtbase-fix-keymap-update-handling/+merge/213687
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~chris.gagnon/kubuntu-packaging/enable-tests-qtimageformats-opensource-src into lp:~kubuntu-packagers/kubuntu-packaging/qtimageformats-opensource-src

2014-05-13 Thread Chris Gagnon
Chris Gagnon has proposed merging 
lp:~chris.gagnon/kubuntu-packaging/enable-tests-qtimageformats-opensource-src 
into lp:~kubuntu-packagers/kubuntu-packaging/qtimageformats-opensource-src.

Requested reviews:
  Kubuntu Packagers (kubuntu-packagers)

For more details, see:
https://code.launchpad.net/~chris.gagnon/kubuntu-packaging/enable-tests-qtimageformats-opensource-src/+merge/219192
-- 
https://code.launchpad.net/~chris.gagnon/kubuntu-packaging/enable-tests-qtimageformats-opensource-src/+merge/219192
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~chris.gagnon/kubuntu-packaging/enable-tests-qtimageformats-opensource-src 
into lp:~kubuntu-packagers/kubuntu-packaging/qtimageformats-opensource-src.
=== modified file 'debian/control'
--- debian/control	2014-02-06 17:13:42 +
+++ debian/control	2014-05-12 13:46:55 +
@@ -14,7 +14,8 @@
pkg-kde-tools,
qtbase5-private-dev (= 5.2.1+dfsg~),
libmng-dev,
-   libtiff-dev
+   libtiff-dev,
+   xvfb
 Standards-Version: 3.9.4
 Homepage: http://qt-project.org/
 Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtimageformats.git

=== modified file 'debian/rules'
--- debian/rules	2013-09-03 07:28:41 +
+++ debian/rules	2014-05-12 13:46:55 +
@@ -12,7 +12,11 @@
 	dh $@ --parallel
 
 override_dh_auto_configure:
-	qmake
+	qmake QT_BUILD_PARTS+=tests
 
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
+
+override_dh_auto_test:
+	xvfb-run -a make check QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib PATH=$(CURDIR)/bin:$(PATH)
+

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~timo-jyrinki/kubuntu-packaging/qtbase-fix-keymap-update-handling2 into lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src

2014-05-13 Thread Timo Jyrinki
Review: Approve

Succeeded in PPA: 
https://launchpad.net/~canonical-qt5-edgers/+archive/qt5-daily/+build/5931794
-- 
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtbase-fix-keymap-update-handling2/+merge/216815
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_cherrypickpatches into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src

2014-05-13 Thread Timo Jyrinki
Review: Approve

Once again tests succeeded in the landing PPA:
https://launchpad.net/~ci-train-ppa-service/+archive/landing-006/+sourcepub/4040443/+listing-archive-extra

-- 
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtdeclarative_cherrypickpatches/+merge/212351
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~timo-jyrinki/kubuntu-packaging/qtbase_cherrypick_lp1299712 into lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src

2014-05-13 Thread Timo Jyrinki
Timo Jyrinki has proposed merging 
lp:~timo-jyrinki/kubuntu-packaging/qtbase_cherrypick_lp1299712 into 
lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src.

Commit message:
* debian/patches/When-looking-up-the-window-hierarchy-stop-at-foreign.patch
- Cherry-pick a fix to a bug affecting online accounts (LP: #1299712)

Requested reviews:
  Kubuntu Packagers (kubuntu-packagers)
Related bugs:
  Bug #1299712 in qtbase-opensource-src (Ubuntu): Online accounts for facebook 
(and google) are missing cursor for sign-in
  https://bugs.launchpad.net/ubuntu/+source/qtbase-opensource-src/+bug/1299712

For more details, see:
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtbase_cherrypick_lp1299712/+merge/213641
-- 
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtbase_cherrypick_lp1299712/+merge/213641
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~timo-jyrinki/kubuntu-packaging/qtbase_cherrypick_lp1299712 into 
lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src.
=== modified file 'debian/changelog'
--- debian/changelog	2014-03-25 11:50:39 +
+++ debian/changelog	2014-04-01 12:44:08 +
@@ -1,3 +1,10 @@
+qtbase-opensource-src (5.2.1+dfsg-1ubuntu11) trusty; urgency=medium
+
+  * debian/patches/When-looking-up-the-window-hierarchy-stop-at-foreign.patch
+- Cherry-pick a fix to a bug affecting online accounts (LP: #1299712)
+
+ -- Timo Jyrinki timo-jyri...@ubuntu.com  Tue, 01 Apr 2014 12:41:00 +
+
 qtbase-opensource-src (5.2.1+dfsg-1ubuntu10) trusty; urgency=medium
 
   * Make qt5-qmake Multi-Arch: same since it moved from shipping files in

=== added file 'debian/patches/When-looking-up-the-window-hierarchy-stop-at-foreign.patch'
--- debian/patches/When-looking-up-the-window-hierarchy-stop-at-foreign.patch	1970-01-01 00:00:00 +
+++ debian/patches/When-looking-up-the-window-hierarchy-stop-at-foreign.patch	2014-04-01 12:44:08 +
@@ -0,0 +1,40 @@
+From fa5e611af1bc38ba1305fd1983f7560cbc4aa041 Mon Sep 17 00:00:00 2001
+From: Alberto Mardegan alberto.marde...@canonical.com
+Date: Mon, 31 Mar 2014 15:25:44 +0300
+Subject: [PATCH] When looking up the window hierarchy, stop at foreign windows
+
+If the window being activated is an embedded window, the parent window
+will be a foreign window (usually not even belonging to the current
+process); we shouldn't attempt to focus it.
+
+Task-number: QTBUG-37984
+Change-Id: I2ea03a86b30bbc43cde643e18e0e1d020e5f2c84
+---
+ src/widgets/kernel/qapplication_qpa.cpp | 11 +--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/src/widgets/kernel/qapplication_qpa.cpp b/src/widgets/kernel/qapplication_qpa.cpp
+index 2f6e8ac..5a4a459 100644
+--- a/src/widgets/kernel/qapplication_qpa.cpp
 b/src/widgets/kernel/qapplication_qpa.cpp
+@@ -126,8 +126,15 @@ bool QApplicationPrivate::modalState()
+ 
+ QWidget *qt_tlw_for_window(QWindow *wnd)
+ {
+-while (wnd  !wnd-isTopLevel()) // QTBUG-32177, wnd might be a QQuickView embedded via window container.
+-wnd = wnd-parent();
++// QTBUG-32177, wnd might be a QQuickView embedded via window container.
++while (wnd  !wnd-isTopLevel()) {
++QWindow *parent = wnd-parent();
++// Don't end up in windows not belonging to this application
++if (parent  parent-type() != Qt::ForeignWindow)
++wnd = wnd-parent();
++else
++break;
++}
+ if (wnd)
+ foreach (QWidget *tlw, qApp-topLevelWidgets())
+ if (tlw-windowHandle() == wnd)
+-- 
+1.9.0
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-03-18 06:00:39 +
+++ debian/patches/series	2014-04-01 12:44:08 +
@@ -28,3 +28,4 @@
 Fix-log_clusters-calculation-in-HarfBuzz-NG-code-pat.patch
 Minor-optimization-for-QTextEngine-shapeText.patch
 HarfBuzz-NG-Hide-characters-that-should-normally-be-.patch
+When-looking-up-the-window-hierarchy-stop-at-foreign.patch

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_cherrypickpatches into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src

2014-05-13 Thread Timo Jyrinki
The proposal to merge 
lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_cherrypickpatches into 
lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src has been 
updated.

Commit Message changed to:

* debian/patches/Don-t-crash-on-Runtime-getQmlImportedScripts.patch
- Backport from upstream code submittal (LP: #1294181)
  * debian/patches/Fix-global-object-handling-in-worker-script-JS-files.patch
- Backport a fix from upstream (LP: #1294019)
  * debian/patches/V4-JIT-save-restore-ebx-GOT-ptr-on-linux-x86.patch
debian/patches/V4-fix-range-sorting.patch
debian/patches/V4-regalloc-fix-interval-splitting-when-register-pre.patch
- Replace Don-t-use-ebx-in-the-x86-register-allocator.patch with a newer 
  set of fixes from upstream (LP: #1271033)

For more details, see:
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtdeclarative_cherrypickpatches/+merge/212351
-- 
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtdeclarative_cherrypickpatches/+merge/212351
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_cherrypickpatches into 
lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~timo-jyrinki/kubuntu-packaging/qtbase-fix-keymap-update-handling2 into lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src

2014-05-13 Thread Timo Jyrinki
The proposal to merge 
lp:~timo-jyrinki/kubuntu-packaging/qtbase-fix-keymap-update-handling2 into 
lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src has been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtbase-fix-keymap-update-handling2/+merge/216815
-- 
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtbase-fix-keymap-update-handling2/+merge/216815
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~timo-jyrinki/kubuntu-packaging/qtbase-fix-keymap-update-handling2 into lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src

2014-05-13 Thread Timo Jyrinki
The proposal to merge 
lp:~timo-jyrinki/kubuntu-packaging/qtbase-fix-keymap-update-handling2 into 
lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src has been updated.

Commit Message changed to:

[ Dmitry Shachnev ]
* Backport upstream patch to fix issues with keymap update handling
  (Add_better_support_for_keymap_update_handling.patch, copied from
  Debian and rebased).
* Build-depend on libxkbcommon-x11-dev, as the new patch includes
  xkbcommon/xkbcommon-x11.h.

[ Timo Jyrinki ]
* debian/patches/Do-not-use-Bsymbolic-on-anything-but-x86-and-x86-64.patch:
  - Cherry-pick a patch disabling -Bsymbolic on non-i386/amd64 archs
(LP: #1304709)

For more details, see:
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtbase-fix-keymap-update-handling2/+merge/216815
-- 
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtbase-fix-keymap-update-handling2/+merge/216815
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~timo-jyrinki/kubuntu-packaging/qtbase-fix-keymap-update-handling2 into 
lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~timo-jyrinki/kubuntu-packaging/qtpim_cherry-pick-contact-fix into lp:~kubuntu-packagers/kubuntu-packaging/qtpim-opensource-src

2014-05-13 Thread Timo Jyrinki
The proposal to merge 
lp:~timo-jyrinki/kubuntu-packaging/qtpim_cherry-pick-contact-fix into 
lp:~kubuntu-packagers/kubuntu-packaging/qtpim-opensource-src has been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtpim_cherry-pick-contact-fix/+merge/212097
-- 
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtpim_cherry-pick-contact-fix/+merge/212097
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~timo-jyrinki/kubuntu-packaging/qtpim_cherry-pick-contact-fix into 
lp:~kubuntu-packagers/kubuntu-packaging/qtpim-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_rfc2822_dateformat into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src

2014-05-13 Thread Timo Jyrinki
Timo Jyrinki has proposed merging 
lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_rfc2822_dateformat into 
lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.

Commit message:
* debian/patches/Support-RFC2822Date-date-format-similar-to-V8.patch
  - Support RFC 2822 format (LP: #1298978)

Requested reviews:
  Kubuntu Packagers (kubuntu-packagers)
Related bugs:
  Bug #1298978 in Ubuntu RSS Feed Reader App: QtQuick V4 Date.Parse() does not 
support RFC2822 date format
  https://bugs.launchpad.net/ubuntu-rssreader-app/+bug/1298978

For more details, see:
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtdeclarative_rfc2822_dateformat/+merge/213977
-- 
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtdeclarative_rfc2822_dateformat/+merge/213977
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_rfc2822_dateformat into 
lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.
=== modified file 'debian/changelog'
--- debian/changelog	2014-04-03 05:54:03 +
+++ debian/changelog	2014-04-03 08:35:28 +
@@ -1,3 +1,10 @@
+qtdeclarative-opensource-src (5.2.1-3ubuntu13) trusty; urgency=medium
+
+  * debian/patches/Support-RFC2822Date-date-format-similar-to-V8.patch
+- Support RFC 2822 format (LP: #1298978)
+
+ -- Timo Jyrinki timo-jyri...@ubuntu.com  Thu, 03 Apr 2014 05:55:24 +
+
 qtdeclarative-opensource-src (5.2.1-3ubuntu12) trusty; urgency=medium
 
   * 0001-Call-tzset-from-getLocalTZA-so-we-learn-about-tz-cha.patch: Call

=== added file 'debian/patches/Support-RFC2822Date-date-format-similar-to-V8.patch'
--- debian/patches/Support-RFC2822Date-date-format-similar-to-V8.patch	1970-01-01 00:00:00 +
+++ debian/patches/Support-RFC2822Date-date-format-similar-to-V8.patch	2014-04-03 08:35:28 +
@@ -0,0 +1,31 @@
+From 771cf807de52c8b4352eed341c3cc40c35c9b9d2 Mon Sep 17 00:00:00 2001
+From: Timo Jyrinki timo.jyri...@canonical.com
+Date: Thu, 3 Apr 2014 05:28:38 +
+Subject: [PATCH] Support RFC2822Date date format similar to V8.
+
+Currently a date like Wed, 18 Sep 2013 07:00:51 -0700 cannot be parsed.
+However, this used to work in Qt 5.0.2. This commit adds a check for
+Qt::RFC2822Date format after the ISODate check but before the manually
+defined QStringLiteral formats.
+
+Task-Number: QTBUG-38011
+---
+ src/qml/jsruntime/qv4dateobject.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/qml/jsruntime/qv4dateobject.cpp b/src/qml/jsruntime/qv4dateobject.cpp
+index fc94862..70bec14 100644
+--- a/src/qml/jsruntime/qv4dateobject.cpp
 b/src/qml/jsruntime/qv4dateobject.cpp
+@@ -488,6 +488,8 @@ static inline double ParseString(const QString s)
+ QDateTime dt = QDateTime::fromString(s, Qt::TextDate);
+ if (!dt.isValid())
+ dt = QDateTime::fromString(s, Qt::ISODate);
++if (!dt.isValid())
++dt = QDateTime::fromString(s, Qt::RFC2822Date);
+ if (!dt.isValid()) {
+ QStringList formats;
+ formats  QStringLiteral(M/d/)
+-- 
+1.9.0
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-03-27 17:10:35 +
+++ debian/patches/series	2014-04-03 08:35:28 +
@@ -18,3 +18,4 @@
 V4-fix-range-sorting.patch
 V4-regalloc-fix-interval-splitting-when-register-pre.patch
 0001-Call-tzset-from-getLocalTZA-so-we-learn-about-tz-cha.patch
+Support-RFC2822Date-date-format-similar-to-V8.patch

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~zeller-benjamin/kubuntu-packaging/qtcreator into lp:~kubuntu-packagers/kubuntu-packaging/qtcreator

2014-05-13 Thread Zoltan Balogh
Zoltan Balogh has proposed merging 
lp:~zeller-benjamin/kubuntu-packaging/qtcreator into 
lp:~kubuntu-packagers/kubuntu-packaging/qtcreator.

Commit message:
Replace qnx, valgrind and remotelinux plugins with derived versiond

Requested reviews:
  Timo Jyrinki (timo-jyrinki)
Related bugs:
  Bug #1302619 in Ubuntu: [FFe] New package qtcreator-plugin-remotelinux 
  https://bugs.launchpad.net/ubuntu/+bug/1302619
  Bug #1302620 in qtcreator (Ubuntu): [FFe] Remove remotelinux plugin and its 
dependencies from the QtC package
  https://bugs.launchpad.net/ubuntu/+source/qtcreator/+bug/1302620

For more details, see:
https://code.launchpad.net/~zeller-benjamin/kubuntu-packaging/qtcreator/+merge/214891

Replace qnx, valgrind and remotelinux plugins with derived versiond
-- 
https://code.launchpad.net/~zeller-benjamin/kubuntu-packaging/qtcreator/+merge/214891
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtcreator.
=== modified file 'debian/changelog'
--- debian/changelog	2014-04-01 10:02:32 +
+++ debian/changelog	2014-04-09 07:31:40 +
@@ -1,9 +1,18 @@
+ TREE
 qtcreator (3.0.1-0ubuntu3) trusty; urgency=medium
 
   * Rebuild against Qt Webkit 5.1.1
 
  -- Timo Jyrinki timo-jyri...@ubuntu.com  Thu, 13 Mar 2014 14:23:24 +
 
+===
+qtcreator (3.0.1-0ubuntu3) UNRELEASED; urgency=medium
+
+  * Replace qnx, valgrind and remotelinux plugins with derived versiond
+
+ -- Benjamin Zeller benjamin.zel...@canonical.com  Mon, 31 Mar 2014 11:24:38 +0200
+
+ MERGE-SOURCE
 qtcreator (3.0.1-0ubuntu2) trusty; urgency=medium
 
   * Make qtcreator-plugin-cmake a Recommends instead

=== modified file 'debian/control'
--- debian/control	2014-04-01 10:02:32 +
+++ debian/control	2014-04-09 07:31:40 +
@@ -71,6 +71,9 @@
 qtbase5-dev-tools,
 qtcreator-doc,
 qtcreator-plugin-cmake,
+qtcreator-plugin-remotelinux,
+qtcreator-plugin-valgrind,
+qtcreator-plugin-qnx,
 qtdeclarative5-dev,
 xterm | x-terminal-emulator,
 Breaks: qtcreator-plugin-ubuntu (= 2.9.0~),

=== renamed file 'debian/patches/disable_cmake_plugin.diff' = 'debian/patches/disable_plugins.diff'
--- debian/patches/disable_cmake_plugin.diff	2014-03-06 10:25:09 +
+++ debian/patches/disable_plugins.diff	2014-04-09 07:31:40 +
@@ -1,16 +1,17 @@
-Description: Disable CMake plugin in order to use alternative one
- This patch disables QtC's current upstream CMake plugin so that 
- qtcreator-plugin-cmake can be installed instead.
+Description: Disable plugins in order to use alternative one
+ This patch disables QtC's current upstream CMake,Valgrind,Qnx and
+ Remotelinux plugin so that qtcreator-plugin-[cmake|valgrind|qnx|remotelinux] 
+ can be installed instead.
  . 
- The Ubuntu's CMake plugin will be presented to upstream when it's 
+ The Ubuntu's plugins will be presented to upstream when it's 
  fully functional, to consider how to get the improvements to be part 
  of a future release of Qt Creator.
 Author: Benjamin Zeller benjamin.zel...@canonical.com
 Author: Zoltan Balogh zoltan.bal...@canonical.com
 
 === modified file 'src/plugins/plugins.pro'
 a/src/plugins/plugins.pro	2013-12-02 09:16:15 +
-+++ b/src/plugins/plugins.pro	2014-03-06 10:19:13 +
+--- a/src/plugins/plugins.pro	2014-03-06 10:25:09 +
 b/src/plugins/plugins.pro	2014-03-31 08:57:03 +
 @@ -24,7 +24,6 @@
  debugger \
  help \
@@ -19,10 +20,22 @@
  autotoolsprojectmanager \
  fakevim \
  designer \
+@@ -41,11 +40,8 @@
+ analyzerbase \
+ qmljstools \
+ macros \
+-remotelinux \
+ android \
+-valgrind \
+ todo \
+-qnx \
+ clearcase \
+ baremetal \
+ ios
 
 === modified file 'src/plugins/plugins.qbs'
 a/src/plugins/plugins.qbs	2013-12-02 09:15:30 +
-+++ b/src/plugins/plugins.qbs	2014-03-06 10:19:13 +
+--- a/src/plugins/plugins.qbs	2014-03-06 10:25:09 +
 b/src/plugins/plugins.qbs	2014-03-31 08:57:31 +
 @@ -13,7 +13,6 @@
  bookmarks/bookmarks.qbs,
  classview/classview.qbs,
@@ -31,4 +44,22 @@
  coreplugin/coreplugin.qbs,
  coreplugin/images/logo/logo.qbs,
  cpaster/cpaster.qbs,
+@@ -46,17 +45,14 @@
+ qmljstools/qmljstools.qbs,
+ qmlprofiler/qmlprofiler.qbs,
+ qmlprojectmanager/qmlprojectmanager.qbs,
+-qnx/qnx.qbs,
+ qmakeprojectmanager/qmakeprojectmanager.qbs,
+ qtsupport/qtsupport.qbs,
+-remotelinux/remotelinux.qbs,
+ resourceeditor/resourceeditor.qbs,
+ subversion/subversion.qbs,
+ tasklist/tasklist.qbs,
+ texteditor/texteditor.qbs,
+ todo/todo.qbs,
+ updateinfo/updateinfo.qbs,
+-valgrind/valgrind.qbs,
+ vcsbase/vcsbase.qbs,
+ welcome/welcome.qbs
+ ].concat(project.additionalPlugins)
 

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-03-06 10:25:09 +

Re: [Merge] lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_rfc2822_dateformat into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src

2014-05-13 Thread Timo Jyrinki
Review: Approve


-- 
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtdeclarative_rfc2822_dateformat/+merge/213977
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~laney/kubuntu-packaging/qt5-qmake-ma-same into lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src

2014-05-13 Thread Timo Jyrinki
The proposal to merge lp:~laney/kubuntu-packaging/qt5-qmake-ma-same into 
lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src has been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~laney/kubuntu-packaging/qt5-qmake-ma-same/+merge/211509
-- 
https://code.launchpad.net/~laney/kubuntu-packaging/qt5-qmake-ma-same/+merge/211509
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~laney/kubuntu-packaging/qt5-qmake-ma-same into 
lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~mitya57/kubuntu-packaging/qtwebkit-lp1134745 into lp:~kubuntu-packagers/kubuntu-packaging/qtwebkit-opensource-src_510

2014-05-13 Thread Timo Jyrinki
The proposal to merge lp:~mitya57/kubuntu-packaging/qtwebkit-lp1134745 into 
lp:~kubuntu-packagers/kubuntu-packaging/qtwebkit-opensource-src_510 has been 
updated.

Commit Message changed to:

Copy dont_pollute_pri_and_pc_with_private_deps.patch from Debian
(LP: #1134745).

For more details, see:
https://code.launchpad.net/~mitya57/kubuntu-packaging/qtwebkit-lp1134745/+merge/211692
-- 
https://code.launchpad.net/~mitya57/kubuntu-packaging/qtwebkit-lp1134745/+merge/211692
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~mitya57/kubuntu-packaging/qtwebkit-lp1134745 into 
lp:~kubuntu-packagers/kubuntu-packaging/qtwebkit-opensource-src_510.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~chris.gagnon/kubuntu-packaging/qtscript-opensource-src-enable-tests-again into lp:~kubuntu-packagers/kubuntu-packaging/qtscript-opensource-src

2014-05-13 Thread Chris Gagnon
Chris Gagnon has proposed merging 
lp:~chris.gagnon/kubuntu-packaging/qtscript-opensource-src-enable-tests-again 
into lp:~kubuntu-packagers/kubuntu-packaging/qtscript-opensource-src.

Requested reviews:
  Kubuntu Packagers (kubuntu-packagers)

For more details, see:
https://code.launchpad.net/~chris.gagnon/kubuntu-packaging/qtscript-opensource-src-enable-tests-again/+merge/215068
-- 
https://code.launchpad.net/~chris.gagnon/kubuntu-packaging/qtscript-opensource-src-enable-tests-again/+merge/215068
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~chris.gagnon/kubuntu-packaging/qtscript-opensource-src-enable-tests-again 
into lp:~kubuntu-packagers/kubuntu-packaging/qtscript-opensource-src.
=== added file 'debian/patches/enable-tests.patch'
--- debian/patches/enable-tests.patch	1970-01-01 00:00:00 +
+++ debian/patches/enable-tests.patch	2014-04-10 01:04:36 +
@@ -0,0 +1,14 @@
+Index: qtscript-opensource-src-5.2.1+dfsg/tests/auto/auto.pro
+===
+--- qtscript-opensource-src-5.2.1+dfsg.orig/tests/auto/auto.pro	2014-04-09 20:41:59.767274525 -0400
 qtscript-opensource-src-5.2.1+dfsg/tests/auto/auto.pro	2014-04-09 20:42:59.931274554 -0400
+@@ -15,7 +15,8 @@
+qscriptvaluegenerated \
+qscriptvalueiterator \
+qscriptqwidgets \
+-   cmake \
++#  remove failing test that needs to be fixed
++#   cmake \
+ 
+ !contains(QT_CONFIG, private_tests): SUBDIRS -= \
+qscriptcontext \

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-03-10 15:39:03 +
+++ debian/patches/series	2014-04-10 01:04:36 +
@@ -2,3 +2,4 @@
 disable_v8_sunspider_tests.patch
 s390x_jscore.diff
 aarch64.patch
+enable-tests.patch

=== modified file 'debian/rules'
--- debian/rules	2014-03-10 14:25:18 +
+++ debian/rules	2014-04-10 01:04:36 +
@@ -39,4 +39,4 @@
 
 override_dh_auto_test:
 	# Do not run tests at least until we get the transition sorted out.
-	#xvfb-run -a dh_auto_test
+	xvfb-run -a dh_auto_test

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~mitya57/kubuntu-packaging/qtwebkit-lp1134745 into lp:~kubuntu-packagers/kubuntu-packaging/qtwebkit-opensource-src_510

2014-05-13 Thread Timo Jyrinki
Thanks! I'll assign a silo for it, line 50 currently at 
http://wiki.ubuntu.com/citrain

This qtwebkit-opensource-src_510 branch is as good as any, while we're stuck 
with QtWebKit 5.1.1 at least until lp:oxide comes into production. We're not 
running WebKit tests anyway so there's not much to be done by CI either, 
compared to having all builds done in a PPA.
-- 
https://code.launchpad.net/~mitya57/kubuntu-packaging/qtwebkit-lp1134745/+merge/211692
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~mitya57/kubuntu-packaging/qtwebkit-lp1134745 into 
lp:~kubuntu-packagers/kubuntu-packaging/qtwebkit-opensource-src_510.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~mitya57/kubuntu-packaging/qtlocation-prepare-merge into lp:~kubuntu-packagers/kubuntu-packaging/qtlocation-opensource-src

2014-05-13 Thread Timo Jyrinki
The proposal to merge lp:~mitya57/kubuntu-packaging/qtlocation-prepare-merge 
into lp:~kubuntu-packagers/kubuntu-packaging/qtlocation-opensource-src has been 
updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~mitya57/kubuntu-packaging/qtlocation-prepare-merge/+merge/212316
-- 
https://code.launchpad.net/~mitya57/kubuntu-packaging/qtlocation-prepare-merge/+merge/212316
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~mitya57/kubuntu-packaging/qtlocation-prepare-merge into 
lp:~kubuntu-packagers/kubuntu-packaging/qtlocation-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative-for-u-series-multiple-fixes into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src

2014-05-13 Thread Timo Jyrinki
The proposal to merge 
lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative-for-u-series-multiple-fixes 
into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src has 
been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtdeclarative-for-u-series-multiple-fixes/+merge/216821
-- 
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtdeclarative-for-u-series-multiple-fixes/+merge/216821
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative-for-u-series-multiple-fixes 
into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_fix_smoothedanimation_and_sync_with_archives into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src

2014-05-13 Thread Timo Jyrinki
The proposal to merge 
lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_fix_smoothedanimation_and_sync_with_archives
 into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src has 
been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtdeclarative_fix_smoothedanimation_and_sync_with_archives/+merge/215080
-- 
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtdeclarative_fix_smoothedanimation_and_sync_with_archives/+merge/215080
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_fix_smoothedanimation_and_sync_with_archives
 into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~timo-jyrinki/kubuntu-packaging/qtbase-opensource-src_touch_xinput2_use_master_device into lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src

2014-05-13 Thread Timo Jyrinki
Timo Jyrinki has proposed merging 
lp:~timo-jyrinki/kubuntu-packaging/qtbase-opensource-src_touch_xinput2_use_master_device
 into lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src.

Commit message:
* debian/patches/xi2-use-master-device.patch:
  - Make xi2 select events on master device instead of slaves.
(LP: #1307701)

Requested reviews:
  Kubuntu Packagers (kubuntu-packagers)

For more details, see:
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtbase-opensource-src_touch_xinput2_use_master_device/+merge/219175
-- 
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtbase-opensource-src_touch_xinput2_use_master_device/+merge/219175
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~timo-jyrinki/kubuntu-packaging/qtbase-opensource-src_touch_xinput2_use_master_device
 into lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src.
=== modified file 'debian/changelog'
--- debian/changelog	2014-04-28 15:54:23 +
+++ debian/changelog	2014-05-12 11:26:25 +
@@ -1,3 +1,11 @@
+qtbase-opensource-src (5.2.1+dfsg-1ubuntu16) utopic; urgency=medium
+
+  * debian/patches/xi2-use-master-device.patch:
+- Make xi2 select events on master device instead of slaves.
+  (LP: #1307701)
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Tue, 06 May 2014 13:14:17 +
+
 qtbase-opensource-src (5.2.1+dfsg-1ubuntu15) utopic; urgency=medium
 
   [ Dmitry Shachnev ]

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-04-23 08:37:26 +
+++ debian/patches/series	2014-05-12 11:26:25 +
@@ -30,3 +30,4 @@
 HarfBuzz-NG-Hide-characters-that-should-normally-be-.patch
 When-looking-up-the-window-hierarchy-stop-at-foreign.patch
 Add_better_support_for_keymap_update_handling.patch
+xi2-use-master-device.patch

=== added file 'debian/patches/xi2-use-master-device.patch'
--- debian/patches/xi2-use-master-device.patch	1970-01-01 00:00:00 +
+++ debian/patches/xi2-use-master-device.patch	2014-05-12 11:26:25 +
@@ -0,0 +1,81 @@
+Description: qt5 use xi2 master device instead of selecting events on all slave devices separately.
+Author: Maarten Lankhorst maarten.lankho...@canonical.com
+
+For LP: #1307701
+
+Selecting events from the master device has the advantage that we don't need to
+grab the touch event to prevent mouse emulation to our window.
+
+---
+--- a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
 b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
+@@ -84,6 +84,7 @@
+ m_xi2Enabled = XIQueryVersion(xDisplay, xiMajor, m_xi2Minor) != BadRequest;
+ } else {
+ m_xi2Enabled = true;
++has_touch_without_mouse_emulation = true;
+ }
+ if (m_xi2Enabled) {
+ if (Q_UNLIKELY(debug_xinput_devices))
+@@ -180,17 +181,9 @@
+ XIEventMask mask;
+ mask.mask_len = sizeof(bitMask);
+ mask.mask = xiBitMask;
+-// Enable each touchscreen
+-foreach (XInput2DeviceData *dev, m_touchDevices.values()) {
+-mask.deviceid = dev-xiDeviceInfo-deviceid;
+-Status result = XISelectEvents(xDisplay, window, mask, 1);
+-// If we have XInput = 2.2 and successfully enable a touchscreen, then
+-// it will provide touch only. In most other cases, there will be
+-// emulated mouse events from the driver. If not, then Qt must do its
+-// own mouse emulation to enable interaction with mouse-oriented QWidgets.
+-if (m_xi2Minor = 2  result == Success)
+-has_touch_without_mouse_emulation = true;
+-}
++mask.deviceid = XIAllMasterDevices;
++
++Status result = XISelectEvents(xDisplay, window, mask, 1);
+ #endif // XCB_USE_XINPUT22
+ 
+ #ifndef QT_NO_TABLETEVENT
+@@ -201,7 +194,7 @@
+ // all the pure xcb code with Xlib-based XI2.
+ if (!m_tabletData.isEmpty()) {
+ QVectorXIEventMask xiEventMask(m_tabletData.count());
+-bitMask |= XI_ButtonPressMask;
++bitMask = XI_ButtonPressMask;
+ bitMask |= XI_ButtonReleaseMask;
+ bitMask |= XI_MotionMask;
+ bitMask |= XI_PropertyEventMask;
+@@ -329,7 +322,7 @@
+ fixed1616ToReal(xiDeviceEvent-root_x), fixed1616ToReal(xiDeviceEvent-root_y) );
+ 
+ if (QXcbWindow *platformWindow = platformWindowFromId(xiDeviceEvent-event)) {
+-XInput2DeviceData *dev = deviceForId(xiEvent-deviceid);
++XInput2DeviceData *dev = deviceForId(xiDeviceEvent-sourceid);
+ Q_ASSERT(dev);
+ const bool firstTouch = m_touchPoints.isEmpty();
+ if (xiEvent-evtype == XI_TouchBegin) {
+@@ -434,22 +427,6 @@
+ qDebug() touchpointtouchPoint.id   state   touchPoint.state   pos norm   touchPoint.normalPosition 
+  area   touchPoint.area   pressure   touchPoint.pressure;
+ QWindowSystemInterface::handleTouchEvent(platformWindow-window(), xiEvent-time, 

Re: [Merge] lp:~mitya57/kubuntu-packaging/qtwebkit-merge-with-debian into lp:~kubuntu-packagers/kubuntu-packaging/qtwebkit-opensource-src

2014-05-13 Thread Timo Jyrinki
This looks it'd be great to have so I'm planning to build this for testing in 
addition to qtbase and qtdeclarative when U opens, but we need to check with 
webapps people (= dbarth, alex-abreu) on how they see this.

I'm not clear on what's the schedule for full Oxide moving. In addition to 
touch also desktop is currently including libqt5webkit5 in default install 
still (checked with seeded-in-ubuntu qtwebkit-opensource-src).
-- 
https://code.launchpad.net/~mitya57/kubuntu-packaging/qtwebkit-merge-with-debian/+merge/216539
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~mitya57/kubuntu-packaging/qtwebkit-merge-with-debian into 
lp:~kubuntu-packagers/kubuntu-packaging/qtwebkit-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~mitya57/kubuntu-packaging/qtbase-fix-keymap-update-handling into lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src

2014-05-13 Thread Timo Jyrinki
Building and to be tested via 
https://launchpad.net/~ci-train-ppa-service/+archive/landing-017

The earlier ubuntu11 was tested and is now in UNAPPROVED queue and needs to be 
passed to the archives first.
-- 
https://code.launchpad.net/~mitya57/kubuntu-packaging/qtbase-fix-keymap-update-handling/+merge/213687
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~mitya57/kubuntu-packaging/qtbase-fix-keymap-update-handling into 
lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~mitya57/kubuntu-packaging/qtwebkit-lp1134745 into lp:~kubuntu-packagers/kubuntu-packaging/qtwebkit-opensource-src_510

2014-05-13 Thread Timo Jyrinki
Review: Approve

Looking further, the .prl widgets file is however fixed and the 
lp:~timo-jyrinki/+junk/testwebkit test case works unlike without this.

I've also tested there are no regressions on device, and at least the Ubuntu 
Touch reverse dependencies seem to compile ok.

So, I think this is ok, but I'd like to have a 2nd ack too.
-- 
https://code.launchpad.net/~mitya57/kubuntu-packaging/qtwebkit-lp1134745/+merge/211692
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~mitya57/kubuntu-packaging/qtwebkit-lp1134745 into 
lp:~kubuntu-packagers/kubuntu-packaging/qtwebkit-opensource-src_510.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~timo-jyrinki/kubuntu-packaging/qtbase-fix-keymap-update-handling2 into lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src

2014-05-13 Thread Timo Jyrinki
Timo Jyrinki has proposed merging 
lp:~timo-jyrinki/kubuntu-packaging/qtbase-fix-keymap-update-handling2 into 
lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src.

Commit message:
[ Dmitry Shachnev ]
* Backport upstream patch to fix issues with keymap update handling
  (Add_better_support_for_keymap_update_handling.patch, copied from
  Debian and rebased).
* Build-depend on libxkbcommon-x11-dev, as the new patch includes
  xkbcommon/xkbcommon-x11.h.

[ Timo Jyrinki ]
* debian/patches/Do-not-use-Bsymbolic-on-anything-but-x86-and-x86-64.patch:
  - Cherry-pick a patch disabling -Bsymbolic on non-i386/amd64 archs
(LP: #1304709)

Requested reviews:
  PS Jenkins bot (ps-jenkins): continuous-integration
  Kubuntu Packagers (kubuntu-packagers)
Related bugs:
  Bug #1304709 in Ubuntu UI Toolkit: Runtime signal connection errors when 
using the new signal style
  https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1304709

For more details, see:
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtbase-fix-keymap-update-handling2/+merge/216815

For U-series when it opens, via a landing silo
-- 
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtbase-fix-keymap-update-handling2/+merge/216815
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~timo-jyrinki/kubuntu-packaging/qtbase-fix-keymap-update-handling2 into 
lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src.
=== modified file 'debian/changelog'
--- debian/changelog	2014-04-23 05:06:52 +
+++ debian/changelog	2014-04-23 05:19:18 +
@@ -1,3 +1,19 @@
+qtbase-opensource-src (5.2.1+dfsg-1ubuntu16) UNRELEASED; urgency=medium
+
+  [ Dmitry Shachnev ]
+  * Backport upstream patch to fix issues with keymap update handling
+(Add_better_support_for_keymap_update_handling.patch, copied from
+Debian and rebased).
+  * Build-depend on libxkbcommon-x11-dev, as the new patch includes
+xkbcommon/xkbcommon-x11.h.
+
+  [ Timo Jyrinki ]
+  * debian/patches/Do-not-use-Bsymbolic-on-anything-but-x86-and-x86-64.patch:
+- Cherry-pick a patch disabling -Bsymbolic on non-i386/amd64 archs
+  (LP: #1304709)
+
+ -- Timo Jyrinki timo-jyri...@ubuntu.com  Wed, 23 Apr 2014 05:18:10 +
+
 qtbase-opensource-src (5.2.1+dfsg-1ubuntu14) trusty; urgency=medium
 
   * libqt5gui5.symbols, libqt5opengl5.symbols: making the gl/gles symbols

=== modified file 'debian/control'
--- debian/control	2014-03-18 12:08:16 +
+++ debian/control	2014-04-23 05:19:18 +
@@ -55,6 +55,7 @@
libxcb1-dev,
libxi-dev,
libxkbcommon-dev,
+   libxkbcommon-x11-dev,
libxrender-dev,
pkg-kde-tools (= 0.14.2),
unixodbc-dev,

=== added file 'debian/patches/Add_better_support_for_keymap_update_handling.patch'
--- debian/patches/Add_better_support_for_keymap_update_handling.patch	1970-01-01 00:00:00 +
+++ debian/patches/Add_better_support_for_keymap_update_handling.patch	2014-04-23 05:19:18 +
@@ -0,0 +1,665 @@
+From 18e162e8640d96f2d7f2a85ef35d00350360903d Mon Sep 17 00:00:00 2001
+From: Gatis Paeglis gatis.paeg...@digia.com
+Date: Thu, 27 Feb 2014 18:05:14 +0100
+Subject: [PATCH] Add better support for keymap update handling
+
+Use the new X11 support API xkb_x11_* released in libxkbcommon version 0.4.0.
+
+From the commit message where this API was introduced:
+
+These are function to create an xkb_keymap directly from XKB requests
+to the X server. This opens up the possibility for X clients to use
+xcb + xcb-xkb + xkbcommon as a proper replacement for Xlib + xkbfile for
+keyboard support.
+
+Why not just use the RMLVO that the server puts in the _XKB_RULES_NAMES
+property? This does not account for custom keymaps, on-the-fly keymap
+modifications, remote clients, etc., so is not a proper solution in
+practice. Also, some servers don't even set it. Now, the client just
+needs to recreate the keymap in response to a change in the server's
+keymap (as Xlib clients do with XRefreshKeyboardMapping() and friends).
+
+This patch moves XKEYBOARD presence decision from compile time to runtime
+for a proper remote X client support.
+
+Task-number: QTBUG-31527
+Task-number: QTBUG-32760
+Change-Id: I4d402668cda2126ef180b27022154f96b1874b1d
+---
+ src/plugins/platforms/xcb/qxcbconnection.cpp |  61 
+ src/plugins/platforms/xcb/qxcbconnection.h   |   2 +-
+ src/plugins/platforms/xcb/qxcbkeyboard.cpp   | 220 +++
+ src/plugins/platforms/xcb/qxcbkeyboard.h |  35 ++---
+ src/plugins/platforms/xcb/xcb-plugin.pro |   8 +-
+ 5 files changed, 136 insertions(+), 190 deletions(-)
+
+--- a/src/plugins/platforms/xcb/qxcbconnection.cpp
 b/src/plugins/platforms/xcb/qxcbconnection.cpp
+@@ -782,6 +782,7 @@
+ xcb_timestamp_t time;
+ uint8_t deviceID;
+ } any;
++xcb_xkb_new_keyboard_notify_event_t new_keyboard_notify;
+ xcb_xkb_map_notify_event_t map_notify;

Re: [Merge] lp:~timo-jyrinki/kubuntu-packaging/qtbase-opensource-src_qt530RC into lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src

2014-05-13 Thread Timo Jyrinki
(oh, right, it won't work unless jenkins is given the orig tarballs)
-- 
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtbase-opensource-src_qt530RC/+merge/219138
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~timo-jyrinki/kubuntu-packaging/qtbase-opensource-src_qt530RC into 
lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~iahmad/kubuntu-packaging/qtcreator into lp:~kubuntu-packagers/kubuntu-packaging/qtcreator

2014-05-13 Thread I Ahmad
Thanks for your comments Dmitry, I ll try fixing them but the one about
export LD_LIBRARY_PATH didn't work for me and that's why I adopted this
work around. Could you please try it locally and let me know if it works
for you. So far I tried exporting as well as setting it inline but none of
them work.

Cheers


On Tue, Apr 15, 2014 at 12:51 PM, Dmitry Shachnev mity...@gmail.com wrote:

 Review: Needs Fixing

 Thanks for your work! My comments:

 - Please build-depend on xauth. Xvfb only recommends xauth, while it is
 needed for running the tests.
 - Please use dh_auto_test instead of make check. This way the tests will
 be properly skipped when DEB_BUILD_OPTIONS contains nocheck. See other Qt
 modules for example of how to do that.
 - Instead of cp -r $(CURDIR)/builddir/lib/*/ $(CURDIR)/lib, you can
 simply export LD_LIBRARY_PATH or QT_PLUGIN_PATH. Again, see other Qt
 modules.
 - There is something weird with the version number in debian/changelog.
 --

 https://code.launchpad.net/~iahmad/kubuntu-packaging/qtcreator/+merge/215802
 You are the owner of lp:~iahmad/kubuntu-packaging/qtcreator.


-- 
https://code.launchpad.net/~iahmad/kubuntu-packaging/qtcreator/+merge/215802
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtcreator.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_fix_marking_of_prototype_objects_in_chain into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src

2014-05-13 Thread Timo Jyrinki
The proposal to merge 
lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_fix_marking_of_prototype_objects_in_chain
 into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src has 
been updated.

Commit Message changed to:

* debian/patches/Fix-marking-of-prototype-objects-in-chain.patch
  - Fix a crasher with deleted QQmlCompiledData as suggested by upstream
(LP: #1304248)

For more details, see:
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtdeclarative_fix_marking_of_prototype_objects_in_chain/+merge/214689
-- 
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtdeclarative_fix_marking_of_prototype_objects_in_chain/+merge/214689
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_fix_marking_of_prototype_objects_in_chain
 into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~mitya57/kubuntu-packaging/qtwebkit-merge-with-debian into lp:~kubuntu-packagers/kubuntu-packaging/qtwebkit-opensource-src

2014-05-13 Thread Timo Jyrinki
The proposal to merge lp:~mitya57/kubuntu-packaging/qtwebkit-merge-with-debian 
into lp:~kubuntu-packagers/kubuntu-packaging/qtwebkit-opensource-src has been 
updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~mitya57/kubuntu-packaging/qtwebkit-merge-with-debian/+merge/216539
-- 
https://code.launchpad.net/~mitya57/kubuntu-packaging/qtwebkit-merge-with-debian/+merge/216539
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~mitya57/kubuntu-packaging/qtwebkit-merge-with-debian into 
lp:~kubuntu-packagers/kubuntu-packaging/qtwebkit-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_fix_smoothedanimation into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src

2014-05-13 Thread Timo Jyrinki
Timo Jyrinki has proposed merging 
lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_fix_smoothedanimation into 
lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.

Commit message:
* Fix_QSmoothedAnimation_sometimes_getting_stuck.patch
  - Fix SmoothedAnimation getting stuck (LP: #1305015) (LP: #1300326)

Requested reviews:
  Kubuntu Packagers (kubuntu-packagers)
Related bugs:
  Bug #1300326 in qtdeclarative-opensource-src (Ubuntu): Shell randomly 
freezes with grey tint
  
https://bugs.launchpad.net/ubuntu/+source/qtdeclarative-opensource-src/+bug/1300326
  Bug #1305015 in qtdeclarative-opensource-src (Ubuntu): [PATCH] Fix 
QSmoothedAnimation sometimes getting stuck
  
https://bugs.launchpad.net/ubuntu/+source/qtdeclarative-opensource-src/+bug/1305015

For more details, see:
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtdeclarative_fix_smoothedanimation/+merge/215079
-- 
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtdeclarative_fix_smoothedanimation/+merge/215079
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_fix_smoothedanimation into 
lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.
=== modified file 'debian/changelog'
--- debian/changelog	2014-04-03 08:34:03 +
+++ debian/changelog	2014-04-10 05:40:16 +
@@ -1,3 +1,10 @@
+qtdeclarative-opensource-src (5.2.1-3ubuntu14) trusty; urgency=medium
+
+  * Fix_QSmoothedAnimation_sometimes_getting_stuck.patch
+- Fix SmoothedAnimation getting stuck (LP: #1305015) (LP: #1300326)
+
+ -- Timo Jyrinki timo-jyri...@ubuntu.com  Wed, 09 Apr 2014 15:11:10 +0300
+
 qtdeclarative-opensource-src (5.2.1-3ubuntu13) trusty; urgency=medium
 
   * debian/patches/Support-RFC2822Date-date-format-similar-to-V8.patch

=== added file 'debian/patches/Fix_QSmoothedAnimation_sometimes_getting_stuck.patch'
--- debian/patches/Fix_QSmoothedAnimation_sometimes_getting_stuck.patch	1970-01-01 00:00:00 +
+++ debian/patches/Fix_QSmoothedAnimation_sometimes_getting_stuck.patch	2014-04-10 05:40:16 +
@@ -0,0 +1,15 @@
+diff -ru qtdeclarative-opensource-src-5.2.1/src/quick/util/qquicksmoothedanimation.cpp qtdeclarative-opensource-src-5.2.1-patched/src/quick/util/qquicksmoothedanimation.cpp
+--- qtdeclarative-opensource-src-5.2.1/src/quick/util/qquicksmoothedanimation.cpp	2014-02-01 21:38:03.0 +0100
 qtdeclarative-opensource-src-5.2.1-patched/src/quick/util/qquicksmoothedanimation.cpp	2014-04-09 13:24:15.977541285 +0200
+@@ -242,7 +242,10 @@
+ 
+ void QSmoothedAnimation::updateCurrentTime(int t)
+ {
+-if (!isRunning()  !isPaused()) // This can happen if init() stops the animation in some cases
++// We should drop the delayedStopTimer-isActive() part
++// when updating to 5.3 since the bug seems to be fixed
++// in a more elaborate way in there
++if ((!isRunning()  !isPaused()) || delayedStopTimer-isActive()) // This can happen if init() stops the animation in some cases
+ return;
+ 
+ qreal time_seconds = useDelta ? qreal(QQmlAnimationTimer::instance()-currentDelta()) / 1000. : qreal(t - lastTime) / 1000.;

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-04-03 08:34:03 +
+++ debian/patches/series	2014-04-10 05:40:16 +
@@ -19,3 +19,4 @@
 V4-regalloc-fix-interval-splitting-when-register-pre.patch
 0001-Call-tzset-from-getLocalTZA-so-we-learn-about-tz-cha.patch
 Support-RFC2822Date-date-format-similar-to-V8.patch
+Fix_QSmoothedAnimation_sometimes_getting_stuck.patch

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~timo-jyrinki/kubuntu-packaging/qtbase_cherrypick_lp1299712 into lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src

2014-05-13 Thread Timo Jyrinki
The proposal to merge 
lp:~timo-jyrinki/kubuntu-packaging/qtbase_cherrypick_lp1299712 into 
lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src has been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtbase_cherrypick_lp1299712/+merge/213641
-- 
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtbase_cherrypick_lp1299712/+merge/213641
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~timo-jyrinki/kubuntu-packaging/qtbase_cherrypick_lp1299712 into 
lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~timo-jyrinki/kubuntu-packaging/qtbase-opensource-src_touch_xinput2_use_master_device into lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src

2014-05-13 Thread Timo Jyrinki
Tested successfully by jibel and seb128, being SRUed to trusty after utopic.
-- 
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtbase-opensource-src_touch_xinput2_use_master_device/+merge/219175
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~timo-jyrinki/kubuntu-packaging/qtbase-opensource-src_touch_xinput2_use_master_device
 into lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~iahmad/kubuntu-packaging/qtcreator into lp:~kubuntu-packagers/kubuntu-packaging/qtcreator

2014-05-13 Thread I Ahmad
I Ahmad has proposed merging lp:~iahmad/kubuntu-packaging/qtcreator into 
lp:~kubuntu-packagers/kubuntu-packaging/qtcreator.

Requested reviews:
  Timo Jyrinki (timo-jyrinki)

For more details, see:
https://code.launchpad.net/~iahmad/kubuntu-packaging/qtcreator/+merge/215802

Enabled the unit tests while building package and skipped the ones which are 
failing.
-- 
https://code.launchpad.net/~iahmad/kubuntu-packaging/qtcreator/+merge/215802
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtcreator.
=== modified file 'debian/changelog'
--- debian/changelog	2014-04-01 10:02:32 +
+++ debian/changelog	2014-04-15 04:53:14 +
@@ -1,3 +1,10 @@
+qtcreator (3.0.1-0ubuntu7) UNRELEASED; urgency=low
+
+  * Enable the unit tests during package build.
+  * Skip failing tests on unix. 
+  
+ -- Iftikhar Ahmad (QA Engineer) iftikhar.ah...@canonical.com  Mon, 14 Apr 2014 22:30:55 +0500
+
 qtcreator (3.0.1-0ubuntu3) trusty; urgency=medium
 
   * Rebuild against Qt Webkit 5.1.1

=== modified file 'debian/control'
--- debian/control	2014-04-01 10:02:32 +
+++ debian/control	2014-04-15 04:53:14 +
@@ -40,6 +40,7 @@
qttools5-dev-tools (= 5.2.0~),
qttools5-private-dev (= 5.2.0~),
qtxmlpatterns5-dev-tools (= 5.2.0~),
+   xvfb,
 Standards-Version: 3.9.3
 Homepage: http://qt-project.org/
 Vcs-Browser: http://git.debian.org/?p=collab-maint/qt-creator.git

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-03-06 10:25:09 +
+++ debian/patches/series	2014-04-15 04:53:14 +
@@ -1,4 +1,5 @@
 # Debian patches
+skip_failing_unit_tests.diff
 02_use_x-terminal-emulator.diff
 botan_system_lib.diff
 no-Werror.diff

=== added file 'debian/patches/skip_failing_unit_tests.diff'
--- debian/patches/skip_failing_unit_tests.diff	1970-01-01 00:00:00 +
+++ debian/patches/skip_failing_unit_tests.diff	2014-04-15 04:53:14 +
@@ -0,0 +1,28 @@
+Index: qtcreator/tests/auto/auto.pro
+===
+--- qtcreator.orig/tests/auto/auto.pro	2014-04-08 10:18:58.684264000 +
 qtcreator/tests/auto/auto.pro	2014-04-08 10:20:30.671316474 +
+@@ -4,9 +4,7 @@
+ aggregation \
+ changeset \
+ cplusplus \
+-debugger \
+ diff \
+-extensionsystem \
+ environment \
+ generichighlighter \
+ profilewriter \
+@@ -15,8 +13,11 @@
+ qtcprocess \
+ utils \
+ utils_stringutils \
+-filesearch \
+-valgrind
++filesearch
++
++!unix:SUBDIRS += debugger
++!unix:SUBDIRS += extensionsystem
++!unix:SUBDIRS += valgrind
+ 
+ #contains (QT_CONFIG, declarative) {
+ #SUBDIRS += qml

=== modified file 'debian/rules'
--- debian/rules	2014-03-07 06:32:17 +
+++ debian/rules	2014-04-15 04:53:14 +
@@ -21,6 +21,7 @@
 export QMAKE_LFLAGS_RELEASE := $(LDFLAGS)
 export QMAKE_LFLAGS_DEBUG := $(LDFLAGS)
 export QT_SELECT := qt5
+export QT_QPA_PLATFORM := minimal
 
 # Upstream changelog
 upstream_changes := $(wildcard dist/changes-*)
@@ -65,3 +66,8 @@
 
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
+
+override_dh_auto_test:
+	cp -r $(CURDIR)/builddir/lib/*/ $(CURDIR)/lib
+	cd tests/auto/  ( test -e Makefile || qmake auto.pro -o Makefile )  xvfb-run -a make -f Makefile check
+

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_fix_marking_of_prototype_objects_in_chain into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src

2014-05-13 Thread Timo Jyrinki
The proposal to merge 
lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_fix_marking_of_prototype_objects_in_chain
 into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src has 
been updated.

Status: Needs review = Work in progress

For more details, see:
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtdeclarative_fix_marking_of_prototype_objects_in_chain/+merge/214689
-- 
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtdeclarative_fix_marking_of_prototype_objects_in_chain/+merge/214689
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_fix_marking_of_prototype_objects_in_chain
 into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~iahmad/kubuntu-packaging/qtcreator into lp:~kubuntu-packagers/kubuntu-packaging/qtcreator

2014-05-13 Thread I Ahmad
I Ahmad has proposed merging lp:~iahmad/kubuntu-packaging/qtcreator into 
lp:~kubuntu-packagers/kubuntu-packaging/qtcreator.

Requested reviews:
  Kubuntu Packagers (kubuntu-packagers)

For more details, see:
https://code.launchpad.net/~iahmad/kubuntu-packaging/qtcreator/+merge/214721
-- 
https://code.launchpad.net/~iahmad/kubuntu-packaging/qtcreator/+merge/214721
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~iahmad/kubuntu-packaging/qtcreator into 
lp:~kubuntu-packagers/kubuntu-packaging/qtcreator.
=== modified file 'debian/changelog'
--- debian/changelog	2014-04-01 10:02:32 +
+++ debian/changelog	2014-04-08 11:14:21 +
@@ -1,3 +1,10 @@
+qtcreator (3.0.1-0ubuntu6) UNRELEASED; urgency=low
+
+  * Enable the unit tests during package build.
+  * Skip failing tests on unix. 
+
+ -- Iftikhar Ahmad (QA Engineer) ubuntu@trusty4  Tue, 08 Apr 2014 10:24:45 +
+
 qtcreator (3.0.1-0ubuntu3) trusty; urgency=medium
 
   * Rebuild against Qt Webkit 5.1.1

=== modified file 'debian/control'
--- debian/control	2014-04-01 10:02:32 +
+++ debian/control	2014-04-08 11:14:21 +
@@ -40,6 +40,7 @@
qttools5-dev-tools (= 5.2.0~),
qttools5-private-dev (= 5.2.0~),
qtxmlpatterns5-dev-tools (= 5.2.0~),
+   xvfb,
 Standards-Version: 3.9.3
 Homepage: http://qt-project.org/
 Vcs-Browser: http://git.debian.org/?p=collab-maint/qt-creator.git

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-03-06 10:25:09 +
+++ debian/patches/series	2014-04-08 11:14:21 +
@@ -1,4 +1,5 @@
 # Debian patches
+skip_failing_unit_tests.diff
 02_use_x-terminal-emulator.diff
 botan_system_lib.diff
 no-Werror.diff

=== added file 'debian/patches/skip_failing_unit_tests.diff'
--- debian/patches/skip_failing_unit_tests.diff	1970-01-01 00:00:00 +
+++ debian/patches/skip_failing_unit_tests.diff	2014-04-08 11:14:21 +
@@ -0,0 +1,28 @@
+Index: qtcreator/tests/auto/auto.pro
+===
+--- qtcreator.orig/tests/auto/auto.pro	2014-04-08 10:18:58.684264000 +
 qtcreator/tests/auto/auto.pro	2014-04-08 10:20:30.671316474 +
+@@ -4,9 +4,7 @@
+ aggregation \
+ changeset \
+ cplusplus \
+-debugger \
+ diff \
+-extensionsystem \
+ environment \
+ generichighlighter \
+ profilewriter \
+@@ -15,8 +13,11 @@
+ qtcprocess \
+ utils \
+ utils_stringutils \
+-filesearch \
+-valgrind
++filesearch
++
++!unix:SUBDIRS += debugger
++!unix:SUBDIRS += extensionsystem
++!unix:SUBDIRS += valgrind
+ 
+ #contains (QT_CONFIG, declarative) {
+ #SUBDIRS += qml

=== modified file 'debian/rules'
--- debian/rules	2014-03-07 06:32:17 +
+++ debian/rules	2014-04-08 11:14:21 +
@@ -21,6 +21,7 @@
 export QMAKE_LFLAGS_RELEASE := $(LDFLAGS)
 export QMAKE_LFLAGS_DEBUG := $(LDFLAGS)
 export QT_SELECT := qt5
+export QT_QPA_PLATFORM := minimal
 
 # Upstream changelog
 upstream_changes := $(wildcard dist/changes-*)
@@ -65,3 +66,7 @@
 
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
+
+override_dh_auto_test:
+	cd tests/auto/  ( test -e Makefile || qmake auto.pro -o Makefile )  xvfb-run -a make -f Makefile check
+

=== modified file 'tests/auto/auto.pro'
--- tests/auto/auto.pro	2013-11-15 12:25:23 +
+++ tests/auto/auto.pro	2014-04-08 11:14:21 +
@@ -4,9 +4,7 @@
 aggregation \
 changeset \
 cplusplus \
-debugger \
 diff \
-extensionsystem \
 environment \
 generichighlighter \
 profilewriter \
@@ -15,8 +13,11 @@
 qtcprocess \
 utils \
 utils_stringutils \
-filesearch \
-valgrind
+filesearch
+
+!unix:SUBDIRS += debugger
+!unix:SUBDIRS += extensionsystem
+!unix:SUBDIRS += valgrind
 
 #contains (QT_CONFIG, declarative) {
 #SUBDIRS += qml

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~mitya57/kubuntu-packaging/qtwebkit-lp1134745 into lp:~kubuntu-packagers/kubuntu-packaging/qtwebkit-opensource-src_510

2014-05-13 Thread Timo Jyrinki
Thanks, so it seems to be. Releasing the landing.
-- 
https://code.launchpad.net/~mitya57/kubuntu-packaging/qtwebkit-lp1134745/+merge/211692
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~mitya57/kubuntu-packaging/qtwebkit-lp1134745 into 
lp:~kubuntu-packagers/kubuntu-packaging/qtwebkit-opensource-src_510.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~mitya57/kubuntu-packaging/qtwebkit-lp1134745 into lp:~kubuntu-packagers/kubuntu-packaging/qtwebkit-opensource-src_510

2014-05-13 Thread Timo Jyrinki
Review: Approve


-- 
https://code.launchpad.net/~mitya57/kubuntu-packaging/qtwebkit-lp1134745/+merge/211692
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~mitya57/kubuntu-packaging/qtwebkit-lp1134745 into 
lp:~kubuntu-packagers/kubuntu-packaging/qtwebkit-opensource-src_510.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~timo-jyrinki/kubuntu-packaging/qtbase-opensource-src_qt530RC into lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src

2014-05-13 Thread Timo Jyrinki
The proposal to merge 
lp:~timo-jyrinki/kubuntu-packaging/qtbase-opensource-src_qt530RC into 
lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src has been updated.

Commit Message changed to:

* WIP, release candidate build
  - Disable patches, most should be fine to remove too
* Build with GStreamer 1.0
* debian/patches/revert_upstream_bsymbolic_change.patch:
  - Revert upstream change since we have fixed binutils
* Move include files to multi-arch dir following Debian's lead

For more details, see:
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtbase-opensource-src_qt530RC/+merge/219138
-- 
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtbase-opensource-src_qt530RC/+merge/219138
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~timo-jyrinki/kubuntu-packaging/qtbase-opensource-src_qt530RC into 
lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative-for-u-series-multiple-fixes into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src

2014-05-13 Thread Timo Jyrinki
Timo Jyrinki has proposed merging 
lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative-for-u-series-multiple-fixes 
into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.

Commit message:
* Depend conditionally on libgl1 (LP: #1278871)
* debian/patches/Fix-marking-of-prototype-objects-in-chain.patch
  - Fix a crasher with deleted QQmlCompiledData as suggested by upstream
(LP: #1304248)
* debian/patches/QQuickItemView-QQuickPathView-Fix-creation-of-delega.patch:
  - Fix Carousel doesn't re-render properly after scrolling
(LP: #1307578)
* debian/patches/Implement-proper-support-for-layoutChange-in-QQmlDel.patch:
  - Fix a performance hit when editing sorted lists (LP: #1303746)

Requested reviews:
  Kubuntu Packagers (kubuntu-packagers)
Related bugs:
  Bug #1278871 in mesa (Ubuntu): please consider making libgl1-mesa-dri to not 
be pulled into ubuntu-touch seed
  https://bugs.launchpad.net/ubuntu/+source/mesa/+bug/1278871
  Bug #1303746 in qtdeclarative-opensource-src (Ubuntu): Performance hit when 
editing sorted lists
  
https://bugs.launchpad.net/ubuntu/+source/qtdeclarative-opensource-src/+bug/1303746
  Bug #1304248 in qtdeclarative-opensource-src (Ubuntu): [PATCH] Crash with 
deleted QQmlCompiledData
  
https://bugs.launchpad.net/ubuntu/+source/qtdeclarative-opensource-src/+bug/1304248
  Bug #1307578 in Unity 8: Carousel doesn't re-render properly after scrolling
  https://bugs.launchpad.net/unity8/+bug/1307578

For more details, see:
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtdeclarative-for-u-series-multiple-fixes/+merge/216821
-- 
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtdeclarative-for-u-series-multiple-fixes/+merge/216821
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative-for-u-series-multiple-fixes 
into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.
=== modified file 'debian/changelog'
--- debian/changelog	2014-04-10 06:00:35 +
+++ debian/changelog	2014-04-23 06:34:17 +
@@ -1,3 +1,17 @@
+qtdeclarative-opensource-src (5.2.1-3ubuntu16) UNRELEASED; urgency=medium
+
+  * Depend conditionally on libgl1 (LP: #1278871)
+  * debian/patches/Fix-marking-of-prototype-objects-in-chain.patch
+- Fix a crasher with deleted QQmlCompiledData as suggested by upstream
+  (LP: #1304248)
+  * debian/patches/QQuickItemView-QQuickPathView-Fix-creation-of-delega.patch:
+- Fix Carousel doesn't re-render properly after scrolling
+  (LP: #1307578)
+  * debian/patches/Implement-proper-support-for-layoutChange-in-QQmlDel.patch:
+- Fix a performance hit when editing sorted lists (LP: #1303746)
+
+ -- Timo Jyrinki timo-jyri...@ubuntu.com  Wed, 23 Apr 2014 06:11:53 +
+
 qtdeclarative-opensource-src (5.2.1-3ubuntu15) trusty; urgency=medium
 
   * Fix_QSmoothedAnimation_sometimes_getting_stuck.patch

=== modified file 'debian/control'
--- debian/control	2014-04-10 05:58:37 +
+++ debian/control	2014-04-23 06:34:17 +
@@ -145,7 +145,7 @@
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libgl1-mesa-dri, ${misc:Depends}, ${shlibs:Depends}
+Depends: libgl1-mesa-dri | libgl1, ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 5 Qt Quick 2 QML plugin
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.

=== added file 'debian/patches/Fix-marking-of-prototype-objects-in-chain.patch'
--- debian/patches/Fix-marking-of-prototype-objects-in-chain.patch	1970-01-01 00:00:00 +
+++ debian/patches/Fix-marking-of-prototype-objects-in-chain.patch	2014-04-23 06:34:17 +
@@ -0,0 +1,89 @@
+From 0d90b1d646d9f443f071f474911cd7a8495d523b Mon Sep 17 00:00:00 2001
+From: Simon Hausmann simon.hausm...@digia.com
+Date: Mon, 7 Apr 2014 11:20:03 +0200
+Subject: [PATCH] Fix marking of prototype objects in chain
+
+With a real prototype chain it can happen that an internal class' prototype's
+class itself has a prototype. Therefore the first transition on the empty class
+is a PrototypeChange one, but the class the transition leads to may have
+PrototypeChange transitions itself, which weren't marked.
+
+There are multiple solutions to this, but this patch is the minimal fix by
+recursing fully through the internal class tree. That way it's easier to
+back-port the fix also into 5.2.x based branches.
+
+Task-number: QTBUG-37834
+
+Change-Id: I901b13a2663fbad5844003ca5752f2f304de320c
+---
+ src/qml/jsruntime/qv4internalclass.cpp | 15 ++-
+ tests/auto/qml/qjsengine/tst_qjsengine.cpp | 18 ++
+ 2 files changed, 24 insertions(+), 9 deletions(-)
+
+diff --git a/src/qml/jsruntime/qv4internalclass.cpp b/src/qml/jsruntime/qv4internalclass.cpp
+index 4fe8f0b..dab137b 100644
+--- a/src/qml/jsruntime/qv4internalclass.cpp
 b/src/qml/jsruntime/qv4internalclass.cpp
+@@ -458,17 +458,14 @@ void InternalClass::destroy()
+ 

Re: kopete mediastreamer

2014-05-13 Thread Rohan Garg
 Why?  It still can't be in the ISO.


Probably because we ship KTP by default instead of Kopete and thus it
makes sense to drop that requirement?

Cheers
Rohan Garg

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: kopete mediastreamer

2014-05-13 Thread Harald Sitter
On Tue, May 13, 2014 at 12:39 PM, Rohan Garg rohang...@kubuntu.org wrote:
 Why?  It still can't be in the ISO.


 Probably because we ship KTP by default instead of Kopete and thus it
 makes sense to drop that requirement?

Exactly

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~chris.gagnon/kubuntu-packaging/enable-tests-qtimageformats-opensource-src into lp:~kubuntu-packagers/kubuntu-packaging/qtimageformats-opensource-src

2014-05-13 Thread Dmitry Shachnev
Thanks. I see no reason to diverge from Debian here, so I've committed the 
changes directly to Debian Git, with some (usual) fixes:

- Build-dependency on xauth;
- Using dh_auto_test to take care about DEB_BUILD_OPTIONS=nocheck;
- Removing some unneeded make variables, only plugins path is really helpful.
-- 
https://code.launchpad.net/~chris.gagnon/kubuntu-packaging/enable-tests-qtimageformats-opensource-src/+merge/219192
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~chris.gagnon/kubuntu-packaging/enable-tests-qtimageformats-opensource-src 
into lp:~kubuntu-packagers/kubuntu-packaging/qtimageformats-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


meeting recording

2014-05-13 Thread Jonathan Riddell
More exciting than any podcast, it's the meeting from yesterday!

http://starsky.19inch.net/~jr/tmp/Mumble-2014-05-12-20-03-05-kyofel.dyndns.org-Mixdown.ogg

Jonathan

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: Kubuntu Council Elections 2014 - Call for Nominations

2014-05-13 Thread Scott Kitterman
On Tuesday, May 13, 2014 12:22:21 Rohan Garg wrote:
 The Kubuntu Council terms for Jonathan Riddell, Jussi Schultink, and
 Scott Kitterman
 expire on 2014-06-17.  This is a call for nominations for the Kubuntu
 Council to elect three members.
 
 The term will be for two years, 2014-06-17 to 2016-06-17.
 
 As in the past, the election will be conducted using CIVS (Condorcet
 Internet Voting Service - http://www.cs.cornell.edu/andru/civs.html ).  The
 top three ranking vote recipients will be elected.
 
 Schedule:
 
 Nomination period: Now to 2014-06-1
 Ballot Preparation: 2013-06-01 to 2013-06-02
 Voting Period: 2014-06-02 to 2014-06-15
 End Poll/Results Announced: 2014-06-16
 New Term Begins: 2014-06-17
 
 Eligibility:
 
 All Kubuntu Members ( https://launchpad.net/~kubuntu-members/+members ) are
 eligible to be nominated and to vote.  If you have a public email address in
 Launchpad, you need take no further action to receive your voting ballot. 
 If you do not have a public email address, please contact me offlist with
 the address you'd like your ballot sent to, otherwise you will be unable to
 vote.
 
 Nominations:
 
 All Kubuntu members are eligible.  The Kubuntu Council is intended to
 represent all of the Kubuntu community.  Applications from involved non-
 developers are encouraged.  If you are nominating someone else, please
 confirm their willingness to serve before nominating them.  Nominations
 should be done in public via either kubuntu-users or kubuntu-devel mailing
 lists.  If there is some extraordinary reason that precludes that, contact
 me directly.
 
 Commitment:
 
 The Kubuntu Council is the leadership body of Kubuntu.  Members of the
 council are expected to be active in Kubuntu.  The Kubuntu Council has
 three primary roles:
  - Approve development plans for future Kubuntu releases
  - Approve Kubuntu membership applications
  - Resolve disputes within the Kubuntu project
 
 The time commitment is not large.  Meetings are generally only once every
 several months and conducted via IRC.
 
 Questions:
 
 If there are questions, you can contact me (preferably) via this mailing
 list or (if really necessary) via direct mail.

I nominate me.

Scott K


-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: kopete mediastreamer

2014-05-13 Thread Scott Kitterman
On Tuesday, May 13, 2014 12:44:45 Harald Sitter wrote:
 On Tue, May 13, 2014 at 12:39 PM, Rohan Garg rohang...@kubuntu.org wrote:
  Why?  It still can't be in the ISO.
  
  Probably because we ship KTP by default instead of Kopete and thus it
  makes sense to drop that requirement?
 
 Exactly

Right.  Makes sense.  I mailed pre-caffeine this morning.

Scott K

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel