Bug#695837: qt4-x11: Allow co-installability with upcoming Qt5

2012-12-13 Thread Timo Jyrinki
Source: qt4-x11
Severity: wishlist
Tags: patch

Dear Maintainer,

The Qt5 is coming out in the near future, with release candidate 
already out. It will contain some additional binaries that would clash 
with Debian's Qt4 in its current shape, unless more binaries get the 
-qt4 suffix and alternatives treatment.

Attached git patch addresses the issue to the extent I'm currently aware. 
It has been tested on the Ubuntu side in the following PPA, where 
Qt5 RC1 and Qt4 are currently co-installable:

https://launchpad.net/~canonical-qt5-edgers/+archive/qt5-proper

After the version put in there I tested a full build against Debian's 
version and added qmlviewer(-qt4) to the binaries being handled.

-Timo

-- System Information:
Debian Release: 7.0
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 3.2.0-4-686-pae (SMP w/1 CPU core)
Locale: LANG=fi_FI.UTF-8, LC_CTYPE=fi_FI.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
>From 40d973de572a1c52cbe65e1b700cdade189dbc81 Mon Sep 17 00:00:00 2001
From: Timo Jyrinki 
Date: Thu, 13 Dec 2012 09:20:26 +0200
Subject: [PATCH] * debian/patches/01_debian_append_qt4_suffix2.diff:   -
 Prepare for Qt5 co-installability

---
 debian/changelog |6 +-
 debian/libqt4-dev-bin.install|6 +-
 debian/libqt4-dev-bin.postinst   |   15 ++
 debian/patches/01_debian_append_qt4_suffix2.diff |  255 ++
 debian/patches/series|1 +
 debian/qt4-dev-tools.install |   22 +-
 debian/qt4-dev-tools.postinst|   55 +
 debian/qt4-qmlviewer.install |2 +-
 debian/qt4-qmlviewer.postinst|   10 +
 9 files changed, 356 insertions(+), 16 deletions(-)
 create mode 100644 debian/patches/01_debian_append_qt4_suffix2.diff
 create mode 100644 debian/qt4-qmlviewer.postinst

