aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRasmus Thomsen <oss@cogitri.dev>2020-04-24 11:04:06 +0200
committerLeo <thinkabit.ukim@gmail.com>2020-04-24 11:31:47 +0000
commit6a447d36f5f69569400b3c05fd4dea6d36b06912 (patch)
tree83313d867845e238d5dea2b1b5d443f7ccd4f7cf
parenteb1e0684fa13bd8302878c7ad1a28b6c0303ee3d (diff)
downloadaports-6a447d36f5f69569400b3c05fd4dea6d36b06912.tar.gz
aports-6a447d36f5f69569400b3c05fd4dea6d36b06912.tar.bz2
aports-6a447d36f5f69569400b3c05fd4dea6d36b06912.tar.xz
community/*: stop manually moving usr/{lib,share}/glade to -dev subpkg
abuild 3.6.x does this for us, so this will lead to build failures. Also rebuild since we moved things to the wrong places (e.g. /usr/lib instead of /usr/lib/glade) in most APKBUILDs
-rw-r--r--community/gitg/APKBUILD9
-rw-r--r--community/gtksourceview4/APKBUILD8
-rw-r--r--community/libgweather/APKBUILD7
-rw-r--r--community/libhandy/APKBUILD6
-rw-r--r--community/libpeas/APKBUILD8
-rw-r--r--community/libxfce4ui/APKBUILD9
6 files changed, 7 insertions, 40 deletions
diff --git a/community/gitg/APKBUILD b/community/gitg/APKBUILD
index 33dff015c6..23839c5958 100644
--- a/community/gitg/APKBUILD
+++ b/community/gitg/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=gitg
pkgver=3.32.1
-pkgrel=4
+pkgrel=5
pkgdesc="gitg is the GNOME GUI client to view git repositories"
url="https://wiki.gnome.org/Apps/Gitg"
arch="all !s390x !mips !mips64" # missing gtksourceview
@@ -33,11 +33,4 @@ package() {
DESTDIR="$pkgdir" ninja -C output install
}
-dev() {
- default_dev
- mkdir -p "$subpkgdir"/usr/lib "$subpkgdir"/usr/share
- mv "$pkgdir"/usr/lib/glade/modules "$subpkgdir"/usr/lib/
- mv "$pkgdir"/usr/share/glade/catalogs "$subpkgdir"/usr/share/
-}
-
sha512sums="243e630b3e5bb1919dc307e6b3fed1b1b0e3884d2a2507e4526b4af61e86f1cd7004a3dbb96001ffb0280cefe7cdb9b109c39996718913c7410224830c0145a4 gitg-3.32.1.tar.xz"
diff --git a/community/gtksourceview4/APKBUILD b/community/gtksourceview4/APKBUILD
index fc462faa86..6a18925405 100644
--- a/community/gtksourceview4/APKBUILD
+++ b/community/gtksourceview4/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=gtksourceview4
pkgver=4.6.0
-pkgrel=0
+pkgrel=1
pkgdesc="A text widget adding syntax highlighting and more to GNOME"
url="https://wiki.gnome.org/Projects/GtkSourceView"
arch="all !s390x !mips !mips64" # Limited by ibus -> librsvg
@@ -36,11 +36,5 @@ check() {
package() {
DESTDIR="$pkgdir" ninja -C output install
}
-
-dev() {
- default_dev
- mkdir -p "$subpkgdir"/usr/share
- mv "$pkgdir"/usr/share/glade/catalogs "$subpkgdir"/usr/share/
-}
sha512sums="e7a873dbd452f2077afbc6e0142ce17172a8d33220ea1181e69ed8a5cf94e42e2df741e5a0636731fab6984e84ea2347dca34b5889f3808d29259e13527fa00c gtksourceview-4.6.0.tar.xz
c765c7c77a94007e95c050c05ef0283b2cdcd5751274924ea08a02ea2507061677d7f286c3e98d6b91f3603a06364d1ea43491e77e2e086e05c841218923e771 skip-test.patch"
diff --git a/community/libgweather/APKBUILD b/community/libgweather/APKBUILD
index 378948d5cd..b87623c78f 100644
--- a/community/libgweather/APKBUILD
+++ b/community/libgweather/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=libgweather
pkgver=3.36.0
-pkgrel=0
+pkgrel=1
pkgdesc="GNOME weather library"
url="https://wiki.gnome.org/Projects/LibGWeather"
arch="all"
@@ -36,11 +36,6 @@ package() {
DESTDIR="$pkgdir" ninja -C output install
}
-dev() {
- default_dev
- mkdir -p "$subpkgdir"/usr/share
- mv "$pkgdir"/usr/share/glade/catalogs "$subpkgdir"/usr/share/
-}
sha512sums="0f89d4f7faa9582b4b717b29ca60f6dbaa43614ac1e6aa7da8542595f2db2b4c2a1c5f77ed0d2822e6e358665873db03383846b11e797d78cc993f20fd4472a2 libgweather-3.36.0.tar.xz
73ddf302a64e8e03a2a0cb8e2b61b14af27d09d01687a4431da5a8d0394fe71c760a3654a5ffe518c6b3176f76b89bc46742cbea61909d849d6398cf60f6b5e5 remove-locale-dependant-test.patch"
diff --git a/community/libhandy/APKBUILD b/community/libhandy/APKBUILD
index 15a27045a1..d2b5504ecd 100644
--- a/community/libhandy/APKBUILD
+++ b/community/libhandy/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=libhandy
pkgver=0.0.13
-pkgrel=1
+pkgrel=2
pkgdesc="Library full of GTK+ widgets for mobile phones"
url="https://source.puri.sm/Librem5/libhandy"
arch="all !s390x !mips !mips64" # Limited by 'ibus'
@@ -38,10 +38,8 @@ package() {
dev() {
default_dev
- mkdir -p "$subpkgdir"/usr/lib "$subpkgdir"/usr/share
+ mkdir -p "$subpkgdir"/usr
mv "$pkgdir"/usr/bin "$subpkgdir"/usr
- mv "$pkgdir"/usr/share/glade/catalogs "$subpkgdir"/usr/share
- mv "$pkgdir"/usr/lib/glade/modules "$subpkgdir"/usr/share
}
sha512sums="b9eaef775a93c200aa3f526b627827ed4530ff2a4c826ab24abdbd944075c0939232bd2c3388b8b8e34c6729cb11017a7af2bd3ff9eec78fbdc7e7dd9f11d24b libhandy-v0.0.13.tar.gz
diff --git a/community/libpeas/APKBUILD b/community/libpeas/APKBUILD
index 61ff3333e7..a79a46b36e 100644
--- a/community/libpeas/APKBUILD
+++ b/community/libpeas/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=libpeas
pkgver=1.26.0
-pkgrel=0
+pkgrel=1
pkgdesc="GObject-based plugin system"
url="https://wiki.gnome.org/Projects/Libpeas"
arch="all"
@@ -40,10 +40,4 @@ py3() {
mv "$pkgdir"/usr/lib/libpeas-1.0/loaders/libpython3loader.* "$subpkgdir"/usr/lib/libpeas-1.0/loaders/
}
-dev() {
- default_dev
- mkdir -p "$subpkgdir"/usr/share
- mv "$pkgdir"/usr/share/glade/catalogs "$subpkgdir"/usr/share/
-}
-
sha512sums="86157da14d17c16df2ef3f44ab48822ea1a8be8aec8f5419bc421bd475113f686cd16f9616ac53cbf3dc6f31f521384ac63eb8e9f1a46ea21b5cda8ba21e855f libpeas-1.26.0.tar.xz"
diff --git a/community/libxfce4ui/APKBUILD b/community/libxfce4ui/APKBUILD
index b2278f9b83..4793dc1da0 100644
--- a/community/libxfce4ui/APKBUILD
+++ b/community/libxfce4ui/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxfce4ui
pkgver=4.14.1
-pkgrel=0
+pkgrel=1
pkgdesc="Widgets library for the Xfce desktop environment"
url="https://xfce.org/"
arch="all"
@@ -37,13 +37,6 @@ package() {
make DESTDIR="$pkgdir" install
}
-dev() {
- default_dev
- mkdir -p "$subpkgdir"/usr/lib "$subpkgdir"/usr/share
- mv "$pkgdir"/usr/lib/glade* "$subpkgdir"/usr/lib/
- mv "$pkgdir"/usr/share/glade* "$subpkgdir"/usr/share/
-}
-
gtk3() {
mkdir -p "$subpkgdir"/usr/lib
mv "$pkgdir"/usr/lib/libxfce4ui-2.so.* \