summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-01-21 09:51:18 +0100
committerErich Eckner <git@eckner.net>2019-01-21 09:51:18 +0100
commitab7672f26a14ad13b3ffaefd2de09906b2a27606 (patch)
treeb55bca91726b4ce237bfabb597ee044f4b2427c1
parent64dab5e626f0eff2cc7760c018bfbf836f1c9321 (diff)
parent0af9aedcd977e42e2f2bda7957f9545d938f058d (diff)
downloadpackages-ab7672f26a14ad13b3ffaefd2de09906b2a27606.tar.xz
Merge branch 'master' into i486
-rw-r--r--community/glfw/PKGBUILD14
-rw-r--r--core/glib2/PKGBUILD15
-rw-r--r--extra/devtools/PKGBUILD8
-rw-r--r--extra/doxygen/PKGBUILD11
-rw-r--r--extra/gtkmm3/PKGBUILD10
-rw-r--r--extra/icedtea-web/PKGBUILD10
-rw-r--r--extra/java-openjfx/PKGBUILD14
-rw-r--r--extra/libpst/PKGBUILD10
-rw-r--r--extra/subversion/PKGBUILD74
9 files changed, 159 insertions, 7 deletions
diff --git a/community/glfw/PKGBUILD b/community/glfw/PKGBUILD
new file mode 100644
index 00000000..bb9bc52c
--- /dev/null
+++ b/community/glfw/PKGBUILD
@@ -0,0 +1,14 @@
+eval "$(
+ declare -f package_glfw-x11 | \
+ sed '
+ 2 a arch=(i486 i686 pentium3 x86_64)
+ '
+ declare -f package_glfw-wayland | \
+ sed '
+ 2 a arch=(i486 i686 pentium3 x86_64)
+ '
+ declare -f package_glfw-doc | \
+ sed '
+ 2 a arch=(any)
+ '
+)"
diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD
index ae229167..27be5242 100644
--- a/core/glib2/PKGBUILD
+++ b/core/glib2/PKGBUILD
@@ -1,6 +1,17 @@
+eval "$(
+ declare -f package_glib2 | \
+ sed '
+ 2 a arch=(i486 i686 pentium3 x86_64)
+ '
+ declare -f package_glib2-docs | \
+ sed '
+ 2 a arch=(any)
+ '
+)"
+
# i486-specific
if [ "${CARCH}" = "i486" ]; then
- # no documentation
+ # documentation is not built by i486 slave
makedepends=(${makedepends[@]//gtk-doc/})
eval "$(
declare -f build | \
@@ -16,8 +27,6 @@ if [ "${CARCH}" = "i486" ]; then
'
)"
- pkgname=(${pkgname[@]//glib2-docs})
-
# all but one test succeed, for now disable testing
# ERROR: timer - too few tests run (expected 7, got 0)
# ERROR: timer - exited with status 134 (terminated by signal 6?)
diff --git a/extra/devtools/PKGBUILD b/extra/devtools/PKGBUILD
index bdc5069f..72c50e60 100644
--- a/extra/devtools/PKGBUILD
+++ b/extra/devtools/PKGBUILD
@@ -1,15 +1,15 @@
# we override almost everything
-pkgver=20180918
-pkgrel=2
-pkgdesc='Tools for Arch Linux 32 package maintainers'
+pkgver=20181005
+pkgrel=1
+pkgdesc='Tools for Arch Linux 32 package maintainers and build slave operators'
license=('GPL')
url='https://git.archlinux32.org/archlinux32/devtools32/'
source=(
"https://sources.archlinux32.org/sources/${pkgname}32-v${pkgver}.tar.gz"{,.sig}
)
if [ "${md5sums[0]}" = 'ed3c757184e633faeea09747a7b91bb1' ]; then
- sha512sums=('e2e6d86c909566d05961abaa95255d5a3eb96f9fc0720235910357f9dd4f512c52a8d2f46d66c5e75e8b9cc347b7430b7100ed8a61b67a9b4cebdab1ade3698a'
+ sha512sums=('1521c467ffdd8c40c72346e87969a04e02906685ece6b60056da13348b760c07fa1f74b94937a06a7731e8b173b7ad5c0ef921627e6db2c1e521465b021de251'
'SKIP')
validpgpkeys=('DE9F7688CACF04FEB81A6C590AEEC90755DA7B5A')
unset md5sums
diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD
index 9152a88c..0095f04c 100644
--- a/extra/doxygen/PKGBUILD
+++ b/extra/doxygen/PKGBUILD
@@ -1,3 +1,14 @@
+eval "$(
+ declare -f package_doxygen | \
+ sed '
+ 2 a arch=(i486 i686 pentium3 x86_64)
+ '
+ declare -f package_doxygen-doc | \
+ sed '
+ 2 a arch=(any)
+ '
+)"
+
if [ "${CARCH}" = "i486" ]; then
# no qt5
makedepends=(${makedepends[@]//qt5-base/})
diff --git a/extra/gtkmm3/PKGBUILD b/extra/gtkmm3/PKGBUILD
new file mode 100644
index 00000000..1e89309a
--- /dev/null
+++ b/extra/gtkmm3/PKGBUILD
@@ -0,0 +1,10 @@
+eval "$(
+ declare -f package_gtkmm3 | \
+ sed '
+ 2 a arch=(i486 i686 pentium3 x86_64)
+ '
+ declare -f package_gtkmm3-docs | \
+ sed '
+ 2 a arch=(any)
+ '
+)"
diff --git a/extra/icedtea-web/PKGBUILD b/extra/icedtea-web/PKGBUILD
new file mode 100644
index 00000000..d8c186ad
--- /dev/null
+++ b/extra/icedtea-web/PKGBUILD
@@ -0,0 +1,10 @@
+eval "$(
+ declare -f package_icedtea-web | \
+ sed '
+ 2 a arch=(i486 i686 pentium3 x86_64)
+ '
+ declare -f package_icedtea-web-doc | \
+ sed '
+ 2 a arch=(any)
+ '
+)"
diff --git a/extra/java-openjfx/PKGBUILD b/extra/java-openjfx/PKGBUILD
new file mode 100644
index 00000000..c8a26318
--- /dev/null
+++ b/extra/java-openjfx/PKGBUILD
@@ -0,0 +1,14 @@
+eval "$(
+ declare -f package_java-openjfx | \
+ sed '
+ 2 a arch=(i486 i686 pentium3 x86_64)
+ '
+ declare -f package_java-openjfx-src | \
+ sed '
+ 2 a arch=(i486 i686 pentium3 x86_64)
+ '
+ declare -f package_java-openjfx-doc | \
+ sed '
+ 2 a arch=(any)
+ '
+)"
diff --git a/extra/libpst/PKGBUILD b/extra/libpst/PKGBUILD
new file mode 100644
index 00000000..8ebd9181
--- /dev/null
+++ b/extra/libpst/PKGBUILD
@@ -0,0 +1,10 @@
+eval "$(
+ declare -f package_libpst | \
+ sed '
+ 2 a arch=(i486 i686 pentium3 x86_64)
+ '
+ declare -f package_libpst-docs | \
+ sed '
+ 2 a arch=(any)
+ '
+)"
diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD
new file mode 100644
index 00000000..42f7e8e2
--- /dev/null
+++ b/extra/subversion/PKGBUILD
@@ -0,0 +1,74 @@
+# i486-specific
+if [ "${CARCH}" = "i486" ]; then
+ # no Apache server integration
+ makedepends=(${makedepends[@]//apache/})
+ eval "$(
+ declare -f build | \
+ sed '
+ s@--with-apxs@@
+ s@--with-apache-libexecdir=/usr/lib/httpd/modules@@
+ '
+ )"
+
+ # no Java bindings
+ makedepends=(${makedepends[@]//java-environment<10/})
+ eval "$(
+ declare -f build | \
+ sed '
+ s@--enable-javahl@--disable-javahl@
+ s@--with-jdk=/usr/lib/jvm/default@@
+ /make/s/javahl//
+ '
+ )"
+ eval "$(
+ declare -f package | \
+ sed '
+ /make/s/install-javahl//
+ '
+ )"
+
+ # no Ruby bindings
+ makedepends=(${makedepends[@]//ruby/})
+ eval "$(
+ declare -f build | \
+ sed '
+ s@--with-ruby-sitedir=/usr/lib/ruby/vendor_ruby@@
+ /make/s/swig-rb//
+ '
+ )"
+ eval "$(
+ declare -f check | \
+ sed '
+ /make/s/check-swig-rb//
+ '
+ )"
+ eval "$(
+ declare -f package | \
+ sed '
+ /make/s/install-swig-rb//
+ '
+ )"
+
+ # no KDE gui
+ makedepends=(${makedepends[@]//kdelibs4support/})
+ makedepends=(${makedepends[@]//kwallet/})
+ eval "$(
+ declare -f build | \
+ sed '
+ s@--with-kwallet@@
+ '
+ )"
+
+ # no Gnome gui
+ makedepends=(${makedepends[@]//libgnome-keyring/})
+ eval "$(
+ declare -f build | \
+ sed '
+ s@--with-gnome-keyring@@
+ s@--with-jdk=/usr/lib/jvm/default@@
+ '
+ )"
+
+
+fi
+