Merge branch '3.5' into 3.6

This commit is contained in:
Juergen Daubert 2020-12-05 11:04:43 +00:00
commit 34a923c0f3
15 changed files with 53 additions and 60 deletions

View File

@ -9,19 +9,19 @@ drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libpcre2-16.a
-rwxr-xr-x root/root usr/lib/libpcre2-16.la
lrwxrwxrwx root/root usr/lib/libpcre2-16.so -> libpcre2-16.so.0.10.0
lrwxrwxrwx root/root usr/lib/libpcre2-16.so.0 -> libpcre2-16.so.0.10.0
-rwxr-xr-x root/root usr/lib/libpcre2-16.so.0.10.0
lrwxrwxrwx root/root usr/lib/libpcre2-16.so -> libpcre2-16.so.0.10.1
lrwxrwxrwx root/root usr/lib/libpcre2-16.so.0 -> libpcre2-16.so.0.10.1
-rwxr-xr-x root/root usr/lib/libpcre2-16.so.0.10.1
-rw-r--r-- root/root usr/lib/libpcre2-32.a
-rwxr-xr-x root/root usr/lib/libpcre2-32.la
lrwxrwxrwx root/root usr/lib/libpcre2-32.so -> libpcre2-32.so.0.10.0
lrwxrwxrwx root/root usr/lib/libpcre2-32.so.0 -> libpcre2-32.so.0.10.0
-rwxr-xr-x root/root usr/lib/libpcre2-32.so.0.10.0
lrwxrwxrwx root/root usr/lib/libpcre2-32.so -> libpcre2-32.so.0.10.1
lrwxrwxrwx root/root usr/lib/libpcre2-32.so.0 -> libpcre2-32.so.0.10.1
-rwxr-xr-x root/root usr/lib/libpcre2-32.so.0.10.1
-rw-r--r-- root/root usr/lib/libpcre2-8.a
-rwxr-xr-x root/root usr/lib/libpcre2-8.la
lrwxrwxrwx root/root usr/lib/libpcre2-8.so -> libpcre2-8.so.0.10.0
lrwxrwxrwx root/root usr/lib/libpcre2-8.so.0 -> libpcre2-8.so.0.10.0
-rwxr-xr-x root/root usr/lib/libpcre2-8.so.0.10.0
lrwxrwxrwx root/root usr/lib/libpcre2-8.so -> libpcre2-8.so.0.10.1
lrwxrwxrwx root/root usr/lib/libpcre2-8.so.0 -> libpcre2-8.so.0.10.1
-rwxr-xr-x root/root usr/lib/libpcre2-8.so.0.10.1
-rw-r--r-- root/root usr/lib/libpcre2-posix.a
-rwxr-xr-x root/root usr/lib/libpcre2-posix.la
lrwxrwxrwx root/root usr/lib/libpcre2-posix.so -> libpcre2-posix.so.2.0.3

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/XmNsQAEaojg9pqzGNRknikS+x7Jvsp+L65dwfdqQFXhgz18fDqvz/7gnJqTmWVamLazI8gT36itvtPabhzAigo=
SHA256 (Pkgfile) = a3cd70297a954fae95806f58f55205abdc51f87b70736c255bbe49835a475ac8
SHA256 (.footprint) = 1f86e60065f787fb5b0f3d2480f2c221b8cb9181f53e16852b4aa9e1921d4630
SHA256 (pcre2-10.35.tar.bz2) = 9ccba8e02b0ce78046cdfb52e5c177f0f445e421059e43becca4359c669d4613
RWSE3ohX2g5d/Y5lnP9I3wVlXkBJmRKoLMMCrRqMMbxjVrJ5dMVfivzx9J04Lbgn2yvwPq9Fik7AGeAHgY5/yKBaSsNdOTu95wc=
SHA256 (Pkgfile) = 35a615cfdd3b482536ae33a98f795eedf524280e7f97534172e089f0533c6916
SHA256 (.footprint) = c5bd4fc845a62e229234f77ca445132f388148c62736f48e6171c2a261cd5c6f
SHA256 (pcre2-10.36.tar.bz2) = a9ef39278113542968c7c73a31cfcb81aca1faa64690f400b907e8ab6b4a665c

View File

