[SCM] qtbase packaging branch, ubuntu, updated. debian/5.4.2+dfsg-2-17-g4657478
Timo Jyrinki
timo at moszumanska.debian.org
Mon Jun 8 12:04:29 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=a873dd4
The following commit has been merged in the ubuntu branch:
commit a873dd4b66b7fdb2aed528b97db3ffc584a7d237
Merge: c94272c2e26678d47463a1b4d2bd229da80e2d31 853550f9186667d1252bc6723db8bc4ddbf71975
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date: Mon Jun 8 07:18:00 2015 +0000
Merge branch 'experimental' into ubuntu. Drop additional cherry-picked patches.
Conflicts:
debian/changelog
debian/patches/series
debian/changelog | 49 +++++++--
debian/control | 2 +-
debian/libqt5concurrent5.lintian-overrides | 2 +-
debian/libqt5core5a.lintian-overrides | 2 +-
debian/libqt5dbus5.lintian-overrides | 2 +-
debian/libqt5gui5.lintian-overrides | 2 +-
debian/libqt5network5.lintian-overrides | 2 +-
debian/libqt5opengl5.lintian-overrides | 2 +-
debian/libqt5printsupport5.lintian-overrides | 2 +-
debian/libqt5sql5.lintian-overrides | 2 +-
debian/libqt5test5.lintian-overrides | 2 +-
debian/libqt5widgets5.lintian-overrides | 2 +-
debian/libqt5xml5.lintian-overrides | 2 +-
debian/patches/cve-2015-0295.diff | 29 ------
debian/patches/enable_pie.patch | 38 -------
...fixes_crash_in_bmp_and_ico_image_decoders.patch | 62 -----------
.../patches/fixes_crash_in_gif_image_decoder.patch | 30 ------
debian/patches/gnukfreebsd.diff | 2 +-
debian/patches/make-sure-there-s-a-scene.patch | 68 ------------
.../make_qglobal_h_complain_if_you_use_fpie.patch | 39 -------
...tsystemtrayicon_handle_submenus_correctly.patch | 88 ----------------
debian/patches/require_fpic_instead_of_fpie.patch | 115 ---------------------
debian/patches/series | 18 ----
..._ensure_that_fpic_is_used_in_cmake_builds.patch | 30 ------
...rkDiskCache-Stop-using-actual-web-servers.patch | 63 -----------
...e-SelectionWindowDestroy-in-QXcbClipboard.patch | 36 -------
...nm-Registered-delayed-in-constructor-othe.patch | 37 -------
...te-mouse-buttons-from-MotionNotify-events.patch | 78 --------------
.../patches/upstream_xcb_use_themed_cursor.patch | 47 ---------
...ing_tray_icon_window_until_it_is_embedded.patch | 45 --------
debian/qtbase5-dev.install-common | 2 +
31 files changed, 57 insertions(+), 843 deletions(-)
diff --cc debian/changelog
index ed5ff98,d520e04..0b8e237
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,64 -1,39 +1,99 @@@
-qtbase-opensource-src (5.4.2+dfsg-3) UNRELEASED; urgency=medium
++qtbase-opensource-src (5.4.2+dfsg-2ubuntu1) UNRELEASED; urgency=medium
+
- [ Lisandro Damián Nicanor Pérez Meyer ]
- * Update symbols files with buildd's logs.
++ * New upstream release.
++ * Drop additional cherry-picked patches now included:
++ - make-sure-there-s-a-scene.patch
++ - upstream-gerrit_Handle-SelectionWindowDestroy-in-QXcbClipboard.patch
++ - upstream_Call-ofono-nm-Registered-delayed-in-constructor-othe.patch
++ - upstream_xcb-Update-mouse-buttons-from-MotionNotify-events.patch
++ - upstream_xcb_use_themed_cursor.patch
++ - enable_pie.patch
+
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 06 Jun 2015 10:27:36 -0300
++ -- Timo Jyrinki <timo-jyrinki at ubuntu.com> Mon, 08 Jun 2015 07:12:43 +0000
+
+ qtbase-opensource-src (5.4.2+dfsg-2) experimental; urgency=medium
+
+ * Update symbols files with buildds' logs.
+ * Mark private symbols as such.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org> Wed, 03 Jun 2015 19:56:52 -0300
+
+ qtbase-opensource-src (5.4.2+dfsg-1) experimental; urgency=medium
+
+ * New upstream release.
+ * libqt5gui5: demote libqt5libqgtk2 to a suggestion.
+ * Update symbols files with buildds' logs.
+ * Bump qtbase-abi to 5-4-2.
+ * Refresh gnukfreebsd.diff.
+ * Delete patches backported from upstream already present in this release:
+ - cve-2015-0295.diff
+ - qtsystemtrayicon_handle_submenus_correctly.patch
+ - xcb_delay_showing_tray_icon_window_until_it_is_embedded.patch
+ - require_fpic_instead_of_fpie.patch
+ - try_to_ensure_that_fpic_is_used_in_cmake_builds.patch
+ - make_qglobal_h_complain_if_you_use_fpie.patch
+ - fixes_crash_in_bmp_and_ico_image_decoders.patch
+ - fixes_crash_in_gif_image_decoder.patch
+ - tst_QNetworkDiskCache-Stop-using-actual-web-servers.patch
+ * Update install file for qtbase5-dev.
+ * Update symbols files with current build log.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org> Tue, 02 Jun 2015 13:27:56 -0300
+
+qtbase-opensource-src (5.4.1+dfsg-4ubuntu3) wily; urgency=medium
+
+ * debian/patches/series: enable_pie.patch is actually an upstreamed patch
+ * Re-enable the other fpic patches, and do not enforce fpie anymore
+ * debian/patches/latest_fpic_commits.patch: Take even more of the 5.4.2
+ last minute patches.
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com> Wed, 03 Jun 2015 13:06:41 +0000
+
+qtbase-opensource-src (5.4.1+dfsg-4ubuntu2) wily; urgency=medium
+
+ * Redisable the fpic/fpie patches again until there is a better solution.
+ (LP: #1457840)
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com> Fri, 22 May 2015 11:47:02 +0000
+
+qtbase-opensource-src (5.4.1+dfsg-4ubuntu1) wily; urgency=medium
+
+ * Sync with Debian 5.4.1+dfsg-4, drop more delta:
+ - Enable fpic/fpie patches, although see below
+ - Re-enable requiring gdb on ppc64el
+ - Remove debian/mark_private_symbols.sh as new pkg-kde-tools is in Ubuntu
+ * Remaining changes from Debian:
+ - Remove firebird dependencies and ibase recommendation
+ - Depend on OpenGL ES on all arches from qtbase5-dev
+ - Support OpenGL ES twin packages for x86
+ - qt5-qmake-arm-linux-gnueabihf alternative qmake
+ - Don't set -reduce-relocations and don't revert the upstream bsymbolic
+ disabling on non-x86 because of a problem with with Unity 8 on arm -
+ https://launchpad.net/bugs/1403758
+ - Use enable_pie.patch to fix QObject::connect failing on ARM
+ - Provides: qt-default in qt5-default
+ - Use our symbols files, including supporting gles x86 Qt
+ - Tests enabled (xvfb dep, debian/rules, enable-tests.patch)
+ - Additional patches, cherry-picked/upstreamed:
+ | Correct-typo-in-the-Gujarati-openType-identififer.patch
+ | load_testability_from_env_var.patch
+ | make-sure-there-s-a-scene.patch
+ | upstream_xcb-Update-mouse-buttons-from-MotionNotify-events.patch
+ | upstream-gerrit_Handle-SelectionWindowDestroy-in-QXcbClipboard.patch
+ | upstream_Call-ofono-nm-Registered-delayed-in-constructor-othe.patch
+ | upstream_xcb_use_themed_cursor.patch
+ - Additional patches, Ubuntu specific:
+ | enable_pie.patch
+ | disable_overlay_scrollbars.diff
+ | qt5-qmake-arm-linux-gnueabihf
+ | Add-workaround-for-GL-on-Android-emulator.patch
+ | enable-tests.patch
+ | qopenglframebufferobject_powervrworkaround.patch
+ | disable-generic-plugin-when-others-available.patch
+ * Switch qtbase over to Debian git
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com> Fri, 22 May 2015 05:14:09 +0000
+
- qtbase-opensource-src (5.4.1+dfsg-5) UNRELEASED; urgency=medium
-
- [ Lisandro Damián Nicanor Pérez Meyer ]
- * libqt5gui5: demote libqt5libqgtk2 to a suggestion.
-
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Mon, 18 May 2015 18:35:01 -0300
-
qtbase-opensource-src (5.4.1+dfsg-4) experimental; urgency=medium
* Add try_to_ensure_that_fpic_is_used_in_cmake_builds.patch, it seems
diff --cc debian/patches/series
index a967b5e,6175555..9042299
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -2,36 -2,8 +2,18 @@@
upstream_small-improvements-to-the-hurd-g-mkspec.patch
upstream_Complete-MIPS-atomic-support-on-pre-MIPS32-architect.patch
gnukfreebsd.diff
- cve-2015-0295.diff
- qtsystemtrayicon_handle_submenus_correctly.patch
- xcb_delay_showing_tray_icon_window_until_it_is_embedded.patch
- require_fpic_instead_of_fpie.patch
- try_to_ensure_that_fpic_is_used_in_cmake_builds.patch
- make_qglobal_h_complain_if_you_use_fpie.patch
- enable_pie.patch
- latest_fpic_commits.patch
- fixes_crash_in_bmp_and_ico_image_decoders.patch
- fixes_crash_in_gif_image_decoder.patch
- tst_QNetworkDiskCache-Stop-using-actual-web-servers.patch
- Correct-typo-in-the-Gujarati-openType-identififer.patch
+load_testability_from_env_var.patch
# Debian specific.
-revert_upstream_bsymbolic_change.patch
+#revert_upstream_bsymbolic_change.patch # https://launchpad.net/bugs/1403758
no_htmlinfo_example.diff
remove_privacy_breachs.diff
+
+# Ubuntu specific.
+disable_overlay_scrollbars.diff
+qt5-qmake-arm-linux-gnueabihf
+Add-workaround-for-GL-on-Android-emulator.patch
+enable-tests.patch
+qopenglframebufferobject_powervrworkaround.patch
+disable-generic-plugin-when-others-available.patch
+
- # Cherrypicked - will be in 5.4.2
- make-sure-there-s-a-scene.patch
- upstream_xcb-Update-mouse-buttons-from-MotionNotify-events.patch
- upstream-gerrit_Handle-SelectionWindowDestroy-in-QXcbClipboard.patch
- upstream_Call-ofono-nm-Registered-delayed-in-constructor-othe.patch
- upstream_xcb_use_themed_cursor.patch
--
qtbase packaging
More information about the pkg-kde-commits
mailing list