diff --git a/debian/changelog b/debian/changelog
index 861c402..20e1fae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,11 @@ qt4-x11 (4:4.8.2+dfsg-5) UNRELEASED; urgency=low
 installed, also on rebuilt packages. This arrangement is transitional.
 (Closes: #669278).
 
- -- Debian Qt/KDE Maintainers   Sat, 08 Dec 2012 14:26:18 -0300
+  [ Timo Jyrinki ]
+  * debian/patches/01_debian_append_qt4_suffix2.diff:
+- Prepare for Qt5 co-installability
+
+ -- Timo Jyrinki   Thu, 13 Dec 2012 09:04:23 +0200
 
 qt4-x11 (4:4.8.2+dfsg-4) unstable; urgency=medium
 
diff --git a/debian/libqt4-dev-bin.install b/debian/libqt4-dev-bin.install
index 5502220..602e231 100644
--- a/debian/libqt4-dev-bin.install
+++ b/debian/libqt4-dev-bin.install
@@ -1,7 +1,7 @@
 usr/bin/moc-qt4
-usr/bin/qdbuscpp2xml
-usr/bin/qdbusxml2cpp
+usr/bin/qdbuscpp2xml-qt4
+usr/bin/qdbusxml2cpp-qt4
 usr/bin/qt3to4
-usr/bin/rcc
+usr/bin/rcc-qt4
 usr/bin/uic-qt4
 usr/bin/uic3
diff --git a/debian/libqt4-dev-bin.postinst b/debian/libqt4-dev-bin.postinst
index 9e3c347..9213b96 100644
--- a/debian/libqt4-dev-bin.postinst
+++ b/debian/libqt4-dev-bin.postinst
@@ -12,4 +12,19 @@ update-alternatives --install \
 --slave /usr/share/man/man1/uic.1.gz uic.1.gz \
 "/usr/share/man/man1/uic-qt4.1.gz"
 
+update-alternatives --install \
+/usr/bin/rcc rcc "/usr/bin/rcc-qt4" "40" \
+--slave /usr/share/man/man1/rcc.1.gz rcc.1.gz \
+"/usr/share/man/man1/rcc-qt4.1.gz"
+
+update-alternatives --install \
+/usr/bin/qdbusxml2cpp qdbusxml2cpp "/usr/bin/qdbusxml2cpp-qt4" "40" \
+--slave /usr/share/man/man1/qdbusxml2cpp.1.gz qdbusxml2cpp.1.gz \
+"/usr/share/man/man1/qdbusxml2cpp-qt4.1.gz"
+
+update-alternatives --install \
+/usr/bin/qdbuscpp2xml qdbuscpp2xml "/usr/bin/qdbuscpp2xml-qt4" "40" \
+--slave /usr/share/man/man1/qdbuscpp2xml.1.gz qdbuscpp2xml.1.gz \
+"/usr/share/man/man1/qdbuscpp2xml-qt4.1.gz"
+
 #DEBHELPER#
diff --git a/debian/patches/01_debian_append_qt4_suffix2.diff b/debian/patches/01_debian_append_qt4_suffix2.diff
new file mode 100644
index 000..fbaa39e
--- /dev/null
+++ b/debian/patches/01_debian_append_qt4_suffix2.diff
@@ -0,0 +1,255 @@
+Author: Timo Jyrinki 
+Description: Append a -qt4 suffix to some more tools.
+ To allow co-installation of the development tools of Qt5 with the Qt4 ones,
+ we append a -qt4 suffix to the executable names of some additional 
+ development tools that did not need the suffix with Qt3 vs Qt4.
+Last-Update: 2012-12-03
+Forwarded: not-needed
+
+=== modified file 'mkspecs/features/dbusadaptors.prf'
+--- a/mkspecs/features/dbusadaptors.prf	2011-03-03 20:58:36 +
 b/mkspecs/features/dbusadaptors.prf	2012-12-03 10:59:00 +
+@@ -1,4 +1,4 @@
+-qtPrepareTool(QMAKE_QDBUSXML2CPP, qdbusxml2cpp)
++qtPrepareTool(QMAKE_QDBUSXML2CPP, qdbusxml2cpp-qt4)
+ 
+ for(DBUS_ADAPTOR, $$list($$unique(DBUS_ADAPTORS))) {

Bug#695837: qt4-x11: Allow co-installability with upcoming Qt5

2012-12-13 Thread Timo Jyrinki
13.12.2012 12:19, Sune Vuorela kirjoitti:
> Upstream is providing a qttoolwrappere that helps selecting the right one. 
> Please see relevant discussions on upstream maillist about it.

Ok, I've missed that, thanks for notifying. I only noticed that from
Thiago's original proposal the tool renaming wasn't applied (unlike the
library renaming), which lead me to assume distros are still expected to
do similar handling as before.

-Timo


-- 
To UNSUBSCRIBE, email to debian-qt-kde-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/50c9b07e.1070...@iki.fi



Re: building qt4 for arm

2013-02-13 Thread Timo Jyrinki
2013/2/12 Neil Williams :
> That doesn't help with the problem that the default Debian build only
> supports Xorg and most boards are actually going to require QtEmbedded
> and framebuffer support. If you've only got 256MB of RAM, Xorg is
> seriously painful.

The Qt5 on Debian will btw build the framebuffer and EGL QPA plugins
in addition to the XCB plugin.

-Timo


-- 
To UNSUBSCRIBE, email to debian-qt-kde-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/CAJtFfx=y9c9colxy6pb0fbphomfc5afyk6qhgvj_dl95onq...@mail.gmail.com



Bug#754061: qtdeclarative-opensource-src: Does not work with the RFC2822 datetime format

2014-07-07 Thread Timo Jyrinki
Source: qtdeclarative-opensource-src
Severity: normal
Tags: upstream

Dear Maintainer,

I tested that the https://bugreports.qt-project.org/browse/QTBUG-38011 
still seems to apply to Debian's Qt 5.3.1, despite upstream's thoughts 
that it would have been fixed in 5.3.0.

That is, running qmlscene date.qml with the attached QML file gives 
me Invalid Date both on 5.3.0 (tested in Ubuntu) and Debian's 5.3.1.

There is a two-liner patch related to the upstream bug report that I 
tested fixed the problem on Ubuntu's 5.3.0.

-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 3.14-1-686-pae (SMP w/1 CPU core)
Locale: LANG=fi_FI.UTF-8, LC_CTYPE=fi_FI.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
import QtQuick 2.0

Rectangle {

  Component.onCompleted: {
 var dateObj = new Date("Wed, 18 Sep 2013 07:00:51 -0700")

 console.log("dateObj: ", dateObj)
  }
}



Bug#757271: Might need linking against qtDBus

2014-08-06 Thread Timo Jyrinki
After some tinkering, it seems the key would be to add libbluetooth-dev
and pkg-config build dependencies. I'll be adding them to git.

-Timo


-- 
To UNSUBSCRIBE, email to debian-qt-kde-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/53e31733.7080...@iki.fi



Bug#711307: libqt5webkit5-dev: Insufficient dependencies in libqt5webkit5-dev

2013-06-06 Thread Timo Jyrinki
Package: libqt5webkit5-dev
Version: 5.0.2-1
Severity: important

Dear Maintainer,

This is an after the fact bug report to (in)validate the recent dependency 
changes in the packaging git.

It seems that the dependencies of libqt5webkit5-dev, or possibly some of its 
dependencies, are not sufficient at the moment.

I've made a simple test case as follows:
apt-get install bzr-builddeb libqt5webkit5-dev qtdeclarative5-dev qt5-default
apt-get remove libqt5opengl5-dev # only recommended by qtbase5-dev
bzr branch lp:~timo-jyrinki/+junk/testwebkit
cd testwebkit
bzr bd

This fails with:

/usr/bin/ld: cannot find -lxslt
/usr/bin/ld: cannot find -lgio-2.0
/usr/bin/ld: cannot find -lgstapp-0.10
/usr/bin/ld: cannot find -lgstinterfaces-0.10
/usr/bin/ld: cannot find -lgstpbutils-0.10
/usr/bin/ld: cannot find -lgstvideo-0.10
/usr/bin/ld: cannot find -lgstbase-0.10
/usr/bin/ld: cannot find -lgstreamer-0.10
/usr/bin/ld: cannot find -lgobject-2.0
/usr/bin/ld: cannot find -lgmodule-2.0
/usr/bin/ld: cannot find -lgthread-2.0
/usr/bin/ld: cannot find -lxml2
/usr/bin/ld: cannot find -lglib-2.0
/usr/bin/ld: cannot find -lsqlite3
/usr/bin/ld: cannot find -lQt5OpenGL

Related to the already made commit to the packaging, direct Mesa 
dependencies seem not needed as libqt5opengl5 depends on them already.

In addition to the already added dependencies - libqt5opengl5-dev 
libgstreamer-plugins-base0.10-dev libxslt1-dev - sqlite3 dependency 
seems to be missing.

-Timo

-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 3.9.0-3-generic
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Shell: /bin/sh linked to /bin/dash

Versions of packages libqt5webkit5-dev depends on:
ii  dpkg   1.16.10
ii  libqt5webkit5  5.0.2-1
ii  qtbase5-dev5.0.2+dfsg1-5

libqt5webkit5-dev recommends no packages.

libqt5webkit5-dev suggests no packages.

-- no debconf information


-- 
To UNSUBSCRIBE, email to debian-qt-kde-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20130606084032.5347.30079.reportbug@duuni



Bug#711307: libqt5webkit5-dev: Insufficient dependencies in libqt5webkit5-dev

2013-06-07 Thread Timo Jyrinki
06.06.2013 12:31, Pino Toscano kirjoitti:
> ... no, adding the lot of -dev packages added in Git and the above is 
> not the right solution.
> 
> Doing a bit of investigation reveals that 
> /usr/lib/*/libQt5WebKitWidgets.prl is filled with these libs (mostly 
> non-qt5, but also some unneeded qt5 ones), so it is an upstream bug that 
> should be reported. In the meanwhile, a (IMHO) better workaround would 
> be pruning these libraries from that .prl file.

Right, thanks for clarification. I can confirm that 5.1 beta1 still has
the same issue, so it probably isn't fixed in trunk either.

-Timo




signature.asc
Description: OpenPGP digital signature


Bug#763454: qtbase-opensource-src: Building against Qt fails not finding mtdev

2014-09-30 Thread Timo Jyrinki
Source: qtbase-opensource-src
Severity: normal

Dear Maintainer,

After the qtbase started building against libmtdev-dev, that dependency 
is transferred to some of the software building against qtbase. Because 
libmtdev-dev is however not a dependency of qtbase5-(private-)dev, building 
fails by default.

Steps to reproduce:

tar xvf dummy-qt5.tar
cd dummy-qt5
pdebuild
# fails at /usr/bin/ld: cannot find -lmtdev

*** End of the template - remove these template lines ***


-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 3.16-2-686-pae (SMP w/1 CPU core)
Locale: LANG=fi_FI.UTF-8, LC_CTYPE=fi_FI.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash


dummy-qt5.tar
Description: Unix tar archive


Bug#779500: qtcreator: Qtcreator disappears when switching displays

2015-11-02 Thread Timo Jyrinki
Hello,

Could you please test this with Qt 5.5.1 now in unstable?

The multi-monitor problems with Qt are spread over to multiple different
bugs. 5.5.1 should address at least many of them.

-Timo



Bug#803937: qtcreator: Qt Creator adds a new configuration on each start

2015-11-03 Thread Timo Jyrinki
Package: qtcreator
Version: 3.5.1+dfsg-2
Severity: normal
Tags: patch

Dear Maintainer,

Qt Creator in Debian currently has a patch "always_autotect_qt_version". 
This is the other half of detection related patches, the other half was 
upstreamed for Qt Creator 3.5.

The remaining Debian patch however causes a new configuration to be 
added to Options -> Build & Run -> Qt Versions tab every time Qt Creator 
is started.

The attached further patch from Ubuntu resolves the problem.

-- System Information:
Debian Release: stretch/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (450, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 4.2.0-1-686-pae (SMP w/1 CPU core)
Locale: LANG=fi_FI.UTF-8, LC_CTYPE=fi_FI.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Init: systemd (via /run/systemd/system)

Versions of packages qtcreator depends on:
ii  libbotan-1.10-1   1.10.10-6+b1
ii  libc6 2.19-22
ii  libclang1-3.6 1:3.6.2-3
ii  libgcc1   1:5.2.1-23
ii  libqbscore1   1.4.3+dfsg-2
ii  libqbsqtprofilesetup1 1.4.3+dfsg-2
ii  libqt5concurrent5 5.5.1+dfsg-6
ii  libqt5core5a [qtbase-abi-5-5-1]   5.5.1+dfsg-6
ii  libqt5designer5   5.5.1-3
ii  libqt5designercomponents5 5.5.1-3
ii  libqt5gui55.5.1+dfsg-6
ii  libqt5help5   5.5.1-3
ii  libqt5network55.5.1+dfsg-6
ii  libqt5printsupport5   5.5.1+dfsg-6
ii  libqt5qml5 [qtdeclarative-abi-5-5-0]  5.5.1-3
ii  libqt5quick5  5.5.1-3
ii  libqt5quickwidgets5   5.5.1-3
ii  libqt5sql55.5.1+dfsg-6
ii  libqt5sql5-sqlite 5.5.1+dfsg-6
ii  libqt5webkit5 5.5.1+dfsg-2
ii  libqt5widgets55.5.1+dfsg-6
ii  libqt5xml55.5.1+dfsg-6
ii  libstdc++65.2.1-23
ii  qml-module-qtquick-controls   5.5.1-2
ii  qml-module-qtquick2   5.5.1-3
ii  qtchooser 52-gae5eeef-2
ii  qtcreator-data3.5.1+dfsg-2

Versions of packages qtcreator recommends:
ii  gdb   7.10-1
ii  gnome-terminal [x-terminal-emulator]  3.18.1-1
ii  lxterminal [x-terminal-emulator]  0.2.0-1
ii  make  4.0-8.2
ii  qt5-doc   5.5.1-1
ii  qtbase5-dev-tools 5.5.1+dfsg-6
ii  qtcreator-doc 3.5.1+dfsg-2
ii  qtdeclarative5-dev-tools  5.5.1-3
ii  qttools5-dev-tools5.5.1-3
ii  qttranslations5-l10n  5.5.1-2
ii  qtxmlpatterns5-dev-tools  5.5.1-2
ii  xterm [x-terminal-emulator]   320-1

Versions of packages qtcreator suggests:
pn  cmake  
ii  g++4:5.2.1-4
ii  git1:2.6.2-1
pn  kdelibs5-data  
ii  subversion 1.9.2-2

-- no debconf information
Author: Benjamin Zeller 
Description: Fix piling up of Qt configurations.
 The current Debian Qt autodetection patch registers a "new" Qt version 
 on each Qt Creator startup. This fixes it.
Last-Update: 2015-11-02
Forwarded: no

--- qtcreator/src/plugins/qtsupport/qtversionmanager.cpp	2015-10-21 17:53:48.0 +0200
+++ qtcreator/src/plugins/qtsupport/qtversionmanager.cpp	2015-10-22 11:50:21.323455563 +0200
@@ -458,7 +458,7 @@

 QMap currentAutoVersions;
 for (QMap::const_iterator i = m_versions.begin(); i != m_versions.end(); ++i) {
-if (i.value()->isAutodetected()) {
+if (i.value()->isAutodetected() && !i.value()->autodetectionSource().startsWith(QLatin1String("SDK."))) {
 currentAutoVersions.insert(i.value()->qmakeCommand().toString(), i.key());
 }
 }

--- qtcreator/src/libs/utils/buildablehelperlibrary.cpp	2015-08-18 12:02:51.0 +0200
+++ qtcreator/src/libs/utils/buildablehelperlibrary.cpp	2015-11-02 12:36:14.974481823 +0100
@@ -88,8 +88,15 @@
 
 if (dir.exists(qmake)) {
 const QString qmakePath = dir.absoluteFilePath(qmake);
-if (isQmake(qmakePath))
+if (isQmake(qmakePath)) {
+QFileInfo fi(qmakePath);
+if (BuildableHelperLibrary::isQtChooser(fi)) {
+const QString qtChooserPath = BuildableHelperLibrary::qtChooserToQmakePath(fi.symLinkTarget());
+if (!qtChooserPath.isEmpty())
+return FileName::fromString(qtChooserPath);
+}
 return FileName::fromString(qmakePath);
+}
 }

 // Prefer qmake-qt5 to qmake-qt4 by sorting the filenames in reverse order.