New package: gsettings-qt-0.1+17.10.20170824

This commit is contained in:
John 2018-05-21 17:54:11 +02:00 committed by maxice8
parent f996e78325
commit 4d4b0d5f7b
6 changed files with 127 additions and 0 deletions

View file

@ -3361,3 +3361,4 @@ libkid3-gui.so.3.6.0 kid3-3.6.0_1
libcfitsio.so.3 cfitsio-3.450_1
libapparmor.so.1 libapparmor-2.12.0_1
libcue.so.2 libcue-2.2.0_1
libgsettings-qt.so.1 gsettings-qt-0.1+17.10.20170824_1

1
srcpkgs/gsettings-qt-devel Symbolic link
View file

@ -0,0 +1 @@
gsettings-qt

View file

@ -0,0 +1,24 @@
From: Iceyer <iceyers@gmail.com>
Date: Thu, 20 Jul 2017 16:01:55 +0800
Subject: Fix link path error
Forwarded: https://code.launchpad.net/~iceyers/gsettings-qt/fix-link-path
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
--- GSettings/gsettings-qt.pro
+++ 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

View file

@ -0,0 +1,25 @@
From: Iceyer <iceyers@gmail.com>
Date: Fri, 21 Jul 2017 14:43:24 +0800
Subject: Add ordered config
Forwarded: https://code.launchpad.net/~iceyers/gsettings-qt/fix-link-path
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 gsettings-qt.pro
index 15e3684..ee04310 100644
--- a/gsettings-qt.pro
+++ 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

View file

@ -0,0 +1,37 @@
From: Iceyer <iceyers@gmail.com>
Date: Fri, 4 Aug 2017 19:03:59 +0800
Subject: Fix make check failed
Forwarded: https://code.launchpad.net/~iceyers/gsettings-qt/fix-link-path
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 tests/cpptest.pro
index 68b3b49..ec46730 100644
--- a/tests/cpptest.pro
+++ 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 tests/tests.pro
index 6e3a388..2183584 100644
--- a/tests/tests.pro
+++ 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

View file

@ -0,0 +1,39 @@
# Template file for 'gsettings-qt'
pkgname=gsettings-qt
version=0.1+17.10.20170824
revision=1
build_style=qmake
hostmakedepends="qt5-qmake pkg-config qt5-declarative"
makedepends="qt5-devel qt5-declarative-devel glib-devel"
short_desc="Qml bindings for GSettings"
maintainer="John <johnz@posteo.net>"
license="LGPL-3.0-only"
homepage="https://launchpad.net/gsettings-qt"
distfiles="$DEBIAN_SITE/main/g/gsettings-qt/gsettings-qt_${version}.orig.tar.gz"
checksum=a3d1020d526ece2319f1e8f05876e456e85279741653008e05c5d7e8b019c9b9
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-devel qt5-declarative-devel"
fi
pre_configure() {
#disable generation for qmltypes file while cross building
#also makes trouble x86_64-musl so just remove it for everything
if [ "$CROSS_BUILD" ] || [ "${XBPS_TARGET_MACHINE#*-musl}" != "$XBPS_TARGET_MACHINE" ];then
sed -i -e '/qmltypes/ d' GSettings/gsettings-qt.pro
fi
}
post_install() {
rm -r ${DESTDIR}/usr/tests
}
gsettings-qt-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
}
}