summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-01-20 22:09:35 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-01-20 22:09:35 +0000
commitf56633a2ce0fc7c1b02c7229b9978bc6263cd2d4 (patch)
tree686e0ead104be10530060f6c627eecdb16f0371f
parent10e77220b55e60fe4a2ab726091c5c120f153aa7 (diff)
downloadpackages-f56633a2ce0fc7c1b02c7229b9978bc6263cd2d4.tar.gz
packages-f56633a2ce0fc7c1b02c7229b9978bc6263cd2d4.tar.bz2
packages-f56633a2ce0fc7c1b02c7229b9978bc6263cd2d4.tar.xz
packages-f56633a2ce0fc7c1b02c7229b9978bc6263cd2d4.zip
user/accountsservice: migrate from experimental/
-rw-r--r--user/accountsservice/APKBUILD (renamed from experimental/accountsservice/APKBUILD)10
-rw-r--r--user/accountsservice/disable-msgfmt15
2 files changed, 22 insertions, 3 deletions
diff --git a/experimental/accountsservice/APKBUILD b/user/accountsservice/APKBUILD
index fb82e1dd5..2ea23a416 100644
--- a/experimental/accountsservice/APKBUILD
+++ b/user/accountsservice/APKBUILD
@@ -10,8 +10,10 @@ license="GPL-3.0+ AND GPL-2.0+"
depends="dbus"
makedepends="cmake dbus-dev glib-dev gobject-introspection-dev meson ninja
polkit-dev utmps-dev xmlto"
-subpackages="$pkgname-doc"
-source="https://www.freedesktop.org/software/accountsservice/accountsservice-$pkgver.tar.xz"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
+source="https://www.freedesktop.org/software/accountsservice/accountsservice-$pkgver.tar.xz
+ disable-msgfmt
+ "
build() {
cd "$builddir"
@@ -29,6 +31,7 @@ build() {
# msgfmt(1) XML error
cp data/org.freedesktop.accounts.policy.in \
output/data/org.freedesktop.accounts.policy
+ patch -Np1 < "$srcdir"/disable-msgfmt
ninja -C output
}
@@ -42,4 +45,5 @@ package() {
DESTDIR="$pkgdir" ninja -C output install
}
-sha512sums="5fbcccc286dba60efba905aa79b1b51a5478fe52bf2e256d40d9fc2d7a311aea4ce397365045659a4ef2ecb2cc079130fb1d0107749c3c906c394517056ac1c0 accountsservice-0.6.54.tar.xz"
+sha512sums="5fbcccc286dba60efba905aa79b1b51a5478fe52bf2e256d40d9fc2d7a311aea4ce397365045659a4ef2ecb2cc079130fb1d0107749c3c906c394517056ac1c0 accountsservice-0.6.54.tar.xz
+d3cd21c871f66359aae0b4688aeb5f31ba124579212350870540344a489299413a13ad4b66872a9fb549ed3b3664dfbadd03c9b20df3714cb4d26e3f2cf107ce disable-msgfmt"
diff --git a/user/accountsservice/disable-msgfmt b/user/accountsservice/disable-msgfmt
new file mode 100644
index 000000000..3342f7eab
--- /dev/null
+++ b/user/accountsservice/disable-msgfmt
@@ -0,0 +1,15 @@
+--- accountsservice-0.6.54/output/build.ninja.old 2019-01-20 21:23:36.570000000 +0000
++++ accountsservice-0.6.54/output/build.ninja 2019-01-20 21:25:01.140000000 +0000
+@@ -60,9 +60,9 @@
+
+ # Build rules for targets
+
+-build data/org.freedesktop.accounts.policy: CUSTOM_COMMAND ../data/org.freedesktop.accounts.policy.in
+- COMMAND = /usr/bin/meson --internal msgfmthelper ../data/org.freedesktop.accounts.policy.in data/org.freedesktop.accounts.policy xml /usr/src/packages/user/accountsservice/src/accountsservice-0.6.54/po
+- description = Generating$ org.freedesktop.accounts.policy_data_merge$ with$ a$ custom$ command.
++#build data/org.freedesktop.accounts.policy: CUSTOM_COMMAND ../data/org.freedesktop.accounts.policy.in
++# COMMAND = /usr/bin/meson --internal msgfmthelper ../data/org.freedesktop.accounts.policy.in data/org.freedesktop.accounts.policy xml /usr/src/packages/user/accountsservice/src/accountsservice-0.6.54/po
++# description = Generating$ org.freedesktop.accounts.policy_data_merge$ with$ a$ custom$ command.
+
+ build src/accounts-generated.c: CUSTOM_COMMAND /usr/src/packages/user/accountsservice/src/accountsservice-0.6.54/data/org.freedesktop.Accounts.xml | /usr/bin/gdbus-codegen
+ COMMAND = /usr/bin/gdbus-codegen --c-generate-autocleanup all --interface-prefix org.freedesktop. --c-namespace Accounts --body --output src/accounts-generated.c /usr/src/packages/user/accountsservice/src/accountsservice-0.6.54/data/org.freedesktop.Accounts.xml