openkylin
/
gsettings-qt
mirror of https://gitee.com/openkylin/gsettings-qt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

changed debian/source/format to native

This commit is contained in:
openKylinBot 2022-05-14 03:30:57 +08:00
parent eb9e1d7b7d
commit 469a1548bb
8 changed files with 1 additions and 282 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
debian/patches/0001_Fix-link-path-error.patch vendored
View File

@ -1,22 +0,0 @@
From: Iceyer <iceyers@gmail.com>
Date: Thu, 20 Jul 2017 16:01:55 +0800
Subject: Fix link path error
This patch would fix the FTBFS on Debian.
---
GSettings/gsettings-qt.pro | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/GSettings/gsettings-qt.pro b/GSettings/gsettings-qt.pro
index 218eeea..ffd9b5f 100644
--- a/GSettings/gsettings-qt.pro
+++ b/GSettings/gsettings-qt.pro
@@ -4,7 +4,7 @@ QT -= gui
CONFIG += qt plugin no_keywords link_pkgconfig
PKGCONFIG += gio-2.0
INCLUDEPATH += ../src .
-LIBS += -L../src -lgsettings-qt
+LIBS += -L$$(PWD)/../src -lgsettings-qt
TARGET = GSettingsQmlPlugin

23
debian/patches/0002_Add-ordered-config.patch vendored
View File

@ -1,23 +0,0 @@
From: Iceyer <iceyers@gmail.com>
Date: Fri, 21 Jul 2017 14:43:24 +0800
Subject: Add ordered config
This patch would fix random FTBFS when doing parallel build after
debhelper v10 due to tests built before real libraries.
---
gsettings-qt.pro | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gsettings-qt.pro b/gsettings-qt.pro
index 15e3684..bfac383 100644
--- a/gsettings-qt.pro
+++ b/gsettings-qt.pro
@@ -1,2 +1,7 @@
TEMPLATE = subdirs
-SUBDIRS += src/gsettings-qt.pro GSettings/gsettings-qt.pro tests/tests.pro tests/cpptest.pro
+CONFIG += ordered
+SUBDIRS += \
+ src/gsettings-qt.pro \
+ GSettings/gsettings-qt.pro \
+ tests/tests.pro \
+ tests/cpptest.pro

36
debian/patches/0003_Fix-make-check-failed.patch vendored
View File

@ -1,36 +0,0 @@
From: Iceyer <iceyers@gmail.com>
Date: Fri, 4 Aug 2017 19:03:59 +0800
Subject: Fix make check failed
This commit would fix the failure when invoking "make check".
---
tests/cpptest.pro | 3 ++-
tests/tests.pro | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/tests/cpptest.pro b/tests/cpptest.pro
index 87e574a..4fe8526 100644
--- a/tests/cpptest.pro
+++ b/tests/cpptest.pro
@@ -3,7 +3,8 @@ QT += testlib
QT -= gui
CONFIG += testcase link_pkgconfig
TARGET = cpptest
-IMPORTPATH = $$PWD/..
+IMPORTPATH = $$(PWD)/..
+QMAKE_RPATHDIR += $$(PWD)/../src
SOURCES = cpptest.cpp
INCLUDEPATH += $$(PWD)/../src
LIBS += -L$$(PWD)/../src -lgsettings-qt
diff --git a/tests/tests.pro b/tests/tests.pro
index d314e79..7c85662 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -4,6 +4,7 @@ QT -= gui
CONFIG += qmltestcase
TARGET = test
IMPORTPATH = $$PWD/..
+QMAKE_RPATHDIR += $$PWD/../src
SOURCES = test.cpp
schema.target = gschemas.compiled

22
debian/patches/0004_Increase-test-timeout.patch vendored
View File

