[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.5.1+dfsg-14ubuntu2-4-gaa8ad6b
Timo Jyrinki
timo at moszumanska.debian.org
Wed Mar 2 10:27:57 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=aa8ad6b
The following commit has been merged in the ubuntu branch:
commit aa8ad6b3196d4bc5a20cb430f3e688393f96720b
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date: Wed Mar 2 10:27:53 2016 +0000
Build with C.UTF-8 locale to (LP: #1551145) and re-enable tests (LP: #1548686)
---
debian/changelog | 3 +-
debian/patches/enable-tests.patch | 75 ---------------------------------------
debian/rules | 3 ++
3 files changed, 5 insertions(+), 76 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5335073..b2487d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ qtbase-opensource-src (5.5.1+dfsg-14ubuntu3) UNRELEASED; urgency=medium
* debian/patches/Xcb-fix-crash-on-screen-power-save.patch:
- Fix additional cases where crash could occur on monitor disconnections
or power save. (LP: #1551122)
+ * Build with C.UTF-8 locale to (LP: #1551145) and re-enable tests (LP: #1548686)
- -- Timo Jyrinki <timo-jyrinki at ubuntu.com> Mon, 29 Feb 2016 08:03:06 +0000
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com> Wed, 02 Mar 2016 10:27:00 +0000
qtbase-opensource-src (5.5.1+dfsg-14ubuntu2) xenial; urgency=medium
diff --git a/debian/patches/enable-tests.patch b/debian/patches/enable-tests.patch
index 6afdc2c..29abcec 100644
--- a/debian/patches/enable-tests.patch
+++ b/debian/patches/enable-tests.patch
@@ -23582,78 +23582,3 @@ diff -urN qtbase-opensource-src-5.5.1.old/tests/auto/corelib/io/qtextstream/tst_
}
{
// Shift-JIS device
-diff -urN qtbase-opensource-src-5.5.1.old/tests/auto/network/access/qnetworkcookiejar/parser.json qtbase-opensource-src-5.5.1/tests/auto/network/access/qnetworkcookiejar/parser.json
---- qtbase-opensource-src-5.5.1.old/tests/auto/network/access/qnetworkcookiejar/parser.json 2015-10-13 04:35:13.000000000 +0000
-+++ qtbase-opensource-src-5.5.1/tests/auto/network/access/qnetworkcookiejar/parser.json 2016-02-23 12:15:45.174642595 +0000
-@@ -903,14 +903,6 @@
- "sent": []
- },
- {
-- "test": "DOMAIN0017",
-- "received": [
-- "foo=bar; domain=.org"
-- ],
-- "sent-to": "http://home.example.org:8888/cookie-parser-result?domain0017",
-- "sent": []
-- },
-- {
- "test": "DOMAIN0018",
- "received": [
- "foo=bar; domain=.org."
-diff -urN qtbase-opensource-src-5.5.1.old/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp qtbase-opensource-src-5.5.1/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
---- qtbase-opensource-src-5.5.1.old/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp 2015-10-13 04:35:13.000000000 +0000
-+++ qtbase-opensource-src-5.5.1/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp 2016-02-23 12:14:24.218640934 +0000
-@@ -185,10 +185,10 @@
- preset.clear();
- cookie.setPath("/");
- cookie.setDomain(".co.uk");
-- QTest::newRow("effective-tld1-denied") << preset << cookie << "http://something.co.uk" << result << false;
-- cookie.setDomain("co.uk");
-- QTest::newRow("effective-tld1-denied2") << preset << cookie << "http://something.co.uk" << result << false;
-- cookie.setDomain(".something.co.uk");
-+ //QTest::newRow("effective-tld1-denied") << preset << cookie << "http://something.co.uk" << result << false;
-+ //cookie.setDomain("co.uk");
-+ //QTest::newRow("effective-tld1-denied2") << preset << cookie << "http://something.co.uk" << result << false;
-+ //cookie.setDomain(".something.co.uk");
- result += cookie;
- QTest::newRow("effective-tld1-accepted") << preset << cookie << "http://something.co.uk" << result << true;
-
-@@ -196,9 +196,9 @@
- result.clear();
- preset.clear();
- cookie.setDomain(".farmacia.mz");
-- QTest::newRow("effective-tld2-denied") << preset << cookie << "http://farmacia.mz" << result << false;
-- QTest::newRow("effective-tld2-denied2") << preset << cookie << "http://www.farmacia.mz" << result << false;
-- QTest::newRow("effective-tld2-denied3") << preset << cookie << "http://www.anything.farmacia.mz" << result << false;
-+ //QTest::newRow("effective-tld2-denied") << preset << cookie << "http://farmacia.mz" << result << false;
-+ //QTest::newRow("effective-tld2-denied2") << preset << cookie << "http://www.farmacia.mz" << result << false;
-+ //QTest::newRow("effective-tld2-denied3") << preset << cookie << "http://www.anything.farmacia.mz" << result << false;
- cookie.setDomain(".teledata.mz");
- result += cookie;
- QTest::newRow("effective-tld2-accepted") << preset << cookie << "http://www.teledata.mz" << result << true;
-@@ -234,12 +234,12 @@
- result.clear();
- preset.clear();
- cookie.setDomain(".com");
-- QTest::newRow("rfc2109-4.3.2-ex3") << preset << cookie << "http://x.foo.com" << result << false;
-+ //QTest::newRow("rfc2109-4.3.2-ex3") << preset << cookie << "http://x.foo.com" << result << false;
-
- result.clear();
- preset.clear();
- cookie.setDomain(".com.");
-- QTest::newRow("rfc2109-4.3.2-ex3-2") << preset << cookie << "http://x.foo.com" << result << false;
-+ //QTest::newRow("rfc2109-4.3.2-ex3-2") << preset << cookie << "http://x.foo.com" << result << false;
- }
-
- void tst_QNetworkCookieJar::setCookiesFromUrl()
-diff -urN qtbase-opensource-src-5.5.1.old/tests/auto/corelib/io/qurl/tst_qurl.cpp qtbase-opensource-src-5.5.1/tests/auto/corelib/io/qurl/tst_qurl.cpp
---- qtbase-opensource-src-5.5.1.old/tests/auto/corelib/io/qurl/tst_qurl.cpp 2015-10-13 04:35:19.000000000 +0000
-+++ qtbase-opensource-src-5.5.1/tests/auto/corelib/io/qurl/tst_qurl.cpp 2016-02-24 14:20:10.569909324 +0000
-@@ -3200,6 +3200,7 @@
-
- void tst_QUrl::effectiveTLDs()
- {
-+ QSKIP("skip tests due to LP: #1548686");
- QFETCH(QUrl, domain);
- QFETCH(QString, TLD);
- QCOMPARE(domain.topLevelDomain(QUrl::PrettyDecoded), TLD);
diff --git a/debian/rules b/debian/rules
index 214cc90..9c4bb35 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,9 @@ DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
DEB_HOST_ARCH_BITS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS)
DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+LC_ALL := C.UTF-8
+export LC_ALL
+
export PATH := $(PATH):$(shell pwd)/bin
export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
--
qtbase packaging
More information about the pkg-kde-commits
mailing list