summaryrefslogtreecommitdiff
path: root/user
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2019-10-04 17:54:03 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2019-10-04 17:54:03 +0000
commite21600c2762dffef8a31efad44cf9e172fdf6a72 (patch)
tree7824fd090bab27b1e8144b351ae682a05a154638 /user
parent72faf6a61ea307660f79d43519eadb952d853db5 (diff)
parentbadaa27d5febffd453f89d2f1a3bd3f5338bfef0 (diff)
downloadpackages-e21600c2762dffef8a31efad44cf9e172fdf6a72.tar.gz
packages-e21600c2762dffef8a31efad44cf9e172fdf6a72.tar.bz2
packages-e21600c2762dffef8a31efad44cf9e172fdf6a72.tar.xz
packages-e21600c2762dffef8a31efad44cf9e172fdf6a72.zip
Merge branch 'remove-paxmark' into 'master'
Move system/paxmark to legacy/ See merge request adelie/packages!335
Diffstat (limited to 'user')
-rw-r--r--user/emacs/APKBUILD2
-rw-r--r--user/openjdk8/APKBUILD1
2 files changed, 1 insertions, 2 deletions
diff --git a/user/emacs/APKBUILD b/user/emacs/APKBUILD
index 9f02d79a6..a1db01ae7 100644
--- a/user/emacs/APKBUILD
+++ b/user/emacs/APKBUILD
@@ -9,7 +9,7 @@ options="!check !dbg"
url="https://www.gnu.org/software/emacs/"
license="GPL-3.0+"
depends="emacs-nox"
-makedepends="autoconf automake linux-headers paxmark
+makedepends="autoconf automake linux-headers
librsvg-dev giflib-dev libxpm-dev gtk+2.0-dev gconf-dev alsa-lib-dev
glib-dev fontconfig-dev libpng-dev
libxml2-dev pango-dev tiff-dev libjpeg-turbo-dev ncurses-dev
diff --git a/user/openjdk8/APKBUILD b/user/openjdk8/APKBUILD
index 8ac3960b4..4861c4f9b 100644
--- a/user/openjdk8/APKBUILD
+++ b/user/openjdk8/APKBUILD
@@ -168,7 +168,6 @@ build() {
--with-jdk-src-zip="$srcdir/jdk-$_dropsver.tar.xz" \
--with-langtools-src-zip="$srcdir/langtools-$_dropsver.tar.xz" \
--with-nashorn-src-zip="$srcdir/nashorn-$_dropsver.tar.xz" \
- --with-pax=paxmark \
--with-jdk-home="$_bootstrap_java_home" \
--with-pkgversion="Adelie ${pkgver}-r${pkgrel}" \
--enable-nss \