diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-10-04 17:54:03 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-10-04 17:54:03 +0000 |
| commit | e21600c2762dffef8a31efad44cf9e172fdf6a72 (patch) | |
| tree | 7824fd090bab27b1e8144b351ae682a05a154638 | |
| parent | 72faf6a61ea307660f79d43519eadb952d853db5 (diff) | |
| parent | badaa27d5febffd453f89d2f1a3bd3f5338bfef0 (diff) | |
| download | packages-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
| -rw-r--r-- | legacy/paxmark/APKBUILD (renamed from system/paxmark/APKBUILD) | 0 | ||||
| -rw-r--r-- | legacy/paxmark/paxmark (renamed from system/paxmark/paxmark) | 0 | ||||
| -rw-r--r-- | system/pcre2/APKBUILD | 2 | ||||
| -rw-r--r-- | user/emacs/APKBUILD | 2 | ||||
| -rw-r--r-- | user/openjdk8/APKBUILD | 1 |
5 files changed, 2 insertions, 3 deletions
diff --git a/system/paxmark/APKBUILD b/legacy/paxmark/APKBUILD index 3c9c69400..3c9c69400 100644 --- a/system/paxmark/APKBUILD +++ b/legacy/paxmark/APKBUILD diff --git a/system/paxmark/paxmark b/legacy/paxmark/paxmark index 87a84f4f7..87a84f4f7 100644 --- a/system/paxmark/paxmark +++ b/legacy/paxmark/paxmark diff --git a/system/pcre2/APKBUILD b/system/pcre2/APKBUILD index ef1fa1492..7bca0e450 100644 --- a/system/pcre2/APKBUILD +++ b/system/pcre2/APKBUILD @@ -9,7 +9,7 @@ arch="all" license="BSD-3-Clause" depends="" depends_dev="libedit-dev zlib-dev" -makedepends="$depends_dev paxmark" +makedepends="$depends_dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools libpcre2-16:_libpcre libpcre2-32:_libpcre" source="https://ftp.pcre.org/pub/pcre/$pkgname-$pkgver.tar.gz" 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 \ |