From c480cf51fa38a0438f4c846df442694f1535f622 Mon Sep 17 00:00:00 2001 From: Puqns67 Date: Mon, 27 Feb 2023 23:04:52 +0800 Subject: [PATCH] [Perf] Reorganized file structure --- .gitignore | 4 +- libgbinder/PKGBUILD | 26 ---------- packages/libgbinder/PKGBUILD | 52 +++++++++++++++++++ .../libglibutil}/PKGBUILD | 2 +- .../python-gbinder}/PKGBUILD | 2 +- .../smiley-sans-bin}/PKGBUILD | 0 .../smiley-sans}/PKGBUILD | 0 {waydroid => packages/waydroid}/PKGBUILD | 4 +- 8 files changed, 58 insertions(+), 32 deletions(-) delete mode 100644 libgbinder/PKGBUILD create mode 100644 packages/libgbinder/PKGBUILD rename {libglibutil => packages/libglibutil}/PKGBUILD (90%) rename {python-gbinder => packages/python-gbinder}/PKGBUILD (90%) rename {smiley-sans-bin => packages/smiley-sans-bin}/PKGBUILD (100%) rename {smiley-sans => packages/smiley-sans}/PKGBUILD (100%) rename {waydroid => packages/waydroid}/PKGBUILD (83%) diff --git a/.gitignore b/.gitignore index 2ce43d0..4cc98ec 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ -*/*/ +packages/*/*/ LICENSE *.pkg.tar.zst *.tar.gz *.zip -!*/keys/ +!packages/*/keys/ diff --git a/libgbinder/PKGBUILD b/libgbinder/PKGBUILD deleted file mode 100644 index fc0f00f..0000000 --- a/libgbinder/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Maintainer: Puqns67 -# Contributor: Danct12 - -# This PKGBUILD is base on the AUR repo libgbinder, by Danct12 - -pkgname='libgbinder' -pkgver=1.1.31 -pkgrel=1 -pkgdesc='GLib-style interface to binder' -arch=('i686' 'x86_64' 'armv7h' 'aarch64') -url='https://github.com/mer-hybris/libgbinder' -license=('BSD') -depends=('libglibutil' 'glib2') -source=("${pkgname}-${pkgver}.tar.gz"::"${url}/archive/refs/tags/${pkgver}.tar.gz") -sha512sums=('519cc015a97d6ebcb410efcbff54f01afc401de85efb0a5c1128b57f996f23b352fa5dd70f06ac5b9205c3f0770ffabfd82f367c85ca18a5012f715d09bce690') - -build() { - make -C "${srcdir}/${pkgname}-${pkgver}/" KEEP_SYMBOLS=1 release pkgconfig -} - -package() { - make -C "${srcdir}/${pkgname}-${pkgver}/" DESTDIR="${pkgdir}" install-dev - - # license - install -Dm 644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/packages/libgbinder/PKGBUILD b/packages/libgbinder/PKGBUILD new file mode 100644 index 0000000..0d84794 --- /dev/null +++ b/packages/libgbinder/PKGBUILD @@ -0,0 +1,52 @@ +# Maintainer: Puqns67 +# Contributor: Danct12 + +# This PKGBUILD is base on the AUR repo libgbinder, by Danct12 + +pkgname='libgbinder' +pkgver=1.1.31 +pkgrel=1 +pkgdesc='GLib-style interface to binder' +arch=('i686' 'x86_64' 'armv7h' 'aarch64') +url='https://github.com/mer-hybris/libgbinder' +license=('BSD') +depends=('libglibutil' 'glib2') +source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/${pkgver}.tar.gz") +sha512sums=('519cc015a97d6ebcb410efcbff54f01afc401de85efb0a5c1128b57f996f23b352fa5dd70f06ac5b9205c3f0770ffabfd82f367c85ca18a5012f715d09bce690') + +build() { + make -C "${srcdir}/${pkgname}-${pkgver}/" KEEP_SYMBOLS=1 release pkgconfig +} + +package() { + make -C "${srcdir}/${pkgname}-${pkgver}/" DESTDIR="${pkgdir}" install-dev + + # license + install -Dm 644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} +# Maintainer: Puqns67 +# Contributor: Danct12 + +# This PKGBUILD is base on the AUR repo libgbinder, by Danct12 + +pkgname='libgbinder' +pkgver=1.1.31 +pkgrel=1 +pkgdesc='GLib-style interface to binder' +arch=('i686' 'x86_64' 'armv7h' 'aarch64') +url='https://github.com/mer-hybris/libgbinder' +license=('BSD') +depends=('libglibutil' 'glib2') +source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/${pkgver}.tar.gz") +sha512sums=('519cc015a97d6ebcb410efcbff54f01afc401de85efb0a5c1128b57f996f23b352fa5dd70f06ac5b9205c3f0770ffabfd82f367c85ca18a5012f715d09bce690') + +build() { + make -C "${srcdir}/${pkgname}-${pkgver}/" KEEP_SYMBOLS=1 release pkgconfig +} + +package() { + make -C "${srcdir}/${pkgname}-${pkgver}/" DESTDIR="${pkgdir}" install-dev + + # license + install -Dm 644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/libglibutil/PKGBUILD b/packages/libglibutil/PKGBUILD similarity index 90% rename from libglibutil/PKGBUILD rename to packages/libglibutil/PKGBUILD index a411686..b8c6b94 100644 --- a/libglibutil/PKGBUILD +++ b/packages/libglibutil/PKGBUILD @@ -11,7 +11,7 @@ arch=('i686' 'x86_64' 'armv7h' 'aarch64') url='https://github.com/sailfishos/libglibutil' license=('BSD') depends=('glib2') -source=("${pkgname}-${pkgver}.tar.gz"::"${url}/archive/refs/tags/${pkgver}.tar.gz") +source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/${pkgver}.tar.gz") sha512sums=('5b8d4b00ae149bba0b2df55d5e23910dc52ef3a7ee9162202afe4774e246e9389ba971b3d54ac0542b3678b15a3310c8d0e7536b7296d1a3b82e2ae2f021c541') build() { diff --git a/python-gbinder/PKGBUILD b/packages/python-gbinder/PKGBUILD similarity index 90% rename from python-gbinder/PKGBUILD rename to packages/python-gbinder/PKGBUILD index a0a7f35..a7ac24e 100644 --- a/python-gbinder/PKGBUILD +++ b/packages/python-gbinder/PKGBUILD @@ -13,7 +13,7 @@ _reponame="${url##*/}" license=('GPL3') depends=('libgbinder') makedepends=('cython' 'python' 'python-setuptools') -source=("${_reponame}-${pkgver}.tar.gz"::"${url}/archive/refs/tags/${pkgver}.tar.gz") +source=("${_reponame}-${pkgver}.tar.gz::${url}/archive/refs/tags/${pkgver}.tar.gz") sha512sums=('1910d6e904ac46da519064e9dc57e4059e1ea7072f2cf4b7ca0888a73701a590ff565fe9e9ca67acf94dba2a69f3138457d8b9533c2360befdd508b983f32a03') build() { diff --git a/smiley-sans-bin/PKGBUILD b/packages/smiley-sans-bin/PKGBUILD similarity index 100% rename from smiley-sans-bin/PKGBUILD rename to packages/smiley-sans-bin/PKGBUILD diff --git a/smiley-sans/PKGBUILD b/packages/smiley-sans/PKGBUILD similarity index 100% rename from smiley-sans/PKGBUILD rename to packages/smiley-sans/PKGBUILD diff --git a/waydroid/PKGBUILD b/packages/waydroid/PKGBUILD similarity index 83% rename from waydroid/PKGBUILD rename to packages/waydroid/PKGBUILD index 1db0093..d348b42 100644 --- a/waydroid/PKGBUILD +++ b/packages/waydroid/PKGBUILD @@ -14,9 +14,9 @@ license=('GPL3') depends=('dnsmasq' 'lxc' 'nftables' 'python' 'python-gbinder' 'python-gobject' 'which') optdepends=('waydroid-image: Android image for use with waydroid' 'python-pyclip: share clipboard with container') -source=("${pkgname}-${pkgver}.tar.gz"::"${url}/archive/refs/tags/${pkgver}.tar.gz") +source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/${pkgver}.tar.gz") sha512sums=('2c7feb8cfe2b6e2738159d07e12f378250f5ba6a0d0f47c0ff904af934eacde193ae0fcae1cb4fb67d1687a2ffcd2864c1eea4fa5e52c19685ffad5c702359a5') package() { - make -C "${srcdir}/${pkgname}-${pkgver}/" install DESTDIR="${pkgdir}" USE_NFTABLES=1 + make -C "${srcdir}/${pkgname}-${pkgver}/" DESTDIR="${pkgdir}" USE_NFTABLES=1 install }