diff options
| author | Zach van Rijn <me@zv.io> | 2022-02-01 18:44:36 +0000 |
|---|---|---|
| committer | Zach van Rijn <me@zv.io> | 2022-10-21 18:33:57 -0500 |
| commit | daf37ddfe2179a7dabae43405f17a2e263eb716b (patch) | |
| tree | 9ad98b30b18582ce4148c1e0abddbc54b11118ad | |
| parent | 9684b20847311f06408fe606dbbe3d5075eedfb6 (diff) | |
| download | packages-daf37ddfe2179a7dabae43405f17a2e263eb716b.tar.gz packages-daf37ddfe2179a7dabae43405f17a2e263eb716b.tar.bz2 packages-daf37ddfe2179a7dabae43405f17a2e263eb716b.tar.xz packages-daf37ddfe2179a7dabae43405f17a2e263eb716b.zip | |
user/accountsservice: remove ninja patch.
| -rw-r--r-- | user/accountsservice/APKBUILD | 8 | ||||
| -rw-r--r-- | user/accountsservice/disable-msgfmt | 15 |
2 files changed, 2 insertions, 21 deletions
diff --git a/user/accountsservice/APKBUILD b/user/accountsservice/APKBUILD index f6eaa260d..6f7e8063c 100644 --- a/user/accountsservice/APKBUILD +++ b/user/accountsservice/APKBUILD @@ -11,9 +11,7 @@ depends="dbus" makedepends="cmake dbus-dev glib-dev gobject-introspection-dev meson ninja polkit-dev utmps-dev xmlto" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://www.freedesktop.org/software/accountsservice/accountsservice-$pkgver.tar.xz - disable-msgfmt - " +source="https://www.freedesktop.org/software/accountsservice/accountsservice-$pkgver.tar.xz" build() { CPPFLAGS="-D_PATH_WTMPX=\\\"/run/utmps/wtmp\\\"" meson \ @@ -30,7 +28,6 @@ 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,5 +39,4 @@ package() { DESTDIR="$pkgdir" ninja -C output install } -sha512sums="c12e6a8e80f9b087f97238da4734d2d3a14a7c5cbd870a32a04b00116f176c818c39fb886f6dc72c3e93c136b0c2074ddf8f77e20431fa3bd54f138bea9d262d accountsservice-0.6.55.tar.xz -218b6e28cd277365569c0a214276e7c40a41a3cfd6037a34b86b57dbab4273031089d91fa24191d9a9c30423b8dbb7d946ff62a564783d7f9d002125f9cf27e5 disable-msgfmt" +sha512sums="c12e6a8e80f9b087f97238da4734d2d3a14a7c5cbd870a32a04b00116f176c818c39fb886f6dc72c3e93c136b0c2074ddf8f77e20431fa3bd54f138bea9d262d accountsservice-0.6.55.tar.xz" diff --git a/user/accountsservice/disable-msgfmt b/user/accountsservice/disable-msgfmt deleted file mode 100644 index 5db05f140..000000000 --- a/user/accountsservice/disable-msgfmt +++ /dev/null @@ -1,15 +0,0 @@ ---- 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.55/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.55/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.55/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.55/data/org.freedesktop.Accounts.xml |