diff options
Diffstat (limited to 'user')
36 files changed, 825 insertions, 65 deletions
diff --git a/user/garcon/APKBUILD b/user/garcon/APKBUILD index 81886c47e..248d30e81 100644 --- a/user/garcon/APKBUILD +++ b/user/garcon/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=garcon -pkgver=0.6.2 -pkgrel=1 +pkgver=0.6.3 +pkgrel=0 pkgdesc="freedesktop.org menu library for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7a96c33b47302fa989862098bc5b8ed64515a60e19a4b8dbb049398cf847d64584f93f85b1f6e1327653b22f0b44a805b737258bbc9ac69197639ef7f13f20b1 garcon-0.6.2.tar.bz2" +sha512sums="1adc4373728ed19641441e0f38778d7401c78e7db52c76a258c378287c5a324e87e2aa11bca134813de4b1eaa807c62ccdf73a4c5e4d83d6acab27aafa61b5b0 garcon-0.6.3.tar.bz2" diff --git a/user/gtk+3.0/APKBUILD b/user/gtk+3.0/APKBUILD index a3a5ff659..9b7b14844 100644 --- a/user/gtk+3.0/APKBUILD +++ b/user/gtk+3.0/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=gtk+3.0 -pkgver=3.24.9 +pkgver=3.24.10 pkgrel=0 pkgdesc="The GTK+ Toolkit (v3)" url="https://www.gtk.org/" @@ -53,4 +53,4 @@ package() { rm -f "$pkgdir"/usr/share/man/man1/gtk-update-icon-cache.1 } -sha512sums="b303db40d5e277841738982a97edd67076febe41b3a455344aeff05c6a5b149c6d3b953cc5db1a792b63cdcc44c2d28f955d81065cb2c6b3f00d0b133a555d7a gtk+-3.24.9.tar.xz" +sha512sums="1f7980189f522fd3646fb480b965c21801cc30b3316eb8bad8ded1efd25d3054f62160ddbe9ea241628c11b24f746024fbc3d22b17b9bd61fa6c301ab91d6498 gtk+-3.24.10.tar.xz" diff --git a/user/gtkmm+3.0/APKBUILD b/user/gtkmm+3.0/APKBUILD index f8a441882..84c2727c1 100644 --- a/user/gtkmm+3.0/APKBUILD +++ b/user/gtkmm+3.0/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=gtkmm+3.0 -pkgver=3.24.0 +pkgver=3.24.1 pkgrel=0 pkgdesc="C++ interfaces for GTK+ 3" url="https://gnome.org" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="94658fbf7eebbac2a864d6c7d3cd0e6ffd4ac213fd1d9986d721d4906c7a43a45d8757df475879ee37ef54ec5e3fac7d9a8e4a194b97b2be72a10743bf2e13ac gtkmm-3.24.0.tar.xz" +sha512sums="be7144edb0d5d68f761c9e92c197c3b84de045072443222694c1595faebf3390623a390dbec9f7232a70231aca138b1cb4343ab273333b2a6a418af7ec1586ed gtkmm-3.24.1.tar.xz" diff --git a/user/gvim/APKBUILD b/user/gvim/APKBUILD index e195793cc..e1cde6aa8 100644 --- a/user/gvim/APKBUILD +++ b/user/gvim/APKBUILD @@ -5,7 +5,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=gvim _pkgreal=vim -pkgver=8.1.1635 +pkgver=8.1.1662 pkgrel=0 pkgdesc="advanced text editor" url="http://www.vim.org" @@ -74,4 +74,4 @@ package() { ln -s gvim rgvim } -sha512sums="41b79ff52438ecbf56366696d3a12d34531a835b64d2ea809597797531950f2f8eb73d753375d23e1411631afaa3f9413fad8af7b0a1fed1532a1714ec1dbb4b vim-8.1.1635.tar.gz" +sha512sums="512fe345ea0982b49fa4b4d520f7e9e874dff92599a6fbc83ef795f9e39445394c3f0e53326f9a8a56c99ba0aa186d08a7d97af378ea22b2c755c57842f1f2ad vim-8.1.1662.tar.gz" diff --git a/user/imagemagick/APKBUILD b/user/imagemagick/APKBUILD index 4fccc54cd..af4e6b383 100644 --- a/user/imagemagick/APKBUILD +++ b/user/imagemagick/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=imagemagick -pkgver=7.0.8.48 +pkgver=7.0.8.53 _abiver=7 _pkgver=${pkgver%.*}-${pkgver##*.} pkgrel=0 @@ -16,7 +16,7 @@ makedepends="zlib-dev libpng-dev libjpeg-turbo-dev freetype-dev fontconfig-dev libxml2-dev librsvg-dev libraw-dev" checkdepends="freetype fontconfig lcms2 graphviz" subpackages="$pkgname-doc $pkgname-dev $pkgname-c++:_cxx $pkgname-libs" -source="https://distfiles.adelielinux.org/source/ImageMagick-$_pkgver.tar.xz" +source="https://github.com/ImageMagick/ImageMagick/archive/$_pkgver.tar.gz" builddir="$srcdir/ImageMagick-${_pkgver}" build() { @@ -81,4 +81,4 @@ _cxx() { mv "$pkgdir"/usr/lib/libMagick++*.so.* "$subpkgdir"/usr/lib/ } -sha512sums="194773526b86762fbcd509a722114c88b23a7bdd96431f666581e11d2c13334e6f58c1edcecb6e9117a00ea873cca8657887f7962ccbb5748d1c692b7756c792 ImageMagick-7.0.8-48.tar.xz" +sha512sums="f96de743266cefdb48e14e8c18cd36d629641894b056637e2d17bbf8cd0626c81b3c762db0893c919a3caaa60c6b34ab777f40d19c8f75b7604eb2975fdd56be 7.0.8-53.tar.gz" diff --git a/user/libev/APKBUILD b/user/libev/APKBUILD index e13d861ef..382523aab 100644 --- a/user/libev/APKBUILD +++ b/user/libev/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: pkgname=libev -pkgver=4.25 +pkgver=4.27 pkgrel=0 pkgdesc="Event dispatch library" url="http://software.schmorp.de/pkg/libev.html" @@ -36,5 +36,5 @@ package() { rm "$pkgdir"/usr/include/event.h } -sha512sums="83455d4dcb626a28d8477aaea27cdee6bc88b273fae926a57eed9f6a59d4b0ea2eef0f41ad09ff711aea2956ed83a591aa53cfe8aa242f7d0a4da19180d764c4 libev-4.25.tar.gz +sha512sums="18fbac15c3a24b2efcd547d98d423fe59a1684cd3afe7ff25a3da54d8df3e11f351df455657d830df93366853f74d584f6e47a7c9ffaba84aa586957bf39ea82 libev-4.27.tar.gz b5bc1b5ed1e605cd45a01adce70c1a97188c0b46a36333f12eccd4407c95d96f18adff90ee8c5733c1783a36b4adc5ef67d6b470104339a1ac5c4539a2a4599e libev-4.11-Add-pkgconfig-support.patch" diff --git a/user/libinput/APKBUILD b/user/libinput/APKBUILD index 14db25b0e..ee878b4b5 100644 --- a/user/libinput/APKBUILD +++ b/user/libinput/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libinput pkgver=1.13.2 -pkgrel=0 +pkgrel=1 pkgdesc="Library for handling input devices" url="https://www.freedesktop.org/wiki/Software/libinput/" arch="all" @@ -11,7 +11,8 @@ license="MIT" makedepends="doxygen eudev-dev graphviz libevdev-dev libwacom-dev meson mtdev-dev ninja py3-recommonmark py3-sphinx py3-sphinx-rtd-theme" checkdepends="check-dev valgrind" -subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" +subpackages="$pkgname-dev $pkgname-doc" +replaces="$pkgname-libs" source="https://freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" build() { @@ -28,7 +29,6 @@ check() { package() { DESTDIR="$pkgdir" ninja -C builddir/ install - install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } sha512sums="26f11c5274c26acc38b9b5729195010c0799a9563f1eb0e0cd67e323f8ed73b0fc8db8584ec8fdf1b726417f64c2daeb54832167079832626c8c1190fccf459f libinput-1.13.2.tar.xz" diff --git a/user/libwacom/APKBUILD b/user/libwacom/APKBUILD index 56464b2a0..c99e8605a 100644 --- a/user/libwacom/APKBUILD +++ b/user/libwacom/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libwacom pkgver=0.33 -pkgrel=1 +pkgrel=2 pkgdesc="Tablet description library" url="http://linuxwacom.sourceforge.net/" arch="all" @@ -31,9 +31,9 @@ check() { package() { make DESTDIR="$pkgdir" install install -dm755 "$pkgdir"/usr/lib/udev/rules.d/ - tools/generate-udev-rules + tools/generate-udev-rules \ > "$pkgdir"/usr/lib/udev/rules.d/65-libwacom.rules } sha512sums="de4d9cf3b5f4d87a159ba8ee617bafce9d13b67dc23d9dc67efd57317b0df2079dd0de328bc800de47f14ee49ea82bb842e34297cef23ba336c1ddca3afa826d libwacom-0.33.tar.bz2 -d1ac1176aa4a95991330e23fb84868d65a1b2e81d68173c990f885af1ce591de7aca16e21db8128e4f1975bca22b8014a6fa2ca8c0458dce464568239d75263c fix-database.patch" +db07a7c44bd7ed010eec167d5e7cd807da203f8d42630855189b7c7e91ef6776b7df571ee0b0a0985912f836640fcf458ee4a394a47e9e8365892a6a137a3f00 fix-database.patch" diff --git a/user/libwacom/fix-database.patch b/user/libwacom/fix-database.patch index d367ca997..3c43b5bbf 100644 --- a/user/libwacom/fix-database.patch +++ b/user/libwacom/fix-database.patch @@ -1,15 +1,25 @@ -https://github.com/linuxwacom/libwacom/issues/85 - -Awful, cheesy hack. - ---- libwacom-0.33/libwacom/libwacom-database.c.old 2019-04-12 03:10:21.000000000 +0000 -+++ libwacom-0.33/libwacom/libwacom-database.c 2019-06-01 06:24:56.290159726 +0000 -@@ -152,7 +152,7 @@ - - memset(namestr, 0, sizeof(namestr)); +diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c +index afb89a2..28388f5 100644 +--- a/libwacom/libwacom-database.c ++++ b/libwacom/libwacom-database.c +@@ -147,14 +147,13 @@ make_match_string (const char *name, WacomBusType bus, int vendor_id, int produc + static gboolean + match_from_string(const char *str, WacomBusType *bus, int *vendor_id, int *product_id, char **name) + { +- int rc = 1; +- char busstr[64], namestr[64]; ++ int rc = 1, len = 0; ++ char busstr[64]; +- memset(namestr, 0, sizeof(namestr)); +- - rc = sscanf(str, "%63[^:]:%x:%x:%63c", busstr, vendor_id, product_id, namestr); -+ rc = sscanf(str, "%63[^:]:%x:%x:%63[^\b]", busstr, vendor_id, product_id, namestr); - if (rc == 4) { - *name = g_strdup(namestr); +- if (rc == 4) { +- *name = g_strdup(namestr); ++ rc = sscanf(str, "%63[^:]:%x:%x:%n", busstr, vendor_id, product_id, &len); ++ if (len > 0) { ++ /* Grumble grumble scanf handling of %n */ ++ *name = g_strdup(str+len); } else if (rc == 3) { + *name = NULL; + } else { diff --git a/user/libxfce4ui/APKBUILD b/user/libxfce4ui/APKBUILD index 3e99f60f2..97d1424a5 100644 --- a/user/libxfce4ui/APKBUILD +++ b/user/libxfce4ui/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=libxfce4ui -pkgver=4.13.5 -pkgrel=1 +pkgver=4.13.6 +pkgrel=0 pkgdesc="UI library for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5ce49c7052392ac0df74b0d5069fa7880d7b322a15b10c5c20932f10ae06529be2b21d95f7e1c10a8ecb2e38cce9a2d880ac107c3ce1e7f51d570d5ece7b7d3c libxfce4ui-4.13.5.tar.bz2" +sha512sums="1992bf5d41fdc200281004f035542f6b5f225edad20e37c9c47fc531e94055473c3747be6026740f0ec32f5ff5f1a42072b624e71b326467711c724372dca8c4 libxfce4ui-4.13.6.tar.bz2" diff --git a/user/libxfce4util/APKBUILD b/user/libxfce4util/APKBUILD index 5ddc923d3..a63dc6b28 100644 --- a/user/libxfce4util/APKBUILD +++ b/user/libxfce4util/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=libxfce4util -pkgver=4.13.3 -pkgrel=1 +pkgver=4.13.4 +pkgrel=0 pkgdesc="Utility library for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e06bf58d46c5c3c6964a17ca8d998bd8e78bb61577ddcd855680878a890912a167212a2b4e3b347f41f84d2983e71fd1d76716db9c4a88a1d4f45a0f5aaf5e51 libxfce4util-4.13.3.tar.bz2" +sha512sums="7d474839acbc2b4f75cb39e39053214bac43b5da9f7605aec8e78bfc1ab1a07864429a47f18faae9be8dfecbb7f5a055bd2eb20c0b9d1b4912755b81cac1ada2 libxfce4util-4.13.4.tar.bz2" diff --git a/user/mate-user-guide/APKBUILD b/user/mate-user-guide/APKBUILD index 3d905d3af..ca93a5109 100644 --- a/user/mate-user-guide/APKBUILD +++ b/user/mate-user-guide/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=mate-user-guide -pkgver=1.22.1 +pkgver=1.22.2 pkgrel=0 pkgdesc="User handbook for the MATE desktop environment" url="https://mate-desktop.org" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="972f609364cb0673c3c402f6936618ba4a212d122055ea18232734cc2cc9d023e9a16cbd78ba96898d227b6db640234c98b387550504224428bfc682b6090877 mate-user-guide-1.22.1.tar.xz" +sha512sums="94e5c6f45acad8f4e422c2e403ae19357702ce2aba5aee33b92cbdfd0610548aa821c3e74ded2824987e36a8da23b2b4a455b3277260c9bab2fa5b719745e06d mate-user-guide-1.22.2.tar.xz" diff --git a/user/netsurf/APKBUILD b/user/netsurf/APKBUILD index 54fdea907..917c71be5 100644 --- a/user/netsurf/APKBUILD +++ b/user/netsurf/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=netsurf pkgver=3.8 -pkgrel=0 +pkgrel=1 pkgdesc="Modern, lightweight GTK-based browser" url="http://www.netsurf-browser.org/" arch="all" @@ -13,7 +13,9 @@ makedepends="curl-dev zlib-dev bison flex libjpeg-turbo-dev libpng-dev openssl-dev expat-dev gperf gtk+2.0-dev librsvg-dev perl-html-parser" source="http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-$pkgver.tar.gz - Makefile.config" + Makefile.config + curl.patch + " builddir="$srcdir/netsurf-all-$pkgver" prepare() { @@ -22,14 +24,13 @@ prepare() { } build() { - cd "$builddir" make PREFIX=/usr NETSURF_USE_VIDEO=YES } package() { - cd "$builddir" make PREFIX=/usr DESTDIR="$pkgdir" install } sha512sums="cc040566b2ae4bda1fa15f75f246b2977f17b1f0adc747ddf86a9f8873bc25dce46cacce8e3d80146e72cc0227b1642c9da8b39a73ca2b5bb254334a25b8136a netsurf-all-3.8.tar.gz -cb5f7ca711c4a015a49acc25882b9b95e151d69e68a21d1df068f107b2372dc7493a25c0dfc1ef0cf42ceb16ba47ceb1002f6d37c2424512b183b508ee41357e Makefile.config" +cb5f7ca711c4a015a49acc25882b9b95e151d69e68a21d1df068f107b2372dc7493a25c0dfc1ef0cf42ceb16ba47ceb1002f6d37c2424512b183b508ee41357e Makefile.config +594c82f550ac04ea86807a7b2d634e10b24156439588d2d1917f67a8962ae872ab50289400d7f779ba0711a6758aee4bd442d7318fe6f271945e60242285c2bb curl.patch" diff --git a/user/netsurf/curl.patch b/user/netsurf/curl.patch new file mode 100644 index 000000000..c76a4dfa1 --- /dev/null +++ b/user/netsurf/curl.patch @@ -0,0 +1,161 @@ +From 65b16f4c54eba748ee4c8b6580e6f08fc27534f8 Mon Sep 17 00:00:00 2001 +From: Michael Drake <michael.drake@codethink.co.uk> +Date: Mon, 6 May 2019 17:12:14 +0100 +Subject: Curl fetcher: Force HTTP1.1 to fix HTTP2 crash. + +On ubuntu 19.4, curl is built with HTTP2 support, and we +segfault. + +==18174== Invalid read of size 1 +==18174== at 0x4ACCE7D: ??? (in /usr/lib/x86_64-linux-gnu/libcurl.so.4.5.0) +==18174== by 0x4B054B1: ??? (in /usr/lib/x86_64-linux-gnu/libcurl.so.4.5.0) +==18174== by 0x4AD398A: ??? (in /usr/lib/x86_64-linux-gnu/libcurl.so.4.5.0) +==18174== by 0x4AD7A0B: ??? (in /usr/lib/x86_64-linux-gnu/libcurl.so.4.5.0) +==18174== by 0x4AE93EE: ??? (in /usr/lib/x86_64-linux-gnu/libcurl.so.4.5.0) +==18174== by 0x4AEA8A8: curl_multi_perform (in /usr/lib/x86_64-linux-gnu/libcurl.so.4.5.0) +==18174== by 0x1F2EF7: fetch_curl_poll (curl.c:1209) +==18174== by 0x1EEC5C: fetcher_poll (fetch.c:271) +==18174== by 0x2A1ED4: schedule_run (schedule.c:160) +==18174== by 0x15F941: framebuffer_run (gui.c:596) +==18174== by 0x15F941: main (gui.c:2206) +==18174== Address 0x9de95a8 is 3,224 bytes inside a block of size 6,304 free'd +==18174== at 0x483997B: free (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so) +==18174== by 0x4AD497B: ??? (in /usr/lib/x86_64-linux-gnu/libcurl.so.4.5.0) +==18174== by 0x4AE158C: curl_easy_cleanup (in /usr/lib/x86_64-linux-gnu/libcurl.so.4.5.0) +==18174== by 0x1F30DE: fetch_curl_cache_handle (curl.c:761) +==18174== by 0x1F30DE: fetch_curl_stop (curl.c:840) +==18174== by 0x1F30DE: fetch_curl_done (curl.c:1122) +==18174== by 0x1F30DE: fetch_curl_poll (curl.c:1223) +==18174== by 0x1EEC5C: fetcher_poll (fetch.c:271) +==18174== by 0x2A1ED4: schedule_run (schedule.c:160) +==18174== by 0x15F941: framebuffer_run (gui.c:596) +==18174== by 0x15F941: main (gui.c:2206) +==18174== Block was alloc'd at +==18174== at 0x483AB35: calloc (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so) +==18174== by 0x4AE165F: curl_easy_duphandle (in /usr/lib/x86_64-linux-gnu/libcurl.so.4.5.0) +==18174== by 0x1F15EB: fetch_curl_get_handle (curl.c:738) +==18174== by 0x1F15EB: fetch_curl_start (curl.c:750) +==18174== by 0x1EEB22: fetch_dispatch_job (fetch.c:156) +==18174== by 0x1EEB22: fetch_choose_and_dispatch (fetch.c:187) +==18174== by 0x1EEB22: fetch_dispatch_jobs (fetch.c:247) +==18174== by 0x1EF1BB: fetch_start (fetch.c:573) +==18174== by 0x26C779: llcache_object_refetch (llcache.c:916) +==18174== by 0x26D5E4: llcache_object_fetch (llcache.c:979) +==18174== by 0x26D5E4: llcache_object_retrieve_from_cache (llcache.c:1767) +==18174== by 0x26D5E4: llcache_object_retrieve (llcache.c:1865) +==18174== by 0x26E42C: llcache_fetch_redirect (llcache.c:2110) +==18174== by 0x26E42C: llcache_fetch_callback (llcache.c:2810) +==18174== by 0x1F1295: fetch_curl_process_headers (curl.c:922) +==18174== by 0x1F13A0: fetch_curl_data (curl.c:1324) +==18174== by 0x4ACD4C3: ??? (in /usr/lib/x86_64-linux-gnu/libcurl.so.4.5.0) +==18174== by 0x4AE00DA: ??? (in /usr/lib/x86_64-linux-gnu/libcurl.so.4.5.0) +--- + content/fetchers/curl.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c +index 7ce7c5b48..4602f6aea 100644 +--- a/netsurf/content/fetchers/curl.c ++++ b/netsurf/content/fetchers/curl.c +@@ -1519,6 +1519,10 @@ nserror fetch_curl_register(void) + if (nsoption_bool(suppress_curl_debug)) { + SETOPT(CURLOPT_DEBUGFUNCTION, fetch_curl_ignore_debug); + } ++ ++ /* Currently we explode if curl uses HTTP2, so force 1.1. */ ++ SETOPT(CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); ++ + SETOPT(CURLOPT_WRITEFUNCTION, fetch_curl_data); + SETOPT(CURLOPT_HEADERFUNCTION, fetch_curl_header); + SETOPT(CURLOPT_PROGRESSFUNCTION, fetch_curl_progress); +-- +cgit v1.2.1 + + +From 3d80e825e1c77ece19c21ed1cc568049856a44de Mon Sep 17 00:00:00 2001 +From: Daniel Silverstone <dsilvers@digital-scurf.org> +Date: Wed, 5 Jun 2019 19:51:47 +0100 +Subject: content/fetchers/curl.c: Defer fetch start if inside cURL + +In order to cope better with modern cURL which prevents making +cURL calls when inside a callback from within cURL, defer fetch +start when we are processing in `fetch_curl_data()`. + +Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org> +--- + content/fetchers/curl.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +(limited to 'content/fetchers/curl.c') + +diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c +index 63b9ea115..c039429a5 100644 +--- a/netsurf/content/fetchers/curl.c ++++ b/content/fetchers/curl.c +@@ -142,6 +142,9 @@ static char fetch_error_buffer[CURL_ERROR_SIZE]; + /** Proxy authentication details. */ + static char fetch_proxy_userpwd[100]; + ++/** Interlock to prevent initiation during callbacks */ ++static bool inside_curl = false; ++ + + /* OpenSSL 1.0.x to 1.1.0 certificate reference counting changed + * LibreSSL declares its OpenSSL version as 2.1 but only supports the old way +@@ -710,6 +713,9 @@ fetch_curl_initiate_fetch(struct curl_fetch_info *fetch, CURL *handle) + code = fetch_curl_set_options(fetch); + if (code != CURLE_OK) { + fetch->curl_handle = 0; ++ /* The handle maybe went bad, eat it */ ++ NSLOG(netsurf, WARNING, "cURL handle maybe went bad, retry later"); ++ curl_easy_cleanup(handle); + return false; + } + +@@ -747,6 +753,10 @@ static CURL *fetch_curl_get_handle(lwc_string *host) + static bool fetch_curl_start(void *vfetch) + { + struct curl_fetch_info *fetch = (struct curl_fetch_info*)vfetch; ++ if (inside_curl) { ++ NSLOG(netsurf, DEBUG, "Deferring fetch because we're inside cURL"); ++ return false; ++ } + return fetch_curl_initiate_fetch(fetch, + fetch_curl_get_handle(fetch->host)); + } +@@ -1317,6 +1327,9 @@ static size_t fetch_curl_data(char *data, size_t size, size_t nmemb, void *_f) + CURLcode code; + fetch_msg msg; + ++ assert(inside_curl == false); ++ inside_curl = true; ++ + /* ensure we only have to get this information once */ + if (!f->http_code) { + code = curl_easy_getinfo(f->curl_handle, CURLINFO_HTTP_CODE, +@@ -1330,11 +1343,13 @@ static size_t fetch_curl_data(char *data, size_t size, size_t nmemb, void *_f) + */ + if (f->http_code == 401) { + f->http_code = 0; ++ inside_curl = false; + return size * nmemb; + } + + if (f->abort || (!f->had_headers && fetch_curl_process_headers(f))) { + f->stopped = true; ++ inside_curl = false; + return 0; + } + +@@ -1344,6 +1359,7 @@ static size_t fetch_curl_data(char *data, size_t size, size_t nmemb, void *_f) + msg.data.header_or_data.len = size * nmemb; + fetch_send_callback(&msg, f->fetch_handle); + ++ inside_curl = false; + if (f->abort) { + f->stopped = true; + return 0; +-- +cgit v1.2.1 + + diff --git a/user/py3-docopt/APKBUILD b/user/py3-docopt/APKBUILD new file mode 100644 index 000000000..b0bdf48a7 --- /dev/null +++ b/user/py3-docopt/APKBUILD @@ -0,0 +1,30 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=py3-docopt +_pkgname=${pkgname#py3-} +pkgver=0.6.2 +pkgrel=0 +pkgdesc="Expressive Python argument parsing library" +url="https://pypi.org/project/docopt/" +arch="noarch" +license="MIT" +depends="python3" +makedepends="python3-dev" +subpackages="" +source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/$_pkgname-$pkgver" + +build() { + python3 setup.py build +} + +check() { + python3 setup.py test +} + +package() { + mkdir -p "$pkgdir" + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="af138feccf8c37b374ee44fcda4938a88107d434df13c173214021b1a3348b152a595095a86982b66ac03a11db8e0f1e9e6a3a65c98deea92330311daeb831a3 docopt-0.6.2.tar.gz" diff --git a/user/py3-hbmqtt/APKBUILD b/user/py3-hbmqtt/APKBUILD new file mode 100644 index 000000000..e3f10e5ca --- /dev/null +++ b/user/py3-hbmqtt/APKBUILD @@ -0,0 +1,31 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=py3-hbmqtt +_pkgname=${pkgname#py3-} +pkgver=0.9.5 +pkgrel=0 +pkgdesc="MQTT client/broker using Python and asyncio" +url="https://pypi.org/project/hbmqtt/" +arch="noarch" +license="MIT" +depends="python3" +checkdepends="py3-docopt py3-passlib py3-pyyaml py3-six py3-transitions py3-websockets" +makedepends="python3-dev" +subpackages="" +source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/$_pkgname-$pkgver" + +build() { + python3 setup.py build +} + +check() { + python3 setup.py test +} + +package() { + mkdir -p "$pkgdir" + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="f5b1a301268c7af300a407a1a9734ba74ced825883e6740cc9d4e2eed4db48c55f6d76e4911a69743e1db514b1f2b4a05abb2320f40c349f2ac7a1d6c38d1642 hbmqtt-0.9.5.tar.gz" diff --git a/user/py3-passlib/APKBUILD b/user/py3-passlib/APKBUILD new file mode 100644 index 000000000..e3b86d402 --- /dev/null +++ b/user/py3-passlib/APKBUILD @@ -0,0 +1,32 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=py3-passlib +_pkgname=${pkgname#py3-} +pkgver=1.7.1 +pkgrel=0 +pkgdesc="Python password hashing framework" +url="https://pypi.org/project/passlib/" +arch="noarch" +options="!check" # needs nose +license="BSD-3-Clause" +depends="python3" +checkdepends="py3-nose" +makedepends="python3-dev" +subpackages="" +source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/$_pkgname-$pkgver" + +build() { + python3 setup.py build +} + +check() { + python3 setup.py test +} + +package() { + mkdir -p "$pkgdir" + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="3d5f069cd4e44e5e87cdabc46845acbdd6c1eeedb7ce1f611aebee87b0f7af19009b6a47a10ec555fd84260b9f5c933c6429e325d30326de3869f05031674168 passlib-1.7.1.tar.gz" diff --git a/user/py3-sphinxcontrib-asyncio/APKBUILD b/user/py3-sphinxcontrib-asyncio/APKBUILD new file mode 100644 index 000000000..73056c35a --- /dev/null +++ b/user/py3-sphinxcontrib-asyncio/APKBUILD @@ -0,0 +1,32 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=py3-sphinxcontrib-asyncio +_pkgname=${pkgname#py3-} +pkgver=0.2.0 +pkgrel=0 +pkgdesc="Sphinx extension for using asyncio coroutines in markup" +url="https://pypi.org/project/sphinxcontrib-asyncio/" +arch="noarch" +options="!check" # Tests not included in tarball. +license="Apache-2.0" +depends="python3" +checkdepends="py3-pytest" +makedepends="python3-dev" +subpackages="" +source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/$_pkgname-$pkgver" + +build() { + python3 setup.py build +} + +check() { + python3 setup.py test +} + +package() { + mkdir -p "$pkgdir" + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="2ca25717c03385ae9bf879b8efeab8d508292d07f96d941032720d755d3db2e7bbc3c9a33c6103af9d83849ed8878bea1048d349bd0873288ee2addfee9756b7 sphinxcontrib-asyncio-0.2.0.tar.gz" diff --git a/user/py3-transitions/APKBUILD b/user/py3-transitions/APKBUILD new file mode 100644 index 000000000..8d9005f3e --- /dev/null +++ b/user/py3-transitions/APKBUILD @@ -0,0 +1,31 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=py3-transitions +_pkgname=${pkgname#py3-} +pkgver=0.6.9 +pkgrel=0 +pkgdesc="Python state machine library" +url="https://pypi.org/project/passlib/" +arch="noarch" +options="!check" # requires nose, pygraphviz +license="MIT" +depends="python3" +makedepends="python3-dev" +subpackages="" +source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/$_pkgname-$pkgver" + +build() { + python3 setup.py build +} + +check() { + python3 setup.py test +} + +package() { + mkdir -p "$pkgdir" + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="0cef11d547ae631afcb3dad557ab81b425f825028639787337f700f19073d7cb4c69ba9b6284155b3be85fb3eac4c4abd5b0cf3104dff8d2098c219729de4352 transitions-0.6.9.tar.gz" diff --git a/user/py3-websockets/APKBUILD b/user/py3-websockets/APKBUILD new file mode 100644 index 000000000..3dad1684a --- /dev/null +++ b/user/py3-websockets/APKBUILD @@ -0,0 +1,30 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=py3-websockets +_pkgname=${pkgname#py3-} +pkgver=8.0 +pkgrel=0 +pkgdesc="Python implementation of RFCs 6455 and 7692" +url="https://pypi.org/project/websockets/" +arch="all" +license="BSD-3-Clause" +depends="python3" +makedepends="python3-dev" +subpackages="" +source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/$_pkgname-$pkgver" + +build() { + python3 setup.py build +} + +check() { + python3 setup.py test +} + +package() { + mkdir -p "$pkgdir" + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="8ae408224367b4e1fcab4d39758f75902072b15e833ed9db41afc9b69deb8cb6f1c538c200785e260cd890f31562feaeb99bdbcec445c5561714a9f08b936f6f websockets-8.0.tar.gz" diff --git a/user/sdl2_image/APKBUILD b/user/sdl2_image/APKBUILD index d320f1076..e29ebdf53 100644 --- a/user/sdl2_image/APKBUILD +++ b/user/sdl2_image/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: pkgname=sdl2_image -pkgver=2.0.4 +pkgver=2.0.5 pkgrel=0 _pkgname=SDL2_image pkgdesc="Library to load images of various formats as SDL surfaces" @@ -14,6 +14,15 @@ subpackages="$pkgname-dev" source="https://www.libsdl.org/projects/SDL_image/release/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" +# secfixes: +# 2.0.5: +# - CVE-2019-12216 +# - CVE-2019-12217 +# - CVE-2019-12218 +# - CVE-2019-12219 +# - CVE-2019-12220 +# - CVE-2019-12221 + build() { cd "$builddir" ./configure \ @@ -39,4 +48,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7320a5c9111908d402fbb0c12a49eb359a6db645c0c86839793ebb1a5b75eaca7c85eb96851f3a0b4a68a2f06363c8189555afd4f1048a4a41447370eddd7e6a SDL2_image-2.0.4.tar.gz" +sha512sums="77e743d3f32707e015b290c1379ae3c7d7a3fe265995713267f0d0ec6517de4808f0de9890b5ab28445941af5bc9fbff346620629e0d7d7e9f365262cab05ee7 SDL2_image-2.0.5.tar.gz" diff --git a/user/thunar-volman/APKBUILD b/user/thunar-volman/APKBUILD index c11154579..617f28a23 100644 --- a/user/thunar-volman/APKBUILD +++ b/user/thunar-volman/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=thunar-volman -pkgver=0.9.2 -pkgrel=1 +pkgver=0.9.3 +pkgrel=0 pkgdesc="Volume manager for Thunar" url="https://xfce.org" arch="all" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="808f3dfdf105911275b0c96705604bd1575cd9c5bddaaae96583949c995a3bc84a71ce154c05ed3ce395d4b4d78e4d67770f79b3226fd4a35c509f5e612de72f thunar-volman-0.9.2.tar.bz2" +sha512sums="514fd7256c2cda7fac266b05b631e4c34ddc66e12d63270cf76846b0748d1a7c2444bfb2d5600722c4eb41f0c0c95d4823e9c3c17f0f9e2c289f9967cb75ccc2 thunar-volman-0.9.3.tar.bz2" diff --git a/user/thunar/APKBUILD b/user/thunar/APKBUILD index 7e7210458..4f79995f6 100644 --- a/user/thunar/APKBUILD +++ b/user/thunar/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=thunar -pkgver=1.8.6 -pkgrel=1 +pkgver=1.8.7 +pkgrel=0 pkgdesc="File manager for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="086dc139627d8f11341b2db91358ef1831d2b8494d34abac49355dbaf850a21c30f979294f9adf2bc8548e5f817a4e165803a3db74cd989cd3867a4e228d74db Thunar-1.8.6.tar.bz2" +sha512sums="d4faf28857ee7c29c799bec9c5d7c639596b213f2aeb1089125d074083a4a13e91425cf3f35c63ce313330ee9ef070653a868a1a4526dc443a5d603bd9dec588 Thunar-1.8.7.tar.bz2" diff --git a/user/tumbler/APKBUILD b/user/tumbler/APKBUILD index 27f7ee2b2..ac79e8a96 100644 --- a/user/tumbler/APKBUILD +++ b/user/tumbler/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=tumbler -pkgver=0.2.4 -pkgrel=2 +pkgver=0.2.5 +pkgrel=0 pkgdesc="Thumbnail generation service for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cf1d9499ff293086176a0e5055181e5527d9ae39a7786d9fe15a47202e1b02218981c072229e736a7057e85bf0c6ceff34c1f55a12396b3df0b3ab9fda822d02 tumbler-0.2.4.tar.bz2" +sha512sums="beaab1ff4c777c85a2467ce253e203269bef82f7636a8993240d23f0f50e197d9f4c74154cd8827386b92a68d21fd00f592b38759dbcdb10fcfd4383e90b1ad6 tumbler-0.2.5.tar.bz2" diff --git a/user/xdg-utils/APKBUILD b/user/xdg-utils/APKBUILD index 08766dfaa..ff09bfff1 100644 --- a/user/xdg-utils/APKBUILD +++ b/user/xdg-utils/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xdg-utils pkgver=1.1.3 -pkgrel=0 +pkgrel=1 pkgdesc="Basic desktop integration functions" url="https://www.freedesktop.org/wiki/Software/xdg-utils/" arch="noarch" @@ -13,10 +13,14 @@ makedepends="libxml2-utils libxslt lynx xmlto" subpackages="$pkgname-doc" source="https://portland.freedesktop.org/download/xdg-utils-$pkgver.tar.gz xdg-screensaver-mv-T.patch + xdg-mime-gnome.patch + xdg-mime-plasma.patch + xdg-open-failure.patch + xdg-open-spaces.patch + xdg-su-lxqt.patch " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,9 +32,13 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } sha512sums="d1f819a211eb4104a90dfdc6fedcb640fd46b15ccfc8762266f8f538c49d74cb00027b8c1af991fb2a200acb4379986ae375700e06a2aa08fb41a38f883acb3e xdg-utils-1.1.3.tar.gz -db0896979fbc3b575826b4d732658564d08bcfc957b3fa1490fe02e4cc7b52adfa1e05956432a732dae8f50145e0040bc145739ba5692ae1b86fa74be8174436 xdg-screensaver-mv-T.patch" +db0896979fbc3b575826b4d732658564d08bcfc957b3fa1490fe02e4cc7b52adfa1e05956432a732dae8f50145e0040bc145739ba5692ae1b86fa74be8174436 xdg-screensaver-mv-T.patch +f8a711f349a690a950339574209fdaa6e06ef05644d8c83fd90b0c6abe9f64a457320e02a53c3cf4a68630fe15872c2786189c34014635169c8ba40e5fe0f693 xdg-mime-gnome.patch +0270c722a4655815c7d2c042340c2bc16b1d99d1b1e4f4bf160c549afbd5620b88dfaaf31f2bbd1bafcf8d153f40e72af53006b94651a3a787c0dccec63dbb0c xdg-mime-plasma.patch +17d1941fb81cb8b0bf23817b4d57c603bdcb4abc2919d8c6ce0dff4ce27cc83b33454740c881a67f9d9cb329ba1ea941067fcaca1fc82900d94c540699bf29cd xdg-open-failure.patch +8f3888313dd74a6b6332aa8a41525d517e47bf37450fd361543df06146ed91e8d5a2be9762a10535a557b88f7c3d0c47904b0a250109f7d1a783d9ec30aaba04 xdg-open-spaces.patch +48f7f976cf54741fb8fce7f559a0bfd08567363759e7788b8607066a32b0666e8ba1d4c7d2f9599950df81f0b71bd8114b20e937ece5ad88ec7f378ac8e8a9ac xdg-su-lxqt.patch" diff --git a/user/xdg-utils/xdg-mime-gnome.patch b/user/xdg-utils/xdg-mime-gnome.patch new file mode 100644 index 000000000..327d6968b --- /dev/null +++ b/user/xdg-utils/xdg-mime-gnome.patch @@ -0,0 +1,40 @@ +From 0547886c0a7ae79145998495a6e3af6a1450d0c7 Mon Sep 17 00:00:00 2001 +From: Martin Puppe <dev@mpuppe.de> +Date: Sat, 13 Apr 2019 12:46:44 +0200 +Subject: [PATCH] xdg-mime: return correct exit code for GNOME + +If the desktop environment was GNOME and none of the commands for +detecting the MIME type of a file was available, xdg-mime used to return +exit code 0 even though it failed. The man page says it should return +exit code 3. This commit fixes the issue. + +I have considered returning exit code 4 instead since that is what would +be returned if info_kde() or info_generic() fail to find a tool for MIME +type detection. But I have decided to implement the behavior as +specified in the man page. + +The exit code of an if construct is 0 if no condition +tested true [^1]. The author of the original code probably was not aware +of this. + +[^1]: https://www.gnu.org/software/bash/manual/html_node/Conditional-Constructs.html#Conditional-Constructs +--- + scripts/xdg-mime.in | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/scripts/xdg-mime.in b/scripts/xdg-mime.in +index 0e567c7..034d0ef 100644 +--- a/scripts/xdg-mime.in ++++ b/scripts/xdg-mime.in +@@ -84,6 +84,8 @@ info_gnome() + elif gnomevfs-info --help 2>/dev/null 1>&2; then + DEBUG 1 "Running gnomevfs-info \"$1\"" + gnomevfs-info --slow-mime "$1" 2> /dev/null | grep "^MIME" | cut -d ":" -f 2 | sed s/"^ "// ++ else ++ exit_failure_operation_impossible "no method available for querying MIME type of '$filename'" + fi + + if [ $? -eq 0 ]; then +-- +2.21.0 + diff --git a/user/xdg-utils/xdg-mime-plasma.patch b/user/xdg-utils/xdg-mime-plasma.patch new file mode 100644 index 000000000..38b5f4b28 --- /dev/null +++ b/user/xdg-utils/xdg-mime-plasma.patch @@ -0,0 +1,61 @@ +From cf2a703b19d64f939890dcea79b3bd8d2a9a08fe Mon Sep 17 00:00:00 2001 +From: Ongun Kanat <ongun.kanat@gmail.com> +Date: Fri, 12 Jul 2019 16:22:35 +0200 +Subject: [PATCH] Fix xdg-mime for proper Plasma 5 support + +This adds checks for Plasma 5 and runs kbuildsycoca5 after +updating mimeapps.list file. The path of the file is +detected via qtpaths utility. +--- + scripts/xdg-mime.in | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/scripts/xdg-mime.in b/scripts/xdg-mime.in +index 0e567c7..1ac6a3d 100644 +--- a/scripts/xdg-mime.in ++++ b/scripts/xdg-mime.in +@@ -133,7 +133,10 @@ make_default_kde() + # text/plain=gnome-gedit.desktop;gnu-emacs.desktop; + vendor="$1" + mimetype="$2" +- if [ x"$KDE_SESSION_VERSION" = x"4" ]; then ++ if [ x"$KDE_SESSION_VERSION" = x"5" ]; then ++ default_dir=$(qtpaths --writable-path ConfigLocation) ++ default_file="$default_dir/mimeapps.list" ++ elif [ x"$KDE_SESSION_VERSION" = x"4" ]; then + default_dir=`kde4-config --path xdgdata-apps 2> /dev/null | cut -d ':' -f 1` + default_file="$default_dir/mimeapps.list" + else +@@ -148,7 +151,7 @@ make_default_kde() + DEBUG 1 "Updating $default_file" + mkdir -p "$default_dir" + [ -f "$default_file" ] || touch "$default_file" +- if [ x"$KDE_SESSION_VERSION" = x"4" ]; then ++ if [ x"$KDE_SESSION_VERSION" = x"4" ] || [ x"$KDE_SESSION_VERSION" = x"5" ]; then + [ -f "$default_file" ] || touch "$default_file" + awk -v application="$vendor" -v mimetype="$mimetype" ' + BEGIN { +@@ -207,7 +210,7 @@ make_default_kde() + } + } + ' "$default_file" > "${default_file}.new" && mv "${default_file}.new" "$default_file" +- eval 'kbuildsycoca4'$xdg_redirect_output ++ eval 'kbuildsycoca${KDE_SESSION_VERSION}'$xdg_redirect_output + else + awk -v application="$vendor" -v mimetype="$mimetype" ' + BEGIN { +@@ -576,6 +579,11 @@ if [ "$action" = "makedefault" ]; then + + make_default_kde "$filename" "$mimetype" + make_default_generic "$filename" "$mimetype" ++ detectDE ++ ++ if [ x"$DE" = x"kde" ]; then ++ eval 'kbuildsycoca${KDE_SESSION_VERSION}'$xdg_redirect_output ++ fi + done + exit_success + fi +-- +2.21.0 + diff --git a/user/xdg-utils/xdg-open-failure.patch b/user/xdg-utils/xdg-open-failure.patch new file mode 100644 index 000000000..022d4614d --- /dev/null +++ b/user/xdg-utils/xdg-open-failure.patch @@ -0,0 +1,43 @@ +From 0ad418b2543b532ec82298ac2660d3f222f10882 Mon Sep 17 00:00:00 2001 +From: KARBOWSKI Piotr <piotr.karbowski@gmail.com> +Date: Sun, 23 Jun 2019 11:39:40 +0200 +Subject: [PATCH] xdg-open: Exit also on non-zero exit status from 'Exec' + .desktop entry. + +Currently if the tool that was taken out of .desktop file Exec field +will exit with non-zero exit code, xdg-open will then fallback to +open_generic() from search_desktop_file(), which will lead to opening +again the same file with the same tool and ending on opening the file +with web browser. + +This may lead to situation when for example text editor that fails to +write file on exit, will open the unchanged file with web browsr. + +Another real life example is if one were to exit from mpv with +control-C, xdg-open will again start mpv, then it will try to start +x-web-browser and ending with starting a browser from list -- firefox in +my case. + +This must be a bug as it's not docummented anywhere. If we got to the +point where we exec $command_exec then xdg-open must exit even if +whatever was executed by $command_exec returned non-zero exit status. +--- + scripts/xdg-open.in | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in +index 202f3e3..7cfdde0 100644 +--- a/scripts/xdg-open.in ++++ b/scripts/xdg-open.in +@@ -325,6 +325,8 @@ search_desktop_file() + + if [ $? -eq 0 ]; then + exit_success ++ else ++ exit_failure_operation_failed + fi + fi + +-- +2.21.0 + diff --git a/user/xdg-utils/xdg-open-spaces.patch b/user/xdg-utils/xdg-open-spaces.patch new file mode 100644 index 000000000..7583a9dc3 --- /dev/null +++ b/user/xdg-utils/xdg-open-spaces.patch @@ -0,0 +1,38 @@ +From cc686869e9801b09abc29a3e72718ae0520aa97e Mon Sep 17 00:00:00 2001 +From: Dominik Schmidt <dominik@schm1dt.ch> +Date: Sat, 8 Dec 2018 19:56:44 +0100 +Subject: [PATCH] xdg-open: Fix unquoted variable expansion when looking for + .desktop files + +The recursive find algorithm for the .desktop files has an unquoted path expansion +in the generic case, when no desktop environment specific tool is found. +Hence, if we have a directory layout containing something along the lines of + + ~/.local/share/applications/foo bar/ + +Then the recursion will expand into searching in: + + * `~/.local/share/applications/foo` + * `~/bar/*` + +instead of `~/.local/share/applications/foo bar/*` +--- + scripts/xdg-open.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in +index 202f3e3..b3e0ba9 100644 +--- a/scripts/xdg-open.in ++++ b/scripts/xdg-open.in +@@ -328,7 +328,7 @@ search_desktop_file() + fi + fi + +- for d in $dir/*/; do ++ for d in "$dir"/*/; do + [ -d "$d" ] && search_desktop_file "$default" "$d" "$target" + done + } +-- +2.21.0 + diff --git a/user/xdg-utils/xdg-su-lxqt.patch b/user/xdg-utils/xdg-su-lxqt.patch new file mode 100644 index 000000000..dccc4e214 --- /dev/null +++ b/user/xdg-utils/xdg-su-lxqt.patch @@ -0,0 +1,28 @@ +Upstream-Bug: https://bugzilla.suse.com/show_bug.cgi?id=1120397 +Upstream-Bug: https://github.com/lxqt/lxqt/issues/1653 + +From 132cbff34f00f67a83ea58919a982abe600f25c3 Mon Sep 17 00:00:00 2001 +From: Fabio Pesari <posta@parallelo.eu> +Date: Sun, 7 Jul 2019 13:08:33 +0000 +Subject: [PATCH] xdg-su: Fix escaping for lxqt-sudo + +--- + scripts/xdg-su.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/xdg-su.in b/scripts/xdg-su.in +index b7a9865..65463eb 100644 +--- a/scripts/xdg-su.in ++++ b/scripts/xdg-su.in +@@ -84,7 +84,7 @@ su_lxqt() + if [ $? -eq 0 ] ; then + if [ -z "$user" ] ; then + # -s option runs as su rather then sudo +- $LXQTSU -s "$cmd" ++ $LXQTSU -s $cmd + else + # lxqt-sudo does not support specifying a user + su_generic +-- +2.21.0 + diff --git a/user/xf86-video-trident/APKBUILD b/user/xf86-video-trident/APKBUILD new file mode 100644 index 000000000..560447424 --- /dev/null +++ b/user/xf86-video-trident/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-video-trident +pkgver=1.3.8 +pkgrel=0 +pkgdesc="X.Org driver for Trident video cards" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="util-macros xorg-server-dev xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.X.Org/releases/individual/driver/xf86-video-trident-$pkgver.tar.bz2" + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="f971e9441c9ff7374d53d30f6746232903221665ae52560d5716762c2233cc6d0065b631a4fed98bf194d9827572cc42da577a2e6e06ba014e6ce42343b63f66 xf86-video-trident-1.3.8.tar.bz2" diff --git a/user/xf86-video-v4l/APKBUILD b/user/xf86-video-v4l/APKBUILD new file mode 100644 index 000000000..2437720a1 --- /dev/null +++ b/user/xf86-video-v4l/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-video-v4l +pkgver=0.3.0 +pkgrel=0 +pkgdesc="X.Org driver for Video4Linux devices" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="util-macros xorg-server-dev xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.X.Org/releases/individual/driver/xf86-video-v4l-$pkgver.tar.bz2" + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="ec39b2fa70143b8662c3bd8ec094afdfa245687072d19164eb6b6c3e96aaf39a4d7708af60be975fcd07927cc9055812a67abb611a98cd27b3d548d8c2249955 xf86-video-v4l-0.3.0.tar.bz2" diff --git a/user/xf86-video-vboxvideo/APKBUILD b/user/xf86-video-vboxvideo/APKBUILD new file mode 100644 index 000000000..5a5288f9b --- /dev/null +++ b/user/xf86-video-vboxvideo/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-video-vboxvideo +pkgver=1.0.0 +pkgrel=0 +pkgdesc="X.Org driver for the VirtualBox video adaptor" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="util-macros xorg-server-dev xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.X.Org/releases/individual/driver/xf86-video-vboxvideo-$pkgver.tar.bz2" + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="1a9856a966495a3a291592ee3113ed5ee83e3ef530bf37d91605206a62f641726511ad48ca79b8a3e94f601f8cf15341255b0c7d14f5c8acf985b84f965d8dfc xf86-video-vboxvideo-1.0.0.tar.bz2" diff --git a/user/xf86-video-vesa/APKBUILD b/user/xf86-video-vesa/APKBUILD new file mode 100644 index 000000000..b87f3412f --- /dev/null +++ b/user/xf86-video-vesa/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-video-vesa +pkgver=2.4.0 +pkgrel=0 +pkgdesc="X.Org driver for VESA-compatible video adaptors" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="util-macros xorg-server-dev xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.X.Org/releases/individual/driver/xf86-video-vesa-$pkgver.tar.bz2" + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="4af5c0a7fd64eba503980198cf510688dff2f33482ceac446455d97255dcc828613387ac57828eb6dce080cb15a8644a2b2e278bf356705fdeaea873ab07c2de xf86-video-vesa-2.4.0.tar.bz2" diff --git a/user/xf86-video-vmware/APKBUILD b/user/xf86-video-vmware/APKBUILD new file mode 100644 index 000000000..99cfce3ba --- /dev/null +++ b/user/xf86-video-vmware/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-video-vmware +pkgver=13.3.0 +pkgrel=0 +pkgdesc="X.Org driver for VMware's SVGA adaptor" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="eudev-dev util-macros xorg-server-dev xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.X.Org/releases/individual/driver/xf86-video-vmware-$pkgver.tar.bz2" + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="c318de893cae7b2b11e11c1b389ee47478b7c8d1f52c27099dbe453efec28f3e9da449217307a8c2251999eada66312f766996be1a6ead413b8b6dedc42c68ca xf86-video-vmware-13.3.0.tar.bz2" diff --git a/user/xorg-drivers/APKBUILD b/user/xorg-drivers/APKBUILD index c6442655d..0d26e67ca 100644 --- a/user/xorg-drivers/APKBUILD +++ b/user/xorg-drivers/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xorg-drivers pkgver=1.0 -pkgrel=0 +pkgrel=1 pkgdesc="Drivers for X.Org systems" url="https://www.X.Org/" arch="all" @@ -12,15 +12,20 @@ depends="xf86-input-evdev xf86-input-joystick xf86-input-keyboard xf86-input-libinput xf86-input-mouse xf86-input-synaptics xf86-input-void xf86-input-wacom - xf86-video-ast xf86-video-ati xf86-video-cirrus xf86-video-dummy - xf86-video-fbdev xf86-video-freedreno xf86-video-mach64 xf86-video-mga - xf86-video-nouveau xf86-video-openchrome xf86-video-qxl xf86-video-r128 - xf86-video-tdfx" + xf86-video-amdgpu xf86-video-ast xf86-video-ati xf86-video-cirrus + xf86-video-dummy xf86-video-fbdev xf86-video-freedreno xf86-video-glint + xf86-video-mach64 xf86-video-mga xf86-video-nouveau + xf86-video-openchrome xf86-video-qxl xf86-video-r128 + xf86-video-rendition xf86-video-siliconmotion xf86-video-sis + xf86-video-sisusb xf86-video-tdfx xf86-video-trident xf86-video-v4l + xf86-video-vboxvideo xf86-video-vesa xf86-video-vmware" case $CTARGET_ARCH in pmmx) depends="$depends xf86-video-geode xf86-video-intel" ;; x86_64) depends="$depends xf86-video-intel" ;; + sparc*) + depends="$depends xf86-video-sunffb xf86-video-sunleo" ;; esac source="" |