summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorjustforlxz2021-10-29 20:40:44 +0800
committerjustforlxz2021-10-29 20:40:44 +0800
commit146b5345398277e094d805f1ada588a06f401b5b (patch)
treeb9b162e2032181847c909745398bf437383550d7
parent88be701a9556459692fa0ac180989ec04deb5246 (diff)
downloadaur-146b5345398277e094d805f1ada588a06f401b5b.tar.gz
update
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD12
-rw-r--r--fix-ut.patch46
3 files changed, 58 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 57b209c66d7e..8f5ad6030b48 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -18,6 +18,8 @@ pkgbase = dtkcore-git
provides = dtkcore
conflicts = dtkcore
source = dtkcore-git::git://github.com/linuxdeepin/dtkcore.git
+ source = fix-ut.patch
sha512sums = SKIP
+ sha512sums = 1ace18326ddd5fd14bf652b21db9ee9f706f1dae63f23e9712e7d9142487bff43e1464d2d5bf46e2cfec6663e3153629749ec5e99c1b5e9e785071d6fa9301b2
pkgname = dtkcore-git
diff --git a/PKGBUILD b/PKGBUILD
index 21f0660a0492..c0bd8ade4862 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,14 +12,22 @@ makedepends=('git' 'qt5-tools' 'gtest' 'dtkcommon-git')
conflicts=('dtkcore')
provides=('dtkcore')
groups=('deepin-git')
-source=("$pkgname::git://github.com/linuxdeepin/dtkcore.git")
-sha512sums=('SKIP')
+source=("$pkgname::git://github.com/linuxdeepin/dtkcore.git"
+ "fix-ut.patch"
+ )
+sha512sums=('SKIP'
+ '1ace18326ddd5fd14bf652b21db9ee9f706f1dae63f23e9712e7d9142487bff43e1464d2d5bf46e2cfec6663e3153629749ec5e99c1b5e9e785071d6fa9301b2')
pkgver() {
cd $pkgname
git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
}
+prepare() {
+ cd $pkgname
+ patch -p1 -i ../fix-ut.patch
+}
+
build() {
cd $pkgname
qmake-qt5 PREFIX=/usr DTK_VERSION=$pkgver LIB_INSTALL_DIR=/usr/lib
diff --git a/fix-ut.patch b/fix-ut.patch
new file mode 100644
index 000000000000..e30b5ced68db
--- /dev/null
+++ b/fix-ut.patch
@@ -0,0 +1,46 @@
+diff --git a/tests/ut_dconfig.cpp b/tests/ut_dconfig.cpp
+index 4cf17b9..b55f566 100644
+--- a/tests/ut_dconfig.cpp
++++ b/tests/ut_dconfig.cpp
+@@ -29,6 +29,9 @@
+
+ DCORE_USE_NAMESPACE
+
++static constexpr char const *APP_ID = "tests";
++static constexpr char const *FILE_NAME = "example";
++
+ class ut_DConfig : public testing::Test
+ {
+ protected:
+@@ -50,8 +53,7 @@ protected:
+ static EnvGuard backendType;
+ static EnvGuard fileBackendLocalPerfix;
+ static FileCopyGuard *metaGuard;
+- static constexpr char const *APP_ID = "tests";
+- static constexpr char const *FILE_NAME = "example";
++
+ };
+ EnvGuard ut_DConfig::fileBackendLocalPerfix;
+ EnvGuard ut_DConfig::backendType;
+diff --git a/tests/ut_dconfigfile.cpp b/tests/ut_dconfigfile.cpp
+index da185b2..728d4e0 100644
+--- a/tests/ut_dconfigfile.cpp
++++ b/tests/ut_dconfigfile.cpp
+@@ -29,6 +29,8 @@
+
+ DCORE_USE_NAMESPACE
+
++static constexpr char const *LocalPrefix = "/tmp/example";
++
+ class ut_DConfigFile : public testing::Test
+ {
+ protected:
+@@ -42,7 +44,7 @@ protected:
+ }
+ virtual void TearDown() override;
+
+- static constexpr char const *LocalPrefix = "/tmp/example";
++
+
+ const char *APP_ID = "org.foo.appid";
+ const char *FILE_NAME = "org.foo.name";