@ -1,22 +0,0 @@
From: Boyuan Yang <073plan@gmail.com>
Date: Sun, 13 May 2018 22:24:24 +0800
Subject: Increase test timeout
See also https://bugs.debian.org/898497 .
---
tests/cpptest.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/cpptest.cpp b/tests/cpptest.cpp
index cf98ef6..8dd8cdd 100644
--- a/tests/cpptest.cpp
+++ b/tests/cpptest.cpp
@@ -25,7 +25,7 @@ void TestDeferredDelete::test_deferredDelete()
QSignalSpy spy(dummy.data(), &QObject::destroyed); // watch the dummy object get destroyed
settings->set("testString", "bar");
- QVERIFY(spy.wait(1));
+ QVERIFY(spy.wait(500)); // extend time from 1ms to 500ms for slower machines
QVERIFY(dummy.isNull()); // verify dummy got destroyed for real
QCOMPARE(settings->get("testString").toString(), QStringLiteral("bar")); // also verify the setting got written by reading it back
}

21
debian/patches/0005_bugfix-about-test-cases.patch vendored
View File

@ -1,21 +0,0 @@
From: Yanhao Mo <yanhaocs@gmail.com>
Date: Wed, 8 Aug 2018 15:34:54 +0800
Subject: [PATCH] bugfix about test cases
---
tests/tst_GSettings.qml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/tst_GSettings.qml b/tests/tst_GSettings.qml
index 040575e..b2b2f30 100644
--- a/tests/tst_GSettings.qml
+++ b/tests/tst_GSettings.qml
@@ -12,7 +12,7 @@ TestCase {
id: settings
schema.id: "com.ubports.gsettings.Test"
// has to be "valueChanged" signal, not "changed"; the latter doesn't work reliably with the in-memory gsettings backend
- onValueChanged: changes.push([key, value]);
+ onValueChanged: testCase.changes.push([key, value]);
}
SignalSpy {

151
debian/patches/2001_keep-com.canonical-DBus-namespace.patch vendored
View File

@ -1,151 +0,0 @@
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Sat, 14 May 2022 03:30:57 +0800
Subject: Revert upstream's decision to rename the DBus namespace.
Forwarded: https://gitlab.com/ubports/core/gsettings-qt/issues/1
---
tests/com.canonical.gsettings.test.gschema.xml | 31 ++++++++++++++++++++++++++
tests/com.ubports.gsettings.test.gschema.xml | 31 --------------------------
tests/cpptest.cpp | 2 +-
tests/cpptest.pro | 2 +-
tests/tests.pro | 2 +-
tests/tst_GSettings.qml | 4 ++--
6 files changed, 36 insertions(+), 36 deletions(-)
create mode 100644 tests/com.canonical.gsettings.test.gschema.xml
delete mode 100644 tests/com.ubports.gsettings.test.gschema.xml
diff --git a/tests/com.canonical.gsettings.test.gschema.xml b/tests/com.canonical.gsettings.test.gschema.xml
new file mode 100644
index 0000000..5707cdd
--- /dev/null
+++ b/tests/com.canonical.gsettings.test.gschema.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+ <schema id="com.canonical.gsettings.Test" path="/com/canonical/gsettings/test/">
+ <key name="test-integer" type="i">
+ <default>42</default>
+ </key>
+ <key name="test-double" type="d">
+ <default>1.5</default>
+ </key>
+ <key name="test-boolean" type="b">
+ <default>false</default>
+ </key>
+ <key name="test-string" type="s">
+ <default>"hello"</default>
+ </key>
+ <key name="test-enum" type="s">
+ <choices>
+ <choice value='one'/>
+ <choice value='two'/>
+ <choice value='three'/>
+ </choices>
+ <default>'one'</default>
+ </key>
+ <key name="test-string-list" type="as">
+ <default>['one', 'two', 'three']</default>
+ </key>
+ <key name="test-map" type="a{ss}">
+ <default>{'foo': 'one', 'bar': 'two'}</default>
+ </key>
+ </schema>
+</schemalist>
diff --git a/tests/com.ubports.gsettings.test.gschema.xml b/tests/com.ubports.gsettings.test.gschema.xml
deleted file mode 100644
index 9cfcbd2..0000000
--- a/tests/com.ubports.gsettings.test.gschema.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schemalist>
- <schema id="com.ubports.gsettings.Test" path="/com/ubports/gsettings/test/">
- <key name="test-integer" type="i">
- <default>42</default>
- </key>
- <key name="test-double" type="d">
- <default>1.5</default>
- </key>
- <key name="test-boolean" type="b">
- <default>false</default>
- </key>
- <key name="test-string" type="s">
- <default>"hello"</default>
- </key>
- <key name="test-enum" type="s">
- <choices>
- <choice value='one'/>
- <choice value='two'/>
- <choice value='three'/>
- </choices>
- <default>'one'</default>
- </key>
- <key name="test-string-list" type="as">
- <default>['one', 'two', 'three']</default>
- </key>
- <key name="test-map" type="a{ss}">
- <default>{'foo': 'one', 'bar': 'two'}</default>
- </key>
- </schema>
-</schemalist>
diff --git a/tests/cpptest.cpp b/tests/cpptest.cpp
index 8dd8cdd..7871224 100644
--- a/tests/cpptest.cpp
+++ b/tests/cpptest.cpp
@@ -15,7 +15,7 @@ private:
void TestDeferredDelete::initTestCase()
{
- settings = new QGSettings("com.ubports.gsettings.Test", QByteArray(), this);
+ settings = new QGSettings("com.canonical.gsettings.Test", QByteArray(), this);
dummy = new QObject;
connect(settings, &QGSettings::changed, dummy.data(), &QObject::deleteLater); // delete the dummy object upon any gsettings change
}
diff --git a/tests/cpptest.pro b/tests/cpptest.pro
index 4fe8526..ec46730 100644
--- a/tests/cpptest.pro
+++ b/tests/cpptest.pro
@@ -11,7 +11,7 @@ LIBS += -L$$(PWD)/../src -lgsettings-qt
schema.target = gschemas.compiled
schema.commands = glib-compile-schemas $$PWD
-schema.depends = com.ubports.gsettings.test.gschema.xml
+schema.depends = com.canonical.gsettings.test.gschema.xml
QMAKE_EXTRA_TARGETS += schema
PRE_TARGETDEPS = gschemas.compiled
diff --git a/tests/tests.pro b/tests/tests.pro
index 7c85662..2183584 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -9,7 +9,7 @@ SOURCES = test.cpp
schema.target = gschemas.compiled
schema.commands = glib-compile-schemas $$PWD
-schema.depends = com.ubports.gsettings.test.gschema.xml
+schema.depends = com.canonical.gsettings.test.gschema.xml
QMAKE_EXTRA_TARGETS += schema
PRE_TARGETDEPS = gschemas.compiled
diff --git a/tests/tst_GSettings.qml b/tests/tst_GSettings.qml
index b2b2f30..8cafde5 100644
--- a/tests/tst_GSettings.qml
+++ b/tests/tst_GSettings.qml
@@ -10,7 +10,7 @@ TestCase {
GSettings {
id: settings
- schema.id: "com.ubports.gsettings.Test"
+ schema.id: "com.canonical.gsettings.Test"
// has to be "valueChanged" signal, not "changed"; the latter doesn't work reliably with the in-memory gsettings backend
onValueChanged: testCase.changes.push([key, value]);
}
@@ -24,7 +24,7 @@ TestCase {
GSettings {
id: invalid_settings
- schema.id: "com.ubports.gsettings.NonExisting"
+ schema.id: "com.canonical.gsettings.NonExisting"
}
property string bindingTest: settings.testString

6
debian/patches/series vendored
View File

@ -1,6 +0,0 @@
0001_Fix-link-path-error.patch
0002_Add-ordered-config.patch
0003_Fix-make-check-failed.patch
0004_Increase-test-timeout.patch
0005_bugfix-about-test-cases.patch
2001_keep-com.canonical-DBus-namespace.patch

2
debian/source/format vendored
View File

@ -1 +1 @@
3.0 (quilt)
3.0 (native)