@ -1,11 +1,10 @@
# Description: Perl Compatible Regular Expressions
# URL: http://www.pcre.org
# Maintainer: Juergen Daubert, jue at crux dot nu
# Depends on:
name=libpcre2
version=10.35
release=2
version=10.36
release=1
source=(https://ftp.pcre.org/pub/pcre/pcre2-$version.tar.bz2)
build() {

View File

@ -1,6 +1,6 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/UJ22iquIiSnJqmV9nioQn4G35dSTBVkaeNxjwJZYuCCHec/mfKqxXan8j0x+H/ckk0UnK/KRWeRhRnd0Iha0gw=
SHA256 (Pkgfile) = 38ff552fd80b4ac8dcaffa5fdf718af897e9d9688a12de65b62689a6ee2a36bd
RWSE3ohX2g5d/XpaR3VTEXzLd7pgtmz/uvjg+Xlv2MSg/mbomGnid/0b7yUNMHqIB34NtLnfqIVca6BL3op854sKrl47tbO6dAY=
SHA256 (Pkgfile) = 7214f05fe155e323fd1a8147719f43260a99f8a3aa30d3bf2ac1ae08403b7174
SHA256 (.footprint) = 97bae1c6abdd6d9ef67da974af7d52bafee2c7d4ca012560b5882933849400e6
SHA256 (lua-5.4.1.tar.gz) = 4ba786c3705eb9db6567af29c91a01b81f1c0ac3124fdbf6cd94bdd9e53cca7d
SHA256 (liblua.so.patch) = a8a7f89ab0c03b4bc1d58a935c54df792ad628edb4d1788c5ac66e4fc2d9f800

View File

@ -5,7 +5,7 @@
name=lua
version=5.4.1
release=1
release=2
source=(https://www.lua.org/ftp/$name-$version.tar.gz
liblua.so.patch lua.pc)
@ -29,7 +29,7 @@ build() {
ln -s luac $PKG/usr/bin/luac${version:0:3}
ln -s liblua.so.$version $PKG/usr/lib/liblua${version:0:3}.so
install -m 0644 -D lua.pc $PKG/usr/lib/pkgconfig/lua${version:0:1}${version:2:1}.pc
install -m 0644 -D $SRC/lua.pc $PKG/usr/lib/pkgconfig/lua${version:0:1}${version:2:1}.pc
ln -s lua${version:0:1}${version:2:1}.pc $PKG/usr/lib/pkgconfig/lua.pc
ln -s lua${version:0:1}${version:2:1}.pc $PKG/usr/lib/pkgconfig/lua${version:0:3}.pc
ln -s lua${version:0:1}${version:2:1}.pc $PKG/usr/lib/pkgconfig/lua-${version:0:3}.pc

View File

@ -1,6 +1,6 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/Vf2PdAeEPYM3dRv2p7rkPQjc/FEirSJMd3opIOg8ZARy8PPLwSNHN0cXl14RiIz25HXzhIerYHYzQEPZKVa5Ag=
SHA256 (Pkgfile) = 5906a00027a6b2f78ffba88c5ab142c55c1a6a1ba55de734bbac5634c9d4ca26
RWSE3ohX2g5d/Z4UYsDOHy+9bQqcwDhhzlUk2yQymophF0I/oGa7tGeefFPNRsWRceNNfS1Y1iIojV9TZ2XEXLddBxhXKROUwAI=
SHA256 (Pkgfile) = 1e98234f3ba248d658e714ce478eb55d400120a17ab1f7b1b92f3a558acb4a56
SHA256 (.footprint) = c2f5517f192c7c7ed4511899abf30b7ee966d96bc1295c5cc401e0137b9dd798
SHA256 (lua-5.2.4.tar.gz) = b9e2e4aad6789b3b63a056d442f7b39f0ecfca3ae0f1fc0ae4e9614401b69f4b
SHA256 (lua.diff) = e9638e7767244b1f4991088b3786f1a36235935b3161690d2b2e188a896fc1af

View File

@ -5,7 +5,7 @@
name=lua52
version=5.2.4
release=1
release=2
source=(http://www.lua.org/ftp/lua-$version.tar.gz
lua.diff lua-5.2-cflags.diff lua.pc)
@ -36,7 +36,7 @@ build() {
INSTALL_MAN="$PKG/usr/share/man/man1" \
install
install -m 0644 -D lua.pc $PKG/usr/lib/pkgconfig/lua5.2.pc
install -m 0644 -D $SRC/lua.pc $PKG/usr/lib/pkgconfig/lua5.2.pc
# fixups
ln -s liblua5.2.so $PKG/usr/lib/liblua.so.5.2

View File

@ -1,6 +1,6 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/cugZucBkmR+GZW4EXUePQGRaDjhvWxRonih4dkvn/z4uCgIyFEojNZsYP9jnOqZvz5lkgr8h1Tbbk/aNSd2Wwc=
SHA256 (Pkgfile) = 99086cd50bd34f23b87b8e34f86bf68dc08e9a907f611e19aad19e45a945ac84
RWSE3ohX2g5d/YLHNKTIiCL1zSPAC8NDFYGvii9WuR7F2K9Vg0zz/uOeY2/RwbzKqY7cYkOa108U53+IyPLcFGwDOckG6SzP5gA=
SHA256 (Pkgfile) = a47f765660e5c3d36a61e04f266d0438a03c783acee28e88ff77b1e1d1f3996b
SHA256 (.footprint) = 7af6f0dbde9d146befda64916f7d3bdfb6314020337f0aecac98726c37b701c4
SHA256 (lua-5.3.6.tar.gz) = fc5fd69bb8736323f026672b1b7235da613d7177e72558893a0bdcd320466d60
SHA256 (liblua.so.patch) = 2cc83c77423a2dda3696766b2d1ccee2796e052ab04d5178905f41ed9241a3d8

View File

@ -5,7 +5,7 @@
name=lua53
version=5.3.6
release=1
release=2
source=(https://www.lua.org/ftp/lua-$version.tar.gz
liblua.so.patch lua.pc)
@ -38,7 +38,7 @@ build() {
INSTALL_MAN="$PKG/usr/share/man/man1" \
install
install -m 0644 -D lua.pc $PKG/usr/lib/pkgconfig/lua5.3.pc
install -m 0644 -D $SRC/lua.pc $PKG/usr/lib/pkgconfig/lua5.3.pc
ln -sf lua53.pc $PKG/usr/lib/pkgconfig/lua5.3.pc
ln -sf lua53.pc $PKG/usr/lib/pkgconfig/lua-5.3.pc

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/StvqlBbLEBikScywgC1YZSxPN4CsSRSLokDQ5lJH0BtVPxkynvSUJdX3fLR1jtAebHaujw/Kxcm/qm0vG0N+w4=
SHA256 (Pkgfile) = a4abbd0d654a183b0fd1c97e89882e8643ddce8d47c1f704a1f8ab339b2f7622
RWSE3ohX2g5d/TWYp+DwKJ4fGPK4HFQxsrGv99J6GV49AR6s17TsdgE5W24ZiuHa+d2HyksYNK+05GkkKBkO/3PMyjfGqdXGJA8=
SHA256 (Pkgfile) = bb1cdede0f937fb66f0b7473072b4939332150680184773a01dec42636c67ba6
SHA256 (.footprint) = 16a4cbc53d0d6b7d01be8b598ad20486e3081237707bd214a678fb9a59ab629b
SHA256 (mutt-2.0.2.tar.gz) = 471218babe97968a45704f1e1e17523c4620ad1f92bae4143a4c9749ab1411c8
SHA256 (mutt-2.0.3.tar.gz) = 9c327cafb7acbfd4a57e7c817148fe438720a4545a5f628926f7745bc752c1ed

View File

@ -4,7 +4,7 @@
# Depends on: gdbm openssl zlib
name=mutt
version=2.0.2
version=2.0.3
release=1
source=(https://bitbucket.org/mutt/mutt/downloads/$name-$version.tar.gz)

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/etunsrNMFincI0/6BqtZ/xEWIer7fE3B8jdgdaIdnZeboV8ZsEuPjEjMumWy6y8ylrswDyGyurEDOT9kbo7fAk=
SHA256 (Pkgfile) = 9242f76205dc123dd5ac74566d93db7d31dfb077b1aba71fe4ad462f32fa902a
RWSE3ohX2g5d/a/PWCLbHkACa/LueuZ0A/T7kwlbJV4f7FwqNlqkrB8fuQIYsMWRHx9QRWL2QtW0YlXmBTWf+gOU2n9ATyiInws=
SHA256 (Pkgfile) = d6fad8701b73f8ba5347ad4f1fbf803b6b1275cb1dc432f311c4db4b9798a18c
SHA256 (.footprint) = b789e4814bad3d6307660c68c66fb3c0c5587d726f039425b8fc37c6bc865204
SHA256 (Inconsolata-dz.otf.zip) = 002fed4b8c1e5417c03f9b55e009acc682da08b13cdbf8f601f52efaf5324d58
SHA256 (Inconsolata-dz.otf) = 04e0821b13941dca2df582ea16ff146d848bbb6fc0171d7c714e2c7bc471947f

View File

@ -4,10 +4,9 @@
# Depends on: xorg-mkfontscale fontconfig
name=xorg-font-inconsolata-dz
#date -d "$(curl -sI http://media.nodnod.net/Inconsolata-dz.otf.zip | grep '^Last-Modified:' | cut -d' ' -f2-)" +%Y%m%d
version=20090212
version=20201205
release=1
source=(http://media.nodnod.net/Inconsolata-dz.otf.zip)
source=(https://nodnod.net/posts/inconsolata-dz/files/Inconsolata-dz.otf)
build() {
install -m 0644 -D $SRC/Inconsolata-dz.otf $PKG/usr/share/fonts/X11/OTF/Inconsolata-dz.otf

View File

@ -1,6 +1,6 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/UIZlHsADFVEHko39BtQtZbs7esitzqcGsbqffbSgwQpFFx7yyDC049vD0IGxTOKm3lstJJQh74tFs0pXMulagU=
SHA256 (Pkgfile) = d0904d8a7ead82f82b002e6de14908c1e57f059426cdf7a93fc6346776f7e07c
RWSE3ohX2g5d/fCj+6G2ltZMQ1Y8AUVnBe6t/fDkvhjRblubWWalnKxlOcnomfKDqM7pKfa850gnfazM0pn4WXm44hR+eCdmkQk=
SHA256 (Pkgfile) = d9c06be8c8ae9634458e79d85aa894572cdd63be0a207f8a67576a592a9a1d35
SHA256 (.footprint) = b04fc4d3a62e3311e32f9350e044e905495c74101132621641fe2088f7248bdc
SHA256 (xpdf-4.02.tar.gz) = 52d51dc943b9614b8da66e8662b3031a3c82dc25bfc792eac6b438aa36d549a4
SHA256 (xpdf-automagic.patch) = 3cf7b618a90e39891b140978c9147e7b8edfd39666f11c9eb11bfe8727241cd9

View File

@ -6,33 +6,28 @@
name=xpdf
version=4.02
release=1
source=(https://xpdfreader-dl.s3.amazonaws.com/xpdf-${version}.tar.gz
release=2
source=(https://dl.xpdfreader.com/$name-$version.tar.gz
xpdf-automagic.patch
xpdf-visibility.patch
xpdf-shared-libs.patch)
build() {
cd $name-$version
CXXFLAGS+=' -Wno-deprecated -Wno-deprecated-declarations'
patch -p1 -i $SRC/xpdf-automagic.patch
patch -p1 -i $SRC/xpdf-visibility.patch
patch -p1 -i $SRC/xpdf-shared-libs.patch
patch -d $name-$version -p1 -i $SRC/xpdf-automagic.patch
patch -d $name-$version -p1 -i $SRC/xpdf-visibility.patch
patch -d $name-$version -p1 -i $SRC/xpdf-shared-libs.patch
mkdir build
cd build
cmake -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DA4_PAPER=ON \
-DXPDFWIDGET_PRINTING="$(prt-get isinst cups >/dev/null && echo ON || echo OFF)" \
-DWITH_LIBPAPER=$(prt-get isinst paper >/dev/null && echo ON || echo OFF) ..
cd xpdf-qt
make
make install DESTDIR=$PKG
cmake -S $name-$version -B build -G Ninja \
-D CMAKE_INSTALL_PREFIX=/usr \
-D CMAKE_INSTALL_LIBDIR=lib \
-D CMAKE_BUILD_TYPE=Release \
-D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
-D A4_PAPER=ON \
-D XPDFWIDGET_PRINTING="$(prt-get isinst cups >/dev/null && echo ON || echo OFF)" \
-D WITH_LIBPAPER="$(prt-get isinst paper >/dev/null && echo ON || echo OFF)"
cmake --build build -- xpdf
DESTDIR=$PKG cmake --install build/xpdf-qt
}