summaryrefslogtreecommitdiff
path: root/user
diff options
context:
space:
mode:
Diffstat (limited to 'user')
-rw-r--r--user/cairo/APKBUILD6
-rw-r--r--user/dejagnu/APKBUILD6
-rw-r--r--user/dialog/APKBUILD4
-rw-r--r--user/ffmpeg/APKBUILD10
-rw-r--r--user/ffmpeg/altivec-fix.patch47
-rw-r--r--user/freetds/APKBUILD4
-rw-r--r--user/gnupg/APKBUILD4
-rw-r--r--user/itstool/APKBUILD6
-rw-r--r--user/krb5/APKBUILD4
-rw-r--r--user/libinput/APKBUILD4
-rw-r--r--user/libqalculate/APKBUILD8
-rw-r--r--user/libqalculate/without-readline.patch262
-rw-r--r--user/libwacom/APKBUILD4
-rw-r--r--user/lighttpd/APKBUILD4
-rw-r--r--user/pixman/APKBUILD8
-rw-r--r--user/pixman/float-header-fix.patch16
-rw-r--r--user/sdl2/APKBUILD6
-rw-r--r--user/tiff/APKBUILD14
-rw-r--r--user/tiff/CVE-2017-18013.patch34
-rw-r--r--user/ttf-liberation/APKBUILD8
20 files changed, 43 insertions, 416 deletions
diff --git a/user/cairo/APKBUILD b/user/cairo/APKBUILD
index 676764645..36e88f395 100644
--- a/user/cairo/APKBUILD
+++ b/user/cairo/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer:
pkgname=cairo
-pkgver=1.14.12
-pkgrel=2
+pkgver=1.16.0
+pkgrel=0
pkgdesc="A vector graphics library"
url="https://cairographics.org/"
arch="all"
@@ -76,6 +76,6 @@ tools() {
"$subpkgdir"/usr/lib/cairo/
}
-sha512sums="ede6e75ae95605bf5c4b3859b1824cf125c4a2a35a67d38244cc70951ca44b1d4fd7cf622953d3a7cb868fb5b00856ef6d68ee615276b76eec437641290b01e1 cairo-1.14.12.tar.xz
+sha512sums="9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f cairo-1.16.0.tar.xz
d8185f4ec74f44c4746acf7e79bba7ff7ffd9d35bdabeb25e10b4e12825942d910931aa857f1645e5c8185bcb40a1f1ffe1e7e647428e9ea66618b2aec52fac3 fontconfig-ultimate-2016-04-23.tar.gz
86f26fe41deb5e14f553c999090d1ec1d92a534fa7984112c9a7f1d6c6a8f1b7bb735947e8ec3f26e817f56410efe8cc46c5e682f6a278d49b40a683513740e0 musl-stacksize.patch"
diff --git a/user/dejagnu/APKBUILD b/user/dejagnu/APKBUILD
index d2ee84eb2..53018f36f 100644
--- a/user/dejagnu/APKBUILD
+++ b/user/dejagnu/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=dejagnu
-pkgver=1.6
-pkgrel=1
+pkgver=1.6.2
+pkgrel=0
pkgdesc="Framework for testing other programs"
url="https://www.gnu.org/software/dejagnu/"
arch="noarch"
@@ -34,4 +34,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="a494dd5cde8d275b397116049c93e183f5f1731d63660ee8d2f4263b099fc5be7fbddde927fab3ccd5f000c43d50242f94bbb4d95497b915ea53be418bc145bc dejagnu-1.6.tar.gz"
+sha512sums="ae527ce245871d49b84773d0d14b1ea6b2316c88097eeb84091a3aa885ff007eeaa1cd9c5b002d94a956d218451079b5e170561ffa43a291d9d82283aa834042 dejagnu-1.6.2.tar.gz"
diff --git a/user/dialog/APKBUILD b/user/dialog/APKBUILD
index 9b10cf914..a7dc72010 100644
--- a/user/dialog/APKBUILD
+++ b/user/dialog/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=dialog
-_realver=1.3-20181022
+_realver=1.3-20181107
pkgver=${_realver/-/.}
pkgrel=0
pkgdesc="Script interpreter providing curses widgets"
@@ -33,4 +33,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="5d7891086ab6d2f4a815538513b09754a56368bbb0ec3bd107346fd2ed6ae10fa858173447fa609cce28a91e234ed8067d9439efeb973593fff2df1e811a8925 dialog-1.3-20181022.tgz"
+sha512sums="69cb367bc9a1d6dcd69b74f7eae9b4318f0bfd9c0eae48144da119df10f7f81ed4c215a8882d72dfbbd9ff41c5e591c80b168b9552e014454cc80c9aa37dca55 dialog-1.3-20181107.tgz"
diff --git a/user/ffmpeg/APKBUILD b/user/ffmpeg/APKBUILD
index b396a291e..8d576a7ed 100644
--- a/user/ffmpeg/APKBUILD
+++ b/user/ffmpeg/APKBUILD
@@ -3,8 +3,8 @@
# Contributor: Jakub Skrzypnik <j.skrzypnik@openmailbox.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=ffmpeg
-pkgver=4.0.2
-pkgrel=1
+pkgver=4.1
+pkgrel=0
pkgdesc="Record, convert, and stream audio and video"
url="https://ffmpeg.org/"
arch="all"
@@ -19,7 +19,6 @@ makedepends="gnutls-dev lame-dev libvorbis-dev xvidcore-dev zlib-dev libvdpau-de
ladspa-dev libcdio-dev libcdio-paranoia-dev wavpack-dev libwebp-dev"
source="https://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz
0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch
- altivec-fix.patch
"
# secfixes:
@@ -100,6 +99,5 @@ libs() {
mv "$pkgdir"/usr/lib "$subpkgdir"/usr/
}
-sha512sums="2dc2b8c66d9c31b6d06da5da336ef45415e3c24fac8c9063cd47f7d4cf688ec4846f88cdd9e841b956cea81e56bb3c6b7655aef503400c7367c32910c28990ac ffmpeg-4.0.2.tar.xz
-32652e18d4eb231a2e32ad1cacffdf33264aac9d459e0e2e6dd91484fced4e1ca5a62886057b1f0b4b1589c014bbe793d17c78adbaffec195f9a75733b5b18cb 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch
-225a87ad4b5564e2cbf35e669cc54adddf7f8ca05fbcfc27ed92f4406d0fd3b27558477afaf4c3c13079b19035d0761d8b2f8af9bc25fcfd727183faa606e4f6 altivec-fix.patch"
+sha512sums="59db7e8a6238048c04c3b0bd5885aea2bf7951f79949fc0659a8d235c4cd809ac0c1a74544a4c218a38c8c739eea76f5ee1231bfb96439487212c6e65591780e ffmpeg-4.1.tar.xz
+32652e18d4eb231a2e32ad1cacffdf33264aac9d459e0e2e6dd91484fced4e1ca5a62886057b1f0b4b1589c014bbe793d17c78adbaffec195f9a75733b5b18cb 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch"
diff --git a/user/ffmpeg/altivec-fix.patch b/user/ffmpeg/altivec-fix.patch
deleted file mode 100644
index e0d6230a3..000000000
--- a/user/ffmpeg/altivec-fix.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From c0f58c3d4da82aaf5774b1bc3a11b8a416664e18 Mon Sep 17 00:00:00 2001
-From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
-Date: Sat, 21 Jul 2018 00:42:00 -0500
-Subject: [PATCH] libavcodec/ppc: Fix HEVC AltiVec routines
-
-GCC requires the argument to vec_splat_u32 to be a literal. The easiest
-way to accomplish this is to change 'shift' to be const in scale (as it
-is in the transform routine above), and convert both routines to be
-inline. This way, GCC can coerce the values to literals.
-
-Tested on a 970 (Apple G5) and POWER9 (Talos II); passed fate and played
-a clip of Big Buck Bunny correctly.
-
-Signed-off-by: A. Wilcox <AWilcox@Wilcox-Tech.com>
----
- libavcodec/ppc/hevcdsp.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/libavcodec/ppc/hevcdsp.c b/libavcodec/ppc/hevcdsp.c
-index 4b1037d792..c8679c2de2 100644
---- a/libavcodec/ppc/hevcdsp.c
-+++ b/libavcodec/ppc/hevcdsp.c
-@@ -41,8 +41,9 @@ static const vec_u8 mask[2] = {
- { 0x04, 0x05, 0x0C, 0x0D, 0x14, 0x15, 0x1C, 0x1D, 0x06, 0x07, 0x0E, 0x0F, 0x16, 0x17, 0x1E, 0x1F },
- };
-
--static void transform4x4(vec_s16 src_01, vec_s16 src_23, vec_s32 res[4],
-- const int shift, int16_t *coeffs)
-+static av_always_inline void transform4x4(vec_s16 src_01, vec_s16 src_23,
-+ vec_s32 res[4], const int shift,
-+ int16_t *coeffs)
- {
- vec_s16 src_02, src_13;
- vec_s32 zero = vec_splat_s32(0);
-@@ -67,7 +68,8 @@ static void transform4x4(vec_s16 src_01, vec_s16 src_23, vec_s32 res[4],
- res[3] = vec_sub(e0, o0);
- }
-
--static void scale(vec_s32 res[4], vec_s16 res_packed[2], int shift)
-+static av_always_inline void scale(vec_s32 res[4], vec_s16 res_packed[2],
-+ const int shift)
- {
- int i;
- vec_u32 v_shift = vec_splat_u32(shift);
---
-2.17.1
-
diff --git a/user/freetds/APKBUILD b/user/freetds/APKBUILD
index 9bb50f742..ec1d26e66 100644
--- a/user/freetds/APKBUILD
+++ b/user/freetds/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=freetds
-pkgver=1.00.104
+pkgver=1.00.109
pkgrel=0
pkgdesc="Tabular Datastream Library"
url="http://www.freetds.org/"
@@ -40,5 +40,5 @@ package() {
make -j1 DESTDIR="$pkgdir" install
}
-sha512sums="e1a1f2831bd893cc738e0e5029512d60e38ca3e26ad0df59916cb100dd90f9bf2a82273533a316928dc6152d80266692415dd2e16a8f7edb029c3439ebe8986c freetds-1.00.104.tar.gz
+sha512sums="0c0742414aea533635a9d9b550d0cde10c14226a48d5ec9d353dfa07199d6788ae505e8e671945003a824a4049f11ddac1e4229eed51ac795c91dbf16ed6a4ef freetds-1.00.109.tar.gz
d75d1aab6687586697f3e430db1e82f21208f10076b45996542eea682e36cbbbb344f479a9336fcfd294b5b87d7acb2ec5fb8ddd1914e990e23dd5e7ae93a0b6 fix-includes.patch"
diff --git a/user/gnupg/APKBUILD b/user/gnupg/APKBUILD
index 9cf3b093a..400967285 100644
--- a/user/gnupg/APKBUILD
+++ b/user/gnupg/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=gnupg
-pkgver=2.2.10
+pkgver=2.2.11
pkgrel=0
pkgdesc="GNU Privacy Guard 2 - PGP replacement"
url="https://www.gnupg.org/"
@@ -41,6 +41,6 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="a4477828f268fa69125cf1822f8a721e67f8f4008bd9817b701989393bd93689aac8fee1f4d34d918911d53afabdcbb1c84d40e8a4489d7a29b5a769d330fddd gnupg-2.2.10.tar.bz2
+sha512sums="8aa8beea877993b6eef155e1a503ffdde9963ff04a24e6a3dea7979efeeeeeab57e942a80ad46ef254d27a83e8cb2e3008da7749afa8e39eade190c0499f95d9 gnupg-2.2.11.tar.bz2
c6cc4595081c5b025913fa3ebecf0dff87a84f3c669e3fef106e4fa040f1d4314ee52dd4c0e0002b213034fb0810221cfdd0033eae5349b6e3978f05d08bcac7 0001-Include-sys-select.h-for-FD_SETSIZE.patch
b19a44dacf061dd02b439ab8bd820e3c721aab77168f705f5ce65661f26527b03ea88eec16d78486a633c474120589ec8736692ebff57ab9b95f52f57190ba6b fix-i18n.patch"
diff --git a/user/itstool/APKBUILD b/user/itstool/APKBUILD
index 6d6b66814..7fdfc40cc 100644
--- a/user/itstool/APKBUILD
+++ b/user/itstool/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=itstool
-pkgver=2.0.4
-pkgrel=4
+pkgver=2.0.5
+pkgrel=0
pkgdesc="ITS-based XML translation tool"
url="http://itstool.org/"
arch="noarch"
@@ -38,5 +38,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="f5cfa9c75710f9cc43a61caeb92ca04ec77023bce6fb14d770dda82efde2e5d9050245618c249d309227a3d43555cb1739f5fe680b4a370786ed4631fa9ee4b7 itstool-2.0.4.tar.bz2
+sha512sums="67c55b83e43b5a4626a6633305b2e48a06a5defdf7725e78b00409edea213d166cb3d870a58eb402c48968bddd7c1778d9852acfa0ddebdd363f34ac13f32aa7 itstool-2.0.5.tar.bz2
eb426e7cc9f151154f47b93ef46d6fcfb5fa0982be3bf78863ebf5ea009a89de252a6c63dfb090d76003c47107ebb5d1ac2a7d1ef7db08defe19e32f996dbdbd fix-segfault.patch"
diff --git a/user/krb5/APKBUILD b/user/krb5/APKBUILD
index 84d2855a9..c3d8ad2ff 100644
--- a/user/krb5/APKBUILD
+++ b/user/krb5/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=krb5
-pkgver=1.16.1
+pkgver=1.16.2
pkgrel=0
case $pkgver in
*.*.*) _ver=${pkgver%.*};;
@@ -96,7 +96,7 @@ libs() {
mv "$pkgdir"/usr/lib "$subpkgdir"/usr/
}
-sha512sums="fa4ec14a4ffe690861e2dd7ea39d7698af2058ce181bb733ea891f80279f4dde4bb891adec5ccb0eaddf737306e6ceb1fe3744a2946e6189a7d7d2dd3bc5ba84 krb5-1.16.1.tar.gz
+sha512sums="738c071a90e0f38680bb17bdcf950310bc4549f3cb851e1d34de11239ae88178e6ee1a5e5d48c6d3efef544339b07d22dba5347dd763a4266d8d4df7cf47afc9 krb5-1.16.2.tar.gz
5a3782ff17b383f8cd0415fd13538ab56afd788130d6ad640e9f2682b7deaae7f25713ce358058ed771091040dccf62a3bc87e6fd473d505ec189a95debcc801 mit-krb5_krb5-config_LDFLAGS.patch
43b9885b7eb8d0d60920def688de482f2b1701288f9acb1bb21dc76b2395428ff304961959eb04ba5eafd0412bae35668d6d2c8223424b9337bc051eadf51682 krb5kadmind.initd
ede15f15bbbc9d0227235067abe15245bb9713aea260d397379c63275ce74aea0db6c91c15d599e40c6e89612d76f3a0f8fdd21cbafa3f30d426d4310d3e2cec krb5kdc.initd
diff --git a/user/libinput/APKBUILD b/user/libinput/APKBUILD
index d334cfc01..76b3f44f7 100644
--- a/user/libinput/APKBUILD
+++ b/user/libinput/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libinput
-pkgver=1.12.2
+pkgver=1.12.3
pkgrel=0
pkgdesc="Library for handling input devices"
url="https://www.freedesktop.org/wiki/Software/libinput/"
@@ -34,4 +34,4 @@ package() {
install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
-sha512sums="f7122a1d18dd2d0072a34fd9897ebe25a065100b3754052d7ec133bddb56d5c2a5a94950cfc8366ef5d117180c28b3ff99b1a62f3ab95df5ac22f86721fbdc67 libinput-1.12.2.tar.xz"
+sha512sums="cdc512cb53442ae85d5a23e10db9dd3548bcca0de24d7fcc48954a60773563d84d9b10278b6a693ade95d0789bb5d42bbb8b7cf1c178fe85401cb09a5402ff02 libinput-1.12.3.tar.xz"
diff --git a/user/libqalculate/APKBUILD b/user/libqalculate/APKBUILD
index 313c3f823..0a02a5926 100644
--- a/user/libqalculate/APKBUILD
+++ b/user/libqalculate/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libqalculate
-pkgver=2.8.0
-pkgrel=1
+pkgver=2.8.1
+pkgrel=0
pkgdesc="Library implementing a powerful, versatile desktop calculator"
url="https://qalculate.github.io/"
arch="all"
@@ -13,7 +13,6 @@ depends_dev="gmp-dev mpfr-dev"
makedepends="$depends_dev curl-dev icu-dev intltool libxml2-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang qalc"
source="https://github.com/Qalculate/libqalculate/releases/download/v$pkgver/libqalculate-$pkgver.tar.gz
- without-readline.patch
"
build() {
@@ -44,5 +43,4 @@ qalc() {
mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
}
-sha512sums="4e38b2086850b7f4ce4de0061232ac36bcdb83f0be3c6d412183087b2c7f94955b08054ad572a1f0dabff732cb82ee41c387eb906209ccadba6477cc019a3e72 libqalculate-2.8.0.tar.gz
-9bedf6666a761411ab95add94fd1936864d3f1b6d0aeff4e304f272b7fcd2aec07f830f3bb27956bf792b2b5069fd9e20c7d920d3903e4d89be163b6f1ea2474 without-readline.patch"
+sha512sums="a258bf4f67db70263626ac77822afc75fd7a9e5af2feb1930314daff219865b28c43e82fef6ceae4f3f23957447d6eaebdc709e606d28457bca0f47eefb9274a libqalculate-2.8.1.tar.gz"
diff --git a/user/libqalculate/without-readline.patch b/user/libqalculate/without-readline.patch
deleted file mode 100644
index 329cbb866..000000000
--- a/user/libqalculate/without-readline.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-From 9398f8f70a98e731e29f58439bdc75faa554dd04 Mon Sep 17 00:00:00 2001
-From: Hanna K <hanna.knutsson@protonmail.com>
-Date: Wed, 31 Oct 2018 08:27:06 +0100
-Subject: [PATCH] Fix compilation without readline; Use bold text for mode
- headings
-
----
- src/qalc.cc | 118 ++++++++++++++++------------------------------------
- 1 file changed, 37 insertions(+), 81 deletions(-)
-
-diff --git a/src/qalc.cc b/src/qalc.cc
-index 0621913..db15a1a 100644
---- a/src/qalc.cc
-+++ b/src/qalc.cc
-@@ -409,10 +409,12 @@ bool check_exchange_rates() {
- #ifdef HAVE_LIBREADLINE
- # define CHECK_IF_SCREEN_FILLED if(!cfile) {rcount++; if(rcount + 3 >= rows) {FPUTS_UNICODE(_("\nPress Enter to continue."), stdout); fflush(stdout); rl_read_key(); puts(""); rcount = 1;}}
- # define CHECK_IF_SCREEN_FILLED_PUTS(x) if(!cfile) {rcount += countRows(x, cols); if(rcount + 2 >= rows) {FPUTS_UNICODE(_("\nPress Enter to continue."), stdout); fflush(stdout); rl_read_key(); puts(""); rcount = 1;}} PUTS_UNICODE(x);
-+# define CHECK_IF_SCREEN_FILLED_HEADING(x) rcount += 2; CHECK_IF_SCREEN_FILLED; if(rcount > 1) {puts("");} PUTS_BOLD(x); puts(""); if(rcount == 1) {rcount = 3;}
- # define INIT_SCREEN_CHECK int rows, cols, rcount = 0; if(!cfile) rl_get_screen_size(&rows, &cols);
- #else
- # define CHECK_IF_SCREEN_FILLED
- # define CHECK_IF_SCREEN_FILLED_PUTS(x) PUTS_UNICODE(x);
-+# define CHECK_IF_SCREEN_FILLED_HEADING(x) puts(""); PUTS_BOLD(x); puts("");
- # define INIT_SCREEN_CHECK {}
- #endif
-
-@@ -907,7 +909,7 @@ void set_option(string str) {
- #define STR_AND_TABS_T3(x) str = x; pctl = unicode_length(str); if(pctl >= 16) {str += "\t";} else if(pctl >= 8) {str += "\t\t";} else {str += "\t\t\t";}
- #define STR_AND_TABS_T4(x) str = x; pctl = unicode_length(str); if(pctl >= 24) {str += "\t";} else if(pctl >= 16) {str += "\t\t";} else if(pctl >= 8) {str += "\t\t\t";} else {str += "\t\t\t\t";}
- #define PRINT_AND_COLON_TABS(x) FPUTS_UNICODE(x, stdout); pctl = unicode_length_check(x); if(pctl >= 32) fputs("\t", stdout); else if(pctl >= 24) fputs("\t\t", stdout); else if(pctl >= 16) fputs("\t\t\t", stdout); else if(pctl >= 8) fputs("\t\t\t\t", stdout); else fputs("\t\t\t\t\t", stdout);
--#define PUTS_BOLD(x) str = "\033[1m"; str += x; str += "\033[0m"; puts(str.c_str());
-+#define PUTS_BOLD(x) str = "\033[1m"; str += x; str += "\033[0m"; PUTS_UNICODE(str.c_str());
-
- bool equalsIgnoreCase(const string &str1, const string &str2, size_t i2, size_t i2_end, size_t minlength) {
- if(str1.empty() || str2.empty()) return false;
-@@ -2318,12 +2320,11 @@ int main(int argc, char *argv[]) {
- //qalc command
- } else if(EQUALS_IGNORECASE_AND_LOCAL(str, "mode", _("mode"))) {
- INIT_SCREEN_CHECK
-- puts(""); CHECK_IF_SCREEN_FILLED
-+
- int pctl;
-
-- PUTS_UNICODE(_("Algebraic Mode"));
-- puts("");
-- rcount += 2;
-+ CHECK_IF_SCREEN_FILLED_HEADING(_("Algebraic Mode"));
-+
- PRINT_AND_COLON_TABS(_("algebra mode"));
- switch(evalops.structuring) {
- case STRUCTURING_NONE: {PUTS_UNICODE(_("none")); break;}
-@@ -2355,11 +2356,8 @@ int main(int argc, char *argv[]) {
- if(value.empty()) value = _("unknown");
- PRINT_AND_COLON_TABS(_("assumptions")); PUTS_UNICODE(value.c_str()); CHECK_IF_SCREEN_FILLED
-
-- rcount += 2; CHECK_IF_SCREEN_FILLED
-- if(rcount > 1) puts("");
-- PUTS_UNICODE(_("Calculation"));
-- puts("");
-- if(rcount == 1) rcount = 3;
-+ CHECK_IF_SCREEN_FILLED_HEADING(_("Calculation"));
-+
- PRINT_AND_COLON_TABS(_("angle unit"));
- switch(evalops.parse_options.angle_unit) {
- case ANGLE_UNIT_RADIANS: {PUTS_UNICODE(_("rad")); break;}
-@@ -2378,11 +2376,8 @@ int main(int argc, char *argv[]) {
- PRINT_AND_COLON_TABS(_("interval")); PUTS_UNICODE(b2oo(CALCULATOR->usesIntervalArithmetic(), false)); CHECK_IF_SCREEN_FILLED
- PRINT_AND_COLON_TABS(_("precision")) printf("%i\n", CALCULATOR->getPrecision()); CHECK_IF_SCREEN_FILLED
-
-- rcount += 2; CHECK_IF_SCREEN_FILLED
-- if(rcount > 1) puts("");
-- PUTS_UNICODE(_("Enabled Objects"));
-- puts("");
-- if(rcount == 1) rcount = 3;
-+ CHECK_IF_SCREEN_FILLED_HEADING(_("Enabled Objects"));
-+
- PRINT_AND_COLON_TABS(_("calculate functions")); PUTS_UNICODE(b2oo(evalops.calculate_functions, false)); CHECK_IF_SCREEN_FILLED
- PRINT_AND_COLON_TABS(_("calculate variables")); PUTS_UNICODE(b2oo(evalops.calculate_variables, false)); CHECK_IF_SCREEN_FILLED
- PRINT_AND_COLON_TABS(_("complex numbers")); PUTS_UNICODE(b2oo(evalops.allow_complex, false)); CHECK_IF_SCREEN_FILLED
-@@ -2393,11 +2388,8 @@ int main(int argc, char *argv[]) {
- PRINT_AND_COLON_TABS(_("variables")); PUTS_UNICODE(b2oo(evalops.parse_options.variables_enabled, false)); CHECK_IF_SCREEN_FILLED
- PRINT_AND_COLON_TABS(_("variable units")); PUTS_UNICODE(b2oo(CALCULATOR->variableUnitsEnabled(), false)); CHECK_IF_SCREEN_FILLED
-
-- rcount += 2; CHECK_IF_SCREEN_FILLED
-- if(rcount > 1) puts("");
-- PUTS_UNICODE(_("Generic Display Options"));
-- puts("");
-- if(rcount == 1) rcount = 3;
-+ CHECK_IF_SCREEN_FILLED_HEADING(_("Generic Display Options"));
-+
- PRINT_AND_COLON_TABS(_("abbreviations")); PUTS_UNICODE(b2oo(printops.abbreviate_names, false)); CHECK_IF_SCREEN_FILLED
- PRINT_AND_COLON_TABS(_("division sign"));
- switch(printops.division_sign) {
-@@ -2420,11 +2412,8 @@ int main(int argc, char *argv[]) {
- PRINT_AND_COLON_TABS(_("spell out logical")); PUTS_UNICODE(b2oo(printops.spell_out_logical_operators, false)); CHECK_IF_SCREEN_FILLED
- PRINT_AND_COLON_TABS(_("unicode")); PUTS_UNICODE(b2oo(printops.use_unicode_signs, false)); CHECK_IF_SCREEN_FILLED
-
-- rcount += 2; CHECK_IF_SCREEN_FILLED
-- if(rcount > 1) puts("");
-- PUTS_UNICODE(_("Numerical Display"));
-- puts("");
-- if(rcount == 1) rcount = 3;
-+ CHECK_IF_SCREEN_FILLED_HEADING(_("Numerical Display"));
-+
- PRINT_AND_COLON_TABS(_("base"));
- switch(printops.base) {
- case BASE_ROMAN_NUMERALS: {PUTS_UNICODE(_("roman")); break;}
-@@ -2513,11 +2502,8 @@ int main(int argc, char *argv[]) {
- PRINT_AND_COLON_TABS(_("show ending zeroes")); PUTS_UNICODE(b2oo(printops.show_ending_zeroes, false)); CHECK_IF_SCREEN_FILLED
- PRINT_AND_COLON_TABS(_("two's complement")); PUTS_UNICODE(b2oo(printops.twos_complement, false)); CHECK_IF_SCREEN_FILLED
-
-- rcount += 2; CHECK_IF_SCREEN_FILLED
-- if(rcount > 1) puts("");
-- PUTS_UNICODE(_("Parsing"));
-- puts("");
-- if(rcount == 1) rcount = 3;
-+ CHECK_IF_SCREEN_FILLED_HEADING(_("Parsing"));
-+
- PRINT_AND_COLON_TABS(_("decimal comma"));
- if(b_decimal_comma < 0) {PUTS_UNICODE(_("locale"));}
- else if(b_decimal_comma == 0) {PUTS_UNICODE(_("off"));}
-@@ -2552,11 +2538,8 @@ int main(int argc, char *argv[]) {
- CHECK_IF_SCREEN_FILLED
- PRINT_AND_COLON_TABS(_("rpn syntax")); PUTS_UNICODE(b2oo(evalops.parse_options.rpn, false)); CHECK_IF_SCREEN_FILLED
-
-- rcount += 2; CHECK_IF_SCREEN_FILLED
-- if(rcount > 1) puts("");
-- PUTS_UNICODE(_("Units"));
-- puts("");
-- if(rcount == 1) rcount = 3;
-+ CHECK_IF_SCREEN_FILLED_HEADING(_("Units"));
-+
- PRINT_AND_COLON_TABS(_("all prefixes")); PUTS_UNICODE(b2oo(printops.use_all_prefixes, false)); CHECK_IF_SCREEN_FILLED
- PRINT_AND_COLON_TABS(_("autoconversion"));
- switch(evalops.auto_post_conversion) {
-@@ -2583,11 +2566,8 @@ int main(int argc, char *argv[]) {
- }
- CHECK_IF_SCREEN_FILLED
-
-- rcount += 2; CHECK_IF_SCREEN_FILLED
-- if(rcount > 1) puts("");
-- PUTS_UNICODE(_("Other"));
-- puts("");
-- if(rcount == 1) rcount = 3;
-+ CHECK_IF_SCREEN_FILLED_HEADING(_("Other"));
-+
- PRINT_AND_COLON_TABS(_("rpn")); PUTS_UNICODE(b2oo(rpn_mode, false)); CHECK_IF_SCREEN_FILLED
- PRINT_AND_COLON_TABS(_("save definitions")); PUTS_UNICODE(b2yn(save_defs_on_exit, false)); CHECK_IF_SCREEN_FILLED
- PRINT_AND_COLON_TABS(_("save mode")); PUTS_UNICODE(b2yn(save_mode_on_exit, false)); CHECK_IF_SCREEN_FILLED
-@@ -3011,11 +2991,8 @@ int main(int argc, char *argv[]) {
- CHECK_IF_SCREEN_FILLED_PUTS("");
- CHECK_IF_SCREEN_FILLED_PUTS(_("Available options and accepted values are (the current value is marked with '*'):"));
-
-- rcount += 2; CHECK_IF_SCREEN_FILLED
-- if(rcount > 1) puts("");
-- PUTS_UNICODE(_("Algebraic Mode"));
-- puts("");
-- if(rcount == 1) rcount = 3;
-+ CHECK_IF_SCREEN_FILLED_HEADING(_("Algebraic Mode"));
-+
- STR_AND_TABS_2(_("algebra mode"), evalops.structuring, _("none"), _("simplify"), _("factorize"));
- STR_AND_TABS_BOOL(_("assume nonzero denominators"), evalops.assume_denominators_nonzero);
- STR_AND_TABS_BOOL(_("warn nonzero denominators"), evalops.warn_about_denominators_assumed_nonzero);
-@@ -3049,21 +3026,15 @@ int main(int argc, char *argv[]) {
- if(ass->type() == ASSUMPTION_TYPE_INTEGER) str += "*";
- str += ")"; CHECK_IF_SCREEN_FILLED_PUTS(str.c_str());
-
-- rcount += 2; CHECK_IF_SCREEN_FILLED
-- if(rcount > 1) puts("");
-- PUTS_UNICODE(_("Calculation"));
-- puts("");
-- if(rcount == 1) rcount = 3;
-+ CHECK_IF_SCREEN_FILLED_HEADING(_("Calculation"));
-+
- STR_AND_TABS_3(_("angle unit"), evalops.parse_options.angle_unit, _("none"), _("radians"), _("degrees"), _("gradians"));
- STR_AND_TABS_2(_("approximation"), evalops.approximation, _("exact"), _("try exact"), _("approximate"));
- STR_AND_TABS_BOOL(_("interval"), CALCULATOR->usesIntervalArithmetic());
- STR_AND_TABS(_("precision")); str += "(> 0) "; str += i2s(CALCULATOR->getPrecision()); str += "*"; CHECK_IF_SCREEN_FILLED_PUTS(str.c_str());
-
-- rcount += 2; CHECK_IF_SCREEN_FILLED
-- if(rcount > 1) puts("");
-- PUTS_UNICODE(_("Enabled Objects"));
-- puts("");
-- if(rcount == 1) rcount = 3;
-+ CHECK_IF_SCREEN_FILLED_HEADING(_("Enabled Objects"));
-+
- STR_AND_TABS_BOOL(_("calculate functions"), evalops.calculate_functions);
- STR_AND_TABS_BOOL(_("calculate variables"), evalops.calculate_variables);
- STR_AND_TABS_BOOL(_("complex numbers"), evalops.allow_complex);
-@@ -3074,11 +3045,8 @@ int main(int argc, char *argv[]) {
- STR_AND_TABS_BOOL(_("variables"), evalops.parse_options.variables_enabled);
- STR_AND_TABS_BOOL(_("variable units"), CALCULATOR->variableUnitsEnabled());
-
-- rcount += 2; CHECK_IF_SCREEN_FILLED
-- if(rcount > 1) puts("");
-- PUTS_UNICODE(_("Generic Display Options"));
-- puts("");
-- if(rcount == 1) rcount = 3;
-+ CHECK_IF_SCREEN_FILLED_HEADING(_("Generic Display Options"));
-+
- STR_AND_TABS_BOOL(_("abbreviations"), printops.abbreviate_names);
- STR_AND_TABS_2(_("division sign"), printops.division_sign, "/", SIGN_DIVISION_SLASH, SIGN_DIVISION);
- STR_AND_TABS_BOOL(_("excessive parentheses"), printops.excessive_parenthesis);
-@@ -3088,12 +3056,9 @@ int main(int argc, char *argv[]) {
- STR_AND_TABS_BOOL(_("spacious"), printops.spacious);
- STR_AND_TABS_BOOL(_("spell out logical"), printops.spell_out_logical_operators);
- STR_AND_TABS_BOOL(_("unicode"), printops.use_unicode_signs);
--
-- rcount += 2; CHECK_IF_SCREEN_FILLED
-- if(rcount > 1) puts("");
-- PUTS_UNICODE(_("Numerical Display"));
-- puts("");
-- if(rcount == 1) rcount = 3;
-+
-+ CHECK_IF_SCREEN_FILLED_HEADING(_("Numerical Display"));
-+
- STR_AND_TABS(_("base")); str += "(2 - 36"; str += ", "; str += _("bin");
- if(printops.base == BASE_BINARY) str += "*";
- str += ", "; str += _("oct");
-@@ -3154,11 +3119,8 @@ int main(int argc, char *argv[]) {
- STR_AND_TABS_BOOL(_("show ending zeroes"), printops.show_ending_zeroes);
- STR_AND_TABS_BOOL(_("two's complement"), printops.twos_complement);
-
-- rcount += 2; CHECK_IF_SCREEN_FILLED
-- if(rcount > 1) puts("");
-- PUTS_UNICODE(_("Parsing"));
-- puts("");
-- if(rcount == 1) rcount = 3;
-+ CHECK_IF_SCREEN_FILLED_HEADING(_("Parsing"));
-+
- STR_AND_TABS(_("decimal comma")); str += "("; str += _("locale");
- if(b_decimal_comma < 0) str += "*";
- str += ", "; str += _("off");
-@@ -3191,11 +3153,8 @@ int main(int argc, char *argv[]) {
- STR_AND_TABS_2(_("read precision"), evalops.parse_options.read_precision, _("off"), _("always"), _("when decimals"))
- STR_AND_TABS_BOOL(_("rpn syntax"), evalops.parse_options.rpn);
-
-- rcount += 2; CHECK_IF_SCREEN_FILLED
-- if(rcount > 1) puts("");
-- PUTS_UNICODE(_("Units"));
-- puts("");
-- if(rcount == 1) rcount = 3;
-+ CHECK_IF_SCREEN_FILLED_HEADING(_("Units"));
-+
- STR_AND_TABS_BOOL(_("all prefixes"), printops.use_all_prefixes);
- STR_AND_TABS(_("autoconversion"));
- str += (_("none"));
-@@ -3222,11 +3181,8 @@ int main(int argc, char *argv[]) {
- if(auto_update_exchange_rates > 0) {str += " "; str += i2s(auto_update_exchange_rates); str += "*";}
- CHECK_IF_SCREEN_FILLED_PUTS(str.c_str());
-
-- rcount += 2; CHECK_IF_SCREEN_FILLED
-- if(rcount > 1) puts("");
-- PUTS_UNICODE(_("Other"));
-- puts("");
-- if(rcount == 1) rcount = 3;
-+ CHECK_IF_SCREEN_FILLED_HEADING(_("Other"));
-+
- STR_AND_TABS_BOOL(_("rpn"), rpn_mode);
- STR_AND_TABS_YESNO(_("save definitions"), save_defs_on_exit);
- STR_AND_TABS_YESNO(_("save mode"), save_mode_on_exit);
diff --git a/user/libwacom/APKBUILD b/user/libwacom/APKBUILD
index d2ab224f4..c5faa796f 100644
--- a/user/libwacom/APKBUILD
+++ b/user/libwacom/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Ivan Tham <pickfire@riseup.net>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libwacom
-pkgver=0.31
+pkgver=0.32
pkgrel=0
pkgdesc="Tablet description library"
url="http://linuxwacom.sourceforge.net/"
@@ -37,4 +37,4 @@ package() {
> "$pkgdir"/usr/lib/udev/rules.d/65-libwacom.rules
}
-sha512sums="fb1fd470000bf3a620c4dd2293fff483bf6e1ffddaffc176e7b88f13d44347f4b322e1827b53ce61ae25e2d99f36c50767c201f38161498969c7c8215dad1c36 libwacom-0.31.tar.bz2"
+sha512sums="d7001bb355d4b269e61bf95f0b71621088e76d6894a4a1d002b6a0904a20dd75e0b4fb85368fd20ccafbbfbb1c7ff17150a39962554c8f27f9fcad48c397125b libwacom-0.32.tar.bz2"
diff --git a/user/lighttpd/APKBUILD b/user/lighttpd/APKBUILD
index dee436ffd..1be241d58 100644
--- a/user/lighttpd/APKBUILD
+++ b/user/lighttpd/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=lighttpd
-pkgver=1.4.51
+pkgver=1.4.52
pkgrel=0
pkgdesc="A secure, fast, compliant and very flexible web-server"
url="http://www.lighttpd.net/"
@@ -101,7 +101,7 @@ mod_webdav() {
_mv_mod mod_webdav
}
-sha512sums="ee4f150c30322dae50760b99cddd0bd935195ee21e042809fa8d303425d12081c23c00d8ea8fcd3d023b6b414a46b9b953edc4ed25400fe39f10487f0956561f lighttpd-1.4.51.tar.xz
+sha512sums="3c604f441c001641681b958012524c9a2e801314b07d9741d4b5e086e7585d676516e3fe587e0ff69f1f937c11b9a290f2173866d6b90019117b6be299972a72 lighttpd-1.4.52.tar.xz
f2f3c5c7731550237fd75a8de66275f427eaf897cffff7ac7ef44178328ad8fad6c4ec6654759bfc665cbaf7991ddcdf0aaa916831c8b6aa440192d57b242038 lighttpd.initd
9d2ab5deb7353ebf290e90936b511941df440859c78589d0bcf130ef69a5e9c79e4d318548b6b118df002083c46f7476230a28954b7a10a9dbd05040e02b1291 lighttpd.confd
0536b4f21d2e8659f7831b45998c13d9f6051ae7ecde13be01f372f837d255bfc4e211de48a7686cc743d53aa9c08ab3f10ec19788896dcf8356b90053ca7a16 lighttpd.logrotate
diff --git a/user/pixman/APKBUILD b/user/pixman/APKBUILD
index 607a49afb..b694941e9 100644
--- a/user/pixman/APKBUILD
+++ b/user/pixman/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=pixman
-pkgver=0.34.0
-pkgrel=5
+pkgver=0.36.0
+pkgrel=0
pkgdesc="Low-level pixel manipulation library"
url="https://www.X.Org/"
arch="all"
@@ -9,7 +9,6 @@ license="MIT"
subpackages="$pkgname-dev $pkgname-dbg"
makedepends="perl linux-headers"
source="https://www.X.Org/releases/individual/lib/$pkgname-$pkgver.tar.bz2
- float-header-fix.patch
stacksize-reduction.patch
"
@@ -35,6 +34,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="755a3f5596e7bd9710abc8e5bfd341adaf2177f5b21f7aaae7f85b8fb57580ea48df586ad32bf6adef6ce0430e7cadaa57754a2fa466bc4b15bf70ee64cd1418 pixman-0.34.0.tar.bz2
-5064da221fe406e58169df0b07df7123ccf65487e654dba9e0903122480363c2b4e11ec0a14ac546658c747934509f2f66e3d0d078d6dd0ac92505c24b0e9ee9 float-header-fix.patch
+sha512sums="ed99c85a8ce11f52659da61bff599c0405ae0069c30434bdef7238bc9f18e83e6d534cddf38c14d753943edbaeba580c5005ad7575f27e469ca7be7878678d21 pixman-0.36.0.tar.bz2
3d75e7328e6eaaa6e8f4defa4402db815764369f94b81be38fba07933267fe24b03b591dd4c3f3544cb090650153728bfbdd81a91acaf19524c3d08f61427f63 stacksize-reduction.patch"
diff --git a/user/pixman/float-header-fix.patch b/user/pixman/float-header-fix.patch
deleted file mode 100644
index 5c151a14f..000000000
--- a/user/pixman/float-header-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./pixman/pixman-private.h.orig
-+++ ./pixman/pixman-private.h
-@@ -1,5 +1,3 @@
--#include <float.h>
--
- #ifndef PIXMAN_PRIVATE_H
- #define PIXMAN_PRIVATE_H
-
-@@ -30,6 +28,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <stddef.h>
-+#include <float.h>
-
- #include "pixman-compiler.h"
-
diff --git a/user/sdl2/APKBUILD b/user/sdl2/APKBUILD
index 45927c139..910eb1763 100644
--- a/user/sdl2/APKBUILD
+++ b/user/sdl2/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: August Klein <amatcoder@gmail.com>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=sdl2
-pkgver=2.0.8
-pkgrel=1
+pkgver=2.0.9
+pkgrel=0
pkgdesc="Low level audio, keyboard, mouse, joystick and graphics library"
url="https://www.libsdl.org/"
arch="all"
@@ -43,5 +43,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="673c6058b8692a36b4a3594456b10ef6051efe79e4fb644421fc5c76b11fd68b895840a2c8b72413418c378733e2993d33f19767d0d7ed101eda6310bd70c869 SDL2-2.0.8.tar.gz
+sha512sums="a78a4708b2bb5b35a7c7b7501eb3bd60a9aa3bb95a3d84e57763df4a377185e7312a94b66321eef7ca0d17255e4b402fc950e83ef0dbbd08f14ff1194107dc10 SDL2-2.0.9.tar.gz
f64402503f4cf7e7d65efc1b397c9d632b0f592ee04893884155d0e88bc88e0ae096778cbd30a2caf61246430b43bd17a1f78dda8a8abcbc8ebd60ef107386ac ensure-c++-on-ppc.patch"
diff --git a/user/tiff/APKBUILD b/user/tiff/APKBUILD
index f05bcbc2f..7bb89ee3e 100644
--- a/user/tiff/APKBUILD
+++ b/user/tiff/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=tiff
-pkgver=4.0.9
-pkgrel=2
+pkgver=4.0.10
+pkgrel=0
pkgdesc="Library to read, create, and manipulate TIFF image files"
url="http://www.libtiff.org/"
arch="all"
@@ -13,7 +13,6 @@ depends_dev="zlib-dev libjpeg-turbo-dev"
makedepends="libtool autoconf automake $depends_dev"
subpackages="$pkgname-doc $pkgname-dev $pkgname-tools"
source="http://download.osgeo.org/libtiff/$pkgname-$pkgver.tar.gz
- CVE-2017-18013.patch
"
# secfixes:
# 4.0.9-r1:
@@ -36,12 +35,6 @@ source="http://download.osgeo.org/libtiff/$pkgname-$pkgver.tar.gz
# 4.0.7-r1:
# - CVE-2017-5225
-prepare() {
- cd "$builddir"
- update_config_sub
- default_prepare
-}
-
build() {
cd "$builddir"
./configure \
@@ -71,5 +64,4 @@ tools() {
mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
}
-sha512sums="04f3d5eefccf9c1a0393659fe27f3dddd31108c401ba0dc587bca152a1c1f6bc844ba41622ff5572da8cc278593eff8c402b44e7af0a0090e91d326c2d79f6cd tiff-4.0.9.tar.gz
-2baa66963302ff51e34774d6e0703f769ba1ca7f527456ae13ea230af69280e024440390df9b5a51776fc29cb6d2d40713431a2c2d98f29e50e3f8f5a7f4d73b CVE-2017-18013.patch"
+sha512sums="d213e5db09fd56b8977b187c5a756f60d6e3e998be172550c2892dbdb4b2a8e8c750202bc863fe27d0d1c577ab9de1710d15e9f6ed665aadbfd857525a81eea8 tiff-4.0.10.tar.gz"
diff --git a/user/tiff/CVE-2017-18013.patch b/user/tiff/CVE-2017-18013.patch
deleted file mode 100644
index 5a1d90082..000000000
--- a/user/tiff/CVE-2017-18013.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c6f41df7b581402dfba3c19a1e3df4454c551a01 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Sun, 31 Dec 2017 15:09:41 +0100
-Subject: [PATCH] libtiff/tif_print.c: TIFFPrintDirectory(): fix null pointer dereference on corrupted file. Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2770
-
----
- libtiff/tif_print.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/libtiff/tif_print.c b/libtiff/tif_print.c
-index 9959d35..8deceb2 100644
---- a/libtiff/tif_print.c
-+++ b/libtiff/tif_print.c
-@@ -665,13 +665,13 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags)
- #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
- fprintf(fd, " %3lu: [%8I64u, %8I64u]\n",
- (unsigned long) s,
-- (unsigned __int64) td->td_stripoffset[s],
-- (unsigned __int64) td->td_stripbytecount[s]);
-+ td->td_stripoffset ? (unsigned __int64) td->td_stripoffset[s] : 0,
-+ td->td_stripbytecount ? (unsigned __int64) td->td_stripbytecount[s] : 0);
- #else
- fprintf(fd, " %3lu: [%8llu, %8llu]\n",
- (unsigned long) s,
-- (unsigned long long) td->td_stripoffset[s],
-- (unsigned long long) td->td_stripbytecount[s]);
-+ td->td_stripoffset ? (unsigned long long) td->td_stripoffset[s] : 0,
-+ td->td_stripbytecount ? (unsigned long long) td->td_stripbytecount[s] : 0);
- #endif
- }
- }
---
-libgit2 0.26.0
-
diff --git a/user/ttf-liberation/APKBUILD b/user/ttf-liberation/APKBUILD
index 7f0029af5..eb25558c8 100644
--- a/user/ttf-liberation/APKBUILD
+++ b/user/ttf-liberation/APKBUILD
@@ -1,10 +1,10 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=ttf-liberation
-pkgver=2.00.3
+pkgver=2.00.4
# Note: 2.00.0 onward releases does not includes Liberation Sans Narrow font due to licensing problems.
# we use narrowver to grab older release which does include narrow fonts
_narrowver=1.07.4
-pkgrel=2
+pkgrel=0
pkgdesc="Red Hat's Liberation fonts"
url="https://pagure.io/liberation-fonts/"
arch="noarch"
@@ -29,7 +29,7 @@ package() {
"$pkgdir"/etc/fonts/conf.d
install -m644 "$srcdir"/liberation-fonts-ttf-$_narrowver/*.ttf \
"$pkgdir"/usr/share/fonts/$pkgname
- install -m644 "$srcdir"/liberation-fonts-ttf-$pkgver/*.ttf \
+ install -m644 "$srcdir"/liberation-fonts-ttf-2.00.3/*.ttf \
"$pkgdir"/usr/share/fonts/$pkgname
for j in "$srcdir"/*.conf; do
@@ -40,7 +40,7 @@ package() {
done
}
-sha512sums="a83ab0c05bfa97ec30a946ff4b2d23dd1e29974999241b2a058f3c052879eb48e818e09a42a7fe27f04728fea56ddbbf67c60820b10e93e3b99f50892372565d liberation-fonts-ttf-2.00.3.tar.gz
+sha512sums="a83ab0c05bfa97ec30a946ff4b2d23dd1e29974999241b2a058f3c052879eb48e818e09a42a7fe27f04728fea56ddbbf67c60820b10e93e3b99f50892372565d liberation-fonts-ttf-2.00.4.tar.gz
0906151d111fd660c8cb90dfcb39e0a38805aa53cac162def5240ff3a75c40f6195e6876d09a2f7081913bfe732550b670d197f0e10598c463186fe3bc229b9f liberation-fonts-ttf-1.07.4.tar.gz
585b74555132098d1d89b118b92fb843471ae2882622dec16178f8e7690fe6b5d8bf46e27e59fc3324aebfbd52a4b511d2ad77a8ddf8ef319cbe89b1a2dac91a 30-liberation-mono.conf
cf017383d4390d52bef7c79abb2f48fc4440880ca03ee4dc11647ced524e45a944c4c3e3b318837bef9632b5aa1445e8f29e87f2ea195a8a47899cdeef67aae7 30-liberation-sans-narrow.conf
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-07 16:41:15 +0000