summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-12-25 06:16:32 -0600
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-12-25 06:16:32 -0600
commit754b3fc000a30529e63362a7b4921bf697468232 (patch)
tree0f72607e29a7e741e06127df2507482e5a33e32d
parent5fa1a959ce020d9e72d9232fe9205b274cac086d (diff)
downloadpackages-754b3fc000a30529e63362a7b4921bf697468232.tar.gz
packages-754b3fc000a30529e63362a7b4921bf697468232.tar.bz2
packages-754b3fc000a30529e63362a7b4921bf697468232.tar.xz
packages-754b3fc000a30529e63362a7b4921bf697468232.zip
user/*: Fix metadata
-rw-r--r--user/at-spi2-core/APKBUILD8
-rw-r--r--user/cairo/APKBUILD2
-rw-r--r--user/chrpath/APKBUILD5
-rw-r--r--user/cyrus-sasl/APKBUILD11
-rw-r--r--user/freetds/APKBUILD2
-rw-r--r--user/freetype/APKBUILD5
-rw-r--r--user/gc/APKBUILD1
-rw-r--r--user/gdk-pixbuf/APKBUILD13
-rw-r--r--user/graphite2/APKBUILD9
-rw-r--r--user/gtk-doc/APKBUILD2
-rw-r--r--user/hicolor-icon-theme/APKBUILD4
-rw-r--r--user/highlight/APKBUILD1
-rw-r--r--user/itstool/APKBUILD5
-rw-r--r--user/krb5-conf/APKBUILD2
-rw-r--r--user/lcms2/APKBUILD7
-rw-r--r--user/libatomic_ops/APKBUILD1
-rw-r--r--user/libcroco/APKBUILD5
-rw-r--r--user/libgsf/APKBUILD5
-rw-r--r--user/libpaper/APKBUILD2
-rw-r--r--user/libpciaccess/APKBUILD1
-rw-r--r--user/librsvg/APKBUILD6
-rw-r--r--user/libunistring/APKBUILD6
-rw-r--r--user/libverto/APKBUILD1
-rw-r--r--user/libxcursor/APKBUILD2
-rw-r--r--user/libxrender/APKBUILD3
-rw-r--r--user/libxshmfence/APKBUILD3
-rw-r--r--user/libxt/APKBUILD2
-rw-r--r--user/libxtst/APKBUILD12
-rw-r--r--user/libxv/APKBUILD6
-rw-r--r--user/libxxf86vm/APKBUILD8
-rw-r--r--user/mtdev/APKBUILD6
-rw-r--r--user/openjpeg/APKBUILD19
-rw-r--r--user/openldap/APKBUILD25
-rw-r--r--user/pango/APKBUILD3
-rw-r--r--user/postgresql/APKBUILD10
-rw-r--r--user/py3-pygments/APKBUILD4
-rw-r--r--user/rarian/APKBUILD5
-rw-r--r--user/tiff/APKBUILD5
-rw-r--r--user/tree/APKBUILD2
-rw-r--r--user/unixodbc/APKBUILD4
-rw-r--r--user/xcb-util-keysyms/APKBUILD6
-rw-r--r--user/xcb-util-wm/APKBUILD6
42 files changed, 73 insertions, 162 deletions
diff --git a/user/at-spi2-core/APKBUILD b/user/at-spi2-core/APKBUILD
index 92c017b61..4e7ea3109 100644
--- a/user/at-spi2-core/APKBUILD
+++ b/user/at-spi2-core/APKBUILD
@@ -8,15 +8,13 @@ url="https://wiki.linuxfoundation.org/accessibility/d-bus"
arch="all"
options="!check" # Requires running at-spi2 daemon.
license="LGPL-2.0+"
-depends=""
-depends_dev="libxtst-dev"
-makedepends="$depends_dev dbus-dev glib-dev intltool gobject-introspection-dev
- dbus meson ninja"
+depends="gobject-introspection"
+makedepends="dbus-dev glib-dev gobject-introspection-dev libxtst-dev meson ninja"
subpackages="$pkgname-dev $pkgname-lang"
source="https://download.gnome.org/sources/at-spi2-core/${pkgver%.*}/at-spi2-core-$pkgver.tar.xz"
build() {
- meson --prefix=/usr builddir/
+ meson -Dprefix=/usr builddir/
ninja -C builddir/
}
diff --git a/user/cairo/APKBUILD b/user/cairo/APKBUILD
index bfb290d7b..84ef072a3 100644
--- a/user/cairo/APKBUILD
+++ b/user/cairo/APKBUILD
@@ -7,7 +7,7 @@ url="https://cairographics.org/"
arch="all"
options="!check" # Recursive dependency on gtk+2.0 for check.
license="LGPL-2.0+ AND MPL-1.1"
-depends=
+depends=""
depends_dev="fontconfig-dev freetype-dev libxrender-dev pixman-dev
xcb-util-dev libxext-dev $pkgname-tools"
makedepends="$depends_dev zlib-dev expat-dev glib-dev libpng-dev
diff --git a/user/chrpath/APKBUILD b/user/chrpath/APKBUILD
index 9eed07b26..7bdb44c39 100644
--- a/user/chrpath/APKBUILD
+++ b/user/chrpath/APKBUILD
@@ -6,11 +6,12 @@ pkgdesc="Modify rpath of compiled programs"
url="https://github.com/jwilk-mirrors/chrpath"
arch="all"
license="GPL-2.0-only"
+depends=""
+makedepends=""
subpackages="$pkgname-doc"
source="https://alioth-archive.debian.org/releases/chrpath/chrpath/0.16/chrpath-0.16.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -23,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" docdir=/usr/share/doc/$pkgname-$pkgver \
install
}
diff --git a/user/cyrus-sasl/APKBUILD b/user/cyrus-sasl/APKBUILD
index cbf824ce4..be7505b82 100644
--- a/user/cyrus-sasl/APKBUILD
+++ b/user/cyrus-sasl/APKBUILD
@@ -8,12 +8,11 @@ url="https://www.cyrusimap.org/sasl/"
arch="all"
options="!check" # No test suite.
license="BSD-4-Clause"
+depends=""
+makedepends="db-dev openssl-dev krb5-dev autoconf automake libtool"
subpackages="$pkgname-dev $pkgname-doc $pkgname-gssapi $pkgname-gs2
$pkgname-scram $pkgname-ntlm $pkgname-crammd5 $pkgname-digestmd5
libsasl $pkgname-openrc"
-depends=""
-makedepends="db-dev openssl-dev krb5-dev
- autoconf automake libtool"
source="https://github.com/cyrusimap/$pkgname/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz
saslauthd.initd
"
@@ -23,7 +22,6 @@ source="https://github.com/cyrusimap/$pkgname/releases/download/$pkgname-$pkgver
# - CVE-2013-4122
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -47,7 +45,6 @@ build() {
}
package() {
- cd "$builddir"
make -j1 DESTDIR="$pkgdir" install
install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
@@ -57,7 +54,7 @@ package() {
_plugindir=usr/lib/sasl2
_plugin() {
- depends=
+ depends=""
replaces="libsasl"
pkgdesc="Cyrus SASL plugin for $2"
mkdir -p "$subpkgdir"/$_plugindir
@@ -72,7 +69,7 @@ crammd5() { _plugin crammd5 CRAM-MD5; }
digestmd5() { _plugin digestmd5 DIGEST-MD5; }
libsasl() {
- depends=
+ depends=""
pkgdesc="Cyrus Simple Authentication and Security Layer (SASL) library"
mkdir -p "$subpkgdir"/usr
mv "$pkgdir"/usr/lib "$subpkgdir"/usr/
diff --git a/user/freetds/APKBUILD b/user/freetds/APKBUILD
index 16a305b18..3687b3cdc 100644
--- a/user/freetds/APKBUILD
+++ b/user/freetds/APKBUILD
@@ -3,7 +3,7 @@
pkgname=freetds
pkgver=1.1.6
pkgrel=0
-pkgdesc="Tabular Datastream Library"
+pkgdesc="Library for accessing Sybase and MS SQL Server databases"
url="https://www.freetds.org/"
arch="all"
license="LGPL-2.0+"
diff --git a/user/freetype/APKBUILD b/user/freetype/APKBUILD
index 5f93a4ee3..cc04fd333 100644
--- a/user/freetype/APKBUILD
+++ b/user/freetype/APKBUILD
@@ -37,9 +37,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-doc() {
- gzip "$pkgdir/usr/share/man/man1/freetype-config.1"
- default_doc
-}
-
sha512sums="c7a565b0ab3dce81927008a6965d5c7540f0dc973fcefdc1677c2e65add8668b4701c2958d25593cb41f706f4488765365d40b93da71dbfa72907394f28b2650 freetype-2.10.1.tar.xz"
diff --git a/user/gc/APKBUILD b/user/gc/APKBUILD
index 39e3cbdfd..0525181ee 100644
--- a/user/gc/APKBUILD
+++ b/user/gc/APKBUILD
@@ -6,6 +6,7 @@ pkgdesc="A garbage collector for C and C++"
url="http://hboehm.info/gc/"
arch="all"
license="MIT"
+depends=""
makedepends="libatomic_ops-dev linux-headers"
subpackages="$pkgname-dev $pkgname-doc libgc++:libgccpp"
source="https://github.com/ivmai/bdwgc/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz"
diff --git a/user/gdk-pixbuf/APKBUILD b/user/gdk-pixbuf/APKBUILD
index 09740c5c3..7377083bb 100644
--- a/user/gdk-pixbuf/APKBUILD
+++ b/user/gdk-pixbuf/APKBUILD
@@ -13,9 +13,7 @@ makedepends="glib-dev gobject-introspection-dev libjpeg-turbo-dev libpng-dev
install="$pkgname.pre-deinstall"
triggers="$pkgname.trigger=/usr/lib/gdk-pixbuf-2.0/*/loaders"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz
- "
-replaces="gtk+"
+source="https://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz"
# secfixes:
# 2.36.6-r1:
@@ -24,10 +22,11 @@ replaces="gtk+"
# - CVE-2017-6314
build() {
- mkdir build
- cd build
- meson -Dprefix=/usr -Dinstalled_tests=false
- ninja
+ meson \
+ -Dprefix=/usr \
+ -Dinstalled_tests=false \
+ build
+ ninja -C build
}
check() {
diff --git a/user/graphite2/APKBUILD b/user/graphite2/APKBUILD
index 6ad455474..74e5b7032 100644
--- a/user/graphite2/APKBUILD
+++ b/user/graphite2/APKBUILD
@@ -12,7 +12,6 @@ license="LGPL-2.1+ OR MPL-2.0+ OR GPL-2.0+"
depends=""
depends_dev="freetype-dev"
makedepends="$depends_dev cmake"
-install=""
subpackages="$pkgname-dev"
source="$pkgname-$pkgver.tar.gz::https://github.com/silnrsi/$_realname/archive/$pkgver.tar.gz
graphite2-1.2.0-cmakepath.patch
@@ -20,8 +19,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/silnrsi/$_realname/archive/$
builddir="$srcdir/$_realname-$pkgver"
build() {
- cd "$builddir"
-
# Fix linking error on 32-bit platforms
sed -i -e 's/\-nodefaultlibs//g' src/CMakeLists.txt
@@ -31,8 +28,7 @@ build() {
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
-DGRAPHITE2_COMPARE_RENDERER=OFF \
- -DGRAPHITE2_NFILEFACE=ON \
- -DGRAPHITE2_NSEGCACHE=ON
+ -DGRAPHITE2_NFILEFACE=ON
# fix unwanted -O3 cflag (taken from Debian)
find . -type f ! -name "rules" ! -name "changelog" -exec sed -i -e 's/\-O3//g' {} \;
@@ -40,8 +36,7 @@ build() {
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir/" install
+ make DESTDIR="$pkgdir/" -C build install
}
sha512sums="8e2c6047a66b4d8873842de6b9b1909d326512b47a04f483b3a6113b97fd0d47e0da7cf9ecf96e060ca06e5288b49f1300e2fd7165d2d82d6a8eb8cb7d53d33f graphite2-1.3.13.tar.gz
diff --git a/user/gtk-doc/APKBUILD b/user/gtk-doc/APKBUILD
index 52d4d8073..b99643f50 100644
--- a/user/gtk-doc/APKBUILD
+++ b/user/gtk-doc/APKBUILD
@@ -10,8 +10,8 @@ arch="noarch"
options="!check"
license="GFDL"
depends="docbook-xsl perl python3 py3-pygments py3-six pkgconf glib-dev highlight"
-makedepends="rarian-dev py-libxml2 itstool autoconf automake libtool"
checkdepends="bc"
+makedepends="rarian-dev py-libxml2 itstool autoconf automake libtool"
source="https://download.gnome.org/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz"
build() {
diff --git a/user/hicolor-icon-theme/APKBUILD b/user/hicolor-icon-theme/APKBUILD
index ffcc38651..fa6f71bd0 100644
--- a/user/hicolor-icon-theme/APKBUILD
+++ b/user/hicolor-icon-theme/APKBUILD
@@ -7,10 +7,11 @@ url="https://www.freedesktop.org/wiki/Software/icon-theme/"
arch="noarch"
options="!check" # Just icon set, no tests.
license="GPL-2.0-only"
+depends=""
+makedepends=""
source="https://icon-theme.freedesktop.org/releases/$pkgname-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -19,7 +20,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/highlight/APKBUILD b/user/highlight/APKBUILD
index 3e3b1f342..4670ecd7f 100644
--- a/user/highlight/APKBUILD
+++ b/user/highlight/APKBUILD
@@ -8,6 +8,7 @@ url="http://www.andre-simon.de/doku/highlight/highlight.html"
arch="all"
options="!check" # No test suite.
license="GPL-3.0+"
+depends=""
makedepends="boost-dev lua5.3-dev"
subpackages="$pkgname-doc"
source="http://www.andre-simon.de/zip/$pkgname-$pkgver.tar.bz2"
diff --git a/user/itstool/APKBUILD b/user/itstool/APKBUILD
index 7936887b7..c4fee9e06 100644
--- a/user/itstool/APKBUILD
+++ b/user/itstool/APKBUILD
@@ -7,13 +7,12 @@ url="http://itstool.org/"
arch="noarch"
license="GPL-3.0+"
depends="py3-libxml2 python3"
+makedepends=""
subpackages="$pkgname-doc"
source="http://files.itstool.org/itstool/$pkgname-$pkgver.tar.bz2
fix-segfault.patch"
build() {
- cd "$builddir"
-
PYTHON="/usr/bin/python3" ./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,7 +25,6 @@ build() {
}
check() {
- cd "$builddir"
make check
# verify that the shebang is correct
chmod +x itstool
@@ -34,7 +32,6 @@ check() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/krb5-conf/APKBUILD b/user/krb5-conf/APKBUILD
index 7d9b6b91c..1597688a6 100644
--- a/user/krb5-conf/APKBUILD
+++ b/user/krb5-conf/APKBUILD
@@ -14,8 +14,6 @@ options="!check" # Single config file.
license="MIT"
depends=""
makedepends=""
-install=""
-subpackages=""
source=""
replaces="heimdal krb5-libs"
diff --git a/user/lcms2/APKBUILD b/user/lcms2/APKBUILD
index a70ba2a39..c1df9d6d2 100644
--- a/user/lcms2/APKBUILD
+++ b/user/lcms2/APKBUILD
@@ -10,17 +10,14 @@ license="MIT"
depends=""
depends_dev="libjpeg-turbo-dev tiff-dev zlib-dev"
makedepends="$depends_dev"
-install=""
subpackages="$pkgname-dev $pkgname-doc $pkgname-utils"
-source="http://www.littlecms.com/lcms2-$pkgver.tar.gz
- "
+source="http://www.littlecms.com/lcms2-$pkgver.tar.gz"
# secfixes:
# 2.8-r1:
# - CVE-2016-10165
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -38,12 +35,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libatomic_ops/APKBUILD b/user/libatomic_ops/APKBUILD
index 2008be5af..b22941f3e 100644
--- a/user/libatomic_ops/APKBUILD
+++ b/user/libatomic_ops/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="Provides semi-portable access to hardware provided atomic memory operat
arch="all"
url="https://github.com/ivmai/libatomic_ops"
license="GPL-2.0-only"
+depends=""
makedepends=""
subpackages="$pkgname-dev $pkgname-doc"
source="$url/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz"
diff --git a/user/libcroco/APKBUILD b/user/libcroco/APKBUILD
index 0ed8d4685..209720aaa 100644
--- a/user/libcroco/APKBUILD
+++ b/user/libcroco/APKBUILD
@@ -8,7 +8,7 @@ arch="all"
options="!check" # Can only test already-installed library
license="LGPL-2.1-only"
subpackages="$pkgname-dev"
-depends=
+depends=""
makedepends="glib-dev libxml2-dev"
checkdepends="cmd:which"
source="https://download.gnome.org/sources/$pkgname/0.6/$pkgname-$pkgver.tar.xz"
@@ -18,7 +18,6 @@ source="https://download.gnome.org/sources/$pkgname/0.6/$pkgname-$pkgver.tar.xz"
# - CVE-2017-7960
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -28,12 +27,10 @@ build() {
}
check() {
- cd "$builddir"
make test
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libgsf/APKBUILD b/user/libgsf/APKBUILD
index b0916d3da..cd5faf416 100644
--- a/user/libgsf/APKBUILD
+++ b/user/libgsf/APKBUILD
@@ -7,7 +7,7 @@ url="https://www.gnome.org/"
arch="all"
license="LGPL-2.1-only"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-depends=
+depends=""
depends_dev="bzip2-dev"
makedepends="libxml2-dev glib-dev bzip2-dev intltool python3 zlib-dev
gobject-introspection-dev"
@@ -18,7 +18,6 @@ source="https://download.gnome.org/sources/$pkgname/1.14/$pkgname-$pkgver.tar.xz
# - CVE-2016-9888
build() {
- cd "$builddir"
sed -i -e 's/gsf-gnome//' -e 's/thumbnailer//' Makefile.*
./configure \
--build=$CBUILD \
@@ -35,12 +34,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
rm -f "$pkgdir"/usr/share/man/man1/gsf-office-thumbnailer.1
}
diff --git a/user/libpaper/APKBUILD b/user/libpaper/APKBUILD
index 99f2492c4..28bb47d2c 100644
--- a/user/libpaper/APKBUILD
+++ b/user/libpaper/APKBUILD
@@ -9,7 +9,7 @@ options="!check" # No test suite.
license="GPL-2.0-only"
subpackages="$pkgname-dev $pkgname-doc"
depends=""
-makedepends=""
+makedepends="autoconf automake libtool"
source="http://ftp.debian.org/debian/pool/main/libp/libpaper/libpaper_$pkgver.tar.gz"
prepare() {
diff --git a/user/libpciaccess/APKBUILD b/user/libpciaccess/APKBUILD
index 6e825dfb2..8d7bed86c 100644
--- a/user/libpciaccess/APKBUILD
+++ b/user/libpciaccess/APKBUILD
@@ -6,6 +6,7 @@ pkgdesc="X11 PCI access library"
url="https://www.X.Org/"
arch="all"
license="MIT AND X11"
+depends=""
makedepends="util-macros"
subpackages="$pkgname-dev"
source="https://www.X.Org/releases/individual/lib/$pkgname-$pkgver.tar.bz2
diff --git a/user/librsvg/APKBUILD b/user/librsvg/APKBUILD
index 76ca74648..eddc645dc 100644
--- a/user/librsvg/APKBUILD
+++ b/user/librsvg/APKBUILD
@@ -8,15 +8,13 @@ arch="all"
options="!check" # Depends on specific font hinting.
license="LGPL-2.0+"
subpackages="$pkgname-dev $pkgname-doc"
-depends=
+depends=""
depends_dev="gtk+2.0-dev libcroco-dev libgsf-dev"
makedepends="$depends_dev bzip2-dev cairo-dev glib-dev
gobject-introspection-dev"
-install=
source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -27,12 +25,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR=""$pkgdir"" install
rm -rf "$pkgdir"/usr/lib/mozilla
}
diff --git a/user/libunistring/APKBUILD b/user/libunistring/APKBUILD
index 95a2e3608..e41e0cffc 100644
--- a/user/libunistring/APKBUILD
+++ b/user/libunistring/APKBUILD
@@ -9,12 +9,10 @@ arch="all"
license="GPL-2.0+ OR LGPL-3.0+"
depends=""
makedepends=""
-install=""
subpackages="$pkgname-dev $pkgname-doc"
-source="http://ftp.gnu.org/gnu/libunistring/libunistring-$pkgver.tar.xz"
+source="https://ftp.gnu.org/gnu/libunistring/libunistring-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -28,12 +26,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
rm -f "$pkgdir"/usr/lib/charset.alias
}
diff --git a/user/libverto/APKBUILD b/user/libverto/APKBUILD
index 9038302e7..602ed91e8 100644
--- a/user/libverto/APKBUILD
+++ b/user/libverto/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="Main loop abstraction library"
url="https://github.com/npmccallum/libverto"
arch="all"
license="MIT"
+depends=""
makedepends="glib-dev libevent-dev libev-dev automake autoconf libtool"
subpackages="$pkgname-dev $pkgname-libev $pkgname-libevent $pkgname-glib"
source="$pkgname-$pkgver.tar.gz::https://github.com/npmccallum/$pkgname/archive/$pkgver.tar.gz
diff --git a/user/libxcursor/APKBUILD b/user/libxcursor/APKBUILD
index 6aff75fef..8b23c9078 100644
--- a/user/libxcursor/APKBUILD
+++ b/user/libxcursor/APKBUILD
@@ -6,9 +6,9 @@ pkgdesc="X cursor management library"
url="https://www.X.Org/"
arch="all"
license="MIT"
-subpackages="$pkgname-dev $pkgname-doc"
depends=""
makedepends="libx11-dev libxfixes-dev libxrender-dev util-macros xorgproto-dev"
+subpackages="$pkgname-dev $pkgname-doc"
source="https://www.X.Org/releases/individual/lib/libXcursor-$pkgver.tar.bz2"
builddir="$srcdir"/libXcursor-$pkgver
diff --git a/user/libxrender/APKBUILD b/user/libxrender/APKBUILD
index 0f6978084..a212b8f67 100644
--- a/user/libxrender/APKBUILD
+++ b/user/libxrender/APKBUILD
@@ -14,7 +14,6 @@ source="https://www.X.Org/releases/individual/lib/libXrender-$pkgver.tar.bz2"
builddir="$srcdir"/libXrender-$pkgver
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,12 +25,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libxshmfence/APKBUILD b/user/libxshmfence/APKBUILD
index 1608eb19d..f13c7e3c4 100644
--- a/user/libxshmfence/APKBUILD
+++ b/user/libxshmfence/APKBUILD
@@ -14,7 +14,6 @@ subpackages="$pkgname-dev"
source="https://www.X.Org/releases/individual/lib/libxshmfence-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libxt/APKBUILD b/user/libxt/APKBUILD
index c0990b0b5..c1ef89fe5 100644
--- a/user/libxt/APKBUILD
+++ b/user/libxt/APKBUILD
@@ -8,8 +8,8 @@ arch="all"
license="X11"
depends=""
depends_dev="libsm-dev"
-makedepends="$depends_dev libice-dev libx11-dev util-macros xorgproto-dev"
checkdepends="glib-dev"
+makedepends="$depends_dev libice-dev libx11-dev util-macros xorgproto-dev"
subpackages="$pkgname-dev $pkgname-doc"
source="https://www.X.Org/releases/individual/lib/libXt-$pkgver.tar.bz2"
builddir="$srcdir"/libXt-$pkgver
diff --git a/user/libxtst/APKBUILD b/user/libxtst/APKBUILD
index f32cb1cbb..9a933e987 100644
--- a/user/libxtst/APKBUILD
+++ b/user/libxtst/APKBUILD
@@ -6,16 +6,13 @@ pkgdesc="X11 Testing Resource extension library"
url="https://www.X.Org/"
arch="all"
license="MIT"
-subpackages="$pkgname-dev $pkgname-doc"
depends=""
-depends_dev="xorgproto-dev"
-makedepends="$depends_dev libx11-dev libxext-dev libxi-dev util-macros"
-source="https://www.X.Org/releases/individual/lib/libXtst-$pkgver.tar.bz2
- "
+makedepends="libx11-dev libxext-dev libxi-dev util-macros xorgproto-dev"
+subpackages="$pkgname-dev $pkgname-doc"
+source="https://www.X.Org/releases/individual/lib/libXtst-$pkgver.tar.bz2"
builddir="$srcdir"/libXtst-$pkgver
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -27,14 +24,11 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
- install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
}
sha512sums="6f6741fd3596775eaa056465319f78c29c91b3893a851a4899df651a2023a4d762497b112a33d7d3e8865fe85d173d03e4b49daef76a66af1ae1eaab82a12765 libXtst-1.2.3.tar.bz2"
diff --git a/user/libxv/APKBUILD b/user/libxv/APKBUILD
index 573c1c0d1..d17cb97ba 100644
--- a/user/libxv/APKBUILD
+++ b/user/libxv/APKBUILD
@@ -10,10 +10,9 @@ depends=""
makedepends="libx11-dev libxext-dev util-macros xorgproto-dev"
subpackages="$pkgname-dev $pkgname-doc"
source="https://www.X.Org/releases/individual/lib/libXv-$pkgver.tar.bz2"
-
builddir="$srcdir"/libXv-$pkgver
+
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,14 +24,11 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
- install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
sha512sums="97cb3ab06cedc87799d06e1affd5cee32ed0e551903fa5c915f79e7ed92eded867e3220b4a663822f7ebd86fdc71b09943b7077d98f1200019992e8d24144e58 libXv-1.0.11.tar.bz2"
diff --git a/user/libxxf86vm/APKBUILD b/user/libxxf86vm/APKBUILD
index 0f8f91a4a..53c8d3df0 100644
--- a/user/libxxf86vm/APKBUILD
+++ b/user/libxxf86vm/APKBUILD
@@ -6,14 +6,13 @@ pkgdesc="X11 XFree86 video mode extension library"
url="https://www.X.Org/"
arch="all"
license="X11"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
+depends=""
makedepends="libx11-dev libxext-dev util-macros xorgproto-dev"
+subpackages="$pkgname-dev $pkgname-doc"
source="https://www.X.Org/releases/individual/lib/libXxf86vm-$pkgver.tar.bz2"
builddir="$srcdir"/libXxf86vm-$pkgver
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -22,14 +21,11 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
- install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
sha512sums="c5f92d86e143db02ebb36bcd25618acaa2cb2831f5a23800a06dd431cd73b6702d95de8fe7407ce626336bf614c288d5256f4d87ea7781fad2ab6c517cbf09e0 libXxf86vm-1.1.4.tar.bz2"
diff --git a/user/mtdev/APKBUILD b/user/mtdev/APKBUILD
index 81300c4e2..38b63184b 100644
--- a/user/mtdev/APKBUILD
+++ b/user/mtdev/APKBUILD
@@ -14,13 +14,11 @@ subpackages="$pkgname-dev"
source="http://bitmath.org/code/mtdev/mtdev-$pkgver.tar.gz"
prepare() {
- cd "$builddir"
- update_config_sub
default_prepare
+ update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -33,12 +31,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/openjpeg/APKBUILD b/user/openjpeg/APKBUILD
index e454afa61..680e1c8c2 100644
--- a/user/openjpeg/APKBUILD
+++ b/user/openjpeg/APKBUILD
@@ -8,21 +8,13 @@ url="http://www.openjpeg.org/"
arch="all"
options="!check" # No test suite.
license="BSD-2-Clause-NetBSD"
+depends=""
depends_dev="$pkgname-tools"
makedepends="libpng-dev tiff-dev lcms2-dev doxygen cmake"
subpackages="$pkgname-dev $pkgname-tools"
source="$pkgname-$pkgver.tar.gz::https://github.com/uclouvain/openjpeg/archive/v$pkgver.tar.gz
CVE-2019-12973.patch"
-build() {
- cmake . \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=RelWithDebInfo \
- -DOPENJPEG_INSTALL_LIB_DIR=lib \
- -DOPENJPEG_INSTALL_PACKAGE_DIR=lib/cmake/$pkgname-${pkgver%.*}
- make
-}
-
# secfixes:
# 2.3.1-r2:
# - CVE-2019-12973
@@ -40,6 +32,15 @@ build() {
# - CVE-2016-9580
# - CVE-2016-9581
+build() {
+ cmake . \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DOPENJPEG_INSTALL_LIB_DIR=lib \
+ -DOPENJPEG_INSTALL_PACKAGE_DIR=lib/cmake/$pkgname-${pkgver%.*}
+ make
+}
+
package() {
make DESTDIR="$pkgdir" install
}
diff --git a/user/openldap/APKBUILD b/user/openldap/APKBUILD
index 3f84e64c7..ffff4c1a7 100644
--- a/user/openldap/APKBUILD
+++ b/user/openldap/APKBUILD
@@ -1,5 +1,4 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
-# Contributor: Jakub Jirutka <jakub@jirutka.cz>
#
# secfixes:
# 2.4.48-r0:
@@ -15,20 +14,20 @@ pkgname=openldap
pkgver=2.4.48
pkgrel=0
pkgdesc="LDAP Server"
-url="http://www.openldap.org/"
+url="https://www.openldap.org/"
arch="all"
options="!check" # Test suite takes > 2 hours to complete on each builder.
-license="custom"
+license="OLDAP-2.8"
depends=""
-pkgusers="ldap"
-pkggroups="ldap"
depends_dev="openssl-dev cyrus-sasl-dev util-linux-dev"
-makedepends="$depends_dev db-dev groff unixodbc-dev libtool
+makedepends="$depends_dev db-dev groff icu-dev unixodbc-dev
autoconf automake libtool"
subpackages="$pkgname-dev $pkgname-doc libldap $pkgname-openrc
$pkgname-clients $pkgname-passwd-pbkdf2:passwd_pbkdf2
$pkgname-backend-all:_backend_all:noarch
$pkgname-overlay-all:_overlay_all:noarch"
+pkgusers="ldap"
+pkggroups="ldap"
install="$pkgname.pre-install $pkgname.post-install $pkgname.post-upgrade"
source="ftp://ftp.$pkgname.org/pub/OpenLDAP/$pkgname-release/$pkgname-$pkgver.tgz
openldap-2.4-ppolicy.patch
@@ -60,7 +59,7 @@ do
done
prepare() {
- cd "$builddir"
+ default_prepare
update_config_sub
sed -i '/^STRIP/s,-s,,g' build/top.mk
@@ -68,8 +67,6 @@ prepare() {
}
build () {
- cd "$builddir"
-
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -106,13 +103,10 @@ build () {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
-
make DESTDIR="$pkgdir" install
# Install passwd pbkdf2.
@@ -124,8 +118,8 @@ package() {
rmdir var/lib/openldap/run
# Fix tools symlinks to slapd.
- local path; for path in $(find usr/sbin/ -type l); do
- ln -sf slapd $path
+ for _path in $(find usr/sbin/ -type l); do
+ ln -sf slapd $_path
done
# Move executable from lib to sbin.
@@ -149,7 +143,6 @@ package() {
libldap() {
pkgdesc="OpenLDAP libraries"
depends=""
- install=""
_submv "usr/lib/*.so*" etc/openldap/ldap.conf
}
@@ -199,7 +192,7 @@ _overlay() {
}
_submv() {
- local path; for path in "$@"; do
+ for path in "$@"; do
mkdir -p "$subpkgdir"/${path%/*}
mv "$pkgdir"/$path "$subpkgdir"/${path%/*}/
done
diff --git a/user/pango/APKBUILD b/user/pango/APKBUILD
index c26726d5d..a9e6d5beb 100644
--- a/user/pango/APKBUILD
+++ b/user/pango/APKBUILD
@@ -7,11 +7,12 @@ url="https://www.pango.org/"
arch="all"
options="!check" # no tests available
license="LGPL-2.1+"
-subpackages="$pkgname-dev $pkgname-doc"
+depends=""
makedepends="$depends_dev cairo-dev expat-dev fontconfig-dev freetype-dev
fribidi-dev glib-dev gobject-introspection-dev harfbuzz-dev libxft-dev"
install="$pkgname.pre-deinstall"
triggers="$pkgname.trigger=/usr/lib/pango/*/modules"
+subpackages="$pkgname-dev $pkgname-doc"
source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
CVE-2019-1010238.patch"
diff --git a/user/postgresql/APKBUILD b/user/postgresql/APKBUILD
index fef7c4ef2..975cd7e7f 100644
--- a/user/postgresql/APKBUILD
+++ b/user/postgresql/APKBUILD
@@ -62,9 +62,8 @@ source="https://ftp.postgresql.org/pub/source/v$pkgver/$pkgname-$pkgver.tar.bz2
prepare() {
default_prepare
- cd "$builddir"
- local file; for file in $pkgname.initd $pkgname.confd; do
+ for file in $pkgname.initd $pkgname.confd; do
sed "s|@VERSION@|${pkgver%.*}|" "$srcdir"/$file > $file
done
}
@@ -93,16 +92,12 @@ build() {
}
check() {
- cd "$builddir"
-
_run_tests src/test
_run_tests src/pl
_run_tests contrib
}
package() {
- cd "$builddir"
-
make DESTDIR="$pkgdir" install install-docs
cd "$pkgdir"
@@ -167,7 +162,6 @@ contrib() {
depends=""
cd "$builddir"
-
# Avoid installing plperl and plpython extensions, these will be
# installed into separate subpackages.
sed -Ei -e 's/(.*_plperl)/#\1/' \
@@ -250,7 +244,7 @@ _run_tests() {
}
_submv() {
- local path; for path in "$@"; do
+ for path in "$@"; do
mkdir -p "$subpkgdir/${path%/*}"
mv "$pkgdir"/$path "$subpkgdir"/${path%/*}/
done
diff --git a/user/py3-pygments/APKBUILD b/user/py3-pygments/APKBUILD
index a9c885418..388951161 100644
--- a/user/py3-pygments/APKBUILD
+++ b/user/py3-pygments/APKBUILD
@@ -6,7 +6,7 @@ pkgname=py3-pygments
_pkgname=Pygments
_p="${_pkgname#?}"
_p="${_pkgname%"$_p"}"
-pkgver=2.4.2
+pkgver=2.5.2
pkgrel=0
pkgdesc="A syntax highlighting package written in Python"
url="http://pygments.org/"
@@ -37,4 +37,4 @@ doc() {
install -m 644 -D doc/pygmentize.1 "$pkgdir"/usr/share/man/man1/pygmentize.1
}
-sha512sums="c8f378700e99d9e5701ac7e27363921dbabab50a910686aafda1e016c813e99915fcfeed8298323b9b681b3d81f4265ab9a5bb75b8cdff0668c9eff745337b66 Pygments-2.4.2.tar.gz"
+sha512sums="d6715ca26cdb68d4c771bb530b2395805025c14c78d9099b033d3410ea239c41033fb611e43e39cbaa4ac38078a09324d8cfde42269129be0a096dcc13586859 Pygments-2.5.2.tar.gz"
diff --git a/user/rarian/APKBUILD b/user/rarian/APKBUILD
index c3722414e..227d32230 100644
--- a/user/rarian/APKBUILD
+++ b/user/rarian/APKBUILD
@@ -14,13 +14,11 @@ source="https://download.gnome.org/sources/$pkgname/0.8/$pkgname-$pkgver.tar.bz2
user-segfault.patch"
prepare() {
- cd "$builddir"
- update_config_sub
default_prepare
+ update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -33,7 +31,6 @@ build() {
}
package() {
- cd "$builddir"
make -j1 DESTDIR="$pkgdir" install
}
diff --git a/user/tiff/APKBUILD b/user/tiff/APKBUILD
index 602597842..b3ac5c180 100644
--- a/user/tiff/APKBUILD
+++ b/user/tiff/APKBUILD
@@ -8,7 +8,7 @@ pkgdesc="Library to read, create, and manipulate TIFF image files"
url="http://www.libtiff.org/"
arch="all"
license="MIT"
-depends=
+depends=""
depends_dev="zlib-dev libjpeg-turbo-dev"
makedepends="libtool autoconf automake $depends_dev"
subpackages="$pkgname-doc $pkgname-dev $pkgname-tools"
@@ -39,7 +39,6 @@ source="http://download.osgeo.org/libtiff/$pkgname-$pkgver.tar.gz"
# - CVE-2017-5225
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -52,12 +51,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/tree/APKBUILD b/user/tree/APKBUILD
index 84c872d47..fcbcbf694 100644
--- a/user/tree/APKBUILD
+++ b/user/tree/APKBUILD
@@ -14,12 +14,10 @@ subpackages="$pkgname-doc"
source="http://mama.indstate.edu/users/ice/tree/src/$pkgname-$pkgver.tgz"
build() {
- cd "$builddir"
make
}
package() {
- cd "$builddir"
make prefix="$pkgdir/usr" MANDIR="${pkgdir}/usr/share/man/man1" install
}
diff --git a/user/unixodbc/APKBUILD b/user/unixodbc/APKBUILD
index e631d0f45..03f3c78cc 100644
--- a/user/unixodbc/APKBUILD
+++ b/user/unixodbc/APKBUILD
@@ -3,7 +3,7 @@
pkgname=unixodbc
pkgver=2.3.7
pkgrel=0
-pkgdesc="Library for accessing ODBC data sources"
+pkgdesc="Unix ODBC driver manager and database drivers"
url="http://www.unixodbc.org/"
arch="all"
options="!check" # No test suite.
@@ -15,7 +15,6 @@ source="ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-${pkgver}.tar.gz"
builddir="$srcdir/unixODBC-$pkgver"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -28,7 +27,6 @@ build() {
}
package() {
- cd "$builddir"
make -j1 DESTDIR="$pkgdir" install
}
diff --git a/user/xcb-util-keysyms/APKBUILD b/user/xcb-util-keysyms/APKBUILD
index a1d23fba4..2c0350dd8 100644
--- a/user/xcb-util-keysyms/APKBUILD
+++ b/user/xcb-util-keysyms/APKBUILD
@@ -9,14 +9,12 @@ arch="all"
license="MIT"
depends=""
depends_dev="xcb-util-dev"
-makedepends="$depends_dev m4 util-macros xorgproto-dev"
checkdepends="check-dev"
-replaces="xcb-util"
+makedepends="$depends_dev m4 util-macros xorgproto-dev"
subpackages="$pkgname-dev"
source="https://xcb.freedesktop.org/dist/xcb-util-keysyms-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -29,12 +27,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xcb-util-wm/APKBUILD b/user/xcb-util-wm/APKBUILD
index 1443773fa..36cfe41e9 100644
--- a/user/xcb-util-wm/APKBUILD
+++ b/user/xcb-util-wm/APKBUILD
@@ -9,14 +9,12 @@ arch="all"
license="MIT"
depends=""
depends_dev="xcb-util-dev"
-makedepends="$depends_dev m4 util-macros"
checkdepends="check"
-replaces="xcb-util"
+makedepends="$depends_dev m4 util-macros"
subpackages="$pkgname-dev"
source="https://xcb.freedesktop.org/dist/xcb-util-wm-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -29,12 +27,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}